From ef931bbbff407ce8a0d0f5dfc62b10d23dbd624b Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Mon, 28 May 2018 10:29:12 +0200
Subject: [PATCH 001/539] First prototype.

---
 Common/lib/Makefile.in                   | 147 +++++---
 Makefile.in                              | 251 +++++++------
 SU2_CFD/include/driver_structure.hpp     |   7 +-
 SU2_CFD/include/output_structure.hpp     |  53 ++-
 SU2_CFD/obj/Makefile.am                  |   1 +
 SU2_CFD/obj/Makefile.in                  | 241 +++++++++----
 SU2_CFD/src/driver_structure.cpp         | 235 ++++++++----
 SU2_CFD/src/output_direct_elasticity.cpp | 358 ++++++++++++++++++
 SU2_CFD/src/output_structure.cpp         | 406 +++++++++++----------
 SU2_DEF/obj/Makefile.in                  | 174 +++++----
 SU2_DOT/obj/Makefile.in                  | 175 +++++----
 SU2_GEO/obj/Makefile.in                  | 174 +++++----
 SU2_MSH/obj/Makefile.in                  | 174 +++++----
 SU2_PY/Makefile.in                       | 106 ++++--
 SU2_PY/pySU2/Makefile.in                 | 102 ++++--
 SU2_SOL/obj/Makefile.in                  | 174 +++++----
 aclocal.m4                               | 438 +++++++++++++++--------
 configure                                | 329 ++++++++++-------
 externals/Makefile.in                    | 201 ++++++-----
 externals/cgns/Makefile.in               | 145 +++++---
 externals/metis/Makefile.in              | 145 +++++---
 externals/parmetis/Makefile.in           | 145 +++++---
 externals/tecio/Makefile.in              | 145 +++++---
 23 files changed, 2859 insertions(+), 1467 deletions(-)
 create mode 100644 SU2_CFD/src/output_direct_elasticity.cpp

diff --git a/Common/lib/Makefile.in b/Common/lib/Makefile.in
index 0d2f7860acb8..200e56887235 100644
--- a/Common/lib/Makefile.in
+++ b/Common/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -44,23 +44,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -84,8 +122,6 @@ target_triplet = @target@
 @BUILD_DIRECTDIFF_TRUE@am__append_2 = libSU2_DIRECTDIFF.a
 @BUILD_REVERSE_TRUE@am__append_3 = libSU2_AD.a
 subdir = Common/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -93,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -354,8 +391,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -608,7 +663,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Common/lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Common/lib/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -669,6 +723,7 @@ clean-noinstLIBRARIES:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_a-adt_structure.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+
 libSU2.a: $(libSU2_a_OBJECTS) $(libSU2_a_DEPENDENCIES) $(EXTRA_libSU2_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2.a
 	$(AM_V_AR)$(libSU2_a_AR) libSU2.a $(libSU2_a_OBJECTS) $(libSU2_a_LIBADD)
@@ -707,6 +762,7 @@ libSU2.a: $(libSU2_a_OBJECTS) $(libSU2_a_DEPENDENCIES) $(EXTRA_libSU2_a_DEPENDEN
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_AD_a-adt_structure.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+
 libSU2_AD.a: $(libSU2_AD_a_OBJECTS) $(libSU2_AD_a_DEPENDENCIES) $(EXTRA_libSU2_AD_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2_AD.a
 	$(AM_V_AR)$(libSU2_AD_a_AR) libSU2_AD.a $(libSU2_AD_a_OBJECTS) $(libSU2_AD_a_LIBADD)
@@ -745,6 +801,7 @@ libSU2_AD.a: $(libSU2_AD_a_OBJECTS) $(libSU2_AD_a_DEPENDENCIES) $(EXTRA_libSU2_A
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_DIRECTDIFF_a-adt_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+
 libSU2_DIRECTDIFF.a: $(libSU2_DIRECTDIFF_a_OBJECTS) $(libSU2_DIRECTDIFF_a_DEPENDENCIES) $(EXTRA_libSU2_DIRECTDIFF_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2_DIRECTDIFF.a
 	$(AM_V_AR)$(libSU2_DIRECTDIFF_a_AR) libSU2_DIRECTDIFF.a $(libSU2_DIRECTDIFF_a_OBJECTS) $(libSU2_DIRECTDIFF_a_LIBADD)
@@ -1539,26 +1596,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_DIRECTDIFF_a-adt_structure.obj `if test -f '../src/adt_structure.cpp'; then $(CYGPATH_W) '../src/adt_structure.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/adt_structure.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1570,15 +1616,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1587,9 +1629,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -1742,8 +1785,8 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist ctags distclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -1752,9 +1795,11 @@ uninstall-am:
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Makefile.in b/Makefile.in
index 895bade0acf3..5c875e745766 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -53,23 +53,61 @@
 #
 ################################################################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -98,9 +136,6 @@ target_triplet = @target@
 @BUILD_GEO_TRUE@am__append_7 = SU2_GEO/obj
 @BUILD_PY_WRAPPER_TRUE@am__append_8 = SU2_PY/pySU2
 subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING INSTALL \
-	compile config.guess config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -108,6 +143,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -127,13 +164,14 @@ am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -141,14 +179,36 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = externals Common/lib SU2_PY SU2_CFD/obj SU2_DOT/obj \
 	SU2_MSH/obj SU2_DEF/obj SU2_SOL/obj SU2_GEO/obj SU2_PY/pySU2
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING INSTALL compile \
+	config.guess config.sub depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -361,7 +421,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -387,14 +446,13 @@ $(am__aclocal_m4_deps):
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -415,31 +473,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -455,12 +495,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -472,15 +507,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -489,18 +520,16 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
 clean-cscope:
 	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
 
-cscope.files: clean-cscope cscopelist-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -582,7 +611,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -598,11 +627,17 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -620,7 +655,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -630,22 +665,23 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -802,25 +838,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-cscope \
-	clean-generic cscope cscopelist cscopelist-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 476d8ca7aba3..e7895577e9c6 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -78,7 +78,7 @@ class CDriver {
        mixingplane,                             /*!< \brief mixing-plane simulation flag.*/
        fsi;                                     /*!< \brief FSI simulation flag.*/
   CIteration **iteration_container;             /*!< \brief Container vector with all the iteration methods. */
-  COutput *output;                              /*!< \brief Pointer to the COutput class. */
+  COutput **output;                             /*!< \brief Pointer to the COutput class. */
   CIntegration ***integration_container;        /*!< \brief Container vector with all the integration methods. */
   CGeometry ***geometry_container;              /*!< \brief Geometrical definition of the problem. */
   CSolver ****solver_container;                 /*!< \brief Container vector with all the solutions. */
@@ -201,6 +201,11 @@ class CDriver {
    */
   void PythonInterface_Preprocessing();
 
+  /*!
+   * \brief Preprocess the output container.
+   */
+  void Output_Preprocessing();
+
   /*!
    * \brief Deallocation routine
    */
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index ec9a5f98feaf..266e3604c4ba 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -66,6 +66,8 @@ using namespace std;
  */
 class COutput {
 
+protected:
+
   unsigned long nGlobal_Poin;   // Global number of nodes with halos
   unsigned long nSurf_Poin;   // Global number of nodes of the surface
   unsigned long nGlobal_Doma;   // Global number of nodes without halos
@@ -186,8 +188,6 @@ class COutput {
         **NuFactorIn,
         **NuFactorOut;
 
-protected:
-
   int rank, 	/*!< \brief MPI Rank. */
   size;       	/*!< \brief MPI Size. */
 
@@ -626,7 +626,7 @@ class COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone);
+  virtual void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone);
 
   /*! 
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -639,7 +639,7 @@ class COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ***geometry, CSolver ****solver_container, CConfig **config,
+  virtual void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ***geometry, CSolver ****solver_container, CConfig **config,
                               CIntegration ***integration, bool DualTime, su2double timeused, unsigned short val_iZone);
   
   /*!
@@ -739,7 +739,7 @@ class COutput {
    * \param[in] val_nZone - Total number of domains in the grid file.
    */
   void SetResult_Files_Parallel(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
-                                unsigned long iExtIter, unsigned short val_nZone);
+                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone);
   
   /*!
    * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for flow problems.
@@ -858,4 +858,47 @@ class COutput {
 
 };
 
+/*! \class CFEAOutput
+ *  \brief Output class for FEA problems.
+ *  \author R. Sanchez.
+ *  \date May 24, 2018.
+ */
+class CFEAOutput : public COutput {
+private:
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFEAOutput(CConfig *config);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFEAOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ***geometry, CSolver ****solver_container, CConfig **config,
+                              CIntegration ***integration, bool DualTime, su2double timeused, unsigned short val_iZone);
+
+};
+
 #include "output_structure.inl"
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index c194493e863c..8332e3d5ae8d 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -112,6 +112,7 @@ libSU2Core_sources = \
   ../src/output_fieldview.cpp \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
+  ../src/output_direct_elasticity.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
diff --git a/SU2_CFD/obj/Makefile.in b/SU2_CFD/obj/Makefile.in
index a11f17959c28..4172c3369c87 100644
--- a/SU2_CFD/obj/Makefile.in
+++ b/SU2_CFD/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -55,23 +55,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -97,8 +135,6 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @BUILD_REVERSE_TRUE@am__append_3 = ../bin/SU2_CFD_AD
 @BUILD_NORMAL_TRUE@am__append_4 = libSU2Core.a
 subdir = SU2_CFD/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -106,6 +142,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -157,7 +194,8 @@ am__libSU2Core_a_SOURCES_DIST = ../include/definition_structure.hpp \
 	../src/output_cgns.cpp ../src/output_structure.cpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
-	../src/output_paraview.cpp ../src/python_wrapper_structure.cpp \
+	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
 	../src/solver_adjoint_discrete.cpp \
@@ -216,6 +254,7 @@ am__objects_1 = ../src/libSU2Core_a-definition_structure.$(OBJEXT) \
 	../src/libSU2Core_a-output_fieldview.$(OBJEXT) \
 	../src/libSU2Core_a-output_su2.$(OBJEXT) \
 	../src/libSU2Core_a-output_paraview.$(OBJEXT) \
+	../src/libSU2Core_a-output_direct_elasticity.$(OBJEXT) \
 	../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_turbulent.$(OBJEXT) \
@@ -305,7 +344,8 @@ am_____bin_SU2_CFD_AD_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_cgns.cpp ../src/output_structure.cpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
-	../src/output_paraview.cpp ../src/python_wrapper_structure.cpp \
+	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
 	../src/solver_adjoint_discrete.cpp \
@@ -365,6 +405,7 @@ am__objects_4 =  \
 	../src/___bin_SU2_CFD_AD-output_fieldview.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_su2.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_paraview.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_direct_elasticity.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_turbulent.$(OBJEXT) \
@@ -444,7 +485,8 @@ am_____bin_SU2_CFD_DIRECTDIFF_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_cgns.cpp ../src/output_structure.cpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
-	../src/output_paraview.cpp ../src/python_wrapper_structure.cpp \
+	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
 	../src/solver_adjoint_discrete.cpp \
@@ -503,6 +545,7 @@ am__objects_6 = ../src/___bin_SU2_CFD_DIRECTDIFF-definition_structure.$(OBJEXT)
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_fieldview.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_su2.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_paraview.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_turbulent.$(OBJEXT) \
@@ -602,8 +645,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -805,6 +866,7 @@ libSU2Core_sources = \
   ../src/output_fieldview.cpp \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
+  ../src/output_direct_elasticity.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
@@ -893,7 +955,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_CFD/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_CFD/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -982,6 +1043,8 @@ clean-noinstLIBRARIES:
 	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-output_paraview.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_direct_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT):  \
@@ -1046,6 +1109,7 @@ clean-noinstLIBRARIES:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-variable_template.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+
 libSU2Core.a: $(libSU2Core_a_OBJECTS) $(libSU2Core_a_DEPENDENCIES) $(EXTRA_libSU2Core_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2Core.a
 	$(AM_V_AR)$(libSU2Core_a_AR) libSU2Core.a $(libSU2Core_a_OBJECTS) $(libSU2Core_a_LIBADD)
@@ -1059,10 +1123,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -1083,7 +1148,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -1095,6 +1161,7 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_CFD$(EXEEXT): $(___bin_SU2_CFD_OBJECTS) $(___bin_SU2_CFD_DEPENDENCIES) $(EXTRA____bin_SU2_CFD_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_CFD$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_CFD_LINK) $(___bin_SU2_CFD_OBJECTS) $(___bin_SU2_CFD_LDADD) $(LIBS)
@@ -1162,6 +1229,8 @@ clean-binPROGRAMS:
 	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-output_paraview.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_direct_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT):  \
@@ -1226,6 +1295,7 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-variable_template.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+
 ../bin/SU2_CFD_AD$(EXEEXT): $(___bin_SU2_CFD_AD_OBJECTS) $(___bin_SU2_CFD_AD_DEPENDENCIES) $(EXTRA____bin_SU2_CFD_AD_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_CFD_AD$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_CFD_AD_LINK) $(___bin_SU2_CFD_AD_OBJECTS) $(___bin_SU2_CFD_AD_LDADD) $(LIBS)
@@ -1293,6 +1363,8 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-output_paraview.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT):  \
@@ -1357,6 +1429,7 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-variable_template.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+
 ../bin/SU2_CFD_DIRECTDIFF$(EXEEXT): $(___bin_SU2_CFD_DIRECTDIFF_OBJECTS) $(___bin_SU2_CFD_DIRECTDIFF_DEPENDENCIES) $(EXTRA____bin_SU2_CFD_DIRECTDIFF_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_CFD_DIRECTDIFF$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_CFD_DIRECTDIFF_LINK) $(___bin_SU2_CFD_DIRECTDIFF_OBJECTS) $(___bin_SU2_CFD_DIRECTDIFF_LDADD) $(LIBS)
@@ -1395,6 +1468,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_cgns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_physics.Po@am__quote@
@@ -1459,6 +1533,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_cgns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_physics.Po@am__quote@
@@ -1522,6 +1597,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_cgns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_physics.Po@am__quote@
@@ -2011,6 +2087,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_paraview.obj `if test -f '../src/output_paraview.cpp'; then $(CYGPATH_W) '../src/output_paraview.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_paraview.cpp'; fi`
 
+../src/libSU2Core_a-output_direct_elasticity.o: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Tpo -c -o ../src/libSU2Core_a-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/libSU2Core_a-output_direct_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+
+../src/libSU2Core_a-output_direct_elasticity.obj: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Tpo -c -o ../src/libSU2Core_a-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/libSU2Core_a-output_direct_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+
 ../src/libSU2Core_a-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo -c -o ../src/libSU2Core_a-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Po
@@ -2921,6 +3011,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_paraview.obj `if test -f '../src/output_paraview.cpp'; then $(CYGPATH_W) '../src/output_paraview.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_paraview.cpp'; fi`
 
+../src/___bin_SU2_CFD_AD-output_direct_elasticity.o: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+
+../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Po
@@ -3817,6 +3921,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_paraview.obj `if test -f '../src/output_paraview.cpp'; then $(CYGPATH_W) '../src/output_paraview.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_paraview.cpp'; fi`
 
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.o: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.o `test -f '../src/output_direct_elasticity.cpp' || echo '$(srcdir)/'`../src/output_direct_elasticity.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj: ../src/output_direct_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_elasticity.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
+
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Po
@@ -4265,26 +4383,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-variable_template.obj `if test -f '../src/variable_template.cpp'; then $(CYGPATH_W) '../src/variable_template.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/variable_template.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -4296,15 +4403,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -4313,9 +4416,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -4473,18 +4577,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-noinstLIBRARIES cscopelist ctags distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 46149b1cc6fb..4adf5866fe9f 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -87,6 +87,7 @@ CDriver::CDriver(char* confFile,
   FFDBox                         = new CFreeFormDefBox**[nZone];
   interpolator_container         = new CInterpolator**[nZone];
   transfer_container             = new CTransfer**[nZone];
+  output                         = new COutput*[nZone];
   transfer_types                 = new unsigned short*[nZone];
 
   for (iZone = 0; iZone < nZone; iZone++) {
@@ -100,6 +101,7 @@ CDriver::CDriver(char* confFile,
     FFDBox[iZone]                         = NULL;
     interpolator_container[iZone]         = NULL;
     transfer_container[iZone]             = NULL;
+    output[iZone]                         = NULL;
     transfer_types[iZone]                 = new unsigned short[nZone];
   }
 
@@ -439,22 +441,9 @@ CDriver::CDriver(char* confFile,
   if (rank == MASTER_NODE) cout << endl << "---------------------- Python Interface Preprocessing ---------------------" << endl;
   PythonInterface_Preprocessing();
 
-  /*--- Definition of the output class (one for all zones). The output class
-   manages the writing of all restart, volume solution, surface solution,
-   surface comma-separated value, and convergence history files (both in serial
-   and in parallel). ---*/
-
-  output = new COutput(config_container[ZONE_0]);
-
-  /*--- Open the convergence history file ---*/
+  if (rank == MASTER_NODE) cout << endl << "-------------------------- Output Preprocessing ---------------------------" << endl;
+  Output_Preprocessing();
 
-  if (rank == MASTER_NODE){
-    ConvHist_file = new ofstream[nZone];
-    for (iZone = 0; iZone < nZone; iZone++) {
-      output->SetConvHistory_Header(&ConvHist_file[iZone], config_container[iZone], iZone);
-      config_container[iZone]->SetHistFile(&ConvHist_file[iZone]);
-    }
-  }
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
     ExtIter = config_container[ZONE_0]->GetUnst_RestartIter();
@@ -469,7 +458,7 @@ CDriver::CDriver(char* confFile,
   if (fsi){
       if (rank == MASTER_NODE) cout << endl <<"Opening FSI history file." << endl;
       unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
-      output->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
+      output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
                                 config_container, integration_container, 0,
                                 ZONE_FLOW, ZONE_STRUCT, true);
   }
@@ -611,7 +600,15 @@ void CDriver::Postprocessing() {
   if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
 
   /*--- Deallocate output container ---*/
-  if (output!= NULL) delete output;
+
+  if (output!= NULL) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (output[iZone] != NULL) {
+        delete output[iZone];
+      }
+    }
+    delete [] output;
+  }
   if (rank == MASTER_NODE) cout << "Deleted COutput class." << endl;
 
   if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl;
@@ -2993,6 +2990,92 @@ void CDriver::InitStaticMeshMovement(){
   }
 }
 
+void CDriver::Output_Preprocessing(){
+
+  /*--- Definition of the output class (one for each zone). The output class
+   manages the writing of all restart, volume solution, surface solution,
+   surface comma-separated value, and convergence history files (both in serial
+   and in parallel). ---*/
+  for (iZone = 0; iZone < nZone; iZone++){
+
+    /*--- Initial print to console for this zone. ---*/
+
+    if (rank == MASTER_NODE) cout << "Zone " << iZone+1;
+
+    /*--- Loop over all zones and instantiate the physics iteration. ---*/
+
+    switch (config_container[iZone]->GetKind_Solver()) {
+
+    case EULER: case NAVIER_STOKES: case RANS:
+
+      if (rank == MASTER_NODE)
+        cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case WAVE_EQUATION:
+      if (rank == MASTER_NODE)
+        cout << ": wave output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case HEAT_EQUATION:
+      if (rank == MASTER_NODE)
+        cout << ": heat output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case HEAT_EQUATION_FVM:
+      if (rank == MASTER_NODE)
+        cout << ": heat output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case POISSON_EQUATION:
+      if (rank == MASTER_NODE)
+        cout << ": poisson output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case FEM_ELASTICITY:
+      if (rank == MASTER_NODE)
+        cout << ": FEM output structure." << endl;
+      output[iZone] = new CFEAOutput(config_container[iZone]);
+      break;
+
+    case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
+      if (rank == MASTER_NODE)
+        cout << ": adjoint Euler/Navier-Stokes/RANS output structure.." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (rank == MASTER_NODE)
+        cout << ": discrete adjoint Euler/Navier-Stokes/RANS output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+
+    case DISC_ADJ_FEM:
+      if (rank == MASTER_NODE)
+        cout << ": discrete adjoint FEA output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
+    }
+
+  }
+
+  /*--- Open the convergence history file ---*/
+
+  if (rank == MASTER_NODE){
+    ConvHist_file = new ofstream[nZone];
+    for (iZone = 0; iZone < nZone; iZone++) {
+      output[iZone]->SetConvHistory_Header(&ConvHist_file[iZone], config_container[iZone], iZone);
+      config_container[iZone]->SetHistFile(&ConvHist_file[iZone]);
+    }
+  }
+
+}
+
 void CDriver::TurbomachineryPreprocessing(){
 
   unsigned short donorZone,targetZone, nMarkerInt, iMarkerInt;
@@ -3189,13 +3272,13 @@ void CDriver::PreprocessExtIter(unsigned long ExtIter) {
   /*--- Read the target pressure ---*/
 
   if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
-    output->SetCp_InverseDesign(solver_container[ZONE_0][MESH_0][FLOW_SOL],
+    output[ZONE_0]->SetCp_InverseDesign(solver_container[ZONE_0][MESH_0][FLOW_SOL],
         geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], ExtIter);
 
   /*--- Read the target heat flux ---*/
 
   if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
-    output->SetHeatFlux_InverseDesign(solver_container[ZONE_0][MESH_0][FLOW_SOL],
+    output[ZONE_0]->SetHeatFlux_InverseDesign(solver_container[ZONE_0][MESH_0][FLOW_SOL],
         geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], ExtIter);
 
   /*--- Set the initial condition for EULER/N-S/RANS and for a non FSI simulation ---*/
@@ -3243,7 +3326,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   
   if (!fsi) {
     for (iZone = 0; iZone < nZone; iZone++) {
-      output->SetConvHistory_Body(&ConvHist_file[iZone], geometry_container, solver_container,
+      output[iZone]->SetConvHistory_Body(&ConvHist_file[iZone], geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone);
     }
   }
@@ -3252,7 +3335,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
 
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
     for (iZone = 0; iZone < nZone; iZone++){
-      output->SetCFL_Number(solver_container, config_container, iZone);
+      output[iZone]->SetCFL_Number(solver_container, config_container, iZone);
     }
   }
 
@@ -3341,8 +3424,8 @@ void CDriver::Output(unsigned long ExtIter) {
     
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
-    
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, ExtIter, nZone);
+    for (iZone = 0; iZone < nZone; iZone++)
+      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, ExtIter, iZone, nZone);
     
     
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
@@ -3352,7 +3435,7 @@ void CDriver::Output(unsigned long ExtIter) {
   /*--- Export Surface Solution File for Unsteady Simulations ---*/
   /*--- When calculate mean/fluctuation option will be available, delete the following part ---*/
   if ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (ExtIter % config_container[ZONE_0]->GetWrt_Surf_Freq_DualTime() == 0)) {
-      output->SetSurfaceCSV_Flow(config_container[ZONE_0], geometry_container[ZONE_0][MESH_0], solver_container[ZONE_0][MESH_0][FLOW_SOL], ExtIter, ZONE_0);}
+      output[ZONE_0]->SetSurfaceCSV_Flow(config_container[ZONE_0], geometry_container[ZONE_0][MESH_0], solver_container[ZONE_0][MESH_0][FLOW_SOL], ExtIter, ZONE_0);}
 
 }
 
@@ -3380,11 +3463,11 @@ void CGeneralDriver::Run() {
 
   for (iZone = 0; iZone < nZone; iZone++) {
 
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container,
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container,
                                            solver_container, numerics_container, config_container,
                                            surface_movement, grid_movement, FFDBox, iZone);
 
-    iteration_container[iZone]->Iterate(output, integration_container, geometry_container,
+    iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container,
                                         solver_container, numerics_container, config_container,
                                         surface_movement, grid_movement, FFDBox, iZone);
   }
@@ -3394,12 +3477,12 @@ void CGeneralDriver::Run() {
 void CGeneralDriver::Update() {
 
   for (iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Update(output, integration_container, geometry_container,
+    iteration_container[iZone]->Update(output[iZone], integration_container, geometry_container,
                                       solver_container, numerics_container, config_container,
                                       surface_movement, grid_movement, FFDBox, iZone);
 
   if (config_container[ZONE_0]->GetKind_Solver() == DISC_ADJ_FEM){
-      iteration_container[ZONE_0]->Postprocess(output, integration_container, geometry_container,
+      iteration_container[ZONE_0]->Postprocess(output[iZone], integration_container, geometry_container,
                                       solver_container, numerics_container, config_container,
                                       surface_movement, grid_movement, FFDBox, ZONE_0);
   }
@@ -3438,7 +3521,7 @@ void CFluidDriver::Run() {
   /*--- Zone preprocessing ---*/
 
   for (iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
 
   /*--- Updating zone interface communication patterns,
    needed only for unsteady simulation since for steady problems
@@ -3472,7 +3555,7 @@ void CFluidDriver::Run() {
 
     for (iZone = 0; iZone < nZone; iZone++) {
       config_container[iZone]->SetIntIter(IntIter);
-      iteration_container[iZone]->Iterate(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+      iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
     }
 
     /*--- Check convergence in each zone --*/
@@ -3553,7 +3636,7 @@ void CFluidDriver::Transfer_Data(unsigned short donorZone, unsigned short target
 void CFluidDriver::Update() {
 
   for(iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Update(output, integration_container, geometry_container,
+    iteration_container[iZone]->Update(output[iZone], integration_container, geometry_container,
          solver_container, numerics_container, config_container,
          surface_movement, grid_movement, FFDBox, iZone);
 }
@@ -3589,7 +3672,7 @@ void CTurbomachineryDriver::Run() {
    and other intermediate procedures may be required. ---*/
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container,
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container,
                                            solver_container, numerics_container, config_container,
                                            surface_movement, grid_movement, FFDBox, iZone);
   }
@@ -3600,13 +3683,13 @@ void CTurbomachineryDriver::Run() {
   }
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    iteration_container[iZone]->Iterate(output, integration_container, geometry_container,
+    iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container,
                                         solver_container, numerics_container, config_container,
                                         surface_movement, grid_movement, FFDBox, iZone);
   }
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    iteration_container[iZone]->Postprocess(output, integration_container, geometry_container,
+    iteration_container[iZone]->Postprocess(output[iZone], integration_container, geometry_container,
                                       solver_container, numerics_container, config_container,
                                       surface_movement, grid_movement, FFDBox, iZone);
   }
@@ -3646,7 +3729,7 @@ void CTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone){
 
   /* --- compute turboperformance for each stage and the global machine ---*/
 
-  output->ComputeTurboPerformance(solver_container[targetZone][MESH_0][FLOW_SOL], geometry_container[targetZone][MESH_0], config_container[targetZone]);
+  output[ZONE_0]->ComputeTurboPerformance(solver_container[targetZone][MESH_0][FLOW_SOL], geometry_container[targetZone][MESH_0], config_container[targetZone]);
 
 }
 
@@ -3684,7 +3767,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
   /*--- Update the convergence history file (serial and parallel computations). ---*/
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    output->SetConvHistory_Body(&ConvHist_file[iZone], geometry_container, solver_container,
+    output[iZone]->SetConvHistory_Body(&ConvHist_file[iZone], geometry_container, solver_container,
         config_container, integration_container, false, UsedTime, iZone);
   }
 
@@ -3694,7 +3777,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
     if(mixingplane){
       CFL = 0;
       for (iZone = 0; iZone < nZone; iZone++){
-        output->SetCFL_Number(solver_container, config_container, iZone);
+        output[iZone]->SetCFL_Number(solver_container, config_container, iZone);
         CFL += config_container[iZone]->GetCFL(MESH_0);
       }
       /*--- For fluid-multizone the new CFL number is the same for all the zones and it is equal to the zones' minimum value. ---*/
@@ -3703,7 +3786,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
       }
     }
     else{
-      output->SetCFL_Number(solver_container, config_container, ZONE_0);
+      output[ZONE_0]->SetCFL_Number(solver_container, config_container, ZONE_0);
     }
   }
 
@@ -3848,7 +3931,7 @@ void CDiscAdjFluidDriver::Run() {
 
   for (iZone = 0; iZone < nZone; iZone++) {
 
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container,
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container,
                                                      solver_container, numerics_container, config_container,
                                                      surface_movement, grid_movement, FFDBox, iZone);
   }
@@ -3896,7 +3979,7 @@ void CDiscAdjFluidDriver::Run() {
     /*--- Extract the computed adjoint values of the input variables and store them for the next iteration. ---*/
 
     for (iZone = 0; iZone < nZone; iZone++) {
-      iteration_container[iZone]->Iterate(output, integration_container, geometry_container,
+      iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container,
                                           solver_container, numerics_container, config_container,
                                           surface_movement, grid_movement, FFDBox, iZone);
     }
@@ -3918,7 +4001,7 @@ void CDiscAdjFluidDriver::Run() {
     /*--- Write the convergence history (only screen output) ---*/
 
     if (unsteady)
-      output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0);
+      output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0);
 
   }
 
@@ -4023,7 +4106,7 @@ void CDiscAdjFluidDriver::SetRecording(unsigned short kind_recording){
   RecordingState = kind_recording;
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    iteration_container[iZone]->RegisterOutput(solver_container, geometry_container, config_container, output, iZone);
+    iteration_container[iZone]->RegisterOutput(solver_container, geometry_container, config_container, output[iZone], iZone);
   }
 
   /*--- Extract the objective function and store it --- */
@@ -4074,16 +4157,16 @@ void CDiscAdjFluidDriver::SetObjFunction(){
       case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
         
         if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
-          output->SpecialOutput_AnalyzeSurface(solver_container[iZone][MESH_0][FLOW_SOL], geometry_container[iZone][MESH_0], config_container[iZone], false);
+          output[iZone]->SpecialOutput_AnalyzeSurface(solver_container[iZone][MESH_0][FLOW_SOL], geometry_container[iZone][MESH_0], config_container[iZone], false);
         
         if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
-          output->SpecialOutput_Distortion(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
+          output[iZone]->SpecialOutput_Distortion(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
         
         if (config_container[ZONE_0]->GetnMarker_NearFieldBound() != 0)
-          output->SpecialOutput_SonicBoom(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
+          output[iZone]->SpecialOutput_SonicBoom(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
           
         if (config_container[ZONE_0]->GetPlot_Section_Forces())
-          output->SpecialOutput_SpanLoad(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
+          output[iZone]->SpecialOutput_SpanLoad(solver_container[ZONE_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][MESH_0], config_container[ZONE_0], false);
         
         break;
     }
@@ -4117,7 +4200,7 @@ void CDiscAdjFluidDriver::DirectRun(){
   /*--- Zone preprocessing ---*/
 
   for (iZone = 0; iZone < nZone; iZone++)
-    direct_iteration[iZone]->Preprocess(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+    direct_iteration[iZone]->Preprocess(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
 
   /*--- Updating zone interface communication patterns,
    needed only for unsteady simulation since for steady problems
@@ -4144,7 +4227,7 @@ void CDiscAdjFluidDriver::DirectRun(){
 
   for (iZone = 0; iZone < nZone; iZone++) {
     config_container[iZone]->SetIntIter(1);
-    direct_iteration[iZone]->Iterate(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+    direct_iteration[iZone]->Iterate(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
   }
 
 }
@@ -4167,7 +4250,7 @@ void CDiscAdjTurbomachineryDriver::DirectRun(){
 
   for (iZone = 0; iZone < nZone; iZone++) {
 
-    direct_iteration[iZone]->Preprocess(output, integration_container, geometry_container,
+    direct_iteration[iZone]->Preprocess(output[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, iZone);
 
@@ -4180,13 +4263,13 @@ void CDiscAdjTurbomachineryDriver::DirectRun(){
   }
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    direct_iteration[iZone]->Iterate(output, integration_container, geometry_container,
+    direct_iteration[iZone]->Iterate(output[iZone], integration_container, geometry_container,
                                      solver_container, numerics_container, config_container,
                                      surface_movement, grid_movement, FFDBox, iZone);
   }
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    direct_iteration[iZone]->Postprocess(output, integration_container, geometry_container,
+    direct_iteration[iZone]->Postprocess(output[iZone], integration_container, geometry_container,
                                       solver_container, numerics_container, config_container,
                                       surface_movement, grid_movement, FFDBox, iZone);
   }
@@ -4204,13 +4287,13 @@ void CDiscAdjTurbomachineryDriver::SetObjFunction(){
 
   switch (config_container[ZONE_0]->GetKind_ObjFunc()){
   case ENTROPY_GENERATION:
-    solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output->GetEntropyGen(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+    solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetEntropyGen(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
     break;
   case FLOW_ANGLE_OUT:
-      solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output->GetFlowAngleOut(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+      solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetFlowAngleOut(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
       break;
   case MASS_FLOW_IN:
-    solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output->GetMassFlowIn(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+    solver_container[ZONE_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetMassFlowIn(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
     break;
   default:
     break;
@@ -4252,7 +4335,7 @@ void CDiscAdjTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone
 
   /* --- compute turboperformance for each stage and the global machine ---*/
 
-  output->ComputeTurboPerformance(solver_container[targetZone][MESH_0][FLOW_SOL], geometry_container[targetZone][MESH_0], config_container[targetZone]);
+  output[ZONE_0]->ComputeTurboPerformance(solver_container[targetZone][MESH_0][FLOW_SOL], geometry_container[targetZone][MESH_0], config_container[targetZone]);
 
 }
 
@@ -4289,12 +4372,12 @@ void CHBDriver::Run() {
    all zones before beginning the iteration. ---*/
 
   for (iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container,
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, iZone);
 
   for (iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Iterate(output, integration_container, geometry_container,
+    iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, iZone);
 
@@ -4317,7 +4400,7 @@ void CHBDriver::Update() {
   for (iZone = 0; iZone < nZone; iZone++) {
 
     /*--- Update the harmonic balance terms across all zones ---*/
-    iteration_container[iZone]->Update(output, integration_container, geometry_container,
+    iteration_container[iZone]->Update(output[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, iZone);
 
@@ -4944,7 +5027,7 @@ void CFSIDriver::Run() {
     /*-------------------- Fluid subiteration -------------------------*/
     /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_FLOW]->Preprocess(output, integration_container, geometry_container,
+  iteration_container[ZONE_FLOW]->Preprocess(output[ZONE_FLOW], integration_container, geometry_container,
       solver_container, numerics_container, config_container,
       surface_movement, grid_movement, FFDBox, ZONE_FLOW);
 
@@ -4960,13 +5043,13 @@ void CFSIDriver::Run() {
       /*--- Set ExtIter to iExtIter_FLOW; this is a trick to loop on the steady-state flow solver ---*/
       config_container[ZONE_FLOW]->SetExtIter(IntIter);
 
-      iteration_container[ZONE_FLOW]->Iterate(output, integration_container, geometry_container,
+      iteration_container[ZONE_FLOW]->Iterate(output[ZONE_FLOW], integration_container, geometry_container,
           solver_container, numerics_container, config_container,
           surface_movement, grid_movement, FFDBox, ZONE_FLOW);
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-      output->SetConvHistory_Body(&ConvHist_file[ZONE_0], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW);
+      output[ZONE_FLOW]->SetConvHistory_Body(&ConvHist_file[ZONE_FLOW], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW);
 
       /*--- If the convergence criteria is met for the flow, break the loop ---*/
       StopCalc_Flow = integration_container[ZONE_FLOW][FLOW_SOL]->GetConvergence();
@@ -4985,7 +5068,7 @@ void CFSIDriver::Run() {
 
       config_container[ZONE_FLOW]->SetIntIter(IntIter);
 
-      iteration_container[ZONE_FLOW]->Iterate(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_FLOW);
+      iteration_container[ZONE_FLOW]->Iterate(output[ZONE_FLOW], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_FLOW);
 
       /*--- If convergence was reached in every zone --*/
 
@@ -4994,7 +5077,7 @@ void CFSIDriver::Run() {
 
     /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-     output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW);
+     output[ZONE_FLOW]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW);
 
   } else {
 
@@ -5016,13 +5099,13 @@ void CFSIDriver::Run() {
     /*------------------ Structural subiteration ----------------------*/
     /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_STRUCT]->Iterate(output, integration_container, geometry_container,
+  iteration_container[ZONE_STRUCT]->Iterate(output[ZONE_STRUCT], integration_container, geometry_container,
                                   solver_container, numerics_container, config_container,
                                   surface_movement, grid_movement, FFDBox, ZONE_STRUCT);
 
     /*--- Write the convergence history for the structure (only screen output) ---*/
 
-    output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT);
+    output[ZONE_STRUCT]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT);
 
     /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
 
@@ -5044,7 +5127,7 @@ void CFSIDriver::Run() {
     /*-------------------- Output FSI history -------------------------*/
     /*-----------------------------------------------------------------*/
 
-    output->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
+    output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
                               config_container, integration_container, 0,
                               ZONE_FLOW, ZONE_STRUCT, false);
 
@@ -5068,7 +5151,7 @@ void CFSIDriver::Run() {
   /*-------------------- Update fluid solver ------------------------*/
   /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_FLOW]->Update(output, integration_container, geometry_container,
+  iteration_container[ZONE_FLOW]->Update(output[ZONE_FLOW], integration_container, geometry_container,
                        solver_container, numerics_container, config_container,
                        surface_movement, grid_movement, FFDBox, ZONE_FLOW);
 
@@ -5076,7 +5159,7 @@ void CFSIDriver::Run() {
   /*----------------- Update structural solver ----------------------*/
   /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_STRUCT]->Update(output, integration_container, geometry_container,
+  iteration_container[ZONE_STRUCT]->Update(output[ZONE_STRUCT], integration_container, geometry_container,
                          solver_container, numerics_container, config_container,
                          surface_movement, grid_movement, FFDBox, ZONE_STRUCT);
 
@@ -6026,7 +6109,7 @@ void CDiscAdjFSIDriver::Fluid_Iteration_Direct(unsigned short ZONE_FLOW, unsigne
 
   config_container[ZONE_FLOW]->SetIntIter(0);
 
-  direct_iteration[ZONE_FLOW]->Iterate(output, integration_container, geometry_container,
+  direct_iteration[ZONE_FLOW]->Iterate(output[iZone], integration_container, geometry_container,
       solver_container, numerics_container, config_container,
       surface_movement, grid_movement, FFDBox, ZONE_FLOW);
 
@@ -6063,7 +6146,7 @@ void CDiscAdjFSIDriver::Structural_Iteration_Direct(unsigned short ZONE_FLOW, un
   /*--------------- Iterate the structural solver -------------------*/
   /*-----------------------------------------------------------------*/
 
-  direct_iteration[ZONE_STRUCT]->Iterate(output, integration_container, geometry_container,
+  direct_iteration[ZONE_STRUCT]->Iterate(output[iZone], integration_container, geometry_container,
                                         solver_container, numerics_container, config_container,
                                         surface_movement, grid_movement, FFDBox, ZONE_STRUCT);
 
@@ -6673,7 +6756,7 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
 
   ofstream ConvHist_file;
   if (rank == MASTER_NODE)
-    output->SetConvHistory_Header(&ConvHist_file, config_container[ZONE_0], ZONE_0);
+    output[ZONE_0]->SetConvHistory_Header(&ConvHist_file, config_container[ZONE_0], ZONE_0);
 
 
   if (kind_recording == FLOW_CONS_VARS) {
@@ -6701,7 +6784,7 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   if (kind_recording == FEA_DISP_VARS) {
 
     /*--- Set the convergence criteria (only residual possible) ---*/
-    output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT);
+    output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT);
 
   }
 
@@ -7107,7 +7190,7 @@ void CMultiphysicsZonalDriver::Run() {
   /*--- Zone preprocessing ---*/
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    iteration_container[iZone]->Preprocess(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+    iteration_container[iZone]->Preprocess(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
     config_container[iZone]->SetDelta_UnstTimeND(config_container[ZONE_0]->GetDelta_UnstTimeND());
   }
 
@@ -7139,7 +7222,7 @@ void CMultiphysicsZonalDriver::Run() {
 
       // When running a unsteady simulation, we have to adapt CFL values here.
       if (unsteady && (config_container[ZONE_0]->GetCFL_Adapt() == YES)) {
-          output->SetCFL_Number(solver_container, config_container, iZone);
+          output[iZone]->SetCFL_Number(solver_container, config_container, iZone);
       }
 
       config_container[iZone]->SetIntIter(IntIter);
@@ -7148,7 +7231,7 @@ void CMultiphysicsZonalDriver::Run() {
         if(jZone != iZone && transfer_container[jZone][iZone] != NULL)
           Transfer_Data(jZone, iZone);
 
-      iteration_container[iZone]->Iterate(output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
+      iteration_container[iZone]->Iterate(output[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone);
     }
 
     /*--- Check convergence in each zone --*/
@@ -7179,7 +7262,7 @@ void CMultiphysicsZonalDriver::Run() {
 void CMultiphysicsZonalDriver::Update() {
 
   for(iZone = 0; iZone < nZone; iZone++)
-    iteration_container[iZone]->Update(output, integration_container, geometry_container,
+    iteration_container[iZone]->Update(output[iZone], integration_container, geometry_container,
          solver_container, numerics_container, config_container,
          surface_movement, grid_movement, FFDBox, iZone);
 }
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
new file mode 100644
index 000000000000..bbb0bf2e2ea7
--- /dev/null
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -0,0 +1,358 @@
+/*!
+ * \file output_direct_elasticity.cpp
+ * \brief Main subroutines for output solver information
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CFEAOutput::CFEAOutput(CConfig *config) : COutput(config) {
+
+}
+
+CFEAOutput::~CFEAOutput(void) {
+
+}
+
+void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Write file name with extension ---*/
+  string filename = config->GetConv_FileName();
+  if(config->GetnZone() > 1){
+    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
+  }
+  strcpy (cstr, filename.data());
+
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
+    long iExtIter = config->GetUnst_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(cstr, buffer);
+  }
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(cstr, buffer);
+
+  ConvHist_file->open(cstr, ios::out);
+  ConvHist_file->precision(15);
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+
+  /*--- Header for the residuals ---*/
+
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+
+  /*--- End of the header ---*/
+
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
+    ConvHist_file[0] << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  ConvHist_file[0] << begin << fem_coeff;
+  if (incload) ConvHist_file[0] << fem_incload;
+  ConvHist_file[0] << fem_resid << endfea;
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                  CGeometry ***geometry,
+                                  CSolver ****solver_container,
+                                  CConfig **config,
+                                  CIntegration ***integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone) {
+
+
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][MESH_0]->GetnDim();
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CFEM = 0.0;
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_FEM = 0;
+    if (linear_analysis) nVar_FEM = nDim;
+    if (nonlinear_analysis) nVar_FEM = 3;
+
+
+    /*--- Allocate memory for the residual ---*/
+    residual_fem        = new su2double[nVar_FEM];
+
+    /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+    Total_VMStress = solver_container[val_iZone][MESH_0][FEA_SOL]->GetTotal_CFEA();
+
+    Total_ForceCoeff = solver_container[val_iZone][MESH_0][FEA_SOL]->GetForceCoeff();
+
+    Total_IncLoad = solver_container[val_iZone][MESH_0][FEA_SOL]->GetLoad_Increment();
+
+    LinSolvIter = (unsigned long) solver_container[val_iZone][MESH_0][FEA_SOL]->GetIterLinSolver();
+
+    /*--- Residuals: ---*/
+    /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+    /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+    if (linear_analysis) {
+      for (iVar = 0; iVar < nVar_FEM; iVar++) {
+        residual_fem[iVar] = solver_container[val_iZone][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
+      }
+    }
+    else if (nonlinear_analysis) {
+      for (iVar = 0; iVar < nVar_FEM; iVar++) {
+        residual_fem[iVar] = solver_container[val_iZone][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
+      }
+    }
+
+    /*--- Header frequency ---*/
+
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3))){
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+        else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+        /*--- FEM residual ---*/
+        if (nDim == 2) {
+          if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+          if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+        }
+        else {
+          SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+        }
+        SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+      }
+        /*--- Write the screen header---*/
+      if (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis))) {
+
+        if (dynamic) {
+          cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+        }
+
+        if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+        else cout << endl << " IntIter" << " ExtIter";
+
+        if (linear_analysis) {
+          if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+          if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+        }
+        else if (nonlinear_analysis) {
+          switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+          case RESFEM_RELATIVE:
+            cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+            break;
+          case RESFEM_ABSOLUTE:
+            cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+            break;
+          default:
+            cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+            break;
+          }
+        }
+
+      }
+
+      /*--- Write the solution on the screen and history file ---*/
+
+
+      if (!nonlinear_analysis) {
+        cout.width(5); cout << iExtIter;
+        cout.width(11); cout << timeiter;
+
+      } else {
+        cout.width(8); cout << iIntIter;
+        cout.width(8); cout << iExtIter;
+      }
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin_fem << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_fea;
+    delete [] residual_fem;
+
+
+  }
+}
+
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index e38a016fbbae..d74f99508cae 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -12086,291 +12086,289 @@ void COutput::SetResult_Files_Parallel(CSolver ****solver_container,
                                        CGeometry ***geometry,
                                        CConfig **config,
                                        unsigned long iExtIter,
+                                       unsigned short iZone,
                                        unsigned short val_nZone) {
   
-  unsigned short iZone, iVar;
+  unsigned short iVar;
   unsigned long iPoint;
   bool compressible = true;
 
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-    bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
+  bool cont_adj = config[iZone]->GetContinuous_Adjoint();
+  bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
 
-    /*--- Flags identifying the types of files to be written. ---*/
-    /*--- For now, we are disabling the parallel writers for Tecplot
+  /*--- Flags identifying the types of files to be written. ---*/
+  /*--- For now, we are disabling the parallel writers for Tecplot
           ASCII until we have parallel versions of all file formats
           available. SU2_SOL will remain intact for writing files
           until this capability is completed. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+
+  bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+  bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
 
 #ifdef HAVE_MPI
-    /*--- Do not merge the connectivity or write the visualization files
+  /*--- Do not merge the connectivity or write the visualization files
      if we are running in parallel. Force the use of SU2_SOL to merge and
      write the viz. files in this case to save overhead. ---*/
 
-    if (size > SINGLE_NODE) {
-      Wrt_Vol = false;
-      Wrt_Srf = false;
-    }
+  if (size > SINGLE_NODE) {
+    Wrt_Vol = false;
+    Wrt_Srf = false;
+  }
 #endif
 
-    /*--- Check for compressible/incompressible flow problems. ---*/
+  /*--- Check for compressible/incompressible flow problems. ---*/
 
-    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
+  compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
 
-    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-    
-    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES : case RANS :
-        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][MESH_0],
-                                        solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][MESH_0],
-                                           solver_container[iZone][MESH_0][ADJFLOW_SOL],
-                                           solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone);
-        break;
-      default: break;
-    }
-    
-    /*--- This switch statement will become a call to a virtual function
+  /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+
+  if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+
+  switch (config[iZone]->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES : case RANS :
+    if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][MESH_0],
+        solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone);
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+  case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+    if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][MESH_0],
+        solver_container[iZone][MESH_0][ADJFLOW_SOL],
+        solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone);
+    break;
+  default: break;
+  }
+
+  /*--- This switch statement will become a call to a virtual function
      defined within each of the "physics" output child classes that loads
      the local data for that particular problem alone. ---*/
-    
+
+  if (rank == MASTER_NODE)
+    cout << "Loading solution output data locally on each rank." << endl;
+
+  switch (config[iZone]->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES: case RANS :
+    if (compressible)
+      LoadLocalData_Flow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+    else
+      LoadLocalData_IncFlow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+  case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+    LoadLocalData_AdjFlow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+    break;
+  case FEM_ELASTICITY: case DISC_ADJ_FEM:
+    LoadLocalData_Elasticity(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+    break;
+  case POISSON_EQUATION: case WAVE_EQUATION: case HEAT_EQUATION: case HEAT_EQUATION_FVM:
+    LoadLocalData_Base(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+    break;
+  default: break;
+  }
+
+  /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+
+  if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+      (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+
     if (rank == MASTER_NODE)
-      cout << "Loading solution output data locally on each rank." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES: case RANS :
-        if (compressible)
-          LoadLocalData_Flow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-        else
-          LoadLocalData_IncFlow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-        break;
-      case FEM_ELASTICITY: case DISC_ADJ_FEM:
-        LoadLocalData_Elasticity(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-        break;
-      case POISSON_EQUATION: case WAVE_EQUATION: case HEAT_EQUATION: case HEAT_EQUATION_FVM:
-        LoadLocalData_Base(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-        break;
-      default: break;
-    }
-    
-    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+      cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
 
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+    Local_Data_Copy = new su2double*[geometry[iZone][MESH_0]->GetnPoint()];
+    for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
+      Local_Data_Copy[iPoint] = new su2double[nVar_Par];
+    }
 
-      if (rank == MASTER_NODE)
-        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      Local_Data_Copy = new su2double*[geometry[iZone][MESH_0]->GetnPoint()];
-      for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
-          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
-        }
+    for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
+      for (iVar = 0; iVar < nVar_Par; iVar++) {
+        Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
       }
-      
     }
-    
-    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
 
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+  }
 
-      if (rank == MASTER_NODE)
-        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
-          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
-        }
+  /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
+
+  if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+      (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+
+    if (rank == MASTER_NODE)
+      cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+
+    for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++) {
+      for (iVar = 0; iVar < nVar_Par; iVar++) {
+        Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
       }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++)
-        delete [] Local_Data_Copy[iPoint];
-      delete [] Local_Data_Copy;
-      
     }
-    
-    /*--- After loading the data local to a processor, we perform a sorting,
+
+    for (iPoint = 0; iPoint < geometry[iZone][MESH_0]->GetnPoint(); iPoint++)
+      delete [] Local_Data_Copy[iPoint];
+    delete [] Local_Data_Copy;
+
+  }
+
+  /*--- After loading the data local to a processor, we perform a sorting,
      i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-    SortOutputData(config[iZone], geometry[iZone][MESH_0]);
-    
-    /*--- Write either a binary or ASCII restart file in parallel. ---*/
 
-    if (config[iZone]->GetWrt_Binary_Restart()) {
-      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-    } else {
-      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
-    }
+  if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
+  SortOutputData(config[iZone], geometry[iZone][MESH_0]);
 
-    /*--- Write a slice on a structured mesh if requested. ---*/
+  /*--- Write either a binary or ASCII restart file in parallel. ---*/
 
-    if (config[iZone]->GetWrt_Slice()) {
-      WriteCSV_Slice(config[iZone], geometry[iZone][MESH_0],
-                     solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-      WriteCSV_Slice(config[iZone], geometry[iZone][MESH_0],
-                     solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-    }
+  if (config[iZone]->GetWrt_Binary_Restart()) {
+    if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
+    WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+  } else {
+    if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
+    WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+  }
 
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
-    /*--- Write the solution files if they are requested and we are executing
+  /*--- Write a slice on a structured mesh if requested. ---*/
+
+  if (config[iZone]->GetWrt_Slice()) {
+    WriteCSV_Slice(config[iZone], geometry[iZone][MESH_0],
+        solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
+    WriteCSV_Slice(config[iZone], geometry[iZone][MESH_0],
+        solver_container[iZone][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
+  }
+
+  /*--- Get the file output format ---*/
+
+  unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+
+  /*--- Write the solution files if they are requested and we are executing
      with a single rank (all data on one proc and no comm. overhead). Once we
      have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
      can allow the write of the viz. files as well. ---*/
 
-    if ((size == SINGLE_NODE) && (rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-      
-      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
+  if ((size == SINGLE_NODE) && (rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
 
-      if (rank == MASTER_NODE)
-        cout << "Preparing element connectivity across all ranks." << endl;
-      SortConnectivity(config[iZone], geometry[iZone][MESH_0], iZone);
+    /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
 
-      /*--- Sort the surface data and renumber if for writing. ---*/
+    if (rank == MASTER_NODE)
+      cout << "Preparing element connectivity across all ranks." << endl;
+    SortConnectivity(config[iZone], geometry[iZone][MESH_0], iZone);
 
-      SortOutputData_Surface(config[iZone], geometry[iZone][MESH_0]);
+    /*--- Sort the surface data and renumber if for writing. ---*/
 
-      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
+    SortOutputData_Surface(config[iZone], geometry[iZone][MESH_0]);
 
-      if (Wrt_Vol) {
+    /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
 
-        switch (FileFormat) {
+    if (Wrt_Vol) {
 
-          case TECPLOT:
+      switch (FileFormat) {
 
-            /*--- Write a Tecplot ASCII file ---*/
+      case TECPLOT:
 
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                     solver_container[iZone][MESH_0], iZone, val_nZone, false);
-            break;
+        /*--- Write a Tecplot ASCII file ---*/
 
-          case FIELDVIEW:
+        if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+        WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, false);
+        break;
 
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
+      case FIELDVIEW:
 
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+        /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
 
-            break;
+        if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+        if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
 
-          case TECPLOT_BINARY:
+        break;
 
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+      case TECPLOT_BINARY:
 
-            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                     solver_container[iZone][MESH_0], iZone, val_nZone, false);
-            break;
+        /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
 
-          case FIELDVIEW_BINARY:
+        if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
+        if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+        if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
+        WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, false);
+        break;
 
-            /*--- FieldView binary files not yet available for parallel output. ---*/
+      case FIELDVIEW_BINARY:
 
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
+        /*--- FieldView binary files not yet available for parallel output. ---*/
 
-          case PARAVIEW:
+        if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+        if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+        break;
 
-            /*--- Write a Paraview ASCII file ---*/
+      case PARAVIEW:
 
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                     solver_container[iZone][MESH_0], iZone, val_nZone, false);
-            break;
+        /*--- Write a Paraview ASCII file ---*/
 
-          default:
-            break;
-        }
+        if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+        WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, false);
+        break;
 
+      default:
+        break;
       }
 
-      if (Wrt_Srf) {
+    }
 
-        switch (FileFormat) {
+    if (Wrt_Srf) {
 
-          case TECPLOT:
+      switch (FileFormat) {
 
-            /*--- Write a Tecplot ASCII file ---*/
+      case TECPLOT:
 
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                       solver_container[iZone][MESH_0], iZone, val_nZone, true);
-            break;
+        /*--- Write a Tecplot ASCII file ---*/
 
-          case TECPLOT_BINARY:
+        if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
+        WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, true);
+        break;
 
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+      case TECPLOT_BINARY:
 
-            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                       solver_container[iZone][MESH_0], iZone, val_nZone, true);
-            break;
+        /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
 
-          case PARAVIEW:
+        if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
+        if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+        if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
+        WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, true);
+        break;
 
-            /*--- Write a Paraview ASCII file ---*/
+      case PARAVIEW:
 
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
-                                        solver_container[iZone][MESH_0], iZone, val_nZone, true);
-            break;
-            
-          default:
-            break;
-        }
-        
+        /*--- Write a Paraview ASCII file ---*/
+
+        if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+        WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][MESH_0],
+            solver_container[iZone][MESH_0], iZone, val_nZone, true);
+        break;
+
+      default:
+        break;
       }
 
-      /*--- Clean up the connectivity data that was allocated for output. ---*/
+    }
 
-      DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][MESH_0], false);
-      DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][MESH_0], true);
+    /*--- Clean up the connectivity data that was allocated for output. ---*/
 
-      /*--- Clean up the surface data that was only needed for output. ---*/
+    DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][MESH_0], false);
+    DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][MESH_0], true);
 
-      DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][MESH_0]);
-      
-    }
-    
-    /*--- Deallocate the nodal data needed for writing restarts. ---*/
-    
-    DeallocateData_Parallel(config[iZone], geometry[iZone][MESH_0]);
-    
-    /*--- Clear the variable names list. ---*/
-    
-    Variable_Names.clear();
+    /*--- Clean up the surface data that was only needed for output. ---*/
+
+    DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][MESH_0]);
 
   }
+
+  /*--- Deallocate the nodal data needed for writing restarts. ---*/
+
+  DeallocateData_Parallel(config[iZone], geometry[iZone][MESH_0]);
+
+  /*--- Clear the variable names list. ---*/
+
+  Variable_Names.clear();
+
 }
 
 void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
diff --git a/SU2_DEF/obj/Makefile.in b/SU2_DEF/obj/Makefile.in
index ca97a3a9aeb1..fe967c7f5609 100644
--- a/SU2_DEF/obj/Makefile.in
+++ b/SU2_DEF/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -54,23 +54,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,8 +130,6 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ../bin/SU2_DEF$(EXEEXT)
 subdir = SU2_DEF/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -101,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -172,8 +209,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -372,7 +427,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_DEF/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_DEF/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -399,10 +453,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -423,7 +478,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -441,6 +497,7 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_DEF$(EXEEXT): $(___bin_SU2_DEF_OBJECTS) $(___bin_SU2_DEF_DEPENDENCIES) $(EXTRA____bin_SU2_DEF_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_DEF$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_DEF_LINK) $(___bin_SU2_DEF_OBJECTS) $(___bin_SU2_DEF_LDADD) $(LIBS)
@@ -484,26 +541,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DEF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DEF-SU2_DEF.obj `if test -f '../src/SU2_DEF.cpp'; then $(CYGPATH_W) '../src/SU2_DEF.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_DEF.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -515,15 +561,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -532,9 +574,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -691,18 +734,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic cscopelist ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 # endif
 
diff --git a/SU2_DOT/obj/Makefile.in b/SU2_DOT/obj/Makefile.in
index 836ba9248987..aa1d3d134fe7 100644
--- a/SU2_DOT/obj/Makefile.in
+++ b/SU2_DOT/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -54,23 +54,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -116,8 +154,6 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 @BUILD_REVERSE_TRUE@   ../../Common/lib/libSU2_AD.a
 
 subdir = SU2_DOT/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -125,6 +161,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -205,8 +242,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -402,7 +457,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_DOT/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_DOT/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -429,10 +483,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -453,7 +508,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -471,11 +527,13 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_DOT$(EXEEXT): $(___bin_SU2_DOT_OBJECTS) $(___bin_SU2_DOT_DEPENDENCIES) $(EXTRA____bin_SU2_DOT_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_DOT$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_DOT_LINK) $(___bin_SU2_DOT_OBJECTS) $(___bin_SU2_DOT_LDADD) $(LIBS)
 ../src/___bin_SU2_DOT_AD-SU2_DOT.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+
 ../bin/SU2_DOT_AD$(EXEEXT): $(___bin_SU2_DOT_AD_OBJECTS) $(___bin_SU2_DOT_AD_DEPENDENCIES) $(EXTRA____bin_SU2_DOT_AD_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_DOT_AD$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_DOT_AD_LINK) $(___bin_SU2_DOT_AD_OBJECTS) $(___bin_SU2_DOT_AD_LDADD) $(LIBS)
@@ -534,26 +592,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DOT_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DOT_AD-SU2_DOT.obj `if test -f '../src/SU2_DOT.cpp'; then $(CYGPATH_W) '../src/SU2_DOT.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_DOT.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -565,15 +612,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -582,9 +625,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -741,18 +785,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic cscopelist ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/SU2_GEO/obj/Makefile.in b/SU2_GEO/obj/Makefile.in
index 9dcbab507284..45017797a124 100644
--- a/SU2_GEO/obj/Makefile.in
+++ b/SU2_GEO/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -54,23 +54,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,8 +130,6 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ../bin/SU2_GEO$(EXEEXT)
 subdir = SU2_GEO/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -101,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -164,8 +201,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -356,7 +411,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_GEO/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_GEO/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -383,10 +437,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -407,7 +462,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -425,6 +481,7 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_GEO$(EXEEXT): $(___bin_SU2_GEO_OBJECTS) $(___bin_SU2_GEO_DEPENDENCIES) $(EXTRA____bin_SU2_GEO_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_GEO$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_GEO_LINK) $(___bin_SU2_GEO_OBJECTS) $(___bin_SU2_GEO_LDADD) $(LIBS)
@@ -468,26 +525,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GEO_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_GEO-SU2_GEO.obj `if test -f '../src/SU2_GEO.cpp'; then $(CYGPATH_W) '../src/SU2_GEO.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_GEO.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -499,15 +545,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -516,9 +558,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -675,18 +718,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic cscopelist ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 # endif
 
diff --git a/SU2_MSH/obj/Makefile.in b/SU2_MSH/obj/Makefile.in
index 03bd187619dc..36c286acf181 100644
--- a/SU2_MSH/obj/Makefile.in
+++ b/SU2_MSH/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -54,23 +54,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,8 +130,6 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ../bin/SU2_MSH$(EXEEXT)
 subdir = SU2_MSH/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -101,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -164,8 +201,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -356,7 +411,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_MSH/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_MSH/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -383,10 +437,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -407,7 +462,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -425,6 +481,7 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_MSH$(EXEEXT): $(___bin_SU2_MSH_OBJECTS) $(___bin_SU2_MSH_DEPENDENCIES) $(EXTRA____bin_SU2_MSH_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_MSH$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_MSH_LINK) $(___bin_SU2_MSH_OBJECTS) $(___bin_SU2_MSH_LDADD) $(LIBS)
@@ -468,26 +525,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MSH_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_MSH-SU2_MSH.obj `if test -f '../src/SU2_MSH.cpp'; then $(CYGPATH_W) '../src/SU2_MSH.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_MSH.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -499,15 +545,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -516,9 +558,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -675,18 +718,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic cscopelist ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 # endif
 
diff --git a/SU2_PY/Makefile.in b/SU2_PY/Makefile.in
index 20a0602619ed..dbb36cc232ac 100644
--- a/SU2_PY/Makefile.in
+++ b/SU2_PY/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -55,23 +55,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,8 +130,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = SU2_PY
-DIST_COMMON = $(nobase_dist_mypkg_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -101,6 +137,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_mypkg_DATA) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -153,6 +191,8 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(nobase_dist_mypkg_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -385,7 +425,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_PY/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_PY/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -462,11 +501,9 @@ uninstall-nobase_dist_mypkgDATA:
 	@list='$(nobase_dist_mypkg_DATA)'; test -n "$(mypkgdir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(mypkgdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -606,18 +643,21 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nobase_dist_mypkgDATA
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binSCRIPTS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-nobase_dist_mypkgDATA \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binSCRIPTS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-nobase_dist_mypkgDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
 	uninstall-binSCRIPTS uninstall-nobase_dist_mypkgDATA
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/SU2_PY/pySU2/Makefile.in b/SU2_PY/pySU2/Makefile.in
index c1cce6c3604e..d172a10dd37e 100644
--- a/SU2_PY/pySU2/Makefile.in
+++ b/SU2_PY/pySU2/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -53,23 +53,61 @@
 #
 ################################################################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -91,7 +129,6 @@ host_triplet = @host@
 target_triplet = @target@
 @BUILD_TECIO_TRUE@am__append_1 = ${abs_top_builddir}/externals/tecio/libtecio.a
 subdir = SU2_PY/pySU2
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -99,6 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -121,6 +159,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -323,7 +363,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_PY/pySU2/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_PY/pySU2/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -341,11 +380,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
@@ -479,15 +516,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 all:	
diff --git a/SU2_SOL/obj/Makefile.in b/SU2_SOL/obj/Makefile.in
index 63762fb46ce5..03bdea5cec4a 100644
--- a/SU2_SOL/obj/Makefile.in
+++ b/SU2_SOL/obj/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -54,23 +54,61 @@
 ################################################################################
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,8 +130,6 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ../bin/SU2_SOL$(EXEEXT)
 subdir = SU2_SOL/obj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -101,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -173,8 +210,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -373,7 +428,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_SOL/obj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign SU2_SOL/obj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -400,10 +454,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -424,7 +479,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -442,6 +498,7 @@ clean-binPROGRAMS:
 ../bin/$(am__dirstamp):
 	@$(MKDIR_P) ../bin
 	@: > ../bin/$(am__dirstamp)
+
 ../bin/SU2_SOL$(EXEEXT): $(___bin_SU2_SOL_OBJECTS) $(___bin_SU2_SOL_DEPENDENCIES) $(EXTRA____bin_SU2_SOL_DEPENDENCIES) ../bin/$(am__dirstamp)
 	@rm -f ../bin/SU2_SOL$(EXEEXT)
 	$(AM_V_CXXLD)$(___bin_SU2_SOL_LINK) $(___bin_SU2_SOL_OBJECTS) $(___bin_SU2_SOL_LDADD) $(LIBS)
@@ -485,26 +542,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_SOL_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_SOL-SU2_SOL.obj `if test -f '../src/SU2_SOL.cpp'; then $(CYGPATH_W) '../src/SU2_SOL.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_SOL.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -516,15 +562,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -533,9 +575,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -692,18 +735,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic cscopelist ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 # endif
 
diff --git a/aclocal.m4 b/aclocal.m4
index c43757b3507a..a2ba8880d3b0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
@@ -19,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.12'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.5], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.5])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -102,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -343,7 +343,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -372,7 +372,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -408,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -417,6 +417,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -429,7 +435,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -459,8 +465,7 @@ AC_SUBST([CYGPATH_W])
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
 [AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+             [$0: two- and three-arguments forms are deprecated.])
 m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
@@ -493,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -514,21 +519,63 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 		  [_AM_DEPENDENCIES([OBJC])],
 		  [m4_define([AC_PROG_OBJC],
 			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [_AM_DEPENDENCIES([OBJCXX])],
 		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -537,7 +584,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -559,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -570,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -580,7 +626,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -601,7 +647,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -649,41 +695,9 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -698,8 +712,8 @@ AC_SUBST($1)])
 
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -712,8 +726,8 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   AC_MSG_WARN(['missing' script is too old or missing])
@@ -722,7 +736,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -751,7 +765,54 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -784,8 +845,9 @@ AC_DEFUN([AM_PATH_PYTHON],
  [
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
+  dnl FIXME: Remove the need to hard-code Python versions here.
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
+[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
 
   AC_ARG_VAR([PYTHON], [the Python interpreter])
@@ -854,6 +916,25 @@ AC_DEFUN([AM_PATH_PYTHON],
     [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
   AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
 
+  # Just factor out some code duplication.
+  am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x.  See automake bug#10227.
+try:
+    import sysconfig
+except ImportError:
+    can_use_sysconfig = 0
+else:
+    can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    from platform import python_implementation
+    if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
+        can_use_sysconfig = 0
+except ImportError:
+    pass"
 
   dnl Set up 4 directories:
 
@@ -870,7 +951,14 @@ AC_DEFUN([AM_PATH_PYTHON],
      else
        am_py_prefix=$prefix
      fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+     am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
      case $am_cv_python_pythondir in
      $am_py_prefix*)
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -905,7 +993,14 @@ AC_DEFUN([AM_PATH_PYTHON],
      else
        am_py_exec_prefix=$exec_prefix
      fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+     am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
      case $am_cv_python_pyexecdir in
      $am_py_exec_prefix*)
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -953,9 +1048,26 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
 sys.exit(sys.hexversion < minverhex)"
   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
 
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1148,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1096,7 +1208,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1124,7 +1236,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1143,7 +1255,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1162,76 +1274,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/configure b/configure
index 6bf85e7cd610..86c9c3faad0f 100755
--- a/configure
+++ b/configure
@@ -2602,7 +2602,7 @@ test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-am__api_version='1.12'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2774,8 +2774,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2786,15 +2786,15 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3027,6 +3027,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3083,18 +3122,65 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
@@ -4245,6 +4331,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4375,131 +4520,6 @@ fi
 
   # --------------------------------------------------------------
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
@@ -4989,7 +5009,7 @@ fi
 
         # Find any Python interpreter.
     if test -z "$PYTHON"; then
-      for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+      for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5075,6 +5095,25 @@ $as_echo "$am_cv_python_platform" >&6; }
   PYTHON_PLATFORM=$am_cv_python_platform
 
 
+  # Just factor out some code duplication.
+  am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x.  See automake bug#10227.
+try:
+    import sysconfig
+except ImportError:
+    can_use_sysconfig = 0
+else:
+    can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    from platform import python_implementation
+    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+        can_use_sysconfig = 0
+except ImportError:
+    pass"
 
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
@@ -5088,7 +5127,14 @@ else
      else
        am_py_prefix=$prefix
      fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+     am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
      case $am_cv_python_pythondir in
      $am_py_prefix*)
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -5125,7 +5171,14 @@ else
      else
        am_py_exec_prefix=$exec_prefix
      fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+     am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
      case $am_cv_python_pyexecdir in
      $am_py_exec_prefix*)
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -8552,7 +8605,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -8603,7 +8656,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
diff --git a/externals/Makefile.in b/externals/Makefile.in
index 733afdf3fdba..2966c90f19c2 100644
--- a/externals/Makefile.in
+++ b/externals/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -53,23 +53,61 @@
 #
 ################################################################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -94,7 +132,6 @@ target_triplet = @target@
 @BUILD_METIS_TRUE@@BUILD_PARMETIS_TRUE@am__append_3 = parmetis
 @BUILD_CGNS_TRUE@am__append_4 = cgns
 subdir = externals
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -102,6 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -119,13 +157,14 @@ am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -133,12 +172,33 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = tecio metis parmetis cgns
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -329,7 +389,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign externals/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign externals/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -354,14 +413,13 @@ $(am__aclocal_m4_deps):
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -382,31 +440,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -422,12 +462,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -439,15 +474,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -456,9 +487,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
 
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -630,22 +662,21 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic cscopelist \
-	cscopelist-recursive ctags ctags-recursive distclean \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-generic distclean-tags distdir dvi dvi-am \
+	html html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/externals/cgns/Makefile.in b/externals/cgns/Makefile.in
index dc8de3375af7..f879fc120209 100644
--- a/externals/cgns/Makefile.in
+++ b/externals/cgns/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +90,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = externals/cgns
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -61,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -120,8 +157,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -313,7 +368,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign externals/cgns/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign externals/cgns/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -344,6 +398,7 @@ adf/libcgns_a-ADF_interface.$(OBJEXT): adf/$(am__dirstamp) \
 	adf/$(DEPDIR)/$(am__dirstamp)
 adf/libcgns_a-ADF_internals.$(OBJEXT): adf/$(am__dirstamp) \
 	adf/$(DEPDIR)/$(am__dirstamp)
+
 libcgns.a: $(libcgns_a_OBJECTS) $(libcgns_a_DEPENDENCIES) $(EXTRA_libcgns_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libcgns.a
 	$(AM_V_AR)$(libcgns_a_AR) libcgns.a $(libcgns_a_OBJECTS) $(libcgns_a_LIBADD)
@@ -463,26 +518,15 @@ adf/libcgns_a-ADF_internals.obj: adf/ADF_internals.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcgns_a_CPPFLAGS) $(CPPFLAGS) $(libcgns_a_CFLAGS) $(CFLAGS) -c -o adf/libcgns_a-ADF_internals.obj `if test -f 'adf/ADF_internals.c'; then $(CYGPATH_W) 'adf/ADF_internals.c'; else $(CYGPATH_W) '$(srcdir)/adf/ADF_internals.c'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -494,15 +538,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -511,9 +551,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -666,8 +707,8 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist ctags distclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -676,9 +717,11 @@ uninstall-am:
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/externals/metis/Makefile.in b/externals/metis/Makefile.in
index ca7b2bd6a3a5..0e7e2e6e642f 100644
--- a/externals/metis/Makefile.in
+++ b/externals/metis/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +90,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = externals/metis
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -61,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -173,8 +210,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -444,7 +499,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign externals/metis/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign externals/metis/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -599,6 +653,7 @@ libmetis/libmetis_a-util.$(OBJEXT): libmetis/$(am__dirstamp) \
 	libmetis/$(DEPDIR)/$(am__dirstamp)
 libmetis/libmetis_a-wspace.$(OBJEXT): libmetis/$(am__dirstamp) \
 	libmetis/$(DEPDIR)/$(am__dirstamp)
+
 libmetis.a: $(libmetis_a_OBJECTS) $(libmetis_a_DEPENDENCIES) $(EXTRA_libmetis_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libmetis.a
 	$(AM_V_AR)$(libmetis_a_AR) libmetis.a $(libmetis_a_OBJECTS) $(libmetis_a_LIBADD)
@@ -1544,26 +1599,15 @@ libmetis/libmetis_a-wspace.obj: libmetis/wspace.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmetis_a_CPPFLAGS) $(CPPFLAGS) $(libmetis_a_CFLAGS) $(CFLAGS) -c -o libmetis/libmetis_a-wspace.obj `if test -f 'libmetis/wspace.c'; then $(CYGPATH_W) 'libmetis/wspace.c'; else $(CYGPATH_W) '$(srcdir)/libmetis/wspace.c'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1575,15 +1619,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1592,9 +1632,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -1749,8 +1790,8 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist ctags distclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -1759,9 +1800,11 @@ uninstall-am:
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/externals/parmetis/Makefile.in b/externals/parmetis/Makefile.in
index bee84659cff0..9edb8cd8bda5 100644
--- a/externals/parmetis/Makefile.in
+++ b/externals/parmetis/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +90,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = externals/parmetis
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -61,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -154,8 +191,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -384,7 +439,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign externals/parmetis/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign externals/parmetis/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -521,6 +575,7 @@ libparmetis/libparmetis_a-wspace.$(OBJEXT):  \
 libparmetis/libparmetis_a-xyzpart.$(OBJEXT):  \
 	libparmetis/$(am__dirstamp) \
 	libparmetis/$(DEPDIR)/$(am__dirstamp)
+
 libparmetis.a: $(libparmetis_a_OBJECTS) $(libparmetis_a_DEPENDENCIES) $(EXTRA_libparmetis_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libparmetis.a
 	$(AM_V_AR)$(libparmetis_a_AR) libparmetis.a $(libparmetis_a_OBJECTS) $(libparmetis_a_LIBADD)
@@ -1135,26 +1190,15 @@ libparmetis/libparmetis_a-xyzpart.obj: libparmetis/xyzpart.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparmetis_a_CPPFLAGS) $(CPPFLAGS) $(libparmetis_a_CFLAGS) $(CFLAGS) -c -o libparmetis/libparmetis_a-xyzpart.obj `if test -f 'libparmetis/xyzpart.c'; then $(CYGPATH_W) 'libparmetis/xyzpart.c'; else $(CYGPATH_W) '$(srcdir)/libparmetis/xyzpart.c'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1166,15 +1210,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1183,9 +1223,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -1338,8 +1379,8 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist ctags distclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -1348,9 +1389,11 @@ uninstall-am:
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/externals/tecio/Makefile.in b/externals/tecio/Makefile.in
index 84e76ceb2ec5..fc6308357141 100644
--- a/externals/tecio/Makefile.in
+++ b/externals/tecio/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.5 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +90,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = externals/tecio
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/codi.m4 $(top_srcdir)/m4/compiler.m4 \
@@ -61,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cgns.m4 \
 	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -146,8 +183,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -376,7 +431,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign externals/tecio/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign externals/tecio/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -439,6 +493,7 @@ tecsrc/libtecio_a-tassert.$(OBJEXT): tecsrc/$(am__dirstamp) \
 	tecsrc/$(DEPDIR)/$(am__dirstamp)
 tecsrc/libtecio_a-tecxxx.$(OBJEXT): tecsrc/$(am__dirstamp) \
 	tecsrc/$(DEPDIR)/$(am__dirstamp)
+
 libtecio.a: $(libtecio_a_OBJECTS) $(libtecio_a_DEPENDENCIES) $(EXTRA_libtecio_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libtecio.a
 	$(AM_V_AR)$(libtecio_a_AR) libtecio.a $(libtecio_a_OBJECTS) $(libtecio_a_LIBADD)
@@ -738,26 +793,15 @@ tecsrc/libtecio_a-tecxxx.obj: tecsrc/tecxxx.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtecio_a_CPPFLAGS) $(CPPFLAGS) $(libtecio_a_CXXFLAGS) $(CXXFLAGS) -c -o tecsrc/libtecio_a-tecxxx.obj `if test -f 'tecsrc/tecxxx.cpp'; then $(CYGPATH_W) 'tecsrc/tecxxx.cpp'; else $(CYGPATH_W) '$(srcdir)/tecsrc/tecxxx.cpp'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -769,15 +813,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -786,9 +826,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -941,8 +982,8 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist ctags distclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -951,9 +992,11 @@ uninstall-am:
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

From 2358839e9220ed86b8e8c216e9e2374a0d33e76f Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 30 May 2018 15:21:04 +0200
Subject: [PATCH 002/539] FEA History file working.

---
 SU2_CFD/include/output_structure.hpp     |   7 +-
 SU2_CFD/src/driver_structure.cpp         |  10 +-
 SU2_CFD/src/iteration_structure.cpp      |   4 -
 SU2_CFD/src/output_direct_elasticity.cpp | 319 ++++++++++-------------
 4 files changed, 146 insertions(+), 194 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 266e3604c4ba..f3e3d43ed368 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -865,13 +865,18 @@ class COutput {
  */
 class CFEAOutput : public COutput {
 private:
+
+  char char_histfile[200];
+
+  ofstream HistFile;
+
 public:
 
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFEAOutput(CConfig *config);
+  CFEAOutput(CConfig *config, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 4adf5866fe9f..81e6d55645d0 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -488,7 +488,8 @@ void CDriver::Postprocessing() {
 
     /*--- Close the convergence history file. ---*/
     for (iZone = 0; iZone < nZone; iZone++) {
-      ConvHist_file[iZone].close();
+      if (config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY)
+        ConvHist_file[iZone].close();
     }
     delete [] ConvHist_file;
 
@@ -2992,6 +2993,8 @@ void CDriver::InitStaticMeshMovement(){
 
 void CDriver::Output_Preprocessing(){
 
+  bool new_approach = false;
+
   /*--- Definition of the output class (one for each zone). The output class
    manages the writing of all restart, volume solution, surface solution,
    surface comma-separated value, and convergence history files (both in serial
@@ -3040,7 +3043,8 @@ void CDriver::Output_Preprocessing(){
     case FEM_ELASTICITY:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      output[iZone] = new CFEAOutput(config_container[iZone]);
+      new_approach = true;
+      output[iZone] = new CFEAOutput(config_container[iZone], iZone);
       break;
 
     case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
@@ -3069,7 +3073,7 @@ void CDriver::Output_Preprocessing(){
   if (rank == MASTER_NODE){
     ConvHist_file = new ofstream[nZone];
     for (iZone = 0; iZone < nZone; iZone++) {
-      output[iZone]->SetConvHistory_Header(&ConvHist_file[iZone], config_container[iZone], iZone);
+      if (!new_approach) output[iZone]->SetConvHistory_Header(&ConvHist_file[iZone], config_container[iZone], iZone);
       config_container[iZone]->SetHistFile(&ConvHist_file[iZone]);
     }
   }
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index f40b025933c5..749272ac71bf 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1222,10 +1222,6 @@ void CFEAIteration::Iterate(COutput *output,
 
       config_container[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
 
-      /*--- Write the convergence history headers ---*/
-
-      if (!disc_adj_fem) output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone);
-
       /*--- Run the iteration ---*/
 
       integration_container[val_iZone][FEA_SOL]->Structural_Iteration(geometry_container, solver_container, numerics_container,
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index bbb0bf2e2ea7..4f69b1e6f92b 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -37,111 +37,92 @@
 
 #include "../include/output_structure.hpp"
 
-CFEAOutput::CFEAOutput(CConfig *config) : COutput(config) {
+CFEAOutput::CFEAOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
 
-}
-
-CFEAOutput::~CFEAOutput(void) {
-
-}
-
-void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+  char buffer[50];
 
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
 
-  /*--- Write file name with extension ---*/
-  string filename = config->GetConv_FileName();
+  // Append the zone ID
   if(config->GetnZone() > 1){
-    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
   }
-  strcpy (cstr, filename.data());
+  strcpy (char_histfile, history_filename.data());
 
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetUnst_RestartIter();
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
     if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(cstr, buffer);
+    strcat(char_histfile, buffer);
   }
 
+  // Add the correct file extension depending on the file format
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
   else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
            (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
   else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(cstr, buffer);
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone);
+  }
 
-  ConvHist_file->open(cstr, ios::out);
-  ConvHist_file->precision(15);
+}
 
-  /*--- Begin of the header ---*/
+CFEAOutput::~CFEAOutput(void) {
 
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+
+}
+
+void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone) {
+
+  bool incload = config->GetIncrementalLoad();
+
+  /*--- Begin of the header ---*/
   char begin[]= "\"Iteration\"";
 
   /*--- Header for the coefficients ---*/
-
   char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
   char fem_incload[]= ",\"IncLoad\"";
 
   /*--- Header for the residuals ---*/
-
   char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
 
   /*--- End of the header ---*/
-
   char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
 
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
       (config->GetOutput_FileFormat() == FIELDVIEW) ||
       (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
-    ConvHist_file[0] << "VARIABLES = ";
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
   }
 
   /*--- Write the header, case depending ---*/
-
-  ConvHist_file[0] << begin << fem_coeff;
+  HistFile << begin << fem_coeff;
   if (incload) ConvHist_file[0] << fem_incload;
-  ConvHist_file[0] << fem_resid << endfea;
+  HistFile << fem_resid << endfea;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
       config->GetOutput_FileFormat() == FIELDVIEW ||
       config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
   }
 
 }
@@ -170,21 +151,10 @@ void CFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
   if (rank == MASTER_NODE) {
 
     unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
 
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
     su2double timeiter = timeused/su2double(iExtIter+1);
 
+    unsigned short iVar;
     unsigned short nDim = geometry[val_iZone][MESH_0]->GetnDim();
 
     bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
@@ -194,35 +164,24 @@ void CFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
     bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double Total_CFEM = 0.0;
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
     /*--- Initialize number of variables ---*/
     unsigned short nVar_FEM = 0;
     if (linear_analysis) nVar_FEM = nDim;
     if (nonlinear_analysis) nVar_FEM = 3;
 
-
     /*--- Allocate memory for the residual ---*/
+    su2double *residual_fem          = NULL;
     residual_fem        = new su2double[nVar_FEM];
 
     /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-    Total_VMStress = solver_container[val_iZone][MESH_0][FEA_SOL]->GetTotal_CFEA();
-
-    Total_ForceCoeff = solver_container[val_iZone][MESH_0][FEA_SOL]->GetForceCoeff();
-
-    Total_IncLoad = solver_container[val_iZone][MESH_0][FEA_SOL]->GetLoad_Increment();
-
-    LinSolvIter = (unsigned long) solver_container[val_iZone][MESH_0][FEA_SOL]->GetIterLinSolver();
+    su2double Total_VMStress   = solver_container[val_iZone][MESH_0][FEA_SOL]->GetTotal_CFEA();
+    su2double Total_ForceCoeff = solver_container[val_iZone][MESH_0][FEA_SOL]->GetForceCoeff();
+    su2double Total_IncLoad    = solver_container[val_iZone][MESH_0][FEA_SOL]->GetLoad_Increment();
+    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][MESH_0][FEA_SOL]->GetIterLinSolver();
 
     /*--- Residuals: ---*/
     /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
@@ -239,119 +198,107 @@ void CFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
       }
     }
 
-    /*--- Header frequency ---*/
-
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
     bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3))){
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-        else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-        /*--- FEM residual ---*/
-        if (nDim == 2) {
-          if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-          if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-        }
-        else {
-          SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-        }
-        SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
 
-      }
-        /*--- Write the screen header---*/
-      if (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis))) {
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
-        if (dynamic) {
-          cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-        }
+    // Load data to buffers
+    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
 
-        if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-        else cout << endl << " IntIter" << " ExtIter";
+    SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
 
-        if (linear_analysis) {
-          if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-          if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-        }
-        else if (nonlinear_analysis) {
-          switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-          case RESFEM_RELATIVE:
-            cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-            break;
-          case RESFEM_ABSOLUTE:
-            cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-            break;
-          default:
-            cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-            break;
-          }
-        }
+    /*--- Initial variables ---*/
+    if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+    else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
 
-      }
+    /*--- FEM residual ---*/
+    if (nVar_FEM == 2)
+      SPRINTF (fem_resid, ", %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
+    else
+      SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+
+    /*--- Linear solver iterations and time used ---*/
+    SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+    // Write to history file
 
-      /*--- Write the solution on the screen and history file ---*/
+    HistFile << begin_fem << fem_coeff << fem_resid << end_fem;
+    HistFile.flush();
 
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
-      if (!nonlinear_analysis) {
-        cout.width(5); cout << iExtIter;
-        cout.width(11); cout << timeiter;
+    bool write_header;
+    if (nonlinear_analysis) write_header = (iIntIter == 0);
+    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
 
-      } else {
-        cout.width(8); cout << iIntIter;
-        cout.width(8); cout << iExtIter;
+    if (write_header) {
+
+      if (dynamic && nonlinear_analysis) {
+        cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
       }
 
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin_fem << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-
-      cout.unsetf(ios::fixed);
+      if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+      else cout << endl << " IntIter" << " ExtIter";
+
+      if (linear_analysis) {
+        if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+        if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+      }
+      else if (nonlinear_analysis) {
+        switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+        case RESFEM_RELATIVE:
+          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+          break;
+        case RESFEM_ABSOLUTE:
+          cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+          break;
+        default:
+          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+          break;
+        }
+      }
 
     }
 
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
-    delete [] residual_fea;
-    delete [] residual_fem;
+    if (!nonlinear_analysis) {
+      cout.width(5); cout << iExtIter;
+      cout.width(11); cout << timeiter;
+
+    } else {
+      cout.width(8); cout << iIntIter;
+      cout.width(8); cout << iExtIter;
+    }
 
+    cout.precision(6);
+    cout.setf(ios::fixed, ios::floatfield);
+    if (linear_analysis) {
+      cout.width(14); cout << log10(residual_fem[0]);
+      cout.width(14); cout << log10(residual_fem[1]);
+      if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+    }
+    else if (nonlinear_analysis) {
+      cout.width(14); cout << log10(residual_fem[0]);
+      cout.width(14); cout << log10(residual_fem[1]);
+      cout.width(14); cout << log10(residual_fem[2]);
+    }
+
+    cout.precision(4);
+    cout.setf(ios::scientific, ios::floatfield);
+    cout.width(14); cout << Total_VMStress;
+    cout << endl;
+
+    cout.unsetf(ios::fixed);
+
+
+    delete [] residual_fem;
 
   }
 }

From fdbbc57785b874dfa4491dd647da13b2c4061084 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 30 May 2018 17:40:42 +0200
Subject: [PATCH 003/539] Added output for flow solver.

---
 SU2_CFD/include/output_structure.hpp     |   96 +
 SU2_CFD/obj/Makefile.am                  |    2 +
 SU2_CFD/obj/Makefile.in                  |  116 ++
 SU2_CFD/src/driver_structure.cpp         |   17 +-
 SU2_CFD/src/output_direct_elasticity.cpp |    2 +-
 SU2_CFD/src/output_direct_mean.cpp       | 1701 +++++++++++++++++
 SU2_CFD/src/output_direct_mean_inc.cpp   | 2112 ++++++++++++++++++++++
 7 files changed, 4041 insertions(+), 5 deletions(-)
 create mode 100644 SU2_CFD/src/output_direct_mean.cpp
 create mode 100644 SU2_CFD/src/output_direct_mean_inc.cpp

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index c5f7077a7d84..d9e896f02787 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -859,6 +859,102 @@ class COutput {
 
 };
 
+/*! \class CFlowOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez.
+ *  \date May 30, 2018.
+ */
+class CFlowOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+  ofstream HistFile;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFlowOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFlowOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
+/*! \class CFlowOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez.
+ *  \date May 30, 2018.
+ */
+class CIncFlowOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+  ofstream HistFile;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CIncFlowOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CIncFlowOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
 /*! \class CFEAOutput
  *  \brief Output class for FEA problems.
  *  \author R. Sanchez.
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 8332e3d5ae8d..283f3010d918 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -113,6 +113,8 @@ libSU2Core_sources = \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
   ../src/output_direct_elasticity.cpp \
+  ../src/output_direct_mean.cpp \
+  ../src/output_direct_mean_inc.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
diff --git a/SU2_CFD/obj/Makefile.in b/SU2_CFD/obj/Makefile.in
index 4172c3369c87..08c60fc16d5c 100644
--- a/SU2_CFD/obj/Makefile.in
+++ b/SU2_CFD/obj/Makefile.in
@@ -195,6 +195,8 @@ am__libSU2Core_a_SOURCES_DIST = ../include/definition_structure.hpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/output_direct_mean.cpp \
+	../src/output_direct_mean_inc.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -255,6 +257,8 @@ am__objects_1 = ../src/libSU2Core_a-definition_structure.$(OBJEXT) \
 	../src/libSU2Core_a-output_su2.$(OBJEXT) \
 	../src/libSU2Core_a-output_paraview.$(OBJEXT) \
 	../src/libSU2Core_a-output_direct_elasticity.$(OBJEXT) \
+	../src/libSU2Core_a-output_direct_mean.$(OBJEXT) \
+	../src/libSU2Core_a-output_direct_mean_inc.$(OBJEXT) \
 	../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_turbulent.$(OBJEXT) \
@@ -345,6 +349,8 @@ am_____bin_SU2_CFD_AD_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/output_direct_mean.cpp \
+	../src/output_direct_mean_inc.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -406,6 +412,8 @@ am__objects_4 =  \
 	../src/___bin_SU2_CFD_AD-output_su2.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_paraview.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_direct_elasticity.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_direct_mean.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_direct_mean_inc.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_turbulent.$(OBJEXT) \
@@ -486,6 +494,8 @@ am_____bin_SU2_CFD_DIRECTDIFF_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_physics.cpp ../src/output_tecplot.cpp \
 	../src/output_fieldview.cpp ../src/output_su2.cpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
+	../src/output_direct_mean.cpp \
+	../src/output_direct_mean_inc.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -546,6 +556,8 @@ am__objects_6 = ../src/___bin_SU2_CFD_DIRECTDIFF-definition_structure.$(OBJEXT)
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_su2.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_paraview.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_turbulent.$(OBJEXT) \
@@ -867,6 +879,8 @@ libSU2Core_sources = \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
   ../src/output_direct_elasticity.cpp \
+  ../src/output_direct_mean.cpp \
+  ../src/output_direct_mean_inc.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
@@ -1045,6 +1059,10 @@ clean-noinstLIBRARIES:
 	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-output_direct_elasticity.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_direct_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_direct_mean_inc.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT):  \
@@ -1231,6 +1249,10 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-output_direct_elasticity.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_direct_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_direct_mean_inc.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT):  \
@@ -1365,6 +1387,10 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT):  \
@@ -1469,6 +1495,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_physics.Po@am__quote@
@@ -1534,6 +1562,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_physics.Po@am__quote@
@@ -1598,6 +1628,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_template.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_physics.Po@am__quote@
@@ -2101,6 +2133,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
 
+../src/libSU2Core_a-output_direct_mean.o: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_mean.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Tpo -c -o ../src/libSU2Core_a-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/libSU2Core_a-output_direct_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+
+../src/libSU2Core_a-output_direct_mean.obj: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_mean.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Tpo -c -o ../src/libSU2Core_a-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/libSU2Core_a-output_direct_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+
+../src/libSU2Core_a-output_direct_mean_inc.o: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_mean_inc.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Tpo -c -o ../src/libSU2Core_a-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/libSU2Core_a-output_direct_mean_inc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+
+../src/libSU2Core_a-output_direct_mean_inc.obj: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_mean_inc.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Tpo -c -o ../src/libSU2Core_a-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/libSU2Core_a-output_direct_mean_inc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+
 ../src/libSU2Core_a-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo -c -o ../src/libSU2Core_a-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Po
@@ -3025,6 +3085,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
 
+../src/___bin_SU2_CFD_AD-output_direct_mean.o: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_mean.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+
+../src/___bin_SU2_CFD_AD-output_direct_mean.obj: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_mean.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+
+../src/___bin_SU2_CFD_AD-output_direct_mean_inc.o: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_mean_inc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+
+../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Po
@@ -3935,6 +4023,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.obj `if test -f '../src/output_direct_elasticity.cpp'; then $(CYGPATH_W) '../src/output_direct_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_elasticity.cpp'; fi`
 
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.o: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.o `test -f '../src/output_direct_mean.cpp' || echo '$(srcdir)/'`../src/output_direct_mean.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.obj: ../src/output_direct_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.obj `if test -f '../src/output_direct_mean.cpp'; then $(CYGPATH_W) '../src/output_direct_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean.cpp'; fi`
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.o: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.o `test -f '../src/output_direct_mean_inc.cpp' || echo '$(srcdir)/'`../src/output_direct_mean_inc.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj: ../src/output_direct_mean_inc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_mean_inc.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
+
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Po
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 38da2c52135c..312f36c8539a 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -552,10 +552,16 @@ void CDriver::Postprocessing() {
     /*--- Close the convergence history file. ---*/
     for (iZone = 0; iZone < nZone; iZone++) {
       for (iInst = 0; iInst < nInst[iZone]; iInst++) {
-        if (config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY)
+        if ((config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY) &&
+            (config_container[iZone]->GetKind_Solver() != EULER) &&
+            (config_container[iZone]->GetKind_Solver() != NAVIER_STOKES) &&
+            (config_container[iZone]->GetKind_Solver() != RANS))
         ConvHist_file[iZone][iInst].close();
       }
-      if (config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY)
+      if ((config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY) &&
+          (config_container[iZone]->GetKind_Solver() != EULER) &&
+          (config_container[iZone]->GetKind_Solver() != NAVIER_STOKES) &&
+          (config_container[iZone]->GetKind_Solver() != RANS))
         delete [] ConvHist_file[iZone];
     }
     delete [] ConvHist_file;
@@ -3116,10 +3122,13 @@ void CDriver::Output_Preprocessing(){
     switch (config_container[iZone]->GetKind_Solver()) {
 
     case EULER: case NAVIER_STOKES: case RANS:
-
+      new_approach = true;
       if (rank == MASTER_NODE)
         cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
+        output[iZone] = new CFlowOutput(config_container[iZone], iZone);
+      else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
+        output[iZone] = new CIncFlowOutput(config_container[iZone], iZone);
       break;
 
     case WAVE_EQUATION:
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index bceaa755a9f4..bdb8c1b9eedd 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -1,6 +1,6 @@
 /*!
  * \file output_direct_elasticity.cpp
- * \brief Main subroutines for output solver information
+ * \brief Main subroutines for FEA output
  * \author R. Sanchez
  * \version 6.0.1 "Falcon"
  *
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
new file mode 100644
index 000000000000..9a99227b5704
--- /dev/null
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -0,0 +1,1701 @@
+/*!
+ * \file output_direct_mean.cpp
+ * \brief Main subroutines for FEA output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "../include/output_structure.hpp"
+
+CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CFlowOutput::~CFlowOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+
+}
+
+void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+
+  /*--- Header for the residuals ---*/
+
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char heat_resid[]= ",\"Res_Heat\"";
+
+  /*--- End of the header ---*/
+
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  HistFile << begin;
+  if (!turbo) HistFile << flow_coeff;
+  if (turbo) HistFile << turbo_coeff;
+  if (thermal && !turbo) HistFile << heat_coeff;
+  if (equiv_area) HistFile << equivalent_area_coeff;
+  if (engine || actuator_disk) HistFile << engine_coeff;
+  if (inv_design) {
+    HistFile << Cp_inverse_design;
+    if (thermal && !turbo) HistFile << Heat_inverse_design;
+  }
+  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+  HistFile << flow_resid;
+  if (turbulent) HistFile << turb_resid;
+  if (weakly_coupled_heat) HistFile << heat_resid;
+  if (aeroelastic) HistFile << aeroelastic_coeff;
+  if (output_per_surface) HistFile << monitoring_coeff;
+  if (output_surface) HistFile << surface_outputs;
+  if (direct_diff != NO_DERIVATIVE) {
+    if (!turbo) HistFile << d_flow_coeff;
+    else        HistFile << d_turbo_coeff;
+    if (engine || actuator_disk) HistFile << d_engine;
+    if (thermal) HistFile << d_thermal_coeff;
+  }
+  if (output_comboObj) HistFile << combo_obj;
+  HistFile << end;
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                     CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
+
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+
+    if (fea || fluid_structure) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          break;
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+
+      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+
+    }
+
+  }
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000], wave_coeff[1000],
+    begin_fem[1000], fem_coeff[1000], wave_resid[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool heat = (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION) || (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat());
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION) && (config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CWave = 0.0, Total_CHeat = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_Density = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL;
+    su2double *residual_heat         = NULL;
+
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch  = NULL,
+    *Surface_CL         = NULL,
+    *Surface_CD         = NULL,
+    *Surface_CSF        = NULL,
+    *Surface_CEff       = NULL,
+    *Surface_CFx        = NULL,
+    *Surface_CFy        = NULL,
+    *Surface_CFz        = NULL,
+    *Surface_CMx        = NULL,
+    *Surface_CMy        = NULL,
+    *Surface_CMz        = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0;
+
+    /*--- Direct problem variables ---*/
+    nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (heat) nVar_Heat = 1;
+
+    /*--- Adjoint problem variables ---*/
+    nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_heat       = new su2double[nVar_Heat];
+
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Write information from nodes ---*/
+
+    /*--- Flow solution coefficients ---*/
+
+    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+    if (thermal) {
+      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+      if(weakly_coupled_heat) {
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+      }
+    }
+
+    if (direct_diff != NO_DERIVATIVE) {
+      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+      if (thermal) {
+        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+        //Davg Temp
+      }
+
+      if (engine || actuator_disk) {
+        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+      }
+
+    }
+
+    if (equiv_area) {
+      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+
+      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+    }
+
+    if (engine || actuator_disk) {
+      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+    }
+
+    if (rotating_frame) {
+      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+    }
+
+    if (aeroelastic) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+      }
+    }
+
+    if (output_per_surface) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+      }
+    }
+
+    if (turbo) {
+      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+          }
+        }
+      }
+      if (direct_diff != NO_DERIVATIVE){
+        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+      }
+    }
+
+    /*--- Get flux-averaged values at the specified surface ---*/
+
+    if (output_surface) {
+
+      unsigned short iMarker_Analyze = 0;
+      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+    }
+
+    /*--- Flow Residuals ---*/
+
+    for (iVar = 0; iVar < nVar_Flow; iVar++)
+      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+    /*--- Turbulent residual ---*/
+
+    if (turbulent) {
+      for (iVar = 0; iVar < nVar_Turb; iVar++)
+        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+    }
+
+    if (weakly_coupled_heat) {
+      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+      }
+
+    }
+
+    /*--- Transition residual ---*/
+
+    if (transition) {
+      for (iVar = 0; iVar < nVar_Trans; iVar++)
+        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+    }
+
+    /*--- Iterations of the linear solver ---*/
+
+    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+    /*--- Adjoint solver ---*/
+
+    if (adjoint) {
+
+      /*--- Adjoint solution coefficients ---*/
+
+      Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+      Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+      Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+      Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+      Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+      Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+      Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+      Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+      /*--- Adjoint flow residuals ---*/
+
+      for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+        residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+      }
+
+      /*--- Adjoint turbulent residuals ---*/
+
+      if (turbulent) {
+        if (!frozen_visc) {
+          for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+            residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+        }
+      }
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+
+    /*--- Header frequency ---*/
+
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+
+    if ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3)) {
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+
+        /*--- Write the solution and residual of the history file ---*/
+
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                //
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+
+
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+
+            /*---- Averaged stagnation pressure at an exit ----*/
+
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+            }
+
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            if (adjoint) {
+
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if ((write_heads) && !(!DualTime_Iteration && Unsteady)){
+
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                  if (nZone > 1)
+                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case HEAT_EQUATION :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout << "      Res[Heat]" << "   CHeat(Total)"<<  endl;
+              break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << "      Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!Unsteady) {
+          cout.width(5); cout << iExtIter + ExtIter_OffSet;
+          cout.width(11); cout << timeiter;
+
+        } else if (Unsteady && DualTime_Iteration) {
+          cout.width(8); cout << iIntIter;
+          cout.width(8); cout << iExtIter;
+        }
+      }
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+
+                cout.unsetf(ios_base::floatfield);
+
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+
+        case RANS :
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid << turb_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;
+            }
+          }
+          break;
+
+        case HEAT_EQUATION:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << heat_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            cout.precision(6);
+            cout.setf(ios::fixed, ios::floatfield);
+            cout.width(14); cout << log10(residual_heat[0]);
+            cout.width(14); cout << Total_CHeat;
+            cout << endl;
+          }
+          break;
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << direct_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+        case ADJ_RANS : case DISC_ADJ_RANS:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              HistFile << adj_turb_resid;
+            HistFile << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+
+  }
+}
+
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
new file mode 100644
index 000000000000..2616407ac2f7
--- /dev/null
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -0,0 +1,2112 @@
+/*!
+ * \file output_direct_mean_inc.cpp
+ * \brief Main subroutines for FEA output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "../include/output_structure.hpp"
+
+CIncFlowOutput::CIncFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CIncFlowOutput::~CIncFlowOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+
+}
+
+void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char wave_coeff[]= ",\"CWave\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+
+  /*--- Header for the residuals ---*/
+
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char wave_resid[]= ",\"Res_Wave[0]\",\"Res_Wave[1]\"";
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+  char heat_resid[]= ",\"Res_Heat\"";
+
+  /*--- End of the header ---*/
+
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  switch (config->GetKind_Solver()) {
+
+    case EULER : case NAVIER_STOKES: case RANS :
+      HistFile << begin;
+      if (!turbo) HistFile << flow_coeff;
+      if (turbo) HistFile << turbo_coeff;
+      if (thermal && !turbo) HistFile << heat_coeff;
+      if (equiv_area) HistFile << equivalent_area_coeff;
+      if (engine || actuator_disk) HistFile << engine_coeff;
+      if (inv_design) {
+        HistFile << Cp_inverse_design;
+        if (thermal && !turbo) HistFile << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+      HistFile << flow_resid;
+      if (turbulent) HistFile << turb_resid;
+      if (weakly_coupled_heat) HistFile << heat_resid;
+      if (aeroelastic) HistFile << aeroelastic_coeff;
+      if (output_per_surface) HistFile << monitoring_coeff;
+      if (output_surface) HistFile << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) HistFile << d_flow_coeff;
+        else        HistFile << d_turbo_coeff;
+        if (engine || actuator_disk) HistFile << d_engine;
+        if (thermal) HistFile << d_thermal_coeff;
+      }
+      if (output_comboObj) HistFile << combo_obj;
+      HistFile << end;
+
+      break;
+
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          HistFile << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          HistFile << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+      HistFile << end;
+      break;
+
+    case WAVE_EQUATION:
+      HistFile << begin << wave_coeff;
+      HistFile << wave_resid << end;
+      break;
+
+    case HEAT_EQUATION: case HEAT_EQUATION_FVM:
+      HistFile << begin << heat_coeff;
+      HistFile << heat_resid << end;
+      break;
+
+    case FEM_ELASTICITY:
+      HistFile << begin << fem_coeff;
+      if (incload) HistFile << fem_incload;
+      HistFile << fem_resid << endfea;
+      break;
+
+    case DISC_ADJ_FEM:
+      HistFile << begin << fem_coeff;
+      HistFile << fem_resid << endfea;
+      break;
+
+  }
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                     CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
+
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+
+    if (fea || fluid_structure) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          break;
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+
+      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+
+    }
+
+  }
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000], wave_coeff[1000],
+    begin_fem[1000], fem_coeff[1000], wave_resid[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool wave = (config[val_iZone]->GetKind_Solver() == WAVE_EQUATION);
+    bool heat = (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION) || (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat());
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION) && (config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CWave = 0.0, Total_CHeat = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_Density = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL;
+    su2double *residual_wave         = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+    su2double *residual_heat         = NULL;
+
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch  = NULL,
+    *Surface_CL         = NULL,
+    *Surface_CD         = NULL,
+    *Surface_CSF        = NULL,
+    *Surface_CEff       = NULL,
+    *Surface_CFx        = NULL,
+    *Surface_CFy        = NULL,
+    *Surface_CFz        = NULL,
+    *Surface_CMx        = NULL,
+    *Surface_CMy        = NULL,
+    *Surface_CMz        = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Wave = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+    nVar_FEM = 0;
+
+    /*--- Direct problem variables ---*/
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (wave) nVar_Wave = 2;
+    if (heat) nVar_Heat = 1;
+
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+
+    /*--- Adjoint problem variables ---*/
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_wave       = new su2double[nVar_Wave];
+    residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
+
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Write information from nodes ---*/
+
+    switch (config[val_iZone]->GetKind_Solver()) {
+
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+
+        /*--- Flow solution coefficients ---*/
+
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
+
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
+
+          if (engine || actuator_disk) {
+            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+          }
+
+        }
+
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
+
+        if (engine || actuator_disk) {
+          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
+
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
+
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
+
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+          }
+        }
+
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
+
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+        }
+
+        /*--- Flow Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+        /*--- Turbulent residual ---*/
+
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
+
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
+
+        }
+
+        /*--- Transition residual ---*/
+
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
+
+
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
+
+        /*--- Iterations of the linear solver ---*/
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+        /*--- Adjoint solver ---*/
+
+        if (adjoint) {
+
+          /*--- Adjoint solution coefficients ---*/
+
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+
+          /*--- Adjoint turbulent residuals ---*/
+
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+        }
+
+        break;
+
+      case WAVE_EQUATION:
+
+        /*--- Wave coefficients  ---*/
+
+        Total_CWave = solver_container[val_iZone][val_iInst][FinestMesh][WAVE_SOL]->GetTotal_CWave();
+
+        /*--- Wave Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Wave; iVar++) {
+          residual_wave[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][WAVE_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case HEAT_EQUATION:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_CHeat = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_CHeat();
+
+        /*--- Wave Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+
+        /*--- Heat Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case FEM_ELASTICITY:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+
+    /*--- Header frequency ---*/
+
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
+
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+
+        /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+
+          case EULER : case NAVIER_STOKES: case RANS:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                //
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+
+
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+
+            /*---- Averaged stagnation pressure at an exit ----*/
+
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+            }
+
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
+            if (adjoint) {
+
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+
+            break;
+
+          case WAVE_EQUATION:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_CWave);
+            SPRINTF (wave_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_wave[0]), log10 (residual_wave[1]), dummy, dummy, dummy );
+
+            break;
+
+          case HEAT_EQUATION:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_CHeat);
+            SPRINTF (heat_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_heat[0]), dummy, dummy, dummy, dummy );
+
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+
+          case FEM_ELASTICITY:
+
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
+
+          if (!fem) {
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                  if (nZone > 1)
+                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case WAVE_EQUATION :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout << "      Res[Wave]" << "   CWave(Total)"<<  endl;
+              break;
+
+            case HEAT_EQUATION :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout << "      Res[Heat]" << "   CHeat(Total)"<<  endl;
+              break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << "      Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
+
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
+        }
+      }
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+
+                cout.unsetf(ios_base::floatfield);
+
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+
+        case RANS :
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid << turb_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;
+            }
+          }
+          break;
+
+        case WAVE_EQUATION:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << wave_coeff << wave_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            cout.precision(6);
+            cout.setf(ios::fixed, ios::floatfield);
+            cout.width(14); cout << log10(residual_wave[0]);
+            cout.width(14); cout << Total_CWave;
+            cout << endl;
+          }
+          break;
+
+        case HEAT_EQUATION:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << heat_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            cout.precision(6);
+            cout.setf(ios::fixed, ios::floatfield);
+            cout.width(14); cout << log10(residual_heat[0]);
+            cout.width(14); cout << Total_CHeat;
+            cout << endl;
+          }
+          break;
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << direct_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          break;
+
+        case FEM_ELASTICITY:
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+          break;
+
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+        case ADJ_RANS : case DISC_ADJ_RANS:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              HistFile << adj_turb_resid;
+            HistFile << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_wave;
+    delete [] residual_fea;
+    delete [] residual_fem;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+
+  }
+
+
+}
+

From 3594d3c27816515161a2db775ace44408c6a14da Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Tue, 5 Jun 2018 12:28:34 +0200
Subject: [PATCH 004/539] Added files for different output classes.

---
 SU2_CFD/include/output_structure.hpp      |  204 ++-
 SU2_CFD/obj/Makefile.am                   |    5 +
 SU2_CFD/obj/Makefile.in                   |  287 +++
 SU2_CFD/src/driver_structure.cpp          |   69 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   | 2011 +++++++++++++++++++++
 SU2_CFD/src/output_adjoint_elasticity.cpp |  305 ++++
 SU2_CFD/src/output_adjoint_mean.cpp       | 2011 +++++++++++++++++++++
 SU2_CFD/src/output_direct_heat.cpp        | 2011 +++++++++++++++++++++
 SU2_CFD/src/output_direct_mean.cpp        |  786 +++++---
 SU2_CFD/src/output_direct_mean_inc.cpp    |  131 +-
 SU2_CFD/src/output_driver.cpp             |   38 +
 11 files changed, 7439 insertions(+), 419 deletions(-)
 create mode 100644 SU2_CFD/src/output_adjoint_discrete.cpp
 create mode 100644 SU2_CFD/src/output_adjoint_elasticity.cpp
 create mode 100644 SU2_CFD/src/output_adjoint_mean.cpp
 create mode 100644 SU2_CFD/src/output_direct_heat.cpp
 create mode 100644 SU2_CFD/src/output_driver.cpp

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index d9e896f02787..3b5f3212353e 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -869,10 +869,10 @@ class CFlowOutput : public COutput {
 
   char char_histfile[200];
 
-  ofstream HistFile;
-
 public:
 
+  ofstream HistFile;
+
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -917,10 +917,10 @@ class CIncFlowOutput : public COutput {
 
   char char_histfile[200];
 
-  ofstream HistFile;
-
 public:
 
+  ofstream HistFile;
+
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -965,10 +965,10 @@ class CFEAOutput : public COutput {
 
   char char_histfile[200];
 
-  ofstream HistFile;
-
 public:
 
+  ofstream HistFile;
+
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -1003,4 +1003,196 @@ class CFEAOutput : public COutput {
 
 };
 
+/*! \class CHeatOutput
+ *  \brief Output class for heat problems.
+ *  \author R. Sanchez.
+ *  \date June 5, 2018.
+ */
+class CHeatOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CHeatOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CHeatOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
+/*! \class CAdjFlowOutput
+ *  \brief Output class for flow continuous adjoint problems.
+ *  \author R. Sanchez.
+ *  \date June 5, 2018.
+ */
+class CAdjFlowOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CAdjFlowOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CAdjFlowOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
+/*! \class CDiscAdjFlowOutput
+ *  \brief Output class for flow discrete adjoint problems.
+ *  \author R. Sanchez.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFlowOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFlowOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFlowOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
+/*! \class CDiscAdjFEAOutput
+ *  \brief Output class for elasticity discrete adjoint problems.
+ *  \author R. Sanchez.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFEAOutput : public COutput {
+private:
+
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFEAOutput(CConfig *config, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFEAOutput(void);
+
+  /*!
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+};
+
 #include "output_structure.inl"
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 52ddd1efddf1..65b2b1124ca8 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -113,6 +113,11 @@ libSU2Core_sources = \
   ../src/output_direct_elasticity.cpp \
   ../src/output_direct_mean.cpp \
   ../src/output_direct_mean_inc.cpp \
+  ../src/output_direct_heat.cpp \
+  ../src/output_adjoint_elasticity.cpp \
+  ../src/output_adjoint_discrete.cpp \
+  ../src/output_adjoint_mean.cpp \
+  ../src/output_driver.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
diff --git a/SU2_CFD/obj/Makefile.in b/SU2_CFD/obj/Makefile.in
index 7143cd20b4b7..3665a6889bf9 100644
--- a/SU2_CFD/obj/Makefile.in
+++ b/SU2_CFD/obj/Makefile.in
@@ -195,6 +195,10 @@ am__libSU2Core_a_SOURCES_DIST = ../include/definition_structure.hpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
 	../src/output_direct_mean.cpp \
 	../src/output_direct_mean_inc.cpp \
+	../src/output_direct_heat.cpp \
+	../src/output_adjoint_elasticity.cpp \
+	../src/output_adjoint_discrete.cpp \
+	../src/output_adjoint_mean.cpp ../src/output_driver.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -251,6 +255,11 @@ am__objects_1 = ../src/libSU2Core_a-definition_structure.$(OBJEXT) \
 	../src/libSU2Core_a-output_direct_elasticity.$(OBJEXT) \
 	../src/libSU2Core_a-output_direct_mean.$(OBJEXT) \
 	../src/libSU2Core_a-output_direct_mean_inc.$(OBJEXT) \
+	../src/libSU2Core_a-output_direct_heat.$(OBJEXT) \
+	../src/libSU2Core_a-output_adjoint_elasticity.$(OBJEXT) \
+	../src/libSU2Core_a-output_adjoint_discrete.$(OBJEXT) \
+	../src/libSU2Core_a-output_adjoint_mean.$(OBJEXT) \
+	../src/libSU2Core_a-output_driver.$(OBJEXT) \
 	../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT) \
 	../src/libSU2Core_a-solver_adjoint_turbulent.$(OBJEXT) \
@@ -337,6 +346,10 @@ am_____bin_SU2_CFD_AD_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
 	../src/output_direct_mean.cpp \
 	../src/output_direct_mean_inc.cpp \
+	../src/output_direct_heat.cpp \
+	../src/output_adjoint_elasticity.cpp \
+	../src/output_adjoint_discrete.cpp \
+	../src/output_adjoint_mean.cpp ../src/output_driver.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -394,6 +407,11 @@ am__objects_4 =  \
 	../src/___bin_SU2_CFD_AD-output_direct_elasticity.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_direct_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-output_direct_mean_inc.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_direct_heat.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_adjoint_discrete.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_adjoint_mean.$(OBJEXT) \
+	../src/___bin_SU2_CFD_AD-output_driver.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_AD-solver_adjoint_turbulent.$(OBJEXT) \
@@ -470,6 +488,10 @@ am_____bin_SU2_CFD_DIRECTDIFF_SOURCES_DIST = ../include/SU2_CFD.hpp \
 	../src/output_paraview.cpp ../src/output_direct_elasticity.cpp \
 	../src/output_direct_mean.cpp \
 	../src/output_direct_mean_inc.cpp \
+	../src/output_direct_heat.cpp \
+	../src/output_adjoint_elasticity.cpp \
+	../src/output_adjoint_discrete.cpp \
+	../src/output_adjoint_mean.cpp ../src/output_driver.cpp \
 	../src/python_wrapper_structure.cpp \
 	../src/solver_adjoint_mean.cpp \
 	../src/solver_adjoint_turbulent.cpp \
@@ -526,6 +548,11 @@ am__objects_6 = ../src/___bin_SU2_CFD_DIRECTDIFF-definition_structure.$(OBJEXT)
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.$(OBJEXT) \
+	../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT) \
 	../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_turbulent.$(OBJEXT) \
@@ -843,6 +870,11 @@ libSU2Core_sources = \
   ../src/output_direct_elasticity.cpp \
   ../src/output_direct_mean.cpp \
   ../src/output_direct_mean_inc.cpp \
+  ../src/output_direct_heat.cpp \
+  ../src/output_adjoint_elasticity.cpp \
+  ../src/output_adjoint_discrete.cpp \
+  ../src/output_adjoint_mean.cpp \
+  ../src/output_driver.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
@@ -1017,6 +1049,16 @@ clean-noinstLIBRARIES:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-output_direct_mean_inc.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_direct_heat.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_adjoint_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_adjoint_discrete.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_adjoint_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2Core_a-output_driver.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2Core_a-solver_adjoint_mean.$(OBJEXT):  \
@@ -1195,6 +1237,16 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_direct_heat.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_adjoint_discrete.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_adjoint_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_AD-output_driver.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_AD-solver_adjoint_mean.$(OBJEXT):  \
@@ -1321,6 +1373,16 @@ clean-binPROGRAMS:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.$(OBJEXT):  \
+	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/___bin_SU2_CFD_DIRECTDIFF-solver_adjoint_mean.$(OBJEXT):  \
@@ -1413,10 +1475,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_direct_turbulent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-numerics_template.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_mean_inc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_physics.Po@am__quote@
@@ -1474,10 +1541,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_direct_turbulent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-numerics_template.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_physics.Po@am__quote@
@@ -1534,10 +1606,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_direct_turbulent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-numerics_template.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_cgns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_elasticity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_mean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_direct_mean_inc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_driver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_fieldview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_paraview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2Core_a-output_physics.Po@am__quote@
@@ -2037,6 +2114,76 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
 
+../src/libSU2Core_a-output_direct_heat.o: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_heat.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Tpo -c -o ../src/libSU2Core_a-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/libSU2Core_a-output_direct_heat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+
+../src/libSU2Core_a-output_direct_heat.obj: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_direct_heat.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Tpo -c -o ../src/libSU2Core_a-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/libSU2Core_a-output_direct_heat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+
+../src/libSU2Core_a-output_adjoint_elasticity.o: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Tpo -c -o ../src/libSU2Core_a-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/libSU2Core_a-output_adjoint_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+
+../src/libSU2Core_a-output_adjoint_elasticity.obj: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Tpo -c -o ../src/libSU2Core_a-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/libSU2Core_a-output_adjoint_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+
+../src/libSU2Core_a-output_adjoint_discrete.o: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_discrete.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Tpo -c -o ../src/libSU2Core_a-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/libSU2Core_a-output_adjoint_discrete.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+
+../src/libSU2Core_a-output_adjoint_discrete.obj: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_discrete.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Tpo -c -o ../src/libSU2Core_a-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/libSU2Core_a-output_adjoint_discrete.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+
+../src/libSU2Core_a-output_adjoint_mean.o: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_mean.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Tpo -c -o ../src/libSU2Core_a-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/libSU2Core_a-output_adjoint_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+
+../src/libSU2Core_a-output_adjoint_mean.obj: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_adjoint_mean.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Tpo -c -o ../src/libSU2Core_a-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/libSU2Core_a-output_adjoint_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+
+../src/libSU2Core_a-output_driver.o: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_driver.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_driver.Tpo -c -o ../src/libSU2Core_a-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_driver.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/libSU2Core_a-output_driver.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+
+../src/libSU2Core_a-output_driver.obj: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-output_driver.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-output_driver.Tpo -c -o ../src/libSU2Core_a-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-output_driver.Tpo ../src/$(DEPDIR)/libSU2Core_a-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/libSU2Core_a-output_driver.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2Core_a-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+
 ../src/libSU2Core_a-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2Core_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2Core_a-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo -c -o ../src/libSU2Core_a-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Tpo ../src/$(DEPDIR)/libSU2Core_a-python_wrapper_structure.Po
@@ -2905,6 +3052,76 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
 
+../src/___bin_SU2_CFD_AD-output_direct_heat.o: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_heat.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_heat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+
+../src/___bin_SU2_CFD_AD-output_direct_heat.obj: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_direct_heat.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/___bin_SU2_CFD_AD-output_direct_heat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+
+../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.o: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+
+../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.obj: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+
+../src/___bin_SU2_CFD_AD-output_adjoint_discrete.o: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_discrete.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+
+../src/___bin_SU2_CFD_AD-output_adjoint_discrete.obj: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_discrete.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+
+../src/___bin_SU2_CFD_AD-output_adjoint_mean.o: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_mean.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+
+../src/___bin_SU2_CFD_AD-output_adjoint_mean.obj: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_adjoint_mean.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/___bin_SU2_CFD_AD-output_adjoint_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+
+../src/___bin_SU2_CFD_AD-output_driver.o: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_driver.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/___bin_SU2_CFD_AD-output_driver.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+
+../src/___bin_SU2_CFD_AD-output_driver.obj: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-output_driver.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Tpo -c -o ../src/___bin_SU2_CFD_AD-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/___bin_SU2_CFD_AD-output_driver.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_AD-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+
 ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_AD_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_AD-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_AD-python_wrapper_structure.Po
@@ -3759,6 +3976,76 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_mean_inc.obj `if test -f '../src/output_direct_mean_inc.cpp'; then $(CYGPATH_W) '../src/output_direct_mean_inc.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_mean_inc.cpp'; fi`
 
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.o: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.o `test -f '../src/output_direct_heat.cpp' || echo '$(srcdir)/'`../src/output_direct_heat.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.obj: ../src/output_direct_heat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_direct_heat.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_direct_heat.obj `if test -f '../src/output_direct_heat.cpp'; then $(CYGPATH_W) '../src/output_direct_heat.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_direct_heat.cpp'; fi`
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.o: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.o `test -f '../src/output_adjoint_elasticity.cpp' || echo '$(srcdir)/'`../src/output_adjoint_elasticity.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.obj: ../src/output_adjoint_elasticity.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_elasticity.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_elasticity.obj `if test -f '../src/output_adjoint_elasticity.cpp'; then $(CYGPATH_W) '../src/output_adjoint_elasticity.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_elasticity.cpp'; fi`
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.o: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.o `test -f '../src/output_adjoint_discrete.cpp' || echo '$(srcdir)/'`../src/output_adjoint_discrete.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.obj: ../src/output_adjoint_discrete.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_discrete.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_discrete.obj `if test -f '../src/output_adjoint_discrete.cpp'; then $(CYGPATH_W) '../src/output_adjoint_discrete.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_discrete.cpp'; fi`
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.o: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.o `test -f '../src/output_adjoint_mean.cpp' || echo '$(srcdir)/'`../src/output_adjoint_mean.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.obj: ../src/output_adjoint_mean.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_adjoint_mean.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_adjoint_mean.obj `if test -f '../src/output_adjoint_mean.cpp'; then $(CYGPATH_W) '../src/output_adjoint_mean.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_adjoint_mean.cpp'; fi`
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.o: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.o `test -f '../src/output_driver.cpp' || echo '$(srcdir)/'`../src/output_driver.cpp
+
+../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.obj: ../src/output_driver.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-output_driver.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/output_driver.cpp' object='../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-output_driver.obj `if test -f '../src/output_driver.cpp'; then $(CYGPATH_W) '../src/output_driver.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/output_driver.cpp'; fi`
+
 ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o: ../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_CFD_DIRECTDIFF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo -c -o ../src/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.o `test -f '../src/python_wrapper_structure.cpp' || echo '$(srcdir)/'`../src/python_wrapper_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Tpo ../src/$(DEPDIR)/___bin_SU2_CFD_DIRECTDIFF-python_wrapper_structure.Po
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index d8debe6d4b18..86b273bd5408 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -544,23 +544,6 @@ void CDriver::Postprocessing() {
     if (config_container[ZONE_0]->GetNonphysical_Reconstr() > 0)
       cout << "Warning: " << config_container[ZONE_0]->GetNonphysical_Reconstr() << " reconstructed states for upwinding are non-physical." << endl;
 
-    /*--- Close the convergence history file. ---*/
-    for (iZone = 0; iZone < nZone; iZone++) {
-      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
-        if ((config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY) &&
-            (config_container[iZone]->GetKind_Solver() != EULER) &&
-            (config_container[iZone]->GetKind_Solver() != NAVIER_STOKES) &&
-            (config_container[iZone]->GetKind_Solver() != RANS))
-        ConvHist_file[iZone][iInst].close();
-      }
-      if ((config_container[iZone]->GetKind_Solver() != FEM_ELASTICITY) &&
-          (config_container[iZone]->GetKind_Solver() != EULER) &&
-          (config_container[iZone]->GetKind_Solver() != NAVIER_STOKES) &&
-          (config_container[iZone]->GetKind_Solver() != RANS))
-        delete [] ConvHist_file[iZone];
-    }
-    delete [] ConvHist_file;
-
   }
 
   if (rank == MASTER_NODE)
@@ -2994,28 +2977,10 @@ void CDriver::Output_Preprocessing(){
         output[iZone] = new CIncFlowOutput(config_container[iZone], iZone);
       break;
 
-    case WAVE_EQUATION:
-      if (rank == MASTER_NODE)
-        cout << ": wave output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
-      break;
-
-    case HEAT_EQUATION:
-      if (rank == MASTER_NODE)
-        cout << ": heat output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
-      break;
-
     case HEAT_EQUATION_FVM:
       if (rank == MASTER_NODE)
         cout << ": heat output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
-      break;
-
-    case POISSON_EQUATION:
-      if (rank == MASTER_NODE)
-        cout << ": poisson output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      output[iZone] = new CHeatOutput(config_container[iZone], iZone);
       break;
 
     case FEM_ELASTICITY:
@@ -3028,40 +2993,24 @@ void CDriver::Output_Preprocessing(){
     case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
       if (rank == MASTER_NODE)
         cout << ": adjoint Euler/Navier-Stokes/RANS output structure.." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      output[iZone] = new CAdjFlowOutput(config_container[iZone], iZone);
       break;
 
     case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint Euler/Navier-Stokes/RANS output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], iZone);
       break;
 
     case DISC_ADJ_FEM:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint FEA output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], iZone);
       break;
     }
 
   }
 
-  /*--- Open the convergence history file ---*/
-
-
-  ConvHist_file = NULL;
-  ConvHist_file = new ofstream*[nZone];
-  for (iZone = 0; iZone < nZone; iZone++) {
-    ConvHist_file[iZone] = NULL;
-    if (rank == MASTER_NODE){
-      ConvHist_file[iZone] = new ofstream[nInst[iZone]];
-      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
-        if (!new_approach) output[iZone]->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
-        config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
-      }
-    }
-  }
-
 }
 
 void CDriver::TurbomachineryPreprocessing(){
@@ -3315,7 +3264,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   if (!fsi) {
     for (iZone = 0; iZone < nZone; iZone++) {
       for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        output[ZONE_0]->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+        output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container,
             config_container, integration_container, false, UsedTime, iZone, iInst);
     }
   }
@@ -3754,7 +3703,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInst[iZone]; iInst++)
-      output[iZone]->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+      output[iZone]->SetConvHistory_Body(NULL, geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone, iInst);
   }
 
@@ -5027,7 +4976,7 @@ void CFSIDriver::Run() {
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-      output[ZONE_FLOW]->SetConvHistory_Body(&ConvHist_file[ZONE_FLOW][INST_0], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
+      output[ZONE_FLOW]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
 
       /*--- If the convergence criteria is met for the flow, break the loop ---*/
       StopCalc_Flow = integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence();
@@ -6728,10 +6677,8 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   unsigned long BGS_Iter = config_container[ZONE_FLOW]->GetFSIIter();
 
 
-  ofstream ConvHist_file;
   if (rank == MASTER_NODE)
-    output[ZONE_0]->SetConvHistory_Header(&ConvHist_file, config_container[ZONE_0], ZONE_0, INST_0);
-
+    output[ZONE_0]->SetConvHistory_Header(NULL, config_container[ZONE_0], ZONE_0, INST_0);
 
   if (kind_recording == FLOW_CONS_VARS) {
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
new file mode 100644
index 000000000000..b8e4af013da5
--- /dev/null
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -0,0 +1,2011 @@
+/*!
+ * \file output_adjoint_mean.cpp
+ * \brief Main subroutines for flow discrete adjoint output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+}
+
+void CDiscAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+
+  /*--- Header for the residuals ---*/
+
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+  char heat_resid[]= ",\"Res_Heat\"";
+
+  /*--- End of the header ---*/
+
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  switch (config->GetKind_Solver()) {
+
+    case EULER : case NAVIER_STOKES: case RANS :
+      HistFile << begin;
+      if (!turbo) HistFile << flow_coeff;
+      if (turbo) HistFile << turbo_coeff;
+      if (thermal && !turbo) HistFile << heat_coeff;
+      if (equiv_area) HistFile << equivalent_area_coeff;
+      if (engine || actuator_disk) HistFile << engine_coeff;
+      if (inv_design) {
+        HistFile << Cp_inverse_design;
+        if (thermal && !turbo) HistFile << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+      HistFile << flow_resid;
+      if (turbulent) HistFile << turb_resid;
+      if (weakly_coupled_heat) HistFile << heat_resid;
+      if (aeroelastic) HistFile << aeroelastic_coeff;
+      if (output_per_surface) HistFile << monitoring_coeff;
+      if (output_surface) HistFile << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) HistFile << d_flow_coeff;
+        else        HistFile << d_turbo_coeff;
+        if (engine || actuator_disk) HistFile << d_engine;
+        if (thermal) HistFile << d_thermal_coeff;
+      }
+      if (output_comboObj) HistFile << combo_obj;
+      HistFile << end;
+
+      break;
+
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          HistFile << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          HistFile << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+      HistFile << end;
+      break;
+
+    case HEAT_EQUATION_FVM:
+      HistFile << begin << heat_coeff;
+      HistFile << heat_resid << end;
+      break;
+
+    case FEM_ELASTICITY:
+      HistFile << begin << fem_coeff;
+      if (incload) HistFile << fem_incload;
+      HistFile << fem_resid << endfea;
+      break;
+
+    case DISC_ADJ_FEM:
+      HistFile << begin << fem_coeff;
+      HistFile << fem_resid << endfea;
+      break;
+
+  }
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CDiscAdjFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
+
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+
+    if (fea || fluid_structure) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          break;
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+
+      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+
+    }
+
+  }
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_Density = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+    su2double *residual_heat         = NULL;
+
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch  = NULL,
+    *Surface_CL         = NULL,
+    *Surface_CD         = NULL,
+    *Surface_CSF        = NULL,
+    *Surface_CEff       = NULL,
+    *Surface_CFx        = NULL,
+    *Surface_CFy        = NULL,
+    *Surface_CFz        = NULL,
+    *Surface_CMx        = NULL,
+    *Surface_CMy        = NULL,
+    *Surface_CMz        = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+    nVar_FEM = 0;
+
+    /*--- Direct problem variables ---*/
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (heat) nVar_Heat = 1;
+
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+
+    /*--- Adjoint problem variables ---*/
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
+
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Write information from nodes ---*/
+
+    switch (config[val_iZone]->GetKind_Solver()) {
+
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+
+        /*--- Flow solution coefficients ---*/
+
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
+
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
+
+          if (engine || actuator_disk) {
+            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+          }
+
+        }
+
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
+
+        if (engine || actuator_disk) {
+          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
+
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
+
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
+
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+          }
+        }
+
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
+
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+        }
+
+        /*--- Flow Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+        /*--- Turbulent residual ---*/
+
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
+
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
+
+        }
+
+        /*--- Transition residual ---*/
+
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
+
+
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
+
+        /*--- Iterations of the linear solver ---*/
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+        /*--- Adjoint solver ---*/
+
+        if (adjoint) {
+
+          /*--- Adjoint solution coefficients ---*/
+
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+
+          /*--- Adjoint turbulent residuals ---*/
+
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+        }
+
+        break;
+
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+
+        /*--- Heat Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case FEM_ELASTICITY:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+
+    /*--- Header frequency ---*/
+
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
+
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+
+        /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+
+          case EULER : case NAVIER_STOKES: case RANS:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                //
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+
+
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+
+            /*---- Averaged stagnation pressure at an exit ----*/
+
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+            }
+
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
+            if (adjoint) {
+
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+
+          case FEM_ELASTICITY:
+
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
+
+          if (!fem) {
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                  if (nZone > 1)
+                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << "      Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
+
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
+        }
+      }
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+
+                cout.unsetf(ios_base::floatfield);
+
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+
+        case RANS :
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid << turb_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;
+            }
+          }
+          break;
+
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << direct_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          break;
+
+        case FEM_ELASTICITY:
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+          break;
+
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+        case ADJ_RANS : case DISC_ADJ_RANS:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              HistFile << adj_turb_resid;
+            HistFile << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_fea;
+    delete [] residual_fem;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+
+  }
+}
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
new file mode 100644
index 000000000000..c7ec0257ed9d
--- /dev/null
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -0,0 +1,305 @@
+/*!
+ * \file output_adjoint_mean.cpp
+ * \brief Main subroutines for elasticity discrete adjoint output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+
+}
+
+void CDiscAdjFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+
+  bool incload = config->GetIncrementalLoad();
+
+  /*--- Begin of the header ---*/
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+
+  /*--- Header for the residuals ---*/
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+
+  /*--- End of the header ---*/
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+  HistFile << begin << fem_coeff;
+  if (incload) ConvHist_file[0] << fem_incload;
+  HistFile << fem_resid << endfea;
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CDiscAdjFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                     CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
+
+
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short iVar;
+    unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_FEM = 0;
+    if (linear_analysis) nVar_FEM = nDim;
+    if (nonlinear_analysis) nVar_FEM = 3;
+
+    /*--- Allocate memory for the residual ---*/
+    su2double *residual_fem          = NULL;
+    residual_fem        = new su2double[nVar_FEM];
+
+    /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+    su2double Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
+    su2double Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
+    su2double Total_IncLoad    = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment();
+    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetIterLinSolver();
+
+    /*--- Residuals: ---*/
+    /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+    /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+    if (linear_analysis) {
+      for (iVar = 0; iVar < nVar_FEM; iVar++) {
+        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
+      }
+    }
+    else if (nonlinear_analysis) {
+      for (iVar = 0; iVar < nVar_FEM; iVar++) {
+        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
+      }
+    }
+
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
+
+    // Load data to buffers
+    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
+
+    SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+    /*--- Initial variables ---*/
+    if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+    else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+
+    /*--- FEM residual ---*/
+    if (nVar_FEM == 2)
+      SPRINTF (fem_resid, ", %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
+    else
+      SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+
+    /*--- Linear solver iterations and time used ---*/
+    SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+    // Write to history file
+
+    HistFile << begin_fem << fem_coeff << fem_resid << end_fem;
+    HistFile.flush();
+
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
+
+    bool write_header;
+    if (nonlinear_analysis) write_header = (iIntIter == 0);
+    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (write_header) {
+
+      if (dynamic && nonlinear_analysis) {
+        cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+      }
+
+      if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+      else cout << endl << " IntIter" << " ExtIter";
+
+      if (linear_analysis) {
+        if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+        if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+      }
+      else if (nonlinear_analysis) {
+        switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+        case RESFEM_RELATIVE:
+          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+          break;
+        case RESFEM_ABSOLUTE:
+          cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+          break;
+        default:
+          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+          break;
+        }
+      }
+
+    }
+
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
+
+    if (!nonlinear_analysis) {
+      cout.width(5); cout << iExtIter;
+      cout.width(11); cout << timeiter;
+
+    } else {
+      cout.width(8); cout << iIntIter;
+      cout.width(8); cout << iExtIter;
+    }
+
+    cout.precision(6);
+    cout.setf(ios::fixed, ios::floatfield);
+    if (linear_analysis) {
+      cout.width(14); cout << log10(residual_fem[0]);
+      cout.width(14); cout << log10(residual_fem[1]);
+      if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+    }
+    else if (nonlinear_analysis) {
+      cout.width(14); cout << log10(residual_fem[0]);
+      cout.width(14); cout << log10(residual_fem[1]);
+      cout.width(14); cout << log10(residual_fem[2]);
+    }
+
+    cout.precision(4);
+    cout.setf(ios::scientific, ios::floatfield);
+    cout.width(14); cout << Total_VMStress;
+    cout << endl;
+
+    cout.unsetf(ios::fixed);
+
+
+    delete [] residual_fem;
+
+  }
+}
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
new file mode 100644
index 000000000000..3bb3b7bc073e
--- /dev/null
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -0,0 +1,2011 @@
+/*!
+ * \file output_adjoint_mean.cpp
+ * \brief Main subroutines for flow continuous adjoint output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CAdjFlowOutput::CAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CAdjFlowOutput::~CAdjFlowOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+}
+
+void CAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+
+  /*--- Header for the residuals ---*/
+
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+  char heat_resid[]= ",\"Res_Heat\"";
+
+  /*--- End of the header ---*/
+
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  switch (config->GetKind_Solver()) {
+
+    case EULER : case NAVIER_STOKES: case RANS :
+      HistFile << begin;
+      if (!turbo) HistFile << flow_coeff;
+      if (turbo) HistFile << turbo_coeff;
+      if (thermal && !turbo) HistFile << heat_coeff;
+      if (equiv_area) HistFile << equivalent_area_coeff;
+      if (engine || actuator_disk) HistFile << engine_coeff;
+      if (inv_design) {
+        HistFile << Cp_inverse_design;
+        if (thermal && !turbo) HistFile << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+      HistFile << flow_resid;
+      if (turbulent) HistFile << turb_resid;
+      if (weakly_coupled_heat) HistFile << heat_resid;
+      if (aeroelastic) HistFile << aeroelastic_coeff;
+      if (output_per_surface) HistFile << monitoring_coeff;
+      if (output_surface) HistFile << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) HistFile << d_flow_coeff;
+        else        HistFile << d_turbo_coeff;
+        if (engine || actuator_disk) HistFile << d_engine;
+        if (thermal) HistFile << d_thermal_coeff;
+      }
+      if (output_comboObj) HistFile << combo_obj;
+      HistFile << end;
+
+      break;
+
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          HistFile << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          HistFile << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+      HistFile << end;
+      break;
+
+    case HEAT_EQUATION_FVM:
+      HistFile << begin << heat_coeff;
+      HistFile << heat_resid << end;
+      break;
+
+    case FEM_ELASTICITY:
+      HistFile << begin << fem_coeff;
+      if (incload) HistFile << fem_incload;
+      HistFile << fem_resid << endfea;
+      break;
+
+    case DISC_ADJ_FEM:
+      HistFile << begin << fem_coeff;
+      HistFile << fem_resid << endfea;
+      break;
+
+  }
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CAdjFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
+
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+
+    if (fea || fluid_structure) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          break;
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+
+      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+
+    }
+
+  }
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_Density = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+    su2double *residual_heat         = NULL;
+
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch  = NULL,
+    *Surface_CL         = NULL,
+    *Surface_CD         = NULL,
+    *Surface_CSF        = NULL,
+    *Surface_CEff       = NULL,
+    *Surface_CFx        = NULL,
+    *Surface_CFy        = NULL,
+    *Surface_CFz        = NULL,
+    *Surface_CMx        = NULL,
+    *Surface_CMy        = NULL,
+    *Surface_CMz        = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+    nVar_FEM = 0;
+
+    /*--- Direct problem variables ---*/
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (heat) nVar_Heat = 1;
+
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+
+    /*--- Adjoint problem variables ---*/
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
+
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Write information from nodes ---*/
+
+    switch (config[val_iZone]->GetKind_Solver()) {
+
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+
+        /*--- Flow solution coefficients ---*/
+
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
+
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
+
+          if (engine || actuator_disk) {
+            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+          }
+
+        }
+
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
+
+        if (engine || actuator_disk) {
+          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
+
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
+
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
+
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+          }
+        }
+
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
+
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+        }
+
+        /*--- Flow Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+        /*--- Turbulent residual ---*/
+
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
+
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
+
+        }
+
+        /*--- Transition residual ---*/
+
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
+
+
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
+
+        /*--- Iterations of the linear solver ---*/
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+        /*--- Adjoint solver ---*/
+
+        if (adjoint) {
+
+          /*--- Adjoint solution coefficients ---*/
+
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+
+          /*--- Adjoint turbulent residuals ---*/
+
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+        }
+
+        break;
+
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+
+        /*--- Heat Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case FEM_ELASTICITY:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+
+    /*--- Header frequency ---*/
+
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
+
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+
+        /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+
+          case EULER : case NAVIER_STOKES: case RANS:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                //
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+
+
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+
+            /*---- Averaged stagnation pressure at an exit ----*/
+
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+            }
+
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
+            if (adjoint) {
+
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+
+          case FEM_ELASTICITY:
+
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
+
+          if (!fem) {
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                  if (nZone > 1)
+                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << "      Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
+
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
+        }
+      }
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+
+                cout.unsetf(ios_base::floatfield);
+
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+
+        case RANS :
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid << turb_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;
+            }
+          }
+          break;
+
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << direct_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          break;
+
+        case FEM_ELASTICITY:
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+          break;
+
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+        case ADJ_RANS : case DISC_ADJ_RANS:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              HistFile << adj_turb_resid;
+            HistFile << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_fea;
+    delete [] residual_fem;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+
+  }
+}
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
new file mode 100644
index 000000000000..b2960095701f
--- /dev/null
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -0,0 +1,2011 @@
+/*!
+ * \file output_direct_heat.cpp
+ * \brief Main subroutines for the heat solver output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CHeatOutput::CHeatOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+
+  char buffer[50];
+
+  // Retrieve the history filename
+  string history_filename = config->GetConv_FileName();
+
+  // Append the zone ID
+  if(config->GetnZone() > 1){
+    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+  }
+  strcpy (char_histfile, history_filename.data());
+
+  // Append the restart iteration: if dynamic problem and restart
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+    long iExtIter = config->GetDyn_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+
+  // Add the correct file extension depending on the file format
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+  }
+
+}
+
+CHeatOutput::~CHeatOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+}
+
+void CHeatOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+
+  /*--- Begin of the header ---*/
+
+  char begin[]= "\"Iteration\"";
+
+  /*--- Header for the coefficients ---*/
+
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+
+  /*--- Header for the residuals ---*/
+
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+  char heat_resid[]= ",\"Res_Heat\"";
+
+  /*--- End of the header ---*/
+
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+
+  /*--- Write the header, case depending ---*/
+
+  switch (config->GetKind_Solver()) {
+
+    case EULER : case NAVIER_STOKES: case RANS :
+      HistFile << begin;
+      if (!turbo) HistFile << flow_coeff;
+      if (turbo) HistFile << turbo_coeff;
+      if (thermal && !turbo) HistFile << heat_coeff;
+      if (equiv_area) HistFile << equivalent_area_coeff;
+      if (engine || actuator_disk) HistFile << engine_coeff;
+      if (inv_design) {
+        HistFile << Cp_inverse_design;
+        if (thermal && !turbo) HistFile << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+      HistFile << flow_resid;
+      if (turbulent) HistFile << turb_resid;
+      if (weakly_coupled_heat) HistFile << heat_resid;
+      if (aeroelastic) HistFile << aeroelastic_coeff;
+      if (output_per_surface) HistFile << monitoring_coeff;
+      if (output_surface) HistFile << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) HistFile << d_flow_coeff;
+        else        HistFile << d_turbo_coeff;
+        if (engine || actuator_disk) HistFile << d_engine;
+        if (thermal) HistFile << d_thermal_coeff;
+      }
+      if (output_comboObj) HistFile << combo_obj;
+      HistFile << end;
+
+      break;
+
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          HistFile << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          HistFile << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+      HistFile << end;
+      break;
+
+    case HEAT_EQUATION_FVM:
+      HistFile << begin << heat_coeff;
+      HistFile << heat_resid << end;
+      break;
+
+    case FEM_ELASTICITY:
+      HistFile << begin << fem_coeff;
+      if (incload) HistFile << fem_incload;
+      HistFile << fem_resid << endfea;
+      break;
+
+    case DISC_ADJ_FEM:
+      HistFile << begin << fem_coeff;
+      HistFile << fem_resid << endfea;
+      break;
+
+  }
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+
+}
+
+
+void CHeatOutput::SetConvHistory_Body(ofstream *ConvHist_file,
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
+
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+
+    if (fea || fluid_structure) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+          }
+
+          break;
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+
+      /*--- Output a file with the forces breakdown. ---*/
+
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+
+      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+
+    }
+
+  }
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_Density = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+    su2double *residual_heat         = NULL;
+
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch  = NULL,
+    *Surface_CL         = NULL,
+    *Surface_CD         = NULL,
+    *Surface_CSF        = NULL,
+    *Surface_CEff       = NULL,
+    *Surface_CFx        = NULL,
+    *Surface_CFy        = NULL,
+    *Surface_CFz        = NULL,
+    *Surface_CMx        = NULL,
+    *Surface_CMy        = NULL,
+    *Surface_CMz        = NULL;
+
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+    nVar_FEM = 0;
+
+    /*--- Direct problem variables ---*/
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (heat) nVar_Heat = 1;
+
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+
+    /*--- Adjoint problem variables ---*/
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
+
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Write information from nodes ---*/
+
+    switch (config[val_iZone]->GetKind_Solver()) {
+
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+
+        /*--- Flow solution coefficients ---*/
+
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
+
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
+
+          if (engine || actuator_disk) {
+            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+          }
+
+        }
+
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
+
+        if (engine || actuator_disk) {
+          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
+
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
+
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
+
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+          }
+        }
+
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
+
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+        }
+
+        /*--- Flow Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+        /*--- Turbulent residual ---*/
+
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
+
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
+
+        }
+
+        /*--- Transition residual ---*/
+
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
+
+
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
+
+        /*--- Iterations of the linear solver ---*/
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+        /*--- Adjoint solver ---*/
+
+        if (adjoint) {
+
+          /*--- Adjoint solution coefficients ---*/
+
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+
+          /*--- Adjoint turbulent residuals ---*/
+
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+        }
+
+        break;
+
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+
+        /*--- Heat Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+
+      case FEM_ELASTICITY:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+
+    /*--- Header frequency ---*/
+
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
+
+
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+
+        /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+
+          case EULER : case NAVIER_STOKES: case RANS:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+                strcat(turbo_coeff, surface_coeff);
+                //
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+                strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+
+
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+
+            /*---- Averaged stagnation pressure at an exit ----*/
+
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+            }
+
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
+            if (adjoint) {
+
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+
+          case FEM_ELASTICITY:
+
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
+
+          if (!fem) {
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                  if (nZone > 1)
+                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << "      Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
+
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
+        }
+      }
+
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+
+                cout.unsetf(ios_base::floatfield);
+
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+
+        case RANS :
+
+          /*--- Write history file ---*/
+
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              HistFile << begin << direct_coeff;
+              if (thermal) HistFile << heat_coeff;
+              if (equiv_area) HistFile << equivalent_area_coeff;
+              if (engine || actuator_disk) HistFile << engine_coeff;
+              if (inv_design) {
+                HistFile << Cp_inverse_design;
+                if (thermal) HistFile << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+              HistFile << flow_resid << turb_resid;
+              if (weakly_coupled_heat) HistFile << heat_resid;
+            }
+            else {
+              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+
+            if (aeroelastic) HistFile << aeroelastic_coeff;
+            if (output_per_surface) HistFile << monitoring_coeff;
+            if (output_surface) HistFile << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+            if (output_comboObj) HistFile << combo_obj;
+            HistFile << end;
+            HistFile.flush();
+          }
+
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;
+            }
+          }
+          break;
+
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << direct_coeff << heat_resid << end;
+            HistFile.flush();
+          }
+          break;
+
+        case FEM_ELASTICITY:
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+          break;
+
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+        case ADJ_RANS : case DISC_ADJ_RANS:
+
+          if (!DualTime_Iteration) {
+            HistFile << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              HistFile << adj_turb_resid;
+            HistFile << end;
+            HistFile.flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_fea;
+    delete [] residual_fem;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+
+  }
+}
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 9a99227b5704..4f7600039d08 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -1,6 +1,6 @@
 /*!
  * \file output_direct_mean.cpp
- * \brief Main subroutines for FEA output
+ * \brief Main subroutines for compressible flow output
  * \author R. Sanchez
  * \version 6.0.1 "Falcon"
  *
@@ -134,6 +134,8 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
   char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
   char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
   char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
   char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
   char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
   char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
@@ -207,11 +209,13 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
       break;
     case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
   }
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
   char heat_resid[]= ",\"Res_Heat\"";
 
   /*--- End of the header ---*/
 
   char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
 
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
@@ -223,32 +227,70 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
 
   /*--- Write the header, case depending ---*/
 
-  HistFile << begin;
-  if (!turbo) HistFile << flow_coeff;
-  if (turbo) HistFile << turbo_coeff;
-  if (thermal && !turbo) HistFile << heat_coeff;
-  if (equiv_area) HistFile << equivalent_area_coeff;
-  if (engine || actuator_disk) HistFile << engine_coeff;
-  if (inv_design) {
-    HistFile << Cp_inverse_design;
-    if (thermal && !turbo) HistFile << Heat_inverse_design;
-  }
-  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-  HistFile << flow_resid;
-  if (turbulent) HistFile << turb_resid;
-  if (weakly_coupled_heat) HistFile << heat_resid;
-  if (aeroelastic) HistFile << aeroelastic_coeff;
-  if (output_per_surface) HistFile << monitoring_coeff;
-  if (output_surface) HistFile << surface_outputs;
-  if (direct_diff != NO_DERIVATIVE) {
-    if (!turbo) HistFile << d_flow_coeff;
-    else        HistFile << d_turbo_coeff;
-    if (engine || actuator_disk) HistFile << d_engine;
-    if (thermal) HistFile << d_thermal_coeff;
+  switch (config->GetKind_Solver()) {
+
+    case EULER : case NAVIER_STOKES: case RANS :
+      HistFile << begin;
+      if (!turbo) HistFile << flow_coeff;
+      if (turbo) HistFile << turbo_coeff;
+      if (thermal && !turbo) HistFile << heat_coeff;
+      if (equiv_area) HistFile << equivalent_area_coeff;
+      if (engine || actuator_disk) HistFile << engine_coeff;
+      if (inv_design) {
+        HistFile << Cp_inverse_design;
+        if (thermal && !turbo) HistFile << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+      HistFile << flow_resid;
+      if (turbulent) HistFile << turb_resid;
+      if (weakly_coupled_heat) HistFile << heat_resid;
+      if (aeroelastic) HistFile << aeroelastic_coeff;
+      if (output_per_surface) HistFile << monitoring_coeff;
+      if (output_surface) HistFile << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) HistFile << d_flow_coeff;
+        else        HistFile << d_turbo_coeff;
+        if (engine || actuator_disk) HistFile << d_engine;
+        if (thermal) HistFile << d_thermal_coeff;
+      }
+      if (output_comboObj) HistFile << combo_obj;
+      HistFile << end;
+
+      break;
+
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          HistFile << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          HistFile << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+      HistFile << end;
+      break;
+
+    case HEAT_EQUATION_FVM:
+      HistFile << begin << heat_coeff;
+      HistFile << heat_resid << end;
+      break;
+
+    case FEM_ELASTICITY:
+      HistFile << begin << fem_coeff;
+      if (incload) HistFile << fem_incload;
+      HistFile << fem_resid << endfea;
+      break;
+
+    case DISC_ADJ_FEM:
+      HistFile << begin << fem_coeff;
+      HistFile << fem_resid << endfea;
+      break;
+
   }
-  if (output_comboObj) HistFile << combo_obj;
-  HistFile << end;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -261,14 +303,14 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
 
 
 void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                     CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
 
   bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
@@ -392,8 +434,8 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
     adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000], wave_coeff[1000],
-    begin_fem[1000], fem_coeff[1000], wave_resid[1000], heat_resid[1000], combo_obj[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
     fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
 
     su2double dummy = 0.0, *Coord;
@@ -417,13 +459,18 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
                       (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
     bool adjoint =  cont_adj || disc_adj;
     bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool heat = (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION) || (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
     bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
     bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
     (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
     (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
 
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
     bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
     bool turbo = config[val_iZone]->GetBoolTurbomachinery();
 
@@ -443,7 +490,7 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
       if (ExtraHeatOutputZone > nZone) {
         SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
       }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION) && (config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
         SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
       }
       else {
@@ -455,7 +502,7 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
     Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CWave = 0.0, Total_CHeat = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
     Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
     Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
     Total_AoA = 0.0;
@@ -486,6 +533,8 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     *residual_transition   = NULL;
     su2double *residual_adjflow      = NULL,
     *residual_adjturbulent = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
     su2double *residual_heat         = NULL;
 
     /*--- Coefficients Monitored arrays ---*/
@@ -505,10 +554,11 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     /*--- Initialize number of variables ---*/
     unsigned short nVar_Flow = 0, nVar_Turb = 0,
     nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0;
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+    nVar_FEM = 0;
 
     /*--- Direct problem variables ---*/
-    nVar_Flow = nDim+2;
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
@@ -518,8 +568,16 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     if (transition) nVar_Trans = 2;
     if (heat) nVar_Heat = 1;
 
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+
     /*--- Adjoint problem variables ---*/
-    nVar_AdjFlow = nDim+2;
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
@@ -532,6 +590,7 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     residual_turbulent  = new su2double[nVar_Turb];
     residual_transition = new su2double[nVar_Trans];
     residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
 
     residual_adjflow      = new su2double[nVar_AdjFlow];
     residual_adjturbulent = new su2double[nVar_AdjTurb];
@@ -552,205 +611,284 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     /*--- Write information from nodes ---*/
 
-    /*--- Flow solution coefficients ---*/
-
-    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-    if (thermal) {
-      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-      if(weakly_coupled_heat) {
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-      }
-    }
+    switch (config[val_iZone]->GetKind_Solver()) {
 
-    if (direct_diff != NO_DERIVATIVE) {
-      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-      if (thermal) {
-        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-        //Davg Temp
-      }
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+
+        /*--- Flow solution coefficients ---*/
+
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
 
-      if (engine || actuator_disk) {
-        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-      }
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
 
-    }
+          if (engine || actuator_disk) {
+            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+          }
 
-    if (equiv_area) {
-      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+        }
 
-      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-    }
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
 
-    if (engine || actuator_disk) {
-      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-    }
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
 
-    if (rotating_frame) {
-      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-    }
+        if (engine || actuator_disk) {
+          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
 
-    if (aeroelastic) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-      }
-    }
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
 
-    if (output_per_surface) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-      }
-    }
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
 
-    if (turbo) {
-      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
           }
         }
-      }
-      if (direct_diff != NO_DERIVATIVE){
-        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-      }
-    }
 
-    /*--- Get flux-averaged values at the specified surface ---*/
-
-    if (output_surface) {
-
-      unsigned short iMarker_Analyze = 0;
-      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
 
-    }
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
 
-    /*--- Flow Residuals ---*/
+        }
 
-    for (iVar = 0; iVar < nVar_Flow; iVar++)
-      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+        /*--- Flow Residuals ---*/
 
-    /*--- Turbulent residual ---*/
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
 
-    if (turbulent) {
-      for (iVar = 0; iVar < nVar_Turb; iVar++)
-        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-    }
+        /*--- Turbulent residual ---*/
 
-    if (weakly_coupled_heat) {
-      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-      }
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
 
-    }
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
 
-    /*--- Transition residual ---*/
+        }
 
-    if (transition) {
-      for (iVar = 0; iVar < nVar_Trans; iVar++)
-        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-    }
+        /*--- Transition residual ---*/
 
-    /*--- Iterations of the linear solver ---*/
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
 
-    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
 
-    /*--- Adjoint solver ---*/
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
 
-    if (adjoint) {
+        /*--- Iterations of the linear solver ---*/
 
-      /*--- Adjoint solution coefficients ---*/
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
 
-      Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-      Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-      Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-      Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-      Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-      Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-      Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-      Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+        /*--- Adjoint solver ---*/
 
-      /*--- Adjoint flow residuals ---*/
+        if (adjoint) {
 
-      for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-        residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-      }
+          /*--- Adjoint solution coefficients ---*/
+
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+
+          /*--- Adjoint turbulent residuals ---*/
+
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+        }
+
+        break;
+
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
 
-      /*--- Adjoint turbulent residuals ---*/
+        /*--- Heat Residuals ---*/
 
-      if (turbulent) {
-        if (!frozen_visc) {
-          for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-            residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
         }
-      }
+
+        break;
+
+      case FEM_ELASTICITY:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
 
     }
 
@@ -770,6 +908,18 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
     else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
@@ -777,8 +927,14 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
 
     /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
 
-    if ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3)) {
 
       /*--- Prepare the history file output, note that the dual
        time output don't write to the history file ---*/
@@ -791,6 +947,11 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
         SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
 
         /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+
+          case EULER : case NAVIER_STOKES: case RANS:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
 
             /*--- Direct coefficients ---*/
             SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
@@ -945,6 +1106,12 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
               SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
             }
 
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
             if (adjoint) {
 
               /*--- Adjoint coefficients ---*/
@@ -984,12 +1151,58 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
               SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
             }
 
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+
+          case FEM_ELASTICITY:
+
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
       }
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         /*--- Write the screen header---*/
-        if ((write_heads) && !(!DualTime_Iteration && Unsteady)){
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
 
+          if (!fem) {
             if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
 
                 cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
 
@@ -1052,6 +1265,19 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
                 if (turbo && write_turbo && val_iZone== 0){
                   WriteTurboPerfConvHistory(config[val_iZone]);
                 }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
             }
             else {
               if (flow) {
@@ -1067,7 +1293,12 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
                 cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
               }
             }
-
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
 
           switch (config[val_iZone]->GetKind_Solver()) {
           case EULER :                  case NAVIER_STOKES:
@@ -1208,13 +1439,6 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
             break;
 
-            case HEAT_EQUATION :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout << "      Res[Heat]" << "   CHeat(Total)"<<  endl;
-              break;
-
             case HEAT_EQUATION_FVM :
               if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
               else cout << endl << " IntIter" << "  ExtIter";
@@ -1222,6 +1446,29 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
               cout <<  "      Res[Heat]" << "   HFlux(Total)";
               break;
 
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
             case ADJ_EULER :              case ADJ_NAVIER_STOKES :
             case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
 
@@ -1339,13 +1586,31 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         cout.precision(6);
         cout.setf(ios::fixed, ios::floatfield);
-        if (!Unsteady) {
-          cout.width(5); cout << iExtIter + ExtIter_OffSet;
-          cout.width(11); cout << timeiter;
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
 
-        } else if (Unsteady && DualTime_Iteration) {
-          cout.width(8); cout << iIntIter;
-          cout.width(8); cout << iExtIter;
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
         }
       }
 
@@ -1537,29 +1802,75 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
           }
           break;
 
-        case HEAT_EQUATION:
+
+        case HEAT_EQUATION_FVM:
 
           if (!DualTime_Iteration) {
-            HistFile << begin << heat_coeff << heat_resid << end;
+            HistFile << begin << direct_coeff << heat_resid << end;
             HistFile.flush();
           }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            cout.precision(6);
-            cout.setf(ios::fixed, ios::floatfield);
-            cout.width(14); cout << log10(residual_heat[0]);
-            cout.width(14); cout << Total_CHeat;
-            cout << endl;
-          }
           break;
 
-        case HEAT_EQUATION_FVM:
+        case FEM_ELASTICITY:
 
           if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
           }
           break;
 
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
         case ADJ_EULER :              case ADJ_NAVIER_STOKES :
         case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
 
@@ -1678,6 +1989,8 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     delete [] residual_flow;
     delete [] residual_turbulent;
     delete [] residual_transition;
+    delete [] residual_fea;
+    delete [] residual_fem;
     delete [] residual_heat;
 
     delete [] residual_adjflow;
@@ -1698,4 +2011,3 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
   }
 }
-
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 2616407ac2f7..22f897a488a2 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -1,6 +1,6 @@
 /*!
  * \file output_direct_mean_inc.cpp
- * \brief Main subroutines for FEA output
+ * \brief Main subroutines for incompressible flow output
  * \author R. Sanchez
  * \version 6.0.1 "Falcon"
  *
@@ -134,7 +134,6 @@ void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
   char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
   char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
   char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char wave_coeff[]= ",\"CWave\"";
   char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
   char fem_incload[]= ",\"IncLoad\"";
   char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
@@ -210,7 +209,6 @@ void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
       break;
     case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
   }
-  char wave_resid[]= ",\"Res_Wave[0]\",\"Res_Wave[1]\"";
   char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
   char heat_resid[]= ",\"Res_Heat\"";
 
@@ -276,12 +274,7 @@ void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
       HistFile << end;
       break;
 
-    case WAVE_EQUATION:
-      HistFile << begin << wave_coeff;
-      HistFile << wave_resid << end;
-      break;
-
-    case HEAT_EQUATION: case HEAT_EQUATION_FVM:
+    case HEAT_EQUATION_FVM:
       HistFile << begin << heat_coeff;
       HistFile << heat_resid << end;
       break;
@@ -310,14 +303,14 @@ void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
 
 
 void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                     CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
 
   bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
@@ -441,8 +434,8 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
     adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000], wave_coeff[1000],
-    begin_fem[1000], fem_coeff[1000], wave_resid[1000], heat_resid[1000], combo_obj[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
     fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
 
     su2double dummy = 0.0, *Coord;
@@ -466,8 +459,7 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
                       (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
     bool adjoint =  cont_adj || disc_adj;
     bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool wave = (config[val_iZone]->GetKind_Solver() == WAVE_EQUATION);
-    bool heat = (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION) || (config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
     bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
     bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
     (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
@@ -498,7 +490,7 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
       if (ExtraHeatOutputZone > nZone) {
         SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
       }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION) && (config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
         SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
       }
       else {
@@ -510,7 +502,7 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
     Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CWave = 0.0, Total_CHeat = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
     Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
     Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
     Total_AoA = 0.0;
@@ -541,7 +533,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     *residual_transition   = NULL;
     su2double *residual_adjflow      = NULL,
     *residual_adjturbulent = NULL;
-    su2double *residual_wave         = NULL;
     su2double *residual_fea          = NULL;
     su2double *residual_fem          = NULL;
     su2double *residual_heat         = NULL;
@@ -562,7 +553,7 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
     /*--- Initialize number of variables ---*/
     unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Wave = 0, nVar_Heat = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
     nVar_AdjFlow = 0, nVar_AdjTurb = 0,
     nVar_FEM = 0;
 
@@ -575,7 +566,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
       }
     }
     if (transition) nVar_Trans = 2;
-    if (wave) nVar_Wave = 2;
     if (heat) nVar_Heat = 1;
 
     if (fem) {
@@ -599,7 +589,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     residual_flow       = new su2double[nVar_Flow];
     residual_turbulent  = new su2double[nVar_Turb];
     residual_transition = new su2double[nVar_Trans];
-    residual_wave       = new su2double[nVar_Wave];
     residual_heat       = new su2double[nVar_Heat];
     residual_fem        = new su2double[nVar_FEM];
 
@@ -839,33 +828,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
         break;
 
-      case WAVE_EQUATION:
-
-        /*--- Wave coefficients  ---*/
-
-        Total_CWave = solver_container[val_iZone][val_iInst][FinestMesh][WAVE_SOL]->GetTotal_CWave();
-
-        /*--- Wave Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Wave; iVar++) {
-          residual_wave[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][WAVE_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-
-      case HEAT_EQUATION:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_CHeat = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_CHeat();
-
-        /*--- Wave Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
 
       case HEAT_EQUATION_FVM:
 
@@ -1191,20 +1153,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
             break;
 
-          case WAVE_EQUATION:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_CWave);
-            SPRINTF (wave_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_wave[0]), log10 (residual_wave[1]), dummy, dummy, dummy );
-
-            break;
-
-          case HEAT_EQUATION:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_CHeat);
-            SPRINTF (heat_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_heat[0]), dummy, dummy, dummy, dummy );
-
-            break;
-
           case HEAT_EQUATION_FVM:
 
             SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
@@ -1491,20 +1439,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
             break;
 
-            case WAVE_EQUATION :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout << "      Res[Wave]" << "   CWave(Total)"<<  endl;
-              break;
-
-            case HEAT_EQUATION :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout << "      Res[Heat]" << "   CHeat(Total)"<<  endl;
-              break;
-
             case HEAT_EQUATION_FVM :
               if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
               else cout << endl << " IntIter" << "  ExtIter";
@@ -1868,35 +1802,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
           }
           break;
 
-        case WAVE_EQUATION:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << wave_coeff << wave_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            cout.precision(6);
-            cout.setf(ios::fixed, ios::floatfield);
-            cout.width(14); cout << log10(residual_wave[0]);
-            cout.width(14); cout << Total_CWave;
-            cout << endl;
-          }
-          break;
-
-        case HEAT_EQUATION:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << heat_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            cout.precision(6);
-            cout.setf(ios::fixed, ios::floatfield);
-            cout.width(14); cout << log10(residual_heat[0]);
-            cout.width(14); cout << Total_CHeat;
-            cout << endl;
-          }
-          break;
 
         case HEAT_EQUATION_FVM:
 
@@ -2084,7 +1989,6 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     delete [] residual_flow;
     delete [] residual_turbulent;
     delete [] residual_transition;
-    delete [] residual_wave;
     delete [] residual_fea;
     delete [] residual_fem;
     delete [] residual_heat;
@@ -2106,7 +2010,4 @@ void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
     delete [] aeroelastic_plunge;
 
   }
-
-
 }
-
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
new file mode 100644
index 000000000000..734d90625ee4
--- /dev/null
+++ b/SU2_CFD/src/output_driver.cpp
@@ -0,0 +1,38 @@
+/*!
+ * \file output_driver.cpp
+ * \brief Main subroutines for multizone output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"

From 0d1b7a8b24bf91b1de05cd8e8729a54d034daec6 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Tue, 5 Jun 2018 14:22:03 +0200
Subject: [PATCH 005/539] Remove pointer to ConvHist_file - now it's zone
 dependent and accessible anywhere and not only in driver.

---
 SU2_CFD/include/output_structure.hpp      |   34 +-
 SU2_CFD/include/output_structure.inl      |    8 +-
 SU2_CFD/src/driver_structure.cpp          |   16 +-
 SU2_CFD/src/iteration_structure.cpp       |   20 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |    7 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp |    9 +-
 SU2_CFD/src/output_adjoint_mean.cpp       |    7 +-
 SU2_CFD/src/output_direct_elasticity.cpp  |    9 +-
 SU2_CFD/src/output_direct_heat.cpp        |    7 +-
 SU2_CFD/src/output_direct_mean.cpp        |  166 +-
 SU2_CFD/src/output_direct_mean_inc.cpp    |    7 +-
 SU2_CFD/src/output_structure.cpp          | 1953 ---------------------
 SU2_SOL/src/SU2_SOL.cpp                   |    2 +-
 13 files changed, 112 insertions(+), 2133 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 3b5f3212353e..0e5b24ebf8ad 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -623,15 +623,13 @@ class COutput {
   
   /*! 
    * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
 
-  virtual void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  virtual void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*! 
    * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] solver_container - Container vector with all the solutions.
    * \param[in] config - Definition of the particular problem.
@@ -640,7 +638,7 @@ class COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  virtual void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  virtual void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
                               CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
   /*!
@@ -889,7 +887,7 @@ class CFlowOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -902,7 +900,7 @@ class CFlowOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -937,7 +935,7 @@ class CIncFlowOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -950,7 +948,7 @@ class CIncFlowOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -985,7 +983,7 @@ class CFEAOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -998,7 +996,7 @@ class CFEAOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -1033,7 +1031,7 @@ class CHeatOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -1046,7 +1044,7 @@ class CHeatOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -1081,7 +1079,7 @@ class CAdjFlowOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -1094,7 +1092,7 @@ class CAdjFlowOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -1129,7 +1127,7 @@ class CDiscAdjFlowOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -1142,7 +1140,7 @@ class CDiscAdjFlowOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
@@ -1177,7 +1175,7 @@ class CDiscAdjFEAOutput : public COutput {
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
@@ -1190,7 +1188,7 @@ class CDiscAdjFEAOutput : public COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 };
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index ed7e3a036ec1..a11b3241151b 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -43,4 +43,10 @@ inline su2double COutput::GetFlowAngleOut(unsigned short iMarkerTP, unsigned sho
 
 inline su2double COutput::GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan) { return MassFlowIn[iMarkerTP][iSpan]; }
 
-inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
\ No newline at end of file
+inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
+
+inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
+
+inline void COutput::SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config, CIntegration ****integration,
+ bool DualTime_Iteration, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 86b273bd5408..69c53001816c 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3264,7 +3264,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   if (!fsi) {
     for (iZone = 0; iZone < nZone; iZone++) {
       for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container,
+        output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container,
             config_container, integration_container, false, UsedTime, iZone, iInst);
     }
   }
@@ -3703,7 +3703,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInst[iZone]; iInst++)
-      output[iZone]->SetConvHistory_Body(NULL, geometry_container, solver_container,
+      output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone, iInst);
   }
 
@@ -3937,7 +3937,7 @@ void CDiscAdjFluidDriver::Run() {
     /*--- Write the convergence history (only screen output) ---*/
 
     if (unsteady)
-      output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0, INST_0);
+      output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0, INST_0);
 
   }
 
@@ -4976,7 +4976,7 @@ void CFSIDriver::Run() {
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-      output[ZONE_FLOW]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
+      output[ZONE_FLOW]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
 
       /*--- If the convergence criteria is met for the flow, break the loop ---*/
       StopCalc_Flow = integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence();
@@ -5004,7 +5004,7 @@ void CFSIDriver::Run() {
 
     /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-     output[ZONE_FLOW]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
+     output[ZONE_FLOW]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
 
   } else {
 
@@ -5032,7 +5032,7 @@ void CFSIDriver::Run() {
 
     /*--- Write the convergence history for the structure (only screen output) ---*/
 
-    output[ZONE_STRUCT]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
+    output[ZONE_STRUCT]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
 
     /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
 
@@ -6678,7 +6678,7 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
 
 
   if (rank == MASTER_NODE)
-    output[ZONE_0]->SetConvHistory_Header(NULL, config_container[ZONE_0], ZONE_0, INST_0);
+    output[ZONE_0]->SetConvHistory_Header(config_container[ZONE_0], ZONE_0, INST_0);
 
   if (kind_recording == FLOW_CONS_VARS) {
 
@@ -6705,7 +6705,7 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   if (kind_recording == FEA_DISP_VARS) {
 
     /*--- Set the convergence criteria (only residual possible) ---*/
-    output[ZONE_0]->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
+    output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
 
   }
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 8e47da64a538..be47ba409b83 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -542,7 +542,7 @@ void CFluidIteration::Iterate(COutput *output,
 
   if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() ) {
     
-    output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
     
   }
   
@@ -932,7 +932,7 @@ void CHeatIteration::Iterate(COutput *output,
 
   if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() ) {
 
-    output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
   }
 }
 
@@ -1071,7 +1071,7 @@ void CFEAIteration::Iterate(COutput *output,
         /*--- Write the convergence history (first, compute Von Mises stress) ---*/
         solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
         write_output = output->PrintOutput(IntIter-1, config_container[val_iZone]->GetWrt_Con_Freq_DualTime());
-        if (write_output) output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+        if (write_output) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
         config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1105,7 +1105,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history headers ---*/
 
-      if (!disc_adj_fem) output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      if (!disc_adj_fem) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
       /*--- Run the first iteration ---*/
 
@@ -1115,7 +1115,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
       /*--- Run the second iteration ---*/
 
@@ -1128,7 +1128,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
 
       bool meetCriteria;
@@ -1154,7 +1154,7 @@ void CFEAIteration::Iterate(COutput *output,
 
           /*--- Write the convergence history (first, compute Von Mises stress) ---*/
           solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-          output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+          output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
           config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1219,7 +1219,7 @@ void CFEAIteration::Iterate(COutput *output,
 
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+            output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
             config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1234,7 +1234,7 @@ void CFEAIteration::Iterate(COutput *output,
           if (iIncrement < nIncrements - 1){
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetConvHistory_Body(&ConvHist_file, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+            output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
           }
 
         }
@@ -2230,7 +2230,7 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
     /*--- Write the convergence history (only screen output) ---*/
 
    if(IntIter != nIntIter-1)
-      output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
 
   }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index b8e4af013da5..47914d86318e 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -74,7 +74,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, unsigned short val_iZone
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -87,7 +87,7 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 
 }
 
-void CDiscAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CDiscAdjFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
   char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
@@ -300,8 +300,7 @@ void CDiscAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig
 }
 
 
-void CDiscAdjFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
+void CDiscAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   CSolver *****solver_container,
                                   CConfig **config,
                                   CIntegration ****integration,
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index c7ec0257ed9d..019bd21c8193 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -74,7 +74,7 @@ CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, unsigned short val_iZone)
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -88,7 +88,7 @@ CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
 
 }
 
-void CDiscAdjFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CDiscAdjFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
 
   bool incload = config->GetIncrementalLoad();
 
@@ -115,7 +115,7 @@ void CDiscAdjFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *
 
   /*--- Write the header, case depending ---*/
   HistFile << begin << fem_coeff;
-  if (incload) ConvHist_file[0] << fem_incload;
+  if (incload) HistFile << fem_incload;
   HistFile << fem_resid << endfea;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
@@ -128,8 +128,7 @@ void CDiscAdjFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *
 }
 
 
-void CDiscAdjFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                     CGeometry ****geometry,
+void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
                                      CSolver *****solver_container,
                                      CConfig **config,
                                      CIntegration ****integration,
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 3bb3b7bc073e..217f3dc34af3 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -74,7 +74,7 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COut
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -87,7 +87,7 @@ CAdjFlowOutput::~CAdjFlowOutput(void) {
 
 }
 
-void CAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CAdjFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
   char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
@@ -300,8 +300,7 @@ void CAdjFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
 }
 
 
-void CAdjFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
+void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   CSolver *****solver_container,
                                   CConfig **config,
                                   CIntegration ****integration,
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index bdb8c1b9eedd..e3f323db0706 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -74,7 +74,7 @@ CFEAOutput::CFEAOutput(CConfig *config, unsigned short val_iZone) : COutput(conf
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -88,7 +88,7 @@ CFEAOutput::~CFEAOutput(void) {
 
 }
 
-void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
 
   bool incload = config->GetIncrementalLoad();
 
@@ -115,7 +115,7 @@ void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config,
 
   /*--- Write the header, case depending ---*/
   HistFile << begin << fem_coeff;
-  if (incload) ConvHist_file[0] << fem_incload;
+  if (incload) HistFile << fem_incload;
   HistFile << fem_resid << endfea;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
@@ -128,8 +128,7 @@ void CFEAOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config,
 }
 
 
-void CFEAOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                     CGeometry ****geometry,
+void CFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
                                      CSolver *****solver_container,
                                      CConfig **config,
                                      CIntegration ****integration,
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index b2960095701f..6521fafecca9 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -74,7 +74,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short val_iZone) : COutput(co
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -87,7 +87,7 @@ CHeatOutput::~CHeatOutput(void) {
 
 }
 
-void CHeatOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CHeatOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
   char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
@@ -300,8 +300,7 @@ void CHeatOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
 }
 
 
-void CHeatOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
+void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   CSolver *****solver_container,
                                   CConfig **config,
                                   CIntegration ****integration,
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 4f7600039d08..8268cf3be5b3 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -75,7 +75,7 @@ CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(co
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -89,8 +89,8 @@ CFlowOutput::~CFlowOutput(void) {
 
 }
 
-void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
 
@@ -101,9 +101,6 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
   bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
   bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
                     (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
   bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
 
   bool output_surface = (config->GetnMarker_Analyze() != 0);
@@ -112,10 +109,6 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
   bool turbo = config->GetBoolTurbomachinery();
   unsigned short direct_diff = config->GetDirectDiff();
 
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
   bool thermal = false; /* Flag for whether to print heat flux values */
   bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
 
@@ -134,11 +127,6 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
   char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
   char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
   char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
   char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
   char Cp_inverse_design[]= ",\"Cp_Diff\"";
   char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
@@ -209,13 +197,10 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
       break;
     case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
   }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
 
   /*--- End of the header ---*/
 
   char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
 
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
@@ -227,70 +212,32 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
 
   /*--- Write the header, case depending ---*/
 
-  switch (config->GetKind_Solver()) {
-
-    case EULER : case NAVIER_STOKES: case RANS :
-      HistFile << begin;
-      if (!turbo) HistFile << flow_coeff;
-      if (turbo) HistFile << turbo_coeff;
-      if (thermal && !turbo) HistFile << heat_coeff;
-      if (equiv_area) HistFile << equivalent_area_coeff;
-      if (engine || actuator_disk) HistFile << engine_coeff;
-      if (inv_design) {
-        HistFile << Cp_inverse_design;
-        if (thermal && !turbo) HistFile << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-      HistFile << flow_resid;
-      if (turbulent) HistFile << turb_resid;
-      if (weakly_coupled_heat) HistFile << heat_resid;
-      if (aeroelastic) HistFile << aeroelastic_coeff;
-      if (output_per_surface) HistFile << monitoring_coeff;
-      if (output_surface) HistFile << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) HistFile << d_flow_coeff;
-        else        HistFile << d_turbo_coeff;
-        if (engine || actuator_disk) HistFile << d_engine;
-        if (thermal) HistFile << d_thermal_coeff;
-      }
-      if (output_comboObj) HistFile << combo_obj;
-      HistFile << end;
-
-      break;
-
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          HistFile << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          HistFile << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-      HistFile << end;
-      break;
-
-    case HEAT_EQUATION_FVM:
-      HistFile << begin << heat_coeff;
-      HistFile << heat_resid << end;
-      break;
-
-    case FEM_ELASTICITY:
-      HistFile << begin << fem_coeff;
-      if (incload) HistFile << fem_incload;
-      HistFile << fem_resid << endfea;
-      break;
-
-    case DISC_ADJ_FEM:
-      HistFile << begin << fem_coeff;
-      HistFile << fem_resid << endfea;
-      break;
-
+  HistFile << begin;
+  if (!turbo) HistFile << flow_coeff;
+  if (turbo) HistFile << turbo_coeff;
+  if (thermal && !turbo) HistFile << heat_coeff;
+  if (equiv_area) HistFile << equivalent_area_coeff;
+  if (engine || actuator_disk) HistFile << engine_coeff;
+  if (inv_design) {
+    HistFile << Cp_inverse_design;
+    if (thermal && !turbo) HistFile << Heat_inverse_design;
   }
+  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+  HistFile << flow_resid;
+  if (turbulent) HistFile << turb_resid;
+  if (weakly_coupled_heat) HistFile << heat_resid;
+  if (aeroelastic) HistFile << aeroelastic_coeff;
+  if (output_per_surface) HistFile << monitoring_coeff;
+  if (output_surface) HistFile << surface_outputs;
+  if (direct_diff != NO_DERIVATIVE) {
+    if (!turbo) HistFile << d_flow_coeff;
+    else        HistFile << d_turbo_coeff;
+    if (engine || actuator_disk) HistFile << d_engine;
+    if (thermal) HistFile << d_thermal_coeff;
+  }
+  if (output_comboObj) HistFile << combo_obj;
+  HistFile << end;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -302,8 +249,7 @@ void CFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config
 }
 
 
-void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
+void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   CSolver *****solver_container,
                                   CConfig **config,
                                   CIntegration ****integration,
@@ -315,29 +261,23 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
   bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
   bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
   unsigned long iIntIter    = config[val_iZone]->GetIntIter();
   unsigned long iExtIter    = config[val_iZone]->GetExtIter();
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
   unsigned short nZone      = config[val_iZone]->GetnZone();
   unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
   bool energy               = config[val_iZone]->GetEnergy_Equation();
   bool incload              = config[val_iZone]->GetIncrementalLoad();
   bool output_files         = true;
 
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+  if (!DualTime_Iteration) {
 
     if ((config[val_iZone]->GetFixed_CL_Mode()) &&
         (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
       output_files = false;
     }
 
-    if (fea || fluid_structure) output_files = false;
+    if (fluid_structure) output_files = false;
 
     /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
 
@@ -350,39 +290,33 @@ void CFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
 
       if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
 
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
 
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the surface. ---*/
+      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the surface. ---*/
+      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
 
-          break;
+      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
       }
 
       /*--- Output a file with the forces breakdown. ---*/
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 22f897a488a2..ec340fa5ef87 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -75,7 +75,7 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, unsigned short val_iZone) : COut
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(NULL, config, val_iZone, INST_0);
+    SetConvHistory_Header(config, val_iZone, INST_0);
   }
 
 }
@@ -89,7 +89,7 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 
 }
 
-void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
   char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
@@ -302,8 +302,7 @@ void CIncFlowOutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *con
 }
 
 
-void CIncFlowOutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
+void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   CSolver *****solver_container,
                                   CConfig **config,
                                   CIntegration ****integration,
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 429f526634ef..00c803f303de 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4262,1959 +4262,6 @@ void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
   }
 }
 
-void COutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-  
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-  
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-  
-  /*--- Write file name with extension ---*/
-  string filename = config->GetConv_FileName();
-  if(config->GetnZone() > 1){
-    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
-  }
-  if(config->GetnTimeInstances() > 1){
-    filename = config->GetMultiInstance_HistoryFileName(filename, val_iInst);
-  }
-  strcpy (cstr, filename.data());
-  
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetUnst_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(cstr, buffer);
-  }
-  
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(cstr, buffer);
-  
-  ConvHist_file->open(cstr, ios::out);
-  ConvHist_file->precision(15);
-  
-  /*--- Begin of the header ---*/
-  
-  char begin[]= "\"Iteration\"";
-  
-  /*--- Header for the coefficients ---*/
-  
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
-  /*--- Find the markers being monitored and create a header for them ---*/
-  
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-  
-  /*--- Header for the residuals ---*/
-  
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP: 
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:   	SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:   	SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-  
-  /*--- End of the header ---*/
-  
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
-  
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
-    ConvHist_file[0] << "VARIABLES = ";
-  }
-  
-  /*--- Write the header, case depending ---*/
-  
-  switch (config->GetKind_Solver()) {
-      
-    case EULER : case NAVIER_STOKES: case RANS :
-      ConvHist_file[0] << begin;
-      if (!turbo) ConvHist_file[0] << flow_coeff;
-      if (turbo) ConvHist_file[0] << turbo_coeff;
-      if (thermal && !turbo) ConvHist_file[0] << heat_coeff;
-      if (equiv_area) ConvHist_file[0] << equivalent_area_coeff;
-      if (engine || actuator_disk) ConvHist_file[0] << engine_coeff;
-      if (inv_design) {
-        ConvHist_file[0] << Cp_inverse_design;
-        if (thermal && !turbo) ConvHist_file[0] << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) ConvHist_file[0] << rotating_frame_coeff;
-
-      ConvHist_file[0] << flow_resid;
-      if (turbulent) ConvHist_file[0] << turb_resid;
-      if (weakly_coupled_heat) ConvHist_file[0] << heat_resid;
-      if (aeroelastic) ConvHist_file[0] << aeroelastic_coeff;
-      if (output_per_surface) ConvHist_file[0] << monitoring_coeff;
-      if (output_surface) ConvHist_file[0] << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) ConvHist_file[0] << d_flow_coeff;
-        else        ConvHist_file[0] << d_turbo_coeff;
-        if (engine || actuator_disk) ConvHist_file[0] << d_engine;
-        if (thermal) ConvHist_file[0] << d_thermal_coeff;
-      }
-      if (output_comboObj) ConvHist_file[0] << combo_obj;
-      ConvHist_file[0] << end;
-      
-      break;
-      
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          ConvHist_file[0] << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          ConvHist_file[0] << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else ConvHist_file[0] << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) ConvHist_file[0] << adj_turb_resid;
-      ConvHist_file[0] << end;
-      break;
-      
-    case HEAT_EQUATION_FVM:
-      ConvHist_file[0] << begin << heat_coeff;
-      ConvHist_file[0] << heat_resid << end;
-      break;
-      
-    case FEM_ELASTICITY:
-      ConvHist_file[0] << begin << fem_coeff;
-      if (incload) ConvHist_file[0] << fem_incload;
-      ConvHist_file[0] << fem_resid << endfea;
-      break;
-      
-    case DISC_ADJ_FEM:
-      ConvHist_file[0] << begin << fem_coeff;
-      ConvHist_file[0] << fem_resid << endfea;
-      break;
-
-  }
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
-  }
-  
-}
-
-
-void COutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-  
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
-    
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-    
-    if (fea || fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-    
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-      
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-      
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-          
-          break;
-      }
-      
-      /*--- Output a file with the forces breakdown. ---*/
-      
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-      
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-      
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-      
-      /*--- Output a file with the forces breakdown. ---*/
-      
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-      
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
-      
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-      
-    }
-    
-  }
-  
-  /*--- Output using only the master node ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-    
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-    
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-    
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-    
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-    
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-    
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-    
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-    
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();    
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-    
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-    
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-    
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
-    
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
-    
-    /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
-    
-    /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-    
-    /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-    
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
-    
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    /*--- Write information from nodes ---*/
-    
-    switch (config[val_iZone]->GetKind_Solver()) {
-        
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-        
-        /*--- Flow solution coefficients ---*/
-        
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-          
-        }
-        
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-          
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-        
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-        
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-        
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-        
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-        
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-        
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-        
-        /*--- Flow Residuals ---*/
-        
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-        
-        /*--- Turbulent residual ---*/
-        
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-        
-        /*--- Transition residual ---*/
-        
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-        
-        
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
-        
-        /*--- Iterations of the linear solver ---*/
-        
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-        
-        /*--- Adjoint solver ---*/
-        
-        if (adjoint) {
-          
-          /*--- Adjoint solution coefficients ---*/
-          
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-          /*--- Adjoint flow residuals ---*/
-          
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
-          
-          /*--- Adjoint turbulent residuals ---*/
-          
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
-          }
-          
-        }
-        
-        break;
-        
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-        
-      case FEM_ELASTICITY:
-        
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-        
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-        
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
-
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-        
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
-        
-        break;
-
-      case DISC_ADJ_FEM:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
-
-        break;
-
-
-    }
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-    
-    /*--- Header frequency ---*/
-    
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-    
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-    
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
-      
-      
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-        
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-        
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-        
-        /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-            
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-            
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-            
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-            
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-            }
-
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-								strcat(turbo_coeff, surface_coeff);
-								//
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-
-              }
-            }
-            
-            
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            }
-            else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-            
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-            
-            /*---- Averaged stagnation pressure at an exit ----*/
-            
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-            
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-            }
-
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-            }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-              
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-              
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
-            }
-
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-            }
-            
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-            break;
-            
-          case FEM_ELASTICITY:
-            
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
-
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
-            break;
-
-          case DISC_ADJ_FEM:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
-
-            break;
-
-        }
-      }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
-
-          if (!fem) {
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
-
-              }
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-              
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-              
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:	      cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
-          }
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-      
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
-        }
-      }
-      
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-          
-          /*--- Write history file ---*/
-          
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              ConvHist_file[0] << begin << direct_coeff;
-              if (thermal) ConvHist_file[0] << heat_coeff;
-              if (equiv_area) ConvHist_file[0] << equivalent_area_coeff;
-              if (engine || actuator_disk) ConvHist_file[0] << engine_coeff;
-              if (inv_design) {
-                ConvHist_file[0] << Cp_inverse_design;
-                if (thermal) ConvHist_file[0] << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) ConvHist_file[0] << rotating_frame_coeff;
-              ConvHist_file[0] << flow_resid;
-              if (weakly_coupled_heat) ConvHist_file[0] << heat_resid;
-            }
-            else {
-              ConvHist_file[0] << begin << turbo_coeff << flow_resid;
-            }
-            
-            if (aeroelastic) ConvHist_file[0] << aeroelastic_coeff;
-            if (output_per_surface) ConvHist_file[0] << monitoring_coeff;
-            if (output_surface) ConvHist_file[0] << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) ConvHist_file[0] << d_direct_coeff;
-            if (output_comboObj) ConvHist_file[0] << combo_obj;
-            ConvHist_file[0] << end;
-            ConvHist_file[0].flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-                
-                cout.unsetf(ios_base::floatfield);
-                
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-          
-        case RANS :
-          
-          /*--- Write history file ---*/
-          
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              ConvHist_file[0] << begin << direct_coeff;
-              if (thermal) ConvHist_file[0] << heat_coeff;
-              if (equiv_area) ConvHist_file[0] << equivalent_area_coeff;
-              if (engine || actuator_disk) ConvHist_file[0] << engine_coeff;
-              if (inv_design) {
-                ConvHist_file[0] << Cp_inverse_design;
-                if (thermal) ConvHist_file[0] << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) ConvHist_file[0] << rotating_frame_coeff;
-              ConvHist_file[0] << flow_resid << turb_resid;
-              if (weakly_coupled_heat) ConvHist_file[0] << heat_resid;
-            }
-            else {
-              ConvHist_file[0] << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-            
-            if (aeroelastic) ConvHist_file[0] << aeroelastic_coeff;
-            if (output_per_surface) ConvHist_file[0] << monitoring_coeff;
-            if (output_surface) ConvHist_file[0] << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) ConvHist_file[0] << d_direct_coeff;
-            if (output_comboObj) ConvHist_file[0] << combo_obj;
-            ConvHist_file[0] << end;
-            ConvHist_file[0].flush();
-          }
-          
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;              
-            }
-          }
-          break;
-          
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            ConvHist_file[0] << begin << direct_coeff << heat_resid << end;
-            ConvHist_file[0].flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-          
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-          
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-          
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-          
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-          
-          if (!DualTime_Iteration) {
-            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid << end;
-            ConvHist_file[0].flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-          
-        case ADJ_RANS : case DISC_ADJ_RANS:
-          
-          if (!DualTime_Iteration) {
-            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              ConvHist_file[0] << adj_turb_resid;
-            ConvHist_file[0] << end;
-            ConvHist_file[0].flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-          
-      }
-      cout.unsetf(ios::fixed);
-
-    }
-    
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
-    delete [] residual_heat;
-
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-    
-  }
-}
-
 void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
   
   su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index f68261618b30..c42661abb518 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
 
   unsigned short iZone, nZone = SINGLE_ZONE, iInst;
   su2double StartTime = 0.0, StopTime = 0.0, UsedTime = 0.0;
-  ofstream ConvHist_file;
+
   char config_file_name[MAX_STRING_SIZE];
   int rank = MASTER_NODE;
   int size = SINGLE_NODE;

From 43f101b7a75ace34a58aef63ed5570d0d810b70f Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Jun 2018 14:45:00 +0200
Subject: [PATCH 006/539] Adapt subclasses.

---
 SU2_CFD/src/output_adjoint_discrete.cpp   |    2 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp |  110 +-
 SU2_CFD/src/output_adjoint_mean.cpp       | 1473 ++++-------------
 SU2_CFD/src/output_direct_heat.cpp        | 1764 +--------------------
 SU2_CFD/src/output_direct_mean.cpp        | 1204 ++++----------
 SU2_CFD/src/output_direct_mean_inc.cpp    | 1363 +++++-----------
 6 files changed, 1041 insertions(+), 4875 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 47914d86318e..38c0c892245c 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -51,7 +51,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, unsigned short val_iZone
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 019bd21c8193..84336d2b947e 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -90,8 +90,6 @@ CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
 
 void CDiscAdjFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
 
-  bool incload = config->GetIncrementalLoad();
-
   /*--- Begin of the header ---*/
   char begin[]= "\"Iteration\"";
 
@@ -115,7 +113,6 @@ void CDiscAdjFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short va
 
   /*--- Write the header, case depending ---*/
   HistFile << begin << fem_coeff;
-  if (incload) HistFile << fem_incload;
   HistFile << fem_resid << endfea;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
@@ -157,45 +154,29 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
     unsigned short iVar;
     unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
 
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
     bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
     /*------------------------------------------------------------------------------------------------------*/
     /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
     /*------------------------------------------------------------------------------------------------------*/
 
     /*--- Initialize number of variables ---*/
-    unsigned short nVar_FEM = 0;
-    if (linear_analysis) nVar_FEM = nDim;
-    if (nonlinear_analysis) nVar_FEM = 3;
+    unsigned short nVar_FEM = nDim;
 
     /*--- Allocate memory for the residual ---*/
     su2double *residual_fem          = NULL;
     residual_fem        = new su2double[nVar_FEM];
 
     /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-    su2double Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
-    su2double Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
-    su2double Total_IncLoad    = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment();
-    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetIterLinSolver();
+    su2double Total_CFEM = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
 
     /*--- Residuals: ---*/
     /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
     /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
 
-    if (linear_analysis) {
-      for (iVar = 0; iVar < nVar_FEM; iVar++) {
-        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
-      }
-    }
-    else if (nonlinear_analysis) {
-      for (iVar = 0; iVar < nVar_FEM; iVar++) {
-        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
-      }
+    for (iVar = 0; iVar < nVar_FEM; iVar++) {
+      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(iVar);
     }
 
     bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
@@ -210,8 +191,6 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
     SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
 
     /*--- Initial variables ---*/
-    if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-    else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
 
     /*--- FEM residual ---*/
     if (nVar_FEM == 2)
@@ -219,48 +198,23 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
     else
       SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
 
-    /*--- Linear solver iterations and time used ---*/
-    SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
     // Write to history file
 
-    HistFile << begin_fem << fem_coeff << fem_resid << end_fem;
+    HistFile << begin_fem << fem_resid << end_fem;
     HistFile.flush();
 
     /*------------------------------------------------------------------------------------------------------*/
     /*--- Write the screen header---------------------------------------------------------------------------*/
     /*------------------------------------------------------------------------------------------------------*/
 
-    bool write_header;
-    if (nonlinear_analysis) write_header = (iIntIter == 0);
-    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+    bool write_header = (iIntIter == 0);
 
     if (write_header) {
 
-      if (dynamic && nonlinear_analysis) {
-        cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-      }
+      cout << endl << " IntIter" << " ExtIter";
 
-      if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-      else cout << endl << " IntIter" << " ExtIter";
-
-      if (linear_analysis) {
-        if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-        if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-      }
-      else if (nonlinear_analysis) {
-        switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-        case RESFEM_RELATIVE:
-          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-          break;
-        case RESFEM_ABSOLUTE:
-          cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-          break;
-        default:
-          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-          break;
-        }
-      }
+      if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+      if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
 
     }
 
@@ -268,31 +222,35 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
     /*--- Write the screen output---------------------------------------------------------------------------*/
     /*------------------------------------------------------------------------------------------------------*/
 
-    if (!nonlinear_analysis) {
-      cout.width(5); cout << iExtIter;
-      cout.width(11); cout << timeiter;
-
-    } else {
-      cout.width(8); cout << iIntIter;
-      cout.width(8); cout << iExtIter;
-    }
-
     cout.precision(6);
     cout.setf(ios::fixed, ios::floatfield);
-    if (linear_analysis) {
-      cout.width(14); cout << log10(residual_fem[0]);
-      cout.width(14); cout << log10(residual_fem[1]);
-      if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-    }
-    else if (nonlinear_analysis) {
-      cout.width(14); cout << log10(residual_fem[0]);
-      cout.width(14); cout << log10(residual_fem[1]);
-      cout.width(14); cout << log10(residual_fem[2]);
-    }
+
+    cout.width(15); cout << log10(residual_fem[0]);
+    cout.width(15); cout << log10(residual_fem[1]);
+    if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
 
     cout.precision(4);
     cout.setf(ios::scientific, ios::floatfield);
-    cout.width(14); cout << Total_VMStress;
+
+
+    if (config[val_iZone]->GetnElasticityMod() == 1){
+      cout.width(14); cout << solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+      cout.width(14); cout << solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+    }
+    else{
+      Total_SensE = 0.0; Total_SensNu = 0.0;
+      for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+          Total_SensE += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+              *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+          Total_SensNu += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+              *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+      }
+      Total_SensE = sqrt(Total_SensE);
+      Total_SensNu = sqrt(Total_SensNu);
+      cout.width(14); cout << Total_SensE;
+      cout.width(14); cout << Total_SensNu;
+    }
+
     cout << endl;
 
     cout.unsetf(ios::fixed);
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 217f3dc34af3..fcad7e13e17f 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -51,7 +51,7 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COut
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -225,70 +225,17 @@ void CAdjFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
 
   /*--- Write the header, case depending ---*/
 
-  switch (config->GetKind_Solver()) {
-
-    case EULER : case NAVIER_STOKES: case RANS :
-      HistFile << begin;
-      if (!turbo) HistFile << flow_coeff;
-      if (turbo) HistFile << turbo_coeff;
-      if (thermal && !turbo) HistFile << heat_coeff;
-      if (equiv_area) HistFile << equivalent_area_coeff;
-      if (engine || actuator_disk) HistFile << engine_coeff;
-      if (inv_design) {
-        HistFile << Cp_inverse_design;
-        if (thermal && !turbo) HistFile << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-      HistFile << flow_resid;
-      if (turbulent) HistFile << turb_resid;
-      if (weakly_coupled_heat) HistFile << heat_resid;
-      if (aeroelastic) HistFile << aeroelastic_coeff;
-      if (output_per_surface) HistFile << monitoring_coeff;
-      if (output_surface) HistFile << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) HistFile << d_flow_coeff;
-        else        HistFile << d_turbo_coeff;
-        if (engine || actuator_disk) HistFile << d_engine;
-        if (thermal) HistFile << d_thermal_coeff;
-      }
-      if (output_comboObj) HistFile << combo_obj;
-      HistFile << end;
-
-      break;
-
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          HistFile << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          HistFile << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-      HistFile << end;
-      break;
-
-    case HEAT_EQUATION_FVM:
-      HistFile << begin << heat_coeff;
-      HistFile << heat_resid << end;
-      break;
-
-    case FEM_ELASTICITY:
-      HistFile << begin << fem_coeff;
-      if (incload) HistFile << fem_incload;
-      HistFile << fem_resid << endfea;
-      break;
-
-    case DISC_ADJ_FEM:
-      HistFile << begin << fem_coeff;
-      HistFile << fem_resid << endfea;
-      break;
-
+  if (!turbo) {
+    if (compressible) {
+      HistFile << begin << adj_coeff << adj_flow_resid;
+    }
+    if (incompressible) {
+      HistFile << begin << adj_inc_coeff << adj_flow_resid;
+    }
   }
+  else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
+  if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
+  HistFile << end;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -327,100 +274,12 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
   bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
 
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
-
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-
-    if (fea || fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          break;
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
-
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-
-    }
-
-  }
-
   /*--- Output using only the master node ---*/
 
   if (rank == MASTER_NODE) {
 
     /*-- Compute the total objective if a "combo" objective is used ---*/
 
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-
     unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
     if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
         config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
@@ -565,14 +424,6 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     if (transition) nVar_Trans = 2;
     if (heat) nVar_Heat = 1;
 
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
-
     /*--- Adjoint problem variables ---*/
     if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
     if (turbulent) {
@@ -608,285 +459,157 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Write information from nodes ---*/
 
-    switch (config[val_iZone]->GetKind_Solver()) {
-
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-
-        /*--- Flow solution coefficients ---*/
-
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-
-        }
-
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-
-        /*--- Flow Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-        /*--- Turbulent residual ---*/
-
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-
-        /*--- Transition residual ---*/
-
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-
-
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
-
-        /*--- Iterations of the linear solver ---*/
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-        /*--- Adjoint solver ---*/
-
-        if (adjoint) {
-
-          /*--- Adjoint solution coefficients ---*/
-
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-          /*--- Adjoint flow residuals ---*/
-
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
-
-          /*--- Adjoint turbulent residuals ---*/
-
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
-          }
+    /*--- Flow solution coefficients ---*/
+
+    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+    if (thermal) {
+      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+      if(weakly_coupled_heat) {
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+      }
+    }
 
-        }
+    if (equiv_area) {
+      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
 
-        break;
+      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+    }
 
+    if (engine || actuator_disk) {
+      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+    }
 
-      case HEAT_EQUATION_FVM:
+    if (rotating_frame) {
+      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+    }
 
-        /*--- Heat coefficients  ---*/
+    if (aeroelastic) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+      }
+    }
 
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+    if (output_per_surface) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+      }
+    }
 
-        /*--- Heat Residuals ---*/
+    /*--- Get flux-averaged values at the specified surface ---*/
+
+    if (output_surface) {
+
+      unsigned short iMarker_Analyze = 0;
+      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
 
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
+    }
 
-        break;
+    /*--- Flow Residuals ---*/
 
-      case FEM_ELASTICITY:
+    for (iVar = 0; iVar < nVar_Flow; iVar++)
+      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
 
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+    /*--- Turbulent residual ---*/
 
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+    if (turbulent) {
+      for (iVar = 0; iVar < nVar_Turb; iVar++)
+        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+    }
 
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+    if (weakly_coupled_heat) {
+      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+      }
 
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+    }
 
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+    /*--- Transition residual ---*/
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+    if (transition) {
+      for (iVar = 0; iVar < nVar_Trans; iVar++)
+        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+    }
 
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
+    /*--- Iterations of the linear solver ---*/
 
-        break;
+    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
 
-      case DISC_ADJ_FEM:
+    /*--- Adjoint solver ---*/
 
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+    /*--- Adjoint solution coefficients ---*/
 
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+    Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+    Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+    Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+    Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+    Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+    Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+    Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
+    Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
+    /*--- Adjoint flow residuals ---*/
 
-        break;
+    for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+      residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+    }
 
+    /*--- Adjoint turbulent residuals ---*/
 
+    if (turbulent) {
+      if (!frozen_visc) {
+        for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+          residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+      }
     }
 
     if (extra_heat_output) {
@@ -905,17 +628,6 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
@@ -923,15 +635,7 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
 
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
-
+    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
 
       /*--- Prepare the history file output, note that the dual
        time output don't write to the history file ---*/
@@ -946,260 +650,207 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
         /*--- Write the solution and residual of the history file ---*/
         switch (config[val_iZone]->GetKind_Solver()) {
 
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
+        case EULER : case NAVIER_STOKES: case RANS:
+        case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+        case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+
+          /*--- Direct coefficients ---*/
+          SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+              Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+              Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+          if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+          if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+          if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+          if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+          if (inv_design) {
+            SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+            if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+          }
 
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
+          if (direct_diff != NO_DERIVATIVE) {
+            if (!turbo)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+            else
+              SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                  D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+            if (engine || actuator_disk)
               SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
+                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+            if (thermal)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+          }
 
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+          if (aeroelastic) {
+            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+              //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+              if (iMarker_Monitoring == 0) {
+                SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+              }
+              else {
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
                 strcat(aeroelastic_coeff, surface_coeff);
               }
+              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+              strcat(aeroelastic_coeff, surface_coeff);
             }
+          }
 
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+          if (output_per_surface) {
+            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+              //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+              if (iMarker_Monitoring == 0) {
+                SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+              }
+              else {
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
                 strcat(monitoring_coeff, surface_coeff);
               }
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
             }
+          }
 
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+          if (turbo){
+            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+              if (iMarker_Monitoring == 0){
+                SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+              }else{
+                SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
                 strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                //
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-
               }
-            }
-
+              SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+              strcat(turbo_coeff, surface_coeff);
+              //
+              SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
+              SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
 
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            }
-            else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
             }
+          }
 
-            /*---- Averaged stagnation pressure at an exit ----*/
 
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-            }
+          /*--- Flow residual ---*/
+          if (nDim == 2) {
+            if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+          }
+          else {
+            if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+            if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+          }
 
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+          /*--- Turbulent residual ---*/
+          if (turbulent) {
+            switch(nVar_Turb) {
+            case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+            case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
             }
+          }
 
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
+          /*---- Averaged stagnation pressure at an exit ----*/
 
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+          if (output_surface) {
+            SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+          }
 
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
+          /*--- Transition residual ---*/
+          if (transition) {
+            SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+          }
 
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
+          /*--- Combo objective ---*/
+          if (output_comboObj) {
+            SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+          }
 
+          /*--- Adjoint coefficients ---*/
+          if (!turbo) {
+            if (compressible) {
+              SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
             }
-
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            if (incompressible) {
+              SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
             }
+          } else
+            SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
 
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-            break;
-
-          case FEM_ELASTICITY:
-
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
+          /*--- Adjoint flow residuals ---*/
+          if (nDim == 2) {
+            if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+            if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+          }
+          else {
+            if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+            if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+          }
 
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+          /*--- Adjoint turbulent residuals ---*/
+          if (turbulent)
+            if (!frozen_visc) {
+              if (nVar_AdjTurb == 1) {
+                SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+              } else if (nVar_AdjTurb > 1) {
+                SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+              }
             }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
-            break;
 
-          case DISC_ADJ_FEM:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
+          if (weakly_coupled_heat) {
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+          }
 
-            break;
+          break;
 
         }
       }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+      if ((val_iZone == 0 && val_iInst == 0)){
         /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
+        if (((write_heads) && !(!DualTime_Iteration && Unsteady))){
 
-          if (!fem) {
             if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
 
                 cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
 
@@ -1213,68 +864,10 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
                 cout << "-------------------------------------------------------------------------" << endl;
 
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
                 if (turbo && write_turbo && val_iZone== 0){
                   WriteTurboPerfConvHistory(config[val_iZone]);
                 }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
 
-              }
             }
             else {
               if (flow) {
@@ -1290,184 +883,10 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                 cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
               }
             }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
 
           switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
 
             case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
 
               /*--- Visualize the maximum residual ---*/
               iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
@@ -1515,7 +934,7 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
               }
               break;
 
-            case ADJ_RANS : case DISC_ADJ_RANS:
+            case ADJ_RANS :
 
               /*--- Visualize the maximum residual ---*/
               iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
@@ -1565,14 +984,6 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
               }
               break;
 
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
           }
 
         }
@@ -1580,10 +991,9 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
       /*--- Write the solution on the screen ---*/
 
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+      if ((val_iZone == 0 && val_iInst == 0)){
         cout.precision(6);
         cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
           if (!Unsteady) {
             cout.width(5); cout << iExtIter + ExtIter_OffSet;
             cout.width(11); cout << timeiter;
@@ -1592,284 +1002,11 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
             cout.width(8); cout << iIntIter;
             cout.width(8); cout << iExtIter;
           }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
-        }
       }
 
       switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-
-                cout.unsetf(ios_base::floatfield);
-
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-
-        case RANS :
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid << turb_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;
-            }
-          }
-          break;
-
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
 
         case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
 
           if (!DualTime_Iteration) {
             HistFile << begin << adjoint_coeff << adj_flow_resid << end;
@@ -1921,7 +1058,7 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
           }
           break;
 
-        case ADJ_RANS : case DISC_ADJ_RANS:
+        case ADJ_RANS :
 
           if (!DualTime_Iteration) {
             HistFile << begin << adjoint_coeff << adj_flow_resid;
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 6521fafecca9..fbc496a3ed7b 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -51,7 +51,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short val_iZone) : COutput(co
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -92,28 +92,6 @@ void CHeatOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
 
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
   bool thermal = false; /* Flag for whether to print heat flux values */
   bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
 
@@ -127,87 +105,7 @@ void CHeatOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
 
   /*--- Header for the coefficients ---*/
 
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
   char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
-  /*--- Find the markers being monitored and create a header for them ---*/
-
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-
-  /*--- Header for the residuals ---*/
-
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
   char heat_resid[]= ",\"Res_Heat\"";
 
   /*--- End of the header ---*/
@@ -223,72 +121,10 @@ void CHeatOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
     HistFile << "VARIABLES = ";
   }
 
-  /*--- Write the header, case depending ---*/
-
-  switch (config->GetKind_Solver()) {
-
-    case EULER : case NAVIER_STOKES: case RANS :
-      HistFile << begin;
-      if (!turbo) HistFile << flow_coeff;
-      if (turbo) HistFile << turbo_coeff;
-      if (thermal && !turbo) HistFile << heat_coeff;
-      if (equiv_area) HistFile << equivalent_area_coeff;
-      if (engine || actuator_disk) HistFile << engine_coeff;
-      if (inv_design) {
-        HistFile << Cp_inverse_design;
-        if (thermal && !turbo) HistFile << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-      HistFile << flow_resid;
-      if (turbulent) HistFile << turb_resid;
-      if (weakly_coupled_heat) HistFile << heat_resid;
-      if (aeroelastic) HistFile << aeroelastic_coeff;
-      if (output_per_surface) HistFile << monitoring_coeff;
-      if (output_surface) HistFile << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) HistFile << d_flow_coeff;
-        else        HistFile << d_turbo_coeff;
-        if (engine || actuator_disk) HistFile << d_engine;
-        if (thermal) HistFile << d_thermal_coeff;
-      }
-      if (output_comboObj) HistFile << combo_obj;
-      HistFile << end;
-
-      break;
-
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          HistFile << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          HistFile << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-      HistFile << end;
-      break;
-
-    case HEAT_EQUATION_FVM:
-      HistFile << begin << heat_coeff;
-      HistFile << heat_resid << end;
-      break;
-
-    case FEM_ELASTICITY:
-      HistFile << begin << fem_coeff;
-      if (incload) HistFile << fem_incload;
-      HistFile << fem_resid << endfea;
-      break;
-
-    case DISC_ADJ_FEM:
-      HistFile << begin << fem_coeff;
-      HistFile << fem_resid << endfea;
-      break;
+  /*--- Write the header ---*/
 
-  }
+  HistFile << begin << heat_coeff;
+  HistFile << heat_resid << end;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -309,118 +145,18 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   unsigned short val_iZone,
                                   unsigned short val_iInst) {
 
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
   unsigned long iIntIter    = config[val_iZone]->GetIntIter();
   unsigned long iExtIter    = config[val_iZone]->GetExtIter();
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
   unsigned short nZone      = config[val_iZone]->GetnZone();
   unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
   bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
   bool output_files         = true;
 
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
-
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-
-    if (fea || fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          break;
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
-
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-
-    }
-
-  }
-
   /*--- Output using only the master node ---*/
 
   if (rank == MASTER_NODE) {
 
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-
     unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
     if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
         config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
@@ -443,37 +179,8 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
 
-
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
     bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
     bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
 
     unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
 
@@ -497,396 +204,36 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Initialize variables to store information from all domains (direct solution) ---*/
 
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+    su2double  Total_CHeat = 0.0, Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0;
 
     unsigned short iSpan;
 
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-
     /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
     su2double *residual_heat         = NULL;
 
     /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
 
     /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
+    unsigned short nVar_Heat = 0;
 
     /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
     if (heat) nVar_Heat = 1;
 
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
-
-    /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-
     /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
     residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
-
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
 
     /*--- Write information from nodes ---*/
 
-    switch (config[val_iZone]->GetKind_Solver()) {
-
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-
-        /*--- Flow solution coefficients ---*/
-
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
+    /*--- Heat coefficients  ---*/
 
-        }
-
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-
-        /*--- Flow Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-        /*--- Turbulent residual ---*/
-
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-
-        /*--- Transition residual ---*/
-
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-
-
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
-
-        /*--- Iterations of the linear solver ---*/
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-        /*--- Adjoint solver ---*/
-
-        if (adjoint) {
-
-          /*--- Adjoint solution coefficients ---*/
-
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-          /*--- Adjoint flow residuals ---*/
-
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
-
-          /*--- Adjoint turbulent residuals ---*/
-
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
-          }
-
-        }
-
-        break;
-
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-
-      case FEM_ELASTICITY:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
-
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
-
-        break;
-
-      case DISC_ADJ_FEM:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
-
-        break;
+    Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+    Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+    Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
 
+    /*--- Heat Residuals ---*/
 
+    for (iVar = 0; iVar < nVar_Heat; iVar++) {
+      residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
     }
 
     if (extra_heat_output) {
@@ -898,25 +245,13 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
     /*--- Header frequency ---*/
 
     bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+        (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
     bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
     bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
     bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
     else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
@@ -924,14 +259,8 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
 
     /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
 
+    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
 
       /*--- Prepare the history file output, note that the dual
        time output don't write to the history file ---*/
@@ -944,1067 +273,50 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
         SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
 
         /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-            }
-
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                //
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-
-              }
-            }
-
-
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            }
-            else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-
-            /*---- Averaged stagnation pressure at an exit ----*/
-
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-            }
-
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-            }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
-            }
-
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-            }
-
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-            break;
-
-          case FEM_ELASTICITY:
-
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
-
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
-            break;
-
-          case DISC_ADJ_FEM:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
-
-            break;
+        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+        SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
 
-        }
       }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+      if ((val_iZone == 0 && val_iInst == 0)){
         /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
-
-          if (!fem) {
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
-
-              }
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
-          }
+        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
+
+          if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+          else cout << endl << " IntIter" << "  ExtIter";
+
+          cout <<  "      Res[Heat]" << "   HFlux(Total)";
 
         }
       }
 
       /*--- Write the solution on the screen ---*/
 
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+      if ((val_iZone == 0 && val_iInst == 0)){
         cout.precision(6);
         cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
+
+        if (!Unsteady) {
+          cout.width(5); cout << iExtIter + ExtIter_OffSet;
+          cout.width(11); cout << timeiter;
+
+        } else if (Unsteady && DualTime_Iteration) {
+          cout.width(8); cout << iIntIter;
+          cout.width(8); cout << iExtIter;
         }
-      }
 
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-
-                cout.unsetf(ios_base::floatfield);
-
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-
-        case RANS :
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid << turb_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;
-            }
-          }
-          break;
-
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-        case ADJ_RANS : case DISC_ADJ_RANS:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              HistFile << adj_turb_resid;
-            HistFile << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
+      }
 
+      if (!DualTime_Iteration) {
+        HistFile << begin << direct_coeff << heat_resid << end;
+        HistFile.flush();
       }
+
       cout.unsetf(ios::fixed);
 
     }
 
 
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
     delete [] residual_heat;
 
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-
   }
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 8268cf3be5b3..8a7edde13b9c 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -52,7 +52,7 @@ CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(co
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -134,7 +134,7 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
   char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
   char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
   char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
+  char heat_resid[]= ",\"Res_Heat\"";
   /*--- Find the markers being monitored and create a header for them ---*/
 
   for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
@@ -191,12 +191,6 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
       break;
     case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
   }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
 
   /*--- End of the header ---*/
 
@@ -258,6 +252,9 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   unsigned short val_iZone,
                                   unsigned short val_iInst) {
 
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
   bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
   bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
@@ -335,7 +332,7 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
       SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
 
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
 
       if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
 
@@ -366,11 +363,13 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     /*--- WARNING: These buffers have hard-coded lengths. Note that you
      may have to adjust them to be larger if adding more entries. ---*/
 
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
+    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
+    aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
     adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+    heat_resid[1000], combo_obj[1000],
+    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
 
     su2double dummy = 0.0, *Coord;
     unsigned short iVar, iMarker_Monitoring;
@@ -380,6 +379,8 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
 
+    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
 
     bool rotating_frame = config[val_iZone]->GetRotating_Frame();
     bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
@@ -391,20 +392,13 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
     bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
                       (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
     bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
     bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
     bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
     (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
     (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
 
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
     bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
     bool turbo = config[val_iZone]->GetBoolTurbomachinery();
 
@@ -492,7 +486,7 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     nVar_FEM = 0;
 
     /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    nVar_Flow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
@@ -502,16 +496,9 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     if (transition) nVar_Trans = 2;
     if (heat) nVar_Heat = 1;
 
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
 
     /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    nVar_AdjFlow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
@@ -524,10 +511,6 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     residual_turbulent  = new su2double[nVar_Turb];
     residual_transition = new su2double[nVar_Trans];
     residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
 
     /*--- Allocate memory for the coefficients being monitored ---*/
     aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
@@ -545,286 +528,176 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Write information from nodes ---*/
 
-    switch (config[val_iZone]->GetKind_Solver()) {
-
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-
-        /*--- Flow solution coefficients ---*/
-
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-
-        }
-
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-
-        /*--- Flow Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-        /*--- Turbulent residual ---*/
-
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-
-        /*--- Transition residual ---*/
-
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-
-
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
+    /*--- Flow solution coefficients ---*/
+
+    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+    if (thermal) {
+      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+      if(weakly_coupled_heat) {
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+      }
+    }
 
-        /*--- Iterations of the linear solver ---*/
+    if (direct_diff != NO_DERIVATIVE) {
+      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+      if (thermal) {
+        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+        //Davg Temp
+      }
 
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+      if (engine || actuator_disk) {
+        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+      }
 
-        /*--- Adjoint solver ---*/
+    }
 
-        if (adjoint) {
+    if (equiv_area) {
+      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
 
-          /*--- Adjoint solution coefficients ---*/
+      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+    }
 
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+    if (engine || actuator_disk) {
+      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+    }
 
-          /*--- Adjoint flow residuals ---*/
+    if (rotating_frame) {
+      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+    }
 
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
+    if (aeroelastic) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+      }
+    }
 
-          /*--- Adjoint turbulent residuals ---*/
+    if (output_per_surface) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+      }
+    }
 
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
+    if (turbo) {
+      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
           }
-
         }
+      }
+      if (direct_diff != NO_DERIVATIVE){
+        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+      }
+    }
 
-        break;
-
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-
-      case FEM_ELASTICITY:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+    /*--- Get flux-averaged values at the specified surface ---*/
+
+    if (output_surface) {
+
+      unsigned short iMarker_Analyze = 0;
+      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
 
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+    }
 
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+    /*--- Flow Residuals ---*/
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+    for (iVar = 0; iVar < nVar_Flow; iVar++)
+      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
 
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
+    /*--- Turbulent residual ---*/
 
-        break;
+    if (turbulent) {
+      for (iVar = 0; iVar < nVar_Turb; iVar++)
+        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+    }
 
-      case DISC_ADJ_FEM:
+    if (weakly_coupled_heat) {
+      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+      }
 
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+    }
 
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+    /*--- Transition residual ---*/
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
+    if (transition) {
+      for (iVar = 0; iVar < nVar_Trans; iVar++)
+        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+    }
 
-        break;
 
+    /*--- Iterations of the linear solver ---*/
 
-    }
+    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
 
     if (extra_heat_output) {
       Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
@@ -842,33 +715,14 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
     else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
 
     bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
 
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
 
+    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
 
       /*--- Prepare the history file output, note that the dual
        time output don't write to the history file ---*/
@@ -881,262 +735,171 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
         SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
 
         /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-            }
 
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                //
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-
-              }
-            }
+        /*--- Direct coefficients ---*/
+        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+        if (inv_design) {
+          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+        }
 
+        if (direct_diff != NO_DERIVATIVE) {
+          if (!turbo)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+          else
+            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+          if (engine || actuator_disk)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+          if (thermal)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+        }
 
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+        if (aeroelastic) {
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+            if (iMarker_Monitoring == 0) {
+              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
             }
             else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-
-            /*---- Averaged stagnation pressure at an exit ----*/
-
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+              strcat(aeroelastic_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+            strcat(aeroelastic_coeff, surface_coeff);
+          }
+        }
 
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+        if (output_per_surface) {
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+            if (iMarker_Monitoring == 0) {
+              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
             }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
+            else {
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+          }
+        }
 
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+        if (turbo){
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+            if (iMarker_Monitoring == 0){
+              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+            }else{
+              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+            strcat(turbo_coeff, surface_coeff);
+            //
+            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
 
-            break;
-
-          case HEAT_EQUATION_FVM:
+          }
+        }
 
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+        /*--- Flow residual ---*/
+        if (nDim == 2) {
+          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+        }
+        else {
+          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+        }
 
-            break;
+        /*--- Turbulent residual ---*/
+        if (turbulent) {
+          switch(nVar_Turb) {
+          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+          }
+        }
 
-          case FEM_ELASTICITY:
+        /*---- Averaged stagnation pressure at an exit ----*/
 
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
+        if (output_surface) {
+          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+        }
 
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+        /*--- Transition residual ---*/
+        if (transition) {
+          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+        }
 
-            break;
+        /*--- Combo objective ---*/
+        if (output_comboObj) {
+          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+        }
 
-          case DISC_ADJ_FEM:
+        if (weakly_coupled_heat) {
+          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+        }
 
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
 
-            break;
-
-        }
       }
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
+        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
+
 
-          if (!fem) {
             if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
 
                 cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
 
@@ -1199,19 +962,7 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                 if (turbo && write_turbo && val_iZone== 0){
                   WriteTurboPerfConvHistory(config[val_iZone]);
                 }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
 
-              }
             }
             else {
               if (flow) {
@@ -1227,12 +978,6 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                 cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
               }
             }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
 
           switch (config[val_iZone]->GetKind_Solver()) {
           case EULER :                  case NAVIER_STOKES:
@@ -1373,143 +1118,6 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
             break;
 
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
           }
 
         }
@@ -1520,31 +1128,13 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         cout.precision(6);
         cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
+        if (!Unsteady) {
+          cout.width(5); cout << iExtIter + ExtIter_OffSet;
+          cout.width(11); cout << timeiter;
+
+        } else if (Unsteady && DualTime_Iteration) {
+          cout.width(8); cout << iIntIter;
+          cout.width(8); cout << iExtIter;
         }
       }
 
@@ -1736,184 +1326,6 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
           }
           break;
 
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-        case ADJ_RANS : case DISC_ADJ_RANS:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              HistFile << adj_turb_resid;
-            HistFile << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
       }
       cout.unsetf(ios::fixed);
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index ec340fa5ef87..e3a0a11b9d42 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -52,7 +52,7 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, unsigned short val_iZone) : COut
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -90,7 +90,7 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 }
 
 void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  char cstr[200], buffer[50], turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
 
@@ -101,9 +101,6 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
   bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
   bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
                     (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
   bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
 
   bool output_surface = (config->GetnMarker_Analyze() != 0);
@@ -112,10 +109,6 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
   bool turbo = config->GetBoolTurbomachinery();
   unsigned short direct_diff = config->GetDirectDiff();
 
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
   bool thermal = false; /* Flag for whether to print heat flux values */
   bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
 
@@ -134,11 +127,6 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
   char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
   char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
   char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
   char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
   char Cp_inverse_design[]= ",\"Cp_Diff\"";
   char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
@@ -146,7 +134,7 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
   char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
   char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
   char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
+  char heat_resid[]= ",\"Res_Heat\"";
   /*--- Find the markers being monitored and create a header for them ---*/
 
   for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
@@ -203,19 +191,10 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
       break;
     case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
   }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
 
   /*--- End of the header ---*/
 
   char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
 
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
@@ -227,70 +206,32 @@ void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_i
 
   /*--- Write the header, case depending ---*/
 
-  switch (config->GetKind_Solver()) {
-
-    case EULER : case NAVIER_STOKES: case RANS :
-      HistFile << begin;
-      if (!turbo) HistFile << flow_coeff;
-      if (turbo) HistFile << turbo_coeff;
-      if (thermal && !turbo) HistFile << heat_coeff;
-      if (equiv_area) HistFile << equivalent_area_coeff;
-      if (engine || actuator_disk) HistFile << engine_coeff;
-      if (inv_design) {
-        HistFile << Cp_inverse_design;
-        if (thermal && !turbo) HistFile << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-      HistFile << flow_resid;
-      if (turbulent) HistFile << turb_resid;
-      if (weakly_coupled_heat) HistFile << heat_resid;
-      if (aeroelastic) HistFile << aeroelastic_coeff;
-      if (output_per_surface) HistFile << monitoring_coeff;
-      if (output_surface) HistFile << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) HistFile << d_flow_coeff;
-        else        HistFile << d_turbo_coeff;
-        if (engine || actuator_disk) HistFile << d_engine;
-        if (thermal) HistFile << d_thermal_coeff;
-      }
-      if (output_comboObj) HistFile << combo_obj;
-      HistFile << end;
-
-      break;
-
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          HistFile << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          HistFile << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-      HistFile << end;
-      break;
-
-    case HEAT_EQUATION_FVM:
-      HistFile << begin << heat_coeff;
-      HistFile << heat_resid << end;
-      break;
-
-    case FEM_ELASTICITY:
-      HistFile << begin << fem_coeff;
-      if (incload) HistFile << fem_incload;
-      HistFile << fem_resid << endfea;
-      break;
-
-    case DISC_ADJ_FEM:
-      HistFile << begin << fem_coeff;
-      HistFile << fem_resid << endfea;
-      break;
-
+  HistFile << begin;
+  if (!turbo) HistFile << flow_coeff;
+  if (turbo) HistFile << turbo_coeff;
+  if (thermal && !turbo) HistFile << heat_coeff;
+  if (equiv_area) HistFile << equivalent_area_coeff;
+  if (engine || actuator_disk) HistFile << engine_coeff;
+  if (inv_design) {
+    HistFile << Cp_inverse_design;
+    if (thermal && !turbo) HistFile << Heat_inverse_design;
+  }
+  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+
+  HistFile << flow_resid;
+  if (turbulent) HistFile << turb_resid;
+  if (weakly_coupled_heat) HistFile << heat_resid;
+  if (aeroelastic) HistFile << aeroelastic_coeff;
+  if (output_per_surface) HistFile << monitoring_coeff;
+  if (output_surface) HistFile << surface_outputs;
+  if (direct_diff != NO_DERIVATIVE) {
+    if (!turbo) HistFile << d_flow_coeff;
+    else        HistFile << d_turbo_coeff;
+    if (engine || actuator_disk) HistFile << d_engine;
+    if (thermal) HistFile << d_thermal_coeff;
   }
+  if (output_comboObj) HistFile << combo_obj;
+  HistFile << end;
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -311,32 +252,29 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                                   unsigned short val_iZone,
                                   unsigned short val_iInst) {
 
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
   bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
   bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
   unsigned long iIntIter    = config[val_iZone]->GetIntIter();
   unsigned long iExtIter    = config[val_iZone]->GetExtIter();
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
   unsigned short nZone      = config[val_iZone]->GetnZone();
   unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
   bool energy               = config[val_iZone]->GetEnergy_Equation();
   bool incload              = config[val_iZone]->GetIncrementalLoad();
   bool output_files         = true;
 
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+  if (!DualTime_Iteration) {
 
     if ((config[val_iZone]->GetFixed_CL_Mode()) &&
         (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
       output_files = false;
     }
 
-    if (fea || fluid_structure) output_files = false;
+    if (fluid_structure) output_files = false;
 
     /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
 
@@ -349,39 +287,33 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
       if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
 
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the surface. ---*/
+      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the surface. ---*/
+      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the surface. ---*/
 
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+      }
 
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
+      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
 
-          break;
+      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
       }
 
       /*--- Output a file with the forces breakdown. ---*/
@@ -400,7 +332,7 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
       SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
 
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
+      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
 
       if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
 
@@ -431,11 +363,13 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     /*--- WARNING: These buffers have hard-coded lengths. Note that you
      may have to adjust them to be larger if adding more entries. ---*/
 
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
+    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
+    aeroelastic_coeff[1000], monitoring_coeff[10000],
+    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
     adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+    heat_resid[1000], combo_obj[1000],
+    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
 
     su2double dummy = 0.0, *Coord;
     unsigned short iVar, iMarker_Monitoring;
@@ -445,6 +379,8 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
 
+    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
 
     bool rotating_frame = config[val_iZone]->GetRotating_Frame();
     bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
@@ -456,20 +392,13 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
     bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
                       (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
     bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
     bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
     bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
     (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
     (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
 
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
     bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
     bool turbo = config[val_iZone]->GetBoolTurbomachinery();
 
@@ -557,7 +486,7 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     nVar_FEM = 0;
 
     /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    nVar_Flow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
@@ -567,16 +496,9 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     if (transition) nVar_Trans = 2;
     if (heat) nVar_Heat = 1;
 
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
 
     /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    nVar_AdjFlow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
@@ -589,10 +511,6 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     residual_turbulent  = new su2double[nVar_Turb];
     residual_transition = new su2double[nVar_Trans];
     residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
 
     /*--- Allocate memory for the coefficients being monitored ---*/
     aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
@@ -610,286 +528,176 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Write information from nodes ---*/
 
-    switch (config[val_iZone]->GetKind_Solver()) {
-
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-
-        /*--- Flow solution coefficients ---*/
-
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-
-        }
-
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-
-        /*--- Flow Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-        /*--- Turbulent residual ---*/
-
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-
-        /*--- Transition residual ---*/
-
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-
-
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
+    /*--- Flow solution coefficients ---*/
+
+    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+    if (thermal) {
+      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+      if(weakly_coupled_heat) {
+        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+      }
+    }
 
-        /*--- Iterations of the linear solver ---*/
+    if (direct_diff != NO_DERIVATIVE) {
+      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+      if (thermal) {
+        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+        //Davg Temp
+      }
 
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+      if (engine || actuator_disk) {
+        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+      }
 
-        /*--- Adjoint solver ---*/
+    }
 
-        if (adjoint) {
+    if (equiv_area) {
+      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
 
-          /*--- Adjoint solution coefficients ---*/
+      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+    }
 
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+    if (engine || actuator_disk) {
+      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+    }
 
-          /*--- Adjoint flow residuals ---*/
+    if (rotating_frame) {
+      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+    }
 
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
+    if (aeroelastic) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+      }
+    }
 
-          /*--- Adjoint turbulent residuals ---*/
+    if (output_per_surface) {
+      /*--- Look over the markers being monitored and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+      }
+    }
 
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
+    if (turbo) {
+      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
           }
-
-        }
-
-        break;
-
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
         }
+      }
+      if (direct_diff != NO_DERIVATIVE){
+        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+      }
+    }
 
-        break;
-
-      case FEM_ELASTICITY:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+    /*--- Get flux-averaged values at the specified surface ---*/
+
+    if (output_surface) {
+
+      unsigned short iMarker_Analyze = 0;
+      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
 
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+    }
 
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+    /*--- Flow Residuals ---*/
 
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+    for (iVar = 0; iVar < nVar_Flow; iVar++)
+      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+    /*--- Turbulent residual ---*/
 
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
-
-        break;
+    if (turbulent) {
+      for (iVar = 0; iVar < nVar_Turb; iVar++)
+        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+    }
 
-      case DISC_ADJ_FEM:
+    if (weakly_coupled_heat) {
+      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+      }
 
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+    }
 
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+    /*--- Transition residual ---*/
 
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
+    if (transition) {
+      for (iVar = 0; iVar < nVar_Trans; iVar++)
+        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+    }
 
-        break;
 
+    /*--- Iterations of the linear solver ---*/
 
-    }
+    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
 
     if (extra_heat_output) {
       Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
@@ -907,33 +715,14 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
 
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
     else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
 
     bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
 
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
 
+    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
 
       /*--- Prepare the history file output, note that the dual
        time output don't write to the history file ---*/
@@ -946,262 +735,171 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
         SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
 
         /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-            }
-
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                //
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
 
-              }
-            }
+        /*--- Direct coefficients ---*/
+        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+        if (inv_design) {
+          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+        }
 
+        if (direct_diff != NO_DERIVATIVE) {
+          if (!turbo)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+          else
+            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+          if (engine || actuator_disk)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+          if (thermal)
+            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+        }
 
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+        if (aeroelastic) {
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+            if (iMarker_Monitoring == 0) {
+              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
             }
             else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-
-            /*---- Averaged stagnation pressure at an exit ----*/
-
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+              strcat(aeroelastic_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+            strcat(aeroelastic_coeff, surface_coeff);
+          }
+        }
 
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+        if (output_per_surface) {
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+            if (iMarker_Monitoring == 0) {
+              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
             }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
+            else {
+              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+              strcat(monitoring_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+            strcat(monitoring_coeff, surface_coeff);
+          }
+        }
 
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+        if (turbo){
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+            if (iMarker_Monitoring == 0){
+              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+            }else{
+              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+              strcat(turbo_coeff, surface_coeff);
             }
+            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+            strcat(turbo_coeff, surface_coeff);
+            //
+            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
+            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+            strcat(turbo_coeff, surface_coeff);
 
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+          }
+        }
 
-            break;
+        /*--- Flow residual ---*/
+        if (nDim == 2) {
+          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+        }
+        else {
+          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+        }
 
-          case FEM_ELASTICITY:
+        /*--- Turbulent residual ---*/
+        if (turbulent) {
+          switch(nVar_Turb) {
+          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+          }
+        }
 
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
+        /*---- Averaged stagnation pressure at an exit ----*/
 
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+        if (output_surface) {
+          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+        }
 
-            break;
+        /*--- Transition residual ---*/
+        if (transition) {
+          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+        }
 
-          case DISC_ADJ_FEM:
+        /*--- Combo objective ---*/
+        if (output_comboObj) {
+          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+        }
 
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
+        if (weakly_coupled_heat) {
+          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+        }
 
-            break;
 
-        }
       }
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
+        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
+
 
-          if (!fem) {
             if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
 
                 cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
 
@@ -1264,19 +962,7 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                 if (turbo && write_turbo && val_iZone== 0){
                   WriteTurboPerfConvHistory(config[val_iZone]);
                 }
-                break;
 
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
-
-              }
             }
             else {
               if (flow) {
@@ -1292,12 +978,6 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
                 cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
               }
             }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
 
           switch (config[val_iZone]->GetKind_Solver()) {
           case EULER :                  case NAVIER_STOKES:
@@ -1438,143 +1118,6 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
             break;
 
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
           }
 
         }
@@ -1585,31 +1128,13 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
       if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
         cout.precision(6);
         cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
+        if (!Unsteady) {
+          cout.width(5); cout << iExtIter + ExtIter_OffSet;
+          cout.width(11); cout << timeiter;
+
+        } else if (Unsteady && DualTime_Iteration) {
+          cout.width(8); cout << iIntIter;
+          cout.width(8); cout << iExtIter;
         }
       }
 
@@ -1801,184 +1326,6 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
           }
           break;
 
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-        case ADJ_RANS : case DISC_ADJ_RANS:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              HistFile << adj_turb_resid;
-            HistFile << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
       }
       cout.unsetf(ios::fixed);
 

From 0464014217a8dfd512bae766b2d66ec1c354ccfe Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 7 Jun 2018 13:57:19 +0200
Subject: [PATCH 007/539] Prototype flow output, add config option to determine
 screen output.

---
 Common/include/config_structure.hpp       |   13 +
 Common/include/config_structure.inl       |    4 +
 Common/include/option_structure.hpp       |   57 +
 Common/src/config_structure.cpp           |    8 +-
 SU2_CFD/include/output_structure.hpp      |   26 +-
 SU2_CFD/src/driver_structure.cpp          |   38 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |    2 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp |    2 +-
 SU2_CFD/src/output_adjoint_mean.cpp       |    2 +-
 SU2_CFD/src/output_direct_elasticity.cpp  |   85 +-
 SU2_CFD/src/output_direct_heat.cpp        |    2 +-
 SU2_CFD/src/output_direct_mean.cpp        | 2540 ++++++++++++---------
 SU2_CFD/src/output_direct_mean_inc.cpp    |    2 +-
 13 files changed, 1672 insertions(+), 1109 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 231d7e16077a..c66f691132e5 100755
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -996,6 +996,8 @@ class CConfig {
   su2double *FreeStreamTurboNormal; /*!< \brief Direction to initialize the flow in turbomachinery computation */
   su2double Max_Beta; /*!< \brief Maximum Beta parameter (incompressible preconditioning) in the domain */
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
+  unsigned short *Kind_ScreenOutput;    /*!< \brief Kind of the screen output. */
+  unsigned short nScreenOutput;         /*!< \brief Number of screen output variables (max: 6). */
 
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
@@ -8354,6 +8356,17 @@ class CConfig {
    * \brief Set the ofstream of the history file for the current zone.
    */
   void SetHistFile(ofstream *HistFile);
+
+  /*!
+   * \brief Get the number of screen output variables requested (maximum 6)
+   */
+  unsigned short GetnScreenOutput(void);
+
+  /*
+  * \brief Get the screen output field iField
+  */
+  unsigned short GetScreenOutput_Field(unsigned short iField);
+
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 28f1f0574e45..50608e010196 100755
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1863,3 +1863,7 @@ inline bool CConfig::GetQCR(void) {return QCR;}
 inline ofstream* CConfig::GetHistFile(void) { return ConvHistFile; }
 
 inline void CConfig::SetHistFile(ofstream *HistFile) { ConvHistFile = HistFile; }
+
+inline unsigned short CConfig::GetnScreenOutput(void) { return nScreenOutput; }
+
+inline unsigned short CConfig::GetScreenOutput_Field(unsigned short iField) { return Kind_ScreenOutput[iField]; }
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index e44aeeae267e..00dd8e8169e2 100755
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1777,6 +1777,63 @@ static const map<string, ENUM_INPUT_REF> Input_Ref_Map = CCreateMap<string, ENUM
 ("SU2", SU2_REF)
 ("CUSTOM", CUSTOM_REF);
 
+/*!
+ * \brief types of screen output fields
+ */
+enum ENUM_SCREEN_OUTPUT {
+  SOUT_INTITER = 0,    /*!< \brief Internal iteration. */
+  SOUT_EXTITER = 1,    /*!< \brief External iteration. */
+  SOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
+  SOUT_PHYSTIME = 2,   /*!< \brief Physical time of the iteration. */
+  SOUT_RHO = 10,       /*!< \brief Density output. */
+  SOUT_RHOU1 = 11,     /*!< \brief Momentum-x output. */
+  SOUT_RHOU2 = 12,     /*!< \brief Momentum-y output. */
+  SOUT_RHOU3 = 13,     /*!< \brief Momentum-z output. */
+  SOUT_RHOE = 14,      /*!< \brief Rho-E output. */
+  SOUT_PRESS = 15,     /*!< \brief Pressure output. */
+  SOUT_CL = 20,        /*!< \brief Lift coefficient output. */
+  SOUT_CD = 21,        /*!< \brief Drag coefficient output. */
+  SOUT_CM = 22,        /*!< \brief Moment coefficient output. */
+  SOUT_SA = 30,        /*!< \brief Spalart-Allmaras Nu. */
+  SOUT_K = 31,         /*!< \brief k-w Kinetic energy. */
+  SOUT_W = 32,         /*!< \brief k-w Rate of dissipation. */
+  SOUT_TEMP = 40,      /*!< \brief Temperature. */
+  SOUT_UTOL = 50,       /*!< \brief Elasticity displacement norm. */
+  SOUT_RTOL = 51,       /*!< \brief Elasticity residual norm. */
+  SOUT_ETOL = 52,       /*!< \brief Elasticity energy norm. */
+  SOUT_VMS = 53,        /*!< \brief Elasticity Maximum Von Mises stress. */
+  SOUT_DISPX = 54,        /*!< \brief Norm of the displacement vector - x component. */
+  SOUT_DISPY = 55,        /*!< \brief Norm of the displacement vector - y component. */
+  SOUT_DISPZ = 56         /*!< \brief Norm of the displacement vector - z component. */
+};
+
+static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<string, ENUM_SCREEN_OUTPUT>
+("INT_ITER", SOUT_INTITER)
+("EXT_ITER", SOUT_EXTITER)
+("TIME", SOUT_TIME)
+("PHYSICAL_TIME", SOUT_PHYSTIME)
+("DENSITY", SOUT_RHO)
+("MOMENTUM-X", SOUT_RHOU1)
+("MOMENTUM-Y", SOUT_RHOU2)
+("MOMENTUM-Z", SOUT_RHOU3)
+("RHO-E", SOUT_RHOE)
+("PRESSURE", SOUT_PRESS)
+("LIFT", SOUT_CL)
+("DRAG", SOUT_CD)
+("MOMENT", SOUT_CM)
+("SA-NU", SOUT_SA)
+("K-W_KINETIC", SOUT_K)
+("K-W_DISSIPATION", SOUT_W)
+("TEMPERATURE", SOUT_TEMP)
+("UTOL", SOUT_UTOL)
+("RTOL", SOUT_RTOL)
+("ETOL", SOUT_ETOL)
+("DISPX", SOUT_DISPX)
+("DISPY", SOUT_DISPY)
+("DISPZ", SOUT_DISPZ)
+("VMS", SOUT_VMS);
+
+
 /* END_CONFIG_ENUMS */
 
 class COptionBase {
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 88b5d51d5171..8e226931aa32 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2099,6 +2099,12 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   /* DESCRIPTION: Multipoint design freestream pressure */
   addPythonOption("MULTIPOINT_FREESTREAM_PRESSURE");
   
+  /*--- options that are used for the output ---*/
+  /*!\par CONFIG_CATEGORY:Output Options\ingroup Config*/
+
+  /* DESCRIPTION: Type of mesh motion */
+  addEnumListOption("SCREEN_OUTPUT", nScreenOutput, Kind_ScreenOutput, Screen_Output_Map);
+
   /* END_CONFIG_OPTIONS */
 
 }
@@ -2483,7 +2489,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
 
   /*--- Initialize the ofstream ConvHistFile. ---*/
-  ofstream ConvHistFile;
+//  ofstream ConvHistFile;
 
   /*--- Decide whether we should be writing unsteady solution files. ---*/
   
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 0e5b24ebf8ad..79eda146acf0 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -867,15 +867,17 @@ class CFlowOutput : public COutput {
 
   char char_histfile[200];
 
+  ofstream HistFile;
+
 public:
 
-  ofstream HistFile;
+
 
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, unsigned short iZone);
+  CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -923,7 +925,7 @@ class CIncFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CIncFlowOutput(CConfig *config, unsigned short iZone);
+  CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -961,17 +963,19 @@ class CIncFlowOutput : public COutput {
 class CFEAOutput : public COutput {
 private:
 
-  char char_histfile[200];
-
-public:
+protected:
 
   ofstream HistFile;
+  su2double *residual_fem;
+  unsigned short nVar_FEM;
+
+public:
 
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFEAOutput(CConfig *config, unsigned short iZone);
+  CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1019,7 +1023,7 @@ class CHeatOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CHeatOutput(CConfig *config, unsigned short iZone);
+  CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1067,7 +1071,7 @@ class CAdjFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjFlowOutput(CConfig *config, unsigned short iZone);
+  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1115,7 +1119,7 @@ class CDiscAdjFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjFlowOutput(CConfig *config, unsigned short iZone);
+  CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1163,7 +1167,7 @@ class CDiscAdjFEAOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjFEAOutput(CConfig *config, unsigned short iZone);
+  CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 69c53001816c..bb9f6ad29750 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -513,13 +513,13 @@ CDriver::CDriver(char* confFile,
 
   /*--- Open the FSI convergence history file ---*/
 
-  if (fsi){
-      if (rank == MASTER_NODE) cout << endl <<"Opening FSI history file." << endl;
-      unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
-      output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
-                                config_container, integration_container, 0,
-                                ZONE_FLOW, ZONE_STRUCT, true);
-  }
+//  if (fsi){
+//      if (rank == MASTER_NODE) cout << endl <<"Opening FSI history file." << endl;
+//      unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
+//      output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
+//                                config_container, integration_container, 0,
+//                                ZONE_FLOW, ZONE_STRUCT, true);
+//  }
 
   /*--- Set up a timer for performance benchmarking (preprocessing time is not included) ---*/
 
@@ -2951,8 +2951,6 @@ void CDriver::InitStaticMeshMovement(){
 
 void CDriver::Output_Preprocessing(){
 
-  bool new_approach = false;
-
   /*--- Definition of the output class (one for each zone). The output class
    manages the writing of all restart, volume solution, surface solution,
    surface comma-separated value, and convergence history files (both in serial
@@ -2968,44 +2966,42 @@ void CDriver::Output_Preprocessing(){
     switch (config_container[iZone]->GetKind_Solver()) {
 
     case EULER: case NAVIER_STOKES: case RANS:
-      new_approach = true;
       if (rank == MASTER_NODE)
         cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
-        output[iZone] = new CFlowOutput(config_container[iZone], iZone);
+        output[iZone] = new CFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
-        output[iZone] = new CIncFlowOutput(config_container[iZone], iZone);
+        output[iZone] = new CIncFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case HEAT_EQUATION_FVM:
       if (rank == MASTER_NODE)
         cout << ": heat output structure." << endl;
-      output[iZone] = new CHeatOutput(config_container[iZone], iZone);
+      output[iZone] = new CHeatOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case FEM_ELASTICITY:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      new_approach = true;
-      output[iZone] = new CFEAOutput(config_container[iZone], iZone);
+      output[iZone] = new CFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
       if (rank == MASTER_NODE)
         cout << ": adjoint Euler/Navier-Stokes/RANS output structure.." << endl;
-      output[iZone] = new CAdjFlowOutput(config_container[iZone], iZone);
+      output[iZone] = new CAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint Euler/Navier-Stokes/RANS output structure." << endl;
-      output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], iZone);
+      output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case DISC_ADJ_FEM:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint FEA output structure." << endl;
-      output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], iZone);
+      output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
     }
 
@@ -5054,9 +5050,9 @@ void CFSIDriver::Run() {
     /*-------------------- Output FSI history -------------------------*/
     /*-----------------------------------------------------------------*/
 
-    output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
-                              config_container, integration_container, 0,
-                              ZONE_FLOW, ZONE_STRUCT, false);
+//    output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
+//                              config_container, integration_container, 0,
+//                              ZONE_FLOW, ZONE_STRUCT, false);
 
     if (Convergence) break;
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 38c0c892245c..b5695ecbc45d 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -37,7 +37,7 @@
 
 #include "../include/output_structure.hpp"
 
-CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 84336d2b947e..afea5afca04c 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -37,7 +37,7 @@
 
 #include "../include/output_structure.hpp"
 
-CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index fcad7e13e17f..e56d1cfa33b4 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -37,7 +37,7 @@
 
 #include "../include/output_structure.hpp"
 
-CAdjFlowOutput::CAdjFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index e3f323db0706..608671fa4625 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -37,44 +37,57 @@
 
 #include "../include/output_structure.hpp"
 
-CFEAOutput::CFEAOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  char buffer[50];
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
 
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
+    unsigned short nDim = geometry->GetnDim();
 
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
+    bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
+    char buffer[50], char_histfile[200];
+
+    // Retrieve the history filename
+    string history_filename = config->GetConv_FileName();
+
+    // Append the zone ID
+    if(config->GetnZone() > 1){
+      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+    }
+    strcpy (char_histfile, history_filename.data());
+
+    // Append the restart iteration: if dynamic problem and restart
+    if (config->GetWrt_Dynamic() && config->GetRestart()) {
+      long iExtIter = config->GetDyn_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(char_histfile, buffer);
+    }
+
+    // Add the correct file extension depending on the file format
+    if ((config->GetOutput_FileFormat() == TECPLOT) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    strcat(char_histfile, buffer);
 
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
     SetConvHistory_Header(config, val_iZone, INST_0);
+
+    /*--- Initialize number of variables ---*/
+    if (linear_analysis) nVar_FEM = nDim;
+    if (nonlinear_analysis) nVar_FEM = 3;
+
+    /*--- Allocate memory for the residual ---*/
+    residual_fem        = new su2double[nVar_FEM];
   }
 
 }
@@ -83,6 +96,8 @@ CFEAOutput::~CFEAOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
+
+    if (residual_fem != NULL) delete [] residual_fem;
   }
 
 
@@ -168,15 +183,6 @@ void CFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
     /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
     /*------------------------------------------------------------------------------------------------------*/
 
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_FEM = 0;
-    if (linear_analysis) nVar_FEM = nDim;
-    if (nonlinear_analysis) nVar_FEM = 3;
-
-    /*--- Allocate memory for the residual ---*/
-    su2double *residual_fem          = NULL;
-    residual_fem        = new su2double[nVar_FEM];
-
     /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
     su2double Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
     su2double Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
@@ -297,9 +303,6 @@ void CFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
 
     cout.unsetf(ios::fixed);
 
-
-    delete [] residual_fem;
-
   }
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index fbc496a3ed7b..00eed1b0935b 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -37,7 +37,7 @@
 
 #include "../include/output_structure.hpp"
 
-CHeatOutput::CHeatOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 8a7edde13b9c..a9a4e12c37de 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -38,7 +38,1332 @@
 
 #include "../include/output_structure.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+//CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+//
+//  char buffer[50];
+//
+//  // Retrieve the history filename
+//  string history_filename = config->GetConv_FileName();
+//
+//  // Append the zone ID
+//  if(config->GetnZone() > 1){
+//    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+//  }
+//  strcpy (char_histfile, history_filename.data());
+//
+//  // Append the restart iteration: if dynamic problem and restart
+//  if (config->GetWrt_Unsteady() && config->GetRestart()) {
+//    long iExtIter = config->GetDyn_RestartIter();
+//    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+//    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+//    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+//    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+//    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+//    strcat(char_histfile, buffer);
+//  }
+//
+//  // Add the correct file extension depending on the file format
+//  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+//      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+//  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+//           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+//  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+//  strcat(char_histfile, buffer);
+//
+//  // Open the history file using only the master node
+//  if (rank == MASTER_NODE){
+//    cout << "History filename: " << char_histfile << endl;
+//    HistFile.open(char_histfile, ios::out);
+//    HistFile.precision(15);
+//    SetConvHistory_Header(config, val_iZone, INST_0);
+//  }
+//
+//}
+//
+//CFlowOutput::~CFlowOutput(void) {
+//
+//  if (rank == MASTER_NODE){
+//    HistFile.close();
+//  }
+//
+//
+//}
+//
+//void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+//  char cstr[200], buffer[50], turb_resid[1000];
+//  unsigned short iMarker_Monitoring;
+//  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+//
+//  bool rotating_frame = config->GetRotating_Frame();
+//  bool aeroelastic = config->GetAeroelastic_Simulation();
+//  bool equiv_area = config->GetEquivArea();
+//  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+//  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+//  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+//                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+//  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+//
+//  bool output_surface = (config->GetnMarker_Analyze() != 0);
+//  bool output_comboObj = (config->GetnObj() > 1);
+//  bool output_per_surface = config->GetWrt_Surface();
+//  bool turbo = config->GetBoolTurbomachinery();
+//  unsigned short direct_diff = config->GetDirectDiff();
+//
+//  bool thermal = false; /* Flag for whether to print heat flux values */
+//  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+//
+//  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+//    thermal = true;
+//  }
+//
+//  /*--- Begin of the header ---*/
+//
+//  char begin[]= "\"Iteration\"";
+//
+//  /*--- Header for the coefficients ---*/
+//
+//  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+//  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+//  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+//  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+//  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+//  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+//  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+//  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+//  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+//  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+//  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+//  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+//  char heat_resid[]= ",\"Res_Heat\"";
+//  /*--- Find the markers being monitored and create a header for them ---*/
+//
+//  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+//    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+//    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+//    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+//    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+//    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+//  }
+//
+//  if (turbo){
+//    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+//
+//      stringstream tag;
+//      tag << iMarker_Monitoring + 1;
+//
+//      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+//      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+//      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+//      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+//      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+//      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+//      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+//      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+//      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+//      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+//      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+//      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+//      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+//      // different from zero only in multi-zone computation
+//      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+//      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+//
+//    }
+//  }
+//
+//  char combo_obj[] = ",\"ComboObj\"";
+//
+//  /*--- Header for the residuals ---*/
+//
+//  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+//  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+//  switch (config->GetKind_Turb_Model()) {
+//    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+//      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+//      break;
+//    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+//  }
+//
+//  /*--- End of the header ---*/
+//
+//  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+//
+//  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+//      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+//      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+//      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+//    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+//    HistFile << "VARIABLES = ";
+//  }
+//
+//  /*--- Write the header, case depending ---*/
+//
+//  HistFile << begin;
+//  if (!turbo) HistFile << flow_coeff;
+//  if (turbo) HistFile << turbo_coeff;
+//  if (thermal && !turbo) HistFile << heat_coeff;
+//  if (equiv_area) HistFile << equivalent_area_coeff;
+//  if (engine || actuator_disk) HistFile << engine_coeff;
+//  if (inv_design) {
+//    HistFile << Cp_inverse_design;
+//    if (thermal && !turbo) HistFile << Heat_inverse_design;
+//  }
+//  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+//
+//  HistFile << flow_resid;
+//  if (turbulent) HistFile << turb_resid;
+//  if (weakly_coupled_heat) HistFile << heat_resid;
+//  if (aeroelastic) HistFile << aeroelastic_coeff;
+//  if (output_per_surface) HistFile << monitoring_coeff;
+//  if (output_surface) HistFile << surface_outputs;
+//  if (direct_diff != NO_DERIVATIVE) {
+//    if (!turbo) HistFile << d_flow_coeff;
+//    else        HistFile << d_turbo_coeff;
+//    if (engine || actuator_disk) HistFile << d_engine;
+//    if (thermal) HistFile << d_thermal_coeff;
+//  }
+//  if (output_comboObj) HistFile << combo_obj;
+//  HistFile << end;
+//
+//  if (config->GetOutput_FileFormat() == TECPLOT ||
+//      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+//      config->GetOutput_FileFormat() == FIELDVIEW ||
+//      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+//    HistFile << "ZONE T= \"Convergence history\"" << endl;
+//  }
+//
+////  if (rank == MASTER_NODE){
+////    HistFile.close();
+////  }
+//
+//}
+//
+//
+//void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
+//                                  CSolver *****solver_container,
+//                                  CConfig **config,
+//                                  CIntegration ****integration,
+//                                  bool DualTime_Iteration,
+//                                  su2double timeused,
+//                                  unsigned short val_iZone,
+//                                  unsigned short val_iInst) {
+//
+//  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+//  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+//
+//  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+//  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+//  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+//  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+//  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+//  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+//  unsigned short nZone      = config[val_iZone]->GetnZone();
+//  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+//  bool energy               = config[val_iZone]->GetEnergy_Equation();
+//  bool incload              = config[val_iZone]->GetIncrementalLoad();
+//  bool output_files         = true;
+//
+//  if (!DualTime_Iteration) {
+//
+//    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+//        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+//      output_files = false;
+//    }
+//
+//    if (fluid_structure) output_files = false;
+//
+//    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+//
+//    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+//        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+//        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+//        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+//        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+//
+//
+//      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+//
+//
+//      /*--- For specific applications, evaluate and plot the surface. ---*/
+//
+//      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+//        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+//      }
+//
+//      /*--- For specific applications, evaluate and plot the surface. ---*/
+//
+//      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+//        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+//      }
+//
+//      /*--- For specific applications, evaluate and plot the surface. ---*/
+//
+//      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+//        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+//      }
+//
+//      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+//
+//      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+//        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
+//      }
+//
+//      /*--- Output a file with the forces breakdown. ---*/
+//
+//      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+//        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+//      }
+//
+//      /*--- Compute span-wise values file for turbomachinery. ---*/
+//
+//      if (config[val_iZone]->GetBoolTurbomachinery()) {
+//        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+//      }
+//
+//      /*--- Output a file with the forces breakdown. ---*/
+//
+//      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+//
+//      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
+//
+//      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+//
+//    }
+//
+//  }
+//
+//  /*--- Output using only the master node ---*/
+//
+//  if (rank == MASTER_NODE) {
+//
+//    /*-- Compute the total objective if a "combo" objective is used ---*/
+//
+//    if (output_comboObj) {
+//      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+//      switch (config[val_iZone]->GetKind_Solver()) {
+//      case EULER:                   case NAVIER_STOKES:                   case RANS:
+//        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+//        break;
+//      }
+//    }
+//
+//    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+//    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+//        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+//      ExtIter_OffSet = 0;
+//
+//    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+//     may have to adjust them to be larger if adding more entries. ---*/
+//
+//    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
+//    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
+//    aeroelastic_coeff[1000], monitoring_coeff[10000],
+//    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
+//    adj_turb_resid[1000],
+//    heat_resid[1000], combo_obj[1000],
+//    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+//
+//    su2double dummy = 0.0, *Coord;
+//    unsigned short iVar, iMarker_Monitoring;
+//
+//    unsigned long LinSolvIter = 0, iPointMaxResid;
+//    su2double timeiter = timeused/su2double(iExtIter+1);
+//
+//    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+//
+//    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+//    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+//
+//    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+//    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+//    bool equiv_area = config[val_iZone]->GetEquivArea();
+//    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+//    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+//    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+//    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+//    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+//    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+//                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+//    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+//    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+//    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+//    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+//    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+//
+//    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+//
+//    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+//
+//    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+//
+//    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+//
+//    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+//
+//    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+//    bool extra_heat_output = false;
+//    su2double Extra_Total_Heat = 0.0;
+//    //su2double Extra_Total_Temperature = 0.0;
+//    su2double Extra_Heat_Residual = 0.0;
+//
+//    if (ExtraHeatOutputZone > -1) {
+//      if (ExtraHeatOutputZone > nZone) {
+//        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+//      }
+//      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+//        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+//      }
+//      else {
+//        extra_heat_output = true;
+//      }
+//    }
+//
+//    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+//
+//    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+//    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+//    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
+//    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
+//    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+//    Total_AoA = 0.0;
+//    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+//
+//    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+//    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+//
+//    unsigned short iSpan;
+//
+//    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+//    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+//    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+//
+//    su2double Total_Sens_BPressure = 0.0;
+//    su2double Total_Sens_Density = 0.0;
+//    su2double Total_Sens_ModVel = 0.0;
+//
+//    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+//    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+//        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+//        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+//        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
+//
+//    /*--- Residual arrays ---*/
+//    su2double *residual_flow         = NULL,
+//    *residual_turbulent    = NULL,
+//    *residual_transition   = NULL;
+//    su2double *residual_adjflow      = NULL,
+//    *residual_adjturbulent = NULL;
+//    su2double *residual_fea          = NULL;
+//    su2double *residual_fem          = NULL;
+//    su2double *residual_heat         = NULL;
+//
+//    /*--- Coefficients Monitored arrays ---*/
+//    su2double *aeroelastic_plunge = NULL,
+//    *aeroelastic_pitch  = NULL,
+//    *Surface_CL         = NULL,
+//    *Surface_CD         = NULL,
+//    *Surface_CSF        = NULL,
+//    *Surface_CEff       = NULL,
+//    *Surface_CFx        = NULL,
+//    *Surface_CFy        = NULL,
+//    *Surface_CFz        = NULL,
+//    *Surface_CMx        = NULL,
+//    *Surface_CMy        = NULL,
+//    *Surface_CMz        = NULL;
+//
+//    /*--- Initialize number of variables ---*/
+//    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+//    nVar_Trans = 0, nVar_Heat = 0,
+//    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
+//    nVar_FEM = 0;
+//
+//    /*--- Direct problem variables ---*/
+//    nVar_Flow = nDim+2;
+//    if (turbulent) {
+//      switch (config[val_iZone]->GetKind_Turb_Model()) {
+//        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+//        case SST:    nVar_Turb = 2; break;
+//      }
+//    }
+//    if (transition) nVar_Trans = 2;
+//    if (heat) nVar_Heat = 1;
+//
+//
+//    /*--- Adjoint problem variables ---*/
+//    nVar_AdjFlow = nDim+2;
+//    if (turbulent) {
+//      switch (config[val_iZone]->GetKind_Turb_Model()) {
+//        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+//        case SST:    nVar_AdjTurb = 2; break;
+//      }
+//    }
+//
+//    /*--- Allocate memory for the residual ---*/
+//    residual_flow       = new su2double[nVar_Flow];
+//    residual_turbulent  = new su2double[nVar_Turb];
+//    residual_transition = new su2double[nVar_Trans];
+//    residual_heat       = new su2double[nVar_Heat];
+//
+//    /*--- Allocate memory for the coefficients being monitored ---*/
+//    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+//
+//    /*--- Write information from nodes ---*/
+//
+//    /*--- Flow solution coefficients ---*/
+//
+//    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+//    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+//    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+//    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+//    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+//    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+//    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+//    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+//    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+//    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+//    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+//    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+//    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+//
+//    if (thermal) {
+//      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+//      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+//      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+//
+//      if(weakly_coupled_heat) {
+//        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+//        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+//        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+//      }
+//    }
+//
+//    if (direct_diff != NO_DERIVATIVE) {
+//      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+//      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+//      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+//      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+//      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+//      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+//      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+//      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+//      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+//      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+//      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+//
+//      if (thermal) {
+//        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+//        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+//        //Davg Temp
+//      }
+//
+//      if (engine || actuator_disk) {
+//        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
+//        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
+//        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
+//        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
+//      }
+//
+//    }
+//
+//    if (equiv_area) {
+//      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+//      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+//
+//      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+//      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+//    }
+//
+//    if (engine || actuator_disk) {
+//      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+//      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+//      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+//      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+//    }
+//
+//    if (rotating_frame) {
+//      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+//      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+//      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+//    }
+//
+//    if (aeroelastic) {
+//      /*--- Look over the markers being monitored and get the desired values ---*/
+//      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+//        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+//        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+//      }
+//    }
+//
+//    if (output_per_surface) {
+//      /*--- Look over the markers being monitored and get the desired values ---*/
+//      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+//        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+//        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+//        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+//        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+//        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+//        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+//        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+//        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+//        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+//        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+//      }
+//    }
+//
+//    if (turbo) {
+//      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+//      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+//        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+//          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+//            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+//            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+//          }
+//        }
+//      }
+//      if (direct_diff != NO_DERIVATIVE){
+//        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+//        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+//        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+//      }
+//    }
+//
+//    /*--- Get flux-averaged values at the specified surface ---*/
+//
+//    if (output_surface) {
+//
+//      unsigned short iMarker_Analyze = 0;
+//      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+//      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+//      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+//      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+//      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+//      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+//      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+//      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+//      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+//      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+//      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+//      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+//      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+//      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+//
+//    }
+//
+//    /*--- Flow Residuals ---*/
+//
+//    for (iVar = 0; iVar < nVar_Flow; iVar++)
+//      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+//
+//    /*--- Turbulent residual ---*/
+//
+//    if (turbulent) {
+//      for (iVar = 0; iVar < nVar_Turb; iVar++)
+//        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+//    }
+//
+//    if (weakly_coupled_heat) {
+//      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+//        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+//      }
+//
+//    }
+//
+//    /*--- Transition residual ---*/
+//
+//    if (transition) {
+//      for (iVar = 0; iVar < nVar_Trans; iVar++)
+//        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+//    }
+//
+//
+//    /*--- Iterations of the linear solver ---*/
+//
+//    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+//
+//    if (extra_heat_output) {
+//      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+//      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+//      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+//    }
+//
+//    /*--- Header frequency ---*/
+//
+//    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+//                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+//    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+//    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+//    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+//    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+//    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+//
+//    bool write_heads;
+//    if (Unsteady) write_heads = (iIntIter == 0);
+//    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+//
+//    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+//
+//
+//    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
+//
+//      /*--- Prepare the history file output, note that the dual
+//       time output don't write to the history file ---*/
+//      if (!DualTime_Iteration) {
+//
+//        /*--- Write the begining of the history file ---*/
+//        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+//
+//        /*--- Write the end of the history file ---*/
+//        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+//
+//        /*--- Write the solution and residual of the history file ---*/
+//
+//        /*--- Direct coefficients ---*/
+//        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+//            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+//            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+//        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
+//        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+//        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+//        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+//        if (inv_design) {
+//          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+//          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+//        }
+//
+//        if (direct_diff != NO_DERIVATIVE) {
+//          if (!turbo)
+//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+//          else
+//            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+//                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+//          if (engine || actuator_disk)
+//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+//          if (thermal)
+//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+//        }
+//
+//        if (aeroelastic) {
+//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+//            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+//            if (iMarker_Monitoring == 0) {
+//              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+//            }
+//            else {
+//              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+//              strcat(aeroelastic_coeff, surface_coeff);
+//            }
+//            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+//            strcat(aeroelastic_coeff, surface_coeff);
+//          }
+//        }
+//
+//        if (output_per_surface) {
+//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+//            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+//            if (iMarker_Monitoring == 0) {
+//              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+//            }
+//            else {
+//              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+//              strcat(monitoring_coeff, surface_coeff);
+//            }
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+//            strcat(monitoring_coeff, surface_coeff);
+//          }
+//        }
+//
+//        if (turbo){
+//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+//            if (iMarker_Monitoring == 0){
+//              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+//            }else{
+//              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+//              strcat(turbo_coeff, surface_coeff);
+//            }
+//            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+//            strcat(turbo_coeff, surface_coeff);
+//            //
+//            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+//            strcat(turbo_coeff, surface_coeff);
+//
+//          }
+//        }
+//
+//        /*--- Flow residual ---*/
+//        if (nDim == 2) {
+//          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+//          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+//        }
+//        else {
+//          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+//          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+//        }
+//
+//        /*--- Turbulent residual ---*/
+//        if (turbulent) {
+//          switch(nVar_Turb) {
+//          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+//          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+//          }
+//        }
+//
+//        /*---- Averaged stagnation pressure at an exit ----*/
+//
+//        if (output_surface) {
+//          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+//        }
+//
+//        /*--- Transition residual ---*/
+//        if (transition) {
+//          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+//        }
+//
+//        /*--- Combo objective ---*/
+//        if (output_comboObj) {
+//          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+//        }
+//
+//        if (weakly_coupled_heat) {
+//          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+//        }
+//
+//
+//      }
+//      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+//        /*--- Write the screen header---*/
+//        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
+//
+//
+//            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+//
+//                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+//
+//                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+//                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+//                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+//                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+//
+//                  if (nZone > 1)
+//                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+//
+//                cout << "-------------------------------------------------------------------------" << endl;
+//
+//                if (direct_diff != NO_DERIVATIVE) {
+//                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+//                  cout << "Coefficients are differentiated with respect to ";
+//                  switch (direct_diff) {
+//                  case D_MACH:
+//                    cout << "Mach number." << endl;
+//                    break;
+//                  case D_AOA:
+//                    cout << "AoA." << endl;
+//                    break;
+//                  case D_SIDESLIP:
+//                    cout << "AoS." << endl;
+//                    break;
+//                  case D_REYNOLDS:
+//                    cout << "Reynolds number." << endl;
+//                    break;
+//                  case D_TURB2LAM:
+//                    cout << "Turb/Lam ratio." << endl;
+//                    break;
+//                  case D_PRESSURE:
+//                    cout << "Freestream Pressure." << endl;
+//                    break;
+//                  case D_TEMPERATURE:
+//                    cout << "Freestream Temperature." << endl;
+//                    break;
+//                  case D_DENSITY:
+//                    cout << "Freestream Density." << endl;
+//                    break;
+//                  case D_VISCOSITY:
+//                    cout << "Freestream Viscosity." << endl;
+//                    break;
+//                  case D_DESIGN:
+//                    cout << "Design Variables." << endl;
+//                    break;
+//                  default:
+//                    break;
+//                  }
+//
+//                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+//                  cout.width(18); cout << D_Total_CL;
+//                  cout.width(18); cout << D_Total_CD;
+//                  cout.width(18); cout << D_Total_CMz;
+//                  cout.width(18); cout << D_Total_CEff;
+//                  cout << endl << "-------------------------------------------------------------------------" << endl;
+//                  cout << endl;
+//                }
+//                if (turbo && write_turbo && val_iZone== 0){
+//                  WriteTurboPerfConvHistory(config[val_iZone]);
+//                }
+//
+//            }
+//            else {
+//              if (flow) {
+//                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+//                {
+//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+//                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+//                } else {
+//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+//                }
+//              } else {
+//                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+//              }
+//            }
+//
+//          switch (config[val_iZone]->GetKind_Solver()) {
+//          case EULER :                  case NAVIER_STOKES:
+//
+//            /*--- Visualize the maximum residual ---*/
+//            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+//            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+//
+//            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+//
+//            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+//
+//            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+//              if (nDim == 3) cout << ", " << Coord[2];
+//              cout <<   ")." << endl;
+//            }
+//            else {
+//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+//              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+//              cout <<   ")." << endl;
+//            }
+//
+//            /*--- Print out the number of non-physical points and reconstructions ---*/
+//
+//            if (config[val_iZone]->GetNonphysical_Points() > 0)
+//              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+//            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+//              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+//
+//            cout << "-------------------------------------------------------------------------" << endl;
+//
+//            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+//            else cout << endl << " IntIter" << " ExtIter";
+//
+//            //            if (!fluid_structure) {
+//              if (incompressible && !weakly_coupled_heat) {
+//              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+//              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+//              }
+//              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+//            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+//            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+//            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+//
+//            else if (turbo){
+//
+//              if(nZone  < 2){
+//                /*--- single zone output ---*/
+//                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+//              }
+//              else{
+//                /* --- multi-zone output ---*/
+//                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+//              }
+//            }
+//
+//            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+//            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+//            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+//
+//            if(extra_heat_output) {
+//              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+//            }
+//
+//            cout << endl;
+//
+//            break;
+//
+//          case RANS :
+//
+//            /*--- Visualize the maximum residual ---*/
+//            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+//            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+//
+//            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+//
+//            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+//            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+//              if (nDim == 3) cout << ", " << Coord[2];
+//              cout <<   ")." << endl;
+//            }
+//            else {
+//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+//              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+//              cout <<   ")." << endl;
+//            }
+//            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+//
+//            /*--- Print out the number of non-physical points and reconstructions ---*/
+//            if (config[val_iZone]->GetNonphysical_Points() > 0)
+//              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+//            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+//              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+//
+//            cout << "-------------------------------------------------------------------------" << endl;
+//
+//            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+//            else cout << endl << " IntIter" << " ExtIter";
+//            if (incompressible) cout << "   Res[Press]";
+//            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+//
+//            switch (config[val_iZone]->GetKind_Turb_Model()) {
+//              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+//              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+//            }
+//
+//            if (weakly_coupled_heat) {
+//              cout <<  "     Res[Heat]";
+//            }
+//
+//            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+//            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+//            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+//            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+//            else if (turbo){
+//              if (nZone < 2){
+//                /*--- single zone output ---*/
+//                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+//              }
+//              else{
+//                /*--- multi zone output ---*/
+//                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+//
+//              }
+//            }
+//            else if (weakly_coupled_heat) {
+//              cout << "   HFlux(Total)";
+//            }
+//            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+//
+//            if(extra_heat_output) {
+//              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+//            }
+//
+//            cout << endl;
+//
+//            break;
+//
+//          }
+//
+//        }
+//      }
+//
+//      /*--- Write the solution on the screen ---*/
+//
+//      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+//        cout.precision(6);
+//        cout.setf(ios::fixed, ios::floatfield);
+//        if (!Unsteady) {
+//          cout.width(5); cout << iExtIter + ExtIter_OffSet;
+//          cout.width(11); cout << timeiter;
+//
+//        } else if (Unsteady && DualTime_Iteration) {
+//          cout.width(8); cout << iIntIter;
+//          cout.width(8); cout << iExtIter;
+//        }
+//      }
+//
+//      switch (config[val_iZone]->GetKind_Solver()) {
+//        case EULER : case NAVIER_STOKES:
+//
+//          /*--- Write history file ---*/
+//
+//          if ((!DualTime_Iteration) && (output_files)) {
+//            if (!turbo) {
+//              HistFile << begin << direct_coeff;
+//              if (thermal) HistFile << heat_coeff;
+//              if (equiv_area) HistFile << equivalent_area_coeff;
+//              if (engine || actuator_disk) HistFile << engine_coeff;
+//              if (inv_design) {
+//                HistFile << Cp_inverse_design;
+//                if (thermal) HistFile << Heat_inverse_design;
+//              }
+//              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+//              HistFile << flow_resid;
+//              if (weakly_coupled_heat) HistFile << heat_resid;
+//            }
+//            else {
+//              HistFile << begin << turbo_coeff << flow_resid;
+//            }
+//
+//            if (aeroelastic) HistFile << aeroelastic_coeff;
+//            if (output_per_surface) HistFile << monitoring_coeff;
+//            if (output_surface) HistFile << surface_outputs;
+//            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+//            if (output_comboObj) HistFile << combo_obj;
+//            HistFile << end;
+//            HistFile.flush();
+//          }
+//
+//          /*--- Write screen output ---*/
+//          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+//            if(DualTime_Iteration || !Unsteady) {
+//              cout.precision(6);
+//              cout.setf(ios::fixed, ios::floatfield);
+//              cout.width(13); cout << log10(residual_flow[0]);
+//              if (!equiv_area) {
+//                if (compressible) {
+//                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+//                  else { cout.width(14); cout << log10(residual_flow[4]); }
+//                }
+//                if (incompressible && !weakly_coupled_heat) {
+//                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+//                  else {cout.width(14); cout << log10(residual_flow[1]);}
+//                }
+//                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+//
+//              }
+//
+//              if (rotating_frame && nDim == 3 && !turbo ) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//                cout.width(15); cout << Total_CT;
+//                cout.width(15); cout << Total_CQ;
+//                cout.unsetf(ios_base::floatfield);
+//              }
+//              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+//              cout.precision(4);
+//              cout.setf(ios::scientific, ios::floatfield);
+//              cout << Total_CNearFieldOF; }
+//              else if (turbo) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//
+//                if (nZone < 2) {
+//                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+//                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+//                }
+//                else {
+//                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+//                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+//                }
+//
+//                cout.unsetf(ios_base::floatfield);
+//
+//              }
+//              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+//              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+//              if (aeroelastic) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+//                cout.width(15); cout << aeroelastic_pitch[0];
+//                cout.unsetf(ios_base::floatfield);
+//              }
+//
+//              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+//            }
+//            cout << endl;
+//          }
+//          break;
+//
+//        case RANS :
+//
+//          /*--- Write history file ---*/
+//
+//          if ((!DualTime_Iteration) && (output_files)) {
+//
+//            if (!turbo) {
+//              HistFile << begin << direct_coeff;
+//              if (thermal) HistFile << heat_coeff;
+//              if (equiv_area) HistFile << equivalent_area_coeff;
+//              if (engine || actuator_disk) HistFile << engine_coeff;
+//              if (inv_design) {
+//                HistFile << Cp_inverse_design;
+//                if (thermal) HistFile << Heat_inverse_design;
+//              }
+//              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
+//              HistFile << flow_resid << turb_resid;
+//              if (weakly_coupled_heat) HistFile << heat_resid;
+//            }
+//            else {
+//              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
+//            }
+//
+//            if (aeroelastic) HistFile << aeroelastic_coeff;
+//            if (output_per_surface) HistFile << monitoring_coeff;
+//            if (output_surface) HistFile << surface_outputs;
+//            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
+//            if (output_comboObj) HistFile << combo_obj;
+//            HistFile << end;
+//            HistFile.flush();
+//          }
+//
+//          /*--- Write screen output ---*/
+//
+//          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+//            if(DualTime_Iteration || !Unsteady) {
+//              cout.precision(6);
+//              cout.setf(ios::fixed, ios::floatfield);
+//
+//              if (incompressible) cout.width(13);
+//              else  cout.width(14);
+//              cout << log10(residual_flow[0]);
+//              switch(nVar_Turb) {
+//              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+//              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+//              cout.width(15); cout << log10(residual_turbulent[1]); break;
+//              }
+//
+//              if (weakly_coupled_heat) {
+//                cout.width(14); cout << log10(residual_heat[0]);
+//              }
+//
+//              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+//
+//              if (rotating_frame && nDim == 3 && !turbo ) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//                cout.width(15); cout << Total_CT; cout.width(15);
+//                cout << Total_CQ;
+//                cout.unsetf(ios_base::floatfield);
+//              }
+//              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+//              cout.precision(4);
+//              cout.setf(ios::scientific, ios::floatfield);
+//              cout << Total_CNearFieldOF; }
+//              else if (turbo) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//                if (nZone < 2){
+//                  /*--- single zone output ---*/
+//                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+//                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+//                }
+//                else{
+//                  /*--- multi zone output ---*/
+//                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+//                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+//                  if (direct_diff){
+//                    cout.width(15); cout << D_EntropyGen;
+//                  }
+//                }
+//                cout.unsetf(ios_base::floatfield);
+//              }
+//              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+//              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+//
+//              if (aeroelastic) {
+//                cout.setf(ios::scientific, ios::floatfield);
+//                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+//                cout.width(15); cout << aeroelastic_pitch[0];
+//                cout.unsetf(ios_base::floatfield);
+//              }
+//
+//              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+//              cout << endl;
+//            }
+//          }
+//          break;
+//
+//      }
+//      cout.unsetf(ios::fixed);
+//
+//    }
+//
+//
+//    delete [] residual_flow;
+//    delete [] residual_turbulent;
+//    delete [] residual_transition;
+//    delete [] residual_fea;
+//    delete [] residual_fem;
+//    delete [] residual_heat;
+//
+//    delete [] residual_adjflow;
+//    delete [] residual_adjturbulent;
+//
+//    delete [] Surface_CL;
+//    delete [] Surface_CD;
+//    delete [] Surface_CSF;
+//    delete [] Surface_CEff;
+//    delete [] Surface_CFx;
+//    delete [] Surface_CFy;
+//    delete [] Surface_CFz;
+//    delete [] Surface_CMx;
+//    delete [] Surface_CMy;
+//    delete [] Surface_CMz;
+//    delete [] aeroelastic_pitch;
+//    delete [] aeroelastic_plunge;
+//
+//  }
+//}
+
+
+CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 
@@ -52,7 +1377,7 @@ CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(co
   strcpy (char_histfile, history_filename.data());
 
   // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
+  if (config->GetWrt_Dynamic() && config->GetRestart()) {
     long iExtIter = config->GetDyn_RestartIter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -90,6 +1415,7 @@ CFlowOutput::~CFlowOutput(void) {
 }
 
 void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+
   char cstr[200], buffer[50], turb_resid[1000];
   unsigned short iMarker_Monitoring;
   string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
@@ -100,7 +1426,7 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
   bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
   bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
   bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+      (config->GetKind_Solver() == DISC_ADJ_RANS));
   bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
 
   bool output_surface = (config->GetnMarker_Analyze() != 0);
@@ -186,10 +1512,10 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
   char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
   char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
   switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+    SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+    break;
+  case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
   }
 
   /*--- End of the header ---*/
@@ -244,248 +1570,50 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
 
 
 void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
 
   bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
 
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+
   unsigned long iIntIter    = config[val_iZone]->GetIntIter();
   unsigned long iExtIter    = config[val_iZone]->GetExtIter();
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  if (!DualTime_Iteration) {
-
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-
-    if (fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-
-      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
 
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+  bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                   (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
 
-    }
-
-  }
+  su2double dummy = 0.0;
 
   /*--- Output using only the master node ---*/
 
   if (rank == MASTER_NODE) {
 
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-
     unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
 
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
-    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
-    aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    heat_resid[1000], combo_obj[1000],
-    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
     su2double timeiter = timeused/su2double(iExtIter+1);
 
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+    unsigned short iVar;
+    unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
 
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
     bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool turbulent = (config[val_iZone]->GetKind_Solver() == RANS);
     bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
 
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
     /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
-
-    /*--- Direct problem variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0, nVar_Trans = 0, nVar_Heat = 0;
     nVar_Flow = nDim+2;
     if (turbulent) {
       switch (config[val_iZone]->GetKind_Turb_Model()) {
@@ -497,863 +1625,215 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
     if (heat) nVar_Heat = 1;
 
 
-    /*--- Adjoint problem variables ---*/
-    nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-
     /*--- Allocate memory for the residual ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL,
+    *residual_heat         = NULL;
+
     residual_flow       = new su2double[nVar_Flow];
     residual_turbulent  = new su2double[nVar_Turb];
     residual_transition = new su2double[nVar_Trans];
     residual_heat       = new su2double[nVar_Heat];
 
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Write information from nodes ---*/
-
-    /*--- Flow solution coefficients ---*/
-
-    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-    if (thermal) {
-      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-      if(weakly_coupled_heat) {
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-      }
+    /*--- Flow coefficients -- As of now, this is the Von Mises Stress ---*/
+    su2double Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL(),
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD(),
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF(),
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff(),
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx(),
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy(),
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz(),
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx(),
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy(),
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz(),
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj(),
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset(),
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+
+    /*--- Residuals: ---*/
+
+    for (iVar = 0; iVar < nVar_Flow; iVar++)
+      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+
+    /*--- Turbulent residual ---*/
+    if (turbulent) {
+      for (iVar = 0; iVar < nVar_Turb; iVar++)
+        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
     }
 
-    if (direct_diff != NO_DERIVATIVE) {
-      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-      if (thermal) {
-        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-        //Davg Temp
+    /*--- Turbulent residual ---*/
+    if (weakly_coupled_heat) {
+      for (iVar = 0; iVar < nVar_Heat; iVar++) {
+        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
       }
+    }
 
-      if (engine || actuator_disk) {
-        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-      }
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
 
-    }
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
-    if (equiv_area) {
-      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+    // Load data to buffers
+    char begin[1000], direct_coeff[1000], flow_coeff[1000], flow_resid[1000], turb_resid[1000], end[1000];
 
-      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-    }
+    /*--- Write the begining of the history file ---*/
+    SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
 
-    if (engine || actuator_disk) {
-      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-    }
+    /*--- Initial variables ---*/
+    SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+        Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+        Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
 
-    if (rotating_frame) {
-      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+    /*--- Flow residual ---*/
+    if (nDim == 2) {
+      if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+      if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
     }
-
-    if (aeroelastic) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-      }
+    else {
+      if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+      if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
     }
 
-    if (output_per_surface) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+    /*--- Turbulent residual ---*/
+    if (turbulent) {
+      switch(nVar_Turb) {
+        case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+        case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
       }
     }
+    /*--- Write the end of the history file ---*/
+    SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
 
-    if (turbo) {
-      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-          }
-        }
-      }
-      if (direct_diff != NO_DERIVATIVE){
-        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-      }
-    }
+    // Write to history file
 
-    /*--- Get flux-averaged values at the specified surface ---*/
-
-    if (output_surface) {
-
-      unsigned short iMarker_Analyze = 0;
-      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+    HistFile << begin << direct_coeff << flow_resid;
+    if (turbulent) HistFile << turb_resid;
+    HistFile << end;
+    HistFile.flush();
 
-    }
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
-    /*--- Flow Residuals ---*/
+    bool write_header;
+    if (Unsteady) write_header = (iIntIter == 0);
+    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
 
-    for (iVar = 0; iVar < nVar_Flow; iVar++)
-      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+    if (write_header) {
 
-    /*--- Turbulent residual ---*/
+      /*--- Unsteady local time stepping summary ---*/
+      if (Unsteady){
+        cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
 
-    if (turbulent) {
-      for (iVar = 0; iVar < nVar_Turb; iVar++)
-        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-    }
+        for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+          cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time() <<
+          ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+          ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
 
-    if (weakly_coupled_heat) {
-      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        cout << "-------------------------------------------------------------------------" << endl;
       }
 
-    }
+      /*--- Visualize the maximum residual ---*/
+       unsigned long iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+       su2double *Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
 
-    /*--- Transition residual ---*/
+       cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
 
-    if (transition) {
-      for (iVar = 0; iVar < nVar_Trans; iVar++)
-        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-    }
+       cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
 
+       if (config[val_iZone]->GetSystemMeasurements() == SI) {
+         cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+         if (nDim == 3) cout << ", " << Coord[2];
+         cout <<   ")." << endl;
+       }
+       else {
+         cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+         if (nDim == 3) cout << ", " << Coord[2]*12.0;
+         cout <<   ")." << endl;
+       }
 
-    /*--- Iterations of the linear solver ---*/
+       if (turbulent){
+         cout << "Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() ;
+         cout << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+       }
 
-    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+       /*--- Print out the number of non-physical points and reconstructions ---*/
 
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
+       if (config[val_iZone]->GetNonphysical_Points() > 0)
+         cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+       if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+         cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
 
-    /*--- Header frequency ---*/
-
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-
-
-    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-        /*--- Write the solution and residual of the history file ---*/
-
-        /*--- Direct coefficients ---*/
-        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-        if (inv_design) {
-          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          if (!turbo)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-          else
-            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-          if (engine || actuator_disk)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-          if (thermal)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-        }
-
-        if (aeroelastic) {
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-            if (iMarker_Monitoring == 0) {
-              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-            }
-            else {
-              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-              strcat(aeroelastic_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-            strcat(aeroelastic_coeff, surface_coeff);
-          }
-        }
-
-        if (output_per_surface) {
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-            if (iMarker_Monitoring == 0) {
-              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-            }
-            else {
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-          }
-        }
-
-        if (turbo){
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-            if (iMarker_Monitoring == 0){
-              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-            }else{
-              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-            strcat(turbo_coeff, surface_coeff);
-            //
-            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-
-          }
-        }
-
-        /*--- Flow residual ---*/
-        if (nDim == 2) {
-          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-        }
-        else {
-          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-        }
-
-        /*--- Turbulent residual ---*/
-        if (turbulent) {
-          switch(nVar_Turb) {
-          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-          }
-        }
-
-        /*---- Averaged stagnation pressure at an exit ----*/
-
-        if (output_surface) {
-          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-        }
-
-        /*--- Transition residual ---*/
-        if (transition) {
-          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-        }
-
-        /*--- Combo objective ---*/
-        if (output_comboObj) {
-          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-        }
-
-        if (weakly_coupled_heat) {
-          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-        }
+       cout << "-------------------------------------------------------------------------" << endl;
 
+       /*--- Print out the current iteration ---*/
+       if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+       else cout << endl << " IntIter" << " ExtIter";
 
-      }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        /*--- Write the screen header---*/
-        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
-
-
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          }
-
-        }
-      }
+       /*--- Print the residuals (we should be able to choose this in the config) ---*/
+       cout << "      Res[Rho]";
 
-      /*--- Write the solution on the screen ---*/
+       switch (config[val_iZone]->GetKind_Turb_Model()) {
+         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+         case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
+         default: cout << "      Res[RhoE]"; break;
+       }
 
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-        if (!Unsteady) {
-          cout.width(5); cout << iExtIter + ExtIter_OffSet;
-          cout.width(11); cout << timeiter;
+       cout << "   CLift(Total)"   << "   CDrag(Total)";
 
-        } else if (Unsteady && DualTime_Iteration) {
-          cout.width(8); cout << iIntIter;
-          cout.width(8); cout << iExtIter;
-        }
-      }
+       cout << endl;
 
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-
-                cout.unsetf(ios_base::floatfield);
-
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-
-        case RANS :
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid << turb_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;
-            }
-          }
-          break;
+    }
 
-      }
-      cout.unsetf(ios::fixed);
+    /*------------------------------------------------------------------------------------------------------*/
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------------------------*/
 
+    if (Unsteady) {
+      cout.width(8); cout << iIntIter;
+      cout.width(8); cout << iExtIter;
+    } else {
+      cout.width(5); cout << iExtIter + ExtIter_OffSet;
+      cout.width(11); cout << timeiter;
     }
 
+    cout.precision(6);
+    cout.setf(ios::fixed, ios::floatfield);
+    /*--- Res[Rho] ---*/
+    cout.width(13); cout << log10(residual_flow[0]);
+
+    if (turbulent){
+      switch(nVar_Turb) {
+      case 1:
+        cout.width(14); cout << log10(residual_turbulent[0]);
+        break;
+      case 2:
+        cout.width(14); cout << log10(residual_turbulent[0]);
+        cout.width(15); cout << log10(residual_turbulent[1]);
+        break;
+      }
+    }
+    else{
+      /*--- Res[RhoE] ---*/
+      if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+      else { cout.width(14); cout << log10(residual_flow[4]); }
+    }
+    cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL));
+    cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD));
+
+    cout << endl;
+    cout.unsetf(ios::fixed);
 
     delete [] residual_flow;
     delete [] residual_turbulent;
     delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
     delete [] residual_heat;
 
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-
   }
+
 }
+
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index e3a0a11b9d42..b3772515b814 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -38,7 +38,7 @@
 
 #include "../include/output_structure.hpp"
 
-CIncFlowOutput::CIncFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
+CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   char buffer[50];
 

From a86bc06550b7171fc3466d9dd3133c02fc680c3c Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Mon, 11 Jun 2018 16:44:05 +0200
Subject: [PATCH 008/539] Prototype output with config options.

---
 Common/include/config_structure.hpp       |  17 +-
 Common/include/config_structure.inl       |   4 +
 Common/include/option_structure.hpp       |  43 ++-
 Common/src/config_structure.cpp           |   4 +-
 SU2_CFD/include/output_structure.hpp      | 405 +++++++++++++++++++++-
 SU2_CFD/include/output_structure.inl      |  18 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |  17 +
 SU2_CFD/src/output_adjoint_elasticity.cpp |  18 +
 SU2_CFD/src/output_adjoint_mean.cpp       |  18 +
 SU2_CFD/src/output_direct_elasticity.cpp  | 371 ++++++++++++--------
 SU2_CFD/src/output_direct_heat.cpp        |  18 +
 SU2_CFD/src/output_direct_mean.cpp        |  16 +
 SU2_CFD/src/output_direct_mean_inc.cpp    |  18 +
 SU2_CFD/src/output_structure.cpp          |  36 ++
 14 files changed, 845 insertions(+), 158 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index c66f691132e5..4e32ebe8b2c7 100755
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -996,8 +996,10 @@ class CConfig {
   su2double *FreeStreamTurboNormal; /*!< \brief Direction to initialize the flow in turbomachinery computation */
   su2double Max_Beta; /*!< \brief Maximum Beta parameter (incompressible preconditioning) in the domain */
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
-  unsigned short *Kind_ScreenOutput;    /*!< \brief Kind of the screen output. */
-  unsigned short nScreenOutput;         /*!< \brief Number of screen output variables (max: 6). */
+  unsigned short *Kind_ScreenOutput,    /*!< \brief Kind of the screen output. */
+  *Kind_HistoryOutput;                  /*!< \brief Kind of the output printed to the history file. */
+  unsigned short nScreenOutput,         /*!< \brief Number of screen output variables (max: 6). */
+  nHistoryOutput;                       /*!< \brief Number of variables printed to the history file. */
 
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
@@ -8367,6 +8369,17 @@ class CConfig {
   */
   unsigned short GetScreenOutput_Field(unsigned short iField);
 
+  /*!
+   * \brief Get the number of history output variables requested
+   */
+  unsigned short GetnHistoryOutput(void);
+
+  /*
+  * \brief Get the history output field iField
+  */
+  unsigned short GetHistoryOutput_Field(unsigned short iField);
+
+
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 50608e010196..a00ac2d60aa9 100755
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1867,3 +1867,7 @@ inline void CConfig::SetHistFile(ofstream *HistFile) { ConvHistFile = HistFile;
 inline unsigned short CConfig::GetnScreenOutput(void) { return nScreenOutput; }
 
 inline unsigned short CConfig::GetScreenOutput_Field(unsigned short iField) { return Kind_ScreenOutput[iField]; }
+
+inline unsigned short CConfig::GetnHistoryOutput(void) { return nHistoryOutput; }
+
+inline unsigned short CConfig::GetHistoryOutput_Field(unsigned short iField) { return Kind_HistoryOutput[iField]; }
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 00dd8e8169e2..5a46926cb87d 100755
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1784,7 +1784,7 @@ enum ENUM_SCREEN_OUTPUT {
   SOUT_INTITER = 0,    /*!< \brief Internal iteration. */
   SOUT_EXTITER = 1,    /*!< \brief External iteration. */
   SOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
-  SOUT_PHYSTIME = 2,   /*!< \brief Physical time of the iteration. */
+  SOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
   SOUT_RHO = 10,       /*!< \brief Density output. */
   SOUT_RHOU1 = 11,     /*!< \brief Momentum-x output. */
   SOUT_RHOU2 = 12,     /*!< \brief Momentum-y output. */
@@ -1831,7 +1831,46 @@ static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<stri
 ("DISPX", SOUT_DISPX)
 ("DISPY", SOUT_DISPY)
 ("DISPZ", SOUT_DISPZ)
-("VMS", SOUT_VMS);
+("VON_MISES_STRESS", SOUT_VMS);
+
+/*!
+ * \brief types of screen output fields
+ */
+enum ENUM_HISTFILE_OUTPUT {
+  HOUT_INTITER = 0,    /*!< \brief Internal iteration. */
+  HOUT_EXTITER = 1,    /*!< \brief External iteration. */
+  HOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
+  HOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
+  HOUT_RESIDUALS = 4,       /*!< \brief Residuals output. */
+  HOUT_LINSOL_ITER = 5,     /*!< \brief Linear solver iteration. */
+  HOUT_CUSTOM_OF = 6,       /*!< \brief Custom objective function. */
+  HOUT_AEROCOEFF = 10,      /*!< \brief Aerodynamic coefficients. */
+  HOUT_FORCECOEFF = 11,     /*!< \brief Force coefficients(projection in X, Y, Z) . */
+  HOUT_AOA = 12,            /*!< \brief Angle of attack. */
+  HOUT_EFF = 13,            /*!< \brief Efficiency. */
+  HOUT_CFL = 14,            /*!< \brief CFL Number. */
+  HOUT_LOAD_RAMP = 50,      /*!< \brief Load coefficient transfered as a ramp. */
+  HOUT_LOAD_INCREMENT = 51,       /*!< \brief Load increment (non-linear elasticity). */
+  HOUT_VMS = 53        /*!< \brief Elasticity Maximum Von Mises stress. */
+};
+
+static const map<string, ENUM_HISTFILE_OUTPUT> HistFile_Output_Map = CCreateMap<string, ENUM_HISTFILE_OUTPUT>
+("INT_ITER", HOUT_INTITER)
+("EXT_ITER", HOUT_EXTITER)
+("TIME", HOUT_TIME)
+("PHYSICAL_TIME", HOUT_PHYSTIME)
+("RESIDUALS", HOUT_RESIDUALS)
+("LINEAR_SOLVER_ITER", HOUT_LINSOL_ITER)
+("CUSTOM_OF", HOUT_CUSTOM_OF)
+("AEROCOEFF", HOUT_AEROCOEFF)
+("FORCECOEFF", HOUT_FORCECOEFF)
+("AOA", HOUT_AOA)
+("EFFICIENCY", HOUT_EFF)
+("CFL_NUMBER", HOUT_CFL)
+("LOAD_RAMP", HOUT_LOAD_RAMP)
+("LOAD_INCREMENT", HOUT_LOAD_INCREMENT)
+("VON_MISES_STRESS", HOUT_VMS);
+
 
 
 /* END_CONFIG_ENUMS */
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 8e226931aa32..6054ce7da1f8 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2102,8 +2102,10 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   /*--- options that are used for the output ---*/
   /*!\par CONFIG_CATEGORY:Output Options\ingroup Config*/
 
-  /* DESCRIPTION: Type of mesh motion */
+  /* DESCRIPTION: Type of screen output */
   addEnumListOption("SCREEN_OUTPUT", nScreenOutput, Kind_ScreenOutput, Screen_Output_Map);
+  /* DESCRIPTION: Type of output printed to the history file */
+  addEnumListOption("HISTORY_OUTPUT", nHistoryOutput, Kind_HistoryOutput, HistFile_Output_Map);
 
   /* END_CONFIG_OPTIONS */
 
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 79eda146acf0..2975a931f891 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -855,6 +855,55 @@ class COutput {
    */
   void WriteCSV_Slice(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_direction);
 
+  /*!
+   * \brief Load the output data to the containers in each subclass
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CFlowOutput
@@ -871,8 +920,6 @@ class CFlowOutput : public COutput {
 
 public:
 
-
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -905,6 +952,55 @@ class CFlowOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CFlowOutput
@@ -953,6 +1049,55 @@ class CIncFlowOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CFEAOutput
@@ -969,6 +1114,13 @@ class CFEAOutput : public COutput {
   su2double *residual_fem;
   unsigned short nVar_FEM;
 
+  su2double Total_VMStress;
+  su2double Total_ForceCoeff;
+  su2double Total_IncLoad;
+  su2double Time_Used;
+  unsigned long LinSolvIter;
+  unsigned long iExtIter, iIntIter;
+
 public:
 
   /*!
@@ -990,19 +1142,54 @@ class CFEAOutput : public COutput {
   void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
+   * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CHeatOutput
@@ -1051,6 +1238,55 @@ class CHeatOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CAdjFlowOutput
@@ -1099,6 +1335,55 @@ class CAdjFlowOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CDiscAdjFlowOutput
@@ -1147,6 +1432,55 @@ class CDiscAdjFlowOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 /*! \class CDiscAdjFEAOutput
@@ -1195,6 +1529,55 @@ class CDiscAdjFEAOutput : public COutput {
   void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the history file output
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryFile_Output(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Write the screen header.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Write the screen output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetScreen_Output(CConfig *config);
+
 };
 
 #include "output_structure.inl"
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index a11b3241151b..434187c0d1b2 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -46,7 +46,21 @@ inline su2double COutput::GetMassFlowIn(unsigned short iMarkerTP, unsigned short
 inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
 
 inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
+ 
+inline void COutput::SetHistoryFile_Header(CConfig *config) { }
 
-inline void COutput::SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config, CIntegration ****integration,
- bool DualTime_Iteration, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+inline bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void COutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool COutput::WriteScreen_Header(CConfig *config) { }
+
+inline void COutput::SetScreen_Header(CConfig *config) { }
+
+inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void COutput::SetScreen_Output(CConfig *config) { }
+
+inline void COutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index b5695ecbc45d..28bc1ca9927d 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -2008,3 +2008,20 @@ void CDiscAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
   }
 }
+
+inline void CDiscAdjFlowOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CDiscAdjFlowOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CDiscAdjFlowOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CDiscAdjFlowOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index afea5afca04c..b007b43f32ba 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -260,3 +260,21 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
 
   }
 }
+
+inline void CDiscAdjFEAOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CDiscAdjFEAOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CDiscAdjFEAOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CDiscAdjFEAOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CDiscAdjFEAOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index e56d1cfa33b4..fbe28a1cbf1a 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -1145,3 +1145,21 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
   }
 }
+
+inline void CAdjFlowOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CAdjFlowOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CAdjFlowOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CAdjFlowOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 608671fa4625..036d85d96e59 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -88,6 +88,16 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
 
     /*--- Allocate memory for the residual ---*/
     residual_fem        = new su2double[nVar_FEM];
+
+    /*--- Initialize  ---*/
+    Total_VMStress = 0.0;
+    Total_ForceCoeff = 0.0;
+    Total_IncLoad = 0.0;
+    LinSolvIter = 0.0;
+    Time_Used = 0.0;
+
+    iExtIter = 0;
+    iIntIter = 0;
   }
 
 }
@@ -100,26 +110,10 @@ CFEAOutput::~CFEAOutput(void) {
     if (residual_fem != NULL) delete [] residual_fem;
   }
 
-
 }
 
 void CFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
 
-  bool incload = config->GetIncrementalLoad();
-
-  /*--- Begin of the header ---*/
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-
-  /*--- Header for the residuals ---*/
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-
-  /*--- End of the header ---*/
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
-
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
       (config->GetOutput_FileFormat() == FIELDVIEW) ||
@@ -129,9 +123,7 @@ void CFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone
   }
 
   /*--- Write the header, case depending ---*/
-  HistFile << begin << fem_coeff;
-  if (incload) HistFile << fem_incload;
-  HistFile << fem_resid << endfea;
+  SetHistoryFile_Header(config);
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -142,8 +134,7 @@ void CFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone
 
 }
 
-
-void CFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
+void CFEAOutput::LoadOutput_Data(CGeometry ****geometry,
                                      CSolver *****solver_container,
                                      CConfig **config,
                                      CIntegration ****integration,
@@ -152,157 +143,257 @@ void CFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
                                      unsigned short val_iZone,
                                      unsigned short val_iInst) {
 
+  bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+              (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+  bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+  bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
 
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  /*--- Output using only the master node ---*/
+  unsigned short iVar;
+  unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
 
-  if (rank == MASTER_NODE) {
+  iExtIter = config[val_iZone]->GetExtIter();
+  iIntIter = config[val_iZone]->GetIntIter();
 
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+  Time_Used = timeused;
 
-    su2double timeiter = timeused/su2double(iExtIter+1);
+  /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+  Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
+  Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
+  Total_IncLoad    = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment();
+  LinSolvIter  = (unsigned long) solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetIterLinSolver();
 
-    unsigned short iVar;
-    unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
+  /*--- Residuals: ---*/
+  /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+  /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
 
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-    su2double Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
-    su2double Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
-    su2double Total_IncLoad    = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment();
-    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetIterLinSolver();
-
-    /*--- Residuals: ---*/
-    /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-    /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-
-    if (linear_analysis) {
-      for (iVar = 0; iVar < nVar_FEM; iVar++) {
-        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
-      }
+  if (linear_analysis) {
+    for (iVar = 0; iVar < nVar_FEM; iVar++) {
+      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
     }
-    else if (nonlinear_analysis) {
-      for (iVar = 0; iVar < nVar_FEM; iVar++) {
-        residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
-      }
+  }
+  else if (nonlinear_analysis) {
+    for (iVar = 0; iVar < nVar_FEM; iVar++) {
+      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
     }
+  }
 
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+}
 
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
+bool CFEAOutput::WriteScreen_Header(CConfig *config){
 
-    // Load data to buffers
-    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
-    SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+  bool write_header;
+  if (nonlinear_analysis) write_header = (iIntIter == 0);
+  else write_header = (((iExtIter % (config->GetWrt_Con_Freq()*40)) == 0));
 
-    /*--- Initial variables ---*/
-    if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-    else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+  return write_header;
 
-    /*--- FEM residual ---*/
-    if (nVar_FEM == 2)
-      SPRINTF (fem_resid, ", %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
-    else
-      SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+}
 
-    /*--- Linear solver iterations and time used ---*/
-    SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+void CFEAOutput::SetScreen_Header(CConfig *config){
 
-    // Write to history file
+  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
 
-    HistFile << begin_fem << fem_coeff << fem_resid << end_fem;
-    HistFile.flush();
+  bool absolute = (config->GetResidual_Criteria_FEM() == RESFEM_ABSOLUTE);
 
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
+  if (dynamic && nonlinear_analysis) {
+    cout << endl << "Simulation time: " << config->GetCurrent_DynTime() << ". Time step: " << config->GetDelta_DynTime() << ".";
+  }
 
-    bool write_header;
-    if (nonlinear_analysis) write_header = (iIntIter == 0);
-    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+  // Insert line break
+  cout << endl;
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    switch (config->GetScreenOutput_Field(iField)){
+    case SOUT_INTITER: cout <<  " IntIter"; break;
+    case SOUT_EXTITER: cout <<  " ExtIter"; break;
+    case SOUT_UTOL:
+      if (absolute) cout << "   Res[UTOL-A]";
+      else cout << "     Res[UTOL]";
+      break;
+    case SOUT_RTOL:
+      if (absolute) cout << "   Res[RTOL-A]";
+      else cout << "     Res[RTOL]";
+      break;
+    case SOUT_ETOL:
+      if (absolute) cout << "   Res[ETOL-A]";
+      else cout << "     Res[ETOL]";
+      break;
+    case SOUT_DISPX: cout << "   Res[Displx]"; break;
+    case SOUT_DISPY: cout << "   Res[Disply]"; break;
+    case SOUT_DISPZ: cout << "   Res[Displz]"; break;
+    case SOUT_VMS: cout << "      VMS(Max)"; break;
+    }
+  }
+  // Insert line break
+  cout << endl;
 
-    if (write_header) {
+}
 
-      if (dynamic && nonlinear_analysis) {
-        cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-      }
+bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime){
 
-      if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-      else cout << endl << " IntIter" << " ExtIter";
+  return true;
 
-      if (linear_analysis) {
-        if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-        if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-      }
-      else if (nonlinear_analysis) {
-        switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-        case RESFEM_RELATIVE:
-          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-          break;
-        case RESFEM_ABSOLUTE:
-          cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-          break;
-        default:
-          cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-          break;
-        }
-      }
+}
 
+void CFEAOutput::SetScreen_Output(CConfig *config){
+
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    switch (config->GetScreenOutput_Field(iField)){
+    case SOUT_INTITER:
+      cout.width(8);
+      cout << iIntIter;
+      break;
+    case SOUT_EXTITER:
+      cout.width(8);
+      cout << iExtIter;
+      break;
+    case SOUT_UTOL:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      cout << log10(residual_fem[0]);
+      break;
+    case SOUT_RTOL:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      cout << log10(residual_fem[1]);
+      break;
+    case SOUT_ETOL:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      cout << log10(residual_fem[2]);
+      break;
+    case SOUT_DISPX:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      cout << log10(residual_fem[0]);
+      break;
+    case SOUT_DISPY:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      cout << log10(residual_fem[1]);
+      break;
+    case SOUT_DISPZ:
+      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
+      if (nVar_FEM == 3)
+        cout << log10(residual_fem[2]);
+      else
+        cout << "              ";
+      break;
+    case SOUT_VMS:
+      cout.precision(4); cout.setf(ios::scientific, ios::floatfield); cout.width(14);
+      cout << Total_VMStress;
+      break;
     }
+  }
+  cout << endl;
+  cout.unsetf(ios::fixed);
 
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    if (!nonlinear_analysis) {
-      cout.width(5); cout << iExtIter;
-      cout.width(11); cout << timeiter;
+}
 
-    } else {
-      cout.width(8); cout << iIntIter;
-      cout.width(8); cout << iExtIter;
+void CFEAOutput::SetHistoryFile_Header(CConfig *config){
+
+  // This buffer should be long enough
+  char fem_header[1000]="";
+
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    switch (config->GetHistoryOutput_Field(iField)){
+    case HOUT_INTITER:
+      SPRINTF (fem_header + strlen(fem_header), "\"Int_Iter\"");
+      break;
+    case HOUT_EXTITER:
+      SPRINTF (fem_header + strlen(fem_header), "\"Ext_Iter\"");
+      break;
+    case HOUT_PHYSTIME:
+      SPRINTF (fem_header + strlen(fem_header), "\"Time(min)\"");
+      break;
+    case HOUT_RESIDUALS:
+      if (nVar_FEM == 2)
+        SPRINTF (fem_header + strlen(fem_header), "\"Res_FEM[0]\",\"Res_FEM[1]\"");
+      else
+        SPRINTF (fem_header + strlen(fem_header), "\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"");
+      break;
+    case HOUT_LINSOL_ITER:
+      SPRINTF (fem_header + strlen(fem_header), "\"Linear_Solver_Iterations\"");
+      break;
+    case HOUT_LOAD_RAMP:
+      SPRINTF (fem_header + strlen(fem_header), "\"Load_Ramp\"");
+      break;
+    case HOUT_LOAD_INCREMENT:
+      SPRINTF (fem_header + strlen(fem_header), "\"Load_Increment\"");
+      break;
+    case HOUT_VMS:
+      SPRINTF (fem_header + strlen(fem_header), "\"VonMises_Stress\"");
+      break;
     }
+    // Print a comma in all fields but the last one
+    if (iField < (config->GetnHistoryOutput() - 1))
+      SPRINTF (fem_header + strlen(fem_header), ", ");
+  }
+  SPRINTF (fem_header + strlen(fem_header), "\n");
 
-    cout.precision(6);
-    cout.setf(ios::fixed, ios::floatfield);
-    if (linear_analysis) {
-      cout.width(14); cout << log10(residual_fem[0]);
-      cout.width(14); cout << log10(residual_fem[1]);
-      if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-    }
-    else if (nonlinear_analysis) {
-      cout.width(14); cout << log10(residual_fem[0]);
-      cout.width(14); cout << log10(residual_fem[1]);
-      cout.width(14); cout << log10(residual_fem[2]);
-    }
+  HistFile << fem_header;
+  HistFile.flush();
+
+}
 
-    cout.precision(4);
-    cout.setf(ios::scientific, ios::floatfield);
-    cout.width(14); cout << Total_VMStress;
-    cout << endl;
+bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime){
 
-    cout.unsetf(ios::fixed);
+  return true;
+
+}
 
+void CFEAOutput::SetHistoryFile_Output(CConfig *config){
+
+
+  unsigned long ExtIter_OffSet = config->GetExtIter_OffSet();
+  bool incload              = config->GetIncrementalLoad();
+
+  // This buffer should be long enough
+  char fem_output[1000]="";
+
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    switch (config->GetHistoryOutput_Field(iField)){
+    case HOUT_INTITER:
+      SPRINTF (fem_output + strlen(fem_output), "%8d", SU2_TYPE::Int(iIntIter));
+      break;
+    case HOUT_EXTITER:
+      SPRINTF (fem_output + strlen(fem_output), "%8d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+      break;
+    case HOUT_PHYSTIME:
+      SPRINTF (fem_output + strlen(fem_output), "%12.10f", Time_Used/60.0);
+      break;
+    case HOUT_RESIDUALS:
+      if (nVar_FEM == 2)
+        SPRINTF (fem_output + strlen(fem_output), "%14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
+      else
+        SPRINTF (fem_output + strlen(fem_output), "%14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+      break;
+    case HOUT_LINSOL_ITER:
+      SPRINTF (fem_output + strlen(fem_output), "%lu", LinSolvIter);
+      break;
+    case HOUT_LOAD_RAMP:
+      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_ForceCoeff);
+      break;
+    case HOUT_LOAD_INCREMENT:
+      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_IncLoad);
+      break;
+    case HOUT_VMS:
+      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_VMStress);
+      break;
+    }
+    // Print a comma in all fields but the last one
+    if (iField < (config->GetnHistoryOutput() - 1))
+      SPRINTF (fem_output + strlen(fem_output), ", ");
   }
+  SPRINTF (fem_output + strlen(fem_output), "\n");
+
+  HistFile << fem_output;
+  HistFile.flush();
+
 }
 
+
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 00eed1b0935b..79d713b70a08 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -320,3 +320,21 @@ void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
 
   }
 }
+
+inline void CHeatOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CHeatOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CHeatOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CHeatOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CHeatOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CHeatOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index a9a4e12c37de..d4e41cd67c0f 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -1837,3 +1837,19 @@ void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
 }
 
+inline void CFlowOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CFlowOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CFlowOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CFlowOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CFlowOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index b3772515b814..856d9e0ad3db 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -1357,3 +1357,21 @@ void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
 
   }
 }
+
+inline void CIncFlowOutput::SetHistoryFile_Header(CConfig *config) { }
+
+inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CIncFlowOutput::SetHistoryFile_Output(CConfig *config) { }
+
+inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) { }
+
+inline void CIncFlowOutput::SetScreen_Header(CConfig *config) { }
+
+inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+
+inline void CIncFlowOutput::SetScreen_Output(CConfig *config) { }
+
+inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 00c803f303de..3108e4644269 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4262,6 +4262,42 @@ void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
   }
 }
 
+void COutput::SetConvHistory_Body(CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    bool write_header, write_history, write_screen;
+
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+
+    LoadOutput_Data(geometry, solver_container, config, integration, DualTime_Iteration,
+                    timeused, val_iZone, val_iInst);
+
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
+    SetHistoryFile_Output(config[val_iZone]);
+
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    write_header = WriteScreen_Header(config[val_iZone]);
+    if (write_header) SetScreen_Header(config[val_iZone]);
+
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
+    SetScreen_Output(config[val_iZone]);
+
+  }
+
+}
+
 void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
   
   su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];

From 06782a1d5ec1f0e2fc67708db83f6eed53353178 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 12 Jun 2018 14:50:45 +0200
Subject: [PATCH 009/539] Removed enum init and modified names

---
 Common/include/option_structure.hpp | 64 ++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 5a46926cb87d..3beec48ea184 100755
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1781,30 +1781,37 @@ static const map<string, ENUM_INPUT_REF> Input_Ref_Map = CCreateMap<string, ENUM
  * \brief types of screen output fields
  */
 enum ENUM_SCREEN_OUTPUT {
-  SOUT_INTITER = 0,    /*!< \brief Internal iteration. */
-  SOUT_EXTITER = 1,    /*!< \brief External iteration. */
-  SOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
-  SOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
-  SOUT_RHO = 10,       /*!< \brief Density output. */
-  SOUT_RHOU1 = 11,     /*!< \brief Momentum-x output. */
-  SOUT_RHOU2 = 12,     /*!< \brief Momentum-y output. */
-  SOUT_RHOU3 = 13,     /*!< \brief Momentum-z output. */
-  SOUT_RHOE = 14,      /*!< \brief Rho-E output. */
-  SOUT_PRESS = 15,     /*!< \brief Pressure output. */
-  SOUT_CL = 20,        /*!< \brief Lift coefficient output. */
-  SOUT_CD = 21,        /*!< \brief Drag coefficient output. */
-  SOUT_CM = 22,        /*!< \brief Moment coefficient output. */
-  SOUT_SA = 30,        /*!< \brief Spalart-Allmaras Nu. */
-  SOUT_K = 31,         /*!< \brief k-w Kinetic energy. */
-  SOUT_W = 32,         /*!< \brief k-w Rate of dissipation. */
-  SOUT_TEMP = 40,      /*!< \brief Temperature. */
-  SOUT_UTOL = 50,       /*!< \brief Elasticity displacement norm. */
-  SOUT_RTOL = 51,       /*!< \brief Elasticity residual norm. */
-  SOUT_ETOL = 52,       /*!< \brief Elasticity energy norm. */
-  SOUT_VMS = 53,        /*!< \brief Elasticity Maximum Von Mises stress. */
-  SOUT_DISPX = 54,        /*!< \brief Norm of the displacement vector - x component. */
-  SOUT_DISPY = 55,        /*!< \brief Norm of the displacement vector - y component. */
-  SOUT_DISPZ = 56         /*!< \brief Norm of the displacement vector - z component. */
+  SOUT_INTITER,    /*!< \brief Internal iteration. */
+  SOUT_EXTITER,    /*!< \brief External iteration. */
+  SOUT_TIME,       /*!< \brief Time taken by the iteration. */
+  SOUT_PHYSTIME,   /*!< \brief Physical time of the iteration. */
+  SOUT_RHO,       /*!< \brief Density output. */
+  SOUT_RHOU1,     /*!< \brief Momentum-x output. */
+  SOUT_RHOU2,     /*!< \brief Momentum-y output. */
+  SOUT_RHOU3,     /*!< \brief Momentum-z output. */
+  SOUT_RHOE,      /*!< \brief Rho-E output. */
+  SOUT_PRESS,     /*!< \brief Pressure output. */
+  SOUT_CL,        /*!< \brief Lift coefficient output. */
+  SOUT_CD,        /*!< \brief Drag coefficient output. */
+  SOUT_CMX,       /*!< \brief Moment X coefficient output. */
+  SOUT_CMY,       /*!< \brief Moment Y coefficient output. */
+  SOUT_CMZ,        /*!< \brief Moment Z coefficient output. */
+  SOUT_CFX,        /*!< \brief Force X coefficient output. */
+  SOUT_CFY,        /*!< \brief Force Y coefficient output. */
+  SOUT_CFZ,        /*!< \brief Force Z coefficient output. */
+  SOUT_CEFF,       /*!< \brief Efficiency coefficient output. */
+  SOUT_AOA,       /*!< \brief Angle of attack output. */
+  SOUT_SA,        /*!< \brief Spalart-Allmaras Nu. */
+  SOUT_K,         /*!< \brief k-w Kinetic energy. */
+  SOUT_W,         /*!< \brief k-w Rate of dissipation. */
+  SOUT_TEMP,      /*!< \brief Temperature. */
+  SOUT_UTOL,       /*!< \brief Elasticity displacement norm. */
+  SOUT_RTOL,       /*!< \brief Elasticity residual norm. */
+  SOUT_ETOL,       /*!< \brief Elasticity energy norm. */
+  SOUT_VMS,        /*!< \brief Elasticity Maximum Von Mises stress. */
+  SOUT_DISPX,        /*!< \brief Norm of the displacement vector - x component. */
+  SOUT_DISPY,       /*!< \brief Norm of the displacement vector - y component. */
+  SOUT_DISPZ        /*!< \brief Norm of the displacement vector - z component. */
 };
 
 static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<string, ENUM_SCREEN_OUTPUT>
@@ -1820,7 +1827,14 @@ static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<stri
 ("PRESSURE", SOUT_PRESS)
 ("LIFT", SOUT_CL)
 ("DRAG", SOUT_CD)
-("MOMENT", SOUT_CM)
+("MOMENT-X", SOUT_CMX)
+("MOMENT-Y", SOUT_CMY)
+("MOMENT-Z", SOUT_CMZ)
+("FORCE-X", SOUT_CFX)
+("FORCE-Y", SOUT_CFY)
+("FORCE-Z", SOUT_CFZ)
+("AOA", SOUT_AOA)
+("EFFICIENCY", SOUT_CEFF)
 ("SA-NU", SOUT_SA)
 ("K-W_KINETIC", SOUT_K)
 ("K-W_DISSIPATION", SOUT_W)

From cbdd942616bc9594163eda179cd02ddd70d8b445 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 12 Jun 2018 14:51:12 +0200
Subject: [PATCH 010/539] Added functions for formatting

---
 SU2_CFD/include/output_structure.hpp | 13 ++++++++++++-
 SU2_CFD/include/output_structure.inl | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 2975a931f891..1553aaf2a0b2 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -191,12 +191,15 @@ class COutput {
   int rank, 	/*!< \brief MPI Rank. */
   size;       	/*!< \brief MPI Size. */
 
+  
+  unsigned short field_width;
+  
 public:
 
   /*! 
    * \brief Constructor of the class. 
    */
-  COutput(CConfig *congig);
+  COutput(CConfig *config);
 
   /*! 
    * \brief Destructor of the class. 
@@ -904,6 +907,14 @@ class COutput {
    */
   virtual void SetScreen_Output(CConfig *config);
 
+  void PrintScreenFixed(stringstream &stream, su2double val);
+
+  void PrintScreenScientific(stringstream &stream, su2double val);
+  
+  void PrintScreenInteger(stringstream &stream, unsigned long val);
+  
+  void PrintScreenHeaderString(stringstream &stream, string header);
+  
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 434187c0d1b2..d037e9af7689 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -64,3 +64,24 @@ inline void COutput::SetScreen_Output(CConfig *config) { }
 inline void COutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
+inline void COutput::PrintScreenFixed(stringstream& stream, su2double val) {
+  stream.precision(6); stream.setf(ios::fixed, ios::floatfield); stream.width(field_width);
+  stream << std::right << val;
+  stream.unsetf(ios::fixed);
+}
+
+inline void COutput::PrintScreenScientific(stringstream& stream, su2double val) {
+  stream.precision(4); stream.setf(ios::scientific, ios::floatfield); stream.width(field_width);
+  stream << std::right << val;
+  stream.unsetf(ios::scientific);  
+}
+
+inline void COutput::PrintScreenInteger(stringstream& stream, unsigned long val) {
+  stream.width(field_width);
+  stream << std::right << val;
+}
+
+inline void COutput::PrintScreenHeaderString(stringstream& stream, string header) {
+  if (header.size() > field_width-1) header.resize(field_width-1);
+  stream << std::right << std::setw(field_width) << header; 
+}
\ No newline at end of file

From bfaab9058c1b63053b945531db7fe61a97a31e5f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 12 Jun 2018 14:51:50 +0200
Subject: [PATCH 011/539] Added new direct mean screen output

---
 SU2_CFD/include/output_structure.hpp |  44 +-
 SU2_CFD/src/output_direct_mean.cpp   | 651 +++++++--------------------
 2 files changed, 190 insertions(+), 505 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 1553aaf2a0b2..6dd05d28d554 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -928,6 +928,24 @@ class CFlowOutput : public COutput {
   char char_histfile[200];
 
   ofstream HistFile;
+  
+  unsigned short nVar, nDim;
+  
+  su2double *ResRMS,
+            *ResMax,
+            CD_Total,
+            CL_Total,
+            CMx_Total,
+            CMy_Total,
+            CMz_Total,
+            AoA,
+            CFx_Total,
+            CFy_Total,
+            CFz_Total,
+            CEff_Total,
+            Time_Used;
+  
+  unsigned long LinSolvIter, iExtIter, iIntIter;
 
 public:
 
@@ -943,33 +961,19 @@ class CFlowOutput : public COutput {
   virtual ~CFlowOutput(void);
 
   /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
-   * \brief Set the history file header
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
+  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+  
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index d4e41cd67c0f..1c3400bb8f95 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -38,47 +38,64 @@
 
 #include "../include/output_structure.hpp"
 
-//CFlowOutput::CFlowOutput(CConfig *config, unsigned short val_iZone) : COutput(config) {
-//
-//  char buffer[50];
-//
-//  // Retrieve the history filename
-//  string history_filename = config->GetConv_FileName();
-//
-//  // Append the zone ID
-//  if(config->GetnZone() > 1){
-//    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-//  }
-//  strcpy (char_histfile, history_filename.data());
-//
-//  // Append the restart iteration: if dynamic problem and restart
-//  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-//    long iExtIter = config->GetDyn_RestartIter();
-//    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-//    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-//    strcat(char_histfile, buffer);
-//  }
-//
-//  // Add the correct file extension depending on the file format
-//  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-//      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-//  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-//           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-//  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-//  strcat(char_histfile, buffer);
-//
-//  // Open the history file using only the master node
-//  if (rank == MASTER_NODE){
-//    cout << "History filename: " << char_histfile << endl;
-//    HistFile.open(char_histfile, ios::out);
-//    HistFile.precision(15);
-//    SetConvHistory_Header(config, val_iZone, INST_0);
-//  }
-//
-//}
+CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+
+  // Open the history file using only the master node
+  if (rank == MASTER_NODE){
+
+    nDim = geometry->GetnDim();
+
+    bool turbulent = config->GetKind_Turb_Model() != NONE;
+    
+    char buffer[50], char_histfile[200];
+
+    // Retrieve the history filename
+    string history_filename = config->GetConv_FileName();
+
+    // Append the zone ID
+    if(config->GetnZone() > 1){
+      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+    }
+    strcpy (char_histfile, history_filename.data());
+
+    // Append the restart iteration: if dynamic problem and restart
+    if (config->GetWrt_Dynamic() && config->GetRestart()) {
+      long iExtIter = config->GetDyn_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(char_histfile, buffer);
+    }
+
+    // Add the correct file extension depending on the file format
+    if ((config->GetOutput_FileFormat() == TECPLOT) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    strcat(char_histfile, buffer);
+
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetConvHistory_Header(config, val_iZone, INST_0);
+
+    /*--- Initialize number of variables ---*/
+    nVar = nDim + 2;
+ 
+    ResRMS = new su2double[nVar];
+    ResMax = new su2double[nVar];
+    
+    LinSolvIter = 0;
+    Time_Used = 0.0;
+
+    iExtIter = 0;
+    iIntIter = 0;
+  }
+
+}
 //
 //CFlowOutput::~CFlowOutput(void) {
 //
@@ -1363,47 +1380,6 @@
 //}
 
 
-CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
-  }
-
-}
 
 CFlowOutput::~CFlowOutput(void) {
 
@@ -1413,115 +1389,8 @@ CFlowOutput::~CFlowOutput(void) {
 
 
 }
-
 void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
 
-  char cstr[200], buffer[50], turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-      (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-
-  /*--- Begin of the header ---*/
-
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-  /*--- Find the markers being monitored and create a header for them ---*/
-
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-
-  /*--- Header for the residuals ---*/
-
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-  case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-    SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-    break;
-  case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-
-  /*--- End of the header ---*/
-
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
       (config->GetOutput_FileFormat() == FIELDVIEW) ||
@@ -1531,33 +1400,7 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
   }
 
   /*--- Write the header, case depending ---*/
-
-  HistFile << begin;
-  if (!turbo) HistFile << flow_coeff;
-  if (turbo) HistFile << turbo_coeff;
-  if (thermal && !turbo) HistFile << heat_coeff;
-  if (equiv_area) HistFile << equivalent_area_coeff;
-  if (engine || actuator_disk) HistFile << engine_coeff;
-  if (inv_design) {
-    HistFile << Cp_inverse_design;
-    if (thermal && !turbo) HistFile << Heat_inverse_design;
-  }
-  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-  HistFile << flow_resid;
-  if (turbulent) HistFile << turb_resid;
-  if (weakly_coupled_heat) HistFile << heat_resid;
-  if (aeroelastic) HistFile << aeroelastic_coeff;
-  if (output_per_surface) HistFile << monitoring_coeff;
-  if (output_surface) HistFile << surface_outputs;
-  if (direct_diff != NO_DERIVATIVE) {
-    if (!turbo) HistFile << d_flow_coeff;
-    else        HistFile << d_turbo_coeff;
-    if (engine || actuator_disk) HistFile << d_engine;
-    if (thermal) HistFile << d_thermal_coeff;
-  }
-  if (output_comboObj) HistFile << combo_obj;
-  HistFile << end;
+  SetHistoryFile_Header(config);
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
@@ -1568,288 +1411,126 @@ void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZon
 
 }
 
+inline void CFlowOutput::SetHistoryFile_Header(CConfig *config) { }
 
-void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-
-  bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                   (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-
-  su2double dummy = 0.0;
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short iVar;
-    unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
-
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool turbulent = (config[val_iZone]->GetKind_Solver() == RANS);
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0, nVar_Trans = 0, nVar_Heat = 0;
-    nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-
-    /*--- Allocate memory for the residual ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL,
-    *residual_heat         = NULL;
-
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-
-    /*--- Flow coefficients -- As of now, this is the Von Mises Stress ---*/
-    su2double Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL(),
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD(),
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF(),
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff(),
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx(),
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy(),
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz(),
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx(),
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy(),
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz(),
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj(),
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset(),
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-    unsigned long LinSolvIter  = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-    /*--- Residuals: ---*/
-
-    for (iVar = 0; iVar < nVar_Flow; iVar++)
-      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-    /*--- Turbulent residual ---*/
-    if (turbulent) {
-      for (iVar = 0; iVar < nVar_Turb; iVar++)
-        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-    }
-
-    /*--- Turbulent residual ---*/
-    if (weakly_coupled_heat) {
-      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-      }
-    }
-
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    // Load data to buffers
-    char begin[1000], direct_coeff[1000], flow_coeff[1000], flow_resid[1000], turb_resid[1000], end[1000];
-
-    /*--- Write the begining of the history file ---*/
-    SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-    /*--- Initial variables ---*/
-    SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-        Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-        Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-
-    /*--- Flow residual ---*/
-    if (nDim == 2) {
-      if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-      if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-    }
-    else {
-      if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-      if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-    }
-
-    /*--- Turbulent residual ---*/
-    if (turbulent) {
-      switch(nVar_Turb) {
-        case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-        case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-      }
-    }
-    /*--- Write the end of the history file ---*/
-    SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-    // Write to history file
-
-    HistFile << begin << direct_coeff << flow_resid;
-    if (turbulent) HistFile << turb_resid;
-    HistFile << end;
-    HistFile.flush();
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    bool write_header;
-    if (Unsteady) write_header = (iIntIter == 0);
-    else write_header = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (write_header) {
-
-      /*--- Unsteady local time stepping summary ---*/
-      if (Unsteady){
-        cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-        for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-          cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time() <<
-          ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-          ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-        cout << "-------------------------------------------------------------------------" << endl;
-      }
-
-      /*--- Visualize the maximum residual ---*/
-       unsigned long iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-       su2double *Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-       cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-       cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-       if (config[val_iZone]->GetSystemMeasurements() == SI) {
-         cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-         if (nDim == 3) cout << ", " << Coord[2];
-         cout <<   ")." << endl;
-       }
-       else {
-         cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-         if (nDim == 3) cout << ", " << Coord[2]*12.0;
-         cout <<   ")." << endl;
-       }
-
-       if (turbulent){
-         cout << "Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() ;
-         cout << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-       }
-
-       /*--- Print out the number of non-physical points and reconstructions ---*/
-
-       if (config[val_iZone]->GetNonphysical_Points() > 0)
-         cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-       if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-         cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-       cout << "-------------------------------------------------------------------------" << endl;
+inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
 
-       /*--- Print out the current iteration ---*/
-       if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-       else cout << endl << " IntIter" << " ExtIter";
+inline void CFlowOutput::SetHistoryFile_Output(CConfig *config) { }
 
-       /*--- Print the residuals (we should be able to choose this in the config) ---*/
-       cout << "      Res[Rho]";
+inline bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header;
+  write_header = (((iExtIter % (config->GetWrt_Con_Freq()*40)) == 0));
+  
+  return write_header;
+}
 
-       switch (config[val_iZone]->GetKind_Turb_Model()) {
-         case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-         case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-         default: cout << "      Res[RhoE]"; break;
-       }
+inline void CFlowOutput::SetScreen_Header(CConfig *config) { 
+  
+  stringstream out;
+  
+  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
 
-       cout << "   CLift(Total)"   << "   CDrag(Total)";
+  bool absolute = (config->GetResidual_Criteria_FEM() == RESFEM_ABSOLUTE);
 
-       cout << endl;
+  if (dynamic && nonlinear_analysis) {
+    cout << endl << "Simulation time: " << config->GetCurrent_DynTime() << ". Time step: " << config->GetDelta_DynTime() << ".";
+  }
 
+  // Insert line break
+  cout << endl;
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    switch (config->GetScreenOutput_Field(iField)){
+    case SOUT_INTITER: PrintScreenHeaderString(out,"IntIter");    break;
+    case SOUT_EXTITER: PrintScreenHeaderString(out,"ExtIter");    break;
+    case SOUT_RHO:     PrintScreenHeaderString(out,"Res[Rho]");   break;
+    case SOUT_RHOU1:   PrintScreenHeaderString(out,"Res[RhoU]");  break;
+    case SOUT_RHOU2:   PrintScreenHeaderString(out,"Res[RhoV]");  break;
+    case SOUT_RHOU3:   PrintScreenHeaderString(out,"Res[RhoW]");  break;
+    case SOUT_RHOE:    PrintScreenHeaderString(out,"Res[RhoE]");  break;
+    case SOUT_CD:      PrintScreenHeaderString(out,"CD[Total]");  break;
+    case SOUT_CL:      PrintScreenHeaderString(out,"CL[Total]");  break;
+    case SOUT_CMX:     PrintScreenHeaderString(out,"CMx[Total]"); break;
+    case SOUT_CMY:     PrintScreenHeaderString(out,"CMy[Total]"); break;
+    case SOUT_CMZ:     PrintScreenHeaderString(out,"CMz[Total]"); break;      
+    case SOUT_AOA:     PrintScreenHeaderString(out,"AoA");        break;
+    case SOUT_CFX:     PrintScreenHeaderString(out,"CFx[Total]"); break;
+    case SOUT_CFY:     PrintScreenHeaderString(out,"CFy[Total]"); break;
+    case SOUT_CFZ:     PrintScreenHeaderString(out,"CFz[Total]"); break;  
+    case SOUT_CEFF:    PrintScreenHeaderString(out,"CFz[Total]"); break;    
     }
+  }
+  
+  // Insert line break
+  cout << out.str();
+  cout << endl;
 
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    if (Unsteady) {
-      cout.width(8); cout << iIntIter;
-      cout.width(8); cout << iExtIter;
-    } else {
-      cout.width(5); cout << iExtIter + ExtIter_OffSet;
-      cout.width(11); cout << timeiter;
-    }
+}
 
-    cout.precision(6);
-    cout.setf(ios::fixed, ios::floatfield);
-    /*--- Res[Rho] ---*/
-    cout.width(13); cout << log10(residual_flow[0]);
+inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  return true;
+}
 
-    if (turbulent){
-      switch(nVar_Turb) {
-      case 1:
-        cout.width(14); cout << log10(residual_turbulent[0]);
-        break;
-      case 2:
-        cout.width(14); cout << log10(residual_turbulent[0]);
-        cout.width(15); cout << log10(residual_turbulent[1]);
-        break;
-      }
-    }
-    else{
-      /*--- Res[RhoE] ---*/
-      if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-      else { cout.width(14); cout << log10(residual_flow[4]); }
+inline void CFlowOutput::SetScreen_Output(CConfig *config) {
+  
+  
+  stringstream out;
+  
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    switch (config->GetScreenOutput_Field(iField)){
+    case SOUT_INTITER: PrintScreenInteger(out, iIntIter); break;
+    case SOUT_EXTITER: PrintScreenInteger(out,iExtIter); break;
+    case SOUT_RHO:     PrintScreenFixed(out,log10(ResRMS[0])); break;
+    case SOUT_RHOU1:   PrintScreenFixed(out,log10(ResRMS[1])); break;
+    case SOUT_RHOU2:   PrintScreenFixed(out,log10(ResRMS[2])); break;
+    case SOUT_RHOU3:   if (nDim == 3) PrintScreenFixed(out,log10(ResRMS[3]));
+                       else PrintScreenFixed(out,0.0); break;
+    case SOUT_RHOE:    if (nDim == 3) PrintScreenFixed(out,log10(ResRMS[4]));
+                       else PrintScreenFixed(out,log10(ResRMS[3])); break;
+    case SOUT_CD:      PrintScreenScientific(out,CD_Total);   break;
+    case SOUT_CL:      PrintScreenScientific(out,CL_Total);   break;
+    case SOUT_CMX:     PrintScreenScientific(out,CMx_Total);  break;
+    case SOUT_CMY:     PrintScreenScientific(out,CMy_Total);  break;
+    case SOUT_CMZ:     PrintScreenScientific(out,CMz_Total);  break;
+    case SOUT_CFX:     PrintScreenScientific(out,CFx_Total);  break;
+    case SOUT_CFY:     PrintScreenScientific(out,CFy_Total);  break;
+    case SOUT_CFZ:     PrintScreenScientific(out,CFz_Total);  break;
+    case SOUT_AOA:     PrintScreenScientific(out,AoA);        break;
+    case SOUT_CEFF:    PrintScreenScientific(out,CEff_Total); break;
     }
-    cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL));
-    cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD));
-
-    cout << endl;
-    cout.unsetf(ios::fixed);
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_heat;
-
   }
-
+    
+  // Insert line break
+  cout << out.str();
+  cout << endl;
 }
 
-inline void CFlowOutput::SetHistoryFile_Header(CConfig *config) { }
-
-inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CFlowOutput::SetHistoryFile_Output(CConfig *config) { }
-
-inline bool CFlowOutput::WriteScreen_Header(CConfig *config) { }
-
-inline void CFlowOutput::SetScreen_Header(CConfig *config) { }
-
-inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CFlowOutput::SetScreen_Output(CConfig *config) { }
-
 inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+  unsigned short iVar;
+  
+  for (iVar = 0; iVar < nVar; iVar++){
+    ResRMS[iVar] = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(iVar);
+    ResMax[iVar] = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_Max(iVar);
+  }
+  
+  CD_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD();
+  CL_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL();
+  CMx_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx();
+  CMy_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy();
+  CMz_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz();
+  CFx_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx();
+  CFy_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy();
+  CFz_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz();
+  AoA = config[val_iZone]->GetAoA();
+  CEff_Total = CD_Total/CL_Total;
+  Time_Used = timeused;
+  
+  LinSolvIter = config[val_iZone]->GetLinear_Solver_Iter();
+  iExtIter = config[val_iZone]->GetExtIter();
+  iIntIter = config[val_iZone]->GetIntIter();
+  
+  
+}

From b3b5db87f955da2de960ea0d1fd5f77b5f90f132 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 12 Jun 2018 14:52:23 +0200
Subject: [PATCH 012/539] Modified FEA output to use new functions for screen
 output

---
 SU2_CFD/src/output_direct_elasticity.cpp | 81 +++++++++---------------
 SU2_CFD/src/output_structure.cpp         |  2 +
 2 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 036d85d96e59..89b08748eb80 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -195,6 +195,9 @@ bool CFEAOutput::WriteScreen_Header(CConfig *config){
 
 void CFEAOutput::SetScreen_Header(CConfig *config){
 
+  
+  stringstream out;
+  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
@@ -210,27 +213,28 @@ void CFEAOutput::SetScreen_Header(CConfig *config){
   // Evaluate the requested output
   for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
     switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER: cout <<  " IntIter"; break;
-    case SOUT_EXTITER: cout <<  " ExtIter"; break;
+    case SOUT_INTITER: PrintScreenHeaderString(out,"IntIter");    break;
+    case SOUT_EXTITER: PrintScreenHeaderString(out,"ExtIter");    break;
     case SOUT_UTOL:
-      if (absolute) cout << "   Res[UTOL-A]";
-      else cout << "     Res[UTOL]";
+      if (absolute) PrintScreenHeaderString(out,"Res[UTOL-A]");
+      else PrintScreenHeaderString(out, "Res[UTOL]");
       break;
     case SOUT_RTOL:
-      if (absolute) cout << "   Res[RTOL-A]";
-      else cout << "     Res[RTOL]";
+      if (absolute) PrintScreenHeaderString(out,"Res[RTOL-A]");
+      else PrintScreenHeaderString(out, "Res[RTOL]");
       break;
     case SOUT_ETOL:
-      if (absolute) cout << "   Res[ETOL-A]";
-      else cout << "     Res[ETOL]";
+      if (absolute) PrintScreenHeaderString(out,"Res[ETOL-A]");
+      else PrintScreenHeaderString(out, "Res[ETOL]");
       break;
-    case SOUT_DISPX: cout << "   Res[Displx]"; break;
-    case SOUT_DISPY: cout << "   Res[Disply]"; break;
-    case SOUT_DISPZ: cout << "   Res[Displz]"; break;
-    case SOUT_VMS: cout << "      VMS(Max)"; break;
+    case SOUT_DISPX: PrintScreenHeaderString(out,"Res[Displx]"); break;
+    case SOUT_DISPY: PrintScreenHeaderString(out,"Res[Disply]"); break; 
+    case SOUT_DISPZ: PrintScreenHeaderString(out,"Res[Displz]"); break; 
+    case SOUT_VMS:   PrintScreenHeaderString(out,"VMS(max)"); break; 
     }
   }
   // Insert line break
+  cout << out.str();
   cout << endl;
 
 }
@@ -243,52 +247,25 @@ bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime){
 
 void CFEAOutput::SetScreen_Output(CConfig *config){
 
+  stringstream out;  
+  
   // Evaluate the requested output
   for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
     switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER:
-      cout.width(8);
-      cout << iIntIter;
-      break;
-    case SOUT_EXTITER:
-      cout.width(8);
-      cout << iExtIter;
-      break;
-    case SOUT_UTOL:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      cout << log10(residual_fem[0]);
-      break;
-    case SOUT_RTOL:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      cout << log10(residual_fem[1]);
-      break;
-    case SOUT_ETOL:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      cout << log10(residual_fem[2]);
-      break;
-    case SOUT_DISPX:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      cout << log10(residual_fem[0]);
-      break;
-    case SOUT_DISPY:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      cout << log10(residual_fem[1]);
-      break;
-    case SOUT_DISPZ:
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield); cout.width(14);
-      if (nVar_FEM == 3)
-        cout << log10(residual_fem[2]);
-      else
-        cout << "              ";
-      break;
-    case SOUT_VMS:
-      cout.precision(4); cout.setf(ios::scientific, ios::floatfield); cout.width(14);
-      cout << Total_VMStress;
-      break;
+    case SOUT_INTITER: PrintScreenInteger(out,iIntIter); break;
+    case SOUT_EXTITER: PrintScreenInteger(out,iExtIter); break;
+    case SOUT_UTOL:    PrintScreenFixed(out,log10(residual_fem[0])); break;
+    case SOUT_RTOL:    PrintScreenFixed(out,log10(residual_fem[1])); break;
+    case SOUT_ETOL:    PrintScreenFixed(out,log10(residual_fem[2])); break;
+    case SOUT_DISPX:   PrintScreenFixed(out,log10(residual_fem[0])); break;
+    case SOUT_DISPY:   PrintScreenFixed(out,log10(residual_fem[1])); break;
+    case SOUT_DISPZ:   if (nVar_FEM == 3) PrintScreenFixed(out,log10(residual_fem[2])); else PrintScreenFixed(out,0.0); break;
+    case SOUT_VMS:     PrintScreenScientific(out,Total_VMStress);
     }
   }
+  
+  cout << out.str();
   cout << endl;
-  cout.unsetf(ios::fixed);
 
 }
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 3108e4644269..9060ad72489c 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -41,6 +41,8 @@ COutput::COutput(CConfig *config) {
 
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
+  
+  field_width = 12;
 
   unsigned short iDim, iZone, iSpan, iMarker;
   

From d32765413a8eacacaec3dd2dacbd8a6f828c9c8c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 12 Jun 2018 15:14:06 +0200
Subject: [PATCH 013/539] Fixed small error in header string

---
 SU2_CFD/src/output_direct_mean.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 1c3400bb8f95..8135cdd7051b 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -1459,7 +1459,7 @@ inline void CFlowOutput::SetScreen_Header(CConfig *config) {
     case SOUT_CFX:     PrintScreenHeaderString(out,"CFx[Total]"); break;
     case SOUT_CFY:     PrintScreenHeaderString(out,"CFy[Total]"); break;
     case SOUT_CFZ:     PrintScreenHeaderString(out,"CFz[Total]"); break;  
-    case SOUT_CEFF:    PrintScreenHeaderString(out,"CFz[Total]"); break;    
+    case SOUT_CEFF:    PrintScreenHeaderString(out,"CEff[Total]"); break;    
     }
   }
   

From 179ec573b71411244baf7a392172c43ca8d61462 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 18 Jun 2018 11:34:23 +0200
Subject: [PATCH 014/539] :Modified output fields in config to return string
 list

---
 Common/include/config_structure.hpp |   8 +-
 Common/include/config_structure.inl |   4 +-
 Common/include/option_structure.hpp | 214 ++++++++++++++--------------
 Common/src/config_structure.cpp     |   4 +-
 4 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 4e32ebe8b2c7..c6d08504c3e2 100755
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -996,8 +996,8 @@ class CConfig {
   su2double *FreeStreamTurboNormal; /*!< \brief Direction to initialize the flow in turbomachinery computation */
   su2double Max_Beta; /*!< \brief Maximum Beta parameter (incompressible preconditioning) in the domain */
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
-  unsigned short *Kind_ScreenOutput,    /*!< \brief Kind of the screen output. */
-  *Kind_HistoryOutput;                  /*!< \brief Kind of the output printed to the history file. */
+  string *ScreenOutput,    /*!< \brief Kind of the screen output. */
+  *HistoryOutput;                  /*!< \brief Kind of the output printed to the history file. */
   unsigned short nScreenOutput,         /*!< \brief Number of screen output variables (max: 6). */
   nHistoryOutput;                       /*!< \brief Number of variables printed to the history file. */
 
@@ -8367,7 +8367,7 @@ class CConfig {
   /*
   * \brief Get the screen output field iField
   */
-  unsigned short GetScreenOutput_Field(unsigned short iField);
+  string GetScreenOutput_Field(unsigned short iField);
 
   /*!
    * \brief Get the number of history output variables requested
@@ -8377,7 +8377,7 @@ class CConfig {
   /*
   * \brief Get the history output field iField
   */
-  unsigned short GetHistoryOutput_Field(unsigned short iField);
+  string GetHistoryOutput_Field(unsigned short iField);
 
 
 };
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index a00ac2d60aa9..415d6a34125a 100755
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1866,8 +1866,8 @@ inline void CConfig::SetHistFile(ofstream *HistFile) { ConvHistFile = HistFile;
 
 inline unsigned short CConfig::GetnScreenOutput(void) { return nScreenOutput; }
 
-inline unsigned short CConfig::GetScreenOutput_Field(unsigned short iField) { return Kind_ScreenOutput[iField]; }
+inline string CConfig::GetScreenOutput_Field(unsigned short iField) { return ScreenOutput[iField]; }
 
 inline unsigned short CConfig::GetnHistoryOutput(void) { return nHistoryOutput; }
 
-inline unsigned short CConfig::GetHistoryOutput_Field(unsigned short iField) { return Kind_HistoryOutput[iField]; }
+inline string CConfig::GetHistoryOutput_Field(unsigned short iField) { return HistoryOutput[iField]; }
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 3beec48ea184..807929f26279 100755
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1777,113 +1777,113 @@ static const map<string, ENUM_INPUT_REF> Input_Ref_Map = CCreateMap<string, ENUM
 ("SU2", SU2_REF)
 ("CUSTOM", CUSTOM_REF);
 
-/*!
- * \brief types of screen output fields
- */
-enum ENUM_SCREEN_OUTPUT {
-  SOUT_INTITER,    /*!< \brief Internal iteration. */
-  SOUT_EXTITER,    /*!< \brief External iteration. */
-  SOUT_TIME,       /*!< \brief Time taken by the iteration. */
-  SOUT_PHYSTIME,   /*!< \brief Physical time of the iteration. */
-  SOUT_RHO,       /*!< \brief Density output. */
-  SOUT_RHOU1,     /*!< \brief Momentum-x output. */
-  SOUT_RHOU2,     /*!< \brief Momentum-y output. */
-  SOUT_RHOU3,     /*!< \brief Momentum-z output. */
-  SOUT_RHOE,      /*!< \brief Rho-E output. */
-  SOUT_PRESS,     /*!< \brief Pressure output. */
-  SOUT_CL,        /*!< \brief Lift coefficient output. */
-  SOUT_CD,        /*!< \brief Drag coefficient output. */
-  SOUT_CMX,       /*!< \brief Moment X coefficient output. */
-  SOUT_CMY,       /*!< \brief Moment Y coefficient output. */
-  SOUT_CMZ,        /*!< \brief Moment Z coefficient output. */
-  SOUT_CFX,        /*!< \brief Force X coefficient output. */
-  SOUT_CFY,        /*!< \brief Force Y coefficient output. */
-  SOUT_CFZ,        /*!< \brief Force Z coefficient output. */
-  SOUT_CEFF,       /*!< \brief Efficiency coefficient output. */
-  SOUT_AOA,       /*!< \brief Angle of attack output. */
-  SOUT_SA,        /*!< \brief Spalart-Allmaras Nu. */
-  SOUT_K,         /*!< \brief k-w Kinetic energy. */
-  SOUT_W,         /*!< \brief k-w Rate of dissipation. */
-  SOUT_TEMP,      /*!< \brief Temperature. */
-  SOUT_UTOL,       /*!< \brief Elasticity displacement norm. */
-  SOUT_RTOL,       /*!< \brief Elasticity residual norm. */
-  SOUT_ETOL,       /*!< \brief Elasticity energy norm. */
-  SOUT_VMS,        /*!< \brief Elasticity Maximum Von Mises stress. */
-  SOUT_DISPX,        /*!< \brief Norm of the displacement vector - x component. */
-  SOUT_DISPY,       /*!< \brief Norm of the displacement vector - y component. */
-  SOUT_DISPZ        /*!< \brief Norm of the displacement vector - z component. */
-};
-
-static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<string, ENUM_SCREEN_OUTPUT>
-("INT_ITER", SOUT_INTITER)
-("EXT_ITER", SOUT_EXTITER)
-("TIME", SOUT_TIME)
-("PHYSICAL_TIME", SOUT_PHYSTIME)
-("DENSITY", SOUT_RHO)
-("MOMENTUM-X", SOUT_RHOU1)
-("MOMENTUM-Y", SOUT_RHOU2)
-("MOMENTUM-Z", SOUT_RHOU3)
-("RHO-E", SOUT_RHOE)
-("PRESSURE", SOUT_PRESS)
-("LIFT", SOUT_CL)
-("DRAG", SOUT_CD)
-("MOMENT-X", SOUT_CMX)
-("MOMENT-Y", SOUT_CMY)
-("MOMENT-Z", SOUT_CMZ)
-("FORCE-X", SOUT_CFX)
-("FORCE-Y", SOUT_CFY)
-("FORCE-Z", SOUT_CFZ)
-("AOA", SOUT_AOA)
-("EFFICIENCY", SOUT_CEFF)
-("SA-NU", SOUT_SA)
-("K-W_KINETIC", SOUT_K)
-("K-W_DISSIPATION", SOUT_W)
-("TEMPERATURE", SOUT_TEMP)
-("UTOL", SOUT_UTOL)
-("RTOL", SOUT_RTOL)
-("ETOL", SOUT_ETOL)
-("DISPX", SOUT_DISPX)
-("DISPY", SOUT_DISPY)
-("DISPZ", SOUT_DISPZ)
-("VON_MISES_STRESS", SOUT_VMS);
-
-/*!
- * \brief types of screen output fields
- */
-enum ENUM_HISTFILE_OUTPUT {
-  HOUT_INTITER = 0,    /*!< \brief Internal iteration. */
-  HOUT_EXTITER = 1,    /*!< \brief External iteration. */
-  HOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
-  HOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
-  HOUT_RESIDUALS = 4,       /*!< \brief Residuals output. */
-  HOUT_LINSOL_ITER = 5,     /*!< \brief Linear solver iteration. */
-  HOUT_CUSTOM_OF = 6,       /*!< \brief Custom objective function. */
-  HOUT_AEROCOEFF = 10,      /*!< \brief Aerodynamic coefficients. */
-  HOUT_FORCECOEFF = 11,     /*!< \brief Force coefficients(projection in X, Y, Z) . */
-  HOUT_AOA = 12,            /*!< \brief Angle of attack. */
-  HOUT_EFF = 13,            /*!< \brief Efficiency. */
-  HOUT_CFL = 14,            /*!< \brief CFL Number. */
-  HOUT_LOAD_RAMP = 50,      /*!< \brief Load coefficient transfered as a ramp. */
-  HOUT_LOAD_INCREMENT = 51,       /*!< \brief Load increment (non-linear elasticity). */
-  HOUT_VMS = 53        /*!< \brief Elasticity Maximum Von Mises stress. */
-};
-
-static const map<string, ENUM_HISTFILE_OUTPUT> HistFile_Output_Map = CCreateMap<string, ENUM_HISTFILE_OUTPUT>
-("INT_ITER", HOUT_INTITER)
-("EXT_ITER", HOUT_EXTITER)
-("TIME", HOUT_TIME)
-("PHYSICAL_TIME", HOUT_PHYSTIME)
-("RESIDUALS", HOUT_RESIDUALS)
-("LINEAR_SOLVER_ITER", HOUT_LINSOL_ITER)
-("CUSTOM_OF", HOUT_CUSTOM_OF)
-("AEROCOEFF", HOUT_AEROCOEFF)
-("FORCECOEFF", HOUT_FORCECOEFF)
-("AOA", HOUT_AOA)
-("EFFICIENCY", HOUT_EFF)
-("CFL_NUMBER", HOUT_CFL)
-("LOAD_RAMP", HOUT_LOAD_RAMP)
-("LOAD_INCREMENT", HOUT_LOAD_INCREMENT)
-("VON_MISES_STRESS", HOUT_VMS);
+///*!
+// * \brief types of screen output fields
+// */
+//enum ENUM_SCREEN_OUTPUT {
+//  SOUT_INTITER,    /*!< \brief Internal iteration. */
+//  SOUT_EXTITER,    /*!< \brief External iteration. */
+//  SOUT_TIME,       /*!< \brief Time taken by the iteration. */
+//  SOUT_PHYSTIME,   /*!< \brief Physical time of the iteration. */
+//  SOUT_RHO,       /*!< \brief Density output. */
+//  SOUT_RHOU1,     /*!< \brief Momentum-x output. */
+//  SOUT_RHOU2,     /*!< \brief Momentum-y output. */
+//  SOUT_RHOU3,     /*!< \brief Momentum-z output. */
+//  SOUT_RHOE,      /*!< \brief Rho-E output. */
+//  SOUT_PRESS,     /*!< \brief Pressure output. */
+//  SOUT_CL,        /*!< \brief Lift coefficient output. */
+//  SOUT_CD,        /*!< \brief Drag coefficient output. */
+//  SOUT_CMX,       /*!< \brief Moment X coefficient output. */
+//  SOUT_CMY,       /*!< \brief Moment Y coefficient output. */
+//  SOUT_CMZ,        /*!< \brief Moment Z coefficient output. */
+//  SOUT_CFX,        /*!< \brief Force X coefficient output. */
+//  SOUT_CFY,        /*!< \brief Force Y coefficient output. */
+//  SOUT_CFZ,        /*!< \brief Force Z coefficient output. */
+//  SOUT_CEFF,       /*!< \brief Efficiency coefficient output. */
+//  SOUT_AOA,       /*!< \brief Angle of attack output. */
+//  SOUT_SA,        /*!< \brief Spalart-Allmaras Nu. */
+//  SOUT_K,         /*!< \brief k-w Kinetic energy. */
+//  SOUT_W,         /*!< \brief k-w Rate of dissipation. */
+//  SOUT_TEMP,      /*!< \brief Temperature. */
+//  SOUT_UTOL,       /*!< \brief Elasticity displacement norm. */
+//  SOUT_RTOL,       /*!< \brief Elasticity residual norm. */
+//  SOUT_ETOL,       /*!< \brief Elasticity energy norm. */
+//  SOUT_VMS,        /*!< \brief Elasticity Maximum Von Mises stress. */
+//  SOUT_DISPX,        /*!< \brief Norm of the displacement vector - x component. */
+//  SOUT_DISPY,       /*!< \brief Norm of the displacement vector - y component. */
+//  SOUT_DISPZ        /*!< \brief Norm of the displacement vector - z component. */
+//};
+
+//static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<string, ENUM_SCREEN_OUTPUT>
+//("INT_ITER", SOUT_INTITER)
+//("EXT_ITER", SOUT_EXTITER)
+//("TIME", SOUT_TIME)
+//("PHYSICAL_TIME", SOUT_PHYSTIME)
+//("DENSITY", SOUT_RHO)
+//("MOMENTUM-X", SOUT_RHOU1)
+//("MOMENTUM-Y", SOUT_RHOU2)
+//("MOMENTUM-Z", SOUT_RHOU3)
+//("RHO-E", SOUT_RHOE)
+//("PRESSURE", SOUT_PRESS)
+//("LIFT", SOUT_CL)
+//("DRAG", SOUT_CD)
+//("MOMENT-X", SOUT_CMX)
+//("MOMENT-Y", SOUT_CMY)
+//("MOMENT-Z", SOUT_CMZ)
+//("FORCE-X", SOUT_CFX)
+//("FORCE-Y", SOUT_CFY)
+//("FORCE-Z", SOUT_CFZ)
+//("AOA", SOUT_AOA)
+//("EFFICIENCY", SOUT_CEFF)
+//("SA-NU", SOUT_SA)
+//("K-W_KINETIC", SOUT_K)
+//("K-W_DISSIPATION", SOUT_W)
+//("TEMPERATURE", SOUT_TEMP)
+//("UTOL", SOUT_UTOL)
+//("RTOL", SOUT_RTOL)
+//("ETOL", SOUT_ETOL)
+//("DISPX", SOUT_DISPX)
+//("DISPY", SOUT_DISPY)
+//("DISPZ", SOUT_DISPZ)
+//("VON_MISES_STRESS", SOUT_VMS);
+
+///*!
+// * \brief types of screen output fields
+// */
+//enum ENUM_HISTFILE_OUTPUT {
+//  HOUT_INTITER = 0,    /*!< \brief Internal iteration. */
+//  HOUT_EXTITER = 1,    /*!< \brief External iteration. */
+//  HOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
+//  HOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
+//  HOUT_RESIDUALS = 4,       /*!< \brief Residuals output. */
+//  HOUT_LINSOL_ITER = 5,     /*!< \brief Linear solver iteration. */
+//  HOUT_CUSTOM_OF = 6,       /*!< \brief Custom objective function. */
+//  HOUT_AEROCOEFF = 10,      /*!< \brief Aerodynamic coefficients. */
+//  HOUT_FORCECOEFF = 11,     /*!< \brief Force coefficients(projection in X, Y, Z) . */
+//  HOUT_AOA = 12,            /*!< \brief Angle of attack. */
+//  HOUT_EFF = 13,            /*!< \brief Efficiency. */
+//  HOUT_CFL = 14,            /*!< \brief CFL Number. */
+//  HOUT_LOAD_RAMP = 50,      /*!< \brief Load coefficient transfered as a ramp. */
+//  HOUT_LOAD_INCREMENT = 51,       /*!< \brief Load increment (non-linear elasticity). */
+//  HOUT_VMS = 53        /*!< \brief Elasticity Maximum Von Mises stress. */
+//};
+
+//static const map<string, ENUM_HISTFILE_OUTPUT> HistFile_Output_Map = CCreateMap<string, ENUM_HISTFILE_OUTPUT>
+//("INT_ITER", HOUT_INTITER)
+//("EXT_ITER", HOUT_EXTITER)
+//("TIME", HOUT_TIME)
+//("PHYSICAL_TIME", HOUT_PHYSTIME)
+//("RESIDUALS", HOUT_RESIDUALS)
+//("LINEAR_SOLVER_ITER", HOUT_LINSOL_ITER)
+//("CUSTOM_OF", HOUT_CUSTOM_OF)
+//("AEROCOEFF", HOUT_AEROCOEFF)
+//("FORCECOEFF", HOUT_FORCECOEFF)
+//("AOA", HOUT_AOA)
+//("EFFICIENCY", HOUT_EFF)
+//("CFL_NUMBER", HOUT_CFL)
+//("LOAD_RAMP", HOUT_LOAD_RAMP)
+//("LOAD_INCREMENT", HOUT_LOAD_INCREMENT)
+//("VON_MISES_STRESS", HOUT_VMS);
 
 
 
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 6054ce7da1f8..48fa8c0d38da 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2103,9 +2103,9 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   /*!\par CONFIG_CATEGORY:Output Options\ingroup Config*/
 
   /* DESCRIPTION: Type of screen output */
-  addEnumListOption("SCREEN_OUTPUT", nScreenOutput, Kind_ScreenOutput, Screen_Output_Map);
+  addStringListOption("SCREEN_OUTPUT", nScreenOutput, ScreenOutput);
   /* DESCRIPTION: Type of output printed to the history file */
-  addEnumListOption("HISTORY_OUTPUT", nHistoryOutput, Kind_HistoryOutput, HistFile_Output_Map);
+  addStringListOption("HISTORY_OUTPUT", nHistoryOutput, HistoryOutput);
 
   /* END_CONFIG_OPTIONS */
 

From 52d946330b0d30845c0b946d48009bc251a73c2b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 18 Jun 2018 11:35:57 +0200
Subject: [PATCH 015/539] Added new formatting routines

---
 SU2_CFD/include/output_structure.hpp      | 318 ++++++----------------
 SU2_CFD/include/output_structure.inl      |  30 +-
 SU2_CFD/src/driver_structure.cpp          |   2 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |   8 -
 SU2_CFD/src/output_adjoint_elasticity.cpp |   8 -
 SU2_CFD/src/output_adjoint_mean.cpp       |   8 -
 SU2_CFD/src/output_structure.cpp          | 120 ++++++++
 7 files changed, 219 insertions(+), 275 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 6dd05d28d554..e88acbbf3403 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -192,8 +192,40 @@ class COutput {
   size;       	/*!< \brief MPI Size. */
 
   
+  // TODO: COMMENT NEW STUFF
   unsigned short field_width;
+  string HistorySep;
   
+  vector<string> HistoryHeader;
+  vector<su2double> HistoryValues;
+  
+  std::map<string, su2double> ValueMap;
+  
+  std::map<string, unsigned short> ScreenMapInt, ScreenMapFixed, ScreenMapScientific;
+  
+  std::map<string, unsigned short> HistoryMap;
+ 
+  enum ScreenOutputFormat {
+    FORMAT_INTEGER,
+    FORMAT_FIXED,
+    FORMAT_SCIENTIFIC
+  };
+  
+  struct OutputField {
+    string              FieldName;
+    su2double           Value;
+    unsigned short  ScreenFormat;
+    string HistoryOutputGroup;
+    OutputField() {}
+    OutputField(string fieldname, unsigned short screenformat, string historyoutputgroup):
+      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), HistoryOutputGroup(historyoutputgroup){}
+  };
+  
+  std::map<string, OutputField > Output_Fields;
+  
+  char char_histfile[200];
+
+  ofstream HistFile;
 public:
 
   /*! 
@@ -865,47 +897,51 @@ class COutput {
   virtual void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
+  virtual void SetOutputFields(CConfig *config);
+  
+  
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  virtual void SetHistoryFile_Header(CConfig *config);
+  void SetHistoryFile_Header(CConfig *config);
 
   /*!
-   * \brief Determines if the history file output.
+   * \brief Write the history file output
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  void SetHistoryFile_Output(CConfig *config);
 
   /*!
-   * \brief Write the history file output
+   * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual void SetHistoryFile_Output(CConfig *config);
-
+  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   virtual bool WriteScreen_Header(CConfig *config);
-
+  
   /*!
-   * \brief Write the screen header.
+   * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual void SetScreen_Header(CConfig *config);
+  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
   /*!
-   * \brief Determines if the screen header should be written.
+   * \brief Write the screen header.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  void SetScreen_Header(CConfig *config);
+
 
   /*!
    * \brief Write the screen output.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual void SetScreen_Output(CConfig *config);
+  void SetScreen_Output(CConfig *config);
 
   void PrintScreenFixed(stringstream &stream, su2double val);
 
@@ -915,6 +951,16 @@ class COutput {
   
   void PrintScreenHeaderString(stringstream &stream, string header);
   
+  void AddHistoryValue(su2double val);
+
+  void AddHistoryHeaderString(string header);
+  
+  void PrintHistorySep(stringstream& stream);
+  
+  void AddOutputField(string name, string field_name, unsigned short format, string groupname );
+  
+  void SetOutputFieldValue(string name, su2double value);
+  
 };
 
 /*! \class CFlowOutput
@@ -925,9 +971,7 @@ class COutput {
 class CFlowOutput : public COutput {
 private:
 
-  char char_histfile[200];
 
-  ofstream HistFile;
   
   unsigned short nVar, nDim;
   
@@ -947,6 +991,7 @@ class CFlowOutput : public COutput {
   
   unsigned long LinSolvIter, iExtIter, iIntIter;
 
+
 public:
 
   /*!
@@ -966,56 +1011,27 @@ class CFlowOutput : public COutput {
    */
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
   
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
-
+  void SetOutputFields(CConfig *config);
+  
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
-
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
-
+  
 };
 
 /*! \class CFlowOutput
@@ -1028,10 +1044,9 @@ class CIncFlowOutput : public COutput {
 
   char char_histfile[200];
 
+  unsigned short nDim;
 public:
 
-  ofstream HistFile;
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -1042,28 +1057,7 @@ class CIncFlowOutput : public COutput {
    * \brief Destructor of the class.
    */
   virtual ~CIncFlowOutput(void);
-
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
+  
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
@@ -1071,35 +1065,20 @@ class CIncFlowOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
-
+  void SetOutputFields(CConfig *config);
+  
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
 
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
@@ -1107,12 +1086,6 @@ class CIncFlowOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
-
 };
 
 /*! \class CFEAOutput
@@ -1125,7 +1098,6 @@ class CFEAOutput : public COutput {
 
 protected:
 
-  ofstream HistFile;
   su2double *residual_fem;
   unsigned short nVar_FEM;
 
@@ -1149,13 +1121,6 @@ class CFEAOutput : public COutput {
    */
   virtual ~CFEAOutput(void);
 
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
@@ -1163,47 +1128,26 @@ class CFEAOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
+  void SetOutputFields(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
-
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
+  
 
 };
 
@@ -1219,7 +1163,6 @@ class CHeatOutput : public COutput {
 
 public:
 
-  ofstream HistFile;
 
   /*!
    * \brief Constructor of the class
@@ -1232,27 +1175,6 @@ class CHeatOutput : public COutput {
    */
   virtual ~CHeatOutput(void);
 
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
@@ -1260,11 +1182,6 @@ class CHeatOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
@@ -1272,35 +1189,21 @@ class CHeatOutput : public COutput {
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
 
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
+  
+  void SetOutputFields(CConfig *config);
+   
 
 };
 
@@ -1357,48 +1260,25 @@ class CAdjFlowOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
-
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
 
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
-
+  
 };
 
 /*! \class CDiscAdjFlowOutput
@@ -1454,11 +1334,6 @@ class CDiscAdjFlowOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
@@ -1466,35 +1341,18 @@ class CDiscAdjFlowOutput : public COutput {
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
 
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
 
 };
 
@@ -1551,48 +1409,24 @@ class CDiscAdjFEAOutput : public COutput {
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Header(CConfig *config);
-
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the history file output
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetHistoryFile_Output(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Header(CConfig *config);
 
-  /*!
-   * \brief Write the screen header.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Header(CConfig *config);
-
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
-  /*!
-   * \brief Write the screen output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetScreen_Output(CConfig *config);
-
 };
 
 #include "output_structure.inl"
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index d037e9af7689..dc580f1fe737 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -45,22 +45,16 @@ inline su2double COutput::GetMassFlowIn(unsigned short iMarkerTP, unsigned short
 
 inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
 
+inline void COutput::SetOutputFields(CConfig *config){}
+
 inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
  
-inline void COutput::SetHistoryFile_Header(CConfig *config) { }
-
 inline bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
 
-inline void COutput::SetHistoryFile_Output(CConfig *config) { }
-
 inline bool COutput::WriteScreen_Header(CConfig *config) { }
 
-inline void COutput::SetScreen_Header(CConfig *config) { }
-
 inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
 
-inline void COutput::SetScreen_Output(CConfig *config) { }
-
 inline void COutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
@@ -84,4 +78,24 @@ inline void COutput::PrintScreenInteger(stringstream& stream, unsigned long val)
 inline void COutput::PrintScreenHeaderString(stringstream& stream, string header) {
   if (header.size() > field_width-1) header.resize(field_width-1);
   stream << std::right << std::setw(field_width) << header; 
+}
+
+inline void COutput::AddHistoryValue(su2double val) { 
+  HistoryValues.push_back(val);
+}
+
+inline void COutput::AddHistoryHeaderString(string header) {
+  HistoryHeader.push_back(header); 
+}
+
+inline void COutput::PrintHistorySep(stringstream& stream){
+  stream << HistorySep;
+}
+
+inline void COutput::AddOutputField(string name, string field_name, unsigned short format, string groupname ){
+  Output_Fields[name] = OutputField(field_name, format, groupname);
+}
+
+inline void COutput::SetOutputFieldValue(string name, su2double value){
+  Output_Fields[name].Value = value;
 }
\ No newline at end of file
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index bb9f6ad29750..99a9b37b8de7 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3260,7 +3260,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   if (!fsi) {
     for (iZone = 0; iZone < nZone; iZone++) {
       for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container,
+        output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
             config_container, integration_container, false, UsedTime, iZone, iInst);
     }
   }
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 28bc1ca9927d..59b0ddf87f16 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -2009,19 +2009,11 @@ void CDiscAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
   }
 }
 
-inline void CDiscAdjFlowOutput::SetHistoryFile_Header(CConfig *config) { }
-
 inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CDiscAdjFlowOutput::SetHistoryFile_Output(CConfig *config) { }
-
 inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
 
-inline void CDiscAdjFlowOutput::SetScreen_Header(CConfig *config) { }
-
 inline bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CDiscAdjFlowOutput::SetScreen_Output(CConfig *config) { }
-
 inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index b007b43f32ba..e4b30ecaf3c3 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -261,20 +261,12 @@ void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
   }
 }
 
-inline void CDiscAdjFEAOutput::SetHistoryFile_Header(CConfig *config) { }
-
 inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CDiscAdjFEAOutput::SetHistoryFile_Output(CConfig *config) { }
-
 inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { }
 
-inline void CDiscAdjFEAOutput::SetScreen_Header(CConfig *config) { }
-
 inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CDiscAdjFEAOutput::SetScreen_Output(CConfig *config) { }
-
 inline void CDiscAdjFEAOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index fbe28a1cbf1a..4525e0e94a21 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -1146,20 +1146,12 @@ void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
   }
 }
 
-inline void CAdjFlowOutput::SetHistoryFile_Header(CConfig *config) { }
-
 inline bool CAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CAdjFlowOutput::SetHistoryFile_Output(CConfig *config) { }
-
 inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
 
-inline void CAdjFlowOutput::SetScreen_Header(CConfig *config) { }
-
 inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
 
-inline void CAdjFlowOutput::SetScreen_Output(CConfig *config) { }
-
 inline void CAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 9060ad72489c..a584268705a8 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -43,6 +43,8 @@ COutput::COutput(CConfig *config) {
   size = SU2_MPI::GetSize();
   
   field_width = 12;
+  
+  HistorySep = ",";
 
   unsigned short iDim, iZone, iSpan, iMarker;
   
@@ -16529,3 +16531,121 @@ void COutput::SpecialOutput_AnalyzeSurface(CSolver *solver, CGeometry *geometry,
   
 }
 
+void COutput::SetHistoryFile_Header(CConfig *config) { 
+
+  
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
+  
+  string currentField;
+   
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    currentField = config->GetHistoryOutput_Field(iField);      
+    for(std::map<string, OutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
+      if (currentField == iter->second.HistoryOutputGroup){
+        AddHistoryHeaderString(iter->second.FieldName);
+      }
+    }
+  }
+  
+  stringstream out;
+  for (unsigned short iHeader = 0; iHeader < HistoryHeader.size(); iHeader++){
+    out << "\"" << HistoryHeader[iHeader] << "\"";
+    if (iHeader !=  HistoryHeader.size() - 1) out << HistorySep;
+  }
+  
+  out << endl;
+  HistFile << out.str();
+  HistFile.flush();
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+  
+}
+
+
+void COutput::SetHistoryFile_Output(CConfig *config) { 
+  
+  stringstream out;
+  string currentField;
+  
+  HistoryValues.clear();
+  
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    currentField = config->GetHistoryOutput_Field(iField);      
+    for(std::map<string, OutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
+      if (currentField == iter->second.HistoryOutputGroup){
+        AddHistoryValue(iter->second.Value);
+      }
+    }
+  }
+  
+  for (unsigned short iValue = 0; iValue < HistoryValues.size(); iValue++){
+    out << std::setprecision(10) << HistoryValues[iValue];
+    if (iValue !=  HistoryValues.size() - 1) out << HistorySep;
+    out << " ";
+  }
+  out << endl;
+  HistFile << out.str();
+  HistFile.flush();
+}
+
+void COutput::SetScreen_Header(CConfig *config) { 
+  
+  stringstream out;
+  string currentField;
+  // Insert line break
+  out << endl;
+  // Evaluate the requested output
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    currentField = config->GetScreenOutput_Field(iField);  
+    if (Output_Fields.count(currentField) > 0){
+      PrintScreenHeaderString(out, Output_Fields[currentField].FieldName);
+    } else {
+//      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
+    }
+  }
+  
+  // Insert line break
+  out << endl;
+  cout << out.str();
+  
+}
+
+
+void COutput::SetScreen_Output(CConfig *config) {
+  
+  stringstream out;
+  string currentField;
+  
+  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
+    currentField = config->GetScreenOutput_Field(iField); 
+    if (Output_Fields.count(currentField) > 0){  
+      switch (Output_Fields[currentField].ScreenFormat) {
+      case FORMAT_INTEGER:
+        PrintScreenInteger(out, Output_Fields[currentField].Value);
+        break;
+      case FORMAT_FIXED:
+        PrintScreenFixed(out, Output_Fields[currentField].Value);
+        break;
+      case FORMAT_SCIENTIFIC:
+        PrintScreenScientific(out, Output_Fields[currentField].Value);
+        break;      
+      }
+    }
+  }
+    
+  // Insert line break
+  cout << out.str();
+  cout << endl;
+}
+

From 8fc5d00a882848c08e7d847cfe9a6a203380e774 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 18 Jun 2018 11:36:30 +0200
Subject: [PATCH 016/539] Adapted FEA output

---
 SU2_CFD/src/output_direct_elasticity.cpp | 285 +++++------------------
 1 file changed, 63 insertions(+), 222 deletions(-)

diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 89b08748eb80..695923e57b83 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -76,11 +76,12 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
         (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
+    SetOutputFields(config);
 
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
+    SetHistoryFile_Header(config);
 
     /*--- Initialize number of variables ---*/
     if (linear_analysis) nVar_FEM = nDim;
@@ -112,28 +113,6 @@ CFEAOutput::~CFEAOutput(void) {
 
 }
 
-void CFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-
-  /*--- Write the header, case depending ---*/
-  SetHistoryFile_Header(config);
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
-
-}
-
 void CFEAOutput::LoadOutput_Data(CGeometry ****geometry,
                                      CSolver *****solver_container,
                                      CConfig **config,
@@ -153,224 +132,86 @@ void CFEAOutput::LoadOutput_Data(CGeometry ****geometry,
   unsigned short iVar;
   unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
 
-  iExtIter = config[val_iZone]->GetExtIter();
-  iIntIter = config[val_iZone]->GetIntIter();
-
-  Time_Used = timeused;
-
-  /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-  Total_VMStress   = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
-  Total_ForceCoeff = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
-  Total_IncLoad    = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment();
-  LinSolvIter  = (unsigned long) solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetIterLinSolver();
-
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  
+  SetOutputFieldValue("PHYS_TIME", timeused);
+  
   /*--- Residuals: ---*/
   /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
   /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
 
-  if (linear_analysis) {
-    for (iVar = 0; iVar < nVar_FEM; iVar++) {
-      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(iVar);
+  
+  if (linear_analysis){
+    SetOutputFieldValue("UTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("RTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(1)));
+    if (nVar_FEM == 3){
+      SetOutputFieldValue("ETOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(2)));    
     }
-  }
-  else if (nonlinear_analysis) {
-    for (iVar = 0; iVar < nVar_FEM; iVar++) {
-      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(iVar);
+    SetOutputFieldValue("DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(1)));
+    if (nVar_FEM == 3){
+      SetOutputFieldValue("DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(2)));    
+    }
+  } else if (nonlinear_analysis){
+    SetOutputFieldValue("UTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(0)));
+    SetOutputFieldValue("RTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(1)));
+    if (nVar_FEM == 3){
+      SetOutputFieldValue("ETOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(2)));    
+    }
+    SetOutputFieldValue("DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(0)));
+    SetOutputFieldValue("DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(1)));
+    if (nVar_FEM == 3){
+      SetOutputFieldValue("DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(2)));    
     }
   }
-
-}
-
-bool CFEAOutput::WriteScreen_Header(CConfig *config){
-
-  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-
-  bool write_header;
-  if (nonlinear_analysis) write_header = (iIntIter == 0);
-  else write_header = (((iExtIter % (config->GetWrt_Con_Freq()*40)) == 0));
-
-  return write_header;
-
-}
-
-void CFEAOutput::SetScreen_Header(CConfig *config){
-
   
-  stringstream out;
+  SetOutputFieldValue("VMS", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA());
+  SetOutputFieldValue("LOAD_INCREMENT", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment());
+  SetOutputFieldValue("LOAD_RAMP", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff());
   
-  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-
-  bool absolute = (config->GetResidual_Criteria_FEM() == RESFEM_ABSOLUTE);
-
-  if (dynamic && nonlinear_analysis) {
-    cout << endl << "Simulation time: " << config->GetCurrent_DynTime() << ". Time step: " << config->GetDelta_DynTime() << ".";
-  }
-
-  // Insert line break
-  cout << endl;
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER: PrintScreenHeaderString(out,"IntIter");    break;
-    case SOUT_EXTITER: PrintScreenHeaderString(out,"ExtIter");    break;
-    case SOUT_UTOL:
-      if (absolute) PrintScreenHeaderString(out,"Res[UTOL-A]");
-      else PrintScreenHeaderString(out, "Res[UTOL]");
-      break;
-    case SOUT_RTOL:
-      if (absolute) PrintScreenHeaderString(out,"Res[RTOL-A]");
-      else PrintScreenHeaderString(out, "Res[RTOL]");
-      break;
-    case SOUT_ETOL:
-      if (absolute) PrintScreenHeaderString(out,"Res[ETOL-A]");
-      else PrintScreenHeaderString(out, "Res[ETOL]");
-      break;
-    case SOUT_DISPX: PrintScreenHeaderString(out,"Res[Displx]"); break;
-    case SOUT_DISPY: PrintScreenHeaderString(out,"Res[Disply]"); break; 
-    case SOUT_DISPZ: PrintScreenHeaderString(out,"Res[Displz]"); break; 
-    case SOUT_VMS:   PrintScreenHeaderString(out,"VMS(max)"); break; 
-    }
-  }
-  // Insert line break
-  cout << out.str();
-  cout << endl;
-
-}
-
-bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime){
-
-  return true;
-
 }
 
-void CFEAOutput::SetScreen_Output(CConfig *config){
-
-  stringstream out;  
+void CFEAOutput::SetOutputFields(CConfig *config){
   
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER: PrintScreenInteger(out,iIntIter); break;
-    case SOUT_EXTITER: PrintScreenInteger(out,iExtIter); break;
-    case SOUT_UTOL:    PrintScreenFixed(out,log10(residual_fem[0])); break;
-    case SOUT_RTOL:    PrintScreenFixed(out,log10(residual_fem[1])); break;
-    case SOUT_ETOL:    PrintScreenFixed(out,log10(residual_fem[2])); break;
-    case SOUT_DISPX:   PrintScreenFixed(out,log10(residual_fem[0])); break;
-    case SOUT_DISPY:   PrintScreenFixed(out,log10(residual_fem[1])); break;
-    case SOUT_DISPZ:   if (nVar_FEM == 3) PrintScreenFixed(out,log10(residual_fem[2])); else PrintScreenFixed(out,0.0); break;
-    case SOUT_VMS:     PrintScreenScientific(out,Total_VMStress);
-    }
-  }
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  // Misc.
+  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  
+  // Residuals
+  AddOutputField("UTOL",   "Res_FEM[0]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("RTOL",   "Res_FEM[1]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("ETOL",   "Res_FEM[2]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_X", "Res_FEM[0]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_Y", "Res_FEM[1]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_Z", "Res_FEM[2]", FORMAT_FIXED,  "RESIDUALS");
+  
+  
+  AddOutputField("VMS", "VonMises_Stress", FORMAT_FIXED, "VMS");
+  AddOutputField("LOAD_INCREMENT", "Load_Increment", FORMAT_FIXED, "LOAD_INCREMENT");
+  AddOutputField("LOAD_RAMP", "Load_Ramp", FORMAT_FIXED, "LOAD_RAMP");
   
-  cout << out.str();
-  cout << endl;
-
 }
 
-void CFEAOutput::SetHistoryFile_Header(CConfig *config){
-
-  // This buffer should be long enough
-  char fem_header[1000]="";
-
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    switch (config->GetHistoryOutput_Field(iField)){
-    case HOUT_INTITER:
-      SPRINTF (fem_header + strlen(fem_header), "\"Int_Iter\"");
-      break;
-    case HOUT_EXTITER:
-      SPRINTF (fem_header + strlen(fem_header), "\"Ext_Iter\"");
-      break;
-    case HOUT_PHYSTIME:
-      SPRINTF (fem_header + strlen(fem_header), "\"Time(min)\"");
-      break;
-    case HOUT_RESIDUALS:
-      if (nVar_FEM == 2)
-        SPRINTF (fem_header + strlen(fem_header), "\"Res_FEM[0]\",\"Res_FEM[1]\"");
-      else
-        SPRINTF (fem_header + strlen(fem_header), "\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"");
-      break;
-    case HOUT_LINSOL_ITER:
-      SPRINTF (fem_header + strlen(fem_header), "\"Linear_Solver_Iterations\"");
-      break;
-    case HOUT_LOAD_RAMP:
-      SPRINTF (fem_header + strlen(fem_header), "\"Load_Ramp\"");
-      break;
-    case HOUT_LOAD_INCREMENT:
-      SPRINTF (fem_header + strlen(fem_header), "\"Load_Increment\"");
-      break;
-    case HOUT_VMS:
-      SPRINTF (fem_header + strlen(fem_header), "\"VonMises_Stress\"");
-      break;
-    }
-    // Print a comma in all fields but the last one
-    if (iField < (config->GetnHistoryOutput() - 1))
-      SPRINTF (fem_header + strlen(fem_header), ", ");
-  }
-  SPRINTF (fem_header + strlen(fem_header), "\n");
-
-  HistFile << fem_header;
-  HistFile.flush();
-
-}
+inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
 
-bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime){
+inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {  
+  
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
-  return true;
+  bool write_header;
+  if (nonlinear_analysis) write_header = (config->GetIntIter() == 0);
+  else write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
 
+  return write_header;
+  
 }
-
-void CFEAOutput::SetHistoryFile_Output(CConfig *config){
-
-
-  unsigned long ExtIter_OffSet = config->GetExtIter_OffSet();
-  bool incload              = config->GetIncrementalLoad();
-
-  // This buffer should be long enough
-  char fem_output[1000]="";
-
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    switch (config->GetHistoryOutput_Field(iField)){
-    case HOUT_INTITER:
-      SPRINTF (fem_output + strlen(fem_output), "%8d", SU2_TYPE::Int(iIntIter));
-      break;
-    case HOUT_EXTITER:
-      SPRINTF (fem_output + strlen(fem_output), "%8d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-      break;
-    case HOUT_PHYSTIME:
-      SPRINTF (fem_output + strlen(fem_output), "%12.10f", Time_Used/60.0);
-      break;
-    case HOUT_RESIDUALS:
-      if (nVar_FEM == 2)
-        SPRINTF (fem_output + strlen(fem_output), "%14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
-      else
-        SPRINTF (fem_output + strlen(fem_output), "%14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-      break;
-    case HOUT_LINSOL_ITER:
-      SPRINTF (fem_output + strlen(fem_output), "%lu", LinSolvIter);
-      break;
-    case HOUT_LOAD_RAMP:
-      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_ForceCoeff);
-      break;
-    case HOUT_LOAD_INCREMENT:
-      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_IncLoad);
-      break;
-    case HOUT_VMS:
-      SPRINTF (fem_output + strlen(fem_output), "%14.8e", Total_VMStress);
-      break;
-    }
-    // Print a comma in all fields but the last one
-    if (iField < (config->GetnHistoryOutput() - 1))
-      SPRINTF (fem_output + strlen(fem_output), ", ");
-  }
-  SPRINTF (fem_output + strlen(fem_output), "\n");
-
-  HistFile << fem_output;
-  HistFile.flush();
-
+inline bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  return true;
 }
 
 

From 1af7122e2bb07249b7ad71e5d4d6d6e87c35d3d3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 18 Jun 2018 11:36:46 +0200
Subject: [PATCH 017/539] Adapted heat output

---
 SU2_CFD/src/output_direct_heat.cpp | 287 +++++------------------------
 1 file changed, 43 insertions(+), 244 deletions(-)

diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 79d713b70a08..b78ad9c2ecec 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -68,13 +68,14 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
            (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
   else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
   strcat(char_histfile, buffer);
-
+  SetOutputFields(config);
+  
   // Open the history file using only the master node
   if (rank == MASTER_NODE){
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
+    SetHistoryFile_Header(config);
   }
 
 }
@@ -87,254 +88,52 @@ CHeatOutput::~CHeatOutput(void) {
 
 }
 
-void CHeatOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-
-  /*--- Begin of the header ---*/
-
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-
-  /*--- End of the header ---*/
-
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
 
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-
-  /*--- Write the header ---*/
-
-  HistFile << begin << heat_coeff;
-  HistFile << heat_resid << end;
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
 
+inline bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) {
+  return true;
 }
 
+inline bool CHeatOutput::WriteScreen_Header(CConfig *config) { 
 
-void CHeatOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool output_files         = true;
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double  Total_CHeat = 0.0, Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_heat         = NULL;
-
-    /*--- Coefficients Monitored arrays ---*/
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Heat = 0;
-
-    /*--- Direct problem variables ---*/
-    if (heat) nVar_Heat = 1;
-
-    /*--- Allocate memory for the residual ---*/
-    residual_heat       = new su2double[nVar_Heat];
-
-    /*--- Write information from nodes ---*/
-
-    /*--- Heat coefficients  ---*/
-
-    Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-    Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-    Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-    /*--- Heat Residuals ---*/
-
-    for (iVar = 0; iVar < nVar_Heat; iVar++) {
-      residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-    }
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-
-    /*--- Header frequency ---*/
-
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-        (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-
-    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-        /*--- Write the solution and residual of the history file ---*/
-        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-        SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-      }
-      if ((val_iZone == 0 && val_iInst == 0)){
-        /*--- Write the screen header---*/
-        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
-
-          if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-          else cout << endl << " IntIter" << "  ExtIter";
-
-          cout <<  "      Res[Heat]" << "   HFlux(Total)";
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-
-      if ((val_iZone == 0 && val_iInst == 0)){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-
-        if (!Unsteady) {
-          cout.width(5); cout << iExtIter + ExtIter_OffSet;
-          cout.width(11); cout << timeiter;
-
-        } else if (Unsteady && DualTime_Iteration) {
-          cout.width(8); cout << iIntIter;
-          cout.width(8); cout << iExtIter;
-        }
-
-      }
-
-      if (!DualTime_Iteration) {
-        HistFile << begin << direct_coeff << heat_resid << end;
-        HistFile.flush();
-      }
-
-      cout.unsetf(ios::fixed);
-
-    }
-
-
-    delete [] residual_heat;
-
-  }
+//  return (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
+  return true;
 }
 
-inline void CHeatOutput::SetHistoryFile_Header(CConfig *config) { }
-
-inline bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CHeatOutput::SetHistoryFile_Output(CConfig *config) { }
-
-inline bool CHeatOutput::WriteScreen_Header(CConfig *config) { }
-
-inline void CHeatOutput::SetScreen_Header(CConfig *config) { }
-
-inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CHeatOutput::SetScreen_Output(CConfig *config) { }
+inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  return true;
+}
 
 inline void CHeatOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
-
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+  
+  SetOutputFieldValue("EXT_ITER",     config[val_iZone]->GetExtIter());
+  SetOutputFieldValue("INT_ITER",     config[val_iZone]->GetIntIter());
+  
+  SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_HeatFlux());
+  SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_MaxHeatFlux());
+  SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_AvgTemperature());
+  SetOutputFieldValue("HEAT", log10(solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetRes_RMS(0)));
+  
+  SetOutputFieldValue("TIME", timeused);
+  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetIterLinSolver());
+  
+}
+  
+
+inline void CHeatOutput::SetOutputFields(CConfig *config){
+  
+  
+  AddOutputField("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
+  AddOutputField("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
+  
+  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  
+  AddOutputField("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
+  AddOutputField("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
+  AddOutputField("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
+  
+  AddOutputField("HEAT", "Res[Heat]", FORMAT_FIXED, "RESIDUALS");
+  
+}

From 21bb2f8fa57bbead30ffbcb47715dfcdea6fe861 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 18 Jun 2018 11:37:12 +0200
Subject: [PATCH 018/539] Adapted flow output

---
 SU2_CFD/src/output_direct_mean.cpp     | 1514 ++----------------------
 SU2_CFD/src/output_direct_mean_inc.cpp | 1430 ++--------------------
 2 files changed, 224 insertions(+), 2720 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 8135cdd7051b..cc848a318aaa 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -76,11 +76,12 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short va
         (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
+    SetOutputFields(config);
 
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
+    SetHistoryFile_Header(config);
 
     /*--- Initialize number of variables ---*/
     nVar = nDim + 2;
@@ -93,1444 +94,139 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short va
 
     iExtIter = 0;
     iIntIter = 0;
+    
   }
 
 }
-//
-//CFlowOutput::~CFlowOutput(void) {
-//
-//  if (rank == MASTER_NODE){
-//    HistFile.close();
-//  }
-//
-//
-//}
-//
-//void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-//  char cstr[200], buffer[50], turb_resid[1000];
-//  unsigned short iMarker_Monitoring;
-//  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-//
-//  bool rotating_frame = config->GetRotating_Frame();
-//  bool aeroelastic = config->GetAeroelastic_Simulation();
-//  bool equiv_area = config->GetEquivArea();
-//  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-//  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-//  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-//                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-//  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-//
-//  bool output_surface = (config->GetnMarker_Analyze() != 0);
-//  bool output_comboObj = (config->GetnObj() > 1);
-//  bool output_per_surface = config->GetWrt_Surface();
-//  bool turbo = config->GetBoolTurbomachinery();
-//  unsigned short direct_diff = config->GetDirectDiff();
-//
-//  bool thermal = false; /* Flag for whether to print heat flux values */
-//  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-//
-//  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-//    thermal = true;
-//  }
-//
-//  /*--- Begin of the header ---*/
-//
-//  char begin[]= "\"Iteration\"";
-//
-//  /*--- Header for the coefficients ---*/
-//
-//  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-//  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-//  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-//  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-//  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-//  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-//  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-//  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-//  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-//  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-//  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-//  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-//  char heat_resid[]= ",\"Res_Heat\"";
-//  /*--- Find the markers being monitored and create a header for them ---*/
-//
-//  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-//    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-//    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-//    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-//    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-//    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-//  }
-//
-//  if (turbo){
-//    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-//
-//      stringstream tag;
-//      tag << iMarker_Monitoring + 1;
-//
-//      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-//      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-//      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-//      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-//      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-//      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-//      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-//      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-//      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-//      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-//      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-//      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-//      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-//      // different from zero only in multi-zone computation
-//      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-//      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-//
-//    }
-//  }
-//
-//  char combo_obj[] = ",\"ComboObj\"";
-//
-//  /*--- Header for the residuals ---*/
-//
-//  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-//  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-//  switch (config->GetKind_Turb_Model()) {
-//    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-//      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-//      break;
-//    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-//  }
-//
-//  /*--- End of the header ---*/
-//
-//  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-//
-//  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-//      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-//      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-//      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-//    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-//    HistFile << "VARIABLES = ";
-//  }
-//
-//  /*--- Write the header, case depending ---*/
-//
-//  HistFile << begin;
-//  if (!turbo) HistFile << flow_coeff;
-//  if (turbo) HistFile << turbo_coeff;
-//  if (thermal && !turbo) HistFile << heat_coeff;
-//  if (equiv_area) HistFile << equivalent_area_coeff;
-//  if (engine || actuator_disk) HistFile << engine_coeff;
-//  if (inv_design) {
-//    HistFile << Cp_inverse_design;
-//    if (thermal && !turbo) HistFile << Heat_inverse_design;
-//  }
-//  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-//
-//  HistFile << flow_resid;
-//  if (turbulent) HistFile << turb_resid;
-//  if (weakly_coupled_heat) HistFile << heat_resid;
-//  if (aeroelastic) HistFile << aeroelastic_coeff;
-//  if (output_per_surface) HistFile << monitoring_coeff;
-//  if (output_surface) HistFile << surface_outputs;
-//  if (direct_diff != NO_DERIVATIVE) {
-//    if (!turbo) HistFile << d_flow_coeff;
-//    else        HistFile << d_turbo_coeff;
-//    if (engine || actuator_disk) HistFile << d_engine;
-//    if (thermal) HistFile << d_thermal_coeff;
-//  }
-//  if (output_comboObj) HistFile << combo_obj;
-//  HistFile << end;
-//
-//  if (config->GetOutput_FileFormat() == TECPLOT ||
-//      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-//      config->GetOutput_FileFormat() == FIELDVIEW ||
-//      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-//    HistFile << "ZONE T= \"Convergence history\"" << endl;
-//  }
-//
-////  if (rank == MASTER_NODE){
-////    HistFile.close();
-////  }
-//
-//}
-//
-//
-//void CFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-//                                  CSolver *****solver_container,
-//                                  CConfig **config,
-//                                  CIntegration ****integration,
-//                                  bool DualTime_Iteration,
-//                                  su2double timeused,
-//                                  unsigned short val_iZone,
-//                                  unsigned short val_iInst) {
-//
-//  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-//  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-//
-//  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-//  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-//  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-//  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-//  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-//  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-//  unsigned short nZone      = config[val_iZone]->GetnZone();
-//  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-//  bool energy               = config[val_iZone]->GetEnergy_Equation();
-//  bool incload              = config[val_iZone]->GetIncrementalLoad();
-//  bool output_files         = true;
-//
-//  if (!DualTime_Iteration) {
-//
-//    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-//        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-//      output_files = false;
-//    }
-//
-//    if (fluid_structure) output_files = false;
-//
-//    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-//
-//    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-//        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-//        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-//        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-//        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-//
-//
-//      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-//
-//
-//      /*--- For specific applications, evaluate and plot the surface. ---*/
-//
-//      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-//        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-//      }
-//
-//      /*--- For specific applications, evaluate and plot the surface. ---*/
-//
-//      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-//        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-//      }
-//
-//      /*--- For specific applications, evaluate and plot the surface. ---*/
-//
-//      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-//        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-//      }
-//
-//      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-//
-//      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-//        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-//            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-//      }
-//
-//      /*--- Output a file with the forces breakdown. ---*/
-//
-//      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-//        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-//      }
-//
-//      /*--- Compute span-wise values file for turbomachinery. ---*/
-//
-//      if (config[val_iZone]->GetBoolTurbomachinery()) {
-//        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-//      }
-//
-//      /*--- Output a file with the forces breakdown. ---*/
-//
-//      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-//
-//      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
-//
-//      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-//
-//    }
-//
-//  }
-//
-//  /*--- Output using only the master node ---*/
-//
-//  if (rank == MASTER_NODE) {
-//
-//    /*-- Compute the total objective if a "combo" objective is used ---*/
-//
-//    if (output_comboObj) {
-//      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-//      switch (config[val_iZone]->GetKind_Solver()) {
-//      case EULER:                   case NAVIER_STOKES:                   case RANS:
-//        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-//        break;
-//      }
-//    }
-//
-//    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-//    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-//        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-//      ExtIter_OffSet = 0;
-//
-//    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-//     may have to adjust them to be larger if adding more entries. ---*/
-//
-//    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
-//    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
-//    aeroelastic_coeff[1000], monitoring_coeff[10000],
-//    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
-//    adj_turb_resid[1000],
-//    heat_resid[1000], combo_obj[1000],
-//    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-//
-//    su2double dummy = 0.0, *Coord;
-//    unsigned short iVar, iMarker_Monitoring;
-//
-//    unsigned long LinSolvIter = 0, iPointMaxResid;
-//    su2double timeiter = timeused/su2double(iExtIter+1);
-//
-//    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-//
-//    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-//    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-//
-//    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-//    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-//    bool equiv_area = config[val_iZone]->GetEquivArea();
-//    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-//    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-//    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-//    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-//    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-//    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-//                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-//    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-//    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-//    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-//    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-//    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-//
-//    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-//
-//    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-//
-//    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-//
-//    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
-//
-//    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-//
-//    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-//    bool extra_heat_output = false;
-//    su2double Extra_Total_Heat = 0.0;
-//    //su2double Extra_Total_Temperature = 0.0;
-//    su2double Extra_Heat_Residual = 0.0;
-//
-//    if (ExtraHeatOutputZone > -1) {
-//      if (ExtraHeatOutputZone > nZone) {
-//        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-//      }
-//      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-//        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-//      }
-//      else {
-//        extra_heat_output = true;
-//      }
-//    }
-//
-//    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-//
-//    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-//    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-//    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-//    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-//    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-//    Total_AoA = 0.0;
-//    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-//
-//    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-//    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-//
-//    unsigned short iSpan;
-//
-//    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-//    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-//    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-//
-//    su2double Total_Sens_BPressure = 0.0;
-//    su2double Total_Sens_Density = 0.0;
-//    su2double Total_Sens_ModVel = 0.0;
-//
-//    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-//    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-//        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-//        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-//        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-//
-//    /*--- Residual arrays ---*/
-//    su2double *residual_flow         = NULL,
-//    *residual_turbulent    = NULL,
-//    *residual_transition   = NULL;
-//    su2double *residual_adjflow      = NULL,
-//    *residual_adjturbulent = NULL;
-//    su2double *residual_fea          = NULL;
-//    su2double *residual_fem          = NULL;
-//    su2double *residual_heat         = NULL;
-//
-//    /*--- Coefficients Monitored arrays ---*/
-//    su2double *aeroelastic_plunge = NULL,
-//    *aeroelastic_pitch  = NULL,
-//    *Surface_CL         = NULL,
-//    *Surface_CD         = NULL,
-//    *Surface_CSF        = NULL,
-//    *Surface_CEff       = NULL,
-//    *Surface_CFx        = NULL,
-//    *Surface_CFy        = NULL,
-//    *Surface_CFz        = NULL,
-//    *Surface_CMx        = NULL,
-//    *Surface_CMy        = NULL,
-//    *Surface_CMz        = NULL;
-//
-//    /*--- Initialize number of variables ---*/
-//    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-//    nVar_Trans = 0, nVar_Heat = 0,
-//    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-//    nVar_FEM = 0;
-//
-//    /*--- Direct problem variables ---*/
-//    nVar_Flow = nDim+2;
-//    if (turbulent) {
-//      switch (config[val_iZone]->GetKind_Turb_Model()) {
-//        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-//        case SST:    nVar_Turb = 2; break;
-//      }
-//    }
-//    if (transition) nVar_Trans = 2;
-//    if (heat) nVar_Heat = 1;
-//
-//
-//    /*--- Adjoint problem variables ---*/
-//    nVar_AdjFlow = nDim+2;
-//    if (turbulent) {
-//      switch (config[val_iZone]->GetKind_Turb_Model()) {
-//        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-//        case SST:    nVar_AdjTurb = 2; break;
-//      }
-//    }
-//
-//    /*--- Allocate memory for the residual ---*/
-//    residual_flow       = new su2double[nVar_Flow];
-//    residual_turbulent  = new su2double[nVar_Turb];
-//    residual_transition = new su2double[nVar_Trans];
-//    residual_heat       = new su2double[nVar_Heat];
-//
-//    /*--- Allocate memory for the coefficients being monitored ---*/
-//    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-//
-//    /*--- Write information from nodes ---*/
-//
-//    /*--- Flow solution coefficients ---*/
-//
-//    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-//    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-//    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-//    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-//    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-//    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-//    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-//    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-//    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-//    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-//    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-//    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-//    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-//
-//    if (thermal) {
-//      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-//      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-//      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-//
-//      if(weakly_coupled_heat) {
-//        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-//        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-//        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-//      }
-//    }
-//
-//    if (direct_diff != NO_DERIVATIVE) {
-//      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-//      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-//      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-//      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-//      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-//      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-//      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-//      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-//      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-//      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-//      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-//
-//      if (thermal) {
-//        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-//        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-//        //Davg Temp
-//      }
-//
-//      if (engine || actuator_disk) {
-//        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-//        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-//        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-//        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-//      }
-//
-//    }
-//
-//    if (equiv_area) {
-//      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-//      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-//
-//      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-//      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-//    }
-//
-//    if (engine || actuator_disk) {
-//      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-//      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-//      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-//      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-//    }
-//
-//    if (rotating_frame) {
-//      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-//      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-//      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-//    }
-//
-//    if (aeroelastic) {
-//      /*--- Look over the markers being monitored and get the desired values ---*/
-//      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-//        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-//        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-//      }
-//    }
-//
-//    if (output_per_surface) {
-//      /*--- Look over the markers being monitored and get the desired values ---*/
-//      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-//        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-//        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-//        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-//        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-//        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-//        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-//        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-//        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-//        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-//        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-//      }
-//    }
-//
-//    if (turbo) {
-//      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-//      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-//        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-//          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-//            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-//            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-//          }
-//        }
-//      }
-//      if (direct_diff != NO_DERIVATIVE){
-//        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-//        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-//        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-//      }
-//    }
-//
-//    /*--- Get flux-averaged values at the specified surface ---*/
-//
-//    if (output_surface) {
-//
-//      unsigned short iMarker_Analyze = 0;
-//      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-//      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-//      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-//      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-//      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-//      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-//      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-//      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-//      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-//      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-//      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-//      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-//      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-//      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-//
-//    }
-//
-//    /*--- Flow Residuals ---*/
-//
-//    for (iVar = 0; iVar < nVar_Flow; iVar++)
-//      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-//
-//    /*--- Turbulent residual ---*/
-//
-//    if (turbulent) {
-//      for (iVar = 0; iVar < nVar_Turb; iVar++)
-//        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-//    }
-//
-//    if (weakly_coupled_heat) {
-//      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-//        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-//      }
-//
-//    }
-//
-//    /*--- Transition residual ---*/
-//
-//    if (transition) {
-//      for (iVar = 0; iVar < nVar_Trans; iVar++)
-//        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-//    }
-//
-//
-//    /*--- Iterations of the linear solver ---*/
-//
-//    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-//
-//    if (extra_heat_output) {
-//      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-//      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-//      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-//    }
-//
-//    /*--- Header frequency ---*/
-//
-//    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-//                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-//    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-//    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-//    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-//    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-//    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-//
-//    bool write_heads;
-//    if (Unsteady) write_heads = (iIntIter == 0);
-//    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-//
-//    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-//
-//
-//    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
-//
-//      /*--- Prepare the history file output, note that the dual
-//       time output don't write to the history file ---*/
-//      if (!DualTime_Iteration) {
-//
-//        /*--- Write the begining of the history file ---*/
-//        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-//
-//        /*--- Write the end of the history file ---*/
-//        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-//
-//        /*--- Write the solution and residual of the history file ---*/
-//
-//        /*--- Direct coefficients ---*/
-//        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-//            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-//            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-//        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-//        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-//        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-//        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-//        if (inv_design) {
-//          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-//          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-//        }
-//
-//        if (direct_diff != NO_DERIVATIVE) {
-//          if (!turbo)
-//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-//          else
-//            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-//                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-//          if (engine || actuator_disk)
-//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-//          if (thermal)
-//            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-//                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-//                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-//        }
-//
-//        if (aeroelastic) {
-//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-//            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-//            if (iMarker_Monitoring == 0) {
-//              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-//            }
-//            else {
-//              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-//              strcat(aeroelastic_coeff, surface_coeff);
-//            }
-//            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-//            strcat(aeroelastic_coeff, surface_coeff);
-//          }
-//        }
-//
-//        if (output_per_surface) {
-//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-//            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-//            if (iMarker_Monitoring == 0) {
-//              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-//            }
-//            else {
-//              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-//              strcat(monitoring_coeff, surface_coeff);
-//            }
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-//            strcat(monitoring_coeff, surface_coeff);
-//          }
-//        }
-//
-//        if (turbo){
-//          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-//            if (iMarker_Monitoring == 0){
-//              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-//            }else{
-//              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-//              strcat(turbo_coeff, surface_coeff);
-//            }
-//            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-//            strcat(turbo_coeff, surface_coeff);
-//            //
-//            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-//            strcat(turbo_coeff, surface_coeff);
-//
-//          }
-//        }
-//
-//        /*--- Flow residual ---*/
-//        if (nDim == 2) {
-//          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-//          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-//        }
-//        else {
-//          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-//          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-//        }
-//
-//        /*--- Turbulent residual ---*/
-//        if (turbulent) {
-//          switch(nVar_Turb) {
-//          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-//          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-//          }
-//        }
-//
-//        /*---- Averaged stagnation pressure at an exit ----*/
-//
-//        if (output_surface) {
-//          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-//        }
-//
-//        /*--- Transition residual ---*/
-//        if (transition) {
-//          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-//        }
-//
-//        /*--- Combo objective ---*/
-//        if (output_comboObj) {
-//          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-//        }
-//
-//        if (weakly_coupled_heat) {
-//          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-//        }
-//
-//
-//      }
-//      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-//        /*--- Write the screen header---*/
-//        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
-//
-//
-//            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-//
-//                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-//
-//                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-//                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-//                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-//                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-//
-//                  if (nZone > 1)
-//                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-//
-//                cout << "-------------------------------------------------------------------------" << endl;
-//
-//                if (direct_diff != NO_DERIVATIVE) {
-//                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-//                  cout << "Coefficients are differentiated with respect to ";
-//                  switch (direct_diff) {
-//                  case D_MACH:
-//                    cout << "Mach number." << endl;
-//                    break;
-//                  case D_AOA:
-//                    cout << "AoA." << endl;
-//                    break;
-//                  case D_SIDESLIP:
-//                    cout << "AoS." << endl;
-//                    break;
-//                  case D_REYNOLDS:
-//                    cout << "Reynolds number." << endl;
-//                    break;
-//                  case D_TURB2LAM:
-//                    cout << "Turb/Lam ratio." << endl;
-//                    break;
-//                  case D_PRESSURE:
-//                    cout << "Freestream Pressure." << endl;
-//                    break;
-//                  case D_TEMPERATURE:
-//                    cout << "Freestream Temperature." << endl;
-//                    break;
-//                  case D_DENSITY:
-//                    cout << "Freestream Density." << endl;
-//                    break;
-//                  case D_VISCOSITY:
-//                    cout << "Freestream Viscosity." << endl;
-//                    break;
-//                  case D_DESIGN:
-//                    cout << "Design Variables." << endl;
-//                    break;
-//                  default:
-//                    break;
-//                  }
-//
-//                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-//                  cout.width(18); cout << D_Total_CL;
-//                  cout.width(18); cout << D_Total_CD;
-//                  cout.width(18); cout << D_Total_CMz;
-//                  cout.width(18); cout << D_Total_CEff;
-//                  cout << endl << "-------------------------------------------------------------------------" << endl;
-//                  cout << endl;
-//                }
-//                if (turbo && write_turbo && val_iZone== 0){
-//                  WriteTurboPerfConvHistory(config[val_iZone]);
-//                }
-//
-//            }
-//            else {
-//              if (flow) {
-//                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-//                {
-//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-//                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-//                } else {
-//                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-//                }
-//              } else {
-//                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-//              }
-//            }
-//
-//          switch (config[val_iZone]->GetKind_Solver()) {
-//          case EULER :                  case NAVIER_STOKES:
-//
-//            /*--- Visualize the maximum residual ---*/
-//            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-//            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-//
-//            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-//
-//            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-//
-//            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-//              if (nDim == 3) cout << ", " << Coord[2];
-//              cout <<   ")." << endl;
-//            }
-//            else {
-//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-//              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-//              cout <<   ")." << endl;
-//            }
-//
-//            /*--- Print out the number of non-physical points and reconstructions ---*/
-//
-//            if (config[val_iZone]->GetNonphysical_Points() > 0)
-//              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-//            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-//              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-//
-//            cout << "-------------------------------------------------------------------------" << endl;
-//
-//            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-//            else cout << endl << " IntIter" << " ExtIter";
-//
-//            //            if (!fluid_structure) {
-//              if (incompressible && !weakly_coupled_heat) {
-//              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-//              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-//              }
-//              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-//            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-//            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-//            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-//
-//            else if (turbo){
-//
-//              if(nZone  < 2){
-//                /*--- single zone output ---*/
-//                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-//              }
-//              else{
-//                /* --- multi-zone output ---*/
-//                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-//              }
-//            }
-//
-//            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-//            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-//            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-//
-//            if(extra_heat_output) {
-//              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-//            }
-//
-//            cout << endl;
-//
-//            break;
-//
-//          case RANS :
-//
-//            /*--- Visualize the maximum residual ---*/
-//            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-//            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-//
-//            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-//
-//            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-//            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-//              if (nDim == 3) cout << ", " << Coord[2];
-//              cout <<   ")." << endl;
-//            }
-//            else {
-//              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-//              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-//              cout <<   ")." << endl;
-//            }
-//            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-//
-//            /*--- Print out the number of non-physical points and reconstructions ---*/
-//            if (config[val_iZone]->GetNonphysical_Points() > 0)
-//              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-//            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-//              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-//
-//            cout << "-------------------------------------------------------------------------" << endl;
-//
-//            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-//            else cout << endl << " IntIter" << " ExtIter";
-//            if (incompressible) cout << "   Res[Press]";
-//            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-//
-//            switch (config[val_iZone]->GetKind_Turb_Model()) {
-//              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-//              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-//            }
-//
-//            if (weakly_coupled_heat) {
-//              cout <<  "     Res[Heat]";
-//            }
-//
-//            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-//            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-//            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-//            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-//            else if (turbo){
-//              if (nZone < 2){
-//                /*--- single zone output ---*/
-//                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-//              }
-//              else{
-//                /*--- multi zone output ---*/
-//                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-//
-//              }
-//            }
-//            else if (weakly_coupled_heat) {
-//              cout << "   HFlux(Total)";
-//            }
-//            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-//
-//            if(extra_heat_output) {
-//              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-//            }
-//
-//            cout << endl;
-//
-//            break;
-//
-//          }
-//
-//        }
-//      }
-//
-//      /*--- Write the solution on the screen ---*/
-//
-//      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-//        cout.precision(6);
-//        cout.setf(ios::fixed, ios::floatfield);
-//        if (!Unsteady) {
-//          cout.width(5); cout << iExtIter + ExtIter_OffSet;
-//          cout.width(11); cout << timeiter;
-//
-//        } else if (Unsteady && DualTime_Iteration) {
-//          cout.width(8); cout << iIntIter;
-//          cout.width(8); cout << iExtIter;
-//        }
-//      }
-//
-//      switch (config[val_iZone]->GetKind_Solver()) {
-//        case EULER : case NAVIER_STOKES:
-//
-//          /*--- Write history file ---*/
-//
-//          if ((!DualTime_Iteration) && (output_files)) {
-//            if (!turbo) {
-//              HistFile << begin << direct_coeff;
-//              if (thermal) HistFile << heat_coeff;
-//              if (equiv_area) HistFile << equivalent_area_coeff;
-//              if (engine || actuator_disk) HistFile << engine_coeff;
-//              if (inv_design) {
-//                HistFile << Cp_inverse_design;
-//                if (thermal) HistFile << Heat_inverse_design;
-//              }
-//              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-//              HistFile << flow_resid;
-//              if (weakly_coupled_heat) HistFile << heat_resid;
-//            }
-//            else {
-//              HistFile << begin << turbo_coeff << flow_resid;
-//            }
-//
-//            if (aeroelastic) HistFile << aeroelastic_coeff;
-//            if (output_per_surface) HistFile << monitoring_coeff;
-//            if (output_surface) HistFile << surface_outputs;
-//            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-//            if (output_comboObj) HistFile << combo_obj;
-//            HistFile << end;
-//            HistFile.flush();
-//          }
-//
-//          /*--- Write screen output ---*/
-//          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-//            if(DualTime_Iteration || !Unsteady) {
-//              cout.precision(6);
-//              cout.setf(ios::fixed, ios::floatfield);
-//              cout.width(13); cout << log10(residual_flow[0]);
-//              if (!equiv_area) {
-//                if (compressible) {
-//                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-//                  else { cout.width(14); cout << log10(residual_flow[4]); }
-//                }
-//                if (incompressible && !weakly_coupled_heat) {
-//                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-//                  else {cout.width(14); cout << log10(residual_flow[1]);}
-//                }
-//                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-//
-//              }
-//
-//              if (rotating_frame && nDim == 3 && !turbo ) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//                cout.width(15); cout << Total_CT;
-//                cout.width(15); cout << Total_CQ;
-//                cout.unsetf(ios_base::floatfield);
-//              }
-//              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-//              cout.precision(4);
-//              cout.setf(ios::scientific, ios::floatfield);
-//              cout << Total_CNearFieldOF; }
-//              else if (turbo) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//
-//                if (nZone < 2) {
-//                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-//                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-//                }
-//                else {
-//                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-//                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-//                }
-//
-//                cout.unsetf(ios_base::floatfield);
-//
-//              }
-//              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-//              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-//              if (aeroelastic) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-//                cout.width(15); cout << aeroelastic_pitch[0];
-//                cout.unsetf(ios_base::floatfield);
-//              }
-//
-//              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-//            }
-//            cout << endl;
-//          }
-//          break;
-//
-//        case RANS :
-//
-//          /*--- Write history file ---*/
-//
-//          if ((!DualTime_Iteration) && (output_files)) {
-//
-//            if (!turbo) {
-//              HistFile << begin << direct_coeff;
-//              if (thermal) HistFile << heat_coeff;
-//              if (equiv_area) HistFile << equivalent_area_coeff;
-//              if (engine || actuator_disk) HistFile << engine_coeff;
-//              if (inv_design) {
-//                HistFile << Cp_inverse_design;
-//                if (thermal) HistFile << Heat_inverse_design;
-//              }
-//              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-//              HistFile << flow_resid << turb_resid;
-//              if (weakly_coupled_heat) HistFile << heat_resid;
-//            }
-//            else {
-//              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-//            }
-//
-//            if (aeroelastic) HistFile << aeroelastic_coeff;
-//            if (output_per_surface) HistFile << monitoring_coeff;
-//            if (output_surface) HistFile << surface_outputs;
-//            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-//            if (output_comboObj) HistFile << combo_obj;
-//            HistFile << end;
-//            HistFile.flush();
-//          }
-//
-//          /*--- Write screen output ---*/
-//
-//          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-//            if(DualTime_Iteration || !Unsteady) {
-//              cout.precision(6);
-//              cout.setf(ios::fixed, ios::floatfield);
-//
-//              if (incompressible) cout.width(13);
-//              else  cout.width(14);
-//              cout << log10(residual_flow[0]);
-//              switch(nVar_Turb) {
-//              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-//              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-//              cout.width(15); cout << log10(residual_turbulent[1]); break;
-//              }
-//
-//              if (weakly_coupled_heat) {
-//                cout.width(14); cout << log10(residual_heat[0]);
-//              }
-//
-//              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-//
-//              if (rotating_frame && nDim == 3 && !turbo ) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//                cout.width(15); cout << Total_CT; cout.width(15);
-//                cout << Total_CQ;
-//                cout.unsetf(ios_base::floatfield);
-//              }
-//              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-//              cout.precision(4);
-//              cout.setf(ios::scientific, ios::floatfield);
-//              cout << Total_CNearFieldOF; }
-//              else if (turbo) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//                if (nZone < 2){
-//                  /*--- single zone output ---*/
-//                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-//                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-//                }
-//                else{
-//                  /*--- multi zone output ---*/
-//                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-//                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-//                  if (direct_diff){
-//                    cout.width(15); cout << D_EntropyGen;
-//                  }
-//                }
-//                cout.unsetf(ios_base::floatfield);
-//              }
-//              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-//              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-//
-//              if (aeroelastic) {
-//                cout.setf(ios::scientific, ios::floatfield);
-//                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-//                cout.width(15); cout << aeroelastic_pitch[0];
-//                cout.unsetf(ios_base::floatfield);
-//              }
-//
-//              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-//              cout << endl;
-//            }
-//          }
-//          break;
-//
-//      }
-//      cout.unsetf(ios::fixed);
-//
-//    }
-//
-//
-//    delete [] residual_flow;
-//    delete [] residual_turbulent;
-//    delete [] residual_transition;
-//    delete [] residual_fea;
-//    delete [] residual_fem;
-//    delete [] residual_heat;
-//
-//    delete [] residual_adjflow;
-//    delete [] residual_adjturbulent;
-//
-//    delete [] Surface_CL;
-//    delete [] Surface_CD;
-//    delete [] Surface_CSF;
-//    delete [] Surface_CEff;
-//    delete [] Surface_CFx;
-//    delete [] Surface_CFy;
-//    delete [] Surface_CFz;
-//    delete [] Surface_CMx;
-//    delete [] Surface_CMy;
-//    delete [] Surface_CMz;
-//    delete [] aeroelastic_pitch;
-//    delete [] aeroelastic_plunge;
-//
-//  }
-//}
-
-
 
 CFlowOutput::~CFlowOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
+    
+    delete [] ResRMS;
+    delete [] ResMax;
   }
 
 
 }
-void CFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-
-  /*--- Write the header, case depending ---*/
-  SetHistoryFile_Header(config);
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
-
-}
-
-inline void CFlowOutput::SetHistoryFile_Header(CConfig *config) { }
 
-inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
 
-inline void CFlowOutput::SetHistoryFile_Output(CConfig *config) { }
 
-inline bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header;
-  write_header = (((iExtIter % (config->GetWrt_Con_Freq()*40)) == 0));
+inline void CFlowOutput::SetOutputFields(CConfig *config){
   
-  return write_header;
-}
-
-inline void CFlowOutput::SetScreen_Header(CConfig *config) { 
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
-  stringstream out;
+  // Residuals
+  AddOutputField("DENSITY",    "Res[Rho]",  FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("MOMENTUM-X", "Res[RhoU]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("MOMENTUM-Y", "Res[RhoV]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
   
-  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-
-  bool absolute = (config->GetResidual_Criteria_FEM() == RESFEM_ABSOLUTE);
-
-  if (dynamic && nonlinear_analysis) {
-    cout << endl << "Simulation time: " << config->GetCurrent_DynTime() << ". Time step: " << config->GetDelta_DynTime() << ".";
-  }
-
-  // Insert line break
-  cout << endl;
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER: PrintScreenHeaderString(out,"IntIter");    break;
-    case SOUT_EXTITER: PrintScreenHeaderString(out,"ExtIter");    break;
-    case SOUT_RHO:     PrintScreenHeaderString(out,"Res[Rho]");   break;
-    case SOUT_RHOU1:   PrintScreenHeaderString(out,"Res[RhoU]");  break;
-    case SOUT_RHOU2:   PrintScreenHeaderString(out,"Res[RhoV]");  break;
-    case SOUT_RHOU3:   PrintScreenHeaderString(out,"Res[RhoW]");  break;
-    case SOUT_RHOE:    PrintScreenHeaderString(out,"Res[RhoE]");  break;
-    case SOUT_CD:      PrintScreenHeaderString(out,"CD[Total]");  break;
-    case SOUT_CL:      PrintScreenHeaderString(out,"CL[Total]");  break;
-    case SOUT_CMX:     PrintScreenHeaderString(out,"CMx[Total]"); break;
-    case SOUT_CMY:     PrintScreenHeaderString(out,"CMy[Total]"); break;
-    case SOUT_CMZ:     PrintScreenHeaderString(out,"CMz[Total]"); break;      
-    case SOUT_AOA:     PrintScreenHeaderString(out,"AoA");        break;
-    case SOUT_CFX:     PrintScreenHeaderString(out,"CFx[Total]"); break;
-    case SOUT_CFY:     PrintScreenHeaderString(out,"CFy[Total]"); break;
-    case SOUT_CFZ:     PrintScreenHeaderString(out,"CFz[Total]"); break;  
-    case SOUT_CEFF:    PrintScreenHeaderString(out,"CEff[Total]"); break;    
-    }
-  }
+  // Aerodynamic coefficients
+  AddOutputField("DRAG",       "CD(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("LIFT",       "CL(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("SIDEFORCE",  "CSF(Total)",FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-X",  "CMx(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Y",  "CMy(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Z",  "CMz(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-X",  "CFx(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("FORCE-Y",  "CFy(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
-  // Insert line break
-  cout << out.str();
-  cout << endl;
-
-}
-
-inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  return true;
-}
-
-inline void CFlowOutput::SetScreen_Output(CConfig *config) {
+  // Misc.
+  AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
+  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  
+  // Surface output
+  AddOutputField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+ 
   
+  // Engine output
+  AddOutputField("AEROCDRAG", "AeroCDrag", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("SOLIDCDRAG", "SolidCDrag", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("RADIAL_DISTORTION", "Radial_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  
+  // Rotating Frame
+  AddOutputField("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddOutputField("CT", "CT", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddOutputField("CQ", "CQ", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  
+  //Equivalent area
+  AddOutputField("EQUIV_AREA", "CEquiv_Area", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
+  AddOutputField("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
   
-  stringstream out;
   
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    switch (config->GetScreenOutput_Field(iField)){
-    case SOUT_INTITER: PrintScreenInteger(out, iIntIter); break;
-    case SOUT_EXTITER: PrintScreenInteger(out,iExtIter); break;
-    case SOUT_RHO:     PrintScreenFixed(out,log10(ResRMS[0])); break;
-    case SOUT_RHOU1:   PrintScreenFixed(out,log10(ResRMS[1])); break;
-    case SOUT_RHOU2:   PrintScreenFixed(out,log10(ResRMS[2])); break;
-    case SOUT_RHOU3:   if (nDim == 3) PrintScreenFixed(out,log10(ResRMS[3]));
-                       else PrintScreenFixed(out,0.0); break;
-    case SOUT_RHOE:    if (nDim == 3) PrintScreenFixed(out,log10(ResRMS[4]));
-                       else PrintScreenFixed(out,log10(ResRMS[3])); break;
-    case SOUT_CD:      PrintScreenScientific(out,CD_Total);   break;
-    case SOUT_CL:      PrintScreenScientific(out,CL_Total);   break;
-    case SOUT_CMX:     PrintScreenScientific(out,CMx_Total);  break;
-    case SOUT_CMY:     PrintScreenScientific(out,CMy_Total);  break;
-    case SOUT_CMZ:     PrintScreenScientific(out,CMz_Total);  break;
-    case SOUT_CFX:     PrintScreenScientific(out,CFx_Total);  break;
-    case SOUT_CFY:     PrintScreenScientific(out,CFy_Total);  break;
-    case SOUT_CFZ:     PrintScreenScientific(out,CFz_Total);  break;
-    case SOUT_AOA:     PrintScreenScientific(out,AoA);        break;
-    case SOUT_CEFF:    PrintScreenScientific(out,CEff_Total); break;
-    }
-  }
-    
-  // Insert line break
-  cout << out.str();
-  cout << endl;
 }
 
 inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   unsigned short iVar;
   
-  for (iVar = 0; iVar < nVar; iVar++){
-    ResRMS[iVar] = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(iVar);
-    ResMax[iVar] = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_Max(iVar);
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetOutputFieldValue("DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(0)));
+  SetOutputFieldValue("MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(1)));
+  SetOutputFieldValue("MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
+  if (nDim == 2)
+    SetOutputFieldValue("ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+  else {
+    SetOutputFieldValue("MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+    SetOutputFieldValue("ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(4)));
   }
+  SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
+  SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
+  if (nDim == 3)
+    SetOutputFieldValue("SIDEFORCE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CSF());
+  SetOutputFieldValue("MOMENT-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx());
+  SetOutputFieldValue("MOMENT-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy());
+  if (nDim == 3)
+    SetOutputFieldValue("MOMENT-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz());
+  SetOutputFieldValue("FORCE-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx());
+  SetOutputFieldValue("FORCE-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy());
+  if (nDim == 3)
+    SetOutputFieldValue("FORCE-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz());
   
-  CD_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD();
-  CL_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL();
-  CMx_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx();
-  CMy_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy();
-  CMz_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz();
-  CFx_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx();
-  CFy_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy();
-  CFz_Total = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz();
-  AoA = config[val_iZone]->GetAoA();
-  CEff_Total = CD_Total/CL_Total;
-  Time_Used = timeused;
-  
-  LinSolvIter = config[val_iZone]->GetLinear_Solver_Iter();
-  iExtIter = config[val_iZone]->GetExtIter();
-  iIntIter = config[val_iZone]->GetIntIter();
+  SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
+  SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
+  SetOutputFieldValue("TIME", timeused);
+  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
   
+//  SetOutputFieldValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(0));
+//  SetOutputFieldValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(0));
+//  SetOutputFieldValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(0));
+//  SetOutputFieldValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(0));
+//  SetOutputFieldValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(0));
+}
+
+inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
+
+inline bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header;
+  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
   
+  return true;
+}
+inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  return true;
 }
+
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 856d9e0ad3db..64516ea6256f 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -39,43 +39,47 @@
 #include "../include/output_structure.hpp"
 
 CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-
-  // Open the history file using only the master node
+ 
   if (rank == MASTER_NODE){
+   
+    char buffer[50];
+    
+    // Retrieve the history filename
+    string history_filename = config->GetConv_FileName();
+    
+    nDim = geometry->GetnDim();
+    
+    // Append the zone ID
+    if(config->GetnZone() > 1){
+      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
+    }
+    strcpy (char_histfile, history_filename.data());
+    
+    // Append the restart iteration: if dynamic problem and restart
+    if (config->GetWrt_Unsteady() && config->GetRestart()) {
+      long iExtIter = config->GetDyn_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(char_histfile, buffer);
+    }
+    
+    // Add the correct file extension depending on the file format
+    if ((config->GetOutput_FileFormat() == TECPLOT) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    strcat(char_histfile, buffer);
+    SetOutputFields(config);
+    // Open the history file using only the master node
+    
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
+    SetHistoryFile_Header(config);    
   }
 
 }
@@ -89,1289 +93,93 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 
 }
 
-void CIncFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-
-  /*--- Begin of the header ---*/
-
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-  /*--- Find the markers being monitored and create a header for them ---*/
-
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-
-  /*--- Header for the residuals ---*/
-
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-
-  /*--- End of the header ---*/
-
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-
-  /*--- Write the header, case depending ---*/
-
-  HistFile << begin;
-  if (!turbo) HistFile << flow_coeff;
-  if (turbo) HistFile << turbo_coeff;
-  if (thermal && !turbo) HistFile << heat_coeff;
-  if (equiv_area) HistFile << equivalent_area_coeff;
-  if (engine || actuator_disk) HistFile << engine_coeff;
-  if (inv_design) {
-    HistFile << Cp_inverse_design;
-    if (thermal && !turbo) HistFile << Heat_inverse_design;
-  }
-  if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-  HistFile << flow_resid;
-  if (turbulent) HistFile << turb_resid;
-  if (weakly_coupled_heat) HistFile << heat_resid;
-  if (aeroelastic) HistFile << aeroelastic_coeff;
-  if (output_per_surface) HistFile << monitoring_coeff;
-  if (output_surface) HistFile << surface_outputs;
-  if (direct_diff != NO_DERIVATIVE) {
-    if (!turbo) HistFile << d_flow_coeff;
-    else        HistFile << d_turbo_coeff;
-    if (engine || actuator_disk) HistFile << d_engine;
-    if (thermal) HistFile << d_thermal_coeff;
-  }
-  if (output_comboObj) HistFile << combo_obj;
-  HistFile << end;
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
 
+void CIncFlowOutput::SetOutputFields(CConfig *config){
+  
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  // Residuals
+  AddOutputField("PRESSURE",   "Res[P]",  FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("VELOCITY-X", "Res[U]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
+  
+  // Aerodynamic coefficients
+  AddOutputField("DRAG",       "CD(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("LIFT",       "CL(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("SIDEFORCE",  "CSF(Total)",FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-X",  "CMx(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Y",  "CMy(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Z",  "CMz(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-X",  "CFx(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("FORCE-Y",  "CFy(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  
+  // Misc.
+  AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
+  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  
+  // Surface output
+  AddOutputField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  
 }
+inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
 
-
-void CIncFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  if (!DualTime_Iteration) {
-
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-
-    if (fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-        SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the surface. ---*/
-
-      if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-        SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-      if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-        SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-            geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-
-      if ((rank == MASTER_NODE) && !(fluid_structure)) cout << endl;
-
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-
-    }
-
-  }
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000],
-    rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000],
-    aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    heat_resid[1000], combo_obj[1000],
-    end[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-    bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-    bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
-
-    /*--- Direct problem variables ---*/
-    nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-
-    /*--- Adjoint problem variables ---*/
-    nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-
-    /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Write information from nodes ---*/
-
-    /*--- Flow solution coefficients ---*/
-
-    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-    if (thermal) {
-      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-      if(weakly_coupled_heat) {
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-      }
-    }
-
-    if (direct_diff != NO_DERIVATIVE) {
-      D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-      D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-      D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-      D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-      D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-      D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-      D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-      D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-      D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-      D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-      D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-      if (thermal) {
-        D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-        D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-        //Davg Temp
-      }
-
-      if (engine || actuator_disk) {
-        D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-        D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-        D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-        D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-      }
-
-    }
-
-    if (equiv_area) {
-      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-    }
-
-    if (engine || actuator_disk) {
-      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-    }
-
-    if (rotating_frame) {
-      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-    }
-
-    if (aeroelastic) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-      }
-    }
-
-    if (output_per_surface) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-      }
-    }
-
-    if (turbo) {
-      /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-        for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-          if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-            D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-            D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-          }
-        }
-      }
-      if (direct_diff != NO_DERIVATIVE){
-        D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-        D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-      }
-    }
-
-    /*--- Get flux-averaged values at the specified surface ---*/
-
-    if (output_surface) {
-
-      unsigned short iMarker_Analyze = 0;
-      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-    }
-
-    /*--- Flow Residuals ---*/
-
-    for (iVar = 0; iVar < nVar_Flow; iVar++)
-      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-    /*--- Turbulent residual ---*/
-
-    if (turbulent) {
-      for (iVar = 0; iVar < nVar_Turb; iVar++)
-        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-    }
-
-    if (weakly_coupled_heat) {
-      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-      }
-
-    }
-
-    /*--- Transition residual ---*/
-
-    if (transition) {
-      for (iVar = 0; iVar < nVar_Trans; iVar++)
-        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-    }
-
-
-    /*--- Iterations of the linear solver ---*/
-
-    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-
-    /*--- Header frequency ---*/
-
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-
-
-    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-        /*--- Write the solution and residual of the history file ---*/
-
-        /*--- Direct coefficients ---*/
-        SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-            Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-            Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-        if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-        if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-        if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-        if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-        if (inv_design) {
-          SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-          if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          if (!turbo)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-          else
-            SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-          if (engine || actuator_disk)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-          if (thermal)
-            SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-        }
-
-        if (aeroelastic) {
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-            if (iMarker_Monitoring == 0) {
-              SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-            }
-            else {
-              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-              strcat(aeroelastic_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-            strcat(aeroelastic_coeff, surface_coeff);
-          }
-        }
-
-        if (output_per_surface) {
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-            if (iMarker_Monitoring == 0) {
-              SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-            }
-            else {
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-            strcat(monitoring_coeff, surface_coeff);
-          }
-        }
-
-        if (turbo){
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-            if (iMarker_Monitoring == 0){
-              SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-            }else{
-              SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-            }
-            SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-            strcat(turbo_coeff, surface_coeff);
-            //
-            SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-            SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-            strcat(turbo_coeff, surface_coeff);
-
-          }
-        }
-
-        /*--- Flow residual ---*/
-        if (nDim == 2) {
-          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-        }
-        else {
-          if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-          if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-        }
-
-        /*--- Turbulent residual ---*/
-        if (turbulent) {
-          switch(nVar_Turb) {
-          case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-          case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-          }
-        }
-
-        /*---- Averaged stagnation pressure at an exit ----*/
-
-        if (output_surface) {
-          SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-        }
-
-        /*--- Transition residual ---*/
-        if (transition) {
-          SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-        }
-
-        /*--- Combo objective ---*/
-        if (output_comboObj) {
-          SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-        }
-
-        if (weakly_coupled_heat) {
-          SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-        }
-
-
-      }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        /*--- Write the screen header---*/
-        if (((write_heads) && !(!DualTime_Iteration && Unsteady))) {
-
-
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          }
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-        if (!Unsteady) {
-          cout.width(5); cout << iExtIter + ExtIter_OffSet;
-          cout.width(11); cout << timeiter;
-
-        } else if (Unsteady && DualTime_Iteration) {
-          cout.width(8); cout << iIntIter;
-          cout.width(8); cout << iExtIter;
-        }
-      }
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-
-                cout.unsetf(ios_base::floatfield);
-
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-
-        case RANS :
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid << turb_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;
-            }
-          }
-          break;
-
-      }
-      cout.unsetf(ios::fixed);
-
-    }
-
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
-    delete [] residual_heat;
-
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-
-  }
+inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header;
+  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
+  
+  return true;
+}
+inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  return true;
 }
 
-inline void CIncFlowOutput::SetHistoryFile_Header(CConfig *config) { }
-
-inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CIncFlowOutput::SetHistoryFile_Output(CConfig *config) { }
-
-inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) { }
-
-inline void CIncFlowOutput::SetScreen_Header(CConfig *config) { }
-
-inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CIncFlowOutput::SetScreen_Output(CConfig *config) { }
 
 inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+  
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetOutputFieldValue("PRESSURE", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(0)));
+  SetOutputFieldValue("VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(1)));
+  SetOutputFieldValue("VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
+  if (nDim == 3) SetOutputFieldValue("VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+ 
+  SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
+  SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
+  if (nDim == 3)
+    SetOutputFieldValue("SIDEFORCE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CSF());
+  SetOutputFieldValue("MOMENT-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx());
+  SetOutputFieldValue("MOMENT-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy());
+  if (nDim == 3)
+    SetOutputFieldValue("MOMENT-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz());
+  SetOutputFieldValue("FORCE-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx());
+  SetOutputFieldValue("FORCE-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy());
+  if (nDim == 3)
+    SetOutputFieldValue("FORCE-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz());
+  
+  SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
+  SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
+  SetOutputFieldValue("TIME", timeused);
+  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
+  
+}
 

From 905cf9a1af6159e5a38b8684b14637f188b38c98 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 19 Jun 2018 13:51:06 +0200
Subject: [PATCH 019/539] Added output per surface

---
 SU2_CFD/include/output_structure.hpp   |  6 ++
 SU2_CFD/include/output_structure.inl   | 10 ++++
 SU2_CFD/src/output_direct_mean.cpp     | 62 ++++++++++++++++-----
 SU2_CFD/src/output_direct_mean_inc.cpp | 77 +++++++++++++++++++++-----
 SU2_CFD/src/output_structure.cpp       | 38 +++++++++++++
 5 files changed, 165 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index e88acbbf3403..2632c5d00efa 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -222,6 +222,8 @@ class COutput {
   };
   
   std::map<string, OutputField > Output_Fields;
+  std::map<string, vector<OutputField> > OutputPerSurface_Fields;
+
   
   char char_histfile[200];
 
@@ -961,6 +963,10 @@ class COutput {
   
   void SetOutputFieldValue(string name, su2double value);
   
+  void AddOutputPerSurfaceField(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names);
+  
+  void SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker);
+  
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index dc580f1fe737..ea7c3951cfa7 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -96,6 +96,16 @@ inline void COutput::AddOutputField(string name, string field_name, unsigned sho
   Output_Fields[name] = OutputField(field_name, format, groupname);
 }
 
+inline void COutput::AddOutputPerSurfaceField(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
+  for (unsigned short i = 0; i < marker_names.size(); i++){
+    OutputPerSurface_Fields[name].push_back(OutputField(field_name+"("+marker_names[i]+")", format, groupname));
+  }
+}
+
 inline void COutput::SetOutputFieldValue(string name, su2double value){
   Output_Fields[name].Value = value;
+}
+
+inline void COutput::SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker){
+  OutputPerSurface_Fields[name][iMarker].Value = value;
 }
\ No newline at end of file
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index cc848a318aaa..126e0201ce3f 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -138,26 +138,44 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
   AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
+  vector<string> Marker_Monitoring;
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
+    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
+  }
+  
+  // Aerodynamic coefficients (per surface)  
+  AddOutputPerSurfaceField("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+ 
+  
   // Misc.
   AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
   AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Surface output
-  AddOutputField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  AddOutputPerSurfaceField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
+  AddOutputPerSurfaceField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
  
   
   // Engine output
@@ -206,6 +224,22 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
   if (nDim == 3)
     SetOutputFieldValue("FORCE-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz());
   
+  
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    SetOutputPerSurfaceFieldValue("DRAG_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("LIFT_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("SIDEFORCE_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("MOMENT-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("MOMENT-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("MOMENT-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("FORCE-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("FORCE-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("FORCE-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
+  }
+  
   SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
   SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
   SetOutputFieldValue("TIME", timeused);
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 64516ea6256f..430e63ad8668 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -118,26 +118,49 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
   AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
+  vector<string> Marker_Monitoring;
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
+    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
+  }
+  
+  // Aerodynamic coefficients (per surface)  
+  AddOutputPerSurfaceField("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddOutputPerSurfaceField("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  
+  
   // Misc.
   AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
   AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Surface output
-  AddOutputField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
-  AddOutputField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT");
+  vector<string> Marker_Analyze;
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Monitoring(); iMarker_Analyze++){
+    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
+  }
+  AddOutputPerSurfaceField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+
   
 }
 inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
@@ -181,5 +204,31 @@ inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver ****
   SetOutputFieldValue("TIME", timeused);
   SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
   
+  
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    SetOutputPerSurfaceFieldValue("DRAG_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("LIFT_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("SIDEFORCE_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("MOMENT-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("MOMENT-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("MOMENT-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("FORCE-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetOutputPerSurfaceFieldValue("FORCE-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetOutputPerSurfaceFieldValue("FORCE-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
+  }
+  
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++){
+    
+    SetOutputPerSurfaceFieldValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+  }
+  
+
 }
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index a584268705a8..33a54f966f6c 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -16552,6 +16552,16 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       }
     }
   }
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    currentField = config->GetHistoryOutput_Field(iField);      
+    for(std::map<string, vector<OutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
+      for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
+        if (currentField == iter->second[iMarker].HistoryOutputGroup){
+          AddHistoryHeaderString(iter->second[iMarker].FieldName);
+        }
+      }
+    }
+  }
   
   stringstream out;
   for (unsigned short iHeader = 0; iHeader < HistoryHeader.size(); iHeader++){
@@ -16589,6 +16599,17 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
     }
   }
   
+  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
+    currentField = config->GetHistoryOutput_Field(iField);      
+    for(std::map<string, vector<OutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
+      for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
+        if (currentField == iter->second[iMarker].HistoryOutputGroup){
+          AddHistoryValue(iter->second[iMarker].Value);
+        }
+      }
+    }
+  }
+  
   for (unsigned short iValue = 0; iValue < HistoryValues.size(); iValue++){
     out << std::setprecision(10) << HistoryValues[iValue];
     if (iValue !=  HistoryValues.size() - 1) out << HistorySep;
@@ -16613,8 +16634,12 @@ void COutput::SetScreen_Header(CConfig *config) {
     } else {
 //      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
     }
+    if (OutputPerSurface_Fields.count(currentField) > 0){
+      PrintScreenHeaderString(out, OutputPerSurface_Fields[currentField][0].FieldName);      
+    }
   }
   
+  
   // Insert line break
   out << endl;
   cout << out.str();
@@ -16642,6 +16667,19 @@ void COutput::SetScreen_Output(CConfig *config) {
         break;      
       }
     }
+    if (OutputPerSurface_Fields.count(currentField) > 0){
+      switch (OutputPerSurface_Fields[currentField][0].ScreenFormat) {
+      case FORMAT_INTEGER:
+        PrintScreenInteger(out, OutputPerSurface_Fields[currentField][0].Value);
+        break;
+      case FORMAT_FIXED:
+        PrintScreenFixed(out, OutputPerSurface_Fields[currentField][0].Value);
+        break;
+      case FORMAT_SCIENTIFIC:
+        PrintScreenScientific(out, OutputPerSurface_Fields[currentField][0].Value);
+        break;   
+      }
+    }    
   }
     
   // Insert line break

From 9754f677b618f8ac228d817b7687c83a5dec879f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 19 Jun 2018 18:51:57 +0200
Subject: [PATCH 020/539] Added further output and moved some stuff to COutput
 constructor

---
 SU2_CFD/include/output_structure.hpp     |   26 +-
 SU2_CFD/src/output_adjoint_discrete.cpp  | 1967 +---------------------
 SU2_CFD/src/output_direct_elasticity.cpp |   77 +-
 SU2_CFD/src/output_direct_heat.cpp       |   42 +-
 SU2_CFD/src/output_direct_mean.cpp       |  164 +-
 SU2_CFD/src/output_direct_mean_inc.cpp   |  113 +-
 SU2_CFD/src/output_structure.cpp         |   46 +-
 7 files changed, 210 insertions(+), 2225 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 2632c5d00efa..b5e970697b6f 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -191,6 +191,7 @@ class COutput {
   int rank, 	/*!< \brief MPI Rank. */
   size;       	/*!< \brief MPI Size. */
 
+  unsigned short nDim;
   
   // TODO: COMMENT NEW STUFF
   unsigned short field_width;
@@ -1295,11 +1296,9 @@ class CAdjFlowOutput : public COutput {
 class CDiscAdjFlowOutput : public COutput {
 private:
 
-  char char_histfile[200];
 
 public:
 
-  ofstream HistFile;
 
   /*!
    * \brief Constructor of the class
@@ -1312,27 +1311,6 @@ class CDiscAdjFlowOutput : public COutput {
    */
   virtual ~CDiscAdjFlowOutput(void);
 
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
@@ -1341,6 +1319,8 @@ class CDiscAdjFlowOutput : public COutput {
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 
+  void SetOutputFields(CConfig *config);
+  
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 59b0ddf87f16..c343bcd6bcfc 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -68,13 +68,14 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
            (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
   else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
   strcat(char_histfile, buffer);
+  SetOutputFields(config);
 
   // Open the history file using only the master node
   if (rank == MASTER_NODE){
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
+    SetHistoryFile_Header(config);
   }
 
 }
@@ -87,1933 +88,55 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 
 }
 
-void CDiscAdjFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-
-  /*--- Begin of the header ---*/
-
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
-  /*--- Find the markers being monitored and create a header for them ---*/
-
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-
-  /*--- Header for the residuals ---*/
-
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-
-  /*--- End of the header ---*/
-
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
-
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-
-  /*--- Write the header, case depending ---*/
-
-  switch (config->GetKind_Solver()) {
-
-    case EULER : case NAVIER_STOKES: case RANS :
-      HistFile << begin;
-      if (!turbo) HistFile << flow_coeff;
-      if (turbo) HistFile << turbo_coeff;
-      if (thermal && !turbo) HistFile << heat_coeff;
-      if (equiv_area) HistFile << equivalent_area_coeff;
-      if (engine || actuator_disk) HistFile << engine_coeff;
-      if (inv_design) {
-        HistFile << Cp_inverse_design;
-        if (thermal && !turbo) HistFile << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-
-      HistFile << flow_resid;
-      if (turbulent) HistFile << turb_resid;
-      if (weakly_coupled_heat) HistFile << heat_resid;
-      if (aeroelastic) HistFile << aeroelastic_coeff;
-      if (output_per_surface) HistFile << monitoring_coeff;
-      if (output_surface) HistFile << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) HistFile << d_flow_coeff;
-        else        HistFile << d_turbo_coeff;
-        if (engine || actuator_disk) HistFile << d_engine;
-        if (thermal) HistFile << d_thermal_coeff;
-      }
-      if (output_comboObj) HistFile << combo_obj;
-      HistFile << end;
-
-      break;
-
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          HistFile << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          HistFile << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-      HistFile << end;
-      break;
-
-    case HEAT_EQUATION_FVM:
-      HistFile << begin << heat_coeff;
-      HistFile << heat_resid << end;
-      break;
-
-    case FEM_ELASTICITY:
-      HistFile << begin << fem_coeff;
-      if (incload) HistFile << fem_incload;
-      HistFile << fem_resid << endfea;
-      break;
-
-    case DISC_ADJ_FEM:
-      HistFile << begin << fem_coeff;
-      HistFile << fem_resid << endfea;
-      break;
-
-  }
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
-
+void CDiscAdjFlowOutput::SetOutputFields(CConfig *config){
+
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  AddOutputField("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
+  
+  AddOutputField("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  
+  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  
 }
 
-
-void CDiscAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
-
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-
-    if (fea || fluid_structure) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[ZONE_0], output_files);
-          }
-
-          break;
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-
-      /*--- Output a file with the forces breakdown. ---*/
-
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-
-      if ((rank == MASTER_NODE) && !(fea || fluid_structure)) cout << endl;
-
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-
-    }
-
+inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  
+  SetOutputFieldValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetOutputFieldValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetOutputFieldValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+    SetOutputFieldValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+  } else {
+    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
   }
+  SetOutputFieldValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
+  SetOutputFieldValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
+  SetOutputFieldValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
+  SetOutputFieldValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
+  SetOutputFieldValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetOutputFieldValue("PHYS_TIME", timeused);
 
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
-
-    /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
-
-    /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-
-    /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
-
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Write information from nodes ---*/
-
-    switch (config[val_iZone]->GetKind_Solver()) {
-
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-
-        /*--- Flow solution coefficients ---*/
-
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_AeroCD   = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD  = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR      = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC      = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-
-        }
-
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-
-        if (engine || actuator_disk) {
-          Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-          }
-        }
-
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-        }
-
-        /*--- Flow Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-        /*--- Turbulent residual ---*/
-
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-
-        /*--- Transition residual ---*/
-
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-
-
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
-
-        /*--- Iterations of the linear solver ---*/
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-        /*--- Adjoint solver ---*/
-
-        if (adjoint) {
-
-          /*--- Adjoint solution coefficients ---*/
-
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-          /*--- Adjoint flow residuals ---*/
-
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
-
-          /*--- Adjoint turbulent residuals ---*/
-
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
-          }
-
-        }
-
-        break;
-
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-
-      case FEM_ELASTICITY:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
-
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
-
-        break;
-
-      case DISC_ADJ_FEM:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
-
-        break;
-
-
-    }
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-
-    /*--- Header frequency ---*/
-
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
-
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-        /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-
-          case EULER : case NAVIER_STOKES: case RANS:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-            }
-
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-                strcat(turbo_coeff, surface_coeff);
-                //
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-
-              }
-            }
-
-
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            }
-            else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-
-            /*---- Averaged stagnation pressure at an exit ----*/
-
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-            }
-
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-            }
-
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-            }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
-            }
-
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-            }
-
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-            break;
-
-          case FEM_ELASTICITY:
-
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
-
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
-            break;
-
-          case DISC_ADJ_FEM:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
-
-            break;
-
-        }
-      }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
-
-          if (!fem) {
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
-
-              }
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:       cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
-          }
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
-        }
-      }
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-
-                cout.unsetf(ios_base::floatfield);
-
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-
-        case RANS :
-
-          /*--- Write history file ---*/
-
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              HistFile << begin << direct_coeff;
-              if (thermal) HistFile << heat_coeff;
-              if (equiv_area) HistFile << equivalent_area_coeff;
-              if (engine || actuator_disk) HistFile << engine_coeff;
-              if (inv_design) {
-                HistFile << Cp_inverse_design;
-                if (thermal) HistFile << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) HistFile << rotating_frame_coeff;
-              HistFile << flow_resid << turb_resid;
-              if (weakly_coupled_heat) HistFile << heat_resid;
-            }
-            else {
-              HistFile << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-
-            if (aeroelastic) HistFile << aeroelastic_coeff;
-            if (output_per_surface) HistFile << monitoring_coeff;
-            if (output_surface) HistFile << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) HistFile << d_direct_coeff;
-            if (output_comboObj) HistFile << combo_obj;
-            HistFile << end;
-            HistFile.flush();
-          }
-
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;
-            }
-          }
-          break;
-
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << direct_coeff << heat_resid << end;
-            HistFile.flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-        case ADJ_RANS : case DISC_ADJ_RANS:
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              HistFile << adj_turb_resid;
-            HistFile << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-      }
-      cout.unsetf(ios::fixed);
-
-    }
-
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
-    delete [] residual_heat;
-
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-
-  }
 }
 
-inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
 
-inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
+inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
 
-inline bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+inline bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
 
-inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 695923e57b83..f9effa080c9a 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -39,67 +39,14 @@
 
 CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-
-    unsigned short nDim = geometry->GetnDim();
-
-    bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-
-    char buffer[50], char_histfile[200];
-
-    // Retrieve the history filename
-    string history_filename = config->GetConv_FileName();
-
-    // Append the zone ID
-    if(config->GetnZone() > 1){
-      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-    }
-    strcpy (char_histfile, history_filename.data());
-
-    // Append the restart iteration: if dynamic problem and restart
-    if (config->GetWrt_Dynamic() && config->GetRestart()) {
-      long iExtIter = config->GetDyn_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(char_histfile, buffer);
-    }
-
-    // Add the correct file extension depending on the file format
-    if ((config->GetOutput_FileFormat() == TECPLOT) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-    strcat(char_histfile, buffer);
-    SetOutputFields(config);
-
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);
-
-    /*--- Initialize number of variables ---*/
-    if (linear_analysis) nVar_FEM = nDim;
-    if (nonlinear_analysis) nVar_FEM = 3;
-
-    /*--- Allocate memory for the residual ---*/
-    residual_fem        = new su2double[nVar_FEM];
-
-    /*--- Initialize  ---*/
-    Total_VMStress = 0.0;
-    Total_ForceCoeff = 0.0;
-    Total_IncLoad = 0.0;
-    LinSolvIter = 0.0;
-    Time_Used = 0.0;
-
-    iExtIter = 0;
-    iIntIter = 0;
-  }
+  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  
+  /*--- Initialize number of variables ---*/
+  if (linear_analysis) nVar_FEM = nDim;
+  if (nonlinear_analysis) nVar_FEM = 3;
+  
+  nDim = geometry->GetnDim();
 
 }
 
@@ -179,7 +126,7 @@ void CFEAOutput::SetOutputFields(CConfig *config){
   AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Misc.
-  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
@@ -191,9 +138,9 @@ void CFEAOutput::SetOutputFields(CConfig *config){
   AddOutputField("DISP_Z", "Res_FEM[2]", FORMAT_FIXED,  "RESIDUALS");
   
   
-  AddOutputField("VMS", "VonMises_Stress", FORMAT_FIXED, "VMS");
-  AddOutputField("LOAD_INCREMENT", "Load_Increment", FORMAT_FIXED, "LOAD_INCREMENT");
-  AddOutputField("LOAD_RAMP", "Load_Ramp", FORMAT_FIXED, "LOAD_RAMP");
+  AddOutputField("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");
+  AddOutputField("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
+  AddOutputField("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "LOAD_RAMP");
   
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index b78ad9c2ecec..d3916edc1752 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -39,44 +39,7 @@
 
 CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-  SetOutputFields(config);
-  
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);
-  }
+  nDim = geometry->GetnDim();
 
 }
 
@@ -123,11 +86,10 @@ inline void CHeatOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
 
 inline void CHeatOutput::SetOutputFields(CConfig *config){
   
-  
   AddOutputField("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
   AddOutputField("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
   
-  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   AddOutputField("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 126e0201ce3f..bef4fcd60c1c 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -40,62 +40,7 @@
 
 CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-
-    nDim = geometry->GetnDim();
-
-    bool turbulent = config->GetKind_Turb_Model() != NONE;
-    
-    char buffer[50], char_histfile[200];
-
-    // Retrieve the history filename
-    string history_filename = config->GetConv_FileName();
-
-    // Append the zone ID
-    if(config->GetnZone() > 1){
-      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-    }
-    strcpy (char_histfile, history_filename.data());
-
-    // Append the restart iteration: if dynamic problem and restart
-    if (config->GetWrt_Dynamic() && config->GetRestart()) {
-      long iExtIter = config->GetDyn_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(char_histfile, buffer);
-    }
-
-    // Add the correct file extension depending on the file format
-    if ((config->GetOutput_FileFormat() == TECPLOT) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-    strcat(char_histfile, buffer);
-    SetOutputFields(config);
-
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);
-
-    /*--- Initialize number of variables ---*/
-    nVar = nDim + 2;
- 
-    ResRMS = new su2double[nVar];
-    ResMax = new su2double[nVar];
-    
-    LinSolvIter = 0;
-    Time_Used = 0.0;
-
-    iExtIter = 0;
-    iIntIter = 0;
-    
-  }
+  nDim = geometry->GetnDim();  
 
 }
 
@@ -116,8 +61,9 @@ CFlowOutput::~CFlowOutput(void) {
 inline void CFlowOutput::SetOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddOutputField("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",   FORMAT_INTEGER, "EXT_ITER");
+  AddOutputField("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   
   // Residuals
   AddOutputField("DENSITY",    "Res[Rho]",  FORMAT_FIXED,   "RESIDUALS");
@@ -127,23 +73,22 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
   
   // Aerodynamic coefficients
-  AddOutputField("DRAG",       "CD(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("LIFT",       "CL(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("SIDEFORCE",  "CSF(Total)",FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-X",  "CMx(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Y",  "CMy(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Z",  "CMz(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-X",  "CFx(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
-  AddOutputField("FORCE-Y",  "CFy(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
-  AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
+  // Aerodynamic coefficients (per surface)  
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
-  }
-  
-  // Aerodynamic coefficients (per surface)  
+  }  
   AddOutputPerSurfaceField("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
   AddOutputPerSurfaceField("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
   AddOutputPerSurfaceField("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
@@ -157,42 +102,44 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
  
   
   // Misc.
-  AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
-  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddOutputField("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
   // Surface output
-  AddOutputPerSurfaceField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
-  AddOutputPerSurfaceField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Monitoring);
- 
+  vector<string> Marker_Analyze;
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
+    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
+  }  
+  AddOutputPerSurfaceField("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   
   // Engine output
-  AddOutputField("AEROCDRAG", "AeroCDrag", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddOutputField("SOLIDCDRAG", "SolidCDrag", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddOutputField("RADIAL_DISTORTION", "Radial_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddOutputField("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
   AddOutputField("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
   
   // Rotating Frame
   AddOutputField("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddOutputField("CT", "CT", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddOutputField("CQ", "CQ", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddOutputField("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddOutputField("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
   
   //Equivalent area
-  AddOutputField("EQUIV_AREA", "CEquiv_Area", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
+  AddOutputField("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
   AddOutputField("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
-  
+
   
 }
 
@@ -200,8 +147,11 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   unsigned short iVar;
   
+  
   SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());  
+  SetOutputFieldValue("PHYS_TIME", timeused);
+  
   SetOutputFieldValue("DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(0)));
   SetOutputFieldValue("MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(1)));
   SetOutputFieldValue("MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
@@ -242,14 +192,24 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
   
   SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
   SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
-  SetOutputFieldValue("TIME", timeused);
   SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
   
-//  SetOutputFieldValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(0));
-//  SetOutputFieldValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(0));
-//  SetOutputFieldValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(0));
-//  SetOutputFieldValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(0));
-//  SetOutputFieldValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(0));
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++) {  
+    SetOutputPerSurfaceFieldValue("AVG_MASSFLOW",               config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_MACH",                   config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TEMP",                   config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_PRESS",                  config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_DENSITY",                config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_ENTHALPY",               config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_NORMALVEL",              config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("UNIFORMITY",                 config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("SECONDARY_STRENGTH",         config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("MOMENTUM_DISTORTION",        config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TOTALTEMP",              config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TOTALPRESS",             config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("PRESSURE_DROP",              config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+  }
 }
 
 inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 430e63ad8668..e9f21de13554 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -39,49 +39,9 @@
 #include "../include/output_structure.hpp"
 
 CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
- 
-  if (rank == MASTER_NODE){
-   
-    char buffer[50];
-    
-    // Retrieve the history filename
-    string history_filename = config->GetConv_FileName();
-    
-    nDim = geometry->GetnDim();
-    
-    // Append the zone ID
-    if(config->GetnZone() > 1){
-      history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-    }
-    strcpy (char_histfile, history_filename.data());
-    
-    // Append the restart iteration: if dynamic problem and restart
-    if (config->GetWrt_Unsteady() && config->GetRestart()) {
-      long iExtIter = config->GetDyn_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(char_histfile, buffer);
-    }
-    
-    // Add the correct file extension depending on the file format
-    if ((config->GetOutput_FileFormat() == TECPLOT) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-    strcat(char_histfile, buffer);
-    SetOutputFields(config);
-    // Open the history file using only the master node
-    
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);    
-  }
 
+  nDim = geometry->GetnDim();
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
@@ -101,21 +61,21 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Residuals
-  AddOutputField("PRESSURE",   "Res[P]",  FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("PRESSURE",   "Res[P]", FORMAT_FIXED,   "RESIDUALS");
   AddOutputField("VELOCITY-X", "Res[U]", FORMAT_FIXED,   "RESIDUALS");
   AddOutputField("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
   AddOutputField("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
   
   // Aerodynamic coefficients
-  AddOutputField("DRAG",       "CD(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("LIFT",       "CL(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("SIDEFORCE",  "CSF(Total)",FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-X",  "CMx(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Y",  "CMy(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Z",  "CMz(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-X",  "CFx(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
-  AddOutputField("FORCE-Y",  "CFy(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
-  AddOutputField("FORCE-Z",  "CFz(Total)", FORMAT_SCIENTIFIC,  "AERO_COEFF");
+  AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddOutputField("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
   vector<string> Marker_Monitoring;
@@ -137,29 +97,29 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
   
   
   // Misc.
-  AddOutputField("AOA",      "AoA", FORMAT_SCIENTIFIC, "AOA");
-  AddOutputField("PHYS_TIME", "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddOutputField("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
   // Surface output
   vector<string> Marker_Analyze;
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Monitoring(); iMarker_Analyze++){
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
-  }
-  AddOutputPerSurfaceField("AVG_MASSFLOW", "Avg_Massflow", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_MACH", "Avg_Mach", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TEMP", "Avg_Temp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_PRESS","Avg_Press", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_DENSITY","Avg_Density", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_ENTHALPY", "Avg_Enthalpy", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_NORMALVEL", "Avg_NormalVel", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("UNIFORMITY", "Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_STRENGTH", "Secondary_Strength", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("MOMENTUM_DISTORTION", "Momentum_Distortion", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALTEMP", "Avg_TotalTemp", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALPRESS", "Avg_TotalPress", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("PRESSURE_DROP", "Pressure_Drop", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  }  
+  AddOutputPerSurfaceField("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
 
   
 }
@@ -227,6 +187,17 @@ inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver ****
     SetOutputPerSurfaceFieldValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
     SetOutputPerSurfaceFieldValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
     SetOutputPerSurfaceFieldValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_ENTHALPY",  config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_NORMALVEL",  config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("UNIFORMITY",  config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("SECONDARY_STRENGTH",  config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("MOMENTUM_DISTORTION",  config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TOTALTEMP",  config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("AVG_TOTALPRESS",  config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetOutputPerSurfaceFieldValue("PRESSURE_DROP",  config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+    
+    
   }
   
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 33a54f966f6c..448859021332 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -46,6 +46,47 @@ COutput::COutput(CConfig *config) {
   
   HistorySep = ",";
 
+  
+  if (rank == MASTER_NODE){
+   
+    char buffer[50];
+    
+    // Retrieve the history filename
+    string history_filename = config->GetConv_FileName();
+    
+    // Append the zone ID
+    if(config->GetnZone() > 1){
+      history_filename = config->GetMultizone_HistoryFileName(history_filename, config->GetiZone());
+    }
+    strcpy (char_histfile, history_filename.data());
+    
+    // Append the restart iteration: if dynamic problem and restart
+    if (config->GetWrt_Unsteady() && config->GetRestart()) {
+      long iExtIter = config->GetDyn_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(char_histfile, buffer);
+    }
+    
+    // Add the correct file extension depending on the file format
+    if ((config->GetOutput_FileFormat() == TECPLOT) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    strcat(char_histfile, buffer);
+    SetOutputFields(config);
+    // Open the history file using only the master node
+    
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetHistoryFile_Header(config);    
+  }
+  
   unsigned short iDim, iZone, iSpan, iMarker;
   
   /*--- Initialize point and connectivity counters to zero. ---*/
@@ -4275,6 +4316,7 @@ void COutput::SetConvHistory_Body(CGeometry ****geometry,
                                      unsigned short val_iZone,
                                      unsigned short val_iInst) {
 
+
   /*--- Output using only the master node ---*/
 
   if (rank == MASTER_NODE) {
@@ -16657,7 +16699,7 @@ void COutput::SetScreen_Output(CConfig *config) {
     if (Output_Fields.count(currentField) > 0){  
       switch (Output_Fields[currentField].ScreenFormat) {
       case FORMAT_INTEGER:
-        PrintScreenInteger(out, Output_Fields[currentField].Value);
+        PrintScreenInteger(out, SU2_TYPE::Int(Output_Fields[currentField].Value));
         break;
       case FORMAT_FIXED:
         PrintScreenFixed(out, Output_Fields[currentField].Value);
@@ -16670,7 +16712,7 @@ void COutput::SetScreen_Output(CConfig *config) {
     if (OutputPerSurface_Fields.count(currentField) > 0){
       switch (OutputPerSurface_Fields[currentField][0].ScreenFormat) {
       case FORMAT_INTEGER:
-        PrintScreenInteger(out, OutputPerSurface_Fields[currentField][0].Value);
+        PrintScreenInteger(out, SU2_TYPE::Int(OutputPerSurface_Fields[currentField][0].Value));
         break;
       case FORMAT_FIXED:
         PrintScreenFixed(out, OutputPerSurface_Fields[currentField][0].Value);

From 5c1bd60f156f341aff650d66ff8bc7924a663642 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 20 Jun 2018 14:00:51 +0200
Subject: [PATCH 021/539] Added history file preprocessing and some bugfixes

---
 SU2_CFD/include/output_structure.hpp    |  1 +
 SU2_CFD/include/output_structure.inl    | 12 +++-
 SU2_CFD/src/driver_structure.cpp        |  2 +
 SU2_CFD/src/output_adjoint_discrete.cpp | 47 ++-----------
 SU2_CFD/src/output_direct_mean.cpp      |  6 +-
 SU2_CFD/src/output_direct_mean_inc.cpp  |  4 +-
 SU2_CFD/src/output_structure.cpp        | 88 +++++++++++++------------
 7 files changed, 71 insertions(+), 89 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index b5e970697b6f..3fe1717ec872 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -968,6 +968,7 @@ class COutput {
   
   void SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker);
   
+  void Preprocess_Historyfile(CConfig *config);  
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index ea7c3951cfa7..b65daafe4a66 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -103,9 +103,17 @@ inline void COutput::AddOutputPerSurfaceField(string name, string field_name, un
 }
 
 inline void COutput::SetOutputFieldValue(string name, su2double value){
-  Output_Fields[name].Value = value;
+  if (Output_Fields.count(name) > 0){
+    Output_Fields[name].Value = value;
+  } else {
+    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+  }
 }
 
 inline void COutput::SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker){
-  OutputPerSurface_Fields[name][iMarker].Value = value;
+  if (OutputPerSurface_Fields.count(name) > 0){
+    OutputPerSurface_Fields[name][iMarker].Value = value;
+  } else {
+    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+  }
 }
\ No newline at end of file
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 99a9b37b8de7..be51390929b8 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3004,6 +3004,8 @@ void CDriver::Output_Preprocessing(){
       output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
     }
+    
+    output[iZone]->Preprocess_Historyfile(config_container[iZone]);
 
   }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index c343bcd6bcfc..feaf0364b465 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -38,46 +38,9 @@
 #include "../include/output_structure.hpp"
 
 CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-  SetOutputFields(config);
-
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);
-  }
-
+  
+  nDim = geometry->GetnDim();
+ 
 }
 
 CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
@@ -134,7 +97,9 @@ inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver
 
 }
 
-inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
+inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+  return true;
+}
 
 inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index bef4fcd60c1c..ae49c9aebe69 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -120,7 +120,7 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputPerSurfaceField("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   AddOutputPerSurfaceField("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   AddOutputPerSurfaceField("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_OVER_UNFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddOutputPerSurfaceField("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   AddOutputPerSurfaceField("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   AddOutputPerSurfaceField("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   AddOutputPerSurfaceField("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
@@ -212,7 +212,9 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
   }
 }
 
-inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
+inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ return true;
+}
 
 inline bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header;
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index e9f21de13554..c2c5a3f52ae0 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -123,7 +123,9 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
 
   
 }
-inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
+inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+  return true;
+}
 
 inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header;
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 448859021332..84dbc172f718 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -43,50 +43,7 @@ COutput::COutput(CConfig *config) {
   size = SU2_MPI::GetSize();
   
   field_width = 12;
-  
-  HistorySep = ",";
 
-  
-  if (rank == MASTER_NODE){
-   
-    char buffer[50];
-    
-    // Retrieve the history filename
-    string history_filename = config->GetConv_FileName();
-    
-    // Append the zone ID
-    if(config->GetnZone() > 1){
-      history_filename = config->GetMultizone_HistoryFileName(history_filename, config->GetiZone());
-    }
-    strcpy (char_histfile, history_filename.data());
-    
-    // Append the restart iteration: if dynamic problem and restart
-    if (config->GetWrt_Unsteady() && config->GetRestart()) {
-      long iExtIter = config->GetDyn_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(char_histfile, buffer);
-    }
-    
-    // Add the correct file extension depending on the file format
-    if ((config->GetOutput_FileFormat() == TECPLOT) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-    strcat(char_histfile, buffer);
-    SetOutputFields(config);
-    // Open the history file using only the master node
-    
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetHistoryFile_Header(config);    
-  }
-  
   unsigned short iDim, iZone, iSpan, iMarker;
   
   /*--- Initialize point and connectivity counters to zero. ---*/
@@ -16729,3 +16686,48 @@ void COutput::SetScreen_Output(CConfig *config) {
   cout << endl;
 }
 
+void COutput::Preprocess_Historyfile(CConfig *config){
+  
+  if (rank == MASTER_NODE){
+   
+    HistorySep = ",";
+      
+    char buffer[50];
+    
+    // Retrieve the history filename
+    string history_filename = config->GetConv_FileName();
+    
+    // Append the zone ID
+    if(config->GetnZone() > 1){
+      history_filename = config->GetMultizone_HistoryFileName(history_filename, config->GetiZone());
+    }
+    strcpy (char_histfile, history_filename.data());
+    
+    // Append the restart iteration: if dynamic problem and restart
+    if (config->GetWrt_Unsteady() && config->GetRestart()) {
+      long iExtIter = config->GetDyn_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(char_histfile, buffer);
+    }
+    
+    // Add the correct file extension depending on the file format
+    if ((config->GetOutput_FileFormat() == TECPLOT) ||
+        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    strcat(char_histfile, buffer);
+    SetOutputFields(config);
+    // Open the history file using only the master node
+    
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    SetHistoryFile_Header(config);    
+  }
+  
+}

From 3d3735ffdae5a7fcc09260bae66193f3c1be4f21 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 25 Jun 2018 10:14:30 +0200
Subject: [PATCH 022/539] Added turbulent output to flow and flow_inc solver

---
 SU2_CFD/include/output_structure.hpp   |  3 +++
 SU2_CFD/src/output_direct_mean.cpp     | 23 +++++++++++++++++++++++
 SU2_CFD/src/output_direct_mean_inc.cpp | 22 ++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 3fe1717ec872..df5d4418cdc6 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -999,6 +999,7 @@ class CFlowOutput : public COutput {
   
   unsigned long LinSolvIter, iExtIter, iIntIter;
 
+  unsigned short turb_model;
 
 public:
 
@@ -1053,6 +1054,8 @@ class CIncFlowOutput : public COutput {
   char char_histfile[200];
 
   unsigned short nDim;
+  unsigned short turb_model;
+ 
 public:
 
   /*!
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index ae49c9aebe69..d4a00b22a354 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -41,6 +41,8 @@
 CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   nDim = geometry->GetnDim();  
+  
+  turb_model = config->GetKind_Turb_Model();
 
 }
 
@@ -72,6 +74,16 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
   AddOutputField("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
   
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddOutputField("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+    break;  
+  case SST:
+    AddOutputField("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
+    AddOutputField("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
+    break;
+  }
+  
   // Aerodynamic coefficients
   AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
@@ -161,6 +173,17 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
     SetOutputFieldValue("MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
     SetOutputFieldValue("ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(4)));
   }
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetOutputFieldValue("NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetOutputFieldValue("KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
+    break;
+  }
+  
   SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
   SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
   if (nDim == 3)
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index c2c5a3f52ae0..94e0f47d7a1f 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -42,6 +42,8 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
 
   nDim = geometry->GetnDim();
   
+  turb_model = config->GetKind_Turb_Model();
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
@@ -66,6 +68,16 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
   AddOutputField("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
   
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddOutputField("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+    break;  
+  case SST:
+    AddOutputField("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
+    AddOutputField("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
+    break;
+  }
+  
   // Aerodynamic coefficients
   AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
@@ -148,6 +160,16 @@ inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver ****
   SetOutputFieldValue("VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
   if (nDim == 3) SetOutputFieldValue("VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetOutputFieldValue("NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetOutputFieldValue("KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
+    break;
+  }
+  
   SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
   SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
   if (nDim == 3)

From e6a455e14dcebd3a66ba0ce43ccae1b89cafbf54 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 25 Jun 2018 14:33:14 +0200
Subject: [PATCH 023/539] Fixed after merge problem

---
 SU2_CFD/src/driver_structure.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 26122ce5b29f..64016d74783c 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -548,8 +548,8 @@ CDriver::CDriver(char* confFile,
   MDOFs              = 0.0;
   MDOFsDomain        = 0.0;
   for (iZone = 0; iZone < nZone; iZone++) {
-    MDOFs       += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][iInst][MESH_0]->GetGlobal_nPoint()/(1.0e6);
-    MDOFsDomain += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][iInst][MESH_0]->GetGlobal_nPointDomain()/(1.0e6);
+    MDOFs       += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPoint()/(1.0e6);
+    MDOFsDomain += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPointDomain()/(1.0e6);
   }
 
   /*--- Reset timer for compute/output performance benchmarking. ---*/

From 3434987718bd5f87a9b735405e8aa1674e1b4365 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 2 Jul 2018 10:43:06 +0200
Subject: [PATCH 024/539] Further changes to screen/history output

---
 SU2_CFD/include/output_structure.hpp     |   55 +-
 SU2_CFD/src/output_adjoint_discrete.cpp  |   23 +-
 SU2_CFD/src/output_adjoint_mean.cpp      | 1167 ++--------------------
 SU2_CFD/src/output_direct_elasticity.cpp |    1 -
 SU2_CFD/src/output_direct_heat.cpp       |    2 +-
 SU2_CFD/src/output_direct_mean.cpp       |    6 +-
 SU2_CFD/src/output_direct_mean_inc.cpp   |   28 +-
 7 files changed, 128 insertions(+), 1154 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 63aae20b7167..a93c8c88c5af 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1016,26 +1016,8 @@ class COutput {
  */
 class CFlowOutput : public COutput {
 private:
-
-
   
   unsigned short nVar, nDim;
-  
-  su2double *ResRMS,
-            *ResMax,
-            CD_Total,
-            CL_Total,
-            CMx_Total,
-            CMy_Total,
-            CMz_Total,
-            AoA,
-            CFx_Total,
-            CFy_Total,
-            CFz_Total,
-            CEff_Total,
-            Time_Used;
-  
-  unsigned long LinSolvIter, iExtIter, iIntIter;
 
   unsigned short turb_model;
 
@@ -1093,6 +1075,7 @@ class CIncFlowOutput : public COutput {
 
   unsigned short nDim;
   unsigned short turb_model;
+  bool heat, weakly_coupled_heat;
  
 public:
 
@@ -1147,16 +1130,8 @@ class CFEAOutput : public COutput {
 
 protected:
 
-  su2double *residual_fem;
   unsigned short nVar_FEM;
 
-  su2double Total_VMStress;
-  su2double Total_ForceCoeff;
-  su2double Total_IncLoad;
-  su2double Time_Used;
-  unsigned long LinSolvIter;
-  unsigned long iExtIter, iIntIter;
-
 public:
 
   /*!
@@ -1264,7 +1239,7 @@ class CHeatOutput : public COutput {
 class CAdjFlowOutput : public COutput {
 private:
 
-  char char_histfile[200];
+  unsigned short nDim, turb_model;
 
 public:
 
@@ -1281,33 +1256,14 @@ class CAdjFlowOutput : public COutput {
    */
   virtual ~CAdjFlowOutput(void);
 
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
   void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  void SetOutputFields(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
@@ -1338,7 +1294,8 @@ class CAdjFlowOutput : public COutput {
 class CDiscAdjFlowOutput : public COutput {
 private:
 
-
+  unsigned short nDim, turb_model;
+  
 public:
 
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index feaf0364b465..085c3ce9023f 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -41,6 +41,8 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   
   nDim = geometry->GetnDim();
  
+  turb_model = config->GetKind_Turb_Model();
+  
 }
 
 CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
@@ -62,7 +64,16 @@ void CDiscAdjFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
   AddOutputField("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
   AddOutputField("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
-  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddOutputField("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
+    break;  
+  case SST:
+    AddOutputField("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
+    AddOutputField("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
+    break;
+  default: break;
+  }
   AddOutputField("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
   AddOutputField("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
   AddOutputField("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
@@ -88,6 +99,16 @@ inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver
   } else {
     SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
   }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetOutputFieldValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetOutputFieldValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    break;
+  default: break;
+  }
   SetOutputFieldValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
   SetOutputFieldValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
   SetOutputFieldValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 4525e0e94a21..893bb8ee5054 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -39,44 +39,10 @@
 
 CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
-  }
-
+  nDim = geometry->GetnDim();
+  
+  turb_model = config->GetKind_Turb_Model();
+ 
 }
 
 CAdjFlowOutput::~CAdjFlowOutput(void) {
@@ -87,1071 +53,78 @@ CAdjFlowOutput::~CAdjFlowOutput(void) {
 
 }
 
-void CAdjFlowOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-
-  /*--- Begin of the header ---*/
-
-  char begin[]= "\"Iteration\"";
-
-  /*--- Header for the coefficients ---*/
-
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char engine_coeff[]= ",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-
-  /*--- Find the markers being monitored and create a header for them ---*/
-
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
 
-  /*--- Header for the residuals ---*/
-
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:     SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:     SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-
-  /*--- End of the header ---*/
-
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+inline bool CAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+  return true;
+}
 
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
+inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
+
+inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
+
+
+void CAdjFlowOutput::SetOutputFields(CConfig *config){
+
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  AddOutputField("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddOutputField("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
+    break;  
+  case SST:
+    AddOutputField("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
+    AddOutputField("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
+    break;
+  default: break;
   }
+  AddOutputField("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddOutputField("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  
+  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  
+}
 
-  /*--- Write the header, case depending ---*/
-
-  if (!turbo) {
-    if (compressible) {
-      HistFile << begin << adj_coeff << adj_flow_resid;
-    }
-    if (incompressible) {
-      HistFile << begin << adj_inc_coeff << adj_flow_resid;
-    }
+inline void CAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  
+  SetOutputFieldValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetOutputFieldValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetOutputFieldValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+    SetOutputFieldValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+  } else {
+    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
   }
-  else HistFile << begin << adj_turbo_coeff << adj_flow_resid;
-  if ((turbulent) && (!frozen_visc)) HistFile << adj_turb_resid;
-  HistFile << end;
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetOutputFieldValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetOutputFieldValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetOutputFieldValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    break;
+  default: break;
   }
+  SetOutputFieldValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
+  SetOutputFieldValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
+  SetOutputFieldValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
+  SetOutputFieldValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
+  SetOutputFieldValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetOutputFieldValue("PHYS_TIME", timeused);
 
 }
 
-
-void CAdjFlowOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0, Total_CHeat = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Avg_TotalTemp = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_Density = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0;
-
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch  = NULL,
-    *Surface_CL         = NULL,
-    *Surface_CD         = NULL,
-    *Surface_CSF        = NULL,
-    *Surface_CEff       = NULL,
-    *Surface_CFx        = NULL,
-    *Surface_CFy        = NULL,
-    *Surface_CFz        = NULL,
-    *Surface_CMx        = NULL,
-    *Surface_CMy        = NULL,
-    *Surface_CMz        = NULL;
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0,
-    nVar_FEM = 0;
-
-    /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-    /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-
-    /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
-
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Write information from nodes ---*/
-
-    /*--- Flow solution coefficients ---*/
-
-    Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-    Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-    Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-    if (thermal) {
-      Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-      Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-      Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-      if(weakly_coupled_heat) {
-        Total_Heat     = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Avg_TotalTemp  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-      }
-    }
-
-    if (equiv_area) {
-      Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-      Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-
-      Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-      Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-    }
-
-    if (engine || actuator_disk) {
-      Total_AeroCD  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-      Total_SolidCD = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-      Total_IDR     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-      Total_IDC     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-    }
-
-    if (rotating_frame) {
-      Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-      Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-      Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-    }
-
-    if (aeroelastic) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-        aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-      }
-    }
-
-    if (output_per_surface) {
-      /*--- Look over the markers being monitored and get the desired values ---*/
-      for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-        Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-        Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-        Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-        Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-        Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-        Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-        Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-        Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-        Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-        Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-      }
-    }
-
-    /*--- Get flux-averaged values at the specified surface ---*/
-
-    if (output_surface) {
-
-      unsigned short iMarker_Analyze = 0;
-      Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-      Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-      Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-      Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-      Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-      Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-      Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-      Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-      Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-      Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-      Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-      Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-      Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-      Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-    }
-
-    /*--- Flow Residuals ---*/
-
-    for (iVar = 0; iVar < nVar_Flow; iVar++)
-      residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-
-    /*--- Turbulent residual ---*/
-
-    if (turbulent) {
-      for (iVar = 0; iVar < nVar_Turb; iVar++)
-        residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-    }
-
-    if (weakly_coupled_heat) {
-      for (iVar = 0; iVar < nVar_Heat; iVar++) {
-        residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-      }
-
-    }
-
-    /*--- Transition residual ---*/
-
-    if (transition) {
-      for (iVar = 0; iVar < nVar_Trans; iVar++)
-        residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-    }
-
-    /*--- Iterations of the linear solver ---*/
-
-    LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-
-    /*--- Adjoint solver ---*/
-
-    /*--- Adjoint solution coefficients ---*/
-
-    Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-    Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-    Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-    Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-    Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-    Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-    Total_Sens_Density   = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Density();
-    Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-    /*--- Adjoint flow residuals ---*/
-
-    for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-      residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-    }
-
-    /*--- Adjoint turbulent residuals ---*/
-
-    if (turbulent) {
-      if (!frozen_visc) {
-        for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-          residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-      }
-    }
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-
-    /*--- Header frequency ---*/
-
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-
-
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-
-    if (((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) {
-
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-
-        /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER : case NAVIER_STOKES: case RANS:
-        case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-        case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-
-          /*--- Direct coefficients ---*/
-          SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-              Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-              Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-          if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Avg_TotalTemp);
-          if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-          if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-          if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-          if (inv_design) {
-            SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-            if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-          }
-
-          if (direct_diff != NO_DERIVATIVE) {
-            if (!turbo)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-            else
-              SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                  D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-            if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-            if (thermal)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                  D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                  D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-          }
-
-          if (aeroelastic) {
-            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-              //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-              if (iMarker_Monitoring == 0) {
-                SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-              }
-              else {
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-              SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-              strcat(aeroelastic_coeff, surface_coeff);
-            }
-          }
-
-          if (output_per_surface) {
-            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-              //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-              if (iMarker_Monitoring == 0) {
-                SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-              }
-              else {
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-              }
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-              strcat(monitoring_coeff, surface_coeff);
-            }
-          }
-
-          if (turbo){
-            for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-              if (iMarker_Monitoring == 0){
-                SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-              }else{
-                SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                strcat(turbo_coeff, surface_coeff);
-              }
-              SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-              strcat(turbo_coeff, surface_coeff);
-              //
-              SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-              SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-              strcat(turbo_coeff, surface_coeff);
-
-            }
-          }
-
-
-          /*--- Flow residual ---*/
-          if (nDim == 2) {
-            if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-          }
-          else {
-            if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-            if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-          }
-
-          /*--- Turbulent residual ---*/
-          if (turbulent) {
-            switch(nVar_Turb) {
-            case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-            case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-            }
-          }
-
-          /*---- Averaged stagnation pressure at an exit ----*/
-
-          if (output_surface) {
-            SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-          }
-
-          /*--- Transition residual ---*/
-          if (transition) {
-            SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-          }
-
-          /*--- Combo objective ---*/
-          if (output_comboObj) {
-            SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-          }
-
-          /*--- Adjoint coefficients ---*/
-          if (!turbo) {
-            if (compressible) {
-              SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-            }
-            if (incompressible) {
-              SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-            }
-          } else
-            SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-          /*--- Adjoint flow residuals ---*/
-          if (nDim == 2) {
-            if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-            if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-          }
-          else {
-            if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-            if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-          }
-
-          /*--- Adjoint turbulent residuals ---*/
-          if (turbulent)
-            if (!frozen_visc) {
-              if (nVar_AdjTurb == 1) {
-                SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-              } else if (nVar_AdjTurb > 1) {
-                SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-              }
-            }
-
-          if (weakly_coupled_heat) {
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-          }
-
-          break;
-
-        }
-      }
-      if ((val_iZone == 0 && val_iInst == 0)){
-        /*--- Write the screen header---*/
-        if (((write_heads) && !(!DualTime_Iteration && Unsteady))){
-
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                  if (nZone > 1)
-                    cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS :
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << "      Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-          }
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-
-      if ((val_iZone == 0 && val_iInst == 0)){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-      }
-
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-        case ADJ_RANS :
-
-          if (!DualTime_Iteration) {
-            HistFile << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              HistFile << adj_turb_resid;
-            HistFile << end;
-            HistFile.flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-
-      }
-      cout.unsetf(ios::fixed);
-
-    }
-
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
-    delete [] residual_heat;
-
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-
-  }
-}
-
-inline bool CAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
-
-inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) { }
-
-inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
-
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index f9effa080c9a..6a5069fad200 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -55,7 +55,6 @@ CFEAOutput::~CFEAOutput(void) {
   if (rank == MASTER_NODE){
     HistFile.close();
 
-    if (residual_fem != NULL) delete [] residual_fem;
   }
 
 }
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index d3916edc1752..df42a38b460f 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -78,7 +78,7 @@ inline void CHeatOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
   SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_AvgTemperature());
   SetOutputFieldValue("HEAT", log10(solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetRes_RMS(0)));
   
-  SetOutputFieldValue("TIME", timeused);
+  SetOutputFieldValue("PHYS_TIME", timeused);
   SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetIterLinSolver());
   
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index d4a00b22a354..1ed8693f6e7f 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -50,9 +50,7 @@ CFlowOutput::~CFlowOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
-    
-    delete [] ResRMS;
-    delete [] ResMax;
+
   }
 
 
@@ -82,6 +80,7 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
     AddOutputField("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
     AddOutputField("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
     break;
+  default: break;
   }
   
   // Aerodynamic coefficients
@@ -182,6 +181,7 @@ inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****so
     SetOutputFieldValue("KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
     SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
     break;
+  default: break;
   }
   
   SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 94e0f47d7a1f..97983ec7274a 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -44,6 +44,10 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   
   turb_model = config->GetKind_Turb_Model();
   
+  heat = config->GetEnergy_Equation();
+  
+  weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
@@ -78,6 +82,13 @@ void CIncFlowOutput::SetOutputFields(CConfig *config){
     break;
   }
   
+  if (heat || weakly_coupled_heat){
+    AddOutputField("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
+    AddOutputField("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
+    AddOutputField("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
+    AddOutputField("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
+  }
+  
   // Aerodynamic coefficients
   AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
@@ -169,7 +180,20 @@ inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver ****
     SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
     break;
   }
-  
+  if (weakly_coupled_heat){
+    SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_HeatFlux());
+    SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_MaxHeatFlux());
+    SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_AvgTemperature());
+    SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetRes_RMS(0)));
+  }
+  if (heat){
+    SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_HeatFlux());
+    SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_MaxHeatFlux());
+    SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_AvgTemperature());
+    if (nDim == 3) SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(4)));
+    else           SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+
+  }
   SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
   SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
   if (nDim == 3)
@@ -185,7 +209,7 @@ inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver ****
   
   SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
   SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
-  SetOutputFieldValue("TIME", timeused);
+  SetOutputFieldValue("PHYS_TIME", timeused);
   SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
   
   

From 56c56f1d562ceaedf7bdf473bb9ed7422fe87afe Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 3 Jul 2018 17:16:10 +0200
Subject: [PATCH 025/539] Added new output for disc adj fea.

---
 SU2_CFD/include/output_structure.hpp      |  23 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp | 263 +++++-----------------
 SU2_CFD/src/output_direct_heat.cpp        |   1 -
 SU2_CFD/src/solver_direct_mean.cpp        |   2 +-
 4 files changed, 58 insertions(+), 231 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index a93c8c88c5af..b89859b1bcda 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1348,7 +1348,7 @@ class CDiscAdjFlowOutput : public COutput {
  */
 class CDiscAdjFEAOutput : public COutput {
 private:
-
+  unsigned short nVar_FEM, nDim;
   char char_histfile[200];
 
 public:
@@ -1366,26 +1366,7 @@ class CDiscAdjFEAOutput : public COutput {
    */
   virtual ~CDiscAdjFEAOutput(void);
 
-  /*!
-   * \brief Write the header of the history file.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void SetOutputFields(CConfig *config);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index e4b30ecaf3c3..cd393a6ee0cf 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -38,44 +38,15 @@
 #include "../include/output_structure.hpp"
 
 CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  char buffer[50];
-
-  // Retrieve the history filename
-  string history_filename = config->GetConv_FileName();
-
-  // Append the zone ID
-  if(config->GetnZone() > 1){
-    history_filename = config->GetMultizone_HistoryFileName(history_filename, val_iZone);
-  }
-  strcpy (char_histfile, history_filename.data());
-
-  // Append the restart iteration: if dynamic problem and restart
-  if (config->GetWrt_Dynamic() && config->GetRestart()) {
-    long iExtIter = config->GetDyn_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(char_histfile, buffer);
-  }
-
-  // Add the correct file extension depending on the file format
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
-
-  // Open the history file using only the master node
-  if (rank == MASTER_NODE){
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    SetConvHistory_Header(config, val_iZone, INST_0);
-  }
+ 
+  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  
+  /*--- Initialize number of variables ---*/
+  if (linear_analysis) nVar_FEM = nDim;
+  if (nonlinear_analysis) nVar_FEM = 3;
+  
+  nDim = geometry->GetnDim();
 
 }
 
@@ -88,185 +59,61 @@ CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
 
 }
 
-void CDiscAdjFEAOutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
 
-  /*--- Begin of the header ---*/
-  char begin[]= "\"Iteration\"";
+inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { return true; }
 
-  /*--- Header for the coefficients ---*/
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
+inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { return true; }
 
-  /*--- Header for the residuals ---*/
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+void CDiscAdjFEAOutput::SetOutputFields(CConfig *config){
+  
+  // Iteration numbers
+  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  // Residuals
+  AddOutputField("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddOutputField("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS");
+  
+  //Sensitivities
+  AddOutputField("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY");
+  AddOutputField("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY");
 
-  /*--- End of the header ---*/
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+  
+}
 
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
+inline void CDiscAdjFEAOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+  
+  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  
+  SetOutputFieldValue("PHYS_TIME", timeused);
+  
+  SetOutputFieldValue("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
+  SetOutputFieldValue("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
+  if (nVar_FEM == 3){
+    SetOutputFieldValue("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
   }
-
-  /*--- Write the header, case depending ---*/
-  HistFile << begin << fem_coeff;
-  HistFile << fem_resid << endfea;
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  su2double Total_SensE = 0.0; su2double Total_SensNu = 0.0;  
+  if (config[val_iZone]->GetnElasticityMod() == 1){
+    Total_SensE = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+    Total_SensNu = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
   }
-
-}
-
-
-void CDiscAdjFEAOutput::SetConvHistory_Body(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
-
-
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-
-    su2double timeiter = timeused/su2double(iExtIter+1);
-
-    unsigned short iVar;
-    unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
-
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_FEM = nDim;
-
-    /*--- Allocate memory for the residual ---*/
-    su2double *residual_fem          = NULL;
-    residual_fem        = new su2double[nVar_FEM];
-
-    /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-    su2double Total_CFEM = solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA();
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    /*--- Residuals: ---*/
-    /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-    /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-
-    for (iVar = 0; iVar < nVar_FEM; iVar++) {
-      residual_fem[iVar] = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(iVar);
+  else{
+    for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+        Total_SensE += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+            *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+        Total_SensNu += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+            *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
     }
-
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    // Load data to buffers
-    char begin_fem[1000], fem_coeff[1000], fem_resid[1000], end_fem[1000];
-
-    SPRINTF (begin_fem, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-
-    /*--- Initial variables ---*/
-
-    /*--- FEM residual ---*/
-    if (nVar_FEM == 2)
-      SPRINTF (fem_resid, ", %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]));
-    else
-      SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-
-    // Write to history file
-
-    HistFile << begin_fem << fem_resid << end_fem;
-    HistFile.flush();
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    bool write_header = (iIntIter == 0);
-
-    if (write_header) {
-
-      cout << endl << " IntIter" << " ExtIter";
-
-      if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-      if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-    }
-
-    /*------------------------------------------------------------------------------------------------------*/
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    /*------------------------------------------------------------------------------------------------------*/
-
-    cout.precision(6);
-    cout.setf(ios::fixed, ios::floatfield);
-
-    cout.width(15); cout << log10(residual_fem[0]);
-    cout.width(15); cout << log10(residual_fem[1]);
-    if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-    cout.precision(4);
-    cout.setf(ios::scientific, ios::floatfield);
-
-
-    if (config[val_iZone]->GetnElasticityMod() == 1){
-      cout.width(14); cout << solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-      cout.width(14); cout << solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-    }
-    else{
-      Total_SensE = 0.0; Total_SensNu = 0.0;
-      for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-          Total_SensE += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-              *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-          Total_SensNu += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-              *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-      }
-      Total_SensE = sqrt(Total_SensE);
-      Total_SensNu = sqrt(Total_SensNu);
-      cout.width(14); cout << Total_SensE;
-      cout.width(14); cout << Total_SensNu;
-    }
-
-    cout << endl;
-
-    cout.unsetf(ios::fixed);
-
-
-    delete [] residual_fem;
+    Total_SensE = sqrt(Total_SensE);
+    Total_SensNu = sqrt(Total_SensNu);
 
   }
+  SetOutputFieldValue("SENS_E", Total_SensE);
+  SetOutputFieldValue("SENS_NU", Total_SensNu);
+  
 }
 
-inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
-
-inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { }
-
-inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
-
-inline void CDiscAdjFEAOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
-
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index df42a38b460f..15377afa34e2 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -52,7 +52,6 @@ CHeatOutput::~CHeatOutput(void) {
 }
 
 
-
 inline bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) {
   return true;
 }
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 79d531c12f1d..ded957b81c66 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -16659,7 +16659,7 @@ void CNSSolver::Friction_Forces(CGeometry *geometry, CConfig *config) {
         }
         
       }
-      
+       
       /*--- Project forces and store the non-dimensional coefficients ---*/
       
       if (Monitoring == YES) {

From 462e787cc876e250d7f8bb10016371a402fc1e67 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Jul 2018 11:03:43 +0200
Subject: [PATCH 026/539] Changed some header names

---
 SU2_CFD/src/output_direct_elasticity.cpp | 12 ++++++------
 SU2_CFD/src/output_direct_heat.cpp       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 6a5069fad200..e5a8050b898a 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -129,12 +129,12 @@ void CFEAOutput::SetOutputFields(CConfig *config){
   AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
-  AddOutputField("UTOL",   "Res_FEM[0]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("RTOL",   "Res_FEM[1]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("ETOL",   "Res_FEM[2]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_X", "Res_FEM[0]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_Y", "Res_FEM[1]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_Z", "Res_FEM[2]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("UTOL",   "Res[U]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("RTOL",   "Res[R]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("ETOL",   "Res[E]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_X", "Res[DispX]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_Y", "Res[DispY]", FORMAT_FIXED,  "RESIDUALS");
+  AddOutputField("DISP_Z", "Res[DispZ]", FORMAT_FIXED,  "RESIDUALS");
   
   
   AddOutputField("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 15377afa34e2..d4514fc16f40 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -95,6 +95,6 @@ inline void CHeatOutput::SetOutputFields(CConfig *config){
   AddOutputField("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
   AddOutputField("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
   
-  AddOutputField("HEAT", "Res[Heat]", FORMAT_FIXED, "RESIDUALS");
+  AddOutputField("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
   
 }

From c465b4c70a886d35ee8fa66218830b0e73d33729 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 10 Jul 2018 23:47:56 +0200
Subject: [PATCH 027/539] Added preliminary volume field output

---
 SU2_CFD/include/output_structure.hpp      | 61 ++++++++++-----
 SU2_CFD/include/output_structure.inl      | 20 ++++-
 SU2_CFD/src/driver_structure.cpp          |  4 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |  2 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp |  2 +-
 SU2_CFD/src/output_adjoint_mean.cpp       |  2 +-
 SU2_CFD/src/output_direct_elasticity.cpp  |  2 +-
 SU2_CFD/src/output_direct_heat.cpp        |  2 +-
 SU2_CFD/src/output_direct_mean.cpp        | 26 ++++++-
 SU2_CFD/src/output_direct_mean_inc.cpp    |  2 +-
 SU2_CFD/src/output_structure.cpp          | 92 +++++++++++++++++------
 11 files changed, 161 insertions(+), 54 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index b89859b1bcda..f0f9d919c7d4 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -125,6 +125,7 @@ class COutput {
   su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
   su2double **Parallel_Surf_Data;   // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
   vector<string> Variable_Names;
+  int* Local_Halo;
 
   su2double **Data;
   unsigned short nVar_Consv, nVar_Total, nVar_Extra, nZones;
@@ -201,6 +202,8 @@ class COutput {
 
   unsigned short nDim;
   
+  unsigned short GlobalField_Counter;
+  
   // TODO: COMMENT NEW STUFF
   unsigned short field_width;
   string HistorySep;
@@ -220,19 +223,29 @@ class COutput {
     FORMAT_SCIENTIFIC
   };
   
-  struct OutputField {
+  struct HistoryOutputField {
     string              FieldName;
     su2double           Value;
-    unsigned short  ScreenFormat;
-    string HistoryOutputGroup;
-    OutputField() {}
-    OutputField(string fieldname, unsigned short screenformat, string historyoutputgroup):
+    unsigned short      ScreenFormat;
+    string              HistoryOutputGroup;
+    HistoryOutputField() {}
+    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup):
       FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), HistoryOutputGroup(historyoutputgroup){}
   };
   
-  std::map<string, OutputField > Output_Fields;
-  std::map<string, vector<OutputField> > OutputPerSurface_Fields;
-
+  struct VolumeOutputField {
+    string FieldName;
+    int    Offset;
+    int    nVar;
+    string VolumeOutputGroup;
+    VolumeOutputField () {}
+    VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
+      FieldName(fieldname), Offset(offset), VolumeOutputGroup(volumeoutputgroup){}
+  };
+  
+  std::map<string, HistoryOutputField >         Output_Fields;
+  std::map<string, vector<HistoryOutputField> > OutputPerSurface_Fields;
+  std::map<string, VolumeOutputField >          VolumeOutput_Fields;
   
   char char_histfile[200];
 
@@ -935,7 +948,7 @@ class COutput {
    * \brief Load the output data to the containers in each subclass
    * \param[in] config - Definition of the particular problem.
    */
-  virtual void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  virtual void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
   virtual void SetOutputFields(CConfig *config);
@@ -1006,7 +1019,19 @@ class COutput {
   
   void SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker);
   
-  void Preprocess_Historyfile(CConfig *config);  
+  void PreprocessHistoryOutput(CConfig *config);  
+  
+  void PreprocessVolumeOutput(CConfig *config, CGeometry *geometry);  
+  
+  void AddVolumeOutputField(string name, string field_name, string groupname);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);   
+  
+  void SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value);
+  
+  void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
+  
+  
 };
 
 /*! \class CFlowOutput
@@ -1038,9 +1063,11 @@ class CFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);  
+  
   void SetOutputFields(CConfig *config);
   
   /*!
@@ -1094,7 +1121,7 @@ class CIncFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
   void SetOutputFields(CConfig *config);
@@ -1149,7 +1176,7 @@ class CFEAOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
   void SetOutputFields(CConfig *config);
@@ -1203,7 +1230,7 @@ class CHeatOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 
@@ -1260,7 +1287,7 @@ class CAdjFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
   void SetOutputFields(CConfig *config);
@@ -1314,7 +1341,7 @@ class CDiscAdjFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 
@@ -1372,7 +1399,7 @@ class CDiscAdjFEAOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
   /*!
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index e75cf1aa3f1b..3617d56c1c55 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -36,6 +36,7 @@
  */
 
 #pragma once
+#include "output_structure.hpp"
 
 inline su2double COutput::GetEntropyGen(unsigned short iMarkerTP, unsigned short iSpan) { return EntropyGen[iMarkerTP][iSpan]; }
 
@@ -55,7 +56,7 @@ inline bool COutput::WriteScreen_Header(CConfig *config) { }
 
 inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
 
-inline void COutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void COutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
 inline void COutput::PrintScreenFixed(stringstream& stream, su2double val) {
@@ -93,12 +94,12 @@ inline void COutput::PrintHistorySep(stringstream& stream){
 }
 
 inline void COutput::AddOutputField(string name, string field_name, unsigned short format, string groupname ){
-  Output_Fields[name] = OutputField(field_name, format, groupname);
+  Output_Fields[name] = HistoryOutputField(field_name, format, groupname);
 }
 
 inline void COutput::AddOutputPerSurfaceField(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
   for (unsigned short i = 0; i < marker_names.size(); i++){
-    OutputPerSurface_Fields[name].push_back(OutputField(field_name+"("+marker_names[i]+")", format, groupname));
+    OutputPerSurface_Fields[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
   }
 }
 
@@ -116,4 +117,15 @@ inline void COutput::SetOutputPerSurfaceFieldValue(string name, su2double value,
   } else {
     SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
   }
-}
\ No newline at end of file
+}
+
+inline void COutput::AddVolumeOutputField(string name, string field_name, string groupname){
+  VolumeOutput_Fields[name] = VolumeOutputField(field_name, GlobalField_Counter, groupname);
+  GlobalField_Counter++;
+}
+
+inline void COutput::SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value){
+  Local_Data[iPoint][VolumeOutput_Fields[name].Offset] = value;
+}
+inline void COutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) {}
+
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 204204e404d3..eb2497fca580 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3217,7 +3217,9 @@ void CDriver::Output_Preprocessing(){
       break;
     }
     
-    output[iZone]->Preprocess_Historyfile(config_container[iZone]);
+    output[iZone]->PreprocessHistoryOutput(config_container[iZone]);
+    
+    output[iZone]->PreprocessVolumeOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0]);
 
   }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 085c3ce9023f..b20afb7a8708 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -84,7 +84,7 @@ void CDiscAdjFlowOutput::SetOutputFields(CConfig *config){
   
 }
 
-inline void CDiscAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
 
   SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index cd393a6ee0cf..942444d77527 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -83,7 +83,7 @@ void CDiscAdjFEAOutput::SetOutputFields(CConfig *config){
   
 }
 
-inline void CDiscAdjFEAOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
   SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 893bb8ee5054..8217a680fff2 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -94,7 +94,7 @@ void CAdjFlowOutput::SetOutputFields(CConfig *config){
   
 }
 
-inline void CAdjFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
 
   SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index e5a8050b898a..018c57cf72d8 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -59,7 +59,7 @@ CFEAOutput::~CFEAOutput(void) {
 
 }
 
-void CFEAOutput::LoadOutput_Data(CGeometry ****geometry,
+void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
                                      CSolver *****solver_container,
                                      CConfig **config,
                                      CIntegration ****integration,
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index d4514fc16f40..252e049e87e1 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -66,7 +66,7 @@ inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime
   return true;
 }
 
-inline void CHeatOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
   SetOutputFieldValue("EXT_ITER",     config[val_iZone]->GetExtIter());
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 1ed8693f6e7f..7e05b31aa5b0 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -151,10 +151,34 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
   AddOutputField("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
 
+  AddVolumeOutputField("COORD-X", "x", "COORDINATES");
+  AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+  AddVolumeOutputField("DENSITY",    "Density",    "CONSERVATIVE");
+  AddVolumeOutputField("MOMENTUM-X", "Momentum-x", "CONSERVATIVE");
+  AddVolumeOutputField("MOMENTUM-Y", "Momentum-y", "CONSERVATIVE");
+  AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
+  AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");
   
+    
 }
 
-inline void CFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+
+inline void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+          
+  
+  SetVolumeOutputFieldValue("COORD-X", iPoint, geometry->node[iPoint]->GetCoord(0));  
+  SetVolumeOutputFieldValue("COORD-Y", iPoint, geometry->node[iPoint]->GetCoord(1));
+  SetVolumeOutputFieldValue("COORD-Z", iPoint, geometry->node[iPoint]->GetCoord(2));
+  
+  SetVolumeOutputFieldValue("DENSITY",    iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(0));
+  SetVolumeOutputFieldValue("MOMENTUM-X", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(1));
+  SetVolumeOutputFieldValue("MOMENTUM-Y", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(2));
+  SetVolumeOutputFieldValue("MOMENTUM-Z", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(3));
+  SetVolumeOutputFieldValue("ENERGY",     iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(4));
+}
+
+inline void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   unsigned short iVar;
   
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 97983ec7274a..8dcdf2f15056 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -161,7 +161,7 @@ inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualt
 }
 
 
-inline void CIncFlowOutput::LoadOutput_Data(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
   SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 428bd43e2e23..286b32fc1b7e 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4290,7 +4290,7 @@ void COutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
 
-    LoadOutput_Data(geometry, solver_container, config, integration, DualTime_Iteration,
+    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
                     timeused, val_iZone, val_iInst);
 
     /*--- Write the history file ---------------------------------------------------------------------------*/
@@ -10147,25 +10147,8 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
       if (rank == MASTER_NODE)
         cout << "Loading solution output data locally on each rank." << endl;
 
-      switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES: case RANS :
-        if (compressible)
-          LoadLocalData_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        else
-          LoadLocalData_IncFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case FEM_ELASTICITY: case DISC_ADJ_FEM:
-        LoadLocalData_Elasticity(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case HEAT_EQUATION_FVM:
-        LoadLocalData_Base(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      default: break;
-    }
+      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+    
     
     /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
 
@@ -16989,7 +16972,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
    
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
     currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, OutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
+    for(std::map<string, HistoryOutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
       if (currentField == iter->second.HistoryOutputGroup){
         AddHistoryHeaderString(iter->second.FieldName);
       }
@@ -16997,7 +16980,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   }
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
     currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, vector<OutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
+    for(std::map<string, vector<HistoryOutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
       for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
         if (currentField == iter->second[iMarker].HistoryOutputGroup){
           AddHistoryHeaderString(iter->second[iMarker].FieldName);
@@ -17035,7 +17018,7 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
     currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, OutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
+    for(std::map<string, HistoryOutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
       if (currentField == iter->second.HistoryOutputGroup){
         AddHistoryValue(iter->second.Value);
       }
@@ -17044,7 +17027,7 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
     currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, vector<OutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
+    for(std::map<string, vector<HistoryOutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
       for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
         if (currentField == iter->second[iMarker].HistoryOutputGroup){
           AddHistoryValue(iter->second[iMarker].Value);
@@ -17130,7 +17113,7 @@ void COutput::SetScreen_Output(CConfig *config) {
   cout << endl;
 }
 
-void COutput::Preprocess_Historyfile(CConfig *config){
+void COutput::PreprocessHistoryOutput(CConfig *config){
   
   if (rank == MASTER_NODE){
    
@@ -17175,3 +17158,62 @@ void COutput::Preprocess_Historyfile(CConfig *config){
   }
   
 }
+
+void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
+  unsigned long iPoint, iVertex;
+  bool Wrt_Halo, isPeriodic;
+  
+  unsigned short iMarker;
+  
+  Wrt_Halo = config->GetWrt_Halo();
+  
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+}
+
+void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
+  
+  bool Wrt_Halo = config->GetWrt_Halo();
+  
+  unsigned long iPoint = 0, jPoint = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos & write only if requested ---*/
+    
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      LoadVolumeData(config, geometry, solver, jPoint);
+      
+      jPoint++;
+      
+    }
+  }
+}

From c650be71b069cc25d88a0f671ecc3b1a5722af3d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 11 Jul 2018 20:02:55 +0200
Subject: [PATCH 028/539] Added config option for volume output

---
 Common/include/config_structure.hpp | 13 +++++++++++--
 Common/include/config_structure.inl |  4 ++++
 Common/src/config_structure.cpp     |  4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index be80136301c8..87d2d7bc8749 100755
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1007,9 +1007,9 @@ class CConfig {
 
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
   string *ScreenOutput,    /*!< \brief Kind of the screen output. */
-  *HistoryOutput;                  /*!< \brief Kind of the output printed to the history file. */
+  *HistoryOutput, *VolumeOutput;                  /*!< \brief Kind of the output printed to the history file. */
   unsigned short nScreenOutput,         /*!< \brief Number of screen output variables (max: 6). */
-  nHistoryOutput;                       /*!< \brief Number of variables printed to the history file. */
+  nHistoryOutput, nVolumeOutput;                       /*!< \brief Number of variables printed to the history file. */
 
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
@@ -8460,6 +8460,15 @@ class CConfig {
   */
   string GetHistoryOutput_Field(unsigned short iField);
 
+  /*!
+   * \brief Get the number of history output variables requested
+   */
+  unsigned short GetnVolumeOutput(void);
+
+  /*
+  * \brief Get the history output field iField
+  */
+  string GetVolumeOutput_Field(unsigned short iField);
 
 };
 
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index a307404738fd..292ce90f9baa 100755
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1895,3 +1895,7 @@ inline string CConfig::GetScreenOutput_Field(unsigned short iField) { return Scr
 inline unsigned short CConfig::GetnHistoryOutput(void) { return nHistoryOutput; }
 
 inline string CConfig::GetHistoryOutput_Field(unsigned short iField) { return HistoryOutput[iField]; }
+
+inline unsigned short CConfig::GetnVolumeOutput(void) { return nVolumeOutput; }
+
+inline string CConfig::GetVolumeOutput_Field(unsigned short iField) { return VolumeOutput[iField]; }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index dad7f46eb03b..d545d82c5769 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2119,7 +2119,9 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   addStringListOption("SCREEN_OUTPUT", nScreenOutput, ScreenOutput);
   /* DESCRIPTION: Type of output printed to the history file */
   addStringListOption("HISTORY_OUTPUT", nHistoryOutput, HistoryOutput);
-
+  /* DESCRIPTION: Type of output printed to the volume solution file */
+  addStringListOption("VOLUME_OUTPUT", nVolumeOutput, VolumeOutput);
+  
   /* END_CONFIG_OPTIONS */
 
 }

From 2c8e8f2eacad48497b87fc27a46dba2b6512e28e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 11 Jul 2018 20:04:23 +0200
Subject: [PATCH 029/539] Further steps for customizable volume solution

---
 SU2_CFD/include/output_structure.hpp      |  26 +--
 SU2_CFD/include/output_structure.inl      |  14 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   |   2 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp |   2 +-
 SU2_CFD/src/output_adjoint_mean.cpp       |   2 +-
 SU2_CFD/src/output_direct_elasticity.cpp  |   2 +-
 SU2_CFD/src/output_direct_heat.cpp        |   2 +-
 SU2_CFD/src/output_direct_mean.cpp        |  22 +-
 SU2_CFD/src/output_direct_mean_inc.cpp    |   2 +-
 SU2_CFD/src/output_structure.cpp          | 262 +++++++++++-----------
 SU2_CFD/src/output_tecplot.cpp            |   4 +-
 11 files changed, 171 insertions(+), 169 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index f0f9d919c7d4..f33b73f50baa 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -119,7 +119,6 @@ class COutput {
   int *Conn_Pris_Par;
   int *Conn_Pyra_Par;
   
-  unsigned short nVar_Par;
   su2double **Local_Data;
   su2double **Local_Data_Copy;      // Local data copy for cte. lift mode
   su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
@@ -236,7 +235,6 @@ class COutput {
   struct VolumeOutputField {
     string FieldName;
     int    Offset;
-    int    nVar;
     string VolumeOutputGroup;
     VolumeOutputField () {}
     VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
@@ -951,7 +949,7 @@ class COutput {
   virtual void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  virtual void SetOutputFields(CConfig *config);
+  virtual void SetHistoryOutputFields(CConfig *config);
   
   
   /*!
@@ -1025,13 +1023,13 @@ class COutput {
   
   void AddVolumeOutputField(string name, string field_name, string groupname);
   
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);   
+  virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);   
   
   void SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value);
   
   void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
-  
-  
+    
+  virtual void SetVolumeOutputFields(CConfig *config);
 };
 
 /*! \class CFlowOutput
@@ -1068,7 +1066,9 @@ class CFlowOutput : public COutput {
   
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);  
   
-  void SetOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void SetHistoryOutputFields(CConfig *config);
   
   /*!
    * \brief Determines if the history file output.
@@ -1124,7 +1124,7 @@ class CIncFlowOutput : public COutput {
   void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
   
   /*!
    * \brief Determines if the history file output.
@@ -1179,7 +1179,7 @@ class CFEAOutput : public COutput {
   void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
@@ -1253,7 +1253,7 @@ class CHeatOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
   
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
    
 
 };
@@ -1290,7 +1290,7 @@ class CAdjFlowOutput : public COutput {
   void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
 
   /*!
    * \brief Determines if the history file output.
@@ -1345,7 +1345,7 @@ class CDiscAdjFlowOutput : public COutput {
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
 
 
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
   
   /*!
    * \brief Determines if the history file output.
@@ -1393,7 +1393,7 @@ class CDiscAdjFEAOutput : public COutput {
    */
   virtual ~CDiscAdjFEAOutput(void);
 
-  void SetOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 3617d56c1c55..73d8f2049b7b 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -46,7 +46,7 @@ inline su2double COutput::GetMassFlowIn(unsigned short iMarkerTP, unsigned short
 
 inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
 
-inline void COutput::SetOutputFields(CConfig *config){}
+inline void COutput::SetHistoryOutputFields(CConfig *config){}
 
 inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
  
@@ -120,12 +120,18 @@ inline void COutput::SetOutputPerSurfaceFieldValue(string name, su2double value,
 }
 
 inline void COutput::AddVolumeOutputField(string name, string field_name, string groupname){
-  VolumeOutput_Fields[name] = VolumeOutputField(field_name, GlobalField_Counter, groupname);
-  GlobalField_Counter++;
+  VolumeOutput_Fields[name] = VolumeOutputField(field_name, -1, groupname);
 }
 
 inline void COutput::SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value){
-  Local_Data[iPoint][VolumeOutput_Fields[name].Offset] = value;
+  if (VolumeOutput_Fields.count(name) > 0){
+    if (VolumeOutput_Fields[name].Offset != -1){
+      Local_Data[iPoint][VolumeOutput_Fields[name].Offset] = value;
+    }
+  } else {
+    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+  }
 }
 inline void COutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) {}
 
+inline void COutput::SetVolumeOutputFields(CConfig *config) {}
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index b20afb7a8708..ebaaa680bf46 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -53,7 +53,7 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 
 }
 
-void CDiscAdjFlowOutput::SetOutputFields(CConfig *config){
+void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 942444d77527..ea321adf2751 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -65,7 +65,7 @@ inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { return true
 
 inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { return true; }
 
-void CDiscAdjFEAOutput::SetOutputFields(CConfig *config){
+void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 8217a680fff2..9bf123231e81 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -63,7 +63,7 @@ inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
 inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
 
 
-void CAdjFlowOutput::SetOutputFields(CConfig *config){
+void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 018c57cf72d8..80d23abb7370 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -118,7 +118,7 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
   
 }
 
-void CFEAOutput::SetOutputFields(CConfig *config){
+void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 252e049e87e1..e39221ae6c2b 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -83,7 +83,7 @@ inline void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
 }
   
 
-inline void CHeatOutput::SetOutputFields(CConfig *config){
+inline void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
   AddOutputField("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
   AddOutputField("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 7e05b31aa5b0..33c07dea1b8c 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -58,7 +58,7 @@ CFlowOutput::~CFlowOutput(void) {
 
 
 
-inline void CFlowOutput::SetOutputFields(CConfig *config){
+inline void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
@@ -151,20 +151,25 @@ inline void CFlowOutput::SetOutputFields(CConfig *config){
   AddOutputField("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
   AddOutputField("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
 
+
+}
+
+void CFlowOutput::SetVolumeOutputFields(CConfig *config){
+  
   AddVolumeOutputField("COORD-X", "x", "COORDINATES");
   AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
   AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+  
   AddVolumeOutputField("DENSITY",    "Density",    "CONSERVATIVE");
   AddVolumeOutputField("MOMENTUM-X", "Momentum-x", "CONSERVATIVE");
   AddVolumeOutputField("MOMENTUM-Y", "Momentum-y", "CONSERVATIVE");
   AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
   AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");
   
-    
+  
 }
 
-
-inline void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
           
   
   SetVolumeOutputFieldValue("COORD-X", iPoint, geometry->node[iPoint]->GetCoord(0));  
@@ -178,7 +183,7 @@ inline void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CS
   SetVolumeOutputFieldValue("ENERGY",     iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(4));
 }
 
-inline void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   unsigned short iVar;
   
@@ -259,17 +264,18 @@ inline void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   }
 }
 
-inline bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
  return true;
 }
 
-inline bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
+bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header;
   write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
   
   return true;
 }
-inline bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+
+bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   return true;
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 8dcdf2f15056..3878abeda5cd 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -60,7 +60,7 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 }
 
 
-void CIncFlowOutput::SetOutputFields(CConfig *config){
+void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 286b32fc1b7e..0089e44288b5 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -10160,11 +10160,11 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
       
       Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
       for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
+        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
       }
       
       for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
           Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
         }
       }
@@ -10180,7 +10180,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
         cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
       
       for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
           Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
         }
       }
@@ -10424,16 +10424,16 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
   
   /*--- All output files first need the grid coordinates. ---*/
   
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
+  GlobalField_Counter  = 1; Variable_Names.push_back("x");
+  GlobalField_Counter += 1; Variable_Names.push_back("y");
   if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
+    GlobalField_Counter += 1; Variable_Names.push_back("z");
   }
   
   /*--- At a mininum, the restarts and visualization files need the
    conservative variables, so these follow next. ---*/
   
-  nVar_Par += nVar_Consv_Par;
+  GlobalField_Counter += nVar_Consv_Par;
   
   Variable_Names.push_back("Density");
   Variable_Names.push_back("X-Momentum");
@@ -10459,7 +10459,7 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add the limiters ---*/
     
     if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       
       Variable_Names.push_back("Limiter_Density");
       Variable_Names.push_back("Limiter_X-Momentum");
@@ -10481,7 +10481,7 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add the residuals ---*/
     
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       
       Variable_Names.push_back("Residual_Density");
       Variable_Names.push_back("Residual_X-Momentum");
@@ -10503,8 +10503,8 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add the grid velocity. ---*/
     
     if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
+      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
       
       Variable_Names.push_back("X-Grid_Velocity");
       Variable_Names.push_back("Y-Grid_Velocity");
@@ -10514,14 +10514,14 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     
     /*--- Add Pressure, Temperature, Cp, Mach. ---*/
     
-    nVar_Par += 1;
+    GlobalField_Counter += 1;
     Variable_Names.push_back("Pressure");
     
-    nVar_Par += 2;
+    GlobalField_Counter += 2;
     Variable_Names.push_back("Temperature");
     Variable_Names.push_back("Mach");
     
-    nVar_Par += 1;
+    GlobalField_Counter += 1;
     if (config->GetOutput_FileFormat() == PARAVIEW){
       Variable_Names.push_back("Pressure_Coefficient");
     } else {
@@ -10532,25 +10532,25 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
       if (config->GetOutput_FileFormat() == PARAVIEW){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("X-Skin_Friction_Coefficient");
         Variable_Names.push_back("Y-Skin_Friction_Coefficient");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Z-Skin_Friction_Coefficient");
+          GlobalField_Counter += 1; Variable_Names.push_back("Z-Skin_Friction_Coefficient");
         }
-        nVar_Par += 2;
+        GlobalField_Counter += 2;
         Variable_Names.push_back("Heat_Flux");
         Variable_Names.push_back("Y_Plus");
       } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("<greek>m</greek>");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("C<sub>f</sub>_x");
         Variable_Names.push_back("C<sub>f</sub>_y");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
+          GlobalField_Counter += 1; Variable_Names.push_back("C<sub>f</sub>_z");
         }
-        nVar_Par += 2;
+        GlobalField_Counter += 2;
         Variable_Names.push_back("h");
         Variable_Names.push_back("y<sup>+</sup>");
       }
@@ -10559,7 +10559,7 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add Eddy Viscosity. ---*/
     
     if (Kind_Solver == RANS) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       if (config->GetOutput_FileFormat() == PARAVIEW){
         Variable_Names.push_back("Eddy_Viscosity");
       } else {
@@ -10570,14 +10570,14 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add the distance to the nearest sharp edge if requested. ---*/
     
     if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       Variable_Names.push_back("Sharp_Edge_Dist");
     }
     
     /*--- Add the intermittency for the BC trans. model. ---*/
     
     if (transition) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       if (config->GetOutput_FileFormat() == PARAVIEW){
         Variable_Names.push_back("gamma_BC");
       } else {
@@ -10586,14 +10586,14 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     }
     
     if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-      nVar_Par +=1;
+      GlobalField_Counter +=1;
       Variable_Names.push_back("DES_LengthScale");
-      nVar_Par +=1;
+      GlobalField_Counter +=1;
       Variable_Names.push_back("Wall_Distance");
     }
     
     if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      nVar_Par +=1;
+      GlobalField_Counter +=1;
       Variable_Names.push_back("Roe_Dissipation");
     }
     
@@ -10641,7 +10641,7 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
   
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
   }
   
   Local_Halo = new int[geometry->GetnPoint()];
@@ -10927,16 +10927,16 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
   /*--- All output files first need the grid coordinates. ---*/
 
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
+  GlobalField_Counter  = 1; Variable_Names.push_back("x");
+  GlobalField_Counter += 1; Variable_Names.push_back("y");
   if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
+    GlobalField_Counter += 1; Variable_Names.push_back("z");
   }
 
   /*--- At a mininum, the restarts and visualization files need the
    conservative variables, so these follow next. ---*/
 
-  nVar_Par += nVar_Consv_Par;
+  GlobalField_Counter += nVar_Consv_Par;
 
   /*--- The incompressible solver uses primitives as the working variables. ---*/
 
@@ -10964,7 +10964,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the limiters ---*/
 
     if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
 
       Variable_Names.push_back("Limiter_Pressure");
       Variable_Names.push_back("Limiter_X-Velocity");
@@ -10986,7 +10986,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the residuals ---*/
 
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
 
       Variable_Names.push_back("Residual_Pressure");
       Variable_Names.push_back("Residual_X-Velocity");
@@ -11008,8 +11008,8 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the grid velocity. ---*/
 
     if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
+      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
 
       Variable_Names.push_back("X-Grid_Velocity");
       Variable_Names.push_back("Y-Grid_Velocity");
@@ -11018,7 +11018,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
     /*--- Add Cp, Mach. ---*/
 
-    nVar_Par += 2;
+    GlobalField_Counter += 2;
     if (config->GetOutput_FileFormat() == PARAVIEW){
       Variable_Names.push_back("Pressure_Coefficient");
     } else {
@@ -11030,25 +11030,25 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
       if (config->GetOutput_FileFormat() == PARAVIEW){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("X-Skin_Friction_Coefficient");
         Variable_Names.push_back("Y-Skin_Friction_Coefficient");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Z-Skin_Friction_Coefficient");
+          GlobalField_Counter += 1; Variable_Names.push_back("Z-Skin_Friction_Coefficient");
         }
-        nVar_Par += 2;
+        GlobalField_Counter += 2;
         Variable_Names.push_back("Heat_Flux");
         Variable_Names.push_back("Y_Plus");
       } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("<greek>m</greek>");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("C<sub>f</sub>_x");
         Variable_Names.push_back("C<sub>f</sub>_y");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
+          GlobalField_Counter += 1; Variable_Names.push_back("C<sub>f</sub>_z");
         }
-        nVar_Par += 2;
+        GlobalField_Counter += 2;
         Variable_Names.push_back("h");
         Variable_Names.push_back("y<sup>+</sup>");
       }
@@ -11057,7 +11057,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add Eddy Viscosity. ---*/
 
     if (Kind_Solver == RANS) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       if (config->GetOutput_FileFormat() == PARAVIEW){
         Variable_Names.push_back("Eddy_Viscosity");
       } else {
@@ -11068,14 +11068,14 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the distance to the nearest sharp edge if requested. ---*/
 
     if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       Variable_Names.push_back("Sharp_Edge_Dist");
     }
 
     /*--- Add the intermittency for the BC trans. model. ---*/
 
     if (transition) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       if (config->GetOutput_FileFormat() == PARAVIEW){
         Variable_Names.push_back("gamma_BC");
       } else {
@@ -11085,7 +11085,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
     /*--- New variables get registered here before the end of the loop. ---*/
 
-    nVar_Par += 1;
+    GlobalField_Counter += 1;
     Variable_Names.push_back("Density");
 
   }
@@ -11130,7 +11130,7 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
   }
 
   Local_Halo = new int[geometry->GetnPoint()];
@@ -11394,16 +11394,16 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
   
   /*--- All output files first need the grid coordinates. ---*/
   
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
+  GlobalField_Counter  = 1; Variable_Names.push_back("x");
+  GlobalField_Counter += 1; Variable_Names.push_back("y");
   if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
+    GlobalField_Counter += 1; Variable_Names.push_back("z");
   }
   
   /*--- At a mininum, the restarts and visualization files need the
    conservative variables, so these follow next. ---*/
   
-  nVar_Par += nVar_Consv_Par;
+  GlobalField_Counter += nVar_Consv_Par;
   
   /*--- For now, leave the names as "Conservative_", etc., in order
    to avoid confusion with the serial version, which still prints these
@@ -11440,7 +11440,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
   if ((Kind_Solver == DISC_ADJ_EULER)         ||
       (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
       (Kind_Solver == DISC_ADJ_RANS)) {
-    nVar_Par += nDim;
+    GlobalField_Counter += nDim;
     Variable_Names.push_back("Sensitivity_x");
     Variable_Names.push_back("Sensitivity_y");
     if (geometry->GetnDim()== 3)
@@ -11455,7 +11455,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the limiters ---*/
     
     if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       if (incompressible) {
         Variable_Names.push_back("Limiter_Adjoint_Pressure");
         Variable_Names.push_back("Limiter_Adjoint_X-Velocity");
@@ -11484,7 +11484,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the residuals ---*/
     
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       if (incompressible) {
         Variable_Names.push_back("Residual_Adjoint_Pressure");
         Variable_Names.push_back("Residual_Adjoint_X-Velocity");
@@ -11513,8 +11513,8 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the grid velocity. ---*/
     
     if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
+      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
       Variable_Names.push_back("Grid_Velx");
       Variable_Names.push_back("Grid_Vely");
       if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velz");
@@ -11522,7 +11522,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     
     /*--- All adjoint solvers write the surface sensitivity. ---*/
     
-    nVar_Par += 1; Variable_Names.push_back("Surface_Sensitivity");
+    GlobalField_Counter += 1; Variable_Names.push_back("Surface_Sensitivity");
     
     /*--- For the continouus adjoint, we write either convective scheme's
      dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
@@ -11530,7 +11530,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     if (( Kind_Solver == ADJ_EULER              ) ||
         ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
         ( Kind_Solver == ADJ_RANS               )) {
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
         Variable_Names.push_back("Dissipation_Sensor");
       } else {
@@ -11571,7 +11571,7 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
   
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
   }
   
   Local_Halo = new int[geometry->GetnPoint()];
@@ -11789,16 +11789,16 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
   
   /*--- All output files first need the grid coordinates. ---*/
   
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
+  GlobalField_Counter  = 1; Variable_Names.push_back("x");
+  GlobalField_Counter += 1; Variable_Names.push_back("y");
   if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
+    GlobalField_Counter += 1; Variable_Names.push_back("z");
   }
   
   /*--- At a mininum, the restarts and visualization files need the
    conservative variables, so these follow next. ---*/
   
-  nVar_Par += nVar_Consv_Par;
+  GlobalField_Counter += nVar_Consv_Par;
   
   /*--- For now, leave the names as "Conservative_", etc., in order
    to avoid confusion with the serial version, which still prints these
@@ -11818,7 +11818,7 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
     /*--- Add the limiters ---*/
     
     if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       Variable_Names.push_back("Limiter_Displacement_1");
       Variable_Names.push_back("Limiter_Displacement_2");
       if (geometry->GetnDim() == 3)
@@ -11828,7 +11828,7 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
     /*--- Add the residuals ---*/
     
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       Variable_Names.push_back("Residual_Displacement_1");
       Variable_Names.push_back("Residual_Displacement_2");
       if (geometry->GetnDim() == 3)
@@ -11839,20 +11839,20 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
     if (config->GetDynamic_Analysis() == DYNAMIC) {
       
       /*--- Velocities ---*/
-      nVar_Par += 2;
+      GlobalField_Counter += 2;
       Variable_Names.push_back("Velocity_1");
       Variable_Names.push_back("Velocity_2");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
+        GlobalField_Counter += 1;
         Variable_Names.push_back("Velocity_3");
       }
       
       /*--- Accelerations ---*/
-      nVar_Par += 2;
+      GlobalField_Counter += 2;
       Variable_Names.push_back("Acceleration_1");
       Variable_Names.push_back("Acceleration_2");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
+        GlobalField_Counter += 1;
         Variable_Names.push_back("Acceleration_3");
       }
     }
@@ -11861,12 +11861,12 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
 
       /*--- Add the stresses. ---*/
     
-      nVar_Par += 3;
+      GlobalField_Counter += 3;
       Variable_Names.push_back("Sxx");
       Variable_Names.push_back("Syy");
       Variable_Names.push_back("Sxy");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 3;
+        GlobalField_Counter += 3;
         Variable_Names.push_back("Szz");
         Variable_Names.push_back("Sxz");
         Variable_Names.push_back("Syz");
@@ -11874,7 +11874,7 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
 
       /*--- Add the Von Mises Stress. ---*/
     
-      nVar_Par += 1;
+      GlobalField_Counter += 1;
       Variable_Names.push_back("Von_Mises_Stress");
     
     }
@@ -11888,7 +11888,7 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
   
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
   }
   
   Local_Halo = new int[geometry->GetnPoint()];
@@ -12081,16 +12081,16 @@ void COutput::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver *
   
   /*--- All output files first need the grid coordinates. ---*/
   
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
+  GlobalField_Counter  = 1; Variable_Names.push_back("x");
+  GlobalField_Counter += 1; Variable_Names.push_back("y");
   if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
+    GlobalField_Counter += 1; Variable_Names.push_back("z");
   }
   
   /*--- At a mininum, the restarts and visualization files need the
    conservative variables, so these follow next. ---*/
   
-  nVar_Par += nVar_Consv_Par;
+  GlobalField_Counter += nVar_Consv_Par;
   for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
     varname << "Conservative_" << iVar+1;
     Variable_Names.push_back(varname.str());
@@ -12105,7 +12105,7 @@ void COutput::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver *
     /*--- Add the residuals ---*/
     
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
         varname << "Residual_" << iVar+1;
         Variable_Names.push_back(varname.str());
@@ -12122,7 +12122,7 @@ void COutput::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver *
   
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
+    Local_Data[iPoint] = new su2double[GlobalField_Counter];
   }
   
   Local_Halo = new int[geometry->GetnPoint()];
@@ -13458,7 +13458,7 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   unsigned long iProcessor;
   unsigned long iPoint, Global_Index, nLocalPoint, nTotalPoint, iVertex;
   
-  int VARS_PER_POINT = nVar_Par;
+  int VARS_PER_POINT = GlobalField_Counter;
   int *Local_Halo = NULL;
 
   bool isPeriodic;
@@ -13864,7 +13864,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   unsigned long iPoint, jPoint, kPoint, iElem;
   unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
   
-  int VARS_PER_POINT = nVar_Par;
+  int VARS_PER_POINT = GlobalField_Counter;
   int *Local_Halo = NULL;
   int iNode, count;
   int SendRecv, RecvFrom;
@@ -15352,7 +15352,7 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry,
           
           /*--- Loop over the variables and write the values to file ---*/
           
-          for (iVar = 0; iVar < nVar_Par; iVar++) {
+          for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
             restart_file << scientific << Parallel_Data[iVar][iPoint] << "\t";
           }
           restart_file << "\n";
@@ -15441,32 +15441,6 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
   /*--- These point offsets should be computed once and stored so that we don't
   repeat this code throughout. ---*/
 
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-
-  unsigned long iVertex;
-  bool isPeriodic;
-
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-
-  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-
   /*--- Sum total number of nodes that belong to the domain ---*/
 
   unsigned long nTotalPoint;
@@ -15518,18 +15492,18 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
    one int for ExtIter and 8 su2doubles. ---*/
 
   int var_buf_size = 5;
-  int var_buf[5] = {535532, nVar_Par, (int)nTotalPoint, 1, 8};
+  int var_buf[5] = {535532, GlobalField_Counter, (int)nTotalPoint, 1, 8};
 
   /*--- Prepare the 1D data buffer on this rank. ---*/
 
-  passivedouble *buf = new passivedouble[nParallel_Poin*nVar_Par];
+  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
 
   /*--- For now, create a temp 1D buffer to load up the data for writing.
    This will be replaced with a derived data type most likely. ---*/
 
   for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
-    for (iVar = 0; iVar < nVar_Par; iVar++)
-      buf[iPoint*nVar_Par+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
+      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
 
   /*--- Prepare metadata. ---*/
 
@@ -15622,7 +15596,7 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
   /*--- Define a derived datatype for this ranks contiguous chunk of data
    that will be placed in the restart (1D array size = num points * num vars). ---*/
 
-  MPI_Type_contiguous(nVar_Par*nParallel_Poin, MPI_DOUBLE, &filetype);
+  MPI_Type_contiguous(GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &filetype);
   MPI_Type_commit(&filetype);
 
   /*--- All ranks open the file using MPI. Here, we try to open the file with
@@ -15659,7 +15633,7 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
      fixed length of 33 for the string length to match with CGNS. This is
      needed for when we read the strings later. ---*/
 
-    for (iVar = 0; iVar < nVar_Par; iVar++) {
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
       disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
       strcpy(str_buf, Variable_Names[iVar].c_str());
       MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
@@ -15671,8 +15645,8 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
    After the calculations above, we have the partition sizes store in nPoint_Linear
    in cumulative storage format. ---*/
 
-  disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
-          nVar_Par*nPoint_Linear[rank]*sizeof(passivedouble));
+  disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+          GlobalField_Counter*nPoint_Linear[rank]*sizeof(passivedouble));
 
   /*--- Set the view for the MPI file write, i.e., describe the location in
    the file that this rank "sees" for writing its piece of the restart file. ---*/
@@ -15681,8 +15655,8 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
 
   /*--- Collective call for all ranks to write to their view simultaneously. ---*/
 
-  MPI_File_write_all(fhw, buf, nVar_Par*nParallel_Poin, MPI_DOUBLE, &status);
-  file_size += (su2double)nVar_Par*nParallel_Poin*sizeof(passivedouble);
+  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
+  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
 
   /*--- Free the derived datatype. ---*/
 
@@ -15698,15 +15672,15 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
 
     /*--- External iteration. ---*/
 
-    disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
-            nVar_Par*nTotalPoint*sizeof(passivedouble));
+    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+            GlobalField_Counter*nTotalPoint*sizeof(passivedouble));
     MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
     file_size += (su2double)sizeof(int);
 
     /*--- Additional doubles for AoA, AoS, etc. ---*/
 
-    disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
-            nVar_Par*nTotalPoint*sizeof(passivedouble) + 1*sizeof(int));
+    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+            GlobalField_Counter*nTotalPoint*sizeof(passivedouble) + 1*sizeof(int));
     MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
     file_size += (su2double)8*sizeof(passivedouble);
 
@@ -15883,7 +15857,7 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
 
   /*--- Send and Recv buffers ---*/
 
-  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*nVar_Par];
+  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*GlobalField_Counter];
   su2double *Buffer_Recv_Data = NULL;
 
   unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
@@ -15892,7 +15866,7 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
   /*--- Prepare the receive buffers on the master node only. ---*/
 
   if (rank == MASTER_NODE) {
-    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*nVar_Par];
+    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
     Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
   }
 
@@ -15914,8 +15888,8 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
       if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
           (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
         Buffer_Send_GlobalIndex[nLocalVertex_Surface] = Global_Index;
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
-          Buffer_Send_Data[nLocalVertex_Surface*nVar_Par+iVar] = Parallel_Data[iVar][iPoint];
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Buffer_Send_Data[nLocalVertex_Surface*GlobalField_Counter+iVar] = Parallel_Data[iVar][iPoint];
         }
         nLocalVertex_Surface++;
       }
@@ -15925,7 +15899,7 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
   /*--- Send the information to the master node ---*/
 
 #ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*nVar_Par, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*nVar_Par, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
   SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
 #else
   for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
@@ -15978,8 +15952,8 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
         /*--- Write the the data ---*/
 
         SurfFlow_file << scientific << Global_Index;
-        Total_Index  = iProcessor*MaxLocalVertex_Surface*nVar_Par+iVertex*nVar_Par;
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
+        Total_Index  = iProcessor*MaxLocalVertex_Surface*GlobalField_Counter+iVertex*GlobalField_Counter;
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
           SurfFlow_file << scientific << ", " << Buffer_Recv_Data[Total_Index+iVar];
         }
         SurfFlow_file << endl;
@@ -16033,7 +16007,7 @@ void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
   
   /*--- Deallocate memory for solution data ---*/
   
-  for (unsigned short iVar = 0; iVar < nVar_Par; iVar++) {
+  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
     if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
   }
   if (Parallel_Data != NULL) delete [] Parallel_Data;
@@ -16044,7 +16018,7 @@ void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometr
   
   /*--- Deallocate memory for surface solution data ---*/
 
-  for (unsigned short iVar = 0; iVar < nVar_Par; iVar++) {
+  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
     if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
   }
   if (Parallel_Surf_Data != NULL) delete [] Parallel_Surf_Data;
@@ -17148,7 +17122,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
              (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
-    SetOutputFields(config);
+    SetHistoryOutputFields(config);
     // Open the history file using only the master node
     
     cout << "History filename: " << char_histfile << endl;
@@ -17160,6 +17134,22 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 }
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
+  
+  SetVolumeOutputFields(config);
+  
+  string currentField;
+  
+  for (unsigned short iField = 0; iField < config->GetnVolumeOutput(); iField++){
+    currentField = config->GetVolumeOutput_Field(iField);      
+    for(std::map<string,VolumeOutputField>::iterator iter = VolumeOutput_Fields.begin(); iter != VolumeOutput_Fields.end(); ++iter){
+      if (currentField == iter->second.VolumeOutputGroup){
+        iter->second.Offset = GlobalField_Counter;
+        Variable_Names.push_back(iter->second.FieldName);
+        GlobalField_Counter++;
+      }
+    }
+  }
+    
   unsigned long iPoint, iVertex;
   bool Wrt_Halo, isPeriodic;
   
diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output_tecplot.cpp
index 1f9ffce9204c..0277b8fe3a70 100644
--- a/SU2_CFD/src/output_tecplot.cpp
+++ b/SU2_CFD/src/output_tecplot.cpp
@@ -905,7 +905,7 @@ void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, C
         
         if (surf_sol) {
             for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++)
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++)
           Tecplot_File << scientific << Parallel_Surf_Data[iVar][iPoint] << "\t";
         Tecplot_File << endl;
             
@@ -913,7 +913,7 @@ void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, C
         } else {
           
            for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-          for (iVar = 0; iVar < nVar_Par; iVar++)
+          for (iVar = 0; iVar < GlobalField_Counter; iVar++)
             Tecplot_File << scientific << Parallel_Data[iVar][iPoint] << "\t";
           Tecplot_File << endl;
         }

From afb4a79244e269c7a83538c04954d3aaeedbc81d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 18 Jul 2018 11:20:28 +0200
Subject: [PATCH 030/539] Added surface data collection for volume output

---
 SU2_CFD/include/output_structure.hpp |  13 ++-
 SU2_CFD/include/output_structure.inl |   2 +
 SU2_CFD/src/driver_structure.cpp     |   2 +-
 SU2_CFD/src/output_direct_mean.cpp   | 159 +++++++++++++++++++++++++--
 SU2_CFD/src/output_structure.cpp     |  41 ++++++-
 5 files changed, 196 insertions(+), 21 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index f33b73f50baa..f50d495e1bf5 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1029,6 +1029,9 @@ class COutput {
   
   void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
     
+  void CollectSurfaceData(CConfig* config, CGeometry* geometry, CSolver** solver);
+  
+  virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   virtual void SetVolumeOutputFields(CConfig *config);
 };
 
@@ -1043,6 +1046,10 @@ class CFlowOutput : public COutput {
   unsigned short nVar, nDim;
 
   unsigned short turb_model;
+  
+  bool grid_movement;
+  
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
 
 public:
 
@@ -1050,7 +1057,7 @@ class CFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CFlowOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1064,12 +1071,14 @@ class CFlowOutput : public COutput {
   void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   
   void SetVolumeOutputFields(CConfig *config);
   
   void SetHistoryOutputFields(CConfig *config);
   
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 73d8f2049b7b..4f6ad352d6a6 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -135,3 +135,5 @@ inline void COutput::SetVolumeOutputFieldValue(string name, unsigned long iPoint
 inline void COutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) {}
 
 inline void COutput::SetVolumeOutputFields(CConfig *config) {}
+
+inline void COutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) {}
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index eb2497fca580..2555d1016ad6 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3181,7 +3181,7 @@ void CDriver::Output_Preprocessing(){
       if (rank == MASTER_NODE)
         cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
-        output[iZone] = new CFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
         output[iZone] = new CIncFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 33c07dea1b8c..2d75e6f494cf 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -38,11 +38,36 @@
 
 #include "../include/output_structure.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
 
   nDim = geometry->GetnDim();  
   
   turb_model = config->GetKind_Turb_Model();
+  
+  grid_movement = config->GetGrid_Movement(); 
+  
+  su2double Gas_Constant, Mach2Vel, Mach_Motion;
+  unsigned short iDim;
+  su2double Gamma = config->GetGamma();
+      
+  /*--- Set the non-dimensionalization for coefficients. ---*/
+  
+  RefArea = config->GetRefArea();
+  
+  if (grid_movement) {
+    Gas_Constant = config->GetGas_ConstantND();
+    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+    Mach_Motion = config->GetMach_Motion();
+    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+  }
+  else {
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  }
+  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
 
 }
 
@@ -156,31 +181,141 @@ inline void CFlowOutput::SetHistoryOutputFields(CConfig *config){
 
 void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   
+  // Grid coordinates
   AddVolumeOutputField("COORD-X", "x", "COORDINATES");
   AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
-  AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
   
+  // Conservative variables
   AddVolumeOutputField("DENSITY",    "Density",    "CONSERVATIVE");
   AddVolumeOutputField("MOMENTUM-X", "Momentum-x", "CONSERVATIVE");
   AddVolumeOutputField("MOMENTUM-Y", "Momentum-y", "CONSERVATIVE");
-  AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
-  AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");
+  if (nDim == 3)
+    AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
+  AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");  
+  
+  // Primitive variables
+  AddVolumeOutputField("PRESSURE",    "Pressure",                "PRIMITIVE");
+  AddVolumeOutputField("TEMPERATURE", "Temperature",             "PRIMITIVE");
+  AddVolumeOutputField("MACH",        "Mach",                    "PRIMITIVE");
+  AddVolumeOutputField("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    AddVolumeOutputField("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    
+    AddVolumeOutputField("SKIN_FRICTION-X", "Skin_Friction_Coefficient-x", "PRIMITIVE");
+    AddVolumeOutputField("SKIN_FRICTION-Y", "Skin_Friction_Coefficient-y", "PRIMITIVE");
+    if (nDim == 3)
+      AddVolumeOutputField("SKIN_FRICTION-Z", "Skin_Friction_Coefficient-z", "PRIMITIVE");
+    
+    AddVolumeOutputField("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
+    AddVolumeOutputField("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    
+  }
   
+  if (config->GetKind_Solver() == RANS) {
+    AddVolumeOutputField("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+  }
+  
+  if (config->GetKind_Trans_Model() == BC){
+    AddVolumeOutputField("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+  }
+
+  //Residuals
+  AddVolumeOutputField("RESIDUAL_DENSITY", "Residual_Density", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_MOMENTUM-X", "Residual_Momentum-x", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_MOMENTUM-Y", "Residual_Momentum-y", "RESIDUAL");
+  if (nDim == 3)
+    AddVolumeOutputField("RESIDUAL_MOMENTUM-Z", "Residual_Momentum-z", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_ENERGY", "Residual_Energy", "RESIDUAL");
+  
+  // Limiter values
+  AddVolumeOutputField("LIMITER_DENSITY", "Limiter_Density", "LIMITER");
+  AddVolumeOutputField("LIMITER_MOMENTUM-X", "Limiter_Momentum-x", "LIMITER");
+  AddVolumeOutputField("LIMITER_MOMENTUM-Y", "Limiter_Momentum-y", "LIMITER");
+  if (nDim == 3)
+    AddVolumeOutputField("LIMITER_MOMENTUM-Z", "Limiter_Momentum-z", "LIMITER");
+  AddVolumeOutputField("LIMITER_ENERGY", "Limiter_Energy", "LIMITER");
   
 }
 
 void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
+  CVariable* Node_Turb;
+  
+  if (config->GetKind_Turb_Model() != NONE){
+    Node_Turb = solver[TURB_SOL]->node[iPoint]; 
+  }
+  
+  CPoint*    Node_Geo  = geometry->node[iPoint];
           
+  SetVolumeOutputFieldValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputFieldValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputFieldValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputFieldValue("DENSITY",    iPoint, Node_Flow->GetSolution(0));
+  SetVolumeOutputFieldValue("MOMENTUM-X", iPoint, Node_Flow->GetSolution(1));
+  SetVolumeOutputFieldValue("MOMENTUM-Y", iPoint, Node_Flow->GetSolution(2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("MOMENTUM-Z", iPoint, Node_Flow->GetSolution(3));
+    SetVolumeOutputFieldValue("ENERGY",     iPoint, Node_Flow->GetSolution(4));
+  } else {
+    SetVolumeOutputFieldValue("ENERGY",     iPoint, Node_Flow->GetSolution(3));    
+  }
+  
+  SetVolumeOutputFieldValue("PRESSURE", iPoint, Node_Flow->GetPressure());
+  SetVolumeOutputFieldValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
+  SetVolumeOutputFieldValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
+  SetVolumeOutputFieldValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
   
-  SetVolumeOutputFieldValue("COORD-X", iPoint, geometry->node[iPoint]->GetCoord(0));  
-  SetVolumeOutputFieldValue("COORD-Y", iPoint, geometry->node[iPoint]->GetCoord(1));
-  SetVolumeOutputFieldValue("COORD-Z", iPoint, geometry->node[iPoint]->GetCoord(2));
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    SetVolumeOutputFieldValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
+  }
+  
+  if (config->GetKind_Solver() == RANS) {
+    SetVolumeOutputFieldValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
+  }
+  
+  if (config->GetKind_Trans_Model() == BC){
+    SetVolumeOutputFieldValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
+  }
   
-  SetVolumeOutputFieldValue("DENSITY",    iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(0));
-  SetVolumeOutputFieldValue("MOMENTUM-X", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(1));
-  SetVolumeOutputFieldValue("MOMENTUM-Y", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(2));
-  SetVolumeOutputFieldValue("MOMENTUM-Z", iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(3));
-  SetVolumeOutputFieldValue("ENERGY",     iPoint, solver[FLOW_SOL]->node[iPoint]->GetSolution(4));
+  SetVolumeOutputFieldValue("RESIDUAL_DENSITY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputFieldValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+  } else {
+    SetVolumeOutputFieldValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+  }
+  
+  SetVolumeOutputFieldValue("LIMITER_DENSITY", iPoint, Node_Flow->GetLimiter_Primitive(0));
+  SetVolumeOutputFieldValue("LIMITER_MOMENTUM-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
+  SetVolumeOutputFieldValue("LIMITER_MOMENTUM-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("LIMITER_MOMENTUM-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
+    SetVolumeOutputFieldValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(4));
+  } else {
+    SetVolumeOutputFieldValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(3));   
+  }
+  
+}
+
+void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
+    SetVolumeOutputFieldValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
+    SetVolumeOutputFieldValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
+    if (nDim == 3)
+      SetVolumeOutputFieldValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
+  
+    SetVolumeOutputFieldValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+    SetVolumeOutputFieldValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
+  }
 }
 
 void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 0089e44288b5..7c51a9fbc1a9 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -10149,7 +10149,8 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
       CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
     
-    
+      CollectSurfaceData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+      
     /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
 
     if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
@@ -17137,12 +17138,14 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
   SetVolumeOutputFields(config);
   
+  GlobalField_Counter = 0;
+  
   string currentField;
   
   for (unsigned short iField = 0; iField < config->GetnVolumeOutput(); iField++){
     currentField = config->GetVolumeOutput_Field(iField);      
     for(std::map<string,VolumeOutputField>::iterator iter = VolumeOutput_Fields.begin(); iter != VolumeOutput_Fields.end(); ++iter){
-      if (currentField == iter->second.VolumeOutputGroup){
+      if (((currentField == iter->second.VolumeOutputGroup) || (currentField == iter->first)) && (iter->second.Offset == -1)){
         iter->second.Offset = GlobalField_Counter;
         Variable_Names.push_back(iter->second.FieldName);
         GlobalField_Counter++;
@@ -17153,13 +17156,16 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   unsigned long iPoint, iVertex;
   bool Wrt_Halo, isPeriodic;
   
-  unsigned short iMarker;
+  unsigned short iMarker, iField;
   
   Wrt_Halo = config->GetWrt_Halo();
   
   Local_Data = new su2double*[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
     Local_Data[iPoint] = new su2double[GlobalField_Counter];
+    for (iField = 0; iField < GlobalField_Counter; iField++){
+      Local_Data[iPoint][iField] = 0.0;
+    }
   }
   
   Local_Halo = new int[geometry->GetnPoint()];
@@ -17200,10 +17206,33 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     if (!Local_Halo[iPoint] || Wrt_Halo) {
       
-      LoadVolumeData(config, geometry, solver, jPoint);
-      
-      jPoint++;
+      LoadVolumeData(config, geometry, solver, iPoint);
       
     }
   }
 }
+
+void COutput::CollectSurfaceData(CConfig* config, CGeometry *geometry, CSolver** solver){
+  
+  bool Wrt_Halo = config->GetWrt_Halo();
+  
+  unsigned short iMarker = 0;
+  unsigned long iVertex, iPoint;
+  
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+
+          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+          
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 08c95868eaa2e83c62fee71934d198e697d108ec Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Jul 2018 18:07:11 +0200
Subject: [PATCH 031/539] Added volume output for inc. solver

---
 SU2_CFD/include/output_structure.hpp   |  20 +-
 SU2_CFD/src/driver_structure.cpp       |   2 +-
 SU2_CFD/src/output_direct_mean.cpp     |  99 ++++++++++
 SU2_CFD/src/output_direct_mean_inc.cpp | 261 ++++++++++++++++++++++++-
 SU2_CFD/src/output_structure.cpp       |  41 ++--
 5 files changed, 386 insertions(+), 37 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index f50d495e1bf5..493e317de908 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1028,9 +1028,7 @@ class COutput {
   void SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value);
   
   void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
-    
-  void CollectSurfaceData(CConfig* config, CGeometry* geometry, CSolver** solver);
-  
+      
   virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   virtual void SetVolumeOutputFields(CConfig *config);
 };
@@ -1075,10 +1073,10 @@ class CFlowOutput : public COutput {
   
   void SetVolumeOutputFields(CConfig *config);
   
-  void SetHistoryOutputFields(CConfig *config);
-  
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
   
+  void SetHistoryOutputFields(CConfig *config);
+  
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
@@ -1112,6 +1110,10 @@ class CIncFlowOutput : public COutput {
   unsigned short nDim;
   unsigned short turb_model;
   bool heat, weakly_coupled_heat;
+  
+  bool grid_movement;
+  
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
  
 public:
 
@@ -1119,7 +1121,7 @@ class CIncFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
@@ -1154,6 +1156,12 @@ class CIncFlowOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
+  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
 };
 
 /*! \class CFEAOutput
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 2555d1016ad6..191979869db6 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3183,7 +3183,7 @@ void CDriver::Output_Preprocessing(){
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
         output[iZone] = new CFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
-        output[iZone] = new CIncFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CIncFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case HEAT_EQUATION_FVM:
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 2d75e6f494cf..a60e6e76a818 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -195,6 +195,20 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
   AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");  
   
+  // Turbulent Residuals
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("TKE", "TKE", "CONSERVATIVE");
+    AddVolumeOutputField("OMEGA", "Omega", "CONSERVATIVE");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    break;
+  case NONE:
+    break;
+  }
+  
   // Primitive variables
   AddVolumeOutputField("PRESSURE",    "Pressure",                "PRIMITIVE");
   AddVolumeOutputField("TEMPERATURE", "Temperature",             "PRIMITIVE");
@@ -230,6 +244,19 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutputField("RESIDUAL_MOMENTUM-Z", "Residual_Momentum-z", "RESIDUAL");
   AddVolumeOutputField("RESIDUAL_ENERGY", "Residual_Energy", "RESIDUAL");
   
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutputField("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    break;
+  case NONE:
+    break;
+  }
+  
   // Limiter values
   AddVolumeOutputField("LIMITER_DENSITY", "Limiter_Density", "LIMITER");
   AddVolumeOutputField("LIMITER_MOMENTUM-X", "Limiter_Momentum-x", "LIMITER");
@@ -238,6 +265,29 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutputField("LIMITER_MOMENTUM-Z", "Limiter_Momentum-z", "LIMITER");
   AddVolumeOutputField("LIMITER_ENERGY", "Limiter_Energy", "LIMITER");
   
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
+    AddVolumeOutputField("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Hybrid RANS-LES
+  if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
+    AddVolumeOutputField("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
+    AddVolumeOutputField("WALL_DISTANCE", "Wall_Distance", "DDES");
+  }
+  
+  // Roe Low Dissipation
+  if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+    AddVolumeOutputField("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+  }
 }
 
 void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -266,6 +316,20 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputFieldValue("ENERGY",     iPoint, Node_Flow->GetSolution(3));    
   }
   
+  // Turbulent Residuals
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("TKE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputFieldValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
+    break;
+  case NONE:
+    break;
+  }
+  
   SetVolumeOutputFieldValue("PRESSURE", iPoint, Node_Flow->GetPressure());
   SetVolumeOutputFieldValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
   SetVolumeOutputFieldValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
@@ -293,6 +357,19 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputFieldValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
   }
   
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputFieldValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    break;
+  case NONE:
+    break;
+  }
+  
   SetVolumeOutputFieldValue("LIMITER_DENSITY", iPoint, Node_Flow->GetLimiter_Primitive(0));
   SetVolumeOutputFieldValue("LIMITER_MOMENTUM-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
   SetVolumeOutputFieldValue("LIMITER_MOMENTUM-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
@@ -303,6 +380,28 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputFieldValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(3));   
   }
   
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputFieldValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
+    SetVolumeOutputFieldValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
+    SetVolumeOutputFieldValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
+  }
+  
+  if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+    SetVolumeOutputFieldValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
+  }
+  
 }
 
 void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 3878abeda5cd..2c2090f38972 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -38,7 +38,7 @@
 
 #include "../include/output_structure.hpp"
 
-CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
 
   nDim = geometry->GetnDim();
   
@@ -48,6 +48,31 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   
   weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
   
+  grid_movement = config->GetGrid_Movement(); 
+  
+  su2double Gas_Constant, Mach2Vel, Mach_Motion;
+  unsigned short iDim;
+  su2double Gamma = config->GetGamma();
+      
+  /*--- Set the non-dimensionalization for coefficients. ---*/
+  
+  RefArea = config->GetRefArea();
+  
+  if (grid_movement) {
+    Gas_Constant = config->GetGas_ConstantND();
+    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+    Mach_Motion = config->GetMach_Motion();
+    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+  }
+  else {
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  }
+  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
@@ -247,7 +272,241 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     
     
   }
+
+}
+
+
+void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
+  
+  // Grid coordinates
+  AddVolumeOutputField("COORD-X", "x", "COORDINATES");
+  AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+  
+  // Conservative variables
+  AddVolumeOutputField("PRESSURE",   "Pressure",   "CONSERVATIVE");
+  AddVolumeOutputField("VELOCITY-X", "Velocity-x", "CONSERVATIVE");
+  AddVolumeOutputField("VELOCITY-Y", "Velocity-y", "CONSERVATIVE");
+  if (nDim == 3)
+    AddVolumeOutputField("VELOCITY-Z", "Velocity-z", "CONSERVATIVE");
+  AddVolumeOutputField("TEMPERATURE",  "Temperature","CONSERVATIVE");  
+  
+  // Turbulent Residuals
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("TKE", "TKE", "CONSERVATIVE");
+    AddVolumeOutputField("OMEGA", "Omega", "CONSERVATIVE");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Primitive variables
+  AddVolumeOutputField("MACH",           "Mach",                 "PRIMITIVE");
+  AddVolumeOutputField("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  AddVolumeOutputField("DENSITY",        "Density",              "PRIMITIVE");
+  
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    AddVolumeOutputField("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    
+    AddVolumeOutputField("SKIN_FRICTION-X", "Skin_Friction_Coefficient-x", "PRIMITIVE");
+    AddVolumeOutputField("SKIN_FRICTION-Y", "Skin_Friction_Coefficient-y", "PRIMITIVE");
+    if (nDim == 3)
+      AddVolumeOutputField("SKIN_FRICTION-Z", "Skin_Friction_Coefficient-z", "PRIMITIVE");
+    
+    AddVolumeOutputField("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
+    AddVolumeOutputField("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    
+  }
+  
+  if (config->GetKind_Solver() == RANS) {
+    AddVolumeOutputField("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+  }
+  
+  if (config->GetKind_Trans_Model() == BC){
+    AddVolumeOutputField("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+  }
+
+  //Residuals
+  AddVolumeOutputField("RESIDUAL_PRESSURE", "Residual_Density", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_VELOCITY-X", "Residual_Momentum-x", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_VELOCITY-Y", "Residual_Momentum-y", "RESIDUAL");
+  if (nDim == 3)
+    AddVolumeOutputField("RESIDUAL_VELOCITY-Z", "Residual_Momentum-z", "RESIDUAL");
+  AddVolumeOutputField("RESIDUAL_TEMPERATURE", "Residual_Energy", "RESIDUAL");
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutputField("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Limiter values
+  AddVolumeOutputField("LIMITER_PRESSURE", "Limiter_Pressure", "LIMITER");
+  AddVolumeOutputField("LIMITER_VELOCITY-X", "Limiter_Velocity-x", "LIMITER");
+  AddVolumeOutputField("LIMITER_VELOCITY-Y", "Limiter_Velocity-y", "LIMITER");
+  if (nDim == 3)
+    AddVolumeOutputField("LIMITER_VELOCITY-Z", "Limiter_Velocity-z", "LIMITER");
+  AddVolumeOutputField("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER");
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutputField("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
+    AddVolumeOutputField("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutputField("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Hybrid RANS-LES
+  if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
+    AddVolumeOutputField("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
+    AddVolumeOutputField("WALL_DISTANCE", "Wall_Distance", "DDES");
+  }
   
+  // Roe Low Dissipation
+  if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+    AddVolumeOutputField("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+  }
+}
 
+void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+
+  CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
+  CVariable* Node_Turb;
+  
+  if (config->GetKind_Turb_Model() != NONE){
+    Node_Turb = solver[TURB_SOL]->node[iPoint]; 
+  }
+  
+  CPoint*    Node_Geo  = geometry->node[iPoint];
+          
+  SetVolumeOutputFieldValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputFieldValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputFieldValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputFieldValue("PRESSURE",    iPoint, Node_Flow->GetSolution(0));
+  SetVolumeOutputFieldValue("VELOCITY-X", iPoint, Node_Flow->GetSolution(1));
+  SetVolumeOutputFieldValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(3));
+    SetVolumeOutputFieldValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
+  } else {
+    SetVolumeOutputFieldValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));    
+  }
+  
+  // Turbulent Residuals
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("TKE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputFieldValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  SetVolumeOutputFieldValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
+  SetVolumeOutputFieldValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
+  SetVolumeOutputFieldValue("DENSITY", iPoint, Node_Flow->GetDensity());
+  
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    SetVolumeOutputFieldValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
+  }
+  
+  if (config->GetKind_Solver() == RANS) {
+    SetVolumeOutputFieldValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
+  }
+  
+  if (config->GetKind_Trans_Model() == BC){
+    SetVolumeOutputFieldValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
+  }
+  
+  SetVolumeOutputFieldValue("RESIDUAL_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputFieldValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+  } else {
+    SetVolumeOutputFieldValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+  }
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputFieldValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  SetVolumeOutputFieldValue("LIMITER_PRESSURE", iPoint, Node_Flow->GetLimiter_Primitive(0));
+  SetVolumeOutputFieldValue("LIMITER_VELOCITY-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
+  SetVolumeOutputFieldValue("LIMITER_VELOCITY-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
+  if (nDim == 3){
+    SetVolumeOutputFieldValue("LIMITER_VELOCITY-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
+    SetVolumeOutputFieldValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(4));
+  } else {
+    SetVolumeOutputFieldValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(3));   
+  }
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputFieldValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputFieldValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputFieldValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
+    SetVolumeOutputFieldValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
+    SetVolumeOutputFieldValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
+  }
+  
+  if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+    SetVolumeOutputFieldValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
+  }  
 }
 
+void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
+    SetVolumeOutputFieldValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
+    SetVolumeOutputFieldValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
+    if (nDim == 3)
+      SetVolumeOutputFieldValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
+  
+    SetVolumeOutputFieldValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+    SetVolumeOutputFieldValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
+  }
+}
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 7c51a9fbc1a9..1c378d7f2be3 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -10148,9 +10148,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
         cout << "Loading solution output data locally on each rank." << endl;
 
       CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-    
-      CollectSurfaceData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-      
+         
     /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
 
     if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
@@ -17197,8 +17195,9 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
   
   bool Wrt_Halo = config->GetWrt_Halo();
-  
+  unsigned short iMarker = 0;
   unsigned long iPoint = 0, jPoint = 0;
+  long iVertex = 0;
   
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
     
@@ -17206,33 +17205,17 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     if (!Local_Halo[iPoint] || Wrt_Halo) {
       
-      LoadVolumeData(config, geometry, solver, iPoint);
+      LoadVolumeData(config, geometry, solver, jPoint);
       
-    }
-  }
-}
-
-void COutput::CollectSurfaceData(CConfig* config, CGeometry *geometry, CSolver** solver){
-  
-  bool Wrt_Halo = config->GetWrt_Halo();
-  
-  unsigned short iMarker = 0;
-  unsigned long iVertex, iPoint;
-  
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-
-          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
-          
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          iVertex = geometry->node[iPoint]->GetVertex(iMarker);
+          if (iVertex != -1){ 
+            LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
+          }
         }
       }
+      jPoint++;
     }
   }
-}
\ No newline at end of file
+}

From dfdb1fdd2aa34c744e689046639ba8daa5c6ce23 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 22 Jul 2018 17:36:22 +0200
Subject: [PATCH 032/539] removed deallocation of data arrays for output

---
 SU2_CFD/src/output_direct_mean.cpp | 2 +-
 SU2_CFD/src/output_structure.cpp   | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index a60e6e76a818..e0de433101de 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -83,7 +83,7 @@ CFlowOutput::~CFlowOutput(void) {
 
 
 
-inline void CFlowOutput::SetHistoryOutputFields(CConfig *config){
+void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddOutputField("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 1c378d7f2be3..5a85cb8356ad 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -10348,10 +10348,6 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
       DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-      /*--- Clear the variable names list. ---*/
-
-      Variable_Names.clear();
-
     }
 
 }
@@ -13844,10 +13840,6 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   delete [] nPoint_Send;
   delete [] nPoint_Flag;
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    delete [] Local_Data[iPoint];
-  delete [] Local_Data;
-  
   delete [] Local_Halo;
   delete [] npoint_procs;
   delete [] starting_node;
@@ -15722,7 +15714,6 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
 
   delete [] buf;
 
-  delete [] Local_Halo;
   delete [] npoint_procs;
   delete [] nPoint_Linear;
 

From 63f693ef59d2b11975f257bac8dd147fd3f58198 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 11:55:24 +0200
Subject: [PATCH 033/539] Renamed variablese and added comments

---
 SU2_CFD/include/output_structure.hpp      |  84 +++--
 SU2_CFD/include/output_structure.inl      |  41 ++-
 SU2_CFD/src/output_adjoint_elasticity.cpp |  30 +-
 SU2_CFD/src/output_direct_elasticity.cpp  |  72 ++--
 SU2_CFD/src/output_direct_mean.cpp        | 384 ++++++++++-----------
 SU2_CFD/src/output_direct_mean_inc.cpp    | 401 +++++++++++-----------
 SU2_CFD/src/output_structure.cpp          | 111 ++++--
 7 files changed, 593 insertions(+), 530 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 493e317de908..8488d660532c 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -196,55 +196,63 @@ class COutput {
 
 protected:
 
-  int rank, 	/*!< \brief MPI Rank. */
+  int rank, 	  /*!< \brief MPI Rank. */
   size;       	/*!< \brief MPI Size. */
 
   unsigned short nDim;
   
-  unsigned short GlobalField_Counter;
-  
-  // TODO: COMMENT NEW STUFF
-  unsigned short field_width;
-  string HistorySep;
-  
-  vector<string> HistoryHeader;
-  vector<su2double> HistoryValues;
+  unsigned short GlobalField_Counter; /*!< \brief Number of fields in the volume output */ 
+
+  unsigned short field_width;         /*!< \brief Width of each column for the screen output (hardcoded for now) */
   
-  std::map<string, su2double> ValueMap;
+  /** \brief Enum to identify the screen output format. */
+  enum ScreenOutputFormat {           
+    FORMAT_INTEGER,         /*!< \brief Integer format. Example: 34 */
+    FORMAT_FIXED,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
+    FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
+  };
   
-  std::map<string, unsigned short> ScreenMapInt, ScreenMapFixed, ScreenMapScientific;
+  string HistorySep;                  /*!< \brief Character which separates values in the history file */
   
-  std::map<string, unsigned short> HistoryMap;
+  vector<string>    HistoryHeader;    /*!< \brief Vector containing the names of the fields printed to the history file. */
+  vector<su2double> HistoryValues;    /*!< \brief Vector containing the values of the fields printed to the history file. */
  
-  enum ScreenOutputFormat {
-    FORMAT_INTEGER,
-    FORMAT_FIXED,
-    FORMAT_SCIENTIFIC
-  };
   
+  /** \brief Structure to store information for a history output field.
+   * 
+   *  The stored information is printed to the history file and to screen. 
+   * Each individual instance represents a single field (i.e. column) in the history file or on screen.   
+   */
   struct HistoryOutputField {
-    string              FieldName;
-    su2double           Value;
-    unsigned short      ScreenFormat;
-    string              HistoryOutputGroup;
-    HistoryOutputField() {}
+    string              FieldName;    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
+    su2double           Value;        /*!< \brief The value of the field. */
+    unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
+    string              OutputGroup;  /*!< \brief The group this field belongs to. */
+    HistoryOutputField() {}           /*!< \brief Default constructor. */
     HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup):
-      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), HistoryOutputGroup(historyoutputgroup){}
+      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup){}
   };
   
+  /** \brief Structure to store information for a volume output field.
+   * 
+   *  The stored information is used to create the volume solution file.   
+   */
   struct VolumeOutputField {
-    string FieldName;
-    int    Offset;
-    string VolumeOutputGroup;
-    VolumeOutputField () {}
+    string FieldName;          /*!< \brief The name of the field, i.e. the name that is printed in the file header.*/
+    int    Offset;             /*!< \brief This value identifies the position of the values of this field at each node in the Local_Data array. */
+    string OutputGroup;        /*!< \brief The group this field belongs to. */
+    VolumeOutputField () {}    /*!< \brief Default constructor. */
     VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
-      FieldName(fieldname), Offset(offset), VolumeOutputGroup(volumeoutputgroup){}
+      FieldName(fieldname), Offset(offset), OutputGroup(volumeoutputgroup){}
   };
   
-  std::map<string, HistoryOutputField >         Output_Fields;
-  std::map<string, vector<HistoryOutputField> > OutputPerSurface_Fields;
-  std::map<string, VolumeOutputField >          VolumeOutput_Fields;
+  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */ 
+  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */ 
+  std::map<string, vector<HistoryOutputField> > HistoryOutputPerSurface_Map; /*!< \brief Associative map to access data stored in the history per surface output fields by a string identifier. */ 
+  std::vector<string>                           HistoryOutputPerSurface_List;  /*!< \brief Vector that contains the keys of the HistoryOutputPerSurface_Map in the order of their insertion. */ 
   
+  std::map<string, VolumeOutputField >          VolumeOutput_Map;
+  std::vector<string>                           VolumeOutput_List;
   char char_histfile[200];
 
   ofstream HistFile;
@@ -258,7 +266,7 @@ class COutput {
   /*! 
    * \brief Destructor of the class. 
    */
-  ~COutput(void);
+  virtual ~COutput(void);
 
   /*! 
    * \brief Writes and organizes the all the output files, except the history one, for serial computations.
@@ -1009,23 +1017,23 @@ class COutput {
   
   void PrintHistorySep(stringstream& stream);
   
-  void AddOutputField(string name, string field_name, unsigned short format, string groupname );
+  void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname );
   
-  void SetOutputFieldValue(string name, su2double value);
+  void SetHistoryOutputField(string name, su2double value);
   
-  void AddOutputPerSurfaceField(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names);
+  void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names);
   
-  void SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker);
+  void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker);
   
   void PreprocessHistoryOutput(CConfig *config);  
   
   void PreprocessVolumeOutput(CConfig *config, CGeometry *geometry);  
   
-  void AddVolumeOutputField(string name, string field_name, string groupname);
+  void AddVolumeOutput(string name, string field_name, string groupname);
   
   virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);   
   
-  void SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value);
+  void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
   
   void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
       
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 4f6ad352d6a6..4abb88d64f10 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -50,11 +50,11 @@ inline void COutput::SetHistoryOutputFields(CConfig *config){}
 
 inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
  
-inline bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { }
+inline bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
 
-inline bool COutput::WriteScreen_Header(CConfig *config) { }
+inline bool COutput::WriteScreen_Header(CConfig *config) { return true; }
 
-inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { }
+inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { return true; }
 
 inline void COutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
@@ -93,40 +93,43 @@ inline void COutput::PrintHistorySep(stringstream& stream){
   stream << HistorySep;
 }
 
-inline void COutput::AddOutputField(string name, string field_name, unsigned short format, string groupname ){
-  Output_Fields[name] = HistoryOutputField(field_name, format, groupname);
+inline void COutput::AddHistoryOutput(string name, string field_name, unsigned short format, string groupname ){
+  HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname);
+  HistoryOutput_List.push_back(name);
 }
 
-inline void COutput::AddOutputPerSurfaceField(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
+inline void COutput::AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
   for (unsigned short i = 0; i < marker_names.size(); i++){
-    OutputPerSurface_Fields[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
+    HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
+    HistoryOutputPerSurface_List.push_back(field_name+"("+marker_names[i]+")");
   }
 }
 
-inline void COutput::SetOutputFieldValue(string name, su2double value){
-  if (Output_Fields.count(name) > 0){
-    Output_Fields[name].Value = value;
+inline void COutput::SetHistoryOutputField(string name, su2double value){
+  if (HistoryOutput_Map.count(name) > 0){
+    HistoryOutput_Map[name].Value = value;
   } else {
     SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
   }
 }
 
-inline void COutput::SetOutputPerSurfaceFieldValue(string name, su2double value, unsigned short iMarker){
-  if (OutputPerSurface_Fields.count(name) > 0){
-    OutputPerSurface_Fields[name][iMarker].Value = value;
+inline void COutput::SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker){
+  if (HistoryOutputPerSurface_Map.count(name) > 0){
+    HistoryOutputPerSurface_Map[name][iMarker].Value = value;
   } else {
     SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
   }
 }
 
-inline void COutput::AddVolumeOutputField(string name, string field_name, string groupname){
-  VolumeOutput_Fields[name] = VolumeOutputField(field_name, -1, groupname);
+inline void COutput::AddVolumeOutput(string name, string field_name, string groupname){
+  VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname);
+  VolumeOutput_List.push_back(name);
 }
 
-inline void COutput::SetVolumeOutputFieldValue(string name, unsigned long iPoint, su2double value){
-  if (VolumeOutput_Fields.count(name) > 0){
-    if (VolumeOutput_Fields[name].Offset != -1){
-      Local_Data[iPoint][VolumeOutput_Fields[name].Offset] = value;
+inline void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
+  if (VolumeOutput_Map.count(name) > 0){
+    if (VolumeOutput_Map[name].Offset != -1){
+      Local_Data[iPoint][VolumeOutput_Map[name].Offset] = value;
     }
   } else {
     SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index ea321adf2751..b9b59f24f8f3 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -68,17 +68,17 @@ inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_du
 void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Residuals
-  AddOutputField("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS");
   
   //Sensitivities
-  AddOutputField("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY");
-  AddOutputField("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY");
+  AddHistoryOutput("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY");
+  AddHistoryOutput("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY");
 
   
 }
@@ -86,15 +86,15 @@ void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
 inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetOutputFieldValue("PHYS_TIME", timeused);
+  SetHistoryOutputField("PHYS_TIME", timeused);
   
-  SetOutputFieldValue("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
-  SetOutputFieldValue("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputField("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputField("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
   if (nVar_FEM == 3){
-    SetOutputFieldValue("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
+    SetHistoryOutputField("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
   }
   su2double Total_SensE = 0.0; su2double Total_SensNu = 0.0;  
   if (config[val_iZone]->GetnElasticityMod() == 1){
@@ -112,8 +112,8 @@ inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *
     Total_SensNu = sqrt(Total_SensNu);
 
   }
-  SetOutputFieldValue("SENS_E", Total_SensE);
-  SetOutputFieldValue("SENS_NU", Total_SensNu);
+  SetHistoryOutputField("SENS_E", Total_SensE);
+  SetHistoryOutputField("SENS_NU", Total_SensNu);
   
 }
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 80d23abb7370..8451d298c1f9 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -68,20 +68,16 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
                                      unsigned short val_iZone,
                                      unsigned short val_iInst) {
 
-  bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-              (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+  CSolver* fea_solver = solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL];
+  
+  
   bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-  bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-  bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-
-  unsigned short iVar;
-  unsigned short nDim = geometry[val_iZone][INST_0][MESH_0]->GetnDim();
 
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetOutputFieldValue("PHYS_TIME", timeused);
+  SetHistoryOutputField("PHYS_TIME", timeused);
   
   /*--- Residuals: ---*/
   /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
@@ -89,57 +85,57 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 
   
   if (linear_analysis){
-    SetOutputFieldValue("UTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("RTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputField("UTOL", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputField("RTOL", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetOutputFieldValue("ETOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(2)));    
+      SetHistoryOutputField("ETOL", log10(fea_solver->GetRes_RMS(2)));    
     }
-    SetOutputFieldValue("DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputField("DISP_X", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputField("DISP_Y", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetOutputFieldValue("DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_RMS(2)));    
+      SetHistoryOutputField("DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
     }
   } else if (nonlinear_analysis){
-    SetOutputFieldValue("UTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(0)));
-    SetOutputFieldValue("RTOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(1)));
+    SetHistoryOutputField("UTOL", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputField("RTOL", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetOutputFieldValue("ETOL", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(2)));    
+      SetHistoryOutputField("ETOL", log10(fea_solver->GetRes_FEM(2)));    
     }
-    SetOutputFieldValue("DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(0)));
-    SetOutputFieldValue("DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(1)));
+    SetHistoryOutputField("DISP_X", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputField("DISP_Y", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetOutputFieldValue("DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetRes_FEM(2)));    
+      SetHistoryOutputField("DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
     }
   }
   
-  SetOutputFieldValue("VMS", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetTotal_CFEA());
-  SetOutputFieldValue("LOAD_INCREMENT", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetLoad_Increment());
-  SetOutputFieldValue("LOAD_RAMP", solver_container[val_iZone][INST_0][MESH_0][FEA_SOL]->GetForceCoeff());
+  SetHistoryOutputField("VMS", fea_solver->GetTotal_CFEA());
+  SetHistoryOutputField("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
+  SetHistoryOutputField("LOAD_RAMP", fea_solver->GetForceCoeff());
   
 }
 
 void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Misc.
-  AddOutputField("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
-  AddOutputField("UTOL",   "Res[U]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("RTOL",   "Res[R]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("ETOL",   "Res[E]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_X", "Res[DispX]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_Y", "Res[DispY]", FORMAT_FIXED,  "RESIDUALS");
-  AddOutputField("DISP_Z", "Res[DispZ]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("UTOL",   "Res[U]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("RTOL",   "Res[R]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("ETOL",   "Res[E]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("DISP_X", "Res[DispX]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("DISP_Y", "Res[DispY]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("DISP_Z", "Res[DispZ]", FORMAT_FIXED,  "RESIDUALS");
   
   
-  AddOutputField("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");
-  AddOutputField("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
-  AddOutputField("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "LOAD_RAMP");
+  AddHistoryOutput("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");
+  AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
+  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "LOAD_RAMP");
   
 }
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index a60e6e76a818..02056a7bc412 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -86,95 +86,95 @@ CFlowOutput::~CFlowOutput(void) {
 inline void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",   FORMAT_INTEGER, "EXT_ITER");
-  AddOutputField("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",   FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   
   // Residuals
-  AddOutputField("DENSITY",    "Res[Rho]",  FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("MOMENTUM-X", "Res[RhoU]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("MOMENTUM-Y", "Res[RhoV]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("DENSITY",    "Res[Rho]",  FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("MOMENTUM-X", "Res[RhoU]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("MOMENTUM-Y", "Res[RhoV]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddOutputField("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
     break;  
   case SST:
-    AddOutputField("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
-    AddOutputField("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
     break;
   default: break;
   }
   
   // Aerodynamic coefficients
-  AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
   // Aerodynamic coefficients (per surface)  
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
-  AddOutputPerSurfaceField("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
  
   
   // Misc.
-  AddOutputField("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
   // Surface output
   vector<string> Marker_Analyze;
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
   }  
-  AddOutputPerSurfaceField("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
   
   // Engine output
-  AddOutputField("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddOutputField("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddOutputField("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddOutputField("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
   
   // Rotating Frame
-  AddOutputField("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddOutputField("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddOutputField("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
   
   //Equivalent area
-  AddOutputField("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
-  AddOutputField("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
+  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
+  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
 
 
 }
@@ -182,97 +182,97 @@ inline void CFlowOutput::SetHistoryOutputFields(CConfig *config){
 void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutputField("COORD-X", "x", "COORDINATES");
-  AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
   if (nDim == 3)
-    AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
   // Conservative variables
-  AddVolumeOutputField("DENSITY",    "Density",    "CONSERVATIVE");
-  AddVolumeOutputField("MOMENTUM-X", "Momentum-x", "CONSERVATIVE");
-  AddVolumeOutputField("MOMENTUM-Y", "Momentum-y", "CONSERVATIVE");
+  AddVolumeOutput("DENSITY",    "Density",    "CONSERVATIVE");
+  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "CONSERVATIVE");
+  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "CONSERVATIVE");
   if (nDim == 3)
-    AddVolumeOutputField("MOMENTUM-Z", "Momentum-z", "CONSERVATIVE");
-  AddVolumeOutputField("ENERGY",     "Energy",     "CONSERVATIVE");  
+    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "CONSERVATIVE");
+  AddVolumeOutput("ENERGY",     "Energy",     "CONSERVATIVE");  
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("TKE", "TKE", "CONSERVATIVE");
-    AddVolumeOutputField("OMEGA", "Omega", "CONSERVATIVE");
+    AddVolumeOutput("TKE", "TKE", "CONSERVATIVE");
+    AddVolumeOutput("OMEGA", "Omega", "CONSERVATIVE");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
     break;
   case NONE:
     break;
   }
   
   // Primitive variables
-  AddVolumeOutputField("PRESSURE",    "Pressure",                "PRIMITIVE");
-  AddVolumeOutputField("TEMPERATURE", "Temperature",             "PRIMITIVE");
-  AddVolumeOutputField("MACH",        "Mach",                    "PRIMITIVE");
-  AddVolumeOutputField("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE");
+  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE");
+  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    AddVolumeOutputField("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
     
-    AddVolumeOutputField("SKIN_FRICTION-X", "Skin_Friction_Coefficient-x", "PRIMITIVE");
-    AddVolumeOutputField("SKIN_FRICTION-Y", "Skin_Friction_Coefficient-y", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE");
     if (nDim == 3)
-      AddVolumeOutputField("SKIN_FRICTION-Z", "Skin_Friction_Coefficient-z", "PRIMITIVE");
+      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE");
     
-    AddVolumeOutputField("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
-    AddVolumeOutputField("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
+    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE");
     
   }
   
   if (config->GetKind_Solver() == RANS) {
-    AddVolumeOutputField("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    AddVolumeOutputField("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
   }
 
   //Residuals
-  AddVolumeOutputField("RESIDUAL_DENSITY", "Residual_Density", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_MOMENTUM-X", "Residual_Momentum-x", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_MOMENTUM-Y", "Residual_Momentum-y", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_DENSITY", "Residual_Density", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_MOMENTUM-X", "Residual_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_MOMENTUM-Y", "Residual_Momentum_y", "RESIDUAL");
   if (nDim == 3)
-    AddVolumeOutputField("RESIDUAL_MOMENTUM-Z", "Residual_Momentum-z", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_ENERGY", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_MOMENTUM-Z", "Residual_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ENERGY", "Residual_Energy", "RESIDUAL");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutputField("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
   }
   
   // Limiter values
-  AddVolumeOutputField("LIMITER_DENSITY", "Limiter_Density", "LIMITER");
-  AddVolumeOutputField("LIMITER_MOMENTUM-X", "Limiter_Momentum-x", "LIMITER");
-  AddVolumeOutputField("LIMITER_MOMENTUM-Y", "Limiter_Momentum-y", "LIMITER");
+  AddVolumeOutput("LIMITER_DENSITY", "Limiter_Density", "LIMITER");
+  AddVolumeOutput("LIMITER_MOMENTUM-X", "Limiter_Momentum_x", "LIMITER");
+  AddVolumeOutput("LIMITER_MOMENTUM-Y", "Limiter_Momentum_y", "LIMITER");
   if (nDim == 3)
-    AddVolumeOutputField("LIMITER_MOMENTUM-Z", "Limiter_Momentum-z", "LIMITER");
-  AddVolumeOutputField("LIMITER_ENERGY", "Limiter_Energy", "LIMITER");
+    AddVolumeOutput("LIMITER_MOMENTUM-Z", "Limiter_Momentum_z", "LIMITER");
+  AddVolumeOutput("LIMITER_ENERGY", "Limiter_Energy", "LIMITER");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutputField("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
+    AddVolumeOutput("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
@@ -280,20 +280,20 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   // Hybrid RANS-LES
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    AddVolumeOutputField("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
-    AddVolumeOutputField("WALL_DISTANCE", "Wall_Distance", "DDES");
+    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
+    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES");
   }
   
   // Roe Low Dissipation
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    AddVolumeOutputField("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
   }
 }
 
 void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
-  CVariable* Node_Turb;
+  CVariable* Node_Turb = NULL;
   
   if (config->GetKind_Turb_Model() != NONE){
     Node_Turb = solver[TURB_SOL]->node[iPoint]; 
@@ -301,105 +301,105 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
   
   CPoint*    Node_Geo  = geometry->node[iPoint];
           
-  SetVolumeOutputFieldValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
-  SetVolumeOutputFieldValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
   if (nDim == 3)
-    SetVolumeOutputFieldValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
   
-  SetVolumeOutputFieldValue("DENSITY",    iPoint, Node_Flow->GetSolution(0));
-  SetVolumeOutputFieldValue("MOMENTUM-X", iPoint, Node_Flow->GetSolution(1));
-  SetVolumeOutputFieldValue("MOMENTUM-Y", iPoint, Node_Flow->GetSolution(2));
+  SetVolumeOutputValue("DENSITY",    iPoint, Node_Flow->GetSolution(0));
+  SetVolumeOutputValue("MOMENTUM-X", iPoint, Node_Flow->GetSolution(1));
+  SetVolumeOutputValue("MOMENTUM-Y", iPoint, Node_Flow->GetSolution(2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("MOMENTUM-Z", iPoint, Node_Flow->GetSolution(3));
-    SetVolumeOutputFieldValue("ENERGY",     iPoint, Node_Flow->GetSolution(4));
+    SetVolumeOutputValue("MOMENTUM-Z", iPoint, Node_Flow->GetSolution(3));
+    SetVolumeOutputValue("ENERGY",     iPoint, Node_Flow->GetSolution(4));
   } else {
-    SetVolumeOutputFieldValue("ENERGY",     iPoint, Node_Flow->GetSolution(3));    
+    SetVolumeOutputValue("ENERGY",     iPoint, Node_Flow->GetSolution(3));    
   }
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("TKE", iPoint, Node_Turb->GetSolution(0));
-    SetVolumeOutputFieldValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
     break;
   case NONE:
     break;
   }
   
-  SetVolumeOutputFieldValue("PRESSURE", iPoint, Node_Flow->GetPressure());
-  SetVolumeOutputFieldValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
-  SetVolumeOutputFieldValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
-  SetVolumeOutputFieldValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
+  SetVolumeOutputValue("PRESSURE", iPoint, Node_Flow->GetPressure());
+  SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
+  SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    SetVolumeOutputFieldValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
+    SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
   }
   
   if (config->GetKind_Solver() == RANS) {
-    SetVolumeOutputFieldValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
+    SetVolumeOutputValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    SetVolumeOutputFieldValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
+    SetVolumeOutputValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
   }
   
-  SetVolumeOutputFieldValue("RESIDUAL_DENSITY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
-  SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
-  SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  SetVolumeOutputValue("RESIDUAL_DENSITY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RESIDUAL_MOMENTUM-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputValue("RESIDUAL_MOMENTUM-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("RESIDUAL_MOMENTUM-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
-    SetVolumeOutputFieldValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+    SetVolumeOutputValue("RESIDUAL_MOMENTUM-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
   } else {
-    SetVolumeOutputFieldValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+    SetVolumeOutputValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    SetVolumeOutputFieldValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    SetVolumeOutputValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     break;
   case NONE:
     break;
   }
   
-  SetVolumeOutputFieldValue("LIMITER_DENSITY", iPoint, Node_Flow->GetLimiter_Primitive(0));
-  SetVolumeOutputFieldValue("LIMITER_MOMENTUM-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
-  SetVolumeOutputFieldValue("LIMITER_MOMENTUM-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
+  SetVolumeOutputValue("LIMITER_DENSITY", iPoint, Node_Flow->GetLimiter_Primitive(0));
+  SetVolumeOutputValue("LIMITER_MOMENTUM-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
+  SetVolumeOutputValue("LIMITER_MOMENTUM-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("LIMITER_MOMENTUM-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
-    SetVolumeOutputFieldValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(4));
+    SetVolumeOutputValue("LIMITER_MOMENTUM-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
+    SetVolumeOutputValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(4));
   } else {
-    SetVolumeOutputFieldValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(3));   
+    SetVolumeOutputValue("LIMITER_ENERGY", iPoint, Node_Flow->GetLimiter_Primitive(3));   
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
-    SetVolumeOutputFieldValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
     break;
   case NONE:
     break;
   }
   
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    SetVolumeOutputFieldValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
-    SetVolumeOutputFieldValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
+    SetVolumeOutputValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
+    SetVolumeOutputValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
   }
   
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    SetVolumeOutputFieldValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
+    SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
   }
   
 }
@@ -407,13 +407,13 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
 void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
-    SetVolumeOutputFieldValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
-    SetVolumeOutputFieldValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
+    SetVolumeOutputValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
+    SetVolumeOutputValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
     if (nDim == 3)
-      SetVolumeOutputFieldValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
+      SetVolumeOutputValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
   
-    SetVolumeOutputFieldValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
-    SetVolumeOutputFieldValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
+    SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+    SetVolumeOutputValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
   }
 }
 
@@ -421,80 +421,82 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   unsigned short iVar;
   
+  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
+  CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
   
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());  
-  SetOutputFieldValue("PHYS_TIME", timeused);
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());  
+  SetHistoryOutputField("PHYS_TIME", timeused);
   
-  SetOutputFieldValue("DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(0)));
-  SetOutputFieldValue("MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(1)));
-  SetOutputFieldValue("MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputField("DENSITY", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputField("MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputField("MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
   if (nDim == 2)
-    SetOutputFieldValue("ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputField("ENERGY", log10(flow_solver->GetRes_RMS(3)));
   else {
-    SetOutputFieldValue("MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
-    SetOutputFieldValue("ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputField("MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputField("ENERGY", log10(flow_solver->GetRes_RMS(4)));
   }
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetOutputFieldValue("NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputField("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetOutputFieldValue("KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputField("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputField("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   default: break;
   }
   
-  SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
-  SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
+  SetHistoryOutputField("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputField("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
-    SetOutputFieldValue("SIDEFORCE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CSF());
-  SetOutputFieldValue("MOMENT-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx());
-  SetOutputFieldValue("MOMENT-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy());
+    SetHistoryOutputField("SIDEFORCE", flow_solver->GetTotal_CSF());
+  SetHistoryOutputField("MOMENT-X", flow_solver->GetTotal_CMx());
+  SetHistoryOutputField("MOMENT-Y", flow_solver->GetTotal_CMy());
   if (nDim == 3)
-    SetOutputFieldValue("MOMENT-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz());
-  SetOutputFieldValue("FORCE-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx());
-  SetOutputFieldValue("FORCE-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy());
+    SetHistoryOutputField("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputField("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputField("FORCE-Y", flow_solver->GetTotal_CFy());
   if (nDim == 3)
-    SetOutputFieldValue("FORCE-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz());
+    SetHistoryOutputField("FORCE-Z", flow_solver->GetTotal_CFz());
   
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    SetOutputPerSurfaceFieldValue("DRAG_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("LIFT_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("SIDEFORCE_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("MOMENT-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("MOMENT-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("MOMENT-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("FORCE-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("FORCE-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("FORCE-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
+      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
   }
   
-  SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
-  SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
-  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
+  SetHistoryOutputField("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputField("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
+  SetHistoryOutputField("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++) {  
-    SetOutputPerSurfaceFieldValue("AVG_MASSFLOW",               config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_MACH",                   config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TEMP",                   config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_PRESS",                  config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_DENSITY",                config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_ENTHALPY",               config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_NORMALVEL",              config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("UNIFORMITY",                 config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("SECONDARY_STRENGTH",         config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("MOMENTUM_DISTORTION",        config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TOTALTEMP",              config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TOTALPRESS",             config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("PRESSURE_DROP",              config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW",               config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MACH",                   config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TEMP",                   config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_PRESS",                  config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",                config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",               config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",              config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("UNIFORMITY",                 config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",         config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",        config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",              config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",             config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",              config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
   }
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 2c2090f38972..0ba97de3ab7f 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -88,43 +88,43 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Residuals
-  AddOutputField("PRESSURE",   "Res[P]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("VELOCITY-X", "Res[U]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
-  AddOutputField("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("PRESSURE",   "Res[P]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("VELOCITY-X", "Res[U]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddOutputField("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
     break;  
   case SST:
-    AddOutputField("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
-    AddOutputField("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
     break;
   }
   
   if (heat || weakly_coupled_heat){
-    AddOutputField("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
-    AddOutputField("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
-    AddOutputField("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
-    AddOutputField("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
+    AddHistoryOutput("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
+    AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
+    AddHistoryOutput("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
   }
   
   // Aerodynamic coefficients
-  AddOutputField("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddOutputField("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
+  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
@@ -132,42 +132,42 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   }
   
   // Aerodynamic coefficients (per surface)  
-  AddOutputPerSurfaceField("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddOutputPerSurfaceField("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
   
   
   // Misc.
-  AddOutputField("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
-  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
   // Surface output
   vector<string> Marker_Analyze;
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
   }  
-  AddOutputPerSurfaceField("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddOutputPerSurfaceField("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
 
   
 }
@@ -189,86 +189,90 @@ inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualt
 inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
-  SetOutputFieldValue("PRESSURE", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(0)));
-  SetOutputFieldValue("VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(1)));
-  SetOutputFieldValue("VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(2)));
-  if (nDim == 3) SetOutputFieldValue("VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
+  CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];  
+  CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];
+  
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputField("PRESSURE", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputField("VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputField("VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
+  if (nDim == 3) SetHistoryOutputField("VELOCITY-Z", log10(flow_solver->GetRes_RMS(3)));
  
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetOutputFieldValue("NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputField("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetOutputFieldValue("KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputField("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputField("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   }
   if (weakly_coupled_heat){
-    SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_HeatFlux());
-    SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_MaxHeatFlux());
-    SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_AvgTemperature());
-    SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputField("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
+    SetHistoryOutputField("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
+    SetHistoryOutputField("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
+    SetHistoryOutputField("HEAT",         log10(heat_solver->GetRes_RMS(0)));
   }
   if (heat){
-    SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_HeatFlux());
-    SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_MaxHeatFlux());
-    SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_AvgTemperature());
-    if (nDim == 3) SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(4)));
-    else           SetOutputFieldValue("HEAT",         log10(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputField("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
+    SetHistoryOutputField("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
+    SetHistoryOutputField("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
+    if (nDim == 3) SetHistoryOutputField("HEAT",         log10(flow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputField("HEAT",         log10(flow_solver->GetRes_RMS(3)));
 
   }
-  SetOutputFieldValue("DRAG", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CD());
-  SetOutputFieldValue("LIFT", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CL());
+  SetHistoryOutputField("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputField("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
-    SetOutputFieldValue("SIDEFORCE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CSF());
-  SetOutputFieldValue("MOMENT-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMx());
-  SetOutputFieldValue("MOMENT-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMy());
+    SetHistoryOutputField("SIDEFORCE", flow_solver->GetTotal_CSF());
+  SetHistoryOutputField("MOMENT-X", flow_solver->GetTotal_CMx());
+  SetHistoryOutputField("MOMENT-Y", flow_solver->GetTotal_CMy());
   if (nDim == 3)
-    SetOutputFieldValue("MOMENT-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CMz());
-  SetOutputFieldValue("FORCE-X", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFx());
-  SetOutputFieldValue("FORCE-Y", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFy());
+    SetHistoryOutputField("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputField("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputField("FORCE-Y", flow_solver->GetTotal_CFy());
   if (nDim == 3)
-    SetOutputFieldValue("FORCE-Z", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetTotal_CFz());
+    SetHistoryOutputField("FORCE-Z", flow_solver->GetTotal_CFz());
   
-  SetOutputFieldValue("AOA", config[val_iZone]->GetAoA());
-  SetOutputFieldValue("EFFICIENCY", Output_Fields["DRAG"].Value/Output_Fields["LIFT"].Value);
-  SetOutputFieldValue("PHYS_TIME", timeused);
-  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetIterLinSolver());
+  SetHistoryOutputField("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputField("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
+  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputField("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    SetOutputPerSurfaceFieldValue("DRAG_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("LIFT_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("SIDEFORCE_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("MOMENT-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("MOMENT-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("MOMENT-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("FORCE-X_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
-    SetOutputPerSurfaceFieldValue("FORCE-Y_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetOutputPerSurfaceFieldValue("FORCE-Z_ON_SURFACE", solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
+      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
   }
   
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++){
     
-    SetOutputPerSurfaceFieldValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_ENTHALPY",  config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_NORMALVEL",  config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("UNIFORMITY",  config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("SECONDARY_STRENGTH",  config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("MOMENTUM_DISTORTION",  config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TOTALTEMP",  config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("AVG_TOTALPRESS",  config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetOutputPerSurfaceFieldValue("PRESSURE_DROP",  config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",  config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",  config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("UNIFORMITY",  config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",  config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",  config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",  config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",  config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
     
     
   }
@@ -279,96 +283,103 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
 void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutputField("COORD-X", "x", "COORDINATES");
-  AddVolumeOutputField("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
   if (nDim == 3)
-    AddVolumeOutputField("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
   // Conservative variables
-  AddVolumeOutputField("PRESSURE",   "Pressure",   "CONSERVATIVE");
-  AddVolumeOutputField("VELOCITY-X", "Velocity-x", "CONSERVATIVE");
-  AddVolumeOutputField("VELOCITY-Y", "Velocity-y", "CONSERVATIVE");
+  AddVolumeOutput("PRESSURE",   "Pressure",   "CONSERVATIVE");
+  AddVolumeOutput("VELOCITY-X", "Velocity_x", "CONSERVATIVE");
+  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "CONSERVATIVE");
   if (nDim == 3)
-    AddVolumeOutputField("VELOCITY-Z", "Velocity-z", "CONSERVATIVE");
-  AddVolumeOutputField("TEMPERATURE",  "Temperature","CONSERVATIVE");  
+    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "CONSERVATIVE");
+  AddVolumeOutput("TEMPERATURE",  "Temperature","CONSERVATIVE");  
   
-  // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("TKE", "TKE", "CONSERVATIVE");
-    AddVolumeOutputField("OMEGA", "Omega", "CONSERVATIVE");
+    AddVolumeOutput("TKE", "TKE", "CONSERVATIVE");
+    AddVolumeOutput("OMEGA", "Omega", "CONSERVATIVE");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
     break;
   case NONE:
     break;
   }
   
+  // Grid velocity
+  if (config->GetGrid_Movement()){
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    if (nDim == 3 ) 
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+  }
+  
   // Primitive variables
-  AddVolumeOutputField("MACH",           "Mach",                 "PRIMITIVE");
-  AddVolumeOutputField("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
-  AddVolumeOutputField("DENSITY",        "Density",              "PRIMITIVE");
+  AddVolumeOutput("MACH",           "Mach",                 "PRIMITIVE");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  AddVolumeOutput("DENSITY",        "Density",              "PRIMITIVE");
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    AddVolumeOutputField("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
     
-    AddVolumeOutputField("SKIN_FRICTION-X", "Skin_Friction_Coefficient-x", "PRIMITIVE");
-    AddVolumeOutputField("SKIN_FRICTION-Y", "Skin_Friction_Coefficient-y", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE");
     if (nDim == 3)
-      AddVolumeOutputField("SKIN_FRICTION-Z", "Skin_Friction_Coefficient-z", "PRIMITIVE");
+      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE");
     
-    AddVolumeOutputField("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
-    AddVolumeOutputField("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
+    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE");
     
   }
   
   if (config->GetKind_Solver() == RANS) {
-    AddVolumeOutputField("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    AddVolumeOutputField("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
   }
 
   //Residuals
-  AddVolumeOutputField("RESIDUAL_PRESSURE", "Residual_Density", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_VELOCITY-X", "Residual_Momentum-x", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_VELOCITY-Y", "Residual_Momentum-y", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_PRESSURE", "Residual_Density", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_VELOCITY-X", "Residual_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_VELOCITY-Y", "Residual_Momentum_y", "RESIDUAL");
   if (nDim == 3)
-    AddVolumeOutputField("RESIDUAL_VELOCITY-Z", "Residual_Momentum-z", "RESIDUAL");
-  AddVolumeOutputField("RESIDUAL_TEMPERATURE", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_VELOCITY-Z", "Residual_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_TEMPERATURE", "Residual_Energy", "RESIDUAL");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutputField("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
   }
   
   // Limiter values
-  AddVolumeOutputField("LIMITER_PRESSURE", "Limiter_Pressure", "LIMITER");
-  AddVolumeOutputField("LIMITER_VELOCITY-X", "Limiter_Velocity-x", "LIMITER");
-  AddVolumeOutputField("LIMITER_VELOCITY-Y", "Limiter_Velocity-y", "LIMITER");
+  AddVolumeOutput("LIMITER_PRESSURE", "Limiter_Pressure", "LIMITER");
+  AddVolumeOutput("LIMITER_VELOCITY-X", "Limiter_Velocity_x", "LIMITER");
+  AddVolumeOutput("LIMITER_VELOCITY-Y", "Limiter_Velocity_y", "LIMITER");
   if (nDim == 3)
-    AddVolumeOutputField("LIMITER_VELOCITY-Z", "Limiter_Velocity-z", "LIMITER");
-  AddVolumeOutputField("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER");
+    AddVolumeOutput("LIMITER_VELOCITY-Z", "Limiter_Velocity_z", "LIMITER");
+  AddVolumeOutput("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutputField("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutputField("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
+    AddVolumeOutput("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutputField("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
@@ -376,20 +387,20 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   // Hybrid RANS-LES
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    AddVolumeOutputField("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
-    AddVolumeOutputField("WALL_DISTANCE", "Wall_Distance", "DDES");
+    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
+    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES");
   }
   
   // Roe Low Dissipation
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    AddVolumeOutputField("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
   }
 }
 
 void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
 
   CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
-  CVariable* Node_Turb;
+  CVariable* Node_Turb = NULL;
   
   if (config->GetKind_Turb_Model() != NONE){
     Node_Turb = solver[TURB_SOL]->node[iPoint]; 
@@ -397,116 +408,122 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   
   CPoint*    Node_Geo  = geometry->node[iPoint];
           
-  SetVolumeOutputFieldValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
-  SetVolumeOutputFieldValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
   if (nDim == 3)
-    SetVolumeOutputFieldValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
   
-  SetVolumeOutputFieldValue("PRESSURE",    iPoint, Node_Flow->GetSolution(0));
-  SetVolumeOutputFieldValue("VELOCITY-X", iPoint, Node_Flow->GetSolution(1));
-  SetVolumeOutputFieldValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(2));
+  SetVolumeOutputValue("PRESSURE",    iPoint, Node_Flow->GetSolution(0));
+  SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Flow->GetSolution(1));
+  SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(3));
-    SetVolumeOutputFieldValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
+    SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(3));
+    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
   } else {
-    SetVolumeOutputFieldValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));    
+    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));    
   }
   
-  // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("TKE", iPoint, Node_Turb->GetSolution(0));
-    SetVolumeOutputFieldValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
+    SetVolumeOutputValue("NU_TILDE", iPoint, Node_Turb->GetSolution(0));
     break;
   case NONE:
     break;
   }
   
-  SetVolumeOutputFieldValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
-  SetVolumeOutputFieldValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
-  SetVolumeOutputFieldValue("DENSITY", iPoint, Node_Flow->GetDensity());
+  if (config->GetGrid_Movement()){
+    SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel()[0]);
+    SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel()[1]);
+    if (nDim == 3)
+      SetVolumeOutputValue("GRID_VELOCITY-Z", iPoint, Node_Geo->GetGridVel()[2]);
+  }
+  
+  SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
+  SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetDensity());
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    SetVolumeOutputFieldValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
+    SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
   }
   
   if (config->GetKind_Solver() == RANS) {
-    SetVolumeOutputFieldValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
+    SetVolumeOutputValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    SetVolumeOutputFieldValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
+    SetVolumeOutputValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
   }
   
-  SetVolumeOutputFieldValue("RESIDUAL_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
-  SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
-  SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  SetVolumeOutputValue("RESIDUAL_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RESIDUAL_VELOCITY-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputValue("RESIDUAL_VELOCITY-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("RESIDUAL_VELOCITY-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
-    SetVolumeOutputFieldValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+    SetVolumeOutputValue("RESIDUAL_VELOCITY-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
   } else {
-    SetVolumeOutputFieldValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+    SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    SetVolumeOutputFieldValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    SetVolumeOutputValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     break;
   case NONE:
     break;
   }
   
-  SetVolumeOutputFieldValue("LIMITER_PRESSURE", iPoint, Node_Flow->GetLimiter_Primitive(0));
-  SetVolumeOutputFieldValue("LIMITER_VELOCITY-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
-  SetVolumeOutputFieldValue("LIMITER_VELOCITY-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
+  SetVolumeOutputValue("LIMITER_PRESSURE", iPoint, Node_Flow->GetLimiter_Primitive(0));
+  SetVolumeOutputValue("LIMITER_VELOCITY-X", iPoint, Node_Flow->GetLimiter_Primitive(1));
+  SetVolumeOutputValue("LIMITER_VELOCITY-Y", iPoint, Node_Flow->GetLimiter_Primitive(2));
   if (nDim == 3){
-    SetVolumeOutputFieldValue("LIMITER_VELOCITY-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
-    SetVolumeOutputFieldValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(4));
+    SetVolumeOutputValue("LIMITER_VELOCITY-Z", iPoint, Node_Flow->GetLimiter_Primitive(3));
+    SetVolumeOutputValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(4));
   } else {
-    SetVolumeOutputFieldValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(3));   
+    SetVolumeOutputValue("LIMITER_TEMPERATURE", iPoint, Node_Flow->GetLimiter_Primitive(3));   
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputFieldValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
-    SetVolumeOutputFieldValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputFieldValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
+    SetVolumeOutputValue("LIMITER_NU_TILDE", iPoint, Node_Turb->GetLimiter_Primitive(0));
     break;
   case NONE:
     break;
   }
   
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    SetVolumeOutputFieldValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
-    SetVolumeOutputFieldValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
+    SetVolumeOutputValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale());
+    SetVolumeOutputValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance());
   }
   
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    SetVolumeOutputFieldValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
+    SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
   }  
 }
 
 void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
-    SetVolumeOutputFieldValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
-    SetVolumeOutputFieldValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
+    SetVolumeOutputValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
+    SetVolumeOutputValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
     if (nDim == 3)
-      SetVolumeOutputFieldValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
+      SetVolumeOutputValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
   
-    SetVolumeOutputFieldValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
-    SetVolumeOutputFieldValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
+    SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+    SetVolumeOutputValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
   }
 }
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 17e9423c12ec..80b69eedf511 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -16928,19 +16928,25 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   string currentField;
    
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, HistoryOutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
-      if (currentField == iter->second.HistoryOutputGroup){
-        AddHistoryHeaderString(iter->second.FieldName);
+    currentField = config->GetHistoryOutput_Field(iField);   
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+      if (currentField == Field.OutputGroup){
+        AddHistoryHeaderString(Field.FieldName);
       }
     }
   }
+  
+  
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, vector<HistoryOutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
-      for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
-        if (currentField == iter->second[iMarker].HistoryOutputGroup){
-          AddHistoryHeaderString(iter->second[iMarker].FieldName);
+    currentField = config->GetHistoryOutput_Field(iField);   
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+        if (currentField == Field.OutputGroup){
+          AddHistoryHeaderString(Field.FieldName);
         }
       }
     }
@@ -16974,20 +16980,25 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   HistoryValues.clear();
   
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, HistoryOutputField>::iterator iter = Output_Fields.begin(); iter != Output_Fields.end(); ++iter){
-      if (currentField == iter->second.HistoryOutputGroup){
-        AddHistoryValue(iter->second.Value);
+    currentField = config->GetHistoryOutput_Field(iField);   
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+      if (currentField == Field.OutputGroup){
+        AddHistoryValue(Field.Value);
       }
     }
   }
   
+  
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);      
-    for(std::map<string, vector<HistoryOutputField>>::iterator iter = OutputPerSurface_Fields.begin(); iter != OutputPerSurface_Fields.end(); ++iter){
-      for (unsigned short iMarker = 0; iMarker < iter->second.size(); iMarker++){
-        if (currentField == iter->second[iMarker].HistoryOutputGroup){
-          AddHistoryValue(iter->second[iMarker].Value);
+    currentField = config->GetHistoryOutput_Field(iField);   
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+        if (currentField == Field.OutputGroup){
+          AddHistoryValue(Field.Value);
         }
       }
     }
@@ -17012,13 +17023,13 @@ void COutput::SetScreen_Header(CConfig *config) {
   // Evaluate the requested output
   for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
     currentField = config->GetScreenOutput_Field(iField);  
-    if (Output_Fields.count(currentField) > 0){
-      PrintScreenHeaderString(out, Output_Fields[currentField].FieldName);
+    if (HistoryOutput_Map.count(currentField) > 0){
+      PrintScreenHeaderString(out, HistoryOutput_Map[currentField].FieldName);
     } else {
 //      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
     }
-    if (OutputPerSurface_Fields.count(currentField) > 0){
-      PrintScreenHeaderString(out, OutputPerSurface_Fields[currentField][0].FieldName);      
+    if (HistoryOutputPerSurface_Map.count(currentField) > 0){
+      PrintScreenHeaderString(out, HistoryOutputPerSurface_Map[currentField][0].FieldName);      
     }
   }
   
@@ -17037,29 +17048,29 @@ void COutput::SetScreen_Output(CConfig *config) {
   
   for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
     currentField = config->GetScreenOutput_Field(iField); 
-    if (Output_Fields.count(currentField) > 0){  
-      switch (Output_Fields[currentField].ScreenFormat) {
+    if (HistoryOutput_Map.count(currentField) > 0){  
+      switch (HistoryOutput_Map[currentField].ScreenFormat) {
       case FORMAT_INTEGER:
-        PrintScreenInteger(out, SU2_TYPE::Int(Output_Fields[currentField].Value));
+        PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[currentField].Value));
         break;
       case FORMAT_FIXED:
-        PrintScreenFixed(out, Output_Fields[currentField].Value);
+        PrintScreenFixed(out, HistoryOutput_Map[currentField].Value);
         break;
       case FORMAT_SCIENTIFIC:
-        PrintScreenScientific(out, Output_Fields[currentField].Value);
+        PrintScreenScientific(out, HistoryOutput_Map[currentField].Value);
         break;      
       }
     }
-    if (OutputPerSurface_Fields.count(currentField) > 0){
-      switch (OutputPerSurface_Fields[currentField][0].ScreenFormat) {
+    if (HistoryOutputPerSurface_Map.count(currentField) > 0){
+      switch (HistoryOutputPerSurface_Map[currentField][0].ScreenFormat) {
       case FORMAT_INTEGER:
-        PrintScreenInteger(out, SU2_TYPE::Int(OutputPerSurface_Fields[currentField][0].Value));
+        PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[currentField][0].Value));
         break;
       case FORMAT_FIXED:
-        PrintScreenFixed(out, OutputPerSurface_Fields[currentField][0].Value);
+        PrintScreenFixed(out, HistoryOutputPerSurface_Map[currentField][0].Value);
         break;
       case FORMAT_SCIENTIFIC:
-        PrintScreenScientific(out, OutputPerSurface_Fields[currentField][0].Value);
+        PrintScreenScientific(out, HistoryOutputPerSurface_Map[currentField][0].Value);
         break;   
       }
     }    
@@ -17123,17 +17134,38 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   GlobalField_Counter = 0;
   
   string currentField;
+  bool found_field = false;
+  
+  /*--- Loop through all fields specified in the config ---*/
   
   for (unsigned short iField = 0; iField < config->GetnVolumeOutput(); iField++){
-    currentField = config->GetVolumeOutput_Field(iField);      
-    for(std::map<string,VolumeOutputField>::iterator iter = VolumeOutput_Fields.begin(); iter != VolumeOutput_Fields.end(); ++iter){
-      if (((currentField == iter->second.VolumeOutputGroup) || (currentField == iter->first)) && (iter->second.Offset == -1)){
-        iter->second.Offset = GlobalField_Counter;
-        Variable_Names.push_back(iter->second.FieldName);
+    currentField = config->GetVolumeOutput_Field(iField);  
+    
+    found_field = false;
+    
+    /*--- Loop through all fields defined in the corresponding SetVolumeOutputFields(). 
+     * If it is also defined in the config (either as part of a group or a single field), the field 
+     * object gets an offset so that we know where to find the data in the Local_Data() array.
+     *  Note that the default offset is -1. ---*/
+    
+    for (unsigned short iField_Output = 0; iField_Output < VolumeOutput_List.size(); iField_Output++){
+      
+      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField_Output]];
+      
+      if (((currentField == Field.OutputGroup) || (currentField == VolumeOutput_List[iField_Output])) && (Field.Offset == -1)){
+        Field.Offset = GlobalField_Counter;
+        Variable_Names.push_back(Field.FieldName);
         GlobalField_Counter++;
+        
+        found_field = true;
       }
     }
+    
+    if (!found_field){
+      SU2_MPI::Error(string("There is no output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
+    }
   }
+
     
   unsigned long iPoint, iVertex;
   bool Wrt_Halo, isPeriodic;
@@ -17189,12 +17221,17 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     if (!Local_Halo[iPoint] || Wrt_Halo) {
       
+      /*--- Load the volume data into the Local_Data() array. --- */
+      
       LoadVolumeData(config, geometry, solver, jPoint);
       
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
         if (config->GetMarker_All_Plotting(iMarker) == YES) {
           iVertex = geometry->node[iPoint]->GetVertex(iMarker);
           if (iVertex != -1){ 
+            
+            /*--- Load the surface data into the Local_Data() array. --- */
+            
             LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
           }
         }

From 464558f8e91a1138b507ce2354511da4faee1ed7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 11:55:58 +0200
Subject: [PATCH 034/539] Added volume output for some solvers (adjoint and
 heat)

---
 SU2_CFD/include/output_structure.hpp    |  17 +-
 SU2_CFD/src/output_adjoint_discrete.cpp | 215 ++++++++++++++++----
 SU2_CFD/src/output_adjoint_mean.cpp     | 252 ++++++++++++++++++++----
 SU2_CFD/src/output_direct_heat.cpp      |  77 ++++++--
 4 files changed, 469 insertions(+), 92 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 8488d660532c..beef7e603fb1 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1280,7 +1280,10 @@ class CHeatOutput : public COutput {
   
   void SetHistoryOutputFields(CConfig *config);
    
-
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+ 
 };
 
 /*! \class CAdjFlowOutput
@@ -1334,7 +1337,12 @@ class CAdjFlowOutput : public COutput {
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
+    
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   
 };
 
@@ -1390,6 +1398,11 @@ class CDiscAdjFlowOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
 
 };
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index ebaaa680bf46..e400df6b8dc8 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -56,73 +56,212 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
-  
-  AddOutputField("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  AddHistoryOutput("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddOutputField("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
     break;  
   case SST:
-    AddOutputField("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
-    AddOutputField("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
     break;
   default: break;
   }
-  AddOutputField("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
   
-  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   
 }
 
-inline void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
 
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetOutputFieldValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetOutputFieldValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetOutputFieldValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputField("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputField("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputField("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetOutputFieldValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
-    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputField("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputField("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
   } else {
-    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+    SetHistoryOutputField("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+  }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputField("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputField("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputField("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    break;
+  default: break;
   }
+  SetHistoryOutputField("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
+  SetHistoryOutputField("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
+  SetHistoryOutputField("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
+  SetHistoryOutputField("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
+  SetHistoryOutputField("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetHistoryOutputField("PHYS_TIME", timeused);
+
+}
+
+void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
+  
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  
+  // Conservative
+  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE");
+  if (nDim == 3)
+    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "CONSERVATIVE");
+  
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetOutputFieldValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE");
     break;  
   case SST:
-    SetOutputFieldValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    AddVolumeOutput("ADJOINT_TKE", "Adjoint_TKE", "CONSERVATIVE");
+    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Omega", "CONSERVATIVE");
     break;
   default: break;
   }
-  SetOutputFieldValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
-  SetOutputFieldValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
-  SetOutputFieldValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
-  SetOutputFieldValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
-  SetOutputFieldValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
-  SetOutputFieldValue("PHYS_TIME", timeused);
+  
+  if (config->GetGrid_Movement()){
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    if (nDim == 3)    
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+  }
+  
+  // Residuals
+  AddVolumeOutput("RESIDUAL_ADJOINT_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");
+  if (nDim == 3)
+    AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL");
+    break;  
+  case SST:
+    AddVolumeOutput("RESIDUAL_ADJOINT_TKE", "Residual_Adjoint_TKE", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");
+    break;
+  default: break;
+  }
+  
+  // Sensitivity
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY");
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  if (nDim == 3)
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");  
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY");
+ 
+}
+
+void CDiscAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
+  CVariable* Node_AdjTurb = NULL;
+  CPoint*    Node_Geo     = geometry->node[iPoint];
+  
+  if (config->GetKind_Turb_Model() != NONE){
+    Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
+  }
+  
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputValue("ADJOINT_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
+  SetVolumeOutputValue("ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
+  SetVolumeOutputValue("ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
+    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+  } else {
+    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
+  }
+  
+  // Turbulent 
+  switch(turb_model){
+  case SST:
+    SetVolumeOutputValue("ADJOINT_ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+    SetVolumeOutputValue("ADJOINT_ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Residuals
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_DENSITY", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetSolution(4) - Node_AdjFlow->GetSolution_Old(4));
+  } else {
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
+  }
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  SetVolumeOutputValue("SENSITIVITY_X", iPoint, Node_AdjFlow->GetSensitivity(0));
+  SetVolumeOutputValue("SENSITIVITY_Y", iPoint, Node_AdjFlow->GetSensitivity(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("SENSITIVITY_Z", iPoint, Node_AdjFlow->GetSensitivity(2));
+  
+}
 
+void CDiscAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
+  
 }
 
-inline bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
   return true;
 }
 
-inline bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
+bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
 
-inline bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
+bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
 
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 9bf123231e81..f4ec9971b4a8 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -66,65 +66,249 @@ inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualt
 void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   // Iteration numbers
-  AddOutputField("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddOutputField("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
-  
-  AddOutputField("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
-  AddOutputField("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  
+  AddHistoryOutput("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddOutputField("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
     break;  
   case SST:
-    AddOutputField("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
-    AddOutputField("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
     break;
   default: break;
   }
-  AddOutputField("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddOutputField("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
   
-  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   
 }
 
 inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
 
-  SetOutputFieldValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetOutputFieldValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
+  
+  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetOutputFieldValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetOutputFieldValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetOutputFieldValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputField("ADJOINT_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
+  SetHistoryOutputField("ADJOINT_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
+  SetHistoryOutputField("ADJOINT_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetOutputFieldValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
-    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputField("ADJOINT_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
+    SetHistoryOutputField("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
   } else {
-    SetOutputFieldValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+    SetHistoryOutputField("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
+  }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputField("ADJOINT_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputField("ADJOINT_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+    SetHistoryOutputField("ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
+    break;
+  default: break;
+  }
+  SetHistoryOutputField("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
+  SetHistoryOutputField("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputField("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
+  SetHistoryOutputField("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
+  SetHistoryOutputField("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
+  SetHistoryOutputField("PHYS_TIME", timeused);
+
+}
+
+void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
+  
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  
+  // Conservative
+  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE");
+  if (nDim == 3)
+    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE");
+  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "CONSERVATIVE");
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE");
+    break;  
+  case SST:
+    AddVolumeOutput("ADJOINT_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE");
+    AddVolumeOutput("ADJOINT_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");
+    break;
+  default: break;
+  }
+  
+  if (config->GetGrid_Movement()){
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    if (nDim == 3)    
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+  }
+  
+  // Limiters
+  AddVolumeOutput("LIMITER_ADJOINT_DENSITY",    "Limiter_Adjoint_Density",    "LIMITER");
+  AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-X", "Limiter_Adjoint_Momentum_x", "LIMITER");
+  AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-Y", "Limiter_Adjoint_Momentum_y", "LIMITER");
+  if (nDim == 3)
+    AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-Z", "Limiter_Adjoint_Momentum_z", "LIMITER");
+  AddVolumeOutput("LIMITER_ADJOINT_ENERGY",       "Limiter_Adjoint_Energy",     "LIMITER");
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddVolumeOutput("LIMITER_ADJOINT_NU_TILDE", "Limiter_Adjoint_Nu_Tilde", "CONSERVATIVE");
+    break;  
+  case SST:
+    AddVolumeOutput("LIMITER_ADJOINT_KINETIC_ENERGY", "Limiter_Adjoint_TKE", "CONSERVATIVE");
+    AddVolumeOutput("LIMITER_ADJOINT_DISSIPATION",    "Limiter_Adjoint_Omega", "CONSERVATIVE");
+    break;
+  default: break;
   }
+  
+  // Residuals
+  AddVolumeOutput("RESIDUAL_ADJOINT_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");
+  if (nDim == 3)
+    AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RESIDUAL_ADJOINT_ENERGY",       "Residual_Adjoint_Energy", "RESIDUAL");
+  
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetOutputFieldValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL");
     break;  
   case SST:
-    SetOutputFieldValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetOutputFieldValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    AddVolumeOutput("RESIDUAL_ADJOINT_KINETIC_ENERGY", "Residual_Adjoint_TKE", "RESIDUAL");
+    AddVolumeOutput("RESIDUAL_ADJOINT_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
     break;
   default: break;
   }
-  SetOutputFieldValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
-  SetOutputFieldValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
-  SetOutputFieldValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
-  SetOutputFieldValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
-  SetOutputFieldValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
-  SetOutputFieldValue("PHYS_TIME", timeused);
+  
+  // Sensitivity
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY");
+  
+  // Dissipation Sensor
+  if (config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED){
+    AddVolumeOutput("DISSIPATION_SENSOR", "Dissipation_Sensor", "DISSIPATION_SENSOR");
+  }
+}
 
+void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
+  CVariable* Node_AdjTurb = NULL;
+  CPoint*    Node_Geo     = geometry->node[iPoint];
+  
+  if (config->GetKind_Turb_Model() != NONE){
+    Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
+  }
+  
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputValue("ADJOINT_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
+  SetVolumeOutputValue("ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
+  SetVolumeOutputValue("ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
+    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+  } else {
+    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
+  }
+  
+  // Turbulent 
+  switch(turb_model){
+  case SST:
+    SetVolumeOutputValue("ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+    SetVolumeOutputValue("ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Limiters
+  SetVolumeOutputValue("LIMITER_ADJOINT_DENSITY", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
+  SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetLimiter_Primitive(1));
+  SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetLimiter_Primitive(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetLimiter_Primitive(3));
+    SetVolumeOutputValue("LIMITER_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetLimiter_Primitive(4));
+  } else {
+    SetVolumeOutputValue("LIMITER_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetLimiter_Primitive(3));   
+  }
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputValue("LIMITER_ADJOINT_TKE", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
+    SetVolumeOutputValue("LIMITER_ADJOINT_OMEGA", iPoint, Node_AdjFlow->GetLimiter_Primitive(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("LIMITER_ADJOINT_NU_TILDE", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Residuals
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_DENSITY",    iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-X", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Y", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  if (nDim == 3){
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Z", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY",     iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+  } else {
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY",     iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+  }
+  
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_TKE",   iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_OMEGA", iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("RESIDUAL_ADJOINT_NU_TILDE", iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    break;
+  case NONE:
+    break;
+  }
+
+  if (config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED){
+    SetVolumeOutputValue("DISSIPATION_SENSOR", iPoint, Node_AdjFlow->GetSensor());
+  }
+  
+}
+
+void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
+  
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index e39221ae6c2b..79be682406d0 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -66,35 +66,76 @@ inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime
   return true;
 }
 
-inline void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
-  SetOutputFieldValue("EXT_ITER",     config[val_iZone]->GetExtIter());
-  SetOutputFieldValue("INT_ITER",     config[val_iZone]->GetIntIter());
+  CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];  
   
-  SetOutputFieldValue("HEATFLUX",     solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_HeatFlux());
-  SetOutputFieldValue("HEATFLUX_MAX", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_MaxHeatFlux());
-  SetOutputFieldValue("TEMPERATURE",  solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetTotal_AvgTemperature());
-  SetOutputFieldValue("HEAT", log10(solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputField("EXT_ITER",     config[val_iZone]->GetExtIter());
+  SetHistoryOutputField("INT_ITER",     config[val_iZone]->GetIntIter());
   
-  SetOutputFieldValue("PHYS_TIME", timeused);
-  SetOutputFieldValue("LINSOL_ITER", solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL]->GetIterLinSolver());
+  SetHistoryOutputField("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
+  SetHistoryOutputField("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
+  SetHistoryOutputField("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
+  SetHistoryOutputField("HEAT", log10(heat_solver->GetRes_RMS(0)));
+  
+  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputField("LINSOL_ITER", heat_solver->GetIterLinSolver());
   
 }
   
 
-inline void CHeatOutput::SetHistoryOutputFields(CConfig *config){
+void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddOutputField("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
-  AddOutputField("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
   
-  AddOutputField("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
-  AddOutputField("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
-  AddOutputField("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
-  AddOutputField("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
-  AddOutputField("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
+  AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
+  AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
+  AddHistoryOutput("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
   
-  AddOutputField("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
   
 }
+
+
+void CHeatOutput::SetVolumeOutputFields(CConfig *config){
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  
+  // Conservative
+  AddVolumeOutput("TEMPERATURE", "Temperature", "CONSERVATIVE");
+
+  // Residuals  
+  AddVolumeOutput("RESIDUAL_TEMPERATURE", "Residual_Temperature", "RESIDUAL");
+  
+}
+
+
+void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_Heat = solver[HEAT_SOL]->node[iPoint]; 
+  
+  CPoint*    Node_Geo  = geometry->node[iPoint];
+  
+  // Grid coordinates
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+ 
+  // Conservative
+  SetVolumeOutputValue("TEMPEATURE", iPoint, Node_Heat->GetSolution(0));
+  
+  // Residuals    
+  SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[HEAT_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  
+}
+

From c7e2710e4dc89c31b54213459d572f298cd509a0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 11:56:18 +0200
Subject: [PATCH 035/539] Some small fixes

---
 SU2_CFD/include/output_structure.hpp |  2 +-
 SU2_CFD/src/output_structure.cpp     | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index beef7e603fb1..0483307cb03f 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1049,7 +1049,7 @@ class COutput {
 class CFlowOutput : public COutput {
 private:
   
-  unsigned short nVar, nDim;
+  unsigned short nVar;
 
   unsigned short turb_model;
   
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 80b69eedf511..d7904746b3d6 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -10531,12 +10531,12 @@ void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver *
     
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
       if (config->GetOutput_FileFormat() == PARAVIEW){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("Skin_Friction_Coefficient_x");
         Variable_Names.push_back("Skin_Friction_Coefficient_y");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
+          GlobalField_Counter += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
         }
         GlobalField_Counter += 2;
         Variable_Names.push_back("Heat_Flux");
@@ -11029,12 +11029,12 @@ void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolve
 
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
       if (config->GetOutput_FileFormat() == PARAVIEW){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
+        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
+        GlobalField_Counter += 2;
         Variable_Names.push_back("Skin_Friction_Coefficient_x");
         Variable_Names.push_back("Skin_Friction_Coefficient_y");
         if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
+          GlobalField_Counter += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
         }
         GlobalField_Counter += 2;
         Variable_Names.push_back("Heat_Flux");
@@ -11512,8 +11512,8 @@ void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolve
     /*--- Add the grid velocity. ---*/
     
     if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
+      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
       Variable_Names.push_back("Grid_Velocity_x");
       Variable_Names.push_back("Grid_Velocity_y");
       if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
@@ -11817,7 +11817,7 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
     /*--- Add the residuals ---*/
     
     if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
+      GlobalField_Counter += nVar_Consv_Par;
       Variable_Names.push_back("Residual_Displacement_x");
       Variable_Names.push_back("Residual_Displacement_y");
       if (geometry->GetnDim() == 3)
@@ -11828,20 +11828,20 @@ void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSo
     if (config->GetDynamic_Analysis() == DYNAMIC) {
       
       /*--- Velocities ---*/
-      nVar_Par += 2;
+      GlobalField_Counter += 2;
       Variable_Names.push_back("Velocity_x");
       Variable_Names.push_back("Velocity_y");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
+        GlobalField_Counter += 1;
         Variable_Names.push_back("Velocity_z");
       }
       
       /*--- Accelerations ---*/
-      nVar_Par += 2;
+      GlobalField_Counter += 2;
       Variable_Names.push_back("Acceleration_x");
       Variable_Names.push_back("Acceleration_y");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
+        GlobalField_Counter += 1;
         Variable_Names.push_back("Acceleration_z");
       }
     }

From 370e1831fe79cdf5d169986f767aa17aaa707550 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 16:01:51 +0200
Subject: [PATCH 036/539] Removed some output routines for now

---
 SU2_CFD/include/output_structure.hpp |   183 -
 SU2_CFD/src/driver_structure.cpp     |    54 +-
 SU2_CFD/src/output_structure.cpp     | 14452 ++++++-------------------
 3 files changed, 3051 insertions(+), 11638 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 0483307cb03f..634731821353 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -268,18 +268,6 @@ class COutput {
    */
   virtual ~COutput(void);
 
-  /*! 
-   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Total number of domains in the grid file.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                       unsigned long iExtIter, unsigned short val_nZone);
-  
   /*!
    * \brief Writes and organizes the all the output files, except the history one, for serial computations.
    * \param[in] solver_container - Container vector with all the solutions.
@@ -300,76 +288,6 @@ class COutput {
    */
   void SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file);
 
-  /*!
-   * \brief Writes equivalent area.
-   * \param[in] solver - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_SonicBoom(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
-  
-  /*!
-   * \brief Writes inverse design.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   */
-  void SetCp_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config,
-                         unsigned long iExtIter);
-  
-  /*!
-   * \brief Writes inverse design.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   */
-  void SetHeatFlux_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config,
-                        unsigned long iExtIter);
-  
-  /*!
-   * \brief Writes forces at different sections.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
-  
-  /*!
-   * \brief Writes one dimensional output.
-   * \author H. Kline
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_AnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
-  
-  /*!
-   * \brief Create and write the file with the flow coefficient on the surface.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] FlowSolution - Flow solution.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Current zone number in the grid file.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_Distortion(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
-
-  /*!
-   * \brief Create and write the file with the FSI convergence history.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Solver for all physical problems.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Current zone number in the grid file.
-   */
-  void SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config, CIntegration ****integration,
-                         unsigned long iExtIter, unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT, bool header);
-
   /*!
    * \brief Create and write the file with the FSI convergence history.
    * \param[in] iIter - Current iteration.
@@ -377,27 +295,6 @@ class COutput {
    */
   bool PrintOutput(unsigned long iIter, unsigned long iFreq);
 
-  /*! 
-   * \brief Create and write the file with the flow coefficient on the surface.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] FlowSolution - Flow solution.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Current zone number in the grid file.
-   */
-  void SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*! 
-   * \brief Create and write the file with the adjoint coefficients on the surface for serial computations.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] AdjSolution - Adjoint solution.
-   * \param[in] FlowSolution - Flow solution.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Current zone number in the grid file.
-   */
-  void SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry, CSolver *AdjSolver, CSolver *FlowSolution, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst);
-
   /*!
    * \brief Merge the geometry into a data structure used for output file writing.
    * \param[in] config - Definition of the particular problem.
@@ -714,15 +611,6 @@ class COutput {
   virtual void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
                               CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] solver - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output);
-  
   /*!
    * \brief Write the history file and the convergence on the screen for serial computations.
    * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
@@ -754,22 +642,6 @@ class COutput {
    */
   void ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config);
 
-  /*!
-   * \brief Compute .
-   * \param[in] config - Definition of the particular problem.
-   */
-  void WriteTurboPerfConvHistory(CConfig *config);
-
-  /*!
-   * \brief Write the output file for spanwise turboperformance.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_nZone - iZone index.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_Turbo(CSolver *****solver_container, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output);
-
   /*!
    * \brief Give the Entropy Generation performance parameters for turbomachinery.
    * \param[in] iMarkerTP - Marker turbo-performance.
@@ -791,16 +663,6 @@ class COutput {
    */
   su2double GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan);
 
-  /*!
-   * \brief Write the output file for harmonic balance for each time-instance.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_nZone - Number of Zones.
-   * \param[in] val_iZone - Zone index.
-   * \param[in] output - Create output files.
-   */
-  void SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short iZone, unsigned short val_nZone, bool output);
-
   /*!
    * \brief Writes and organizes the all the output files, except the history one, for parallel computations.
    * \param[in] solver_container - Container vector with all the solutions.
@@ -813,51 +675,6 @@ class COutput {
   void SetResult_Files_Parallel(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
                                 unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone, unsigned short *nInst);
   
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for flow problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-  
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for incmopressible flow problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_iZone - iZone index.
-   */
-  void LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for adjoint flow problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-  
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for elasticity problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-  
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for generic problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 9ef6119d3843..c72091d7dafc 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3421,17 +3421,17 @@ void CDriver::PreprocessExtIter(unsigned long ExtIter) {
   for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetExtIter(ExtIter);
   
 
-  /*--- Read the target pressure ---*/
+//  /*--- Read the target pressure ---*/
 
-  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
-    output[ZONE_0]->SetCp_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
-        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
+//  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
+//    output[ZONE_0]->SetCp_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
+//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
 
-  /*--- Read the target heat flux ---*/
+//  /*--- Read the target heat flux ---*/
 
-  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
-    output[ZONE_0]->SetHeatFlux_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
-        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
+//  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
+//    output[ZONE_0]->SetHeatFlux_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
+//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
 
   /*--- Set the initial condition for EULER/N-S/RANS and for a non FSI simulation ---*/
 
@@ -3614,10 +3614,10 @@ void CDriver::Output(unsigned long ExtIter) {
     
   }
 
-  /*--- Export Surface Solution File for Unsteady Simulations ---*/
-  /*--- When calculate mean/fluctuation option will be available, delete the following part ---*/
-  if ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (ExtIter % config_container[ZONE_0]->GetWrt_Surf_Freq_DualTime() == 0)) {
-      output[ZONE_0]->SetSurfaceCSV_Flow(config_container[ZONE_0], geometry_container[ZONE_0][INST_0][MESH_0], solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], ExtIter, ZONE_0, INST_0);}
+//  /*--- Export Surface Solution File for Unsteady Simulations ---*/
+//  /*--- When calculate mean/fluctuation option will be available, delete the following part ---*/
+//  if ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (ExtIter % config_container[ZONE_0]->GetWrt_Surf_Freq_DualTime() == 0)) {
+//      output[ZONE_0]->SetSurfaceCSV_Flow(config_container[ZONE_0], geometry_container[ZONE_0][INST_0][MESH_0], solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], ExtIter, ZONE_0, INST_0);}
 
 }
 
@@ -4334,26 +4334,26 @@ void CDiscAdjFluidDriver::SetObjFunction(){
 
   /*--- Specific scalar objective functions ---*/
 
-  for (iZone = 0; iZone < nZone; iZone++){
-    switch (config_container[iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+//  for (iZone = 0; iZone < nZone; iZone++){
+//    switch (config_container[iZone]->GetKind_Solver()) {
+//      case EULER:                   case NAVIER_STOKES:                   case RANS:
+//      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
         
-        if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
-          output[iZone]->SpecialOutput_AnalyzeSurface(solver_container[iZone][INST_0][MESH_0][FLOW_SOL], geometry_container[iZone][INST_0][MESH_0], config_container[iZone], false);
+//        if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
+//          output[iZone]->SpecialOutput_AnalyzeSurface(solver_container[iZone][INST_0][MESH_0][FLOW_SOL], geometry_container[iZone][INST_0][MESH_0], config_container[iZone], false);
         
-        if ((config_container[ZONE_0]->GetnMarker_Analyze() != 0) && compressible)
-          output[iZone]->SpecialOutput_Distortion(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+//        if ((config_container[ZONE_0]->GetnMarker_Analyze() != 0) && compressible)
+//          output[iZone]->SpecialOutput_Distortion(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
         
-        if (config_container[ZONE_0]->GetnMarker_NearFieldBound() != 0)
-          output[iZone]->SpecialOutput_SonicBoom(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+//        if (config_container[ZONE_0]->GetnMarker_NearFieldBound() != 0)
+//          output[iZone]->SpecialOutput_SonicBoom(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
           
-        if (config_container[ZONE_0]->GetPlot_Section_Forces())
-          output[iZone]->SpecialOutput_SpanLoad(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+//        if (config_container[ZONE_0]->GetPlot_Section_Forces())
+//          output[iZone]->SpecialOutput_SpanLoad(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
         
-        break;
-    }
-  }
+//        break;
+//    }
+//  }
 
   /*--- Surface based obj. function ---*/
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index d7904746b3d6..81abc8588488 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -432,850 +432,534 @@ COutput::~COutput(void) {
   }
 }
 
-void COutput::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
-                                 CSolver *FlowSolver, unsigned long iExtIter,
-                                 unsigned short val_iZone, unsigned short val_iInst) {
-  
-  unsigned short iMarker;
-  unsigned long iPoint, iVertex, Global_Index;
-  su2double PressCoeff = 0.0, SkinFrictionCoeff[3], HeatFlux;
-  su2double xCoord = 0.0, yCoord = 0.0, zCoord = 0.0, Mach, Pressure;
-  char cstr[200];
+
+void COutput::MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
   
-  unsigned short solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
+  /*--- Flags identifying the types of files to be written. ---*/
   
-#ifndef HAVE_MPI
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
   
-  unsigned short iDim;
-  char buffer [50];
-  ofstream SurfFlow_file;
+  /*--- Merge connectivity for each type of element (excluding halos). Note
+   that we only need to merge the connectivity once, as it does not change
+   during computation. Check whether the base file has been written. ---*/
   
-  /*--- Write file name with extension if unsteady ---*/
-  strcpy (cstr, config->GetSurfFlowCoeff_FileName().c_str());
+  /*--- Merge volumetric grid. ---*/
   
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
-
-  }else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+  if (Wrt_Vol) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
+      cout <<"Merging volumetric triangle grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, TRIANGLE    );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
+      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, QUADRILATERAL   );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
+      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, TETRAHEDRON );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
+      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, HEXAHEDRON  );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
+      cout <<"Merging volumetric prism grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, PRISM       );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
+      cout <<"Merging volumetric pyramid grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, PYRAMID     );
+    
   }
-  else
-    SPRINTF (buffer, ".csv");
   
-  strcat (cstr, buffer);
-  SurfFlow_file.precision(15);
-  SurfFlow_file.open(cstr, ios::out);
-  
-  SurfFlow_file << "\"Global_Index\", \"x_coord\", \"y_coord\", ";
-  if (nDim == 3) SurfFlow_file << "\"z_coord\", ";
-  SurfFlow_file << "\"Pressure\", \"Pressure_Coefficient\", ";
-  
-  switch (solver) {
-    case EULER : SurfFlow_file <<  "\"Mach_Number\"" << "\n"; break;
-    case NAVIER_STOKES: case RANS:
-      if (nDim == 2) SurfFlow_file <<  "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Heat_Flux\"" << "\n";
-      if (nDim == 3) SurfFlow_file <<  "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Skin_Friction_Coefficient_Z\", \"Heat_Flux\"" << "\n";
-      break;
-  }
+  /*--- Merge surface grid. ---*/
   
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        xCoord = geometry->node[iPoint]->GetCoord(0);
-        yCoord = geometry->node[iPoint]->GetCoord(1);
-        if (nDim == 3) zCoord = geometry->node[iPoint]->GetCoord(2);
-        
-        /*--- The output should be in inches ---*/
-        
-        if (config->GetSystemMeasurements() == US) {
-          xCoord *= 12.0; yCoord *= 12.0;
-          if (nDim == 3) zCoord *= 12.0;
-        }
-        
-        Pressure = FlowSolver->node[iPoint]->GetPressure();
-        PressCoeff = FlowSolver->GetCPressure(iMarker, iVertex);
-        SurfFlow_file << scientific << Global_Index << ", " << xCoord << ", " << yCoord << ", ";
-        if (nDim == 3) SurfFlow_file << scientific << zCoord << ", ";
-        SurfFlow_file << scientific << Pressure << ", " << PressCoeff << ", ";
-        switch (solver) {
-          case EULER :
-            Mach = sqrt(FlowSolver->node[iPoint]->GetVelocity2()) / FlowSolver->node[iPoint]->GetSoundSpeed();
-            SurfFlow_file << scientific << Mach << "\n";
-            break;
-          case RANS:
-            
-            for (iDim = 0; iDim < nDim; iDim++)
-              SkinFrictionCoeff[iDim] = FlowSolver->GetCSkinFriction(iMarker, iVertex, iDim);
-            HeatFlux = FlowSolver->GetHeatFlux(iMarker, iVertex);
-            
-            if (nDim == 2) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << HeatFlux << "\n";
-            if (nDim == 3) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << SkinFrictionCoeff[2] << ", " << HeatFlux << "\n";
-            
-            break;
-        }
-      }
-    }
+  if (Wrt_Srf) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
+      cout <<"Merging surface line grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, LINE);
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
+      cout <<"Merging surface triangle grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, TRIANGLE);
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
+      cout <<"Merging surface quadrilateral grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, QUADRILATERAL);
+    
   }
   
-  SurfFlow_file.close();
-  
-#else
-  
-  int iProcessor, nProcessor = size;
-
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long nVertex_Surface = 0, nLocalVertex_Surface = 0;
-  unsigned long MaxLocalVertex_Surface = 0;
-  
-  /*--- Find the max number of surface vertices among all
-   partitions and set up buffers. The master node will handle the
-   writing of the CSV file after gathering all of the data. ---*/
-  
-  nLocalVertex_Surface = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface++;
-      }
-  
-  /*--- Communicate the number of local vertices on each partition
-   to the master node ---*/
-  
-  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
-  
-  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- Send and Recv buffers ---*/
-  
-  su2double *Buffer_Send_Coord_x = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_Coord_x = NULL;
-  
-  su2double *Buffer_Send_Coord_y = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_Coord_y = NULL;
+  /*--- Update total number of volume elements after merge. ---*/
   
-  su2double *Buffer_Send_Coord_z = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_Coord_z = NULL;
+  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
+  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
   
-  su2double *Buffer_Send_Press = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_Press = NULL;
+  /*--- Update total number of surface elements after merge. ---*/
   
-  su2double *Buffer_Send_CPress = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_CPress = NULL;
+  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
   
-  su2double *Buffer_Send_Mach = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_Mach = NULL;
+}
+
+void COutput::MergeCoordinates(CConfig *config, CGeometry *geometry) {
   
-  su2double *Buffer_Send_SkinFriction_x = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_SkinFriction_x = NULL;
+  /*--- Local variables needed on all processors ---*/
   
-  su2double *Buffer_Send_SkinFriction_y = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_SkinFriction_y = NULL;
+  unsigned short iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint;
   
-  su2double *Buffer_Send_SkinFriction_z = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_SkinFriction_z = NULL;
+  unsigned short kind_SU2 = config->GetKind_SU2();
   
-  su2double *Buffer_Send_HeatTransfer = new su2double [MaxLocalVertex_Surface];
-  su2double *Buffer_Recv_HeatTransfer = NULL;
+#ifndef HAVE_MPI
   
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  /*--- In serial, the single process has access to all geometry, so simply
+   load the coordinates into the data structure. ---*/
   
-  /*--- Prepare the receive buffers on the master node only. ---*/
+  unsigned short iMarker;
+  unsigned long iVertex, nTotalPoints = 0;
+  int SendRecv;
   
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if (nDim == 3) Buffer_Recv_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_Press   = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_CPress  = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_Mach    = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_SkinFriction_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_SkinFriction_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if (nDim == 3) Buffer_Recv_SkinFriction_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_HeatTransfer = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
-  }
+  bool isPeriodic;
   
-  /*--- Loop over all vertices in this partition and load the
-   data of the specified type into the buffer to be sent to
-   the master node. ---*/
+  /*--- First, create a structure to locate any periodic halo nodes ---*/
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
   
-  nVertex_Surface = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if (geometry->node[iPoint]->GetDomain()) {
-          Buffer_Send_Press[nVertex_Surface] = FlowSolver->node[iPoint]->GetPressure();
-          Buffer_Send_CPress[nVertex_Surface] = FlowSolver->GetCPressure(iMarker, iVertex);
-          Buffer_Send_Coord_x[nVertex_Surface] = geometry->node[iPoint]->GetCoord(0);
-          Buffer_Send_Coord_y[nVertex_Surface] = geometry->node[iPoint]->GetCoord(1);
-          if (nDim == 3) { Buffer_Send_Coord_z[nVertex_Surface] = geometry->node[iPoint]->GetCoord(2); }
-          
-          /*--- If US system, the output should be in inches ---*/
-          
-          if (config->GetSystemMeasurements() == US) {
-            Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
-            Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
-            if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
-          }
-          
-          Buffer_Send_GlobalIndex[nVertex_Surface] = geometry->node[iPoint]->GetGlobalIndex();
-          
-          if (solver == EULER)
-            Buffer_Send_Mach[nVertex_Surface] = sqrt(FlowSolver->node[iPoint]->GetVelocity2()) / FlowSolver->node[iPoint]->GetSoundSpeed();
-          if ((solver == NAVIER_STOKES) || (solver == RANS)) {
-            Buffer_Send_SkinFriction_x[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 0);
-            Buffer_Send_SkinFriction_y[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 1);
-            if (nDim == 3) Buffer_Send_SkinFriction_z[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 2);
-            Buffer_Send_HeatTransfer[nVertex_Surface] = FlowSolver->GetHeatFlux(iMarker, iVertex);
-          }
-          nVertex_Surface++;
+
+        /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
+         * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
+         * is different in each case ---*/
+
+        if (kind_SU2 == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+
+        if (isPeriodic && (SendRecv < 0)) {
+          Local_Halo[iPoint] = false;
         }
       }
+      
+    }
+  }
   
-  /*--- Send the information to the master node ---*/
+  /*--- Total number of points in the mesh (this might include periodic points). ---*/
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (!Local_Halo[iPoint]) nTotalPoints++;
+  
+  nGlobal_Poin = nTotalPoints;
+  nGlobal_Doma = geometry->GetnPointDomain();
   
-  SU2_MPI::Gather(Buffer_Send_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Press, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Press, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_CPress, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_CPress, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (solver == EULER) SU2_MPI::Gather(Buffer_Send_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if ((solver == NAVIER_STOKES) || (solver == RANS)) {
-    SU2_MPI::Gather(Buffer_Send_SkinFriction_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_SkinFriction_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_SkinFriction_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_HeatTransfer, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_HeatTransfer, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  /*--- Allocate the coordinates data structure. ---*/
+  
+  Coords = new su2double*[nDim];
+  for (iDim = 0; iDim < nDim; iDim++) {
+    Coords[iDim] = new su2double[nGlobal_Poin];
   }
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
   
-  /*--- The master node unpacks the data and writes the surface CSV file ---*/
+  /*--- Loop over the mesh to collect the coords of the local points ---*/
   
-  if (rank == MASTER_NODE) {
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
     
-    /*--- Write file name with extension if unsteady ---*/
-    char buffer[50];
-    string filename = config->GetSurfFlowCoeff_FileName();
-    ofstream SurfFlow_file;
+    /*--- Check if the node belongs to the domain (i.e, not a halo node).
+     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
     
-    /*--- Write file name with extension if unsteady ---*/
-    strcpy (cstr, filename.c_str());
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-      SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+    if (!Local_Halo[iPoint]) {
       
-    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-      if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
-    }
-    else
-      SPRINTF (buffer, ".csv");
-    
-    strcat (cstr, buffer);
-    SurfFlow_file.precision(15);
-    SurfFlow_file.open(cstr, ios::out);
-    
-    SurfFlow_file << "\"Global_Index\", \"x_coord\", \"y_coord\", ";
-    if (nDim == 3) SurfFlow_file << "\"z_coord\", ";
-    SurfFlow_file << "\"Pressure\", \"Pressure_Coefficient\", ";
-    
-    switch (solver) {
-      case EULER : SurfFlow_file <<  "\"Mach_Number\"" << "\n"; break;
-      case NAVIER_STOKES: case RANS:
-        if (nDim == 2) SurfFlow_file << "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Heat_Flux\"" << "\n";
-        if (nDim == 3) SurfFlow_file << "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Skin_Friction_Coefficient_Z\", \"Heat_Flux\"" << "\n";
-        break;
-    }
-    
-    /*--- Loop through all of the collected data and write each node's values ---*/
-    
-    unsigned long Total_Index;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-        
-        /*--- Current index position and global index ---*/
-        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
-        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
-        
-        /*--- Retrieve the merged data for this node ---*/
-        xCoord = Buffer_Recv_Coord_x[Total_Index];
-        yCoord = Buffer_Recv_Coord_y[Total_Index];
-        if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-        Pressure   = Buffer_Recv_Press[Total_Index];
-        PressCoeff = Buffer_Recv_CPress[Total_Index];
+      /*--- Retrieve the current coordinates at this node. ---*/
+      
+      unsigned long iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      for (iDim = 0; iDim < nDim; iDim++) {
+        Coords[iDim][iGlobal_Index] = geometry->node[iPoint]->GetCoord(iDim);
         
-        /*--- Write the first part of the data ---*/
-        SurfFlow_file << scientific << Global_Index << ", " << xCoord << ", " << yCoord << ", ";
-        if (nDim == 3) SurfFlow_file << scientific << zCoord << ", ";
-        SurfFlow_file << scientific << Pressure << ", " << PressCoeff << ", ";
+        /*--- If US system, the output should be in inches ---*/
         
-        /*--- Write the solver-dependent part of the data ---*/
-        switch (solver) {
-          case EULER :
-            Mach = Buffer_Recv_Mach[Total_Index];
-            SurfFlow_file << scientific << Mach << "\n";
-            break;
-          case NAVIER_STOKES: case RANS:
-            SkinFrictionCoeff[0] = Buffer_Recv_SkinFriction_x[Total_Index];
-            SkinFrictionCoeff[1] = Buffer_Recv_SkinFriction_y[Total_Index];
-            if (nDim == 3) SkinFrictionCoeff[2] = Buffer_Recv_SkinFriction_z[Total_Index];
-            HeatFlux = Buffer_Recv_HeatTransfer[Total_Index];
-            if (nDim == 2) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << HeatFlux << "\n";
-            if (nDim == 3) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << SkinFrictionCoeff[2] << ", " << HeatFlux << "\n";
-            break;
+        if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+          Coords[iDim][iGlobal_Index] *= 12.0;
         }
+        
       }
+      
     }
-    
-    /*--- Close the CSV file ---*/
-    SurfFlow_file.close();
-    
-    /*--- Release the recv buffers on the master node ---*/
-    
-    delete [] Buffer_Recv_Coord_x;
-    delete [] Buffer_Recv_Coord_y;
-    if (nDim == 3) delete [] Buffer_Recv_Coord_z;
-    delete [] Buffer_Recv_Press;
-    delete [] Buffer_Recv_CPress;
-    delete [] Buffer_Recv_Mach;
-    delete [] Buffer_Recv_SkinFriction_x;
-    delete [] Buffer_Recv_SkinFriction_y;
-    if (nDim == 3) delete [] Buffer_Recv_SkinFriction_z;
-    delete [] Buffer_Recv_HeatTransfer;
-    delete [] Buffer_Recv_GlobalIndex;
-    
-    delete [] Buffer_Recv_nVertex;
-    
   }
   
-  /*--- Release the memory for the remaining buffers and exit ---*/
   
-  delete [] Buffer_Send_Coord_x;
-  delete [] Buffer_Send_Coord_y;
-  delete [] Buffer_Send_Coord_z;
-  delete [] Buffer_Send_Press;
-  delete [] Buffer_Send_CPress;
-  delete [] Buffer_Send_Mach;
-  delete [] Buffer_Send_SkinFriction_x;
-  delete [] Buffer_Send_SkinFriction_y;
-  delete [] Buffer_Send_SkinFriction_z;
-  delete [] Buffer_Send_HeatTransfer;
-  delete [] Buffer_Send_GlobalIndex;
+  delete [] Local_Halo;
   
-#endif
+#else
   
-}
+  /*--- MPI preprocessing ---*/
+  int iProcessor, nProcessor = size;
+  unsigned long jPoint;
 
-void COutput::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry, CSolver *AdjSolver, CSolver *FlowSolution, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst) {
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
   
-#ifndef HAVE_MPI
+  /*--- Local variables needed for merging the geometry with MPI. ---*/
   
-  unsigned long iPoint, iVertex, Global_Index;
-  su2double *Solution, xCoord, yCoord, zCoord;
-  unsigned short iMarker;
-  char cstr[200], buffer[50];
-  ofstream SurfAdj_file;
-  
-  /*--- Write file name with extension if unsteady ---*/
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
   
-  strcpy (cstr, config->GetSurfAdjCoeff_FileName().c_str());
+  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
   
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
-    
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".csv");
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
   
-  strcat(cstr, buffer);
-  SurfAdj_file.precision(15);
-  SurfAdj_file.open(cstr, ios::out);
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
   
-  SurfAdj_file << "SENS_AOA=" << AdjSolver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-
-  if (geometry->GetnDim() == 2) {
-    if (config ->GetKind_Regime() == COMPRESSIBLE)
-      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"PsiE\",\"x_coord\",\"y_coord\"";
-    else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
-      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"x_coord\",\"y_coord\"";
-
-    if (config->GetDiscrete_Adjoint()) {
-      SurfAdj_file << ",\"x_Sens\",\"y_Sens\"";
-    }
-    SurfAdj_file << "\n";
-    
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES)
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
         for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
           iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-          Solution = AdjSolver->node[iPoint]->GetSolution();
-          xCoord = geometry->node[iPoint]->GetCoord(0);
-          yCoord = geometry->node[iPoint]->GetCoord(1);
-          
-          /*--- If US system, the output should be in inches ---*/
-          
-          if (config->GetSystemMeasurements() == US) {
-            xCoord *= 12.0;
-            yCoord *= 12.0;
-          }
-          if (config ->GetKind_Regime() == COMPRESSIBLE)
-            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
-                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] <<", " << xCoord <<", "<< yCoord;
-          else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
-              SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
-                           << Solution[1] << ", " << Solution[2] <<", " << xCoord <<", "<< yCoord;
-          if (config->GetDiscrete_Adjoint()) {
-            SurfAdj_file << ", " << AdjSolver->node[iPoint]->GetSensitivity(0) << ", " << AdjSolver->node[iPoint]->GetSensitivity(1);
-          }
-          SurfAdj_file << "\n";
-        }
-    }
-  }
-  
-  if (geometry->GetnDim() == 3) {
-    if (config ->GetKind_Regime() == COMPRESSIBLE)
-      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"PsiE\",\"x_coord\",\"y_coord\",\"z_coord\"";
-    else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
-      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"x_coord\",\"y_coord\",\"z_coord\"";
 
-    if (config->GetDiscrete_Adjoint()) {
-      SurfAdj_file << ",\"x_Sens\",\"y_Sens\",\"z_Sens\"";
-    }
-    SurfAdj_file << "\n";
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES)
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-          Solution = AdjSolver->node[iPoint]->GetSolution();
-          
-          xCoord = geometry->node[iPoint]->GetCoord(0);
-          yCoord = geometry->node[iPoint]->GetCoord(1);
-          zCoord = geometry->node[iPoint]->GetCoord(2);
-          
-          /*--- If US system, the output should be in inches ---*/
-          
-          if (config->GetSystemMeasurements() == US) {
-            xCoord *= 12.0;
-            yCoord *= 12.0;
-            zCoord *= 12.0;
+          /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
+           * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
+           * is different in each case ---*/
+
+          if (kind_SU2 == SU2_DEF) {
+            isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+          }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
           }
-          if (config ->GetKind_Regime() == COMPRESSIBLE)
-            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
-                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] << ", " << Solution[4] << ", "<< xCoord <<", "<< yCoord <<", "<< zCoord;
-          else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
-            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
-                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] << ", " << xCoord <<", "<< yCoord <<", "<< zCoord;
-          if (config->GetDiscrete_Adjoint()) {
-            SurfAdj_file << ", " << AdjSolver->node[iPoint]->GetSensitivity(0) << ", " << AdjSolver->node[iPoint]->GetSensitivity(1)
-            << ", " << AdjSolver->node[iPoint]->GetSensitivity(2);
+          if (isPeriodic) {
+            Local_Halo[iPoint] = false;
           }
-          SurfAdj_file << "\n";
         }
+      }
     }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
   }
+  Buffer_Send_nPoin[0] = nLocalPoint;
   
-  SurfAdj_file.close();
+  /*--- Communicate the total number of nodes on this domain. ---*/
   
-#else
-  int iProcessor, nProcessor = size;
-
-  unsigned short nDim = geometry->GetnDim(), iMarker;
-  su2double *Solution, *Coord;
-  unsigned long Buffer_Send_nVertex[1], iVertex, iPoint, nVertex_Surface = 0, nLocalVertex_Surface = 0,
-  MaxLocalVertex_Surface = 0, nBuffer_Scalar;
-  unsigned long *Buffer_Receive_nVertex = NULL;
-  ofstream SurfAdj_file;
+  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
   
-  /*--- Write the surface .csv file ---*/
-  nLocalVertex_Surface = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface ++;
-      }
+  if (rank == MASTER_NODE) {
+    nGlobal_Doma = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
+    }
+  }
+  nBuffer_Scalar = MaxLocalPoint;
   
-  if (rank == MASTER_NODE)
-    Buffer_Receive_nVertex = new unsigned long [nProcessor];
+  /*--- Send and Recv buffers. ---*/
   
-  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_X = NULL;
   
-  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  su2double *Buffer_Send_Coord_x = new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Coord_y= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Coord_z= new su2double[MaxLocalVertex_Surface];
-  unsigned long *Buffer_Send_GlobalPoint= new unsigned long[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Sensitivity= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_PsiRho= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Phi_x= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Phi_y= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_Phi_z= new su2double[MaxLocalVertex_Surface];
-  su2double *Buffer_Send_PsiE = NULL;
-
-  if (config ->GetKind_Regime() == COMPRESSIBLE)
-    Buffer_Send_PsiE =  new su2double[MaxLocalVertex_Surface];
-
-  su2double *Buffer_Send_Sens_x = NULL, *Buffer_Send_Sens_y = NULL, *Buffer_Send_Sens_z = NULL;
-  
-  if (config->GetDiscrete_Adjoint()) {
-    Buffer_Send_Sens_x = new su2double[MaxLocalVertex_Surface];
-    Buffer_Send_Sens_y = new su2double[MaxLocalVertex_Surface];
-    if (nDim == 3) {
-      Buffer_Send_Sens_z = new su2double[MaxLocalVertex_Surface];
-    }
-  }
+  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Y = NULL;
   
-  nVertex_Surface = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if (geometry->node[iPoint]->GetDomain()) {
-          Solution = AdjSolver->node[iPoint]->GetSolution();
-          //Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-          Coord = geometry->node[iPoint]->GetCoord();
-          //d = AdjSolver->node[iPoint]->GetForceProj_Vector();
-          Buffer_Send_GlobalPoint[nVertex_Surface] = geometry->node[iPoint]->GetGlobalIndex();
-          Buffer_Send_Coord_x[nVertex_Surface] = Coord[0];
-          Buffer_Send_Coord_y[nVertex_Surface] = Coord[1];
-          Buffer_Send_Sensitivity[nVertex_Surface] =  AdjSolver->GetCSensitivity(iMarker, iVertex);
-          Buffer_Send_PsiRho[nVertex_Surface] = Solution[0];
-          Buffer_Send_Phi_x[nVertex_Surface] = Solution[1];
-          Buffer_Send_Phi_y[nVertex_Surface] = Solution[2];
-          if ((nDim == 2) && (config->GetKind_Regime() == COMPRESSIBLE)) Buffer_Send_PsiE[nVertex_Surface] = Solution[3];
-          if (nDim == 3) {
-            Buffer_Send_Coord_z[nVertex_Surface] = Coord[2];
-            Buffer_Send_Phi_z[nVertex_Surface] = Solution[3];
-            if(config->GetKind_Regime() == COMPRESSIBLE) Buffer_Send_PsiE[nVertex_Surface] = Solution[4];
-          }
-          if (config->GetDiscrete_Adjoint()) {
-            Buffer_Send_Sens_x[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(0);
-            Buffer_Send_Sens_y[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(1);
-            if (nDim == 3) {
-              Buffer_Send_Sens_z[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(2);
-            }
-          }
-          
-          /*--- If US system, the output should be in inches ---*/
-          
-          if (config->GetSystemMeasurements() == US) {
-            Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
-            Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
-            if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
-          }
-          
-          nVertex_Surface++;
-        }
-      }
+  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
+  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
   
-  su2double *Buffer_Receive_Coord_x = NULL, *Buffer_Receive_Coord_y = NULL, *Buffer_Receive_Coord_z = NULL, *Buffer_Receive_Sensitivity = NULL,
-  *Buffer_Receive_PsiRho = NULL, *Buffer_Receive_Phi_x = NULL, *Buffer_Receive_Phi_y = NULL, *Buffer_Receive_Phi_z = NULL,
-  *Buffer_Receive_PsiE = NULL, *Buffer_Receive_Sens_x = NULL, *Buffer_Receive_Sens_y = NULL, *Buffer_Receive_Sens_z = NULL;
-  unsigned long *Buffer_Receive_GlobalPoint = NULL;
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  
+  /*--- Prepare the receive buffers in the master node only. ---*/
   
   if (rank == MASTER_NODE) {
-    Buffer_Receive_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if (nDim == 3) Buffer_Receive_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_GlobalPoint = new unsigned long [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_Sensitivity = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_PsiRho = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_Phi_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-    Buffer_Receive_Phi_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if (nDim == 3) Buffer_Receive_Phi_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if  (config->GetKind_Regime() == COMPRESSIBLE)
-      Buffer_Receive_PsiE = new su2double [nProcessor*MaxLocalVertex_Surface];
-    if (config->GetDiscrete_Adjoint()) {
-      Buffer_Receive_Sens_x = new su2double[nProcessor*MaxLocalVertex_Surface];
-      Buffer_Receive_Sens_y = new su2double[nProcessor*MaxLocalVertex_Surface];
-      if (nDim == 3) {
-        Buffer_Receive_Sens_z = new su2double[nProcessor*MaxLocalVertex_Surface];
-      }
+    
+    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
+    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
     }
-  }
-  
-  nBuffer_Scalar = MaxLocalVertex_Surface;
-  
-  /*--- Send the information to the Master node ---*/
-  SU2_MPI::Gather(Buffer_Send_Coord_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Coord_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_GlobalPoint, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Receive_GlobalPoint, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Sensitivity, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sensitivity, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_PsiRho, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_PsiRho, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Phi_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Phi_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Phi_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (config->GetKind_Regime() == COMPRESSIBLE)
-      SU2_MPI::Gather(Buffer_Send_PsiE, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_PsiE, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (config->GetDiscrete_Adjoint()) {
-    SU2_MPI::Gather(Buffer_Send_Sens_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Sens_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) {
-      SU2_MPI::Gather(Buffer_Send_Sens_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    Coords = new su2double*[nDim];
+    for (iDim = 0; iDim < nDim; iDim++) {
+      Coords[iDim] = new su2double[nGlobal_Poin];
     }
   }
   
-  /*--- The master node is the one who writes the surface files ---*/
-  if (rank == MASTER_NODE) {
-    unsigned long iVertex, GlobalPoint, position;
-    char cstr[200], buffer[50];
-    ofstream SurfAdj_file;
-    string filename = config->GetSurfAdjCoeff_FileName();
-    
-    /*--- Write file name with extension if unsteady ---*/
-    strcpy (cstr, filename.c_str());
+  /*--- Main communication routine. Loop over each coordinate and perform
+   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
+   all nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+  
+  /*--- Loop over this partition to collect the coords of the local points. ---*/
+  su2double *Coords_Local; jPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
     
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-      SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+    /*--- Check for halos and write only if requested ---*/
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
       
-    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-      if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.csv", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.csv", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
-    }
-    else
-      SPRINTF (buffer, ".csv");
-    
-    strcat (cstr, buffer);
-    SurfAdj_file.open(cstr, ios::out);
-    SurfAdj_file.precision(15);
-    
-    SurfAdj_file << "SENS_AOA=" << AdjSolver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-
-    /*--- Write the 2D surface flow coefficient file ---*/
-    if (geometry->GetnDim() == 2) {
-      if (config->GetKind_Regime() == COMPRESSIBLE)
-        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"PsiE\",\"x_coord\",\"y_coord\"";
-      else if (config->GetKind_Regime() == INCOMPRESSIBLE)
-        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"x_coord\",\"y_coord\"";
-
-      if (config->GetDiscrete_Adjoint()) {
-        SurfAdj_file << ",\" x_Sens\",\"y_Sens\"";
-      }
-      SurfAdj_file << "\n";
+      /*--- Retrieve local coordinates at this node. ---*/
+      Coords_Local = geometry->node[iPoint]->GetCoord();
       
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
-        for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
-          
-          position = iProcessor*MaxLocalVertex_Surface+iVertex;
-          GlobalPoint = Buffer_Receive_GlobalPoint[position];
-
-          if (config->GetKind_Regime() == COMPRESSIBLE)
-            SurfAdj_file << scientific << GlobalPoint <<
-                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
-                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] <<
-                            ", " << Buffer_Receive_PsiE[position] << ", " << Buffer_Receive_Coord_x[position] <<
-                            ", "<< Buffer_Receive_Coord_y[position];
-          else if (config->GetKind_Regime() == INCOMPRESSIBLE)
-            SurfAdj_file << scientific << GlobalPoint <<
-                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
-                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] <<
-                            ", " << Buffer_Receive_Coord_x[position] <<
-                            ", "<< Buffer_Receive_Coord_y[position];
-          if (config->GetDiscrete_Adjoint()) {
-            SurfAdj_file << ", " << Buffer_Receive_Sens_x[position] << ", " << Buffer_Receive_Sens_y[position];
-          }
-          SurfAdj_file << "\n";
-        }
-    }
-    
-    /*--- Write the 3D surface flow coefficient file ---*/
-    if (geometry->GetnDim() == 3) {
-      if (config->GetKind_Regime() == COMPRESSIBLE)
-        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"PsiE\",\"x_coord\",\"y_coord\",\"z_coord\"";
-      else if (config->GetKind_Regime() == INCOMPRESSIBLE)
-        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"x_coord\",\"y_coord\",\"z_coord\"";
-
-      if (config->GetDiscrete_Adjoint()) {
-        SurfAdj_file << ",\"x_Sens\",\"y_Sens\",\"z_Sens\"";
+      /*--- Load local coords into the temporary send buffer. ---*/
+      Buffer_Send_X[jPoint] = Coords_Local[0];
+      Buffer_Send_Y[jPoint] = Coords_Local[1];
+      if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
+      
+      /*--- If US system, the output should be in inches ---*/
+      
+      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+        Buffer_Send_X[jPoint] *= 12.0;
+        Buffer_Send_Y[jPoint] *= 12.0;
+        if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
       }
-      SurfAdj_file << "\n";
       
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
-        for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
-          position = iProcessor*MaxLocalVertex_Surface+iVertex;
-          GlobalPoint = Buffer_Receive_GlobalPoint[position];
-          
-          if (config->GetKind_Regime() == COMPRESSIBLE)
-            SurfAdj_file << scientific << GlobalPoint <<
-                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
-                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] << ", " << Buffer_Receive_Phi_z[position] <<
-                            ", " << Buffer_Receive_PsiE[position] <<", "<< Buffer_Receive_Coord_x[position] <<
-                            ", "<< Buffer_Receive_Coord_y[position] <<", "<< Buffer_Receive_Coord_z[position];
-          else if (config->GetKind_Regime() == INCOMPRESSIBLE)
-            SurfAdj_file << scientific << GlobalPoint <<
-                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
-                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] << ", " << Buffer_Receive_Phi_z[position] <<
-                            ", "<< Buffer_Receive_Coord_x[position] <<
-                            ", "<< Buffer_Receive_Coord_y[position] <<", "<< Buffer_Receive_Coord_z[position];
-
-          if (config->GetDiscrete_Adjoint()) {
-            SurfAdj_file << ", " << Buffer_Receive_Sens_x[position] << ", " << Buffer_Receive_Sens_y[position] << ", " << Buffer_Receive_Sens_z[position];
-          }
-          SurfAdj_file << "\n";
-        }
+      /*--- Store the global index for this local node. ---*/
+      Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Increment jPoint as the counter. We need this because iPoint
+       may include halo nodes that we skip over during this loop. ---*/
+      jPoint++;
     }
-    
   }
   
+  /*--- Gather the coordinate data on the master node using MPI. ---*/
+  
+  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) {
+    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- The master node unpacks and sorts this variable by global index ---*/
+  
   if (rank == MASTER_NODE) {
-    delete [] Buffer_Receive_nVertex;
-    delete [] Buffer_Receive_Coord_x;
-    delete [] Buffer_Receive_Coord_y;
-    if (nDim == 3) delete [] Buffer_Receive_Coord_z;
-    delete [] Buffer_Receive_Sensitivity;
-    delete [] Buffer_Receive_PsiRho;
-    delete [] Buffer_Receive_Phi_x;
-    delete [] Buffer_Receive_Phi_y;
-    if (nDim == 3) delete [] Buffer_Receive_Phi_z;
-    if (config->GetKind_Regime() == COMPRESSIBLE)
-      delete [] Buffer_Receive_PsiE;
-    delete [] Buffer_Receive_GlobalPoint;
-    if (config->GetDiscrete_Adjoint()) {
-      delete [] Buffer_Receive_Sens_x;
-      delete [] Buffer_Receive_Sens_y;
-      if (nDim == 3) {
-        delete [] Buffer_Receive_Sens_z;
+    jPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        /*--- Get global index, then loop over each variable and store ---*/
+        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+        if (iGlobal_Index >= nGlobal_Poin) {
+          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
+        }
+        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
+        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
+        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
+        jPoint++;
       }
+      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+      jPoint = (iProcessor+1)*nBuffer_Scalar;
     }
   }
   
-  delete [] Buffer_Send_Coord_x;
-  delete [] Buffer_Send_Coord_y;
-  delete [] Buffer_Send_Coord_z;
-  delete [] Buffer_Send_GlobalPoint;
-  delete [] Buffer_Send_Sensitivity;
-  delete [] Buffer_Send_PsiRho;
-  delete [] Buffer_Send_Phi_x;
-  delete [] Buffer_Send_Phi_y;
-  delete [] Buffer_Send_Phi_z;
-  delete [] Buffer_Send_PsiE;
-  if (Buffer_Send_Sens_x != NULL) delete [] Buffer_Send_Sens_x;
-  if (Buffer_Send_Sens_y != NULL) delete [] Buffer_Send_Sens_y;
-  if (Buffer_Send_Sens_z != NULL) delete [] Buffer_Send_Sens_z;
-  
-  SurfAdj_file.close();
+  /*--- Immediately release the temporary data buffers. ---*/
+  
+  delete [] Local_Halo;
+  delete [] Buffer_Send_X;
+  delete [] Buffer_Send_Y;
+  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_X;
+    delete [] Buffer_Recv_Y;
+    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
+    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nPoin;
+  }
   
 #endif
+  
 }
 
-void COutput::MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
   
-  /*--- Flags identifying the types of files to be written. ---*/
+  int iProcessor;
+  unsigned short NODES_PER_ELEMENT;
+  unsigned long iPoint, iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
   
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+  unsigned long iVertex, iMarker;
+  unsigned long jElem;
+  int SendRecv, RecvFrom;
   
-  /*--- Merge connectivity for each type of element (excluding halos). Note
-   that we only need to merge the connectivity once, as it does not change
-   during computation. Check whether the base file has been written. ---*/
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
   
-  /*--- Merge volumetric grid. ---*/
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic, isPeriodic;
   
-  if (Wrt_Vol) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
-      cout <<"Merging volumetric triangle grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, TRIANGLE    );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
-      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, QUADRILATERAL   );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
-      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, TETRAHEDRON );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
-      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, HEXAHEDRON  );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
-      cout <<"Merging volumetric prism grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, PRISM       );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
-      cout <<"Merging volumetric pyramid grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, PYRAMID     );
-    
+  unsigned short kind_SU2 = config->GetKind_SU2();
+  
+  int *Conn_Elem = NULL;
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nLocalElem = geometry->GetnElemTria();
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      nLocalElem = geometry->GetnElemQuad();
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      nLocalElem = geometry->GetnElemTetr();
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      nLocalElem = geometry->GetnElemHexa();
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      nLocalElem = geometry->GetnElemPris();
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      nLocalElem = geometry->GetnElemPyra();
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      nLocalElem = 0;
+      NODES_PER_ELEMENT = 0;
+      break;
   }
   
-  /*--- Merge surface grid. ---*/
+  /*--- Find the max number of this element type among all
+   partitions and set up buffers. ---*/
   
-  if (Wrt_Srf) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
-      cout <<"Merging surface line grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, LINE);
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
-      cout <<"Merging surface triangle grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, TRIANGLE);
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
-      cout <<"Merging surface quadrilateral grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, QUADRILATERAL);
-    
+  Buffer_Send_nElem[0] = nLocalElem;
+  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalElem = nLocalElem;
+  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+#endif
+  
+  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+  
+  /*--- Send and Recv buffers ---*/
+  
+  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
+  unsigned long *Buffer_Recv_Elem = NULL;
+  
+  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
+  unsigned short *Buffer_Recv_Halo = NULL;
+  
+  /*--- Prepare the receive buffers on the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
+    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
+    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
   }
   
-  /*--- Update total number of volume elements after merge. ---*/
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that we part of the original domain (we want these to be in the
+   output files). ---*/
   
-  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
-  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
   
-  /*--- Update total number of surface elements after merge. ---*/
+  if (kind_SU2 != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
   
-  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
   
-}
-
-void COutput::MergeCoordinates(CConfig *config, CGeometry *geometry) {
+  /*--- First communicate the number of points that each rank has found ---*/
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
   
-  /*--- Local variables needed on all processors ---*/
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
   
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint;
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
   
-  unsigned short kind_SU2 = config->GetKind_SU2();
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
   
-#ifndef HAVE_MPI
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
   
-  /*--- In serial, the single process has access to all geometry, so simply
-   load the coordinates into the data structure. ---*/
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
   
-  unsigned short iMarker;
-  unsigned long iVertex, nTotalPoints = 0;
-  int SendRecv;
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
   
-  bool isPeriodic;
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
   
-  /*--- First, create a structure to locate any periodic halo nodes ---*/
   int *Local_Halo = new int[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
     Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
@@ -1283,325 +967,262 @@ void COutput::MergeCoordinates(CConfig *config, CGeometry *geometry) {
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
       SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
       for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
-         * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
-         * is different in each case ---*/
-
+        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
         if (kind_SU2 == SU2_DEF) {
           isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
         }else {
           isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
                         (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
         }
-
-        if (isPeriodic && (SendRecv < 0)) {
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
           Local_Halo[iPoint] = false;
         }
       }
-      
     }
   }
   
-  /*--- Total number of points in the mesh (this might include periodic points). ---*/
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (!Local_Halo[iPoint]) nTotalPoints++;
-  
-  nGlobal_Poin = nTotalPoints;
-  nGlobal_Doma = geometry->GetnPointDomain();
-  
-  /*--- Allocate the coordinates data structure. ---*/
-  
-  Coords = new su2double*[nDim];
-  for (iDim = 0; iDim < nDim; iDim++) {
-    Coords[iDim] = new su2double[nGlobal_Poin];
-  }
-  
-  /*--- Loop over the mesh to collect the coords of the local points ---*/
+  /*--- Loop over all elements in this partition and load the
+   elements of the current type into the buffer to be sent to
+   the master node. ---*/
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check if the node belongs to the domain (i.e, not a halo node).
-     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
-    
-    if (!Local_Halo[iPoint]) {
-      
-      /*--- Retrieve the current coordinates at this node. ---*/
+  jNode = 0; jElem = 0;
+  for (iElem = 0; iElem < geometry->GetnElem(); iElem++) {
+    if (geometry->elem[iElem]->GetVTK_Type() == Elem_Type) {
       
-      unsigned long iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+      /*--- Loop over all nodes in this element and load the
+       connectivity into the send buffer. ---*/
       
-      for (iDim = 0; iDim < nDim; iDim++) {
-        Coords[iDim][iGlobal_Index] = geometry->node[iPoint]->GetCoord(iDim);
+      Buffer_Send_Halo[jElem] = false;
+      for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
         
-        /*--- If US system, the output should be in inches ---*/
+        /*--- Store the global index values directly. ---*/
         
-        if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-          Coords[iDim][iGlobal_Index] *= 12.0;
+        iPoint = geometry->elem[iElem]->GetNode(iNode);
+        Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Check if this is a halo node. If so, flag this element
+         as a halo cell. We will use this later to sort and remove
+         any duplicates from the connectivity list. ---*/
+        
+        if (Local_Halo[iPoint]) {
+          Buffer_Send_Halo[jElem] = true;
         }
         
+        /*--- Increment jNode as the counter. We need this because iElem
+         may include other elements that we skip over during this loop. ---*/
+        
+        jNode++;
       }
-      
+      jElem++;
     }
   }
   
+  /*--- Gather the element connectivity information. ---*/
   
-  delete [] Local_Halo;
-  
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
 #else
+  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
+  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+#endif
   
-  /*--- MPI preprocessing ---*/
-  int iProcessor, nProcessor = size;
-  unsigned long jPoint;
-
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  /*--- Local variables needed for merging the geometry with MPI. ---*/
-  
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
+  /*--- The master node unpacks and sorts the connectivity. ---*/
   
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-          /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
-           * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
-           * is different in each case ---*/
-
-          if (kind_SU2 == SU2_DEF) {
-            isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-          }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          }
-          if (isPeriodic) {
-            Local_Halo[iPoint] = false;
-          }
+  if (rank == MASTER_NODE) {
+    
+    /*---  We need to remove any duplicate elements (halo cells) that
+     exist on multiple partitions. Start by initializing all elements
+     to the "write" state by using a boolean array. ---*/
+    
+    Write_Elem = new bool[size*MaxLocalElem];
+    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
+      Write_Elem[iElem] = true;
+    }
+    
+    /*--- Remove the rind layer from the solution only if requested ---*/
+    
+    if (!Wrt_Halo) {
+      
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
+      
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+          
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
+          
         }
+        kElem = (iProcessor+1)*MaxLocalElem;
       }
     }
     
-    /*--- Sum total number of nodes that belong to the domain ---*/
+    /*--- Store the unique connectivity list for this element type. ---*/
     
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+        
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
+          
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
+          
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+          
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
+          }
+        }
+      }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
+    }
   }
-  Buffer_Send_nPoin[0] = nLocalPoint;
   
-  /*--- Communicate the total number of nodes on this domain. ---*/
+  /*--- Immediately release the temporary buffers. ---*/
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] Local_Halo;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
+  }
   
-  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
   
   if (rank == MASTER_NODE) {
-    nGlobal_Doma = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
+    switch (Elem_Type) {
+      case TRIANGLE:
+        nGlobal_Tria = nElem_Total;
+        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_Quad = nElem_Total;
+        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
+        break;
+      case TETRAHEDRON:
+        nGlobal_Tetr = nElem_Total;
+        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
+        break;
+      case HEXAHEDRON:
+        nGlobal_Hexa = nElem_Total;
+        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
+        break;
+      case PRISM:
+        nGlobal_Pris = nElem_Total;
+        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
+        break;
+      case PYRAMID:
+        nGlobal_Pyra = nElem_Total;
+        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
     }
   }
-  nBuffer_Scalar = MaxLocalPoint;
   
-  /*--- Send and Recv buffers. ---*/
+}
+
+void COutput::MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
   
-  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_X = NULL;
+  unsigned short NODES_PER_ELEMENT;
   
-  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Y = NULL;
+  unsigned short iMarker;
+  unsigned long iPoint, iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
   
-  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
-  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
+  int iProcessor;
+  unsigned long jElem;
   
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  unsigned long iVertex;
   
-  /*--- Prepare the receive buffers in the master node only. ---*/
+  int SendRecv, RecvFrom;
   
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
-    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
-    }
-    Coords = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      Coords[iDim] = new su2double[nGlobal_Poin];
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
+  
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic;
+  
+  
+  int *Conn_Elem = NULL;
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  nLocalElem = 0;
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
+        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
+          nLocalElem++;
+        }
+      }
     }
   }
   
-  /*--- Main communication routine. Loop over each coordinate and perform
-   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
-   all nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  /*--- Loop over this partition to collect the coords of the local points. ---*/
-  su2double *Coords_Local; jPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos and write only if requested ---*/
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Retrieve local coordinates at this node. ---*/
-      Coords_Local = geometry->node[iPoint]->GetCoord();
-      
-      /*--- Load local coords into the temporary send buffer. ---*/
-      Buffer_Send_X[jPoint] = Coords_Local[0];
-      Buffer_Send_Y[jPoint] = Coords_Local[1];
-      if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
-      
-      /*--- If US system, the output should be in inches ---*/
-      
-      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-        Buffer_Send_X[jPoint] *= 12.0;
-        Buffer_Send_Y[jPoint] *= 12.0;
-        if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
-      }
-      
-      /*--- Store the global index for this local node. ---*/
-      Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Increment jPoint as the counter. We need this because iPoint
-       may include halo nodes that we skip over during this loop. ---*/
-      jPoint++;
-    }
-  }
-  
-  /*--- Gather the coordinate data on the master node using MPI. ---*/
-  
-  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) {
-    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  }
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- The master node unpacks and sorts this variable by global index ---*/
-  
-  if (rank == MASTER_NODE) {
-    jPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        /*--- Get global index, then loop over each variable and store ---*/
-        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-        if (iGlobal_Index >= nGlobal_Poin) {
-          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
-        }
-        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
-        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
-        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
-        jPoint++;
-      }
-      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-      jPoint = (iProcessor+1)*nBuffer_Scalar;
-    }
-  }
-  
-  /*--- Immediately release the temporary data buffers. ---*/
-  
-  delete [] Local_Halo;
-  delete [] Buffer_Send_X;
-  delete [] Buffer_Send_Y;
-  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_X;
-    delete [] Buffer_Recv_Y;
-    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
-    delete [] Buffer_Recv_GlobalIndex;
-    delete [] Buffer_Recv_nPoin;
-  }
-  
-#endif
-  
-}
-
-void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  int iProcessor;
-  unsigned short NODES_PER_ELEMENT;
-  unsigned long iPoint, iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
-  
-  unsigned long iVertex, iMarker;
-  unsigned long jElem;
-  int SendRecv, RecvFrom;
-  
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
-  
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  unsigned short kind_SU2 = config->GetKind_SU2();
-  
-  int *Conn_Elem = NULL;
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
   switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
     case TRIANGLE:
-      nLocalElem = geometry->GetnElemTria();
       NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
       break;
     case QUADRILATERAL:
-      nLocalElem = geometry->GetnElemQuad();
       NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
       break;
-    case TETRAHEDRON:
-      nLocalElem = geometry->GetnElemTetr();
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      nLocalElem = geometry->GetnElemHexa();
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      nLocalElem = geometry->GetnElemPris();
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      nLocalElem = geometry->GetnElemPyra();
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
     default:
       SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      nLocalElem = 0;
       NODES_PER_ELEMENT = 0;
       break;
   }
@@ -1645,19 +1266,15 @@ void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry,
   
   vector<unsigned long> Added_Periodic;
   Added_Periodic.clear();
-  
-  if (kind_SU2 != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+            (SendRecv < 0)) {
+          Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
         }
       }
     }
@@ -1729,17 +1346,10 @@ void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry,
         notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
                    (SendRecv < 0) && (rank > RecvFrom));
         
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (kind_SU2 == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
+        /*--- We want to keep the periodic nodes that were part of the original domain ---*/
+        notPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                       (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
+                       (SendRecv < 0));
         
         /*--- Lastly, check that this isn't an added periodic point that
          we will forcibly remove. Use the communicated list of these points. ---*/
@@ -1764,38 +1374,39 @@ void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry,
   /*--- Loop over all elements in this partition and load the
    elements of the current type into the buffer to be sent to
    the master node. ---*/
-  
   jNode = 0; jElem = 0;
-  for (iElem = 0; iElem < geometry->GetnElem(); iElem++) {
-    if (geometry->elem[iElem]->GetVTK_Type() == Elem_Type) {
-      
-      /*--- Loop over all nodes in this element and load the
-       connectivity into the send buffer. ---*/
-      
-      Buffer_Send_Halo[jElem] = false;
-      for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-        
-        /*--- Store the global index values directly. ---*/
-        
-        iPoint = geometry->elem[iElem]->GetNode(iNode);
-        Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- Check if this is a halo node. If so, flag this element
-         as a halo cell. We will use this later to sort and remove
-         any duplicates from the connectivity list. ---*/
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
         
-        if (Local_Halo[iPoint]) {
-          Buffer_Send_Halo[jElem] = true;
+        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
+          
+          /*--- Loop over all nodes in this element and load the
+           connectivity into the send buffer. ---*/
+          
+          Buffer_Send_Halo[jElem] = false;
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            
+            /*--- Store the global index values directly. ---*/
+            
+            iPoint = geometry->bound[iMarker][iElem]->GetNode(iNode);
+            Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. ---*/
+            
+            if (Local_Halo[iPoint])
+              Buffer_Send_Halo[jElem] = true;
+            
+            /*--- Increment jNode as the counter. We need this because iElem
+             may include other elements that we skip over during this loop. ---*/
+            
+            jNode++;
+          }
+          jElem++;
         }
-        
-        /*--- Increment jNode as the counter. We need this because iElem
-         may include other elements that we skip over during this loop. ---*/
-        
-        jNode++;
       }
-      jElem++;
-    }
-  }
   
   /*--- Gather the element connectivity information. ---*/
   
@@ -1887,29 +1498,17 @@ void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry,
   
   if (rank == MASTER_NODE) {
     switch (Elem_Type) {
+      case LINE:
+        nGlobal_Line = nElem_Total;
+        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
+        break;
       case TRIANGLE:
-        nGlobal_Tria = nElem_Total;
-        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
+        nGlobal_BoundTria = nElem_Total;
+        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
         break;
       case QUADRILATERAL:
-        nGlobal_Quad = nElem_Total;
-        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
-        break;
-      case TETRAHEDRON:
-        nGlobal_Tetr = nElem_Total;
-        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
-        break;
-      case HEXAHEDRON:
-        nGlobal_Hexa = nElem_Total;
-        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
-        break;
-      case PRISM:
-        nGlobal_Pris = nElem_Total;
-        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
-        break;
-      case PYRAMID:
-        nGlobal_Pyra = nElem_Total;
-        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
+        nGlobal_BoundQuad = nElem_Total;
+        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
         break;
       default:
         SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
@@ -1919,10285 +1518,2799 @@ void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry,
   
 }
 
-void COutput::MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  unsigned short NODES_PER_ELEMENT;
-  
-  unsigned short iMarker;
-  unsigned long iPoint, iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
+void COutput::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
   
-  int iProcessor;
-  unsigned long jElem;
+  unsigned short Kind_Solver  = config->GetKind_Solver();
+  unsigned short iVar = 0, jVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
+  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
+  unsigned short iVar_GridVel = 0, iVar_PressCp = 0, iVar_Lam = 0, iVar_MachMean = 0,
+  iVar_ViscCoeffs = 0, iVar_HeatCoeffs = 0, iVar_Sens = 0, iVar_Extra = 0, iVar_Eddy = 0, iVar_Sharp = 0,
+  iVar_FEA_Vel = 0, iVar_FEA_Accel = 0, iVar_FEA_Stress = 0, iVar_FEA_Stress_3D = 0,
+  iVar_FEA_Extra = 0, iVar_SensDim = 0;
+  unsigned long iPoint = 0, jPoint = 0, iVertex = 0, iMarker = 0;
+  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
   
-  unsigned long iVertex;
+  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Sens = NULL;
   
-  int SendRecv, RecvFrom;
+  unsigned short CurrentIndex;
+  int *Local_Halo;
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
   
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
+  int iProcessor;
   
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic;
+  bool grid_movement  = (config->GetGrid_Movement());
+  bool compressible   = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool transition     = (config->GetKind_Trans_Model() == LM);
+  bool flow           = (( config->GetKind_Solver() == EULER             ) ||
+                         ( config->GetKind_Solver() == NAVIER_STOKES     ) ||
+                         ( config->GetKind_Solver() == RANS              ) ||
+                         ( config->GetKind_Solver() == ADJ_EULER         ) ||
+                         ( config->GetKind_Solver() == ADJ_NAVIER_STOKES ) ||
+                         ( config->GetKind_Solver() == ADJ_RANS          )   );
+  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
   
+  unsigned short iDim;
+  unsigned short nDim = geometry->GetnDim();
+  su2double RefArea = config->GetRefArea();
+  su2double Gamma = config->GetGamma();
+  su2double RefVel2, *Normal, Area;
   
-  int *Conn_Elem = NULL;
+  /*--- Set the non-dimensionalization ---*/
+  if (flow) {
+    if (grid_movement) {
+      Gas_Constant = config->GetGas_ConstantND();
+      Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+      Mach_Motion = config->GetMach_Motion();
+      RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+    }
+    else {
+      RefVel2 = 0.0;
+      for (iDim = 0; iDim < nDim; iDim++)
+        RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+    }
+    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+    RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+    factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+  }
   
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
+  /*--- Prepare send buffers for the conservative variables. Need to
+   find the total number of conservative variables and also the
+   index for their particular solution container. ---*/
   
-  nLocalElem = 0;
+  switch (Kind_Solver) {
+    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; if(config->GetWeakly_Coupled_Heat()) SecondIndex = HEAT_SOL; else SecondIndex = NONE; ThirdIndex = NONE; break;
+    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; if (transition) ThirdIndex=TRANS_SOL; else ThirdIndex = NONE;  if(config->GetWeakly_Coupled_Heat()) ThirdIndex = HEAT_SOL; else ThirdIndex = NONE; break;
+    case FEM_ELASTICITY: FirstIndex = FEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
+    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    default: SecondIndex = NONE; ThirdIndex = NONE; break;
+  }
   
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
-        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
-          nLocalElem++;
-        }
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
+  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
+  nVar_Total = nVar_Consv;
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the limiters ---*/
+    
+    if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
+    
+    /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
+    
+    if (grid_movement && !fem) {
+      iVar_GridVel = nVar_Total;
+      if (geometry->GetnDim() == 2) nVar_Total += 2;
+      else if (geometry->GetnDim() == 3) nVar_Total += 3;
+    }
+    
+    /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
+    
+    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      iVar_PressCp = nVar_Total; nVar_Total += 3;
+      iVar_MachMean = nVar_Total; nVar_Total += 1;
+    }
+    
+    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+    
+    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      iVar_Lam = nVar_Total;
+      nVar_Total += 1;
+      iVar_ViscCoeffs = nVar_Total;
+      if (geometry->GetnDim() == 2) nVar_Total += 2;
+      else if (geometry->GetnDim() == 3) nVar_Total += 3;
+      iVar_HeatCoeffs = nVar_Total;
+      nVar_Total += 2;
+    }
+    
+    /*--- Add Eddy Viscosity to the restart file ---*/
+    
+    if (Kind_Solver == RANS) {
+      iVar_Eddy = nVar_Total; nVar_Total += 1;
+    }
+    
+    /*--- Add Sharp edges to the restart file ---*/
+    
+    if (config->GetWrt_SharpEdges()) {
+      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+        iVar_Sharp = nVar_Total; nVar_Total += 1;
+      }
+    }
+    
+    
+    if (( Kind_Solver == ADJ_EULER              ) ||
+        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+        ( Kind_Solver == ADJ_RANS               )) {
+      iVar_Sens   = nVar_Total; nVar_Total += 2;
+    }
+    
+    if (Kind_Solver == FEM_ELASTICITY)  {
+      /*--- If the analysis is dynamic... ---*/
+      if (config->GetDynamic_Analysis() == DYNAMIC) {
+        /*--- Velocities ---*/
+        iVar_FEA_Vel = nVar_Total;
+        if (geometry->GetnDim() == 2) nVar_Total += 2;
+        else if (geometry->GetnDim() == 3) nVar_Total += 3;
+        /*--- Accelerations ---*/
+        iVar_FEA_Accel = nVar_Total;
+        if (geometry->GetnDim() == 2) nVar_Total += 2;
+        else if (geometry->GetnDim() == 3) nVar_Total += 3;
+      }
+      iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
+      if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
+      iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_EULER)         ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      iVar_Sens    = nVar_Total; nVar_Total += 1;
+      iVar_SensDim = nVar_Total; nVar_Total += nDim;
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+      iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
+    }
+
+    if (config->GetExtraOutput()) {
+      if (Kind_Solver == RANS) {
+        iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
       }
     }
+    
   }
   
-  switch (Elem_Type) {
-    case LINE:
-      NODES_PER_ELEMENT = N_POINTS_LINE;
-      break;
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      NODES_PER_ELEMENT = 0;
-      break;
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+    
   }
+  Buffer_Send_nPoint[0] = nLocalPoint;
   
-  /*--- Find the max number of this element type among all
-   partitions and set up buffers. ---*/
+  /*--- Each processor sends its local number of nodes to the master. ---*/
   
-  Buffer_Send_nElem[0] = nLocalElem;
-  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
   
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
 #else
-  MaxLocalElem = nLocalElem;
-  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+  MaxLocalPoint = nLocalPoint;
+  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
 #endif
   
-  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
-  
-  /*--- Send and Recv buffers ---*/
+  nBuffer_Scalar = MaxLocalPoint;
   
-  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
-  unsigned long *Buffer_Recv_Elem = NULL;
+  /*--- Send and Recv buffers. ---*/
   
-  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
-  unsigned short *Buffer_Recv_Halo = NULL;
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
   
-  /*--- Prepare the receive buffers on the master node only. ---*/
+  su2double *Buffer_Send_Res = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Res = NULL;
   
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
-    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
-    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that we part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-            (SendRecv < 0)) {
-          Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found ---*/
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  su2double *Buffer_Send_Vol = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Vol = NULL;
   
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
   
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  /*--- Auxiliary vectors for surface coefficients ---*/
   
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    Aux_Frict_x = new su2double[geometry->GetnPoint()];
+    Aux_Frict_y = new su2double[geometry->GetnPoint()];
+    Aux_Frict_z = new su2double[geometry->GetnPoint()];
+    Aux_Heat  = new su2double[geometry->GetnPoint()];
+    Aux_yPlus = new su2double[geometry->GetnPoint()];
   }
   
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
+  if ((Kind_Solver == ADJ_EULER) ||
+      (Kind_Solver == ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == ADJ_RANS)  ||
+      (Kind_Solver == DISC_ADJ_EULER) ||
+      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == DISC_ADJ_RANS)) {
+    Aux_Sens = new su2double[geometry->GetnPoint()];
+  }
   
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
+  /*--- Prepare the receive buffers in the master node only. ---*/
   
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
+  if (rank == MASTER_NODE) {
+    
+    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_Res = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_Vol = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+  }
   
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
   
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
+  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+    
+    /*--- Logic for which solution class to draw from. ---*/
+    
+    jVar = iVar;
+    CurrentIndex = FirstIndex;
+    if ((SecondIndex != NONE) && (iVar > nVar_First-1)) {
+      jVar = iVar - nVar_First;
+      CurrentIndex = SecondIndex;
+    }
+    if ((SecondIndex != NONE) && (ThirdIndex != NONE) && (iVar > (nVar_First + nVar_Second-1))) {
+      jVar = iVar - nVar_First - nVar_Second;
+      CurrentIndex = ThirdIndex;
+    }
+    
+    /*--- Loop over this partition to collect the current variable ---*/
+    
+    jPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
       
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+      /*--- Check for halos & write only if requested ---*/
+      
+      if (!Local_Halo[iPoint] || Wrt_Halo) {
         
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
+        /*--- Get this variable into the temporary send buffer. ---*/
         
-        /*--- We want to keep the periodic nodes that were part of the original domain ---*/
-        notPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                       (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
-                       (SendRecv < 0));
+        Buffer_Send_Var[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar);
         
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
+        if (!config->GetLow_MemoryOutput()) {
+          
+          if (config->GetWrt_Limiters()) {
+            Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
           }
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+          if (config->GetWrt_Residuals()) {
+            if (!config->GetDiscrete_Adjoint()) {
+              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            } else {
+              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
+              solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
+            }
+          }
+          
         }
         
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
+        /*--- Only send/recv the volumes & global indices during the first loop ---*/
+        
+        if (iVar == 0) {
+          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
         }
+        
+        jPoint++;
+        
       }
     }
-  }
-  
-  /*--- Loop over all elements in this partition and load the
-   elements of the current type into the buffer to be sent to
-   the master node. ---*/
-  jNode = 0; jElem = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
-        
-        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
-          
-          /*--- Loop over all nodes in this element and load the
-           connectivity into the send buffer. ---*/
-          
-          Buffer_Send_Halo[jElem] = false;
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            
-            /*--- Store the global index values directly. ---*/
-            
-            iPoint = geometry->bound[iMarker][iElem]->GetNode(iNode);
-            Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Check if this is a halo node. If so, flag this element
-             as a halo cell. We will use this later to sort and remove
-             any duplicates from the connectivity list. ---*/
-            
-            if (Local_Halo[iPoint])
-              Buffer_Send_Halo[jElem] = true;
-            
-            /*--- Increment jNode as the counter. We need this because iElem
-             may include other elements that we skip over during this loop. ---*/
-            
-            jNode++;
-          }
-          jElem++;
-        }
+    
+    /*--- Gather the data on the master node. ---*/
+    
+#ifdef HAVE_MPI
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+    if (!config->GetLow_MemoryOutput()) {
+      
+      if (config->GetWrt_Limiters()) {
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
       }
-  
-  /*--- Gather the element connectivity information. ---*/
-  
+      
+      if (config->GetWrt_Residuals()) {
 #ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
 #else
-  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
-  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
 #endif
-  
-  /*--- The master node unpacks and sorts the connectivity. ---*/
-  
-  if (rank == MASTER_NODE) {
+      }
+      
+    }
     
-    /*---  We need to remove any duplicate elements (halo cells) that
-     exist on multiple partitions. Start by initializing all elements
-     to the "write" state by using a boolean array. ---*/
+    if (iVar == 0) {
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
+#endif
+    }
     
-    Write_Elem = new bool[size*MaxLocalElem];
-    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
-      Write_Elem[iElem] = true;
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+    
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+          
+          /*--- Get global index, then loop over each variable and store ---*/
+          
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+          
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+          
+          if (!config->GetLow_MemoryOutput()) {
+            
+            if (config->GetWrt_Limiters()) {
+              Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            }
+            
+            if (config->GetWrt_Residuals()) {
+              unsigned short ExtraIndex;
+              ExtraIndex = nVar_Consv;
+              if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
+              Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            }
+            
+          }
+          
+          jPoint++;
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
     }
     
-    /*--- Remove the rind layer from the solution only if requested ---*/
+  }
+  
+  if (!config->GetLow_MemoryOutput()) {
     
-    if (!Wrt_Halo) {
+    /*--- Additional communication routine for the grid velocity. Note that
+     we are reusing the same temporary buffers from above for efficiency.
+     Also, in the future more routines like this could be used to write
+     an arbitrary number of additional variables to the file. ---*/
+    
+    if (grid_movement && !fem) {
       
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+      jPoint = 0; su2double *Grid_Vel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
           
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
+          /*--- Load buffers with the three grid velocity components. ---*/
           
+          Grid_Vel = geometry->node[iPoint]->GetGridVel();
+          Buffer_Send_Var[jPoint] = Grid_Vel[0];
+          Buffer_Send_Res[jPoint] = Grid_Vel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Grid_Vel[2];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_GridVel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
-        kElem = (iProcessor+1)*MaxLocalElem;
       }
     }
     
-    /*--- Store the unique connectivity list for this element type. ---*/
+    /*--- Communicate Pressure, Cp, and Mach ---*/
     
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the coefficient of pressure at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
         
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
           
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
+          /*--- Load buffers with the pressure, Cp, and mach variables. ---*/
+
+          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetPressure();
+          if (compressible){
+            Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetTemperature();
+          } else{
+            Buffer_Send_Res[jPoint] =  0.0;
+          }
+          Buffer_Send_Vol[jPoint] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea;
+
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_PressCp;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
           
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
           
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Communicate Mach---*/
+    
+    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
+          
+          if (compressible) {
+            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
+            solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed();
+          }
+          if (incompressible) {
+            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())*config->GetVelocity_Ref()/
+            sqrt(config->GetBulk_Modulus()/(solver[FLOW_SOL]->node[iPoint]->GetDensity()*config->GetDensity_Ref()));
           }
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_MachMean;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
       }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
     }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] Local_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
-  }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case LINE:
-        nGlobal_Line = nElem_Total;
-        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
-        break;
-      case TRIANGLE:
-        nGlobal_BoundTria = nElem_Total;
-        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_BoundQuad = nElem_Total;
-        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-        break;
-    }
-  }
-  
-}
-
-void COutput::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar = 0, jVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
-  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
-  unsigned short iVar_GridVel = 0, iVar_PressCp = 0, iVar_Lam = 0, iVar_MachMean = 0,
-  iVar_ViscCoeffs = 0, iVar_HeatCoeffs = 0, iVar_Sens = 0, iVar_Extra = 0, iVar_Eddy = 0, iVar_Sharp = 0,
-  iVar_FEA_Vel = 0, iVar_FEA_Accel = 0, iVar_FEA_Stress = 0, iVar_FEA_Stress_3D = 0,
-  iVar_FEA_Extra = 0, iVar_SensDim = 0;
-  unsigned long iPoint = 0, jPoint = 0, iVertex = 0, iMarker = 0;
-  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
-  
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Sens = NULL;
-  
-  unsigned short CurrentIndex;
-  int *Local_Halo;
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  int iProcessor;
-  
-  bool grid_movement  = (config->GetGrid_Movement());
-  bool compressible   = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool transition     = (config->GetKind_Trans_Model() == LM);
-  bool flow           = (( config->GetKind_Solver() == EULER             ) ||
-                         ( config->GetKind_Solver() == NAVIER_STOKES     ) ||
-                         ( config->GetKind_Solver() == RANS              ) ||
-                         ( config->GetKind_Solver() == ADJ_EULER         ) ||
-                         ( config->GetKind_Solver() == ADJ_NAVIER_STOKES ) ||
-                         ( config->GetKind_Solver() == ADJ_RANS          )   );
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  
-  unsigned short iDim;
-  unsigned short nDim = geometry->GetnDim();
-  su2double RefArea = config->GetRefArea();
-  su2double Gamma = config->GetGamma();
-  su2double RefVel2, *Normal, Area;
-  
-  /*--- Set the non-dimensionalization ---*/
-  if (flow) {
-    if (grid_movement) {
-      Gas_Constant = config->GetGas_ConstantND();
-      Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-      Mach_Motion = config->GetMach_Motion();
-      RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-    }
-    else {
-      RefVel2 = 0.0;
-      for (iDim = 0; iDim < nDim; iDim++)
-        RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-    }
-    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-    RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-    factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  }
-  
-  /*--- Prepare send buffers for the conservative variables. Need to
-   find the total number of conservative variables and also the
-   index for their particular solution container. ---*/
-  
-  switch (Kind_Solver) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; if(config->GetWeakly_Coupled_Heat()) SecondIndex = HEAT_SOL; else SecondIndex = NONE; ThirdIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; if (transition) ThirdIndex=TRANS_SOL; else ThirdIndex = NONE;  if(config->GetWeakly_Coupled_Heat()) ThirdIndex = HEAT_SOL; else ThirdIndex = NONE; break;
-    case FEM_ELASTICITY: FirstIndex = FEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
-    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    default: SecondIndex = NONE; ThirdIndex = NONE; break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
-  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
-  nVar_Total = nVar_Consv;
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
-    
-    if (grid_movement && !fem) {
-      iVar_GridVel = nVar_Total;
-      if (geometry->GetnDim() == 2) nVar_Total += 2;
-      else if (geometry->GetnDim() == 3) nVar_Total += 3;
-    }
-    
-    /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      iVar_PressCp = nVar_Total; nVar_Total += 3;
-      iVar_MachMean = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      iVar_Lam = nVar_Total;
-      nVar_Total += 1;
-      iVar_ViscCoeffs = nVar_Total;
-      if (geometry->GetnDim() == 2) nVar_Total += 2;
-      else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      iVar_HeatCoeffs = nVar_Total;
-      nVar_Total += 2;
-    }
-    
-    /*--- Add Eddy Viscosity to the restart file ---*/
-    
-    if (Kind_Solver == RANS) {
-      iVar_Eddy = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Sharp edges to the restart file ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        iVar_Sharp = nVar_Total; nVar_Total += 1;
-      }
-    }
-    
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      iVar_Sens   = nVar_Total; nVar_Total += 2;
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY)  {
-      /*--- If the analysis is dynamic... ---*/
-      if (config->GetDynamic_Analysis() == DYNAMIC) {
-        /*--- Velocities ---*/
-        iVar_FEA_Vel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-        /*--- Accelerations ---*/
-        iVar_FEA_Accel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      }
-      iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
-      if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_EULER)         ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      iVar_Sens    = nVar_Total; nVar_Total += 1;
-      iVar_SensDim = nVar_Total; nVar_Total += nDim;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
-    }
-
-    if (config->GetExtraOutput()) {
-      if (Kind_Solver == RANS) {
-        iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
-      }
-    }
-    
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-    
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-    
-  }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-  
-  /*--- Each processor sends its local number of nodes to the master. ---*/
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalPoint = nLocalPoint;
-  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
-#endif
-  
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
-  
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
-  
-  su2double *Buffer_Send_Res = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Res = NULL;
-  
-  su2double *Buffer_Send_Vol = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Vol = NULL;
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Auxiliary vectors for surface coefficients ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat  = new su2double[geometry->GetnPoint()];
-    Aux_yPlus = new su2double[geometry->GetnPoint()];
-  }
-  
-  if ((Kind_Solver == ADJ_EULER) ||
-      (Kind_Solver == ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == ADJ_RANS)  ||
-      (Kind_Solver == DISC_ADJ_EULER) ||
-      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == DISC_ADJ_RANS)) {
-    Aux_Sens = new su2double[geometry->GetnPoint()];
-  }
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_Res = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_Vol = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
-  }
-  
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-    
-    /*--- Logic for which solution class to draw from. ---*/
-    
-    jVar = iVar;
-    CurrentIndex = FirstIndex;
-    if ((SecondIndex != NONE) && (iVar > nVar_First-1)) {
-      jVar = iVar - nVar_First;
-      CurrentIndex = SecondIndex;
-    }
-    if ((SecondIndex != NONE) && (ThirdIndex != NONE) && (iVar > (nVar_First + nVar_Second-1))) {
-      jVar = iVar - nVar_First - nVar_Second;
-      CurrentIndex = ThirdIndex;
-    }
-    
-    /*--- Loop over this partition to collect the current variable ---*/
-    
-    jPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      
-      /*--- Check for halos & write only if requested ---*/
-      
-      if (!Local_Halo[iPoint] || Wrt_Halo) {
-        
-        /*--- Get this variable into the temporary send buffer. ---*/
-        
-        Buffer_Send_Var[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar);
-        
-        if (!config->GetLow_MemoryOutput()) {
-          
-          if (config->GetWrt_Limiters()) {
-            Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-          }
-          
-          if (config->GetWrt_Residuals()) {
-            if (!config->GetDiscrete_Adjoint()) {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            } else {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
-              solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
-            }
-          }
-          
-        }
-        
-        /*--- Only send/recv the volumes & global indices during the first loop ---*/
-        
-        if (iVar == 0) {
-          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-        }
-        
-        jPoint++;
-        
-      }
-    }
-    
-    /*--- Gather the data on the master node. ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-    if (!config->GetLow_MemoryOutput()) {
-      
-      if (config->GetWrt_Limiters()) {
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      }
-      
-      if (config->GetWrt_Residuals()) {
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      }
-      
-    }
-    
-    if (iVar == 0) {
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
-#endif
-    }
-    
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-    
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-          
-          /*--- Get global index, then loop over each variable and store ---*/
-          
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-          
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-          
-          if (!config->GetLow_MemoryOutput()) {
-            
-            if (config->GetWrt_Limiters()) {
-              Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            }
-            
-            if (config->GetWrt_Residuals()) {
-              unsigned short ExtraIndex;
-              ExtraIndex = nVar_Consv;
-              if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
-              Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            }
-            
-          }
-          
-          jPoint++;
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-    
-  }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Additional communication routine for the grid velocity. Note that
-     we are reusing the same temporary buffers from above for efficiency.
-     Also, in the future more routines like this could be used to write
-     an arbitrary number of additional variables to the file. ---*/
-    
-    if (grid_movement && !fem) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Grid_Vel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Buffer_Send_Var[jPoint] = Grid_Vel[0];
-          Buffer_Send_Res[jPoint] = Grid_Vel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Grid_Vel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_GridVel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate Pressure, Cp, and Mach ---*/
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the coefficient of pressure at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the pressure, Cp, and mach variables. ---*/
-
-          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetPressure();
-          if (compressible){
-            Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetTemperature();
-          } else{
-            Buffer_Send_Res[jPoint] =  0.0;
-          }
-          Buffer_Send_Vol[jPoint] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea;
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_PressCp;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate Mach---*/
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          if (compressible) {
-            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
-            solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed();
-          }
-          if (incompressible) {
-            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())*config->GetVelocity_Ref()/
-            sqrt(config->GetBulk_Modulus()/(solver[FLOW_SOL]->node[iPoint]->GetDensity()*config->GetDensity_Ref()));
-          }
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_MachMean;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Laminar Viscosity ---*/
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity();
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Lam;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-      
-      /*--- Communicate skin friction ---*/
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the viscous coefficients at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        Aux_Frict_x[iPoint] = 0.0;
-        Aux_Frict_y[iPoint] = 0.0;
-        Aux_Frict_z[iPoint] = 0.0;
-      }
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-            Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-            if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Buffer_Send_Var[jPoint] = Aux_Frict_x[iPoint];
-          Buffer_Send_Res[jPoint] = Aux_Frict_y[iPoint];
-          if (geometry->GetnDim() == 3)
-            Buffer_Send_Vol[jPoint] = Aux_Frict_z[iPoint];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-          Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0;
-        iVar = iVar_ViscCoeffs;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar + 2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor + 1) * nBuffer_Scalar;
-        }
-      }
-      
-      /*--- Communicate heat transfer, y+ ---*/
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the viscous coefficients at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        Aux_Heat[iPoint] = 0.0;
-        Aux_yPlus[iPoint] = 0.0;
-      }
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-            Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          if (compressible) {
-            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
-            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
-          }
-          if (incompressible) {
-            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
-            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
-          }
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0;
-        iVar = iVar_HeatCoeffs;
-
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar + 0][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor + 1) * nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Eddy Viscosity ---*/
-    
-    if (Kind_Solver == RANS) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the pressure and mach variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity();
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Eddy;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-      
-    }
-    
-    /*--- Communicate the Sharp Edges ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        
-        /*--- Loop over this partition to collect the current variable ---*/
-        jPoint = 0;
-        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-          
-          /*--- Check for halos & write only if requested ---*/
-          
-          if (!Local_Halo[iPoint] || Wrt_Halo) {
-            
-            /*--- Load buffers with the pressure and mach variables. ---*/
-            
-            Buffer_Send_Var[jPoint] = geometry->node[iPoint]->GetSharpEdge_Distance();
-            jPoint++;
-          }
-        }
-        
-        /*--- Gather the data on the master node. ---*/
-        
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-        
-        /*--- The master node unpacks and sorts this variable by global index ---*/
-        
-        if (rank == MASTER_NODE) {
-          jPoint = 0; iVar = iVar_Sharp;
-          for (iProcessor = 0; iProcessor < size; iProcessor++) {
-            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-              
-              /*--- Get global index, then loop over each variable and store ---*/
-              
-              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-              Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-              jPoint++;
-            }
-            
-            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-            
-            jPoint = (iProcessor+1)*nBuffer_Scalar;
-          }
-        }
-      }
-    }
-    
-    /*--- Communicate the surface sensitivity ---*/
-    
-    if ((Kind_Solver == ADJ_EULER)         ||
-        (Kind_Solver == ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == ADJ_RANS)          ||
-        (Kind_Solver == DISC_ADJ_EULER)    ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the surface sensitivity at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) Aux_Sens[iPoint] = 0.0;
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-            Area = 0.0;
-            for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
-            Area = sqrt (Area);
-            Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = Aux_Sens[iPoint];
-          if ((config->GetKind_ConvNumScheme() == SPACE_CENTERED) && (!config->GetDiscrete_Adjoint()))
-            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint);
-          if ((config->GetKind_ConvNumScheme() == SPACE_UPWIND) && (!config->GetDiscrete_Adjoint()))
-            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0);
-          
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (!config->GetDiscrete_Adjoint())
-        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      if (!config->GetDiscrete_Adjoint())
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Sens;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            if (!config->GetDiscrete_Adjoint())
-              Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_EULER)    ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0);
-          Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1);
-          if (nDim == 3)
-            Buffer_Send_Vol[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (nDim == 3)
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (nDim == 3)
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_SensDim;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (nDim == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Velocities for dynamic FEM problem ---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Node_Vel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
-          Buffer_Send_Var[jPoint] = Node_Vel[0];
-          Buffer_Send_Res[jPoint] = Node_Vel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Vel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Vel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate the Accelerations for dynamic FEM problem ---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Node_Accel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
-          Buffer_Send_Var[jPoint] = Node_Accel[0];
-          Buffer_Send_Res[jPoint] = Node_Accel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Accel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Accel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-
-    /*--- Communicate the FEM elasticity stresses (2D) - New elasticity solver---*/
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Stress;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-          /*--- Sigma xx ---*/
-          Buffer_Send_Var[jPoint] = Stress[0];
-          /*--- Sigma yy ---*/
-          Buffer_Send_Res[jPoint] = Stress[1];
-          /*--- Sigma xy ---*/
-          Buffer_Send_Vol[jPoint] = Stress[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Stress;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate the FEM elasticity stresses (3D) - New elasticity solver---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (geometry->GetnDim() == 3)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Stress;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-          /*--- Sigma zz ---*/
-          Buffer_Send_Var[jPoint] = Stress[3];
-          /*--- Sigma xz ---*/
-          Buffer_Send_Res[jPoint] = Stress[4];
-          /*--- Sigma yz ---*/
-          Buffer_Send_Vol[jPoint] = Stress[5];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Stress_3D;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Linear elasticity ---*/
-    
-    if ( Kind_Solver == FEM_ELASTICITY ) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress();
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Extra;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())) {
-      /*--- Loop over this partition to collect the current variable ---*/
-
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-
-        /*--- Check for halos & write only if requested ---*/
-
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-
-          Buffer_Send_Var[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(0);
-          Buffer_Send_Res[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(1);
-          if (geometry->GetnDim() == 3)
-            Buffer_Send_Vol[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(2);
-          jPoint++;
-        }
-      }
-
-      /*--- Gather the data on the master node. ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (nDim == 3)
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (nDim == 3)
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Extra;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-
-            /*--- Get global index, then loop over each variable and store ---*/
-
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (nDim == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-
-    if (config->GetExtraOutput()) {
-      
-      for (jVar = 0; jVar < nVar_Extra; jVar++) {
-        
-        /*--- Loop over this partition to collect the current variable ---*/
-        
-        jPoint = 0;
-        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-          
-          /*--- Check for halos & write only if requested ---*/
-          
-          if (!Local_Halo[iPoint] || Wrt_Halo) {
-            
-            /*--- Get this variable into the temporary send buffer. ---*/
-            
-            if (Kind_Solver == RANS) {
-              Buffer_Send_Var[jPoint] = solver[TURB_SOL]->OutputVariables[iPoint*nVar_Extra+jVar];
-            }
-            jPoint++;
-            
-          }
-        }
-        
-        /*--- Gather the data on the master node. ---*/
-        
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-        
-        /*--- The master node unpacks and sorts this variable by global index ---*/
-        
-        if (rank == MASTER_NODE) {
-          jPoint = 0; iVar = iVar_Extra;
-          for (iProcessor = 0; iProcessor < size; iProcessor++) {
-            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-              
-              /*--- Get global index, then loop over each variable and store ---*/
-              
-              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-              Data[iVar+jVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-              jPoint++;
-            }
-            
-            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-            
-            jPoint = (iProcessor+1)*nBuffer_Scalar;
-          }
-        }
-      }
-    }
-    
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_Res;
-  delete [] Buffer_Send_Vol;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nPoint;
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_Res;
-    delete [] Buffer_Recv_Vol;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
-  
-  /*--- Release memory needed for surface coefficients ---*/
-  
-  delete [] Local_Halo;
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    delete[] Aux_Frict_x; delete[] Aux_Frict_y; delete[] Aux_Frict_z;
-    delete [] Aux_Heat; delete [] Aux_yPlus;
-  }
-  if (( Kind_Solver == ADJ_EULER              ) ||
-      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-      ( Kind_Solver == ADJ_RANS               ) ||
-      ( Kind_Solver == DISC_ADJ_EULER         ) ||
-      ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
-      ( Kind_Solver == DISC_ADJ_RANS          )) {
-    delete [] Aux_Sens;
-  }
-  
-}
-
-void COutput::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
-  
-  /*--- Local variables needed on all processors ---*/
-  unsigned short iVar;
-  unsigned long iPoint = 0, jPoint = 0;
-  
-  nVar_Total = config->fields.size() - 1;
-  
-  /*--- Merge the solution either in serial or parallel. ---*/
-  
-#ifndef HAVE_MPI
-  
-  /*--- In serial, the single process has access to all solution data,
-   so it is simple to retrieve and store inside Solution_Data. ---*/
-  
-  unsigned short iMarker;
-  unsigned long iVertex, nTotalPoints = 0;
-  int SendRecv;
-  
-  /*--- First, create a structure to locate any periodic halo nodes ---*/
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
-            (SendRecv < 0)) {
-          Local_Halo[iPoint] = false;
-        }
-      }
-      
-    }
-  }
-  
-  /*--- Total number of points in the mesh (this might include periodic points). ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (!Local_Halo[iPoint]) nTotalPoints++;
-  
-  nGlobal_Poin = nTotalPoints;
-  Data = new su2double*[nVar_Total];
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    Data[iVar] = new su2double[nGlobal_Poin];
-  }
-  
-  /*--- Loop over all points in the mesh, but only write data
-   for nodes in the domain (ignore periodic halo nodes). ---*/
-  
-  jPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    if (!Local_Halo[iPoint]) {
-      
-      /*--- Solution (first, and second system of equations) ---*/
-      
-      unsigned short jVar = 0;
-      for (iVar = 0; iVar < nVar_Total; iVar++) {
-        Data[jVar][jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        jVar++;
-      }
-    }
-    
-    /*--- Increment jPoint as the counter. We need this because iPoint
-     may include halo nodes that we skip over during this loop. ---*/
-    
-    jPoint++;
-    
-  }
-  
-#else
-  
-  /*--- MPI preprocessing ---*/
-  
-  int nProcessor = size, iProcessor;
-  
-  /*--- Local variables needed for merging with MPI ---*/
-  
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-    
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-    
-  }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[nProcessor];
-  
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
-  
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_Var = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
-    
-  }
-  
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    
-    /*--- Loop over this partition to collect the current variable ---*/
-    jPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      
-      /*--- Check for halos and write only if requested ---*/
-      if (!Local_Halo[iPoint] || Wrt_Halo) {
-        
-        /*--- Get this variable into the temporary send buffer. ---*/
-        Buffer_Send_Var[jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        
-        /*--- Only send/recv the volumes & global indices during the first loop ---*/
-        if (iVar == 0) {
-          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-        }
-        jPoint++;
-      }
-    }
-    
-    /*--- Gather the data on the master node. ---*/
-    
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (iVar == 0) {
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-    }
-    
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-          
-          /*--- Get global index, then loop over each variable and store ---*/
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-          jPoint++;
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
-  
-#endif
-  
-  delete [] Local_Halo;
-  
-}
-
-void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  /*--- Local variables ---*/
-  
-  unsigned short nZone = geometry->GetnZone();
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar, iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool grid_movement = config->GetGrid_Movement();
-  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  ofstream restart_file;
-  ofstream meta_file;
-  string filename, meta_filename;
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  
-  /*--- Retrieve filename from config ---*/
-  
-  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
-  
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
-  
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  }
-  
-  /*--- Open the restart file and write the solution. ---*/
-  
-  restart_file.open(filename.c_str(), ios::out);
-  restart_file.precision(15);
-  
-  /*--- Write the header line based on the particular solver ----*/
-  
-  restart_file << "\"PointID\"";
-  
-  /*--- Mesh coordinates are always written to the restart first ---*/
-  
-  if (nDim == 2) {
-    restart_file << "\t\"x\"\t\"y\"";
-  } else {
-    restart_file << "\t\"x\"\t\"y\"\t\"z\"";
-  }
-  
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-  if (( Kind_Solver == FEM_ELASTICITY ) || ( Kind_Solver == DISC_ADJ_FEM))
-      restart_file << "\t\"Displacement_" << iVar+1<<"\"";
-    else
-      restart_file << "\t\"Conservative_" << iVar+1<<"\"";
-  }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
-      }
-    }
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Residual_" << iVar+1<<"\"";
-      }
-    }
-    
-    /*--- Mesh velocities for dynamic mesh cases ---*/
-    
-    if (grid_movement && !fem) {
-      if (nDim == 2) {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
-      } else {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
-      }
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
-      } else
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
-        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-      } else {
-        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
-        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
-      }
-    }
-    
-    if (Kind_Solver == RANS) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
-        restart_file << "\t\"Eddy_Viscosity\"";
-      } else
-        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
-    }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        restart_file << "\t\"Sharp_Edge_Dist\"";
-      }
-    }
-    
-    if ((Kind_Solver == ADJ_EULER              ) ||
-        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        (Kind_Solver == ADJ_RANS               )   ) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
-    }
-    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_RANS               )) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
-      if (geometry->GetnDim() == 3) {
-        restart_file << "\t\"Sensitivity_z\"";
-      }
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      if (!dynamic_fem) {
-        if (geometry->GetnDim() == 2)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        if (geometry->GetnDim() == 3)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-      }
-      else if (dynamic_fem) {
-        if (geometry->GetnDim() == 2) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        }
-        if (geometry->GetnDim() == 3) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      if (geometry->GetnDim() == 2)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
-      if (geometry->GetnDim() == 3)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
-    }
-
-    
-    if (config->GetExtraOutput()) {
-      string *headings = NULL;
-      //if (Kind_Solver == RANS) {
-      headings = solver[TURB_SOL]->OutputHeadingNames;
-      //}
-      
-      for (iVar = 0; iVar < nVar_Extra; iVar++) {
-        if (headings == NULL) {
-          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
-        } else {
-          restart_file << "\t\""<< headings[iVar] <<"\"";
-        }
-      }
-    }
-  }
-  
-  restart_file << "\n";
-  
-  /*--- Write the restart file ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetGlobal_nPointDomain(); iPoint++) {
-    
-    /*--- Index of the point ---*/
-    restart_file << iPoint << "\t";
-    
-    /*--- Write the grid coordinates first ---*/
-    for (iDim = 0; iDim < nDim; iDim++) {
-      restart_file << scientific << Coords[iDim][iPoint] << "\t";
-    }
-    
-    /*--- Loop over the variables and write the values to file ---*/
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      restart_file << scientific << Data[iVar][iPoint] << "\t";
-    }
-    restart_file << "\n";
-  }
-
-  /*--- Write the general header and flow conditions ----*/
-
-  if (dual_time)
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-  else
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-  restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-  restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-  restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-  restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-  restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-  restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-  restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-  if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-
-  /*--- Close the data portion of the restart file. ---*/
-
-  restart_file.close();
-
-}
-
-void COutput::DeallocateCoordinates(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  
-  /*--- The master node alone owns all data found in this routine. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for coordinate data ---*/
-    
-    for (iDim = 0; iDim < nDim; iDim++) {
-      delete [] Coords[iDim];
-    }
-    delete [] Coords;
-  }
-}
-
-void COutput::DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol) {
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for connectivity data ---*/
-    if (surf_sol) {
-      if (nGlobal_Line > 0      && Conn_Line      != NULL) delete [] Conn_Line;
-      if (nGlobal_BoundTria > 0 && Conn_BoundTria != NULL) delete [] Conn_BoundTria;
-      if (nGlobal_BoundQuad > 0 && Conn_BoundQuad != NULL) delete [] Conn_BoundQuad;
-    }
-    else {
-      if (nGlobal_Tria > 0 && Conn_Tria != NULL) delete [] Conn_Tria;
-      if (nGlobal_Quad > 0 && Conn_Quad != NULL) delete [] Conn_Quad;
-      if (nGlobal_Tetr > 0 && Conn_Tetr != NULL) delete [] Conn_Tetr;
-      if (nGlobal_Hexa > 0 && Conn_Hexa != NULL) delete [] Conn_Hexa;
-      if (nGlobal_Pris > 0 && Conn_Pris != NULL) delete [] Conn_Pris;
-      if (nGlobal_Pyra > 0 && Conn_Pyra != NULL) delete [] Conn_Pyra;
-      
-    }
-    
-  }
-}
-
-void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for solution data ---*/
-    for (unsigned short iVar = 0; iVar < nVar_Total; iVar++) {
-      delete [] Data[iVar];
-    }
-    delete [] Data;
-    
-  }
-}
-
-void COutput::SetConvHistory_Body(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
-
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    bool write_header, write_history, write_screen;
-
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-
-    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
-                    timeused, val_iZone, val_iInst);
-
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
-    SetHistoryFile_Output(config[val_iZone]);
-
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = WriteScreen_Header(config[val_iZone]);
-    if (write_header) SetScreen_Header(config[val_iZone]);
-
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
-    SetScreen_Output(config[val_iZone]);
-
-  }
-
-}
-
-void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
-  
-  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
-  unsigned short iMesh;
-  
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
-  unsigned short nVar = 1;
-
-  bool energy = config[val_iZone]->GetEnergy_Equation();
-  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES : case RANS:
-      if (energy) {
-        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-      }
-      else if (weakly_coupled_heat) {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      }
-      else {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-      }
-      break;
-    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-      break;
-    case HEAT_EQUATION_FVM:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      break;
-  }
-  
-  if (RhoRes_New < EPS) RhoRes_New = EPS;
-  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
-
-  Div = RhoRes_Old[val_iZone]/RhoRes_New;
-  Diff = RhoRes_New-RhoRes_Old[val_iZone];
-
-  /*--- Compute MG factor ---*/
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
-    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
-  }
-
-  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
-  else power = config[val_iZone]->GetCFL_AdaptParam(1);
-
-  /*--- Detect a stall in the residual ---*/
-
-  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
-
-  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
-  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
-
-  CFLFactor = pow(Div, power);
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    CFL = config[val_iZone]->GetCFL(iMesh);
-    CFL *= CFLFactor;
-
-    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
-      }
-      break;
-    }
-    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
-      break;
-    }
-
-    config[val_iZone]->SetCFL(iMesh, CFL);
-  }
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-  case EULER : case NAVIER_STOKES : case RANS:
-    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-    break;
-  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-    break;
-  case HEAT_EQUATION_FVM:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    break;
-  }
-  
-}
-
-void COutput::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output) {
-  
-  char cstr[200];
-  unsigned short iDim, iMarker_Monitoring;
-  ofstream Breakdown_file;
-  
-  bool compressible       = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible     = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-  bool unsteady           = (config[val_iZone]->GetUnsteady_Simulation() != NO);
-  bool viscous            = config[val_iZone]->GetViscous();
-  bool grid_movement      = config[val_iZone]->GetGrid_Movement();
-  bool gravity            = config[val_iZone]->GetGravityForce();
-  bool turbulent          = config[val_iZone]->GetKind_Solver() == RANS;
-  bool fixed_cl           = config[val_iZone]->GetFixed_CL_Mode();
-  unsigned short Kind_Solver = config[val_iZone]->GetKind_Solver();
-  unsigned short Kind_Regime = config[val_iZone]->GetKind_Regime();
-  unsigned short Kind_Turb_Model = config[val_iZone]->GetKind_Turb_Model();
-  unsigned short Ref_NonDim = config[val_iZone]->GetRef_NonDim();
-
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nDim = geometry[val_iZone][INST_0][FinestMesh]->GetnDim();
-  bool flow = ((config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-               (config[val_iZone]->GetKind_Solver() == RANS));
-  
-  /*--- Output the mean flow solution using only the master node ---*/
-  
-  if ((rank == MASTER_NODE) && (flow) && (output)) {
-    
-    cout << endl << "Writing the forces breakdown file ("<< config[val_iZone]->GetBreakdown_FileName() << ")." << endl;
-    
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-    
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0,
-    Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CoPx = 0.0, Total_CoPy = 0.0, Total_CoPz = 0.0,
-    Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Inv_CL = 0.0,
-    Inv_CD = 0.0, Inv_CSF = 0.0, Inv_CMx = 0.0, Inv_CMy = 0.0,
-    Inv_CMz = 0.0, Inv_CEff = 0.0, Inv_CFx = 0.0, Inv_CFy = 0.0, Inv_CFz =
-    0.0,      Mnt_CL = 0.0,
-    Mnt_CD = 0.0, Mnt_CSF = 0.0, Mnt_CMx = 0.0, Mnt_CMy = 0.0,
-    Mnt_CMz = 0.0, Mnt_CEff = 0.0, Mnt_CFx = 0.0, Mnt_CFy = 0.0, Mnt_CFz =
-    0.0, Visc_CL = 0.0,
-    Visc_CD = 0.0, Visc_CSF = 0.0, Visc_CMx = 0.0, Visc_CMy = 0.0,
-    Visc_CMz = 0.0, Visc_CEff = 0.0, Visc_CFx = 0.0, Visc_CFy = 0.0, Visc_CFz =
-    0.0, *Surface_CL = NULL, *Surface_CD = NULL,
-    *Surface_CSF = NULL, *Surface_CEff = NULL, *Surface_CFx = NULL,
-    *Surface_CFy = NULL, *Surface_CFz = NULL,
-    *Surface_CMx = NULL, *Surface_CMy = NULL, *Surface_CMz = NULL,
-    *Surface_CL_Inv = NULL,
-    *Surface_CD_Inv = NULL, *Surface_CSF_Inv = NULL,
-    *Surface_CEff_Inv = NULL, *Surface_CFx_Inv = NULL, *Surface_CFy_Inv =
-    NULL, *Surface_CFz_Inv = NULL, *Surface_CMx_Inv = NULL,
-    *Surface_CMy_Inv = NULL, *Surface_CMz_Inv = NULL,
-    *Surface_CL_Visc = NULL,
-    *Surface_CD_Visc = NULL, *Surface_CSF_Visc = NULL,
-    *Surface_CEff_Visc = NULL, *Surface_CFx_Visc = NULL, *Surface_CFy_Visc =
-    NULL, *Surface_CFz_Visc = NULL, *Surface_CMx_Visc = NULL,
-    *Surface_CMy_Visc = NULL, *Surface_CMz_Visc = NULL,
-    *Surface_CL_Mnt = NULL,
-    *Surface_CD_Mnt = NULL, *Surface_CSF_Mnt = NULL,
-    *Surface_CEff_Mnt = NULL, *Surface_CFx_Mnt = NULL, *Surface_CFy_Mnt =
-    NULL, *Surface_CFz_Mnt = NULL, *Surface_CMx_Mnt = NULL,
-    *Surface_CMy_Mnt = NULL, *Surface_CMz_Mnt = NULL;
-    
-    /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
-     the two lines below that use the dt variable. ---*/
-    //time_t now = time(0);
-    //string dt = ctime(&now); dt[24] = '.';
-    
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    Surface_CL_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Inv = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Inv       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    Surface_CL_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Visc =
-    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    
-    Surface_CL_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Mnt =
-    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Flow solution coefficients ---*/
-    
-    Total_CL       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF      = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff        = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    
-    if (nDim == 2) {
-      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-      Total_CoPy = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPy() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      Total_CoPz = 0.0;
-    }
-    if (nDim == 3) {
-      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-      Total_CoPy = 0.0;
-      Total_CoPz = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPz() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    }
-    
-    if (config[ZONE_0]->GetSystemMeasurements() == US) { Total_CoPx *= 12.0; Total_CoPy *= 12.0; Total_CoPz *= 12.0; }
-    
-    /*--- Flow inviscid solution coefficients ---*/
-    
-    Inv_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Inv();
-    Inv_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Inv();
-    Inv_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Inv();
-    Inv_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Inv();
-    Inv_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Inv();
-    Inv_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Inv();
-    Inv_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Inv();
-    Inv_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Inv();
-    Inv_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Inv();
-    Inv_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Inv();
-    
-    /*--- Flow viscous solution coefficients ---*/
-    
-    Visc_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Visc();
-    Visc_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Visc();
-    Visc_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Visc();
-    Visc_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Visc();
-    Visc_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Visc();
-    Visc_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Visc();
-    Visc_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Visc();
-    Visc_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Visc();
-    Visc_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Visc();
-    Visc_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Visc();
-    
-    /*--- Flow momentum solution coefficients ---*/
-    
-    Mnt_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Mnt();
-    Mnt_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Mnt();
-    Mnt_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Mnt();
-    Mnt_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Mnt();
-    Mnt_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Mnt();
-    Mnt_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Mnt();
-    Mnt_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Mnt();
-    Mnt_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Mnt();
-    Mnt_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Mnt();
-    Mnt_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Mnt();
-    
-    
-    /*--- Look over the markers being monitored and get the desired values ---*/
-    
-    for (iMarker_Monitoring = 0;
-         iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring();
-         iMarker_Monitoring++) {
-      Surface_CL[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL(
-                                                             iMarker_Monitoring);
-      Surface_CD[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD(
-                                                             iMarker_Monitoring);
-      Surface_CSF[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF(
-                                                              iMarker_Monitoring);
-      Surface_CEff[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff(
-                                                               iMarker_Monitoring);
-      Surface_CMx[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx(
-                                                              iMarker_Monitoring);
-      Surface_CMy[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy(
-                                                              iMarker_Monitoring);
-      Surface_CMz[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz(
-                                                              iMarker_Monitoring);
-      Surface_CFx[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx(
-                                                              iMarker_Monitoring);
-      Surface_CFy[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy(
-                                                              iMarker_Monitoring);
-      Surface_CFz[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz(
-                                                              iMarker_Monitoring);
-      
-      Surface_CL_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Inv(
-                                                                 iMarker_Monitoring);
-      Surface_CD_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Inv(
-                                                                 iMarker_Monitoring);
-      Surface_CSF_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CEff_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Inv(
-                                                                   iMarker_Monitoring);
-      Surface_CMx_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CMy_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CMz_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFx_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFy_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFz_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CL_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Visc(
-                                                                  iMarker_Monitoring);
-      Surface_CD_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Visc(
-                                                                  iMarker_Monitoring);
-      Surface_CSF_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CEff_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Visc(
-                                                                    iMarker_Monitoring);
-      Surface_CMx_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CMy_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CMz_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFx_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFy_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFz_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Visc(
-                                                                   iMarker_Monitoring);
-      
-      Surface_CL_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Mnt(
-                                                                 iMarker_Monitoring);
-      Surface_CD_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Mnt(
-                                                                 iMarker_Monitoring);
-      Surface_CSF_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CEff_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Mnt(
-                                                                   iMarker_Monitoring);
-      Surface_CMx_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CMy_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CMz_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFx_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFy_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFz_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Mnt(
-                                                                  iMarker_Monitoring);
-      
-    }
-    
-    
-    /*--- Write file name with extension ---*/
-    
-    string filename = config[val_iZone]->GetBreakdown_FileName();
-    strcpy (cstr, filename.data());
-    
-    Breakdown_file.open(cstr, ios::out);
-    
-    Breakdown_file << "\n" <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file <<"|    ___ _   _ ___                                                      |" << "\n";
-    Breakdown_file <<"|   / __| | | |_  )   Release 6.1.0  \"Falcon\"                           |" << "\n";
-    Breakdown_file <<"|   \\__ \\ |_| |/ /                                                      |" << "\n";
-    Breakdown_file <<"|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    //Breakdown_file << "|   Local date and time: " << dt << "                      |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| The current SU2 release has been coordinated by the                   |" << "\n";
-    Breakdown_file << "| SU2 International Developers Society <www.su2devsociety.org>          |" << "\n";
-    Breakdown_file << "| with selected contributions from the open-source community            |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| The main research teams contributing to the current release are:      |" << "\n";
-    Breakdown_file << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << "\n";
-    Breakdown_file << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << "\n";
-    Breakdown_file << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << "\n";
-    Breakdown_file << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << "\n";
-    Breakdown_file << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << "\n";
-    Breakdown_file << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << "\n";
-    Breakdown_file << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << "\n";
-    Breakdown_file << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,       |" << "\n";
-    Breakdown_file << "|                      Tim Albring, and the SU2 contributors.           |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| SU2 is free software; you can redistribute it and/or                  |" << "\n";
-    Breakdown_file << "| modify it under the terms of the GNU Lesser General Public            |" << "\n";
-    Breakdown_file << "| License as published by the Free Software Foundation; either          |" << "\n";
-    Breakdown_file << "| version 2.1 of the License, or (at your option) any later version.    |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| SU2 is distributed in the hope that it will be useful,                |" << "\n";
-    Breakdown_file << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << "\n";
-    Breakdown_file << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << "\n";
-    Breakdown_file << "| Lesser General Public License for more details.                       |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| You should have received a copy of the GNU Lesser General Public      |" << "\n";
-    Breakdown_file << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    
-    Breakdown_file.precision(6);
-
-    Breakdown_file << "\n" << "\n" << "Problem definition:" << "\n" << "\n";
-    
-    switch (Kind_Solver) {
-      case EULER:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Euler equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Euler equations." << "\n";
-        break;
-      case NAVIER_STOKES:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Laminar Navier-Stokes' equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Laminar Navier-Stokes' equations." << "\n";
-        break;
-      case RANS:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible RANS equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible RANS equations." << "\n";
-        Breakdown_file << "Turbulence model: ";
-        switch (Kind_Turb_Model) {
-          case SA:        Breakdown_file << "Spalart Allmaras" << "\n"; break;
-          case SA_NEG:    Breakdown_file << "Negative Spalart Allmaras" << "\n"; break;
-          case SST:       Breakdown_file << "Menter's SST"     << "\n"; break;
-        }
-        break;
-    }
-
-
-    /*--- Compressible version of console output ---*/
-
-    if (compressible) {
-
-
-    if ((Kind_Regime == COMPRESSIBLE) && (Kind_Solver != FEM_ELASTICITY)) {
-      Breakdown_file << "Mach number: " << config[val_iZone]->GetMach() <<"."<< "\n";
-      Breakdown_file << "Angle of attack (AoA): " << config[val_iZone]->GetAoA() <<" deg, and angle of sideslip (AoS): " << config[val_iZone]->GetAoS() <<" deg."<< "\n";
-      if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == ADJ_NAVIER_STOKES) ||
-          (Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS))
-        Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() <<"."<< "\n";
-    }
-    
-    if (fixed_cl) {
-      Breakdown_file << "Simulation at a cte. CL: " << config[val_iZone]->GetTarget_CL() << ".\n";
-     }
-    
-    if (Ref_NonDim == DIMENSIONAL) { Breakdown_file << "Dimensional simulation." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_PRESS_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (P=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_VEL_EQ_MACH) { Breakdown_file << "Non-Dimensional simulation (V=Mach, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_VEL_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (V=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    
-    if (config[val_iZone]->GetSystemMeasurements() == SI) {
-      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
-      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength() << " m." << "\n";
-    }
-    
-    if (config[val_iZone]->GetSystemMeasurements() == US) {
-      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea()*12.0*12.0 << " in^2." << "\n";
-      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength()*12.0 << " in." << "\n";
-    }
-    Breakdown_file << "\n" << "\n" <<"Problem definition:" << "\n" << "\n";
-    if (compressible) {
-      if (viscous) {
-        Breakdown_file << "Viscous flow: Computing pressure using the ideal gas law" << "\n";
-        Breakdown_file << "based on the free-stream temperature and a density computed" << "\n";
-        Breakdown_file << "from the Reynolds number." << "\n";
-      } else {
-        Breakdown_file << "Inviscid flow: Computing density based on free-stream" << "\n";
-        Breakdown_file << "temperature and pressure using the ideal gas law." << "\n";
-      }
-    }
-    
-    if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-    else Breakdown_file << "Force coefficients computed using free-stream values." << "\n";
-    
-    if (incompressible) {
-      Breakdown_file << "Viscous and Inviscid flow: rho_ref, and vel_ref" << "\n";
-      Breakdown_file << "are based on the free-stream values, p_ref = rho_ref*vel_ref^2." << "\n";
-      Breakdown_file << "The free-stream value of the pressure is 0." << "\n";
-      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach() << ", computed using the Bulk modulus." << "\n";
-      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the the free-stream velocity." << "\n";
-      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the the free-stream velocity." << "\n";
-      if (viscous) Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() << ", computed using free-stream values."<< "\n";
-      Breakdown_file << "Only dimensional computation, the grid should be dimensional." << "\n";
-    }
-    
-    Breakdown_file <<"-- Input conditions:"<< "\n";
-    
-    if (compressible) {
-      switch (config[val_iZone]->GetKind_FluidModel()) {
-          
-        case STANDARD_AIR:
-          Breakdown_file << "Fluid Model: STANDARD_AIR "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: 1.4000 "<< "\n";
-          break;
-          
-        case IDEAL_GAS:
-          Breakdown_file << "Fluid Model: IDEAL_GAS "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          break;
-          
-        case VW_GAS:
-          Breakdown_file << "Fluid Model: Van der Waals "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
-          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
-          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
-          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
-          break;
-          
-        case PR_GAS:
-          Breakdown_file << "Fluid Model: Peng-Robinson "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant(non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
-          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
-          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
-          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
-          break;
-      }
-      
-      if (viscous) {
-        
-        switch (config[val_iZone]->GetKind_ViscosityModel()) {
-            
-          case CONSTANT_VISCOSITY:
-            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
-            Breakdown_file << "Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            break;
-            
-          case SUTHERLAND:
-            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
-            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
-            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
-            break;
-            
-        }
-        switch (config[val_iZone]->GetKind_ConductivityModel()) {
-            
-          case CONSTANT_PRANDTL:
-            Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
-            Breakdown_file << "Prandtl: " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
-            break;
-            
-          case CONSTANT_CONDUCTIVITY:
-            Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
-            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
-            break;
-            
-        }
-      }
-    }
-    
-    if (incompressible) {
-      Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-      Breakdown_file << "Epsilon^2 multiplier of Beta for incompressible preconditioner: " << config[val_iZone]->GetBeta_Factor();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    }
-    
-    Breakdown_file << "Free-stream static pressure: " << config[val_iZone]->GetPressure_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    Breakdown_file << "Free-stream total pressure: " << config[val_iZone]->GetPressure_FreeStream() * pow( 1.0+config[val_iZone]->GetMach()*config[val_iZone]->GetMach()*0.5*(config[val_iZone]->GetGamma()-1.0), config[val_iZone]->GetGamma()/(config[val_iZone]->GetGamma()-1.0) );
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Free-stream temperature: " << config[val_iZone]->GetTemperature_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      
-      Breakdown_file << "Free-stream total temperature: " << config[val_iZone]->GetTemperature_FreeStream() * (1.0 + config[val_iZone]->GetMach() * config[val_iZone]->GetMach() * 0.5 * (config[val_iZone]->GetGamma() - 1.0));
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-    }
-    
-    Breakdown_file << "Free-stream density: " << config[val_iZone]->GetDensity_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-    
-    if (nDim == 2) {
-      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
-    }
-    if (nDim == 3) {
-      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
-    }
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
-    
-    Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Free-stream total energy per unit mass: " << config[val_iZone]->GetEnergy_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-    }
-    
-    if (viscous) {
-      Breakdown_file << "Free-stream viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      if (turbulent) {
-        Breakdown_file << "Free-stream turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-        Breakdown_file << "Free-stream specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
-      }
-    }
-    
-    if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
-    
-    /*--- Print out reference values. ---*/
-    
-    Breakdown_file <<"-- Reference values:"<< "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-    }
-    
-    Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-    }
-    
-    Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-    
-    Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference energy per unit mass: " << config[val_iZone]->GetEnergy_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-    }
-    
-    if (incompressible) {
-      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
-    }
-    
-    if (viscous) {
-      Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      if (compressible){
-        Breakdown_file << "Reference conductivity: " << config[val_iZone]->GetConductivity_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " W/m^2.K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf/ft.s.R." << "\n";
-      }
-    }
-    
-    
-    if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
-    
-    /*--- Print out resulting non-dim values here. ---*/
-    
-    Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
-    Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
-    if (viscous) {
-      Breakdown_file << "Reynolds number (non-dim): " << config[val_iZone]->GetReynolds() <<". Re length: " << config[val_iZone]->GetLength_Reynolds();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft." << "\n";
-    }
-    if (gravity) {
-      Breakdown_file << "Froude number (non-dim): " << config[val_iZone]->GetFroude() << "\n";
-      Breakdown_file << "Lenght of the baseline wave (non-dim): " << 2.0*PI_NUMBER*config[val_iZone]->GetFroude()*config[val_iZone]->GetFroude() << "\n";
-    }
-    
-    if (compressible) {
-      Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
-      Breakdown_file << "Free-stream temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
-    }
-    
-    Breakdown_file << "Free-stream pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
-    
-    Breakdown_file << "Free-stream density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
-    
-    if (nDim == 2) {
-      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
-    } else {
-      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
-    }
-    Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
-    
-    if (compressible)
-      Breakdown_file << "Free-stream total energy per unit mass (non-dim): " << config[val_iZone]->GetEnergy_FreeStreamND() << "\n";
-    
-    if (viscous) {
-      Breakdown_file << "Free-stream viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
-      if (turbulent) {
-        Breakdown_file << "Free-stream turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
-        Breakdown_file << "Free-stream specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
-      }
-    }
-    
-    if (unsteady) {
-      Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
-      Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
-    }
-
-    } else {
-
-    /*--- Incompressible version of the console output ---*/
-
-      bool energy     = config[val_iZone]->GetEnergy_Equation();
-      bool boussinesq = (config[val_iZone]->GetKind_DensityModel() == BOUSSINESQ);
-
-      if (config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, temp_ref, p_ref" << "\n";
-        Breakdown_file << "are set to 1.0 in order to perform a dimensional calculation." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
-      }
-      else if (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
-        Breakdown_file << "are based on the initial values, p_ref = rho_ref*vel_ref^2." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
-      }
-      else if (config[val_iZone]->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
-        Breakdown_file << "are user-provided reference values, p_ref = rho_ref*vel_ref^2." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using reference values." << "\n";
-      }
-      Breakdown_file << "The reference area for force coeffs. is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
-      Breakdown_file << "The reference length for force coeffs. is " << config[val_iZone]->GetRefLength() << " m." << "\n";
-
-      Breakdown_file << "The pressure is decomposed into thermodynamic and dynamic components." << "\n";
-      Breakdown_file << "The initial value of the dynamic pressure is 0." << "\n";
-
-      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach();
-      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
-        Breakdown_file << ", computed using the Bulk modulus." << "\n";
-      } else {
-        Breakdown_file << ", computed using fluid speed of sound." << "\n";
-      }
-
-      Breakdown_file << "For external flows, the initial state is imposed at the far-field." << "\n";
-      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the initial velocity." << "\n";
-      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the initial velocity." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Reynolds number per meter: " << config[val_iZone]->GetReynolds() << ", computed using initial values."<< "\n";
-        Breakdown_file << "Reynolds number is a byproduct of inputs only (not used internally)." << "\n";
-      }
-      Breakdown_file << "SI units only. The grid should be dimensional (meters)." << "\n";
-
-      switch (config[val_iZone]->GetKind_DensityModel()) {
-
-        case CONSTANT:
-          if (energy) Breakdown_file << "Energy equation is active and decoupled." << "\n";
-          else Breakdown_file << "No energy equation." << "\n";
-          break;
-
-        case BOUSSINESQ:
-          if (energy) Breakdown_file << "Energy equation is active and coupled through Boussinesq approx." << "\n";
-          break;
-
-        case VARIABLE:
-          if (energy) Breakdown_file << "Energy equation is active and coupled for variable density." << "\n";
-          break;
-
-      }
-
-      Breakdown_file <<"-- Input conditions:"<< "\n";
-
-      switch (config[val_iZone]->GetKind_FluidModel()) {
-
-        case CONSTANT_DENSITY:
-          Breakdown_file << "Fluid Model: CONSTANT_DENSITY "<< "\n";
-          if (energy) {
-            Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << "\n";
-          }
-          if (boussinesq) Breakdown_file << "Thermal expansion coefficient: " << config[val_iZone]->GetThermal_Expansion_Coeff() << " K^-1." << "\n";
-          Breakdown_file << "Thermodynamic pressure not required." << "\n";
-          break;
-
-        case INC_IDEAL_GAS:
-          Breakdown_file << "Fluid Model: INC_IDEAL_GAS "<< endl;
-          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
-          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
-          Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
-          Breakdown_file << "Molecular weight : "<< config[val_iZone]->GetMolecular_Weight() << " g/mol" << endl;
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << endl;
-          Breakdown_file << "Thermodynamic pressure: " << config[val_iZone]->GetPressure_Thermodynamic();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
-          break;
-
-      }
-      if (viscous) {
-        switch (config[val_iZone]->GetKind_ViscosityModel()) {
-
-          case CONSTANT_VISCOSITY:
-            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
-            Breakdown_file << "Constant Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            break;
-
-          case SUTHERLAND:
-            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
-            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
-            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
-            break;
-
-        }
-
-        if (energy) {
-          switch (config[val_iZone]->GetKind_ConductivityModel()) {
-
-            case CONSTANT_PRANDTL:
-              Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
-              Breakdown_file << "Prandtl (Laminar): " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
-              Breakdown_file << "Prandtl (Turbulent): " << config[val_iZone]->GetPrandtl_Turb()<< "\n";
-              break;
-
-            case CONSTANT_CONDUCTIVITY:
-              Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
-              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
-              break;
-
-          }
-        }
-
-      }
-
-      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
-        Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-      }
-
-      Breakdown_file << "Initial dynamic pressure: " << config[val_iZone]->GetPressure_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      Breakdown_file << "Initial total pressure: " << config[val_iZone]->GetPressure_FreeStream() + 0.5*config[val_iZone]->GetDensity_FreeStream()*config[val_iZone]->GetModVel_FreeStream()*config[val_iZone]->GetModVel_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      if (energy) {
-        Breakdown_file << "Initial temperature: " << config[val_iZone]->GetTemperature_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      }
-
-      Breakdown_file << "Initial density: " << config[val_iZone]->GetDensity_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-
-      if (nDim == 2) {
-        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
-      }
-      if (nDim == 3) {
-        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
-      }
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
-
-      Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Initial laminar viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-        if (turbulent) {
-          Breakdown_file << "Initial turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-          Breakdown_file << "Initial specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
-        }
-      }
-
-      if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
-
-      /*--- Print out reference values. ---*/
-
-      Breakdown_file <<"-- Reference values:"<< "\n";
-
-      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
-        Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-      } else {
-        if (energy) {
-          Breakdown_file << "Reference specific heat: " << config[val_iZone]->GetGas_Constant_Ref();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-        }
-      }
-
-      Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      if (energy) {
-        Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      }
-
-      Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-
-      Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-
-      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      }
-
-      if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
-
-      /*--- Print out resulting non-dim values here. ---*/
-
-      Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
-      Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
-      if (viscous) {
-        Breakdown_file << "Reynolds number (per m): " << config[val_iZone]->GetReynolds() << "\n";
-      }
-
-      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
-        Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
-        Breakdown_file << "Initial thermodynamic pressure (non-dim): " << config[val_iZone]->GetPressure_ThermodynamicND() << "\n";
-      } else {
-        if (energy) {
-          Breakdown_file << "Specific heat at constant pressure (non-dim): " << config[val_iZone]->GetSpecific_Heat_CpND() << "\n";
-          if (boussinesq) Breakdown_file << "Thermal expansion coefficient (non-dim.): " << config[val_iZone]->GetThermal_Expansion_CoeffND() << " K^-1." << "\n";
-        }
-      }
-
-      if (energy) Breakdown_file << "Initial temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
-      Breakdown_file << "Initial pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
-      Breakdown_file << "Initial density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
-
-      if (nDim == 2) {
-        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
-      } else {
-        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
-      }
-      Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
-      
-      if (viscous) {
-        Breakdown_file << "Initial viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
-        if (turbulent) {
-          Breakdown_file << "Initial turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
-          Breakdown_file << "Initial specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
-        }
-      }
-      
-      if (unsteady) {
-        Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
-        Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
-      }
-
-    }
-
-    /*--- Begin forces breakdown info. ---*/
-    
-    Breakdown_file << fixed;
-    Breakdown_file << "\n" << "\n" <<"Forces breakdown:" << "\n" << "\n";
-
-    if (nDim == 3) {
-      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      su2double term = (Total_CoPz/m)-Total_CoPx;
-      
-      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z-"<< term << "." << "\n\n";
-      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z+"<< fabs(term);
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
-      else Breakdown_file << " in." << "\n\n";
-    }
-    else {
-      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      su2double term = (Total_CoPy/m)-Total_CoPx;
-      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y-"<< term << "." << "\n\n";
-      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y+"<< fabs(term);
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
-      else Breakdown_file << " in." << "\n\n";
-    }
-
-    /*--- Reference area and force factors. ---*/
-
-    su2double RefDensity, RefArea, RefVel, Factor, Ref;
-    RefArea     = config[val_iZone]->GetRefArea();
-    if (compressible) {
-      RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
-      RefVel = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetModVelocity_Inf();
-    } else {
-      if ((config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) ||
-          (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
-        RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
-        RefVel = 0.0;
-        for (iDim = 0; iDim < nDim; iDim++)
-          RefVel  += solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim)*solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim);
-        RefVel = sqrt(RefVel);
-      } else {
-        RefDensity = config[val_iZone]->GetInc_Density_Ref();
-        RefVel    = config[val_iZone]->GetInc_Velocity_Ref();
-      }
-    }
-    Factor = (0.5*RefDensity*RefArea*RefVel*RefVel);
-    Ref = config[val_iZone]->GetDensity_Ref() * config[val_iZone]->GetVelocity_Ref() * config[val_iZone]->GetVelocity_Ref() * 1.0 * 1.0;
-
-    Breakdown_file << "NOTE: Multiply forces by the non-dimensional factor: " << Factor << ", and the reference factor: " << Ref  << "\n";
-    Breakdown_file << "to obtain the dimensional force."  << "\n" << "\n";
-
-    Breakdown_file << "Total CL:    ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CL;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CL;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CL;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CL << "\n";
-    
-    Breakdown_file << "Total CD:    ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CD;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CD;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CD;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CD << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CSF:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CSF;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CSF;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file <<  SU2_TYPE::Int((Visc_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CSF;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CSF << "\n";
-    }
-    
-    Breakdown_file << "Total CL/CD: ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CEff;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CEff;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file <<  SU2_TYPE::Int((Visc_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CEff;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CEff << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CMx:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CMx;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CMx;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CMx;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CMx << "\n";
-      
-      Breakdown_file << "Total CMy:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CMy;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CMy * 100.0) / (Total_CMy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CMy;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CMy * 100.0) / (Total_CMy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CMy;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CMy << "\n";
-    }
-    
-    Breakdown_file << "Total CMz:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CMz;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CMz;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CMz;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CMz << "\n";
-    
-    Breakdown_file << "Total CFx:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CFx;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CFx;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CFx;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CFx << "\n";
-    
-    Breakdown_file << "Total CFy:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CFy;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CFy;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CFy;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CFy << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CFz:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CFz;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CFz;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CFz;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CFz << "\n";
-    }
-    
-    Breakdown_file << "\n" << "\n";
-    
-    for (iMarker_Monitoring = 0;
-         iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring();
-         iMarker_Monitoring++) {
-      
-      Breakdown_file << "Surface name: "
-      << config[val_iZone]->GetMarker_Monitoring_TagBound(
-                                                          iMarker_Monitoring) << "\n" << "\n";
-      
-      Breakdown_file << "Total CL    (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL[iMarker_Monitoring] * 100.0)
-                       / (Total_CL + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CD    (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD[iMarker_Monitoring] * 100.0)
-                       / (Total_CD + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        Breakdown_file << "Total CSF   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF[iMarker_Monitoring] * 100.0)
-                         / (Total_CSF + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CSF[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CSF_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CSF_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CSF_Mnt[iMarker_Monitoring] << "\n";
-      }
-      
-      Breakdown_file << "Total CL/CD (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff[iMarker_Monitoring] * 100.0) / (Total_CEff + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CEff[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CEff_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CEff_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CEff_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        
-        Breakdown_file << "Total CMx   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx[iMarker_Monitoring] * 100.0) / (Total_CMx + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMx[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMx_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMx_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMx_Mnt[iMarker_Monitoring] << "\n";
-        
-        Breakdown_file << "Total CMy   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy[iMarker_Monitoring] * 100.0) / (Total_CMy + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMy[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMy_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMy_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMy_Mnt[iMarker_Monitoring] << "\n";
-      }
-      
-      Breakdown_file << "Total CMz   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CMz[iMarker_Monitoring] * 100.0) / (Total_CMz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CMz[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CMz_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CMz_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CMz_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CFx   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CFx[iMarker_Monitoring] * 100.0) / (Total_CFx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFx[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFx_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFx_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFx_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CFy   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CFy[iMarker_Monitoring] * 100.0) / (Total_CFy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFy[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFy_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFy_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFy_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        Breakdown_file << "Total CFz   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz[iMarker_Monitoring] * 100.0) / (Total_CFz + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CFz[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CFz_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CFz_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CFz_Mnt[iMarker_Monitoring] << "\n";
-        
-      }
-      
-      Breakdown_file << "\n";
-      
-      
-    }
-    
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    
-    delete [] Surface_CL_Inv;
-    delete [] Surface_CD_Inv;
-    delete [] Surface_CSF_Inv;
-    delete [] Surface_CEff_Inv;
-    delete [] Surface_CFx_Inv;
-    delete [] Surface_CFy_Inv;
-    delete [] Surface_CFz_Inv;
-    delete [] Surface_CMx_Inv;
-    delete [] Surface_CMy_Inv;
-    delete [] Surface_CMz_Inv;
-    
-    delete [] Surface_CL_Visc;
-    delete [] Surface_CD_Visc;
-    delete [] Surface_CSF_Visc;
-    delete [] Surface_CEff_Visc;
-    delete [] Surface_CFx_Visc;
-    delete [] Surface_CFy_Visc;
-    delete [] Surface_CFz_Visc;
-    delete [] Surface_CMx_Visc;
-    delete [] Surface_CMy_Visc;
-    delete [] Surface_CMz_Visc;
-
-    delete [] Surface_CL_Mnt;
-    delete [] Surface_CD_Mnt;
-    delete [] Surface_CSF_Mnt;
-    delete [] Surface_CEff_Mnt;
-    delete [] Surface_CFx_Mnt;
-    delete [] Surface_CFy_Mnt;
-    delete [] Surface_CFz_Mnt;
-    delete [] Surface_CMx_Mnt;
-    delete [] Surface_CMy_Mnt;
-    delete [] Surface_CMz_Mnt;
-
-    Breakdown_file.close();
-    
-  }
-  
-}
-
-void COutput::SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                              unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
-
-#ifdef HAVE_MPI
-    /*--- Do not merge the volume solutions if we are running in parallel.
-     Force the use of SU2_SOL to merge the volume sols in this case. ---*/
-    
-    SU2_MPI::Comm_size(MPI_COMM_WORLD, &size);
-    if (size > SINGLE_NODE) {
-      Wrt_Vol = false;
-      Wrt_Srf = false;
-    }
-#endif
-    
-    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-        
-      case EULER : case NAVIER_STOKES : case RANS :
-        
-        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-        break;
-        
-
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS : case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-        break;
-        
-    }
-    
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
-    /*--- Merge the node coordinates and connectivity, if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (Wrt_Vol || Wrt_Srf) {
-      if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-      MergeConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-    }
-    
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
-    
-    if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-      if (FileFormat == TECPLOT_BINARY) {
-        if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
-        SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-        SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-        if (!wrote_base_file)
-          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-        if (!wrote_surf_file)
-          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], wrote_surf_file);
-      }
-    }
-    
-    /*--- Merge the solution data needed for volume solutions and restarts ---*/
-    
-    if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-    MergeSolution(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
-    
-    /*--- Write restart, or Tecplot files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-    
-    if (rank == MASTER_NODE) {
-      
-      /*--- Write a native restart file ---*/
-      
-      if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
-      SetRestart(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone);
-      
-      if (Wrt_Vol) {
-        
-        switch (FileFormat) {
-            
-          case TECPLOT:
-            
-            /*--- Write a Tecplot ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case FIELDVIEW:
-            
-            /*--- Write a FieldView ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case TECPLOT_BINARY:
-            
-            /*--- Write a Tecplot binary solution file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-            break;
-            
-          case FIELDVIEW_BINARY:
-            
-            /*--- Write a FieldView binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case PARAVIEW:
-            
-            /*--- Write a Paraview ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          default:
-            break;
-        }
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        switch (FileFormat) {
-            
-          case TECPLOT:
-            
-            /*--- Write a Tecplot ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-            break;
-            
-          case TECPLOT_BINARY:
-            
-            /*--- Write a Tecplot binary solution file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-            break;
-            
-          case PARAVIEW:
-            
-            /*--- Write a Paraview ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-            break;
-            
-          default:
-            break;
-        }
-        
-      }
-      
-      /*--- Release memory needed for merging the solution data. ---*/
-      
-      DeallocateCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
-      DeallocateSolution(config[iZone], geometry[iZone][INST_0][MESH_0]);
-      
-    }
-    
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-  }
-}
-
-void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                      unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone, iInst, nInst;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    nInst = config[iZone]->GetnTimeInstances();
-
-    for (iInst = 0; iInst < nInst; iInst++) {
-
-      config[iZone]->SetiInst(iInst);
-
-      /*--- Flags identifying the types of files to be written. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-
-      /*--- Get the file output format ---*/
-
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-
-      /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
-      }
-
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-      }
-
-      /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-
-
-      if (rank == MASTER_NODE) {
-
-        if (Wrt_Vol) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- Write a FieldView ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
-            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- Write a binary binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
-            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          default:
-            break;
-          }
-        }
-
-        if (FileFormat == TECPLOT_BINARY) {
-          if (!wrote_base_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-          if (!wrote_surf_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-        }
-
-        if (Wrt_Vol || Wrt_Srf)
-          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-      }
-
-
-
-      /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-
-    }
-
-  }
-}
-
-void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
-
-  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-  unsigned short iZone;
-  ofstream output_file;
-  string str;
-
-  /*--- Read the name of the output and input file ---*/
-
-  if (rank == MASTER_NODE) {
-    if (su2_file){
-      str = config[ZONE_0]->GetMesh_Out_FileName();
-      strcpy (out_file, str.c_str());
-      strcpy (cstr, out_file);
-      output_file.precision(15);
-      output_file.open(cstr, ios::out);
-
-      if (val_nZone > 1){
-        output_file << "NZONE= " << val_nZone << endl;
-      }
-    }
-  }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol() && config[iZone]->GetVisualize_Deformation();
-    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol() && config[iZone]->GetVisualize_Deformation();
-    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
-    
-    /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
-    MergeConnectivity(config[iZone], geometry[iZone], iZone);
-    
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone]);
-    
-    /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-    
-    if (rank == MASTER_NODE) {
-      
-      if (Wrt_Vol) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
-        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-        if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
-        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        
-      }
-      
-      /*--- Write a .su2 ASCII file ---*/
-
-      if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
-
-      if (su2_file) SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
-      
-      /*--- Write an stl surface file ---*/
-
-      if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
-      
-      if (su2_file) SetSTL_MeshASCII(config[iZone], geometry[iZone]);
-      
-      /*--- Write a binary file with the grid coordinates alone. ---*/
-      
-      if (Wrt_Crd) {
-        cout <<"Writing .dat binary coordinates file." << endl;
-        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
-      }
-      
-      /*--- Deallocate connectivity ---*/
-      
-      DeallocateConnectivity(config[iZone], geometry[iZone], true);
-      DeallocateConnectivity(config[iZone], geometry[iZone], false);
-      DeallocateCoordinates(config[iZone], geometry[iZone]);
-      
-    }
-
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-    /*--- Write an csv surface file, done in parallel ---*/
-
-    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
-
-    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
-
-  }
-
-  if (rank == MASTER_NODE) {
-    if (su2_file){
-      output_file.close();
-    }
-  }
-}
-
-void COutput::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  short iSection, nSection;
-  unsigned long iVertex, iPoint, Trailing_Point;
-  su2double *Plane_P0, *Plane_P0_, *Plane_Normal, *Plane_Normal_, *CPressure,
-  Force[3], ForceInviscid[3], MomentInviscid[3] =
-  { 0.0, 0.0, 0.0 }, MomentDist[3] = { 0.0, 0.0, 0.0 }, RefDensity,
-  RefPressure, RefArea, *Velocity_Inf, Gas_Constant, Mach2Vel,
-  Mach_Motion, Gamma, RefVel2 = 0.0, factor, NDPressure, *Origin,
-  RefLength, Alpha, CL_Inv,
-  Xcoord_LeadingEdge = 0.0, Ycoord_LeadingEdge = 0.0, Zcoord_LeadingEdge = 0.0,
-  Xcoord_TrailingEdge = 0.0, Ycoord_TrailingEdge = 0.0, Zcoord_TrailingEdge = 0.0,
-  Xcoord_LeadingEdge_ = 0.0, 
-  Xcoord_TrailingEdge_ = 0.0, Ycoord_TrailingEdge_ = 0.0, Zcoord_TrailingEdge_ = 0.0,
-  MaxDistance, Distance, Chord, Aux, Dihedral_Trailing;
-  
-  su2double B, Y, C_L, C_L0, Elliptic_Spanload;
-  
-  vector<su2double> Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
-  CPressure_Airfoil;
-  vector<su2double> Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
-  CPressure_Airfoil_;
-  string Marker_Tag, Slice_Filename, Slice_Ext;
-  ofstream Cp_File;
-  unsigned short iDim;
-  
-  bool grid_movement = config->GetGrid_Movement();
-  
-  Plane_P0 = new su2double[3];
-  Plane_P0_ = new su2double[3];
-  Plane_Normal = new su2double[3];
-  Plane_Normal_ = new su2double[3];
-  CPressure = new su2double[geometry->GetnPoint()];
-  
-  if ((rank == MASTER_NODE) && (output)) {
-    cout << endl << "Writing the spanload file (load_distribution.dat).";
-  }
-  
-  /*--- Compute some reference quantities and necessary values ---*/
-  
-  RefDensity = solver->GetDensity_Inf();
-  RefPressure = solver->GetPressure_Inf();
-  RefArea = config->GetRefArea();
-  Velocity_Inf = solver->GetVelocity_Inf();
-  Gamma = config->GetGamma();
-  Origin = config->GetRefOriginMoment(0);
-  RefLength = config->GetRefLength();
-  Alpha = config->GetAoA() * PI_NUMBER / 180.0;
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(
-                    Gamma * Gas_Constant * config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion * Mach2Vel) * (Mach_Motion * Mach2Vel);
-  } else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-      RefVel2 += Velocity_Inf[iDim] * Velocity_Inf[iDim];
-  }
-  factor = 1.0 / (0.5 * RefDensity * RefArea * RefVel2);
-  
-  if (geometry->GetnDim() == 3) {
-    
-    /*--- Copy the pressure to an auxiliar structure ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      CPressure[iPoint] = (solver->node[iPoint]->GetPressure()
-                           - RefPressure) * factor * RefArea;
-    }
-    
-    nSection = config->GetnLocationStations();
-    
-    for (iSection = 0; iSection < nSection; iSection++) {
-      
-      /*--- Read the values from the config file ---*/
-      
-      Plane_Normal[0] = 0.0; Plane_P0[0] = 0.0;
-      Plane_Normal[1] = 0.0; Plane_P0[1] = 0.0;
-      Plane_Normal[2] = 0.0; Plane_P0[2] = 0.0;
-      
-      if (config->GetGeo_Description() == FUSELAGE) {
-        Plane_Normal[0] = 1.0;
-        Plane_P0[0] = config->GetLocationStations(iSection);
-      }
-      else if (config->GetGeo_Description() == NACELLE) {
-        Plane_Normal[0] = 0.0;
-        Plane_Normal[1] = -sin(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
-        Plane_Normal[2] = cos(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
-        
-        /*--- Apply tilt angle to the plane ---*/
-        
-        su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-        su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-        su2double Plane_NormalY_Tilt = Plane_Normal[1];
-        su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-        
-        /*--- Apply toe angle to the plane ---*/
-        
-        su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-        su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-        su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-        su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-        
-        /*--- Update normal vector ---*/
-        
-        Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-        Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-        Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-        
-      }
-      else {
-        Plane_Normal[1] = 1.0;
-        Plane_P0[1] = config->GetLocationStations(iSection);
-      }
-
-      /*--- Compute the airfoil sections (note that we feed in the Cp) ---*/
-      
-      geometry->ComputeAirfoil_Section(Plane_P0, Plane_Normal, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
-                                       CPressure, Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
-                                       CPressure_Airfoil, true, config);
-      
-      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() == 0)) {
-        if ((config->GetGeo_Description() == FUSELAGE) || (config->GetGeo_Description() == WING))
-          cout << endl << "Please check the config file, the section (" << Plane_P0[0] <<", " << Plane_P0[1] <<", " << Plane_P0[2] << ") has not been detected." << endl;
-        if (config->GetGeo_Description() == NACELLE)
-          cout << endl << "Please check the config file, the section (" << Plane_Normal[0] <<", " << Plane_Normal[1] <<", " << Plane_Normal[2] << ") has not been detected." << endl;
-      }
-      
-      
-      /*--- Compute dihedral using a step in the station value ---*/
-      
-      Plane_P0_[0] = 0.0; Plane_Normal_[0] = 0.0;
-      Plane_P0_[1] = 0.0; Plane_Normal_[1] = 0.0;
-      Plane_P0_[2] = 0.0; Plane_Normal_[2] = 0.0;
-
-      if (config->GetGeo_Description() == FUSELAGE) {
-        Plane_Normal_[0] = 1.0;
-        if (iSection == 0) Plane_P0_[0] = config->GetLocationStations(iSection) + 0.01;
-        else Plane_P0_[0] = config->GetLocationStations(iSection) - 0.01;
-      }
-      else if (config->GetGeo_Description() == NACELLE) {
-        if (iSection == 0) {
-          Plane_Normal_[0] = 0.0;
-          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
-          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
-          
-          /*--- Apply tilt angle to the plane ---*/
-          
-          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-          su2double Plane_NormalY_Tilt = Plane_Normal[1];
-          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-          
-          /*--- Apply toe angle to the plane ---*/
-          
-          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-          
-          /*--- Update normal vector ---*/
-          
-          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-          
-        }
-        else {
-          Plane_Normal_[0] = 0.0;
-          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
-          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
-          
-          /*--- Apply tilt angle to the plane ---*/
-          
-          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-          su2double Plane_NormalY_Tilt = Plane_Normal[1];
-          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-          
-          /*--- Apply toe angle to the plane ---*/
-          
-          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-          
-          /*--- Update normal vector ---*/
-          
-          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-          
-        }
-      }
-      else {
-        Plane_Normal_[1] = 1.0;
-        if (iSection == 0) Plane_P0_[1] = config->GetLocationStations(iSection) + 0.01;
-        else Plane_P0_[1] = config->GetLocationStations(iSection) - 0.01;
-      }
-   
-      geometry->ComputeAirfoil_Section(Plane_P0_, Plane_Normal_, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
-                                       CPressure, Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
-                                       CPressure_Airfoil_, true, config);
-      
-      /*--- Output the pressure on each section (tecplot format) ---*/
-      
-      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() != 0)) {
-        
-        /*--- Find leading and trailing edge ---*/
-        
-        Xcoord_LeadingEdge = 1E6; Xcoord_TrailingEdge = -1E6;
-        for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-          if (Xcoord_Airfoil[iVertex] < Xcoord_LeadingEdge) {
-            Xcoord_LeadingEdge = Xcoord_Airfoil[iVertex];
-            Ycoord_LeadingEdge = Ycoord_Airfoil[iVertex];
-            Zcoord_LeadingEdge = Zcoord_Airfoil[iVertex];
-          }
-          if (Xcoord_Airfoil[iVertex] > Xcoord_TrailingEdge) {
-            Xcoord_TrailingEdge = Xcoord_Airfoil[iVertex];
-            Ycoord_TrailingEdge = Ycoord_Airfoil[iVertex];
-            Zcoord_TrailingEdge = Zcoord_Airfoil[iVertex];
-          }
-        }
-        
-        Chord = (Xcoord_TrailingEdge-Xcoord_LeadingEdge);
-        
-        /*--- Compute dihedral ---*/
-        
-        Xcoord_LeadingEdge_ = 1E6; Xcoord_TrailingEdge_ = -1E6;
-        for (iVertex = 0; iVertex < Xcoord_Airfoil_.size(); iVertex++) {
-          if (Xcoord_Airfoil_[iVertex] < Xcoord_LeadingEdge_) {
-            Xcoord_LeadingEdge_ = Xcoord_Airfoil_[iVertex];
-          }
-          if (Xcoord_Airfoil_[iVertex] > Xcoord_TrailingEdge_) {
-            Xcoord_TrailingEdge_ = Xcoord_Airfoil_[iVertex];
-            Ycoord_TrailingEdge_ = Ycoord_Airfoil_[iVertex];
-            Zcoord_TrailingEdge_ = Zcoord_Airfoil_[iVertex];
-          }
-        }
-        
-        if (iSection == 0) {
-          Dihedral_Trailing = atan((Zcoord_TrailingEdge_ - Zcoord_TrailingEdge) / (Ycoord_TrailingEdge_ - Ycoord_TrailingEdge))*180/PI_NUMBER;
-        }
-        else {
-          Dihedral_Trailing = atan((Zcoord_TrailingEdge - Zcoord_TrailingEdge_) / (Ycoord_TrailingEdge - Ycoord_TrailingEdge_))*180/PI_NUMBER;
-        }
-        
-        /*--- Write Cp at each section (tecplot format) ---*/
-        
-        if (output) {
-          
-          ofstream Cp_File;
-          
-          if (iSection == 0) {
-            Cp_File.open("cp_sections.dat", ios::out);
-            Cp_File << "TITLE = \"Airfoil sections\"" << endl;
-            Cp_File << "VARIABLES = \"x/c\",\"C<sub>p</sub>\",\"x\",\"y\",\"z\",\"y/c\",\"z/c\"" << endl;
-          } else
-            Cp_File.open("cp_sections.dat", ios::app);
-          
-          if (config->GetGeo_Description() == NACELLE) {
-            su2double theta_deg = atan2(Plane_Normal[1], -Plane_Normal[2])/PI_NUMBER*180 + 180;
-            Cp_File << "ZONE T=\"Theta = " << theta_deg << " deg\", I= " << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-          }
-          else {
-            if (config->GetSystemMeasurements() == SI) Cp_File << "ZONE T=\"y = " << Plane_P0[1] << " m\", I= "
-              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-            
-            if (config->GetSystemMeasurements() == US) Cp_File << "ZONE T=\"y = " << Plane_P0[1]*12.0 << " in\", I= "
-              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-          }
-          
-
-          
-          /*--- Coordinates and pressure value ---*/
-          
-          for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-            
-            su2double XCoord = Xcoord_Airfoil[iVertex];
-            su2double YCoord = Ycoord_Airfoil[iVertex];
-            su2double ZCoord = Zcoord_Airfoil[iVertex];
-            
-            /*--- Undo the transformation based on the Theta angle ---*/
-            
-            if (config->GetGeo_Description() == NACELLE) {
-              su2double theta_deg = atan2(Plane_Normal[1],-Plane_Normal[2])/PI_NUMBER*180 + 180;
-              su2double Angle = theta_deg*PI_NUMBER/180 - 0.5*PI_NUMBER;
-              
-              XCoord = Xcoord_Airfoil[iVertex] + config->GetNacelleLocation(0);
-              YCoord = (Ycoord_Airfoil[iVertex]*cos(Angle) - Zcoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(1);
-              ZCoord = (Zcoord_Airfoil[iVertex]*cos(Angle) + Ycoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(2);
-              
-            }
-            
-            if (config->GetSystemMeasurements() == US) {
-              Cp_File <<  (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord  << " " << CPressure_Airfoil[iVertex]
-              << " " << XCoord * 12.0 << " " << YCoord * 12.0 << " " << ZCoord * 12.0
-              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
-            }
-            else {
-              Cp_File << (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord << " " << CPressure_Airfoil[iVertex]
-              << " " << XCoord << " " << YCoord << " " << ZCoord
-              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
-            }
-            
-          }
-          
-          Cp_File.close();
-          
-        }
-        
-        /*--- Compute load distribution ---*/
-        
-        ForceInviscid[0] = 0.0; ForceInviscid[1] = 0.0; ForceInviscid[2] = 0.0; MomentInviscid[1] = 0.0;
-        
-        for (iVertex = 0; iVertex < Xcoord_Airfoil.size() - 1; iVertex++) {
-          
-          NDPressure = 0.5 * (CPressure_Airfoil[iVertex] + CPressure_Airfoil[iVertex + 1]);
-          
-          Force[0] = -(Zcoord_Airfoil[iVertex + 1] - Zcoord_Airfoil[iVertex]) * NDPressure;
-          Force[1] = 0.0;
-          Force[2] = (Xcoord_Airfoil[iVertex + 1] - Xcoord_Airfoil[iVertex]) * NDPressure;
-          
-          ForceInviscid[0] += Force[0];
-          ForceInviscid[1] += Force[1];
-          ForceInviscid[2] += Force[2];
-          
-          MomentDist[0] = 0.5 	* (Xcoord_Airfoil[iVertex] + Xcoord_Airfoil[iVertex + 1]) - Origin[0];
-          MomentDist[1] = 0.5 * (Ycoord_Airfoil[iVertex] + Ycoord_Airfoil[iVertex + 1]) - Origin[1];
-          MomentDist[2] = 0.5 	* (Zcoord_Airfoil[iVertex] + Zcoord_Airfoil[iVertex + 1]) - Origin[3];
-          
-          MomentInviscid[1] += (Force[0] * MomentDist[2] - Force[2] * MomentDist[0]) / RefLength;
-          
-        }
-        
-        /*--- Compute local chord, for the nondimensionalization  ---*/
-        
-        MaxDistance = 0.0; Trailing_Point = 0;
-        
-        for (iVertex = 1; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-          
-          Distance = sqrt(pow(Xcoord_Airfoil[iVertex] - Xcoord_Airfoil[Trailing_Point], 2.0) +
-                          pow(Ycoord_Airfoil[iVertex] - Ycoord_Airfoil[Trailing_Point], 2.0) +
-                          pow(Zcoord_Airfoil[iVertex] - Zcoord_Airfoil[Trailing_Point], 2.0));
-          
-          if (MaxDistance < Distance) { MaxDistance = Distance; }
-          
-        }
-        
-        Chord = MaxDistance;
-        
-        CL_Inv = cos(Dihedral_Trailing * PI_NUMBER / 180.0) * fabs( -ForceInviscid[0] * sin(Alpha) + ForceInviscid[2] * cos(Alpha) )/ Chord;
-        
-        /*--- Compute sectional lift at the root ---*/
-        
-        B                  = 2.0*config->GetSemiSpan();
-        RefArea            = config->GetRefArea();
-        C_L                = solver->GetTotal_CL();
-        C_L0               = 8.0*C_L*RefArea/(B*PI_NUMBER);
-        Y                  = Ycoord_Airfoil[0];
-        Aux                = Y/(0.5*B);
-        Elliptic_Spanload  = (C_L0 / RefLength) * sqrt(fabs(1.0-Aux*Aux));
-        
-        
-        /*--- Write load distribution ---*/
-        
-        if (output) {
-          
-          ofstream Load_File;
-          if (iSection == 0) {
-            
-            if (config->GetOutput_FileFormat() == PARAVIEW) {
-              Load_File.open("load_distribution.csv", ios::out);
-              Load_File << "\"Percent Semispan\",\"Sectional C_L\",\"Spanload (c C_L / c_ref) \",\"Elliptic Spanload\"" << endl;
-            }
-            else {
-              Load_File.open("load_distribution.dat", ios::out);
-              Load_File << "TITLE = \"Load distribution\"" << endl;
-              Load_File << "VARIABLES = \"Percent Semispan\",\"Sectional C<sub>L</sub>\",\"Spanload (c C<sub>L</sub> / c<sub>ref</sub>) \",\"Elliptic Spanload\"" << endl;
-              Load_File << "ZONE T=\"Wing load distribution\"" << endl;
-            }
-          } else {
-            if (config->GetOutput_FileFormat() == PARAVIEW) Load_File.open("load_distribution.csv", ios::app);
-            else Load_File.open("load_distribution.dat", ios::app);
-          }
-          
-          
-          /*--- CL and spanload ---*/
-          
-          if (config->GetOutput_FileFormat() == PARAVIEW)
-            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << ", " << CL_Inv  << ", " << Chord*CL_Inv / RefLength <<", " << Elliptic_Spanload   << endl;
-          else
-            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << " " << CL_Inv  << " " << Chord*CL_Inv / RefLength <<" " << Elliptic_Spanload   << endl;
-          
-          Load_File.close();
-          
-        }
-        
-      }
-      
-    }
-    
-  }
-  
-  /*--- Delete dynamically allocated memory ---*/
-  
-  delete[] Plane_P0;
-  delete[] Plane_P0_;
-  delete[] Plane_Normal;
-  delete[] Plane_Normal_;
-  delete[] CPressure;
-  
-}
-
-
-void COutput::SetCp_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
-  
-  unsigned short iMarker, icommas, Boundary, iDim;
-  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
-  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff;
-  bool *PointInDomain;
-  string text_line, surfCp_filename;
-  ifstream Surface_file;
-  char buffer[50], cstr[200];
-  
-  
-  nPointLocal = geometry->GetnPoint();
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nPointGlobal = nPointLocal;
-#endif
-  
-  Point2Vertex = new unsigned long[nPointGlobal][2];
-  PointInDomain = new bool[nPointGlobal];
-  
-  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
-    PointInDomain[iPoint] = false;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        /*--- The Pressure file uses the global numbering ---*/
-        
-#ifndef HAVE_MPI
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
-        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
-        
-        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
-          Point2Vertex[iPoint][0] = iMarker;
-          Point2Vertex[iPoint][1] = iVertex;
-          PointInDomain[iPoint] = true;
-          solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Prepare to read the surface pressure files (CSV) ---*/
-  
-  surfCp_filename = "TargetCp";
-  strcpy (cstr, surfCp_filename.c_str());
-  
-  /*--- Write file name with extension if unsteady or steady ---*/
-  
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".dat");
-  
-  strcat (cstr, buffer);
-  
-  /*--- Read the surface pressure file ---*/
-  
-  string::size_type position;
-  
-  Surface_file.open(cstr, ios::in);
-  
-  if (!(Surface_file.fail())) {
-    
-    getline(Surface_file, text_line);
-    
-    while (getline(Surface_file, text_line)) {
-      for (icommas = 0; icommas < 50; icommas++) {
-        position = text_line.find( ",", 0 );
-        if (position!=string::npos) text_line.erase (position,1);
-      }
-      stringstream  point_line(text_line);
-      
-      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff;
-      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff;
-      
-      if (PointInDomain[iPoint]) {
-        
-        /*--- Find the vertex for the Point and Marker ---*/
-        
-        iMarker = Point2Vertex[iPoint][0];
-        iVertex = Point2Vertex[iPoint][1];
-        
-        solver_container->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
-        
-      }
-      
-    }
-    
-    Surface_file.close();
-    
-  }
-  
-  /*--- Compute the pressure difference ---*/
-  
-  PressDiff = 0.0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        
-        Cp = solver_container->GetCPressure(iMarker, iVertex);
-        CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
-        
-        Area = 0.0;
-        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-          Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt(Area);
-        
-        PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
-      }
-      
-    }
-  }
-  
-#ifdef HAVE_MPI
-  su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
-  SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Update the total Cp difference coeffient ---*/
-  
-  solver_container->SetTotal_CpDiff(PressDiff);
-  
-  delete [] Point2Vertex;
-  delete [] PointInDomain;
-  
-}
-
-void COutput::SetHeatFlux_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
-  
-  unsigned short iMarker, icommas, Boundary, iDim;
-  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
-  su2double XCoord, YCoord, ZCoord, PressureCoeff, HeatFlux = 0.0, HeatFluxDiff, HeatFluxTarget, *Normal = NULL, Area,
-  Pressure, Cf;
-  bool *PointInDomain;
-  string text_line, surfHeatFlux_filename;
-  ifstream Surface_file;
-  char buffer[50], cstr[200];
-  
-  
-  nPointLocal = geometry->GetnPoint();
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nPointGlobal = nPointLocal;
-#endif
-  
-  Point2Vertex = new unsigned long[nPointGlobal][2];
-  PointInDomain = new bool[nPointGlobal];
-  
-  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
-    PointInDomain[iPoint] = false;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        /*--- The Pressure file uses the global numbering ---*/
-        
-#ifndef HAVE_MPI
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
-        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
-        
-        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
-          Point2Vertex[iPoint][0] = iMarker;
-          Point2Vertex[iPoint][1] = iVertex;
-          PointInDomain[iPoint] = true;
-          solver_container->SetHeatFluxTarget(iMarker, iVertex, 0.0);
-        }
-      }
-    }
-  }
-  
-  /*--- Prepare to read the surface pressure files (CSV) ---*/
-  
-  surfHeatFlux_filename = "TargetHeatFlux";
-  strcpy (cstr, surfHeatFlux_filename.c_str());
-  
-  /*--- Write file name with extension if unsteady or steady ---*/
-  
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".dat");
-  
-  strcat (cstr, buffer);
-  
-  /*--- Read the surface pressure file ---*/
-  
-  string::size_type position;
-  
-  Surface_file.open(cstr, ios::in);
-  
-  if (!(Surface_file.fail())) {
-    
-    getline(Surface_file, text_line);
-    
-    while (getline(Surface_file, text_line)) {
-      for (icommas = 0; icommas < 50; icommas++) {
-        position = text_line.find( ",", 0 );
-        if (position!=string::npos) text_line.erase (position,1);
-      }
-      stringstream  point_line(text_line);
-      
-      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
-      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
-      
-      if (PointInDomain[iPoint]) {
-        
-        /*--- Find the vertex for the Point and Marker ---*/
-        
-        iMarker = Point2Vertex[iPoint][0];
-        iVertex = Point2Vertex[iPoint][1];
-        
-        solver_container->SetHeatFluxTarget(iMarker, iVertex, HeatFlux);
-        
-      }
-      
-    }
-    
-    Surface_file.close();
-  }
-  
-  /*--- Compute the pressure difference ---*/
-  
-  HeatFluxDiff = 0.0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        
-        HeatFlux = solver_container->GetHeatFlux(iMarker, iVertex);
-        HeatFluxTarget = solver_container->GetHeatFluxTarget(iMarker, iVertex);
-        
-        Area = 0.0;
-        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-          Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt(Area);
-        
-        HeatFluxDiff += Area * (HeatFluxTarget - HeatFlux) * (HeatFluxTarget - HeatFlux);
-        
-      }
-      
-    }
-  }
-  
-#ifdef HAVE_MPI
-  su2double MyHeatFluxDiff = HeatFluxDiff;   HeatFluxDiff = 0.0;
-  SU2_MPI::Allreduce(&MyHeatFluxDiff, &HeatFluxDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Update the total HeatFlux difference coeffient ---*/
-  
-  solver_container->SetTotal_HeatFluxDiff(HeatFluxDiff);
-  
-  delete [] Point2Vertex;
-  delete [] PointInDomain;
-  
-}
-
-void COutput::SpecialOutput_SonicBoom(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  ofstream EquivArea_file, FuncGrad_file;
-  unsigned short iMarker = 0, iDim;
-  short *AzimuthalAngle = NULL;
-  su2double Gamma, auxXCoord, auxYCoord, auxZCoord, InverseDesign = 0.0, DeltaX, Coord_i, Coord_j, jp1Coord, *Coord = NULL, MeanFuntion,
-  *Face_Normal = NULL, auxArea, auxPress, Mach, Beta, R_Plane, Pressure_Inf,
-  ModVelocity_Inf, Velocity_Inf[3], factor, *Xcoord = NULL, *Ycoord = NULL, *Zcoord = NULL,
-  *Pressure = NULL, *FaceArea = NULL, *EquivArea = NULL, *TargetArea = NULL, *NearFieldWeight = NULL,
-  *Weight = NULL, jFunction, jp1Function;
-  unsigned long jVertex, iVertex, iPoint, nVertex_NearField = 0, auxPoint,
-  *IdPoint = NULL, *IdDomain = NULL, auxDomain;
-  unsigned short iPhiAngle;
-  ofstream NearFieldEA_file; ifstream TargetEA_file;
-  
-  su2double XCoordBegin_OF = config->GetEA_IntLimit(0);
-  su2double XCoordEnd_OF = config->GetEA_IntLimit(1);
-  
-  unsigned short nDim = geometry->GetnDim();
-  su2double AoA = -(config->GetAoA()*PI_NUMBER/180.0);
-  su2double EAScaleFactor = config->GetEA_ScaleFactor(); // The EA Obj. Func. should be ~ force based Obj. Func.
-  
-  Mach  = config->GetMach();
-  Gamma = config->GetGamma();
-  Beta = sqrt(Mach*Mach-1.0);
-  R_Plane = fabs(config->GetEA_IntLimit(2));
-  Pressure_Inf = config->GetPressure_FreeStreamND();
-  Velocity_Inf[0] = config->GetVelocity_FreeStreamND()[0];
-  Velocity_Inf[1] = config->GetVelocity_FreeStreamND()[1];
-  Velocity_Inf[2] = config->GetVelocity_FreeStreamND()[2];
-  ModVelocity_Inf = 0;
-  for (iDim = 0; iDim < 3; iDim++)
-    ModVelocity_Inf += Velocity_Inf[iDim] * Velocity_Inf[iDim];
-  
-  factor = 4.0*sqrt(2.0*Beta*R_Plane) / (Gamma*Pressure_Inf*Mach*Mach);
-  
-  if (rank == MASTER_NODE) cout << endl << "Writing Equivalent Area files.";
-
-#ifndef HAVE_MPI
-  
-  /*--- Compute the total number of points on the near-field ---*/
-  
-  nVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        /*--- Using Face_Normal(z), and Coord(z) we identify only a surface,
-         note that there are 2 NEARFIELD_BOUNDARY surfaces ---*/
-        
-        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) nVertex_NearField ++;
-      }
-  
-  /*--- Create an array with all the coordinates, points, pressures, face area,
-   equivalent area, and nearfield weight ---*/
-  
-  Xcoord = new su2double[nVertex_NearField];
-  Ycoord = new su2double[nVertex_NearField];
-  Zcoord = new su2double[nVertex_NearField];
-  AzimuthalAngle = new short[nVertex_NearField];
-  IdPoint = new unsigned long[nVertex_NearField];
-  IdDomain = new unsigned long[nVertex_NearField];
-  Pressure = new su2double[nVertex_NearField];
-  FaceArea = new su2double[nVertex_NearField];
-  EquivArea = new su2double[nVertex_NearField];
-  TargetArea = new su2double[nVertex_NearField];
-  NearFieldWeight = new su2double[nVertex_NearField];
-  Weight = new su2double[nVertex_NearField];
-  
-  /*--- Copy the boundary information to an array ---*/
-  
-  nVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
-          
-          IdPoint[nVertex_NearField] = iPoint;
-          Xcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
-          Ycoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
-          
-          if (nDim ==2) {
-            AzimuthalAngle[nVertex_NearField] = 0;
-          }
-          
-          if (nDim == 3) {
-            Zcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
-            
-            /*--- Rotate the nearfield cylinder (AoA) only 3D ---*/
-            
-            su2double YcoordRot = Ycoord[nVertex_NearField];
-            su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
-            
-            /*--- Compute the Azimuthal angle (resolution of degress in the Azimuthal angle)---*/
-            
-            su2double AngleDouble; short AngleInt;
-            AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
-            
-            /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
-            
-            su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
-            
-            if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1)) AngleDouble = FixAzimuthalLine - 0.1;
-            
-            AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
-            if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
-            else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
-          }
-          
-          if (AzimuthalAngle[nVertex_NearField] <= 60) {
-            Pressure[nVertex_NearField] = solver->node[iPoint]->GetPressure();
-            FaceArea[nVertex_NearField] = fabs(Face_Normal[nDim-1]);
-            nVertex_NearField ++;
-          }
-          
-        }
-      }
-  
-#else
-  
-  int nProcessor;
-  SU2_MPI::Comm_size(MPI_COMM_WORLD, &nProcessor);
-  
-  unsigned long nLocalVertex_NearField = 0, MaxLocalVertex_NearField = 0;
-  int iProcessor;
-  
-  unsigned long *Buffer_Receive_nVertex = NULL;
-  if (rank == MASTER_NODE) {
-    Buffer_Receive_nVertex = new unsigned long [nProcessor];
-  }
-  
-  /*--- Compute the total number of points of the near-field ghost nodes ---*/
-  
-  nLocalVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if (geometry->node[iPoint]->GetDomain())
-          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0))
-            nLocalVertex_NearField ++;
-      }
-  
-  unsigned long *Buffer_Send_nVertex = new unsigned long [1];
-  Buffer_Send_nVertex[0] = nLocalVertex_NearField;
-  
-  /*--- Send Near-Field vertex information --*/
-  
-  SU2_MPI::Allreduce(&nLocalVertex_NearField, &nVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalVertex_NearField, &MaxLocalVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  delete [] Buffer_Send_nVertex;
-  
-  su2double *Buffer_Send_Xcoord = new su2double[MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Ycoord = new su2double[MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Zcoord = new su2double[MaxLocalVertex_NearField];
-  unsigned long *Buffer_Send_IdPoint = new unsigned long [MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Pressure = new su2double [MaxLocalVertex_NearField];
-  su2double *Buffer_Send_FaceArea = new su2double[MaxLocalVertex_NearField];
-  
-  su2double *Buffer_Receive_Xcoord = NULL;
-  su2double *Buffer_Receive_Ycoord = NULL;
-  su2double *Buffer_Receive_Zcoord = NULL;
-  unsigned long *Buffer_Receive_IdPoint = NULL;
-  su2double *Buffer_Receive_Pressure = NULL;
-  su2double *Buffer_Receive_FaceArea = NULL;
-  
-  if (rank == MASTER_NODE) {
-    Buffer_Receive_Xcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Ycoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Zcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_IdPoint = new unsigned long[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Pressure = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_FaceArea = new su2double[nProcessor*MaxLocalVertex_NearField];
-  }
-  
-  unsigned long nBuffer_Xcoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Ycoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Zcoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_IdPoint = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Pressure = MaxLocalVertex_NearField;
-  unsigned long nBuffer_FaceArea = MaxLocalVertex_NearField;
-  
-  for (iVertex = 0; iVertex < MaxLocalVertex_NearField; iVertex++) {
-    Buffer_Send_IdPoint[iVertex] = 0; Buffer_Send_Pressure[iVertex] = 0.0;
-    Buffer_Send_FaceArea[iVertex] = 0.0; Buffer_Send_Xcoord[iVertex] = 0.0;
-    Buffer_Send_Ycoord[iVertex] = 0.0; Buffer_Send_Zcoord[iVertex] = 0.0;
-  }
-  
-  /*--- Copy coordinates, index points, and pressures to the auxiliar vector --*/
-  
-  nLocalVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if (geometry->node[iPoint]->GetDomain())
-          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
-            Buffer_Send_IdPoint[nLocalVertex_NearField] = iPoint;
-            Buffer_Send_Xcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
-            Buffer_Send_Ycoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
-            Buffer_Send_Zcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
-            Buffer_Send_Pressure[nLocalVertex_NearField] = solver->node[iPoint]->GetPressure();
-            Buffer_Send_FaceArea[nLocalVertex_NearField] = fabs(Face_Normal[nDim-1]);
-            nLocalVertex_NearField++;
-          }
-      }
-  
-  /*--- Send all the information --*/
-  
-  SU2_MPI::Gather(Buffer_Send_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, Buffer_Receive_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, Buffer_Receive_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, Buffer_Receive_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, Buffer_Receive_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Pressure, nBuffer_Pressure, MPI_DOUBLE, Buffer_Receive_Pressure, nBuffer_Pressure, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, Buffer_Receive_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  delete [] Buffer_Send_Xcoord;
-  delete [] Buffer_Send_Ycoord;
-  delete [] Buffer_Send_Zcoord;
-  delete [] Buffer_Send_IdPoint;
-  delete [] Buffer_Send_Pressure;
-  delete [] Buffer_Send_FaceArea;
-  
-  if (rank == MASTER_NODE) {
-    
-    Xcoord = new su2double[nVertex_NearField];
-    Ycoord = new su2double[nVertex_NearField];
-    Zcoord = new su2double[nVertex_NearField];
-    AzimuthalAngle = new short[nVertex_NearField];
-    IdPoint = new unsigned long[nVertex_NearField];
-    IdDomain = new unsigned long[nVertex_NearField];
-    Pressure = new su2double[nVertex_NearField];
-    FaceArea = new su2double[nVertex_NearField];
-    EquivArea = new su2double[nVertex_NearField];
-    TargetArea = new su2double[nVertex_NearField];
-    NearFieldWeight = new su2double[nVertex_NearField];
-    Weight = new su2double[nVertex_NearField];
-    
-    nVertex_NearField = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
-      for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
-        Xcoord[nVertex_NearField] = Buffer_Receive_Xcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-        Ycoord[nVertex_NearField] = Buffer_Receive_Ycoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-        
-        if (nDim == 2) {
-          AzimuthalAngle[nVertex_NearField] = 0;
-        }
-        
-        if (nDim == 3) {
-          Zcoord[nVertex_NearField] = Buffer_Receive_Zcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-          
-          /*--- Rotate the nearfield cylinder  ---*/
-          
-          su2double YcoordRot = Ycoord[nVertex_NearField];
-          su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
-          
-          /*--- Compute the Azimuthal angle ---*/
-          
-          su2double AngleDouble; short AngleInt;
-          AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
-          
-          /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
-          
-          su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
-          
-          if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1))
-            AngleDouble = FixAzimuthalLine - 0.1;
-          
-          AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
-          
-          if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
-          else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
-        }
-        
-        if (AzimuthalAngle[nVertex_NearField] <= 60) {
-          IdPoint[nVertex_NearField] = Buffer_Receive_IdPoint[iProcessor*MaxLocalVertex_NearField+iVertex];
-          Pressure[nVertex_NearField] = Buffer_Receive_Pressure[iProcessor*MaxLocalVertex_NearField+iVertex];
-          FaceArea[nVertex_NearField] = Buffer_Receive_FaceArea[iProcessor*MaxLocalVertex_NearField+iVertex];
-          IdDomain[nVertex_NearField] = iProcessor;
-          nVertex_NearField++;
-        }
-        
-      }
-    
-    delete [] Buffer_Receive_nVertex;
-    
-    delete [] Buffer_Receive_Xcoord;
-    delete [] Buffer_Receive_Ycoord;
-    delete [] Buffer_Receive_Zcoord;
-    delete [] Buffer_Receive_IdPoint;
-    delete [] Buffer_Receive_Pressure;
-    delete [] Buffer_Receive_FaceArea;
-    
-  }
-  
-#endif
-  
-  if (rank == MASTER_NODE) {
-    
-    vector<short> PhiAngleList;
-    vector<short>::iterator IterPhiAngleList;
-    
-    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
-      PhiAngleList.push_back(AzimuthalAngle[iVertex]);
-    
-    sort( PhiAngleList.begin(), PhiAngleList.end());
-    IterPhiAngleList = unique( PhiAngleList.begin(), PhiAngleList.end());
-    PhiAngleList.resize( IterPhiAngleList - PhiAngleList.begin() );
-    
-    /*--- Create vectors and distribute the values among the different PhiAngle queues ---*/
-    
-    vector<vector<su2double> > Xcoord_PhiAngle; Xcoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Ycoord_PhiAngle; Ycoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Zcoord_PhiAngle; Zcoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<unsigned long> > IdPoint_PhiAngle; IdPoint_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<unsigned long> > IdDomain_PhiAngle; IdDomain_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Pressure_PhiAngle; Pressure_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > FaceArea_PhiAngle; FaceArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > EquivArea_PhiAngle; EquivArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > TargetArea_PhiAngle; TargetArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > NearFieldWeight_PhiAngle; NearFieldWeight_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Weight_PhiAngle; Weight_PhiAngle.resize(PhiAngleList.size());
-    
-    /*--- Distribute the values among the different PhiAngles ---*/
-    
-    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        if (AzimuthalAngle[iVertex] == PhiAngleList[iPhiAngle]) {
-          Xcoord_PhiAngle[iPhiAngle].push_back(Xcoord[iVertex]);
-          Ycoord_PhiAngle[iPhiAngle].push_back(Ycoord[iVertex]);
-          Zcoord_PhiAngle[iPhiAngle].push_back(Zcoord[iVertex]);
-          IdPoint_PhiAngle[iPhiAngle].push_back(IdPoint[iVertex]);
-          IdDomain_PhiAngle[iPhiAngle].push_back(IdDomain[iVertex]);
-          Pressure_PhiAngle[iPhiAngle].push_back(Pressure[iVertex]);
-          FaceArea_PhiAngle[iPhiAngle].push_back(FaceArea[iVertex]);
-          EquivArea_PhiAngle[iPhiAngle].push_back(EquivArea[iVertex]);
-          TargetArea_PhiAngle[iPhiAngle].push_back(TargetArea[iVertex]);
-          NearFieldWeight_PhiAngle[iPhiAngle].push_back(NearFieldWeight[iVertex]);
-          Weight_PhiAngle[iPhiAngle].push_back(Weight[iVertex]);
-        }
-    
-    /*--- Order the arrays (x Coordinate, Pressure, Point, and Domain) ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++)
-        for (jVertex = 0; jVertex < Xcoord_PhiAngle[iPhiAngle].size() - 1 - iVertex; jVertex++)
-          if (Xcoord_PhiAngle[iPhiAngle][jVertex] > Xcoord_PhiAngle[iPhiAngle][jVertex+1]) {
-            auxXCoord = Xcoord_PhiAngle[iPhiAngle][jVertex]; Xcoord_PhiAngle[iPhiAngle][jVertex] = Xcoord_PhiAngle[iPhiAngle][jVertex+1]; Xcoord_PhiAngle[iPhiAngle][jVertex+1] = auxXCoord;
-            auxYCoord = Ycoord_PhiAngle[iPhiAngle][jVertex]; Ycoord_PhiAngle[iPhiAngle][jVertex] = Ycoord_PhiAngle[iPhiAngle][jVertex+1]; Ycoord_PhiAngle[iPhiAngle][jVertex+1] = auxYCoord;
-            auxZCoord = Zcoord_PhiAngle[iPhiAngle][jVertex]; Zcoord_PhiAngle[iPhiAngle][jVertex] = Zcoord_PhiAngle[iPhiAngle][jVertex+1]; Zcoord_PhiAngle[iPhiAngle][jVertex+1] = auxZCoord;
-            auxPress = Pressure_PhiAngle[iPhiAngle][jVertex]; Pressure_PhiAngle[iPhiAngle][jVertex] = Pressure_PhiAngle[iPhiAngle][jVertex+1]; Pressure_PhiAngle[iPhiAngle][jVertex+1] = auxPress;
-            auxArea = FaceArea_PhiAngle[iPhiAngle][jVertex]; FaceArea_PhiAngle[iPhiAngle][jVertex] = FaceArea_PhiAngle[iPhiAngle][jVertex+1]; FaceArea_PhiAngle[iPhiAngle][jVertex+1] = auxArea;
-            auxPoint = IdPoint_PhiAngle[iPhiAngle][jVertex]; IdPoint_PhiAngle[iPhiAngle][jVertex] = IdPoint_PhiAngle[iPhiAngle][jVertex+1]; IdPoint_PhiAngle[iPhiAngle][jVertex+1] = auxPoint;
-            auxDomain = IdDomain_PhiAngle[iPhiAngle][jVertex]; IdDomain_PhiAngle[iPhiAngle][jVertex] = IdDomain_PhiAngle[iPhiAngle][jVertex+1]; IdDomain_PhiAngle[iPhiAngle][jVertex+1] = auxDomain;
-          }
-    
-    
-    /*--- Check that all the azimuth lists have the same size ---*/
-    
-    unsigned short nVertex = Xcoord_PhiAngle[0].size();
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-      unsigned short nVertex_aux = Xcoord_PhiAngle[iPhiAngle].size();
-      if (nVertex_aux != nVertex) cout <<"Be careful!!! one azimuth list is shorter than the other"<< endl;
-      nVertex = min(nVertex, nVertex_aux);
-    }
-    
-    /*--- Compute equivalent area distribution at each azimuth angle ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-      EquivArea_PhiAngle[iPhiAngle][0] = 0.0;
-      for (iVertex = 1; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        EquivArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
-        
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][iVertex]*sin(AoA);
-        
-        for (jVertex = 0; jVertex < iVertex-1; jVertex++) {
-          
-          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex]*sin(AoA);
-          jp1Coord = Xcoord_PhiAngle[iPhiAngle][jVertex+1]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex+1]*sin(AoA);
-          
-          jFunction = factor*(Pressure_PhiAngle[iPhiAngle][jVertex] - Pressure_Inf)*sqrt(Coord_i-Coord_j);
-          jp1Function = factor*(Pressure_PhiAngle[iPhiAngle][jVertex+1] - Pressure_Inf)*sqrt(Coord_i-jp1Coord);
-          
-          DeltaX = (jp1Coord-Coord_j);
-          MeanFuntion = 0.5*(jp1Function + jFunction);
-          EquivArea_PhiAngle[iPhiAngle][iVertex] += DeltaX * MeanFuntion;
-        }
-      }
-    }
-    
-    /*--- Create a file with the equivalent area distribution at each azimuthal angle ---*/
-    
-    NearFieldEA_file.precision(15);
-    
-    if (output) {
-      
-      NearFieldEA_file.open("Equivalent_Area.dat", ios::out);
-      NearFieldEA_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
-      
-      if (config->GetSystemMeasurements() == US)
-        NearFieldEA_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\"";
-      else
-        NearFieldEA_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\"";
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-        if (config->GetSystemMeasurements() == US)
-          NearFieldEA_file << ", \"Equivalent Area (ft<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
-        else
-          NearFieldEA_file << ", \"Equivalent Area (m<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
-      }
-      
-      NearFieldEA_file << "\n";
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[0].size(); iVertex++) {
-        
-        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-        su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
-        
-        if (config->GetSystemMeasurements() == US)
-          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
-        else
-          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init);
-        
-        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-          NearFieldEA_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex];
-        }
-        
-        NearFieldEA_file << "\n";
-        
-      }
-      NearFieldEA_file.close();
-      
-    }
-    
-    /*--- Read target equivalent area from the configuration file,
-     this first implementation requires a complete table (same as the original
-     EA table). so... no interpolation. ---*/
-    
-    vector<vector<su2double> > TargetArea_PhiAngle_Trans;
-    TargetEA_file.open("TargetEA.dat", ios::in);
-    
-    if (TargetEA_file.fail()) {
-      /*--- Set the table to 0 ---*/
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        for (iVertex = 0; iVertex < TargetArea_PhiAngle[iPhiAngle].size(); iVertex++)
-          TargetArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
-    }
-    else {
-      
-      /*--- skip header lines ---*/
-      
-      string line;
-      getline(TargetEA_file, line);
-      getline(TargetEA_file, line);
-      
-      while (TargetEA_file) {
-        
-        string line;
-        getline(TargetEA_file, line);
-        istringstream is(line);
-        vector<su2double> row;
-        unsigned short iter = 0;
-        
-        while (is.good()) {
-          string token;
-          getline(is, token,',');
-          
-          istringstream js(token);
-          
-          su2double data;
-          js >> data;
-          
-          /*--- The first element in the table is the coordinate (in or m)---*/
-          
-          if (iter != 0) row.push_back(data);
-          iter++;
-          
-        }
-        TargetArea_PhiAngle_Trans.push_back(row);
-      }
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++)
-          TargetArea_PhiAngle[iPhiAngle][iVertex] = TargetArea_PhiAngle_Trans[iVertex][iPhiAngle];
-      
-    }
-    
-    /*--- Divide by the number of Phi angles in the nearfield ---*/
-    
-    su2double PhiFactor = 1.0/su2double(PhiAngleList.size());
-    
-    /*--- Evaluate the objective function ---*/
-    
-    InverseDesign = 0;
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
-        
-        su2double Difference = EquivArea_PhiAngle[iPhiAngle][iVertex]-TargetArea_PhiAngle[iPhiAngle][iVertex];
-        su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][iVertex]);
-        
-        if ((percentage < 0.1) || (Coord_i < XCoordBegin_OF) || (Coord_i > XCoordEnd_OF)) Difference = 0.0;
-        
-        InverseDesign += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*Difference*Difference;
-        
-      }
-    
-    /*--- Evaluate the weight of the nearfield pressure (adjoint input) ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
-        NearFieldWeight_PhiAngle[iPhiAngle][iVertex] = 0.0;
-        for (jVertex = iVertex; jVertex < EquivArea_PhiAngle[iPhiAngle].size(); jVertex++) {
-          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex];
-          Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
-          
-          su2double Difference = EquivArea_PhiAngle[iPhiAngle][jVertex]-TargetArea_PhiAngle[iPhiAngle][jVertex];
-          su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][jVertex]);
-          
-          if ((percentage < 0.1) || (Coord_j < XCoordBegin_OF) || (Coord_j > XCoordEnd_OF)) Difference = 0.0;
-          
-          NearFieldWeight_PhiAngle[iPhiAngle][iVertex] += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*2.0*Difference*factor*sqrt(Coord_j-Coord_i);
-        }
-      }
-    
-    /*--- Write the Nearfield pressure at each Azimuthal PhiAngle ---*/
-    
-    EquivArea_file.precision(15);
-    
-    if (output) {
-      
-      EquivArea_file.open("nearfield_flow.dat", ios::out);
-      EquivArea_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
-      
-      if (config->GetSystemMeasurements() == US)
-        EquivArea_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\",\"Equivalent Area (ft<sup>2</sup>)\",\"Target Equivalent Area (ft<sup>2</sup>)\",\"Cp\"" << "\n";
-      else
-        EquivArea_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\",\"Equivalent Area (m<sup>2</sup>)\",\"Target Equivalent Area (m<sup>2</sup>)\",\"Cp\"" << "\n";
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-        EquivArea_file << fixed << "ZONE T= \"<greek>F</greek>=" << PhiAngleList[iPhiAngle] << " deg.\"" << "\n";
-        for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++) {
-          
-          su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-          su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
-          
-          if (config->GetSystemMeasurements() == US)
-            EquivArea_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
-          else
-            EquivArea_file << scientific << (XcoordRot - XcoordRot_init);
-          
-          EquivArea_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex]
-          << ", " << TargetArea_PhiAngle[iPhiAngle][iVertex] << ", " << (Pressure_PhiAngle[iPhiAngle][iVertex]-Pressure_Inf)/Pressure_Inf << "\n";
-        }
-      }
-      
-      EquivArea_file.close();
-      
-    }
-    
-    /*--- Write Weight file for adjoint computation ---*/
-    
-    FuncGrad_file.precision(15);
-    
-    if (output) {
-      
-      FuncGrad_file.open("WeightNF.dat", ios::out);
-      
-      FuncGrad_file << scientific << "-1.0";
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        FuncGrad_file << scientific << "\t" << PhiAngleList[iPhiAngle];
-      FuncGrad_file << "\n";
-      
-      for (iVertex = 0; iVertex < NearFieldWeight_PhiAngle[0].size(); iVertex++) {
-        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-        FuncGrad_file << scientific << XcoordRot;
-        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-          FuncGrad_file << scientific << "\t" << NearFieldWeight_PhiAngle[iPhiAngle][iVertex];
-        FuncGrad_file << "\n";
-      }
-      FuncGrad_file.close();
-      
-    }
-    
-    /*--- Delete structures ---*/
-    
-    delete [] Xcoord; delete [] Ycoord; delete [] Zcoord;
-    delete [] AzimuthalAngle; delete [] IdPoint; delete [] IdDomain;
-    delete [] Pressure; delete [] FaceArea;
-    delete [] EquivArea; delete [] TargetArea;
-    delete [] NearFieldWeight; delete [] Weight;
-    
-  }
-  
-#ifndef HAVE_MPI
-  
-  /*--- Store the value of the NearField coefficient ---*/
-  
-  solver->SetTotal_CEquivArea(InverseDesign);
-  
-#else
-  
-  /*--- Send the value of the NearField coefficient to all the processors ---*/
-  
-  SU2_MPI::Bcast(&InverseDesign, 1, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- Store the value of the NearField coefficient ---*/
-  
-  solver->SetTotal_CEquivArea(InverseDesign);
-  
-#endif
-  
-}
-
-void COutput::SpecialOutput_Distortion(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  unsigned short iMarker, iDim, iMarker_Analyze;
-  unsigned long iPoint, iVertex;
-  su2double xCoord = 0.0, yCoord = 0.0, zCoord = 0.0, Area = 0.0, *Vector, TotalArea = 0.0;
-  su2double xCoord_CG = 0.0, yCoord_CG = 0.0, zCoord_CG = 0.0, TipRadius, HubRadius, Distance = 0.0, Distance_Mirror = 0.0;
-  su2double *r, MinDistance, xCoord_ = 0.0, yCoord_ = 0.0, zCoord_ = 0;
-  unsigned short iStation, iAngle, nAngle;
-  char cstr[200];
-  su2double *** ProbeArray, dx = 0.0, dy = 0.0, dz = 0.0, dx_ = 0.0, dy_ = 0.0, dz_ = 0.0, UpVector[3], radians, RotatedVector[3];
-  su2double Pressure, SoundSpeed, Velocity2, Mach,  Gamma, TotalPressure, Mach_Inf, TotalPressure_Inf,
-  Temperature, TotalTemperature, Pressure_Inf, Temperature_Inf, TotalTemperature_Inf, Velocity_Inf, Density;
-  unsigned short nDim = geometry->GetnDim();
-  unsigned short Theta, nStation;
-  unsigned long nVertex_Surface, nLocalVertex_Surface, MaxLocalVertex_Surface;
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long Total_Index;
-  unsigned short Theta_DC60 = 60, nStation_DC60 = 5;
-  su2double PT_Mean, Mach_Mean, q_Mean, PT, q, *PT_Sector, PT_Sector_Min, DC60, *PT_Station, *PT_Station_Min, *Mach_Station, *Mach_Station_Min, IDR, IDC, IDC_Mach;
-  
-  
-  bool Engine_HalfModel = config->GetEngine_HalfModel();
-  su2double SignFlip = 1.0;
-  su2double Beta, Alpha;
-  su2double Mach_ij, Mach_ip1j, Mach_im1j, Mach_ijp1, Mach_ijm1, Filtered_Mach;
-  su2double Alpha_ij, Alpha_ip1j, Alpha_im1j, Alpha_ijp1, Alpha_ijm1, Filtered_Alpha;
-  su2double Beta_ij, Beta_ip1j, Beta_im1j, Beta_ijp1, Beta_ijm1, Filtered_Beta;
-  su2double a, b, c, d;
-
-  int iProcessor, nProcessor;
-  nProcessor = size;
-
-
-  if (rank == MASTER_NODE && !config->GetDiscrete_Adjoint()) cout << endl << "Writing Surface Analysis file (surface_analysis.dat).";
-
-  /*--- Open and rrite file name with extension if unsteady ---*/
-
-  ofstream SurfFlow_file;
-
-  if (output && (rank == MASTER_NODE)) {
-
-    if (config->GetOutput_FileFormat() == PARAVIEW) strcpy (cstr, "surface_analysis.vtk");
-    else strcpy (cstr, "surface_analysis.dat");
-    
-    SurfFlow_file.precision(15);
-
-    SurfFlow_file.open(cstr, ios::out);
-    
-    if (config->GetOutput_FileFormat() == PARAVIEW) {
-      SurfFlow_file << "# vtk DataFile Version 3.0" << endl;
-      SurfFlow_file << "vtk output" << endl;
-      SurfFlow_file << "ASCII" << endl;
-    }
-    else {
-      SurfFlow_file <<"TITLE = \"Surface Analysis\"" <<endl;
-      SurfFlow_file <<"VARIABLES = \"y(in)\", \"z(in)\", \"PT/PT<sub>inf</sub>\", \"TT/TT<sub>inf</sub>\", \"P/P<sub>inf</sub>\", \"T/T<sub>inf</sub>\", \"v<sub>x</sub>/v<sub>inf</sub>\", \"v<sub>y</sub>/v<sub>inf</sub>\", \"v<sub>z</sub>/v<sub>inf</sub>\", \"<greek>a</greek> (deg)\", \"<greek>b</greek> (deg)\", \"Mach\", \"Filtered <greek>a</greek> (deg)\", \"Filtered <greek>b</greek> (deg)\", \"Filtered Mach\"" << endl;
-    }
-    
-  }
-  
-  /*--- Loop over all the markers to analyze ---*/
-
-  for (iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++) {
-
-    string Analyze_TagBound = config->GetMarker_Analyze_TagBound(iMarker_Analyze);
-
-    nVertex_Surface = 0; nLocalVertex_Surface = 0; MaxLocalVertex_Surface = 0;
-
-    /*--- Find the max number of surface vertices among all
-     partitions and set up buffers. The master node will handle the
-     writing of the CSV file after gathering all of the data. ---*/
-
-    nLocalVertex_Surface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
-      if (Marker_TagBound == Analyze_TagBound) {
-        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface++;
-        }
-      }
-    }
-
-    /*--- Communicate the number of local vertices on each partition
-     to the master node ---*/
-    
-    Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-    if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
-
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-    SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    MaxLocalVertex_Surface = nLocalVertex_Surface;
-    Buffer_Recv_nVertex[MASTER_NODE] = Buffer_Send_nVertex[MASTER_NODE];
-#endif
-
-    /*--- Send and Recv buffers ---*/
-
-    su2double *Buffer_Send_Coord_x = NULL, *Buffer_Recv_Coord_x = NULL;
-    Buffer_Send_Coord_x = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_Coord_y = NULL, *Buffer_Recv_Coord_y = NULL;
-    Buffer_Send_Coord_y = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_Coord_z = NULL, *Buffer_Recv_Coord_z = NULL;
-    if (nDim == 3)  Buffer_Send_Coord_z = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_PT = NULL, *Buffer_Recv_PT = NULL;
-    Buffer_Send_PT = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_TT = NULL, *Buffer_Recv_TT = NULL;
-    Buffer_Send_TT = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_P = NULL, *Buffer_Recv_P = NULL;
-    Buffer_Send_P = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_T = NULL, *Buffer_Recv_T = NULL;
-    Buffer_Send_T = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Mach = NULL, *Buffer_Recv_Mach = NULL;
-    Buffer_Send_Mach = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_x = NULL, *Buffer_Recv_Vel_x = NULL;
-    Buffer_Send_Vel_x = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_y = NULL, *Buffer_Recv_Vel_y = NULL;
-    Buffer_Send_Vel_y = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_z = NULL, *Buffer_Recv_Vel_z = NULL;
-    if (nDim == 3) Buffer_Send_Vel_z = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_q = NULL, *Buffer_Recv_q = NULL;
-    Buffer_Send_q = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Area = NULL, *Buffer_Recv_Area = NULL;
-    Buffer_Send_Area = new su2double [MaxLocalVertex_Surface];
-    
-    /*--- Prepare the receive buffers on the master node only. ---*/
-    
-    if (rank == MASTER_NODE) {
-      Buffer_Recv_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-      if (nDim == 3) Buffer_Recv_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_PT = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_TT = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_P = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_T = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Mach = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Vel_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Vel_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-      if (nDim == 3) {
-        Buffer_Recv_Vel_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-      }
-      Buffer_Recv_q = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Area = new su2double [nProcessor*MaxLocalVertex_Surface];
-    }
-    
-    /*--- Loop over all vertices in this partition and load the
-     data of the specified type into the buffer to be sent to
-     the master node. ---*/
-    
-    nVertex_Surface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
-      if (Marker_TagBound == Analyze_TagBound) {
-        
-        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if (geometry->node[iPoint]->GetDomain()) {
-            
-            Buffer_Send_Coord_x[nVertex_Surface] = geometry->node[iPoint]->GetCoord(0);
-            Buffer_Send_Coord_y[nVertex_Surface] = geometry->node[iPoint]->GetCoord(1);
-            if (nDim == 3) { Buffer_Send_Coord_z[nVertex_Surface] = geometry->node[iPoint]->GetCoord(2); }
-            
-            Pressure         = solver->node[iPoint]->GetPressure();
-            Density          = solver->node[iPoint]->GetDensity();
-            Temperature      = solver->node[iPoint]->GetTemperature();
-            SoundSpeed       = solver->node[iPoint]->GetSoundSpeed();
-            Velocity2        = solver->node[iPoint]->GetVelocity2();
-            Mach             = sqrt(Velocity2)/SoundSpeed;
-            Gamma            = config->GetGamma();
-            
-            Mach_Inf         = config->GetMach();
-            Pressure_Inf     = config->GetPressure_FreeStreamND();
-            Temperature_Inf  = config->GetTemperature_FreeStreamND();
-            Velocity_Inf     = sqrt(config->GetVelocity_FreeStreamND()[0]*config->GetVelocity_FreeStreamND()[0]
-                                    + config->GetVelocity_FreeStreamND()[1]*config->GetVelocity_FreeStreamND()[1]
-                                    + config->GetVelocity_FreeStreamND()[2]*config->GetVelocity_FreeStreamND()[2]);
-            
-            Buffer_Send_P[nVertex_Surface] = Pressure / Pressure_Inf;
-            Buffer_Send_T[nVertex_Surface]     = Temperature / Temperature_Inf;
-            Buffer_Send_Mach[nVertex_Surface] = Mach;
-            
-            TotalPressure    = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
-            TotalPressure_Inf  = Pressure_Inf * pow( 1.0 + Mach_Inf * Mach_Inf * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
-            Buffer_Send_PT[nVertex_Surface] = TotalPressure / TotalPressure_Inf;
-            
-            TotalTemperature = Temperature * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
-            TotalTemperature_Inf  = Temperature_Inf * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
-            Buffer_Send_TT[nVertex_Surface] = TotalTemperature / TotalTemperature_Inf;
-            
-            Buffer_Send_Vel_x[nVertex_Surface] = solver->node[iPoint]->GetVelocity(0) / Velocity_Inf;
-            Buffer_Send_Vel_y[nVertex_Surface] = solver->node[iPoint]->GetVelocity(1) / Velocity_Inf;
-            if (nDim == 3) {
-              Buffer_Send_Vel_z[nVertex_Surface] = solver->node[iPoint]->GetVelocity(2) / Velocity_Inf;
-            }
-            
-            Buffer_Send_q[nVertex_Surface] = 0.5*Density*Velocity2;
-            
-            Vector = geometry->vertex[iMarker][iVertex]->GetNormal();
-            Area = 0.0; for (iDim = 0; iDim < nDim; iDim++) { Area += Vector[iDim]*Vector[iDim]; } Area = sqrt(Area);
-            Buffer_Send_Area[nVertex_Surface] = Area;
-            
-            /*--- If US system, the output should be in inches ---*/
-            
-            if (config->GetSystemMeasurements() == US) {
-              
-              Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
-              Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
-              if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
-              Buffer_Send_Area[nVertex_Surface] *= 144.0;
-              
-            }
-            
-            nVertex_Surface++;
-            
-          }
-        }
-        break;
-      }
-    }
-    
-    /*--- Send the information to the master node ---*/
-    
-#ifdef HAVE_MPI
-    
-    SU2_MPI::Gather(Buffer_Send_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_PT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_PT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_TT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_TT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_P, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_P, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_T, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_T, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_q, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_q, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Area, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Area, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    
-#else
-    
-    for (iVertex = 0; iVertex < MaxLocalVertex_Surface; iVertex++) {
-      Buffer_Recv_Coord_x[iVertex] = Buffer_Send_Coord_x[iVertex];
-      Buffer_Recv_Coord_y[iVertex] = Buffer_Send_Coord_y[iVertex];
-      if (nDim == 3) Buffer_Recv_Coord_z[iVertex] = Buffer_Send_Coord_z[iVertex];
-      Buffer_Recv_PT[iVertex] = Buffer_Send_PT[iVertex];
-      Buffer_Recv_TT[iVertex] = Buffer_Send_TT[iVertex];
-      Buffer_Recv_P[iVertex] = Buffer_Send_P[iVertex];
-      Buffer_Recv_T[iVertex] = Buffer_Send_T[iVertex];
-      Buffer_Recv_Mach[iVertex] = Buffer_Send_Mach[iVertex];
-      Buffer_Recv_Vel_x[iVertex] = Buffer_Send_Vel_x[iVertex];
-      Buffer_Recv_Vel_y[iVertex] = Buffer_Send_Vel_y[iVertex];
-      if (nDim == 3) Buffer_Recv_Vel_z[iVertex] = Buffer_Send_Vel_z[iVertex];
-      Buffer_Recv_q[iVertex] = Buffer_Send_q[iVertex];
-      Buffer_Recv_Area[iVertex] = Buffer_Send_Area[iVertex];
-    }
-    
-#endif
-    
-    if (rank == MASTER_NODE) {
-      
-      /*--- Compute the location of the critical points of the distortion measure, and center of gravity ---*/
-      
-      TotalArea = 0.0; xCoord_CG = 0.0; yCoord_CG = 0.0; zCoord_CG = 0.0; PT_Mean = 0.0; Mach_Mean = 0.0;  q_Mean = 0.0;
-      
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-          
-          /*--- Current index position and global index ---*/
-          
-          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-          
-          /*--- Retrieve the merged data for this node ---*/
-          
-          xCoord = Buffer_Recv_Coord_x[Total_Index];
-          yCoord = Buffer_Recv_Coord_y[Total_Index];
-          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-          PT   = Buffer_Recv_PT[Total_Index];
-          Mach = Buffer_Recv_Mach[Total_Index];
-          q    = Buffer_Recv_q[Total_Index];
-          
-          Area       = Buffer_Recv_Area[Total_Index];
-          TotalArea += Area;
-          xCoord_CG += xCoord*Area;
-          yCoord_CG += yCoord*Area;
-          zCoord_CG += zCoord*Area;
-          PT_Mean   += PT*Area;
-          Mach_Mean += PT*Area;
-          q_Mean    += q*Area;
-          
-        }
-      }
-      
-      /*--- Evaluate the area averaged pressure and CG ---*/
-      
-      xCoord_CG = xCoord_CG / TotalArea;
-      yCoord_CG = yCoord_CG / TotalArea;
-      zCoord_CG = zCoord_CG / TotalArea;
-      PT_Mean   /= TotalArea;
-      Mach_Mean /= TotalArea;
-      q_Mean    /=  TotalArea;
-      
-      /*--- If it is a half model, CGy = 0 ---*/
-      
-      if (Engine_HalfModel) { yCoord_CG = 0.0; }
-      
-      /*--- Compute hub and tip radius ---*/
-      
-      TipRadius = 1E-6; HubRadius = 1E6;
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-          
-          /*--- Current index position and global index ---*/
-          
-          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-          
-          /*--- Retrieve the merged data for this node ---*/
-          
-          xCoord = Buffer_Recv_Coord_x[Total_Index];
-          yCoord = Buffer_Recv_Coord_y[Total_Index];
-          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-          
-          if (nDim == 2)
-            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
-                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord));
-          
-          if (nDim == 3)
-            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
-                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord) +
-                            (zCoord_CG-zCoord)*(zCoord_CG-zCoord));
-          
-          if (Distance > TipRadius) TipRadius = Distance;
-          if (Distance < HubRadius) HubRadius = Distance;
-          
-        }
-      }
-      
-      if (HubRadius/TipRadius < 0.05) HubRadius = 0.0;
-      
-      /*--- Evaluate the DC60 parameter ---*/
-      
-      Theta = Theta_DC60;
-      nStation = nStation_DC60;
-      
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      r = new su2double [nStation+1];
-      
-      /*--- Allocate memory ---*/
-      
-      PT_Sector = new su2double [nAngle];
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [5];
-        }
-      }
-      
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius; r[nStation] = TipRadius;
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
-      
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
-        
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
-        
-      }
-      
-      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-                ProbeArray[iAngle][iStation][4] = Buffer_Recv_q[Total_Index];
-              }
-              
-            }
-          }
-          
-        }
-        
-      }
-      
-      /*--- Evaluate the average pressure at each sector, fan face and dynamic pressure ---*/
-      
-      PT_Mean = 0.0; q_Mean = 0.0;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        PT_Sector[iAngle] = 0.0;
-        for (iStation = 0; iStation < nStation; iStation++) {
-          PT_Sector[iAngle] += ProbeArray[iAngle][iStation][3]/float(nStation);
-          PT_Mean           += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-          q_Mean            += ProbeArray[iAngle][iStation][4]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Compute the min value of the averaged pressure at each sector ---*/
-      
-      PT_Sector_Min = PT_Sector[0];
-      for (iAngle = 1; iAngle < nAngle; iAngle++) {
-        if (PT_Sector[iAngle] <= PT_Sector_Min) PT_Sector_Min = PT_Sector[iAngle];
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      Mach_Inf           = config->GetMach();
-      Gamma              = config->GetGamma();
-      TotalPressure_Inf  = config->GetPressure_FreeStreamND() * pow( 1.0 + Mach_Inf * Mach_Inf *
-                                                                    0.5 * (Gamma - 1.0), Gamma    / (Gamma - 1.0));
-      
-      if (q_Mean != 0.0) DC60 = ((PT_Mean - PT_Sector_Min)*TotalPressure_Inf)/q_Mean;
-      else DC60 = 0.0;
-      
-      config->SetSurface_DC60(iMarker_Analyze, DC60);
-      
-      solver->SetTotal_DC60(DC60);
-      
-      /*--- Deallocate the memory ---*/
-      
-      delete[] r;
-      
-      delete [] PT_Sector;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
-      }
-      delete[] ProbeArray;
-      
-      
-      /*--- Evaluate the IDC, and IDR parameters ---*/
-      
-      nStation = SU2_TYPE::Int(config->GetDistortionRack()[0]);
-      Theta = SU2_TYPE::Int(config->GetDistortionRack()[1]);
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      
-      /*--- Allocate memory ---*/
-      
-      r = new su2double [nStation+1];
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [4];
-        }
-      }
-      
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius; r[nStation] = TipRadius;
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
+    
+    /*--- Laminar Viscosity ---*/
+    
+    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
       
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
         
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
+        /*--- Check for halos & write only if requested ---*/
         
-      }
-      
-      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
           
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-              }
-              
-            }
-          }
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
           
+          Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity();
+
+          jPoint++;
         }
-        
-      }
-      
-      /*--- Evaluate the average and min. pressure at each station/radius and fan  ---*/
-      
-      PT_Station = new su2double [nStation];
-      PT_Station_Min = new su2double [nStation];
-      
-      PT_Mean = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        PT_Station[iStation] = 0.0;
-        PT_Station_Min[iStation] = ProbeArray[0][iStation][3];
-        for (iAngle = 0; iAngle < nAngle; iAngle++) {
-          PT = ProbeArray[iAngle][iStation][3];
-          PT_Station[iStation] += PT / float(nAngle);
-          if (PT <= PT_Station_Min[iStation] ) PT_Station_Min[iStation] = PT;
-          PT_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      IDC = 0.0;
-      for (iStation = 0; iStation < nStation-1; iStation++) {
-        IDC = max (IDC, 0.5*((PT_Station[iStation] - PT_Station_Min[iStation])/PT_Mean
-                             + (PT_Station[iStation+1] - PT_Station_Min[iStation+1])/PT_Mean) );
-        
-      }
-      
-      config->SetSurface_IDC(iMarker_Analyze, IDC);
-      solver->SetTotal_IDC(IDC);
-      
-      IDR = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        IDR = max (IDR, (PT_Mean-PT_Station[iStation])/PT_Mean);
       }
       
-      config->SetSurface_IDR(iMarker_Analyze, IDR);
-      
-      solver->SetTotal_IDR(IDR);
-      
-      /*--- Release IDX parameters ---*/
-      
-      delete [] PT_Station_Min;
-      delete [] PT_Station;
+      /*--- Gather the data on the master node. ---*/
       
-      /*--- Evaluate the IDC Mach parameter ---*/
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+#endif
       
-      /*--- Compute the Mach number at each probe, closes grid point to the location ---*/
+      /*--- The master node unpacks and sorts this variable by global index ---*/
       
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy;
-              if (nDim == 3) Distance += dz*dz;
-              Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_Mach[Total_Index];
-              }
-              
-            }
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Lam;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            jPoint++;
           }
           
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
-        
-      }
-      
-      /*--- Evaluate the average and min. pressure at each station/radius and fan face ---*/
-      
-      Mach_Station = new su2double [nStation];
-      Mach_Station_Min = new su2double [nStation];
-      
-      Mach_Mean = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        Mach_Station[iStation] = 0.0;
-        Mach_Station_Min[iStation] = ProbeArray[0][iStation][3];
-        for (iAngle = 0; iAngle < nAngle; iAngle++) {
-          Mach = ProbeArray[iAngle][iStation][3];
-          Mach_Station[iStation] += Mach / float(nAngle);
-          if (Mach <= Mach_Station_Min[iStation] ) Mach_Station_Min[iStation] = Mach;
-          Mach_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      IDC_Mach = 0.0;
-      for (iStation = 0; iStation < nStation-1; iStation++) {
-        if (Mach_Mean != 0)
-          IDC_Mach = max (IDC_Mach, 0.5*((Mach_Station[iStation] - Mach_Station_Min[iStation])/Mach_Mean
-                                         + (Mach_Station[iStation+1] - Mach_Station_Min[iStation+1])/Mach_Mean)   );
-        
       }
       
-      config->SetSurface_IDC_Mach(iMarker_Analyze, IDC_Mach);
-      
-      solver->SetTotal_IDC_Mach(IDC_Mach);
-      
-      delete [] Mach_Station_Min;
-      delete [] Mach_Station;
+      /*--- Communicate skin friction ---*/
       
-      /*--- Release distortion parameters ---*/
+      /*--- First, loop through the mesh in order to find and store the
+       value of the viscous coefficients at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
       
-      delete[] r;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        Aux_Frict_x[iPoint] = 0.0;
+        Aux_Frict_y[iPoint] = 0.0;
+        Aux_Frict_z[iPoint] = 0.0;
       }
-      delete[] ProbeArray;
-      
-      /*--- Create the distortion plot ---*/
-      
-      Theta = 10; nStation = 20;
-      
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      r = new su2double [nStation+1];
-      
-      /*--- Allocate memory ---*/
-      
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [11];
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
+            Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
+            if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
+          }
         }
-      }
       
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius;
-      r[nStation] = TipRadius;
-      
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
-      
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
         
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
+        /*--- Check for halos & write only if requested ---*/
         
-      }
-      
-      /*--- Compute the primitieve variables, closest grid point to the location + gradient ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
           
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              SignFlip = 1.0;
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord);
-                dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  SignFlip = -1.0;
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-                ProbeArray[iAngle][iStation][4] = Buffer_Recv_TT[Total_Index];
-                ProbeArray[iAngle][iStation][5] = Buffer_Recv_P[Total_Index];
-                ProbeArray[iAngle][iStation][6] = Buffer_Recv_T[Total_Index];
-                ProbeArray[iAngle][iStation][7] = Buffer_Recv_Mach[Total_Index];
-                ProbeArray[iAngle][iStation][8] = Buffer_Recv_Vel_x[Total_Index];
-                ProbeArray[iAngle][iStation][9] =  SignFlip * Buffer_Recv_Vel_y[Total_Index];
-                if (nDim == 3) ProbeArray[iAngle][iStation][10] = Buffer_Recv_Vel_z[Total_Index];
-              }
-              
-            }
-          }
+          /*--- Load buffers with the three grid velocity components. ---*/
           
+          Buffer_Send_Var[jPoint] = Aux_Frict_x[iPoint];
+          Buffer_Send_Res[jPoint] = Aux_Frict_y[iPoint];
+          if (geometry->GetnDim() == 3)
+            Buffer_Send_Vol[jPoint] = Aux_Frict_z[iPoint];
+          jPoint++;
         }
-        
       }
       
-      /*--- Reverse in the Y direction to move the solution from 3D to 2D ---*/
-      
-      yCoord_CG = -yCoord_CG;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation][9] = -ProbeArray[iAngle][iStation][9];
-          ProbeArray[iAngle][iStation][1] = -ProbeArray[iAngle][iStation][1];
-        }
-      }
+      /*--- Gather the data on the master node. ---*/
       
-      if (output) {
-        
-        if (config->GetOutput_FileFormat() == PARAVIEW) {
-          
-          SurfFlow_file << "\nDATASET UNSTRUCTURED_GRID" << endl;
-          SurfFlow_file <<"POINTS " << nAngle*nStation << " float" << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][1]-yCoord_CG << " " << ProbeArray[iAngle][iStation][2]-zCoord_CG << " 0.0 " <<" ";
-            }
-          }
-          
-          SurfFlow_file <<"\nCELLS " << nAngle*(nStation-1) <<" "<< nAngle*(nStation-1)*5 << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
-              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
-              SurfFlow_file << "4 " << a  <<" "<< b <<" "<< c <<" "<< d <<" ";
-            }
-          }
-          
-          SurfFlow_file <<"\nCELL_TYPES " << nAngle*(nStation-1) << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              SurfFlow_file << "9 " ;
-            }
-          }
-          
-          SurfFlow_file <<"\nPOINT_DATA " << nAngle*nStation << endl;
-          SurfFlow_file <<"SCALARS PT/PT_inf float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][3] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS TT/TT_inf float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][4] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Alpha float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              SurfFlow_file << Alpha << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Beta float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              SurfFlow_file << Beta << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Mach float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][7] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"VECTORS Velocity float" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][8] << " " << ProbeArray[iAngle][iStation][9] << " " << ProbeArray[iAngle][iStation][10] << " ";
-            }
-          }
-          
-        }
-        else {
-          
-          SurfFlow_file <<"ZONE T= \"" << Analyze_TagBound <<"\", NODES=" << nAngle*nStation << " , ELEMENTS= " << nAngle*(nStation-1) <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              
-              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              
-              Mach_ij = ProbeArray[iAngle][iStation][7];
-              if (iAngle+1 != nAngle) Mach_ip1j = ProbeArray[iAngle+1][iStation][7];
-              else Mach_ip1j = ProbeArray[0][iStation][7];
-              if (iAngle-1 != -1) Mach_im1j = ProbeArray[iAngle-1][iStation][7];
-              else Mach_im1j = ProbeArray[nAngle-1][iStation][7];
-              if (iStation+1 != nStation) Mach_ijp1 = ProbeArray[iAngle][iStation+1][7];
-              else Mach_ijp1 = ProbeArray[iAngle][0][7];
-              if (iStation-1 != -1) Mach_ijm1 = ProbeArray[iAngle][iStation-1][7];
-              else Mach_ijm1 = ProbeArray[iAngle][nStation-1][7];
-              Filtered_Mach = (4.0*Mach_ij+Mach_ip1j+Mach_im1j+Mach_ijp1+Mach_ijm1)/8.0;
-              
-              Alpha_ij = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle+1 != nAngle) Alpha_ip1j = atan(ProbeArray[iAngle+1][iStation][10]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ip1j = atan(ProbeArray[0][iStation][10]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle-1 != -1) Alpha_im1j = atan(ProbeArray[iAngle-1][iStation][10]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_im1j = atan(ProbeArray[nAngle-1][iStation][10]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation+1 != nStation) Alpha_ijp1 = atan(ProbeArray[iAngle][iStation+1][10]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ijp1 = atan(ProbeArray[iAngle][0][10]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation-1 != -1) Alpha_ijm1 = atan(ProbeArray[iAngle][iStation-1][10]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ijm1 = atan(ProbeArray[iAngle][nStation-1][10]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
-              Filtered_Alpha = (4.0*Alpha_ij+Alpha_ip1j+Alpha_im1j+Alpha_ijp1+Alpha_ijm1)/8.0;
-              
-              Beta_ij = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle+1 != nAngle) Beta_ip1j = atan(ProbeArray[iAngle+1][iStation][9]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ip1j = atan(ProbeArray[0][iStation][9]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle-1 != -1) Beta_im1j = atan(ProbeArray[iAngle-1][iStation][9]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_im1j = atan(ProbeArray[nAngle-1][iStation][9]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation+1 != nStation) Beta_ijp1 = atan(ProbeArray[iAngle][iStation+1][9]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ijp1 = atan(ProbeArray[iAngle][0][9]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation-1 != -1) Beta_ijm1 = atan(ProbeArray[iAngle][iStation-1][9]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ijm1 = atan(ProbeArray[iAngle][nStation-1][9]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
-              Filtered_Beta = (4.0*Beta_ij+Beta_ip1j+Beta_im1j+Beta_ijp1+Beta_ijm1)/8.0;
-              
-              
-              SurfFlow_file
-              << " "  << ProbeArray[iAngle][iStation][1]-yCoord_CG
-              <<" " << ProbeArray[iAngle][iStation][2]-zCoord_CG
-              <<" " << ProbeArray[iAngle][iStation][3] <<" " << ProbeArray[iAngle][iStation][4]
-              <<" " << ProbeArray[iAngle][iStation][5] <<" " << ProbeArray[iAngle][iStation][6]
-              <<" " << ProbeArray[iAngle][iStation][8] <<" " << ProbeArray[iAngle][iStation][9]
-              <<" " << ProbeArray[iAngle][iStation][10]
-              <<" " << Alpha <<" " << Beta << " " << ProbeArray[iAngle][iStation][7]
-              <<" " << Filtered_Alpha <<" " << Filtered_Beta << " " << Filtered_Mach << endl;
-              
-            }
-          }
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
-              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
-              SurfFlow_file << a+1  <<" "<< b+1  <<" "<< c+1 <<" "<< d+1 << endl;
-            }
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+          Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0;
+        iVar = iVar_ViscCoeffs;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar + 2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
           }
           
-          /*--- Add extra info ---*/
-          
-          SurfFlow_file << "TEXT X=14, Y=86, F=HELV-BOLD, C=BLUE, H=2.0, ";
-          unsigned short RackProbes = SU2_TYPE::Int(config->GetDistortionRack()[0]);
-          unsigned short RackAngle = SU2_TYPE::Int(config->GetDistortionRack()[1]);
-          SurfFlow_file << "T=\"Rack Size: " << RackProbes << " probes at "<< RackAngle << "deg." << "\\" << "\\n";
-          SurfFlow_file << "Mach " << config->GetMach() << ", Reynolds " << config->GetReynolds() << ", <greek>a</greek> "
-          << config->GetAoA() << "deg, <greek>b</greek> " << config->GetAoS() << "deg." << "\\" << "\\n";
-          SurfFlow_file.precision(1);
-          SurfFlow_file << fixed << "Net Thrust " << solver->GetTotal_NetThrust() << "lbs, Power " << solver->GetTotal_Power() <<  "HP";
-          SurfFlow_file.precision(4);
-          SurfFlow_file << ", MassFlow " << config->GetSurface_MassFlow(iMarker_Analyze) << ",\\" << "\\n";
-          SurfFlow_file << "IDC " << config->GetSurface_IDC(iMarker_Analyze)*100 << "%, IDCM " << config->GetSurface_IDC_Mach(iMarker_Analyze)*100 << "%, IDR " << config->GetSurface_IDR(iMarker_Analyze)*100 << "%,\\" << "\\n";
-          SurfFlow_file << "DC60 " << config->GetSurface_DC60(iMarker_Analyze) << ".\"" << endl;
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
           
+          jPoint = (iProcessor + 1) * nBuffer_Scalar;
         }
-        
       }
-
-      /*--- Release the recv buffers on the master node ---*/
-      
-      delete [] Buffer_Recv_Coord_x;
-      delete [] Buffer_Recv_Coord_y;
-      if (nDim == 3) delete [] Buffer_Recv_Coord_z;
       
-      delete [] Buffer_Recv_PT;
-      delete [] Buffer_Recv_TT;
-      delete [] Buffer_Recv_P;
-      delete [] Buffer_Recv_T;
-      delete [] Buffer_Recv_Mach;
-      delete [] Buffer_Recv_Vel_x;
-      delete [] Buffer_Recv_Vel_y;
-      if (nDim == 3) delete [] Buffer_Recv_Vel_z;
-      delete [] Buffer_Recv_q;
-      
-      delete [] Buffer_Recv_Area;
+      /*--- Communicate heat transfer, y+ ---*/
       
-      delete [] Buffer_Recv_nVertex;
+      /*--- First, loop through the mesh in order to find and store the
+       value of the viscous coefficients at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
       
-      delete[] r;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        Aux_Heat[iPoint] = 0.0;
+        Aux_yPlus[iPoint] = 0.0;
       }
-      delete[] ProbeArray;
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
+            Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
+          }
+        }
       
-    }
-    
-//    if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint()) {
-//
-//      cout << "Surface ("<< Analyze_TagBound << "): ";
-//      cout.precision(4);
-//      cout.setf(ios::fixed, ios::floatfield);
-//      cout << setprecision(1) << "IDC " << 100*config->GetSurface_IDC(iMarker_Analyze)
-//      << "%. IDC Mach " << 100*config->GetSurface_IDC_Mach(iMarker_Analyze)
-//      << "%. IDR " << 100*config->GetSurface_IDR(iMarker_Analyze)
-//      << "%. DC60 " << config->GetSurface_DC60(iMarker_Analyze) << "." << endl;
-//
-//    }
-    
-    /*--- Release the memory for the remaining buffers and exit ---*/
-    
-    delete [] Buffer_Send_Coord_x;
-    delete [] Buffer_Send_Coord_y;
-    if (nDim == 3) delete [] Buffer_Send_Coord_z;
-    
-    delete [] Buffer_Send_PT;
-    delete [] Buffer_Send_TT;
-    delete [] Buffer_Send_P;
-    delete [] Buffer_Send_T;
-    delete [] Buffer_Send_Mach;
-    delete [] Buffer_Send_Vel_x;
-    delete [] Buffer_Send_Vel_y;
-    if (nDim == 3) delete [] Buffer_Send_Vel_z;
-    delete [] Buffer_Send_q;
-    
-    delete [] Buffer_Send_Area;
-    
-  }
-  
-  /*--- Close the tecplot  file ---*/
-  
-  if (output) {
-    SurfFlow_file.close();
-  }
-
-}
-
-void COutput::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geometry, CSolver *****solver_container,
-                                CConfig **config, CIntegration ****integration, unsigned long iExtIter,
-                                unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT, bool header) {
-
-  int rank = MASTER_NODE;
-#ifdef HAVE_MPI
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-#endif
-
-  /*--- Output only using the Master Node ---*/
-
-  if ((rank == MASTER_NODE) && (header)){
-
-    char cstr[200], buffer[50], turb_resid[1000];
-    string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-    bool turbulent = ((config[ZONE_FLOW]->GetKind_Solver() == RANS) || (config[ZONE_FLOW]->GetKind_Solver() == ADJ_RANS) ||
-                       (config[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS));
-
-    unsigned short direct_diff = config[ZONE_FLOW]->GetDirectDiff();
-
-    /*--- Write file name with extension ---*/
-    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
-    strcpy (cstr, filename.data());
-
-    if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
-      long iExtIter = config[ZONE_FLOW]->GetUnst_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(cstr, buffer);
-    }
-
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".vtk");
-    strcat(cstr, buffer);
-
-    FSIHist_file->open(cstr, ios::out);
-    FSIHist_file->precision(15);
-
-    /*--- Begin of the header ---*/
-
-    char begin[]= "\"ExtIter\",\"BGSIter\"";
-
-    /*--- Header for the coefficients ---*/
-
-    char flow_coeff[]= ",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CL/CD\"";
-    char fem_coeff[]= ",\"VM_Stress\"";
-    char of_1[] = ",\"TgtGeom\"";
-    char of_2[] = ",\"TgtNode\"";
-
-    char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-
-     /*--- Header for the residuals ---*/
-
-    char fsi_resid[]= ",\"Res_FSI\",\"RelaxCoeff\",\"ForceCoeff\"";
-
-    char flow_resid[]= ",\"Res_BGS[F0]\",\"Res_BGS[F1]\",\"Res_BGS[F2]\",\"Res_BGS[F3]\",\"Res_BGS[F4]\"";
-    char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-    char fem_resid[]= ",\"Res_BGS[S0]\",\"Res_BGS[S1]\",\"Res_BGS[S2]\"";
-
-    /*--- End of the header ---*/
-
-    char end[]= ",\"Time(min)\"\n";
-
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-        FSIHist_file[0] << "TITLE = \"SU2 FSI Simulation\"" << endl;
-        FSIHist_file[0] << "VARIABLES = ";
-    }
-
-    /*--- Write the header, case depending ---*/
-
-    FSIHist_file[0] << begin;
-
-    FSIHist_file[0] << fsi_resid;
-
-    switch (config[ZONE_FLOW]->GetKind_Solver()) {
-
-      /*--- Flow residual output ---*/
-
-      case EULER : case NAVIER_STOKES: case RANS :
-        FSIHist_file[0] << flow_resid;
-        if (turbulent) FSIHist_file[0] << turb_resid;
-      break;
-
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        FSIHist_file[0] << adj_flow_resid;
-        break;
-
-     }
-
-    /*--- FEA residual output ---*/
-
-     switch (config[ZONE_STRUCT]->GetKind_Solver()) {
-
-       case FEM_ELASTICITY:
-         FSIHist_file[0] << fem_resid;
-         break;
-
-       case DISC_ADJ_FEM:
-         FSIHist_file[0] << fem_resid ;
-         break;
-
-     }
-
-     /*--- Flow coefficients output ---*/
-     switch (config[ZONE_FLOW]->GetKind_Solver()) {
-
-     case EULER : case NAVIER_STOKES: case RANS :
-       FSIHist_file[0] << flow_coeff;
-       if (turbulent) FSIHist_file[0] << turb_resid;
-       if (direct_diff != NO_DERIVATIVE) {
-         FSIHist_file[0] << d_flow_coeff;
-       }
-       break;
-
-       case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-         FSIHist_file[0] << adj_flow_resid;
-         break;
-
-      }
-
-      switch (config[ZONE_STRUCT]->GetKind_Solver()) {
-
-        case FEM_ELASTICITY:
-          FSIHist_file[0] << fem_coeff;
-          break;
-
-        case DISC_ADJ_FEM:
-          FSIHist_file[0] << fem_coeff;
-          break;
-
-      }
-
-      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
-        case REFERENCE_GEOMETRY:
-          FSIHist_file[0] << of_1;
-          break;
-        case REFERENCE_NODE:
-          FSIHist_file[0] << of_2;
-          break;
-        default:
-          break;
-      }
-
-     FSIHist_file[0] << end;
-
-
-  }
-
-  if ((rank == MASTER_NODE) && (!header)){
-
-      unsigned short nDim = geometry[ZONE_STRUCT][INST_0][MESH_0]->GetnDim();
-
-      unsigned long iExtIter = config[ZONE_STRUCT]->GetExtIter();
-      unsigned long ExtIter_OffSet = config[ZONE_STRUCT]->GetExtIter_OffSet();
-      unsigned long iFSIIter = config[ZONE_STRUCT]->GetFSIIter();
-      su2double dummy = 0.0;
-
-      bool first_iter = ((iExtIter==0) && (iFSIIter == 0));
-
-
-      bool compressible = (config[ZONE_FLOW]->GetKind_Regime() == COMPRESSIBLE);
-      bool incompressible = (config[ZONE_FLOW]->GetKind_Regime() == INCOMPRESSIBLE);
-
-
-      bool fem = ((config[ZONE_STRUCT]->GetKind_Solver() == FEM_ELASTICITY) ||
-              (config[ZONE_STRUCT]->GetKind_Solver() == DISC_ADJ_FEM));
-      bool linear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == SMALL_DEFORMATIONS);
-      bool nonlinear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == LARGE_DEFORMATIONS);
-
-      bool disc_adj_flow = config[ZONE_FLOW]->GetDiscrete_Adjoint();
-      bool disc_adj_fem = config[ZONE_STRUCT]->GetDiscrete_Adjoint();
-
-
-      /*--- WARNING: These buffers have hard-coded lengths. Note that you
-       may have to adjust them to be larger if adding more entries. ---*/
-
-      char begin[1000], direct_coeff[1000],
-      fsi_resid[1000], fsi_coeffs[1000],
-      flow_resid[1000], fem_resid[1000],
-      objective_function[1000], end[1000];
-
-      su2double *residual_flow         = NULL;
-      su2double *residual_fem          = NULL;
-      su2double *residual_fsi          = NULL;
-      su2double *coeffs_fsi            = NULL;
-
-      /*--- Initialize number of variables ---*/
-      unsigned short nVar_FSI = 1, nCoeff_FSI = 2, nVar_Flow = 0, nVar_FEM = 0;
-
-      unsigned short iVar;
-
-      /*--- Direct problem variables ---*/
-      if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+1;
-
-      if (fem) {
-        if (linear_analysis) nVar_FEM = nDim;
-        if (nonlinear_analysis) nVar_FEM = 3;
-        if (disc_adj_fem) nVar_FEM = nDim;
-      }
-
-      residual_flow       = new su2double[nVar_Flow];
-      residual_fem        = new su2double[nVar_FEM];
-      residual_fsi        = new su2double[nVar_FSI];
-      coeffs_fsi          = new su2double[nCoeff_FSI];
-
-      /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-      su2double Total_CL = 0.0, Total_CD = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-                Total_OF = 0.0;
-
-      Total_CL       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CL();
-      Total_CD       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CD();
-      Total_CEff     = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CEff();
-      Total_CMx      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMx();
-      Total_CMy      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMy();
-      Total_CMz      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMz();
-
-      bool print_of = false;
-
-      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
-        case REFERENCE_GEOMETRY:
-          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefGeom();
-          print_of = true;
-          break;
-        case REFERENCE_NODE:
-          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefNode();
-          print_of = true;
-          break;
-        default:
-          break;
-      }
-
-      if ((!disc_adj_flow) && (!disc_adj_fem)){
-        /*--- Flow Residuals ---*/
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetRes_BGS(iVar);
-
-        /*--- FEA Residuals ---*/
-        for (iVar = 0; iVar < nVar_FEM; iVar++)
-          residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRes_BGS(iVar);
-
-        residual_fsi[0] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetFSI_Residual();
-        coeffs_fsi[0]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRelaxCoeff();
-        coeffs_fsi[1]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
-
-      }
-      else{
-          /*--- Flow Residuals ---*/
-          for (iVar = 0; iVar < nVar_Flow; iVar++)
-            residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_BGS(iVar);
-          /*--- FEA Residuals ---*/
-          for (iVar = 0; iVar < nVar_FEM; iVar++)
-            residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_BGS(iVar);
-      }
-
-      /*--- Write the begining of the history file ---*/
-      SPRINTF(begin, "%12d, %12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet), SU2_TYPE::Int(iFSIIter));
-      /*--- Write the end of the history file ---*/
-      SPRINTF (end, "\n");
-
-      SPRINTF (fsi_resid, ", %14.8e", log10 (residual_fsi[0]));
-      SPRINTF (fsi_coeffs, ", %14.8e,  %14.8e", coeffs_fsi[0], coeffs_fsi[1]);
-
-      /*--- Flow residual ---*/
-      if (nDim == 2) {
-        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), dummy, dummy);
-      }
-      else {
-        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-      }
-
-      /*--- FEM residual ---*/
-      if (nDim == 2) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-      else SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[1]));
-
-      /*--- Direct coefficients ---*/
-      SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",Total_CL, Total_CD, Total_CMx, Total_CMy, Total_CMz, Total_CEff);
-
-      if (print_of) SPRINTF (objective_function, ", %14.8e", Total_OF);
-
-      if (!first_iter){
-          if (!print_of) FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << end;
-          else FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << objective_function << end;
-            FSIHist_file[0].flush();
-      }
-
-      delete [] residual_flow;
-      delete [] residual_fem;
-      delete [] residual_fsi;
-      delete [] coeffs_fsi;
-
-
-  }
-
-}
-
-void COutput::SetSensitivity_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone) {
-
-  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
-  unsigned long iVertex, iPoint, nPoint, nVertex;
-  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
-
-  unsigned short iZone;
-
-  CSolver **solver = new CSolver*[val_nZone];
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-
-    nPoint = geometry[iZone]->GetnPoint();
-    nDim   = geometry[iZone]->GetnDim();
-    nMarker = config[iZone]->GetnMarker_All();
-    nVar = nDim + 1;
-
-    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
-
-    vector<string> fieldnames;
-    fieldnames.push_back("\"Point\"");
-    fieldnames.push_back("\"x\"");
-    fieldnames.push_back("\"y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"z\"");
-    }
-    fieldnames.push_back("\"Sensitivity_x\"");
-    fieldnames.push_back("\"Sensitivity_y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"Sensitivity_z\"");
-    }
-    fieldnames.push_back("\"Surface_Sensitivity\"");
-
-    solver[iZone] = new CBaselineSolver(geometry[iZone], config[iZone], nVar+nDim, fieldnames);
-
-    for (iPoint = 0; iPoint < nPoint; iPoint++) {
-      for (iDim = 0; iDim < nDim; iDim++) {
-        solver[iZone]->node[iPoint]->SetSolution(iDim, geometry[iZone]->node[iPoint]->GetCoord(iDim));
-      }
-      for (iVar = 0; iVar < nDim; iVar++) {
-        solver[iZone]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone]->GetSensitivity(iPoint, iVar));
-      }
-    }
-
-    /*--- Compute the sensitivity in normal direction ---*/
-
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX ) ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL ) ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL )) {
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
         
-        nVertex = geometry[iZone]->GetnVertex(iMarker);
-
-        for (iVertex = 0; iVertex < nVertex; iVertex++) {
-          iPoint = geometry[iZone]->vertex[iMarker][iVertex]->GetNode();
-          Normal = geometry[iZone]->vertex[iMarker][iVertex]->GetNormal();
-          Prod = 0.0;
-          Area = 0.0;
-          for (iDim = 0; iDim < nDim; iDim++) {
-
-            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
-
-            SensDim = geometry[iZone]->GetSensitivity(iPoint, iDim);
-
-            /*--- Calculate scalar product for projection onto the normal vector ---*/
-
-            Prod += Normal[iDim]*SensDim;
-
-            Area += Normal[iDim]*Normal[iDim];
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          if (compressible) {
+            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
+            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
           }
+          if (incompressible) {
+            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
+            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
+          }
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0;
+        iVar = iVar_HeatCoeffs;
 
-          Area = sqrt(Area);
-
-          /*--- Projection of the gradient onto the normal vector of the surface ---*/
-
-          Sens = Prod/Area;
-
-          solver[iZone]->node[iPoint]->SetSolution(2*nDim, Sens);
-
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar + 0][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor + 1) * nBuffer_Scalar;
         }
       }
     }
-  }
-
-  /*--- Merge the information and write the output files ---*/
-
-  SetBaselineResult_Files(&solver, &geometry, config, 0, val_nZone);
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    delete solver[iZone];
-  }
-  delete [] solver;
-}
-
-void COutput::WriteTurboPerfConvHistory(CConfig *config){
-
-  unsigned short iMarker_Monitoring;
-  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
-  unsigned short nZone       = config->GetnZone();
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool menter_sst       = (config->GetKind_Turb_Model() == SST);
-
-  unsigned short nBladesRow, nStages;
-  unsigned short iStage;
-  nBladesRow = config->GetnMarker_Turbomachinery();
-  nStages    = SU2_TYPE::Int(nBladesRow/2);
+    
+    
+    /*--- Communicate the Eddy Viscosity ---*/
+    
+    if (Kind_Solver == RANS) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the pressure and mach variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity();
 
-  cout << endl << "------------------------- Turbomachinery Summary ------------------------" << endl;
-  cout << endl;
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Turbomachinery(); iMarker_Monitoring++){
-    cout << endl << "----------------------------- Blade " << iMarker_Monitoring + 1 << " -----------------------------------" << endl;
-    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring);
-    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iMarker_Monitoring);
-    if(iMarker_Monitoring == 0){
-      cout << "BC Inlet convergence monitoring marker " << inMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Inlet Total Enthalpy" << "     Inlet Total Enthalpy BC" << "     err(%)" <<  endl;
-      cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-      cout.width(25); cout << TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-      cout.width(25); cout << abs((TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Inlet Entropy" << "            Inlet Entropy BC" << "            err(%)" <<  endl;
-      cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Inlet Absolute Angle" << "     Inlet Absolute Angle BC" << "     err(%)" <<  endl;
-      cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-      cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-      cout.width(25); cout << abs((AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      if(turbulent){
-        if(menter_sst){
-          cout << "     Inlet TurbIntensity" << "      Inlet TurbIntensity BC" << "      err(%)" <<  endl;
-          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetTurbulenceIntensity_FreeStream();
-          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurbulenceIntensity_FreeStream())/config->GetTurbulenceIntensity_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
-          cout << "     Inlet Turb2LamRatio" << "      Inlet Turb2LamRatio BC" << "      err(%)" <<  endl;
-          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetTurb2LamViscRatio_FreeStream();
-          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurb2LamViscRatio_FreeStream())/config->GetTurb2LamViscRatio_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
+          jPoint++;
         }
-        else{
-          cout << "     Inlet Nu Factor" << "          Inlet Nu Factor BC" << "          err(%)" <<  endl;
-          cout.width(25); cout << NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetNuFactor_FreeStream();
-          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetNuFactor_FreeStream())/config->GetNuFactor_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Eddy;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
       }
+      
     }
-    if(iMarker_Monitoring == config->GetnMarker_Turbomachinery() -1 ){
-      // if BC outlet
-      cout << "BC outlet convergence monitoring  marker " << outMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Outlet Pressure" << "          Outlet Pressure BC" << "          err(%)" <<  endl;
-      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << abs((PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-    }
-
-    cout << "Convergence monitoring for integral quantities between markers " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Inlet Mass Flow " << "         Outlet Mass Flow" << "            err(%)" <<  endl;
-    cout.width(25); cout << MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
-    cout.width(25); cout << MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
-    cout.width(25); cout << abs((MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-    cout << endl;
-    cout << endl;
-    //if(stator)
-    //cout << "     Inlet Total Enthalpy " << "    Outlet Total Enthalpy" << "     err(%)" <<  endl;
-    //else
-    cout << "     Inlet Total Rothalpy " << "    Outlet Total Rothalpy" << "       err(%)" <<  endl;
-    cout.width(25); cout << RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << abs((RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "Blade performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Total Pressure Loss(%)" << "   Kinetic Energy Loss(%)" << "      Entropy Generation(%)" << endl;
-    cout.width(25); cout << TotalPressureLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout.width(25); cout << KineticEnergyLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout.width(25); cout << EntropyGen[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "     Total Inlet Enthalpy" << "     Eulerian Work" << "               Pressure Ratio" <<  endl;
-    cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << EulerianWork[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << PressureRatio[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl;
-    cout << "     Inlet Entropy" << "            Outlet Entropy" << "             Outlet Is. Enthalpy" <<  endl;
-    cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-    cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-    cout.width(25); cout << EnthalpyOutIs[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout << endl;
-    cout << endl;
-    cout << "Cinematic quantities between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Inlet Mach"<< "               Inlet Normal Mach" << "            Inlet Tang. Mach" << endl;
-    cout.width(25); cout << sqrt(MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
-    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
-    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];
-    cout << endl;
-    cout << endl;
-    cout << "     Outlet Mach"<< "              Outlet Normal Mach" << "           Outlet Tang. Mach" << endl;
-    cout.width(25); cout << sqrt(MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
-    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
-    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];cout << endl;
-    cout << endl;
-    cout << "     Inlet Flow Angle" << "         Outlet flow Angle  " << endl;
-    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl;
-    // if gridmov
-    cout << "     Inlet Abs Flow Angle" << "     Outlet Abs Flow Angle  " << endl;
-    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-    if(nZone > 0 && iMarker_Monitoring < config->GetnMarker_Turbomachinery() -1){
-      cout << endl << "---------- Mixing-Plane Interface between Blade " << iMarker_Monitoring + 1 << " and Blade " << iMarker_Monitoring + 2 << " -----------" << endl;
-      cout << endl;
-      inMarkerTag_Mix = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring + 1);
-      cout << "Convergence monitoring for the outlet  " << outMarker_Tag << " and the inlet  "<< inMarkerTag_Mix << " : "<<endl;
-      cout << endl;
-      cout << "     Outlet Density " << "          Inlet Density" << "               err(%)" <<  endl;
-      cout.width(25); cout << DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetDensity_Ref();
-      cout.width(25); cout << DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring + 1)]*config->GetDensity_Ref();
-      cout.width(25); cout << abs((DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Pressure " << "         Inlet Pressure" << "              err(%)" <<  endl;
-      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetPressure_Ref();
-      cout.width(25); cout << abs((PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Normal Velocity " << "  Inlet Normal Velocity" << "       err(%)" <<  endl;
-      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*config->GetVelocity_Ref();
-      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0]*config->GetVelocity_Ref();
-      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Tang. Velocity " << "   Inlet Tang. Velocity" << "        err(%)" <<  endl;
-      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*config->GetVelocity_Ref();
-      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1]*config->GetVelocity_Ref();
-      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Entropy " << "          Inlet Entropy" << "               err(%)" <<  endl;
-      cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-      if(turbulent){
-        cout << endl;
-        cout << endl;
-        if(menter_sst){
-          cout << "     Outlet TurbIntensity " << "    Inlet TurbIntensity" << "         err(%)" <<  endl;
-          cout.width(25); cout << TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-          cout << endl;
-          cout << endl;
-          cout << "     Outlet Turb2LamRatio " << "    Inlet Turb2LamRatio" << "         err(%)" <<  endl;
-          cout.width(25); cout << Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+    
+    /*--- Communicate the Sharp Edges ---*/
+    
+    if (config->GetWrt_SharpEdges()) {
+      
+      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+        
+        /*--- Loop over this partition to collect the current variable ---*/
+        jPoint = 0;
+        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+          
+          /*--- Check for halos & write only if requested ---*/
+          
+          if (!Local_Halo[iPoint] || Wrt_Halo) {
+            
+            /*--- Load buffers with the pressure and mach variables. ---*/
+            
+            Buffer_Send_Var[jPoint] = geometry->node[iPoint]->GetSharpEdge_Distance();
+            jPoint++;
+          }
         }
-        else{
-          cout << "     Outlet Nu Factor " << "        Inlet Nu Factor" << "             err(%)" <<  endl;
-          cout.width(25); cout << NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+        
+        /*--- Gather the data on the master node. ---*/
+        
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+        
+        /*--- The master node unpacks and sorts this variable by global index ---*/
+        
+        if (rank == MASTER_NODE) {
+          jPoint = 0; iVar = iVar_Sharp;
+          for (iProcessor = 0; iProcessor < size; iProcessor++) {
+            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+              
+              /*--- Get global index, then loop over each variable and store ---*/
+              
+              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+              Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+              jPoint++;
+            }
+            
+            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+            
+            jPoint = (iProcessor+1)*nBuffer_Scalar;
+          }
         }
       }
-      cout << endl;
-      cout << endl << "-------------------------------------------------------------------------" << endl;
-      cout << endl;
-    }
-
-  }
-  if(nZone > 1){
-    /*--- Stage Performance ---*/
-    for(iStage = 0; iStage < nStages; iStage++ ){
-      cout << endl << "----------------------------- Stage " << iStage + 1 << " -----------------------------------" << endl;
-      inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iStage*2);
-      outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iStage*2+1);
-      cout << "Stage performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
-      cout.width(25); cout << TotalTotalEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout.width(25); cout << TotalStaticEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout.width(25); cout << EntropyGen[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
-      cout.width(25); cout << PressureRatio[nBladesRow + iStage][nSpanWiseSections];
-      cout.width(25); cout << EnthalpyOutIs[nBladesRow + iStage][nSpanWiseSections]*config->GetEnergy_Ref();
-      cout.width(25); cout << abs((MassFlowIn[nBladesRow + iStage][nSpanWiseSections] - MassFlowOut[nBladesRow + iStage][nSpanWiseSections])/MassFlowIn[nBladesRow + iStage][nSpanWiseSections])*100.0;
-    }
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-
-    /*--- Full Machine Performance ---*/
-    // if(turbine)
-    cout << endl << "---------------------------- Turbine ------------------------------------" << endl;
-    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(0);
-    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(nBladesRow-1);
-    cout << "Turbine performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
-    cout.width(25); cout << TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout.width(25); cout << TotalStaticEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout.width(25); cout << EntropyGen[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
-    cout.width(25); cout << PressureRatio[nBladesRow + nStages][nSpanWiseSections];
-    cout.width(25); cout << EnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]*config->GetEnergy_Ref();;
-    cout.width(25); cout << abs((MassFlowIn[nBladesRow + nStages][nSpanWiseSections] - MassFlowOut[nBladesRow + nStages][nSpanWiseSections])/MassFlowIn[nBladesRow + nStages][nSpanWiseSections])*100.0;
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-  }
-  
-}
-
-void COutput::SpecialOutput_Turbo(CSolver *****solver, CGeometry ****geometry, CConfig **config,
-                                       unsigned short val_iZone, bool output) {
-  
-  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
-  unsigned short nZone       = config[val_iZone]->GetnZone();
-
-  unsigned short iDim, iSpan;
-
-  unsigned long iExtIter = config[val_iZone]->GetExtIter();
-  su2double* SpanWiseValuesIn, *SpanWiseValuesOut;
-  ofstream myfile;
-  string spanwise_performance_filename;
-
-
-  /*--- Start of write file turboperformance spanwise ---*/
-  if (rank == MASTER_NODE){
-    SpanWiseValuesIn = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(1);
-    SpanWiseValuesOut = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(2);
-
-
-
-    /*--- Writing Span wise inflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_thermodynamic_values.dat";
-    char buffer[50];
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
     }
-
-
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-
-    myfile << "TITLE = \"Inflow Spanwise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Pressure[Pa]\"";
-    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
-    myfile.width(30); myfile << "\"Temperature[K]\"";
-    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
-    myfile.width(30); myfile << "\"Enthalpy[J]\"";
-    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
-    myfile.width(30); myfile << "\"Density[kg/m3]\"";
-    myfile.width(30); myfile << "\"Entropy[J/K]\"";
-    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
-    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
-    myfile.width(30); myfile << "\"NuFactor[-]\"";
-    myfile << endl;
-
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-
-      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
-      myfile.width(15); myfile << iSpan;
-      myfile.width(30); myfile << PressureIn           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TotalPressureIn      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TemperatureIn        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << TotalTemperatureIn   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << EnthalpyIn           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << TotalEnthalpyIn      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << DensityIn            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
-      myfile.width(30); myfile << EntropyIn            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
-      if(TurbIntensityIn[val_iZone][iSpan] > 1.0){
-        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
-      }else{
-        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][iSpan];
+    
+    /*--- Communicate the surface sensitivity ---*/
+    
+    if ((Kind_Solver == ADJ_EULER)         ||
+        (Kind_Solver == ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == ADJ_RANS)          ||
+        (Kind_Solver == DISC_ADJ_EULER)    ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the surface sensitivity at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) Aux_Sens[iPoint] = 0.0;
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+            Area = 0.0;
+            for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
+            Area = sqrt (Area);
+            Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
+          }
+        }
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = Aux_Sens[iPoint];
+          if ((config->GetKind_ConvNumScheme() == SPACE_CENTERED) && (!config->GetDiscrete_Adjoint()))
+            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint);
+          if ((config->GetKind_ConvNumScheme() == SPACE_UPWIND) && (!config->GetDiscrete_Adjoint()))
+            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0);
+          
+          jPoint++;
+        }
       }
-      myfile.width(30); myfile << Turb2LamViscRatioIn  [val_iZone][iSpan];
-      myfile.width(30); myfile << NuFactorIn           [val_iZone][iSpan];
-      myfile << endl;
-    }
-
-    myfile.close();
-
-    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_thermodynamic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
-    }
-
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-
-    myfile << "TITLE = \"Outflow Span-wise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Pressure[Pa]\"";
-    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
-    myfile.width(30); myfile << "\"Temperature[K]\"";
-    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
-    myfile.width(30); myfile << "\"Enthalpy[J]\"";
-    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
-    myfile.width(30); myfile << "\"Density[kg/m3]\"";
-    myfile.width(30); myfile << "\"Entropy[J/K]\"";
-    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
-    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
-    myfile.width(30); myfile << "\"NuFactor[-]\"";
-    myfile << endl;
-
-
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-
-      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
-      myfile.width(15); myfile << iSpan;
-      myfile.width(30); myfile << PressureOut           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TotalPressureOut      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TemperatureOut        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << TotalTemperatureOut   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << EnthalpyOut           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << TotalEnthalpyOut      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << DensityOut            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
-      myfile.width(30); myfile << EntropyOut            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
-      if(TurbIntensityOut[val_iZone][iSpan] > 1.0){
-        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
-      }else{
-        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][iSpan];
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (!config->GetDiscrete_Adjoint())
+        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      if (!config->GetDiscrete_Adjoint())
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Sens;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            if (!config->GetDiscrete_Adjoint())
+              Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
       }
-      myfile.width(30); myfile << Turb2LamViscRatioOut  [val_iZone][iSpan];
-      myfile.width(30); myfile << NuFactorOut           [val_iZone][iSpan];
-      myfile << endl;
-    }
-
-    myfile.close();
-
-    /*--- Writing Span wise inflow kinematic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_kinematic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
     }
     
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-    
-    myfile << "TITLE = \"Inflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-    
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Normal Mach[-]\"";
-    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
-    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
-    myfile.width(30); myfile << "\"Mach Module[-]\"";
-    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
-    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
-    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
-    myfile << endl;
-    
-    
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+    if ((Kind_Solver == DISC_ADJ_EULER)    ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
-      myfile.width(15); myfile << iSpan;
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << MachIn              [val_iZone][iSpan][iDim];
-      }
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << TurboVelocityIn     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
-      }
-      if(AbsFlowAngleIn[val_iZone][iSpan] != AbsFlowAngleIn[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
-      }
-      else{
-        myfile.width(30); myfile << AbsFlowAngleIn     [val_iZone][iSpan]*180.0/PI_NUMBER;
-      }
-      if(FlowAngleIn[val_iZone][iSpan] != FlowAngleIn[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0);
+          Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1);
+          if (nDim == 3)
+            Buffer_Send_Vol[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
+          jPoint++;
+        }
       }
-      else{
-        myfile.width(30); myfile << FlowAngleIn      [val_iZone][iSpan]*180.0/PI_NUMBER;
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (nDim == 3)
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (nDim == 3)
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_SensDim;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (nDim == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
       }
-      myfile << endl;
-    }
-    
-    myfile.close();
-    
-    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_kinematic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
     }
     
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-    
-    myfile << "TITLE = \"Outflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-    
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Normal Mach[-]\"";
-    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
-    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
-    myfile.width(30); myfile << "\"Mach Module[-]\"";
-    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
-    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
-    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
-    myfile << endl;
     
+    /*--- Communicate the Velocities for dynamic FEM problem ---*/
     
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
       
-      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
-      myfile.width(15); myfile << iSpan;
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << MachOut              [val_iZone][iSpan][iDim];
-      }
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << TurboVelocityOut     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
-      }
-      if(AbsFlowAngleOut[val_iZone][iSpan] != AbsFlowAngleOut[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Node_Vel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
+          Buffer_Send_Var[jPoint] = Node_Vel[0];
+          Buffer_Send_Res[jPoint] = Node_Vel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Vel[2];
+          jPoint++;
+        }
       }
-      else{
-        myfile.width(30); myfile << AbsFlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
       }
-      if(FlowAngleOut[val_iZone][iSpan] != FlowAngleOut[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
       }
-      else{
-        myfile.width(30); myfile << FlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Vel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
       }
-      myfile << endl;
     }
     
-    myfile.close();
+    /*--- Communicate the Accelerations for dynamic FEM problem ---*/
     
-  }
-}
-
-void COutput::SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short iInst, unsigned short val_nInst, bool output) {
-  
-  /*--- Write file with flow quantities for harmonic balance HB ---*/
-  ofstream HB_output_file;
-  ofstream mean_HB_file;
-
-  /*--- MPI Send/Recv buffers ---*/
-  su2double *sbuf_var = NULL,  *rbuf_var = NULL;
-
-  /*--- Other variables ---*/
-  unsigned short iVar, kInst;
-  unsigned short nVar_output = 5;
-  unsigned long current_iter = config[ZONE_0]->GetExtIter();
-
-  /*--- Allocate memory for send buffer ---*/
-  sbuf_var = new su2double[nVar_output];
-
-  su2double *averages = new su2double[nVar_output];
-  for (iVar = 0; iVar < nVar_output; iVar++)
-    averages[iVar] = 0;
-
-  /*--- Allocate memory for receive buffer ---*/
-  if (rank == MASTER_NODE) {
-    rbuf_var = new su2double[nVar_output];
-
-    HB_output_file.precision(15);
-    HB_output_file.open("HB_output.csv", ios::out);
-    HB_output_file <<  "\"time_instance\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\"" << endl;
-
-    mean_HB_file.precision(15);
-    if (current_iter == 0 && iInst == 1) {
-      mean_HB_file.open("history_HB.plt", ios::trunc);
-      mean_HB_file << "TITLE = \"SU2 HARMONIC BALANCE SIMULATION\"" << endl;
-      mean_HB_file <<  "VARIABLES = \"Iteration\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CT\",\"CQ\",\"CMerit\"" << endl;
-      mean_HB_file << "ZONE T= \"Average Convergence History\"" << endl;
-    }
-    else
-      mean_HB_file.open("history_HB.plt", ios::out | ios::app);
-  }
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Run through the zones, collecting the output variables
-       N.B. Summing across processors within a given zone is being done
-       elsewhere. ---*/
-    for (kInst = 0; kInst < val_nInst; kInst++) {
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
       
-      /*--- Flow solution coefficients (parallel) ---*/
-      sbuf_var[0] = solver[ZONE_0][kInst][MESH_0][FLOW_SOL]->GetTotal_CL();
-      sbuf_var[1] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CD();
-      sbuf_var[2] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMx();
-      sbuf_var[3] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMy();
-      sbuf_var[4] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMz();
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      for (iVar = 0; iVar < nVar_output; iVar++) {
-        rbuf_var[iVar] = sbuf_var[iVar];
-      }
-
-      HB_output_file << kInst << ", ";
-      for (iVar = 0; iVar < nVar_output; iVar++)
-        HB_output_file << rbuf_var[iVar] << ", ";
-      HB_output_file << endl;
-
-      /*--- Increment the total contributions from each zone, dividing by nZone as you go ---*/
-      for (iVar = 0; iVar < nVar_output; iVar++) {
-        averages[iVar] += (1.0/su2double(val_nInst))*rbuf_var[iVar];
+      jPoint = 0; su2double *Node_Accel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
+          Buffer_Send_Var[jPoint] = Node_Accel[0];
+          Buffer_Send_Res[jPoint] = Node_Accel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Accel[2];
+          jPoint++;
+        }
       }
-    }
-  }
-
-  if (rank == MASTER_NODE && iInst == INST_0) {
-
-    mean_HB_file << current_iter << ", ";
-    for (iVar = 0; iVar < nVar_output; iVar++) {
-      mean_HB_file << averages[iVar];
-      if (iVar < nVar_output-1)
-        mean_HB_file << ", ";
-    }
-    mean_HB_file << endl;
-  }
-
-  if (rank == MASTER_NODE) {
-    HB_output_file.close();
-    mean_HB_file.close();
-    delete [] rbuf_var;
-  }
-
-  delete [] sbuf_var;
-  delete [] averages;
-}
-
-void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
-                                       CGeometry ****geometry,
-                                       CConfig **config,
-                                       unsigned long iExtIter,
-                                       unsigned short iZone,
-                                       unsigned short val_nZone,
-                                       unsigned short *nInst) {
-  
-  unsigned short iVar, iInst;
-  unsigned long iPoint;
-  bool compressible = true;
-    
-    for (iInst = 0; iInst < nInst[iZone]; iInst++){
-
-      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
-
-      /*--- Flags identifying the types of files to be written. ---*/
-      /*--- For now, we are disabling the parallel writers for Tecplot
-          ASCII until we have parallel versions of all file formats
-          available. SU2_SOL will remain intact for writing files
-          until this capability is completed. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
-
+      
+      /*--- Gather the data on the master node. ---*/
+      
 #ifdef HAVE_MPI
-      /*--- Do not merge the connectivity or write the visualization files
-     if we are running in parallel. Force the use of SU2_SOL to merge and
-     write the viz. files in this case to save overhead. ---*/
-
-      if (size > SINGLE_NODE) {
-        Wrt_Vol = false;
-        Wrt_Srf = false;
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
       }
 #endif
-
-    /*--- Check for compressible/incompressible flow problems. ---*/
-
-    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
-
-    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-    
-    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES : case RANS :
-        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
-            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
-            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
-            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-        break;
-      default: break;
-    }
-
-    /*--- Write a template inlet profile file if requested. ---*/
-
-    if (config[iZone]->GetWrt_InletFile()) {
-      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
       if (rank == MASTER_NODE) {
-        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+        jPoint = 0; iVar = iVar_FEA_Accel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
       }
-      config[iZone]->SetWrt_InletFile(false);
     }
 
-    /*--- This switch statement will become a call to a virtual function
-     defined within each of the "physics" output child classes that loads
-     the local data for that particular problem alone. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Loading solution output data locally on each rank." << endl;
-
-      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-         
-    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
+    /*--- Communicate the FEM elasticity stresses (2D) - New elasticity solver---*/
+    
+    if (Kind_Solver == FEM_ELASTICITY) {
       
-      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
-      }
+      /*--- Loop over this partition to collect the current variable ---*/
       
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
+      jPoint = 0; su2double *Stress;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+          /*--- Sigma xx ---*/
+          Buffer_Send_Var[jPoint] = Stress[0];
+          /*--- Sigma yy ---*/
+          Buffer_Send_Res[jPoint] = Stress[1];
+          /*--- Sigma xy ---*/
+          Buffer_Send_Vol[jPoint] = Stress[2];
+          jPoint++;
         }
       }
       
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Stress;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
     }
     
-    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+    /*--- Communicate the FEM elasticity stresses (3D) - New elasticity solver---*/
+    
+    if ((Kind_Solver == FEM_ELASTICITY) && (geometry->GetnDim() == 3)) {
       
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Stress;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+          /*--- Sigma zz ---*/
+          Buffer_Send_Var[jPoint] = Stress[3];
+          /*--- Sigma xz ---*/
+          Buffer_Send_Res[jPoint] = Stress[4];
+          /*--- Sigma yz ---*/
+          Buffer_Send_Vol[jPoint] = Stress[5];
+          jPoint++;
         }
       }
       
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
-        delete [] Local_Data_Copy[iPoint];
-      delete [] Local_Data_Copy;
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
       
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Stress_3D;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
     }
     
-    /*--- After loading the data local to a processor, we perform a sorting,
-     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-    SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
-    
-    /*--- Write either a binary or ASCII restart file in parallel. ---*/
-
-    if (config[iZone]->GetWrt_Binary_Restart()) {
-      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    } else {
-      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    }
-
-    /*--- Write a slice on a structured mesh if requested. ---*/
-
-    if (config[iZone]->GetWrt_Slice()) {
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-    }
-
-    /*--- Get the file output format ---*/
     
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    /*--- Communicate the Linear elasticity ---*/
     
-    /*--- Write the solution files if they are requested and we are executing
-     with a single rank (all data on one proc and no comm. overhead). Once we
-     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
-     can allow the write of the viz. files as well. ---*/
-
-    if ((size == SINGLE_NODE) && (rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+    if ( Kind_Solver == FEM_ELASTICITY ) {
       
-      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Preparing element connectivity across all ranks." << endl;
-      SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-
-      /*--- Sort the surface data and renumber if for writing. ---*/
-
-      SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
-
-      if (Wrt_Vol) {
-
-        switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
-            break;
+      /*--- Loop over this partition to collect the current variable ---*/
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress();
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Extra;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())) {
+      /*--- Loop over this partition to collect the current variable ---*/
 
-          case FIELDVIEW:
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
 
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
+        /*--- Check for halos & write only if requested ---*/
 
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
 
-            break;
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
 
-          case TECPLOT_BINARY:
+          Buffer_Send_Var[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(0);
+          Buffer_Send_Res[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(1);
+          if (geometry->GetnDim() == 3)
+            Buffer_Send_Vol[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(2);
+          jPoint++;
+        }
+      }
 
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+      /*--- Gather the data on the master node. ---*/
 
-            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
-            break;
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (nDim == 3)
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (nDim == 3)
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
 
-          case FIELDVIEW_BINARY:
+      /*--- The master node unpacks and sorts this variable by global index ---*/
 
-            /*--- FieldView binary files not yet available for parallel output. ---*/
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Extra;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
 
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
+            /*--- Get global index, then loop over each variable and store ---*/
 
-          case PARAVIEW:
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (nDim == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
 
-            /*--- Write a Paraview ASCII file ---*/
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
-            break;
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
 
-          default:
-            break;
+    if (config->GetExtraOutput()) {
+      
+      for (jVar = 0; jVar < nVar_Extra; jVar++) {
+        
+        /*--- Loop over this partition to collect the current variable ---*/
+        
+        jPoint = 0;
+        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+          
+          /*--- Check for halos & write only if requested ---*/
+          
+          if (!Local_Halo[iPoint] || Wrt_Halo) {
+            
+            /*--- Get this variable into the temporary send buffer. ---*/
+            
+            if (Kind_Solver == RANS) {
+              Buffer_Send_Var[jPoint] = solver[TURB_SOL]->OutputVariables[iPoint*nVar_Extra+jVar];
+            }
+            jPoint++;
+            
           }
-
         }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
-
-            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
-            break;
-
-          default:
-            break;
+        
+        /*--- Gather the data on the master node. ---*/
+        
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+        
+        /*--- The master node unpacks and sorts this variable by global index ---*/
+        
+        if (rank == MASTER_NODE) {
+          jPoint = 0; iVar = iVar_Extra;
+          for (iProcessor = 0; iProcessor < size; iProcessor++) {
+            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+              
+              /*--- Get global index, then loop over each variable and store ---*/
+              
+              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+              Data[iVar+jVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+              jPoint++;
+            }
+            
+            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+            
+            jPoint = (iProcessor+1)*nBuffer_Scalar;
           }
-
         }
+      }
+    }
+    
+  }
+  
+  /*--- Immediately release the temporary buffers. ---*/
+  
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_Res;
+  delete [] Buffer_Send_Vol;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nPoint;
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_Res;
+    delete [] Buffer_Recv_Vol;
+    delete [] Buffer_Recv_GlobalIndex;
+  }
+  
+  /*--- Release memory needed for surface coefficients ---*/
+  
+  delete [] Local_Halo;
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    delete[] Aux_Frict_x; delete[] Aux_Frict_y; delete[] Aux_Frict_z;
+    delete [] Aux_Heat; delete [] Aux_yPlus;
+  }
+  if (( Kind_Solver == ADJ_EULER              ) ||
+      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+      ( Kind_Solver == ADJ_RANS               ) ||
+      ( Kind_Solver == DISC_ADJ_EULER         ) ||
+      ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
+      ( Kind_Solver == DISC_ADJ_RANS          )) {
+    delete [] Aux_Sens;
+  }
+  
+}
 
-        /*--- Clean up the connectivity data that was allocated for output. ---*/
-
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
-
-        /*--- Clean up the surface data that was only needed for output. ---*/
-
-        DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
+void COutput::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
+  
+  /*--- Local variables needed on all processors ---*/
+  unsigned short iVar;
+  unsigned long iPoint = 0, jPoint = 0;
+  
+  nVar_Total = config->fields.size() - 1;
+  
+  /*--- Merge the solution either in serial or parallel. ---*/
+  
+#ifndef HAVE_MPI
+  
+  /*--- In serial, the single process has access to all solution data,
+   so it is simple to retrieve and store inside Solution_Data. ---*/
+  
+  unsigned short iMarker;
+  unsigned long iVertex, nTotalPoints = 0;
+  int SendRecv;
+  
+  /*--- First, create a structure to locate any periodic halo nodes ---*/
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
+            (SendRecv < 0)) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+      
+    }
+  }
+  
+  /*--- Total number of points in the mesh (this might include periodic points). ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (!Local_Halo[iPoint]) nTotalPoints++;
+  
+  nGlobal_Poin = nTotalPoints;
+  Data = new su2double*[nVar_Total];
+  for (iVar = 0; iVar < nVar_Total; iVar++) {
+    Data[iVar] = new su2double[nGlobal_Poin];
+  }
+  
+  /*--- Loop over all points in the mesh, but only write data
+   for nodes in the domain (ignore periodic halo nodes). ---*/
+  
+  jPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    if (!Local_Halo[iPoint]) {
+      
+      /*--- Solution (first, and second system of equations) ---*/
+      
+      unsigned short jVar = 0;
+      for (iVar = 0; iVar < nVar_Total; iVar++) {
+        Data[jVar][jPoint] = solver->node[iPoint]->GetSolution(iVar);
+        jVar++;
       }
-
-      /*--- Deallocate the nodal data needed for writing restarts. ---*/
-
-      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      /*--- Clear the variable names list. ---*/
-
-      Variable_Names.clear();
-
     }
-
-}
-
-void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+    
+    /*--- Increment jPoint as the counter. We need this because iPoint
+     may include halo nodes that we skip over during this loop. ---*/
+    
+    jPoint++;
+    
+  }
   
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
+#else
   
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+  /*--- MPI preprocessing ---*/
   
-  su2double RefArea = config->GetRefArea();
-  su2double Gamma = config->GetGamma();
-  su2double RefVel2;
-  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL;
-  su2double *Grid_Vel = NULL;
+  int nProcessor = size, iProcessor;
   
-  bool transition           = (config->GetKind_Trans_Model() == BC);
-  bool grid_movement        = (config->GetGrid_Movement());
-  bool Wrt_Halo             = config->GetWrt_Halo(), isPeriodic;
+  /*--- Local variables needed for merging with MPI ---*/
   
-  int *Local_Halo = NULL;
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+    
+  }
+  Buffer_Send_nPoint[0] = nLocalPoint;
+  
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[nProcessor];
+  
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  nBuffer_Scalar = MaxLocalPoint;
   
-  stringstream varname;
+  /*--- Send and Recv buffers. ---*/
+  
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
   
-  /*--- Set the non-dimensionalization for coefficients. ---*/
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
   
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+  /*--- Prepare the receive buffers in the master node only. ---*/
+  if (rank == MASTER_NODE) {
+    
+    Buffer_Recv_Var = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+    
   }
-  else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+  
+  for (iVar = 0; iVar < nVar_Total; iVar++) {
+    
+    /*--- Loop over this partition to collect the current variable ---*/
+    jPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      
+      /*--- Check for halos and write only if requested ---*/
+      if (!Local_Halo[iPoint] || Wrt_Halo) {
+        
+        /*--- Get this variable into the temporary send buffer. ---*/
+        Buffer_Send_Var[jPoint] = solver->node[iPoint]->GetSolution(iVar);
+        
+        /*--- Only send/recv the volumes & global indices during the first loop ---*/
+        if (iVar == 0) {
+          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
+        }
+        jPoint++;
+      }
+    }
+    
+    /*--- Gather the data on the master node. ---*/
+    
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (iVar == 0) {
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+    }
+    
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+          
+          /*--- Get global index, then loop over each variable and store ---*/
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+          jPoint++;
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
+    }
   }
-  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
   
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
+  /*--- Immediately release the temporary buffers. ---*/
   
-  switch (config->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    default: SecondIndex = NONE; break;
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_GlobalIndex;
   }
   
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
+#endif
   
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
+  delete [] Local_Halo;
+  
+}
+
+void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  /*--- Local variables ---*/
+  
+  unsigned short nZone = geometry->GetnZone();
+  unsigned short Kind_Solver  = config->GetKind_Solver();
+  unsigned short iVar, iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool grid_movement = config->GetGrid_Movement();
+  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
+  ofstream restart_file;
+  ofstream meta_file;
+  string filename, meta_filename;
+  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   
-  /*--- All output files first need the grid coordinates. ---*/
+  /*--- Retrieve filename from config ---*/
   
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
+  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else if (disc_adj_fem){
+    filename = config->GetRestart_AdjFEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
   }
   
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
+  
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
   
-  GlobalField_Counter += nVar_Consv_Par;
+  /*--- Open the restart file and write the solution. ---*/
   
-  Variable_Names.push_back("Density");
-  Variable_Names.push_back("Momentum_x");
-  Variable_Names.push_back("Momentum_y");
-  if (geometry->GetnDim() == 3) Variable_Names.push_back("Momentum_z");
-  Variable_Names.push_back("Energy");
+  restart_file.open(filename.c_str(), ios::out);
+  restart_file.precision(15);
   
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("TKE");
-      Variable_Names.push_back("Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Nu_Tilde");
-    }
+  /*--- Write the header line based on the particular solver ----*/
+  
+  restart_file << "\"PointID\"";
+  
+  /*--- Mesh coordinates are always written to the restart first ---*/
+  
+  if (nDim == 2) {
+    restart_file << "\t\"x\"\t\"y\"";
+  } else {
+    restart_file << "\t\"x\"\t\"y\"\t\"z\"";
   }
   
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
+  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+  if (( Kind_Solver == FEM_ELASTICITY ) || ( Kind_Solver == DISC_ADJ_FEM))
+      restart_file << "\t\"Displacement_" << iVar+1<<"\"";
+    else
+      restart_file << "\t\"Conservative_" << iVar+1<<"\"";
+  }
   
   if (!config->GetLow_MemoryOutput()) {
     
-    /*--- Add the limiters ---*/
-    
     if (config->GetWrt_Limiters()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Limiter_Density");
-      Variable_Names.push_back("Limiter_Momentum_x");
-      Variable_Names.push_back("Limiter_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Momentum_z");
-      Variable_Names.push_back("Limiter_Energy");
-      
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
+      for (iVar = 0; iVar < nVar_Consv; iVar++) {
+        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
       }
     }
-    
-    /*--- Add the residuals ---*/
-    
     if (config->GetWrt_Residuals()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Residual_Density");
-      Variable_Names.push_back("Residual_Momentum_x");
-      Variable_Names.push_back("Residual_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Momentum_z");
-      Variable_Names.push_back("Residual_Energy");
-      
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
+      for (iVar = 0; iVar < nVar_Consv; iVar++) {
+        restart_file << "\t\"Residual_" << iVar+1<<"\"";
       }
     }
     
-    /*--- Add the grid velocity. ---*/
+    /*--- Mesh velocities for dynamic mesh cases ---*/
     
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
-      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
-      
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+    if (grid_movement && !fem) {
+      if (nDim == 2) {
+        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
+      } else {
+        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
+      }
     }
     
-    
-    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
-    
-    GlobalField_Counter += 1;
-    Variable_Names.push_back("Pressure");
-    
-    GlobalField_Counter += 2;
-    Variable_Names.push_back("Temperature");
-    Variable_Names.push_back("Mach");
-    
-    GlobalField_Counter += 1;
-    if (config->GetOutput_FileFormat() == PARAVIEW){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
+    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      if (config->GetOutput_FileFormat() == PARAVIEW) {
+        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
+      } else
+        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
     }
     
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-    
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          GlobalField_Counter += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("Heat_Flux");
-        Variable_Names.push_back("Y_Plus");
+      if (config->GetOutput_FileFormat() == PARAVIEW) {
+        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
+        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
       } else {
-        GlobalField_Counter += 1; Variable_Names.push_back("<greek>m</greek>");
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          GlobalField_Counter += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("h");
-        Variable_Names.push_back("y<sup>+</sup>");
+        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
+        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
       }
     }
     
-    /*--- Add Eddy Viscosity. ---*/
-    
     if (Kind_Solver == RANS) {
-      GlobalField_Counter += 1;
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
-      }
+      if (config->GetOutput_FileFormat() == PARAVIEW) {
+        restart_file << "\t\"Eddy_Viscosity\"";
+      } else
+        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
     }
     
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
-    
     if (config->GetWrt_SharpEdges()) {
-      GlobalField_Counter += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
+      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+        restart_file << "\t\"Sharp_Edge_Dist\"";
+      }
     }
     
-    /*--- Add the intermittency for the BC trans. model. ---*/
-    
-    if (transition) {
-      GlobalField_Counter += 1;
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        Variable_Names.push_back("gamma_BC");
-      } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+    if ((Kind_Solver == ADJ_EULER              ) ||
+        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+        (Kind_Solver == ADJ_RANS               )   ) {
+      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
+    }
+    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
+        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
+        ( Kind_Solver == DISC_ADJ_RANS               )) {
+      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
+      if (geometry->GetnDim() == 3) {
+        restart_file << "\t\"Sensitivity_z\"";
       }
     }
     
-    if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-      GlobalField_Counter +=1;
-      Variable_Names.push_back("DES_LengthScale");
-      GlobalField_Counter +=1;
-      Variable_Names.push_back("Wall_Distance");
+    if (Kind_Solver == FEM_ELASTICITY) {
+      if (!dynamic_fem) {
+        if (geometry->GetnDim() == 2)
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
+        if (geometry->GetnDim() == 3)
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
+      }
+      else if (dynamic_fem) {
+        if (geometry->GetnDim() == 2) {
+          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
+        }
+        if (geometry->GetnDim() == 3) {
+          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
+        }
+      }
     }
     
-    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      GlobalField_Counter +=1;
-      Variable_Names.push_back("Roe_Dissipation");
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+      if (geometry->GetnDim() == 2)
+        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
+      if (geometry->GetnDim() == 3)
+        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
     }
+
     
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat    = new su2double[geometry->GetnPoint()];
-    Aux_yPlus   = new su2double[geometry->GetnPoint()];
-    
-    /*--- First, loop through the mesh in order to find and store the
-     value of the viscous coefficients at any surface nodes. They
-     will be placed in an auxiliary vector and then communicated like
-     all other volumetric variables. ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      Aux_Frict_x[iPoint] = 0.0;
-      Aux_Frict_y[iPoint] = 0.0;
-      Aux_Frict_z[iPoint] = 0.0;
-      Aux_Heat[iPoint]    = 0.0;
-      Aux_yPlus[iPoint]   = 0.0;
-    }
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
+    if (config->GetExtraOutput()) {
+      string *headings = NULL;
+      //if (Kind_Solver == RANS) {
+      headings = solver[TURB_SOL]->OutputHeadingNames;
+      //}
+      
+      for (iVar = 0; iVar < nVar_Extra; iVar++) {
+        if (headings == NULL) {
+          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
+        } else {
+          restart_file << "\t\""<< headings[iVar] <<"\"";
         }
       }
     }
   }
   
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  restart_file << "\n";
   
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
+  /*--- Write the restart file ---*/
   
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
+  for (iPoint = 0; iPoint < geometry->GetGlobal_nPointDomain(); iPoint++) {
+    
+    /*--- Index of the point ---*/
+    restart_file << iPoint << "\t";
+    
+    /*--- Write the grid coordinates first ---*/
+    for (iDim = 0; iDim < nDim; iDim++) {
+      restart_file << scientific << Coords[iDim][iPoint] << "\t";
+    }
+    
+    /*--- Loop over the variables and write the values to file ---*/
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      restart_file << scientific << Data[iVar][iPoint] << "\t";
     }
+    restart_file << "\n";
   }
+
+  /*--- Write the general header and flow conditions ----*/
+
+  if (dual_time)
+    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+  else
+    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+  restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+  restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+  restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+  restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+  restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+  restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+  restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+  if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+
+  /*--- Close the data portion of the restart file. ---*/
+
+  restart_file.close();
+
+}
+
+void COutput::DeallocateCoordinates(CConfig *config, CGeometry *geometry) {
   
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure.          ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
+  unsigned short iDim, nDim = geometry->GetnDim();
   
-  jPoint = 0;
+  /*--- The master node alone owns all data found in this routine. ---*/
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+  if (rank == MASTER_NODE) {
     
-    /*--- Check for halos & write only if requested ---*/
+    /*--- Deallocate memory for coordinate data ---*/
     
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-          Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      /*--- If this is RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables. ---*/
-      
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
-          iVar++;
-        }
-      }
-      
-      /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Limiters ---*/
-        if (config->GetWrt_Limiters()) {
-          /*--- Mean Flow Limiters ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-            iVar++;
-          }
-          /*--- RANS Limiters ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-              iVar++;
-            }
-          }
-        }
-        
-        /*--- Residuals ---*/
-        if (config->GetWrt_Residuals()) {
-          /*--- Mean Flow Residuals ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-          /*--- RANS Residuals ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              iVar++;
-            }
-          }
-        }
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Load buffers with the three grid velocity components. ---*/
-        
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
-        }
-        
-        /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
-        
-        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetPressure(); iVar++;
-        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetTemperature(); iVar++;
-        Local_Data[jPoint][iVar] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed(); iVar++;
-        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
-        
-        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-          
-          /*--- Load data for the laminar viscosity. ---*/
-          
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
-          
-          /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
-          
-          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
-            iVar++;
-          }
-          Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
-          
-        }
-        
-        /*--- Load data for the Eddy viscosity for RANS. ---*/
-        
-        if (Kind_Solver == RANS) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
-        }
-        
-        /*--- Load data for the distance to the nearest sharp edge. ---*/
-        
-        if (config->GetWrt_SharpEdges()) {
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
-        }
-        
-        /*--- Load data for the intermittency of the BC trans. model. ---*/
-        
-        if (transition) {
-          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
-        }
-        
-        if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDES_LengthScale(); iVar++;
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetWall_Distance(); iVar++;
-        }
-        
-        if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetRoe_Dissipation(); iVar++;
-        }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
-      }
-      
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-      
-      jPoint++;
+    for (iDim = 0; iDim < nDim; iDim++) {
+      delete [] Coords[iDim];
+    }
+    delete [] Coords;
+  }
+}
+
+void COutput::DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol) {
+
+  /*--- The master node alone owns all data found in this routine. ---*/
+  if (rank == MASTER_NODE) {
+    
+    /*--- Deallocate memory for connectivity data ---*/
+    if (surf_sol) {
+      if (nGlobal_Line > 0      && Conn_Line      != NULL) delete [] Conn_Line;
+      if (nGlobal_BoundTria > 0 && Conn_BoundTria != NULL) delete [] Conn_BoundTria;
+      if (nGlobal_BoundQuad > 0 && Conn_BoundQuad != NULL) delete [] Conn_BoundQuad;
+    }
+    else {
+      if (nGlobal_Tria > 0 && Conn_Tria != NULL) delete [] Conn_Tria;
+      if (nGlobal_Quad > 0 && Conn_Quad != NULL) delete [] Conn_Quad;
+      if (nGlobal_Tetr > 0 && Conn_Tetr != NULL) delete [] Conn_Tetr;
+      if (nGlobal_Hexa > 0 && Conn_Hexa != NULL) delete [] Conn_Hexa;
+      if (nGlobal_Pris > 0 && Conn_Pris != NULL) delete [] Conn_Pris;
+      if (nGlobal_Pyra > 0 && Conn_Pyra != NULL) delete [] Conn_Pyra;
       
     }
+    
   }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    delete [] Aux_Frict_x;
-    delete [] Aux_Frict_y;
-    delete [] Aux_Frict_z;
-    delete [] Aux_Heat;
-    delete [] Aux_yPlus;
-  }
-  
-  delete [] Local_Halo;
-  
 }
 
-void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
+void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
 
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+  /*--- The master node alone owns all data found in this routine. ---*/
+  if (rank == MASTER_NODE) {
+    
+    /*--- Deallocate memory for solution data ---*/
+    for (unsigned short iVar = 0; iVar < nVar_Total; iVar++) {
+      delete [] Data[iVar];
+    }
+    delete [] Data;
+    
+  }
+}
 
-  su2double RefArea = config->GetRefArea();
-  su2double RefVel2 = 0.0;
-  su2double factor = 0.0;
-  su2double RefDensity = 0.0, RefPressure = 0.0;
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL;
-  su2double *Grid_Vel = NULL;
-
-  bool transition       = (config->GetKind_Trans_Model() == BC);
-  bool grid_movement    = (config->GetGrid_Movement());
-  bool Wrt_Halo         = config->GetWrt_Halo(), isPeriodic;
-  bool variable_density = (config->GetKind_DensityModel() == VARIABLE);
-  bool weakly_coupled_heat  = config->GetWeakly_Coupled_Heat();
+void COutput::SetConvHistory_Body(CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
 
-  int *Local_Halo = NULL;
 
-  stringstream varname;
+  /*--- Output using only the master node ---*/
 
-  /*--- Evaluate reference values for non-dimensionalization.
-   For dimensional or non-dim based on initial values, use
-   the far-field state (inf). For a custom non-dim based
-   on user-provided reference values, use the ref values
-   to compute the forces. ---*/
+  if (rank == MASTER_NODE) {
 
-  if ((config->GetRef_Inc_NonDim() == DIMENSIONAL) ||
-      (config->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
-    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  else if (config->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
-    RefDensity = config->GetInc_Density_Ref();
-    RefVel2    = config->GetInc_Velocity_Ref()*config->GetInc_Velocity_Ref();
-  }
+    bool write_header, write_history, write_screen;
 
-  /*--- Reference pressure is always the far-field value (0.0). ---*/
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
 
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
+                    timeused, val_iZone, val_iInst);
 
-  /*--- Compute factor for force coefficients. ---*/
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
+    if (write_history) SetHistoryFile_Output(config[val_iZone]);
 
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    write_header = WriteScreen_Header(config[val_iZone]);
+    if (write_header) SetScreen_Header(config[val_iZone]);
 
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
+    if (write_screen) SetScreen_Output(config[val_iZone]);
 
-  switch (config->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    default: SecondIndex = NONE; break;
   }
 
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
+}
 
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
+void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
+  
+  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
+  unsigned short iMesh;
+  
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned long ExtIter = config[val_iZone]->GetExtIter();
+  unsigned short nVar = 1;
 
-  /*--- All output files first need the grid coordinates. ---*/
+  bool energy = config[val_iZone]->GetEnergy_Equation();
+  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
 
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
+  switch( config[val_iZone]->GetKind_Solver()) {
+    case EULER : case NAVIER_STOKES : case RANS:
+      if (energy) {
+        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+      }
+      else if (weakly_coupled_heat) {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      }
+      else {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+      }
+      break;
+    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+      break;
+    case HEAT_EQUATION_FVM:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      break;
   }
+  
+  if (RhoRes_New < EPS) RhoRes_New = EPS;
+  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
 
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-
-  GlobalField_Counter += nVar_Consv_Par;
-
-  /*--- The incompressible solver uses primitives as the working variables. ---*/
+  Div = RhoRes_Old[val_iZone]/RhoRes_New;
+  Diff = RhoRes_New-RhoRes_Old[val_iZone];
 
-  Variable_Names.push_back("Pressure");
-  Variable_Names.push_back("Velocity_x");
-  Variable_Names.push_back("Velocity_y");
-  if (geometry->GetnDim() == 3) Variable_Names.push_back("Velocity_z");
-  Variable_Names.push_back("Temperature");
+  /*--- Compute MG factor ---*/
 
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("TKE");
-      Variable_Names.push_back("Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Nu_Tilde");
-    }
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
+    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
   }
 
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-
-  if (!config->GetLow_MemoryOutput()) {
-
-    /*--- Add the limiters ---*/
-
-    if (config->GetWrt_Limiters()) {
-      GlobalField_Counter += nVar_Consv_Par;
-
-      Variable_Names.push_back("Limiter_Pressure");
-      Variable_Names.push_back("Limiter_Velocity_x");
-      Variable_Names.push_back("Limiter_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Velocity_z");
-      Variable_Names.push_back("Limiter_Temperature");
-
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the residuals ---*/
-
-    if (config->GetWrt_Residuals()) {
-      GlobalField_Counter += nVar_Consv_Par;
-
-      Variable_Names.push_back("Residual_Pressure");
-      Variable_Names.push_back("Residual_Velocity_x");
-      Variable_Names.push_back("Residual_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Velocity_z");
-      Variable_Names.push_back("Residual_Temperature");
-
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the grid velocity. ---*/
+  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
+  else power = config[val_iZone]->GetCFL_AdaptParam(1);
 
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
-      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
+  /*--- Detect a stall in the residual ---*/
 
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
+  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
 
-    /*--- Add Cp, Mach. ---*/
+  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
+  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
 
-    GlobalField_Counter += 2;
-    if (config->GetOutput_FileFormat() == PARAVIEW){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-    Variable_Names.push_back("Mach");
+  CFLFactor = pow(Div, power);
 
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    CFL = config[val_iZone]->GetCFL(iMesh);
+    CFL *= CFLFactor;
 
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        GlobalField_Counter += 1; Variable_Names.push_back("Laminar_Viscosity");
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          GlobalField_Counter += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("Heat_Flux");
-        Variable_Names.push_back("Y_Plus");
-      } else {
-        GlobalField_Counter += 1; Variable_Names.push_back("<greek>m</greek>");
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          GlobalField_Counter += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        GlobalField_Counter += 2;
-        Variable_Names.push_back("h");
-        Variable_Names.push_back("y<sup>+</sup>");
+    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
       }
+      break;
     }
-
-    /*--- Add Eddy Viscosity. ---*/
-
-    if (Kind_Solver == RANS) {
-      GlobalField_Counter += 1;
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
-      }
+    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
+      break;
     }
 
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
+    config[val_iZone]->SetCFL(iMesh, CFL);
+  }
 
-    if (config->GetWrt_SharpEdges()) {
-      GlobalField_Counter += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
-    }
+  switch( config[val_iZone]->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES : case RANS:
+    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+    break;
+  case HEAT_EQUATION_FVM:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    break;
+  }
+  
+}
 
-    /*--- Add the intermittency for the BC trans. model. ---*/
+void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                                      unsigned long iExtIter, unsigned short val_nZone) {
+  
+  unsigned short iZone, iInst, nInst;
+  
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+    nInst = config[iZone]->GetnTimeInstances();
 
-    if (transition) {
-      GlobalField_Counter += 1;
-      if (config->GetOutput_FileFormat() == PARAVIEW){
-        Variable_Names.push_back("gamma_BC");
-      } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
-      }
-    }
+    for (iInst = 0; iInst < nInst; iInst++) {
 
-    /*--- New variables get registered here before the end of the loop. ---*/
+      config[iZone]->SetiInst(iInst);
 
-    GlobalField_Counter += 1;
-    Variable_Names.push_back("Density");
+      /*--- Flags identifying the types of files to be written. ---*/
 
-  }
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
 
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
+      /*--- Get the file output format ---*/
 
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat    = new su2double[geometry->GetnPoint()];
-    Aux_yPlus   = new su2double[geometry->GetnPoint()];
+      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
 
-    /*--- First, loop through the mesh in order to find and store the
-     value of the viscous coefficients at any surface nodes. They
-     will be placed in an auxiliary vector and then communicated like
-     all other volumetric variables. ---*/
+      /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
 
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      Aux_Frict_x[iPoint] = 0.0;
-      Aux_Frict_y[iPoint] = 0.0;
-      Aux_Frict_z[iPoint] = 0.0;
-      Aux_Heat[iPoint]    = 0.0;
-      Aux_yPlus[iPoint]   = 0.0;
-    }
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
-        }
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
       }
-    }
-  }
-
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
-
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
 
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
+      /*--- Merge the solution data needed for volume solutions and restarts ---*/
 
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+      }
 
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
+      /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
 
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
 
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure.          ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
+      if (rank == MASTER_NODE) {
 
-  jPoint = 0;
+        if (Wrt_Vol) {
 
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+          switch (FileFormat) {
 
-    /*--- Check for halos & write only if requested ---*/
+          case TECPLOT:
 
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
+            /*--- Write a Tecplot ASCII file ---*/
 
-      /*--- Restart the column index with each new point. ---*/
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-      iVar = 0;
+          case FIELDVIEW:
 
-      /*--- Load the grid node coordinate values. ---*/
+            /*--- Write a FieldView ASCII file ---*/
 
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim); iVar++;
-      }
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-      /*--- Load the conservative variable states for the mean flow variables. ---*/
+          case TECPLOT_BINARY:
 
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(0); iVar++;
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(1); iVar++;
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(2); iVar++;
-      if (nDim == 3) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(3); iVar++;
-      }
-      if (weakly_coupled_heat) {
-        Local_Data[jPoint][iVar] = solver[HEAT_SOL]->node[iPoint]->GetSolution(0);
-        iVar++;
-      }
-      else {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(nDim+1);
-        iVar++;
-      }
+            /*--- Write a Tecplot binary solution file ---*/
 
-      /*--- If this is RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables. ---*/
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
+            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
+            break;
 
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar); iVar++;
-        }
-      }
+          case FIELDVIEW_BINARY:
 
-      /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
+            /*--- Write a binary binary file ---*/
 
-        /*--- Limiters ---*/
-        if (config->GetWrt_Limiters()) {
-          /*--- Mean Flow Limiters ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-            iVar++;
-          }
-          /*--- RANS Limiters ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-              iVar++;
-            }
-          }
-        }
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-        /*--- Residuals ---*/
-        if (config->GetWrt_Residuals()) {
-          /*--- Mean Flow Residuals ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-          /*--- RANS Residuals ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              iVar++;
-            }
-          }
-        }
-      }
+          case PARAVIEW:
 
-      if (!config->GetLow_MemoryOutput()) {
+            /*--- Write a Paraview ASCII file ---*/
 
-        /*--- Load buffers with the three grid velocity components. ---*/
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
+          default:
+            break;
           }
-        }
 
-        /*--- Load data for Cp and Mach variables. ---*/
-
-        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
+        }
 
-        /*--- Mach depends on whether we have variable density or not. ---*/
+        if (Wrt_Srf) {
 
-        if (variable_density) {
-          Local_Data[jPoint][iVar] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
-        sqrt(solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCp()*config->GetPressure_ThermodynamicND()/(solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCv()*solver[FLOW_SOL]->node[iPoint]->GetDensity())); 
-          iVar++;
-        } else {
-          Local_Data[jPoint][iVar] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
-        sqrt(config->GetBulk_Modulus()/(solver[FLOW_SOL]->node[iPoint]->GetDensity())); 
-          iVar++;
-        }
+          switch (FileFormat) {
 
-        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+          case TECPLOT:
 
-          /*--- Load data for the laminar viscosity. ---*/
+            /*--- Write a Tecplot ASCII file ---*/
 
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
 
-          /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
+          case TECPLOT_BINARY:
 
-          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
-            iVar++;
-          }
-          Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
+            /*--- Write a Tecplot binary solution file ---*/
 
-        }
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
+            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
+            break;
 
-        /*--- Load data for the Eddy viscosity for RANS. ---*/
+          case PARAVIEW:
 
-        if (Kind_Solver == RANS) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
-        }
+            /*--- Write a Paraview ASCII file ---*/
 
-        /*--- Load data for the distance to the nearest sharp edge. ---*/
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
 
-        if (config->GetWrt_SharpEdges()) {
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
+          default:
+            break;
+          }
         }
 
-        /*--- Load data for the intermittency of the BC trans. model. ---*/
-
-        if (transition) {
-          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
+        if (FileFormat == TECPLOT_BINARY) {
+          if (!wrote_base_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+          if (!wrote_surf_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
         }
 
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
+        if (Wrt_Vol || Wrt_Srf)
+          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+      }
 
-        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDensity(); iVar++;
 
-      }
 
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
+      /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
 
-      jPoint++;
+#ifdef HAVE_MPI
+      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
 
     }
-  }
 
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    delete [] Aux_Frict_x;
-    delete [] Aux_Frict_y;
-    delete [] Aux_Frict_z;
-    delete [] Aux_Heat;
-    delete [] Aux_yPlus;
   }
-  
-  delete [] Local_Halo;
-  
 }
 
-void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
-  
-  su2double *Aux_Sens = NULL;
-  su2double *Grid_Vel = NULL;
-  su2double *Normal, Area;
-  
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool grid_movement  = (config->GetGrid_Movement());
-  bool Wrt_Halo       = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; break;
-    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; break;
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE;  break;
-    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL;  break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  GlobalField_Counter += nVar_Consv_Par;
-  
-  /*--- For now, leave the names as "Conservative_", etc., in order
-   to avoid confusion with the serial version, which still prints these
-   names. Names can be set alternatively by using the commented code
-   below. ---*/
+void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
 
-  if (incompressible) {
-    Variable_Names.push_back("Adjoint_Pressure");
-    Variable_Names.push_back("Adjoint_Velocity_x");
-    Variable_Names.push_back("Adjoint_Velocity_y");
-    if (geometry->GetnDim() == 3) Variable_Names.push_back("Adjoint_Velocity_z");
-    Variable_Names.push_back("Adjoint_Temperature");
-  } else {
-    Variable_Names.push_back("Adjoint_Density");
-    Variable_Names.push_back("Adjoint_Momentum_x");
-    Variable_Names.push_back("Adjoint_Momentum_y");
-    if (geometry->GetnDim() == 3)
-      Variable_Names.push_back("Adjoint_Momentum_z");
-    Variable_Names.push_back("Adjoint_Energy");
-  }
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("Adjoint_TKE");
-      Variable_Names.push_back("Adjoint_Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Adjoint_Nu_Tilde");
-    }
-  }
+  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
+  unsigned short iZone;
+  ofstream output_file;
+  string str;
 
-  /*--- For the discrete adjoint, we have the full field of sensitivity
-   in each coordinate direction. ---*/
+  /*--- Read the name of the output and input file ---*/
 
-  if ((Kind_Solver == DISC_ADJ_EULER)         ||
-      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == DISC_ADJ_RANS)) {
-    GlobalField_Counter += nDim;
-    Variable_Names.push_back("Sensitivity_x");
-    Variable_Names.push_back("Sensitivity_y");
-    if (geometry->GetnDim()== 3)
-      Variable_Names.push_back("Sensitivity_z");
-  }
+  if (rank == MASTER_NODE) {
+    if (su2_file){
+      str = config[ZONE_0]->GetMesh_Out_FileName();
+      strcpy (out_file, str.c_str());
+      strcpy (cstr, out_file);
+      output_file.precision(15);
+      output_file.open(cstr, ios::out);
 
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Limiter_Adjoint_Pressure");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_x");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Adjoint_Velocity_z");
-        Variable_Names.push_back("Limiter_Adjoint_Temperature");
-      } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_x");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Limiter_Adjoint_Momentum_z");
-        Variable_Names.push_back("Limiter_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_Adjoint_TKE");
-          Variable_Names.push_back("Limiter_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Adjoint_Nu_Tilde");
-        }
-      }
-    }
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Residual_Adjoint_Pressure");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_x");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Adjoint_Velocity_z");
-        Variable_Names.push_back("Residual_Adjoint_Temperature");
-      } else {
-        Variable_Names.push_back("Residual_Adjoint_Density");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_x");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Residual_Adjoint_Momentum_z");
-        Variable_Names.push_back("Residual_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_Adjoint_TKE");
-          Variable_Names.push_back("Residual_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Adjoint_Nu_Tilde");
-        }
+      if (val_nZone > 1){
+        output_file << "NZONE= " << val_nZone << endl;
       }
     }
+  }
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
     
-    /*--- Add the grid velocity. ---*/
-    
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) GlobalField_Counter += 2;
-      else if (geometry->GetnDim() == 3) GlobalField_Counter += 3;
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-    
-    /*--- All adjoint solvers write the surface sensitivity. ---*/
+    /*--- Flags identifying the types of files to be written. ---*/
     
-    GlobalField_Counter += 1; Variable_Names.push_back("Surface_Sensitivity");
+    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol() && config[iZone]->GetVisualize_Deformation();
+    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol() && config[iZone]->GetVisualize_Deformation();
+    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
     
-    /*--- For the continouus adjoint, we write either convective scheme's
-     dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
+    /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
     
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      GlobalField_Counter += 1;
-      if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-        Variable_Names.push_back("Dissipation_Sensor");
-      } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
-      }
-    }
+    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
+    MergeConnectivity(config[iZone], geometry[iZone], iZone);
     
-    /*--- New variables get registered here before the end of the loop. ---*/
+    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+     The grid coordinates are always merged and included first in the
+     restart files. ---*/
     
-  }
-  
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-  
-  Aux_Sens = new su2double[geometry->GetnPoint()];
-  
-  /*--- First, loop through the mesh in order to find and store the
-   value of the viscous coefficients at any surface nodes. They
-   will be placed in an auxiliary vector and then communicated like
-   all other volumetric variables. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Aux_Sens[iPoint] = 0.0;
-  }
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Area = 0.0;
-        for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt (Area);
-        Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
-      }
-    }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
+    MergeCoordinates(config[iZone], geometry[iZone]);
     
-    /*--- Check for halos & write only if requested ---*/
+    /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
     
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
+    if (rank == MASTER_NODE) {
+      
+      if (Wrt_Vol) {
+        
+        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
+        
+        /*--- Write a Tecplot ASCII file ---*/
+        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
+        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        
+      }
       
-      /*--- Restart the column index with each new point. ---*/
+      if (Wrt_Srf) {
+        
+        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
+        
+        /*--- Write a Tecplot ASCII file ---*/
+        if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
+        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+        
+      }
       
-      iVar = 0;
+      /*--- Write a .su2 ASCII file ---*/
+
+      if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
+
+      if (su2_file) SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
       
-      /*--- Load the grid node coordinate values. ---*/
+      /*--- Write an stl surface file ---*/
+
+      if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
       
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
+      if (su2_file) SetSTL_MeshASCII(config[iZone], geometry[iZone]);
       
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
+      /*--- Write a binary file with the grid coordinates alone. ---*/
       
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
+      if (Wrt_Crd) {
+        cout <<"Writing .dat binary coordinates file." << endl;
+        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
       }
       
+      /*--- Deallocate connectivity ---*/
       
-      /*--- If this is Adj. RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables and the
-       limiters / residuals (if requested). ----*/
+      DeallocateConnectivity(config[iZone], geometry[iZone], true);
+      DeallocateConnectivity(config[iZone], geometry[iZone], false);
+      DeallocateCoordinates(config[iZone], geometry[iZone]);
       
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
-          iVar++;
-        }
-      }
+    }
+
+    /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
+    
+#ifdef HAVE_MPI
+    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
+    
+    /*--- Write an csv surface file, done in parallel ---*/
 
-      /*--- Load data for the discrete sensitivities. ---*/
+    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
 
-      if ((Kind_Solver == DISC_ADJ_EULER)         ||
-          (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-          (Kind_Solver == DISC_ADJ_RANS)) {
-        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0); iVar++;
-        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1); iVar++;
-        if (geometry->GetnDim()== 3) {
-          Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
-          iVar++;
-        }
+    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
+
+  }
+
+  if (rank == MASTER_NODE) {
+    if (su2_file){
+      output_file.close();
+    }
+  }
+}
+
+void COutput::SetSensitivity_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone) {
+
+  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
+  unsigned long iVertex, iPoint, nPoint, nVertex;
+  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
+
+  unsigned short iZone;
+
+  CSolver **solver = new CSolver*[val_nZone];
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+
+    nPoint = geometry[iZone]->GetnPoint();
+    nDim   = geometry[iZone]->GetnDim();
+    nMarker = config[iZone]->GetnMarker_All();
+    nVar = nDim + 1;
+
+    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
+
+    vector<string> fieldnames;
+    fieldnames.push_back("\"Point\"");
+    fieldnames.push_back("\"x\"");
+    fieldnames.push_back("\"y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"z\"");
+    }
+    fieldnames.push_back("\"Sensitivity_x\"");
+    fieldnames.push_back("\"Sensitivity_y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"Sensitivity_z\"");
+    }
+    fieldnames.push_back("\"Surface_Sensitivity\"");
+
+    solver[iZone] = new CBaselineSolver(geometry[iZone], config[iZone], nVar+nDim, fieldnames);
+
+    for (iPoint = 0; iPoint < nPoint; iPoint++) {
+      for (iDim = 0; iDim < nDim; iDim++) {
+        solver[iZone]->node[iPoint]->SetSolution(iDim, geometry[iZone]->node[iPoint]->GetCoord(iDim));
       }
-      
-      if (!config->GetLow_MemoryOutput()) {
+      for (iVar = 0; iVar < nDim; iVar++) {
+        solver[iZone]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone]->GetSensitivity(iPoint, iVar));
+      }
+    }
 
-          if (config->GetWrt_Limiters()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter(jVar);
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter(jVar);
-                iVar++;
-              }
-            }
-          }
+    /*--- Compute the sensitivity in normal direction ---*/
 
-          if (config->GetWrt_Residuals()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              if (!config->GetDiscrete_Adjoint()) {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              } else {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar) -
-                solver[FirstIndex]->node[iPoint]->GetSolution_Old(jVar);
-              }
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                if (!config->GetDiscrete_Adjoint()) {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-                } else {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar) -
-                                             solver[SecondIndex]->node[iPoint]->GetSolution_Old(jVar);
-                }
-                iVar++;
-              }
-            }
-          }
-        
-        /*--- Load buffers with the three grid velocity components. ---*/
-        
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
-        }
-        
-        /*--- Load data for the surface sensitivity. ---*/
-        
-        Local_Data[iPoint][iVar] = Aux_Sens[iPoint]; iVar++;
-        
-        /*--- Load data for the convective scheme sensor. ---*/
+    for (iMarker = 0; iMarker < nMarker; iMarker++) {
+
+      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL )) {
         
-        if (( Kind_Solver == ADJ_EULER              ) ||
-            ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-            ( Kind_Solver == ADJ_RANS               )) {
-          if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint); iVar++;
-          } else {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0); iVar++;
+        nVertex = geometry[iZone]->GetnVertex(iMarker);
+
+        for (iVertex = 0; iVertex < nVertex; iVertex++) {
+          iPoint = geometry[iZone]->vertex[iMarker][iVertex]->GetNode();
+          Normal = geometry[iZone]->vertex[iMarker][iVertex]->GetNormal();
+          Prod = 0.0;
+          Area = 0.0;
+          for (iDim = 0; iDim < nDim; iDim++) {
+
+            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
+
+            SensDim = geometry[iZone]->GetSensitivity(iPoint, iDim);
+
+            /*--- Calculate scalar product for projection onto the normal vector ---*/
+
+            Prod += Normal[iDim]*SensDim;
+
+            Area += Normal[iDim]*Normal[iDim];
           }
-        }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
-      }
 
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
+          Area = sqrt(Area);
 
-      jPoint++;
+          /*--- Projection of the gradient onto the normal vector of the surface ---*/
+
+          Sens = Prod/Area;
+
+          solver[iZone]->node[iPoint]->SetSolution(2*nDim, Sens);
+
+        }
+      }
     }
   }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  delete [] Aux_Sens;
-  delete [] Local_Halo;
-  
-}
 
-void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
-  
-  su2double *Node_Vel = NULL, *Node_Accel = NULL, *Stress = NULL;
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case FEM_ELASTICITY: FirstIndex = FEA_SOL; break;
-    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
+  /*--- Merge the information and write the output files ---*/
+
+  SetBaselineResult_Files(&solver, &geometry, config, 0, val_nZone);
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    delete solver[iZone];
   }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  GlobalField_Counter += nVar_Consv_Par;
-  
-  /*--- For now, leave the names as "Conservative_", etc., in order
-   to avoid confusion with the serial version, which still prints these
-   names. Names can be set alternatively by using the commented code
-   below. ---*/
-  
-  Variable_Names.push_back("Displacement_x");
-  Variable_Names.push_back("Displacement_y");
-  if (geometry->GetnDim() == 3)
-    Variable_Names.push_back("Displacement_z");
+  delete [] solver;
+}
 
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
+void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
+                                       CGeometry ****geometry,
+                                       CConfig **config,
+                                       unsigned long iExtIter,
+                                       unsigned short iZone,
+                                       unsigned short val_nZone,
+                                       unsigned short *nInst) {
   
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the residuals ---*/
+  unsigned short iVar, iInst;
+  unsigned long iPoint;
+  bool compressible = true;
     
-    if (config->GetWrt_Residuals()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      Variable_Names.push_back("Residual_Displacement_x");
-      Variable_Names.push_back("Residual_Displacement_y");
-      if (geometry->GetnDim() == 3)
-        Variable_Names.push_back("Residual_Displacement_z");
+    for (iInst = 0; iInst < nInst[iZone]; iInst++){
+
+      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
+      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
+
+      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- For now, we are disabling the parallel writers for Tecplot
+          ASCII until we have parallel versions of all file formats
+          available. SU2_SOL will remain intact for writing files
+          until this capability is completed. ---*/
+
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+
+#ifdef HAVE_MPI
+      /*--- Do not merge the connectivity or write the visualization files
+     if we are running in parallel. Force the use of SU2_SOL to merge and
+     write the viz. files in this case to save overhead. ---*/
+
+      if (size > SINGLE_NODE) {
+        Wrt_Vol = false;
+        Wrt_Srf = false;
+      }
+#endif
+
+    /*--- Check for compressible/incompressible flow problems. ---*/
+
+    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
+
+//    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+    
+//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+    
+//    switch (config[iZone]->GetKind_Solver()) {
+//      case EULER : case NAVIER_STOKES : case RANS :
+//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
+//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+//        break;
+//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
+//            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
+//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+//        break;
+//      default: break;
+//    }
+
+    /*--- Write a template inlet profile file if requested. ---*/
+
+    if (config[iZone]->GetWrt_InletFile()) {
+      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+      if (rank == MASTER_NODE) {
+        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+      }
+      config[iZone]->SetWrt_InletFile(false);
     }
-    
-    /*--- If the analysis is dynamic... ---*/
-    if (config->GetDynamic_Analysis() == DYNAMIC) {
+
+    /*--- This switch statement will become a call to a virtual function
+     defined within each of the "physics" output child classes that loads
+     the local data for that particular problem alone. ---*/
+
+      if (rank == MASTER_NODE)
+        cout << endl << "Loading solution output data locally on each rank." << endl;
+
+      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+         
+    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+
+      if (rank == MASTER_NODE)
+        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
       
-      /*--- Velocities ---*/
-      GlobalField_Counter += 2;
-      Variable_Names.push_back("Velocity_x");
-      Variable_Names.push_back("Velocity_y");
-      if (geometry->GetnDim() == 3) {
-        GlobalField_Counter += 1;
-        Variable_Names.push_back("Velocity_z");
+      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
       }
       
-      /*--- Accelerations ---*/
-      GlobalField_Counter += 2;
-      Variable_Names.push_back("Acceleration_x");
-      Variable_Names.push_back("Acceleration_y");
-      if (geometry->GetnDim() == 3) {
-        GlobalField_Counter += 1;
-        Variable_Names.push_back("Acceleration_z");
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
+        }
       }
+      
     }
     
-    if (!(config->GetDiscrete_Adjoint())) {
+    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
 
-      /*--- Add the stresses. ---*/
-    
-      GlobalField_Counter += 3;
-      Variable_Names.push_back("Sxx");
-      Variable_Names.push_back("Syy");
-      Variable_Names.push_back("Sxy");
-      if (geometry->GetnDim() == 3) {
-        GlobalField_Counter += 3;
-        Variable_Names.push_back("Szz");
-        Variable_Names.push_back("Sxz");
-        Variable_Names.push_back("Syz");
-      }
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
 
-      /*--- Add the Von Mises Stress. ---*/
-    
-      GlobalField_Counter += 1;
-      Variable_Names.push_back("Von_Mises_Stress");
-    
+      if (rank == MASTER_NODE)
+        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+      
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
+        }
+      }
+      
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
+        delete [] Local_Data_Copy[iPoint];
+      delete [] Local_Data_Copy;
+      
     }
     
-    /*--- New variables get registered here before the end of the loop. ---*/
+    /*--- After loading the data local to a processor, we perform a sorting,
+     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
     
-  }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
+    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
+    SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
+    
+    /*--- Write either a binary or ASCII restart file in parallel. ---*/
+
+    if (config[iZone]->GetWrt_Binary_Restart()) {
+      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
+      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+    } else {
+      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
+      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
     }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+
+    /*--- Write a slice on a structured mesh if requested. ---*/
+
+    if (config[iZone]->GetWrt_Slice()) {
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
+    }
+
+    /*--- Get the file output format ---*/
     
-    /*--- Check for halos & write only if requested ---*/
+    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
     
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-        }
-      }
+    /*--- Write the solution files if they are requested and we are executing
+     with a single rank (all data on one proc and no comm. overhead). Once we
+     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
+     can allow the write of the viz. files as well. ---*/
+
+    if ((size == SINGLE_NODE) && (rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
       
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Load the velocities and accelerations (dynamic calculations). ---*/
-        
-        if (config->GetDynamic_Analysis() == DYNAMIC) {
-          
-          /*--- Velocities ---*/
-          
-          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
-          Local_Data[jPoint][iVar] = Node_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Vel[2];
-            iVar++;
-          }
-          
-          /*--- Accelerations ---*/
-          
-          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
-          Local_Data[jPoint][iVar] = Node_Accel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Accel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Accel[2];
-            iVar++;
+      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
+
+      if (rank == MASTER_NODE)
+        cout << "Preparing element connectivity across all ranks." << endl;
+      SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+
+      /*--- Sort the surface data and renumber if for writing. ---*/
+
+      SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
+
+      if (Wrt_Vol) {
+
+        switch (FileFormat) {
+
+          case TECPLOT:
+
+            /*--- Write a Tecplot ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+            break;
+
+          case FIELDVIEW:
+
+            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
+
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+
+            break;
+
+          case TECPLOT_BINARY:
+
+            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+
+            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+            break;
+
+          case FIELDVIEW_BINARY:
+
+            /*--- FieldView binary files not yet available for parallel output. ---*/
+
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+            break;
+
+          case PARAVIEW:
+
+            /*--- Write a Paraview ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+            break;
+
+          default:
+            break;
           }
+
         }
-        
-        if (!(config->GetDiscrete_Adjoint())) {
 
-          /*--- Add the stresses. ---*/
-        
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-        
-          /*--- Sigma xx ---*/
-          Local_Data[jPoint][iVar] = Stress[0]; iVar++;
-          /*--- Sigma yy ---*/
-          Local_Data[jPoint][iVar] = Stress[1]; iVar++;
-          /*--- Sigma xy ---*/
-          Local_Data[jPoint][iVar] = Stress[2]; iVar++;
-        
-          if (geometry->GetnDim() == 3) {
-            /*--- Sigma zz ---*/
-            Local_Data[jPoint][iVar] = Stress[3]; iVar++;
-            /*--- Sigma xz ---*/
-            Local_Data[jPoint][iVar] = Stress[4]; iVar++;
-            /*--- Sigma yz ---*/
-            Local_Data[jPoint][iVar] = Stress[5]; iVar++;
+        if (Wrt_Srf) {
+
+          switch (FileFormat) {
+
+          case TECPLOT:
+
+            /*--- Write a Tecplot ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+            break;
+
+          case TECPLOT_BINARY:
+
+            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+
+            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+            break;
+
+          case PARAVIEW:
+
+            /*--- Write a Paraview ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+            break;
+
+          default:
+            break;
           }
-        
-          /*--- Add the Von Mises Stress. ---*/
-        
-          Local_Data[iPoint][iVar] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress(); iVar++;
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
+
         }
 
-      }
+        /*--- Clean up the connectivity data that was allocated for output. ---*/
 
-        /*--- Increment the point counter, as there may have been halos we
-         skipped over during the data loading. ---*/
-        
-        jPoint++;
-    }
-  }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  delete [] Local_Halo;
-  
-}
+        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
+        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
+
+        /*--- Clean up the surface data that was only needed for output. ---*/
+
+        DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-void COutput::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case HEAT_EQUATION_FVM: FirstIndex = HEAT_SOL;     break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  GlobalField_Counter += nVar_Consv_Par;
-  for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
-    varname << "Conservative_" << iVar+1;
-    Variable_Names.push_back(varname.str());
-    varname.str("");
-  }
-  
-  /*--- If requested, register the residuals for all of the
-   equations in the current problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      GlobalField_Counter += nVar_Consv_Par;
-      for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
-        varname << "Residual_" << iVar+1;
-        Variable_Names.push_back(varname.str());
-        varname.str("");
-      }
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos & write only if requested ---*/
-    
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-        }
       }
-      
-      /*--- New variables can be loaded to the Local_Data structure here,
-       assuming they were registered above correctly. ---*/
-      
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-      
-      jPoint++;
-      
+
+      /*--- Deallocate the nodal data needed for writing restarts. ---*/
+
+      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
+
     }
-  }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  delete [] Local_Halo;
-  
+
 }
 
 void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
@@ -13827,12 +5940,7 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   delete [] nPoint_Recv;
   delete [] nPoint_Send;
   delete [] nPoint_Flag;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    delete [] Local_Data[iPoint];
-  delete [] Local_Data;
-  
-  delete [] Local_Halo;
+
   delete [] npoint_procs;
   delete [] starting_node;
   delete [] ending_node;
@@ -16402,518 +8510,6 @@ void COutput::DeallocateInletCoordinates(CConfig *config, CGeometry *geometry) {
 
 }
 
-void COutput::SpecialOutput_AnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  unsigned short iDim, iMarker, iMarker_Analyze;
-  unsigned long iVertex, iPoint;
-  su2double Mach = 0.0, Pressure, Temperature = 0.0, TotalPressure = 0.0, TotalTemperature = 0.0,
-  Enthalpy, Velocity[3], TangVel[3], Velocity2, MassFlow, Density, Area,
-  AxiFactor = 1.0, SoundSpeed, Vn, Vn2, Vtang2, Weight = 1.0;
-
-  su2double Gas_Constant      = config->GetGas_ConstantND();
-  su2double Gamma             = config->GetGamma();
-  unsigned short nMarker      = config->GetnMarker_All();
-  unsigned short nDim         = geometry->GetnDim();
-  unsigned short Kind_Average = config->GetKind_Average();
-
-  bool compressible   = config->GetKind_Regime() == COMPRESSIBLE;
-  bool incompressible = config->GetKind_Regime() == INCOMPRESSIBLE;
-  bool energy         = config->GetEnergy_Equation();
-
-
-  bool axisymmetric               = config->GetAxisymmetric();
-  unsigned short nMarker_Analyze  = config->GetnMarker_Analyze();
-  
-  su2double  *Vector                    = new su2double[nDim];
-  su2double  *Surface_MassFlow          = new su2double[nMarker];
-  su2double  *Surface_Mach              = new su2double[nMarker];
-  su2double  *Surface_Temperature       = new su2double[nMarker];
-  su2double  *Surface_Density           = new su2double[nMarker];
-  su2double  *Surface_Enthalpy          = new su2double[nMarker];
-  su2double  *Surface_NormalVelocity    = new su2double[nMarker];
-  su2double  *Surface_StreamVelocity2   = new su2double[nMarker];
-  su2double  *Surface_TransvVelocity2   = new su2double[nMarker];
-  su2double  *Surface_Pressure          = new su2double[nMarker];
-  su2double  *Surface_TotalTemperature  = new su2double[nMarker];
-  su2double  *Surface_TotalPressure     = new su2double[nMarker];
-  su2double  *Surface_VelocityIdeal     = new su2double[nMarker];
-  su2double  *Surface_Area              = new su2double[nMarker];
-  su2double  *Surface_MassFlow_Abs      = new su2double[nMarker];
-  
-  /*--- Compute the numerical fan face Mach number, and the total area of the inflow ---*/
-  
-  for (iMarker = 0; iMarker < nMarker; iMarker++) {
-    
-    Surface_MassFlow[iMarker]          = 0.0;
-    Surface_Mach[iMarker]              = 0.0;
-    Surface_Temperature[iMarker]       = 0.0;
-    Surface_Density[iMarker]           = 0.0;
-    Surface_Enthalpy[iMarker]          = 0.0;
-    Surface_NormalVelocity[iMarker]    = 0.0;
-    Surface_StreamVelocity2[iMarker]   = 0.0;
-    Surface_TransvVelocity2[iMarker]   = 0.0;
-    Surface_Pressure[iMarker]          = 0.0;
-    Surface_TotalTemperature[iMarker]  = 0.0;
-    Surface_TotalPressure[iMarker]     = 0.0;
-    Surface_VelocityIdeal[iMarker]     = 0.0;
-    Surface_Area[iMarker]              = 0.0;
-    Surface_MassFlow_Abs[iMarker]      = 0.0;
-
-    if (config->GetMarker_All_Analyze(iMarker) == YES) {
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        
-        if (geometry->node[iPoint]->GetDomain()) {
-          
-          geometry->vertex[iMarker][iVertex]->GetNormal(Vector);
-          
-          if (axisymmetric) {
-            if (geometry->node[iPoint]->GetCoord(1) != 0.0)
-              AxiFactor = 2.0*PI_NUMBER*geometry->node[iPoint]->GetCoord(1);
-            else
-              AxiFactor = 1.0;
-          } else {
-            AxiFactor = 1.0;
-          }
-
-          Density = solver->node[iPoint]->GetDensity();
-          Velocity2 = 0.0; Area = 0.0; MassFlow = 0.0; Vn = 0.0; Vtang2 = 0.0;
-
-          for (iDim = 0; iDim < nDim; iDim++) {
-            Area += (Vector[iDim] * AxiFactor) * (Vector[iDim] * AxiFactor);
-            Velocity[iDim] = solver->node[iPoint]->GetVelocity(iDim);
-            Velocity2 += Velocity[iDim] * Velocity[iDim];
-            Vn += Velocity[iDim] * Vector[iDim] * AxiFactor;
-            MassFlow += Vector[iDim] * AxiFactor * Density * Velocity[iDim];
-          }
-          
-          Area       = sqrt (Area);
-          if (AxiFactor == 0.0) Vn = 0.0; else Vn /= Area;
-          Vn2        = Vn * Vn;
-          Pressure   = solver->node[iPoint]->GetPressure();
-          SoundSpeed = solver->node[iPoint]->GetSoundSpeed();
-
-          for (iDim = 0; iDim < nDim; iDim++) {
-            TangVel[iDim] = Velocity[iDim] - Vn*Vector[iDim]*AxiFactor/Area;
-            Vtang2       += TangVel[iDim]*TangVel[iDim];
-          }
-
-          if (incompressible){
-            if (config->GetKind_DensityModel() == VARIABLE) {
-              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
-              sqrt(solver->node[iPoint]->GetSpecificHeatCp()*config->GetPressure_ThermodynamicND()/(solver->node[iPoint]->GetSpecificHeatCv()*solver->node[iPoint]->GetDensity()));
-            } else {
-              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
-              sqrt(config->GetBulk_Modulus()/(solver->node[iPoint]->GetDensity()));
-            }
-            Temperature       = solver->node[iPoint]->GetTemperature();
-            Enthalpy          = solver->node[iPoint]->GetSpecificHeatCp()*Temperature;
-            TotalTemperature  = Temperature + 0.5*Velocity2/solver->node[iPoint]->GetSpecificHeatCp();
-            TotalPressure     = Pressure + 0.5*Density*Velocity2;
-          }
-          else{
-            Mach              = sqrt(Velocity2)/SoundSpeed;
-            Temperature       = Pressure / (Gas_Constant * Density);
-            Enthalpy          = solver->node[iPoint]->GetEnthalpy();
-            TotalTemperature  = Temperature * (1.0 + Mach * Mach * 0.5 * (Gamma - 1.0));
-            TotalPressure     = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
-          }
-
-          /*--- Compute the mass Surface_MassFlow ---*/
-
-          Surface_Area[iMarker]             += Area;
-          Surface_MassFlow[iMarker]         += MassFlow;
-          Surface_MassFlow_Abs[iMarker]     += abs(MassFlow);
-
-          if (Kind_Average == AVERAGE_MASSFLUX) Weight = abs(MassFlow);
-          else if (Kind_Average == AVERAGE_AREA) Weight = abs(Area);
-          else Weight = 1.0;
-          
-          Surface_Mach[iMarker]             += Mach*Weight;
-          Surface_Temperature[iMarker]      += Temperature*Weight;
-          Surface_Density[iMarker]          += Density*Weight;
-          Surface_Enthalpy[iMarker]         += Enthalpy*Weight;
-          Surface_NormalVelocity[iMarker]   += Vn*Weight;
-          Surface_Pressure[iMarker]         += Pressure*Weight;
-          Surface_TotalTemperature[iMarker] += TotalTemperature*Weight;
-          Surface_TotalPressure[iMarker]    += TotalPressure*Weight;
-
-          /*--- For now, always used the area to weight the uniformities. ---*/
-
-          Weight = abs(Area);
-
-          Surface_StreamVelocity2[iMarker]   += Vn2*Weight;
-          Surface_TransvVelocity2[iMarker]   += Vtang2*Weight;
-
-        }
-      }
-      
-    }
-    
-  }
-  
-  /*--- Copy to the appropriate structure ---*/
-  
-  su2double *Surface_MassFlow_Local          = new su2double [nMarker_Analyze];
-  su2double *Surface_Mach_Local              = new su2double [nMarker_Analyze];
-  su2double *Surface_Temperature_Local       = new su2double [nMarker_Analyze];
-  su2double *Surface_Density_Local           = new su2double [nMarker_Analyze];
-  su2double *Surface_Enthalpy_Local          = new su2double [nMarker_Analyze];
-  su2double *Surface_NormalVelocity_Local    = new su2double [nMarker_Analyze];
-  su2double *Surface_StreamVelocity2_Local   = new su2double [nMarker_Analyze];
-  su2double *Surface_TransvVelocity2_Local   = new su2double [nMarker_Analyze];
-  su2double *Surface_Pressure_Local          = new su2double [nMarker_Analyze];
-  su2double *Surface_TotalTemperature_Local  = new su2double [nMarker_Analyze];
-  su2double *Surface_TotalPressure_Local     = new su2double [nMarker_Analyze];
-  su2double *Surface_Area_Local              = new su2double [nMarker_Analyze];
-  su2double *Surface_MassFlow_Abs_Local      = new su2double [nMarker_Analyze];
-  
-  su2double *Surface_MassFlow_Total          = new su2double [nMarker_Analyze];
-  su2double *Surface_Mach_Total              = new su2double [nMarker_Analyze];
-  su2double *Surface_Temperature_Total       = new su2double [nMarker_Analyze];
-  su2double *Surface_Density_Total           = new su2double [nMarker_Analyze];
-  su2double *Surface_Enthalpy_Total          = new su2double [nMarker_Analyze];
-  su2double *Surface_NormalVelocity_Total    = new su2double [nMarker_Analyze];
-  su2double *Surface_StreamVelocity2_Total   = new su2double [nMarker_Analyze];
-  su2double *Surface_TransvVelocity2_Total   = new su2double [nMarker_Analyze];
-  su2double *Surface_Pressure_Total          = new su2double [nMarker_Analyze];
-  su2double *Surface_TotalTemperature_Total  = new su2double [nMarker_Analyze];
-  su2double *Surface_TotalPressure_Total     = new su2double [nMarker_Analyze];
-  su2double *Surface_Area_Total              = new su2double [nMarker_Analyze];
-  su2double *Surface_MassFlow_Abs_Total      = new su2double [nMarker_Analyze];
-
-  su2double *Surface_MomentumDistortion_Total = new su2double [nMarker_Analyze];
-
-  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-    Surface_MassFlow_Local[iMarker_Analyze]          = 0.0;
-    Surface_Mach_Local[iMarker_Analyze]              = 0.0;
-    Surface_Temperature_Local[iMarker_Analyze]       = 0.0;
-    Surface_Density_Local[iMarker_Analyze]           = 0.0;
-    Surface_Enthalpy_Local[iMarker_Analyze]          = 0.0;
-    Surface_NormalVelocity_Local[iMarker_Analyze]    = 0.0;
-    Surface_StreamVelocity2_Local[iMarker_Analyze]   = 0.0;
-    Surface_TransvVelocity2_Local[iMarker_Analyze]   = 0.0;
-    Surface_Pressure_Local[iMarker_Analyze]          = 0.0;
-    Surface_TotalTemperature_Local[iMarker_Analyze]  = 0.0;
-    Surface_TotalPressure_Local[iMarker_Analyze]     = 0.0;
-    Surface_Area_Local[iMarker_Analyze]              = 0.0;
-    Surface_MassFlow_Abs_Local[iMarker_Analyze]      = 0.0;
-    
-    Surface_MassFlow_Total[iMarker_Analyze]          = 0.0;
-    Surface_Mach_Total[iMarker_Analyze]              = 0.0;
-    Surface_Temperature_Total[iMarker_Analyze]       = 0.0;
-    Surface_Density_Total[iMarker_Analyze]           = 0.0;
-    Surface_Enthalpy_Total[iMarker_Analyze]          = 0.0;
-    Surface_NormalVelocity_Total[iMarker_Analyze]    = 0.0;
-    Surface_StreamVelocity2_Total[iMarker_Analyze]   = 0.0;
-    Surface_TransvVelocity2_Total[iMarker_Analyze]   = 0.0;
-    Surface_Pressure_Total[iMarker_Analyze]          = 0.0;
-    Surface_TotalTemperature_Total[iMarker_Analyze]  = 0.0;
-    Surface_TotalPressure_Total[iMarker_Analyze]     = 0.0;
-    Surface_Area_Total[iMarker_Analyze]              = 0.0;
-    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = 0.0;
-
-    Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
-
-  }
-  
-  /*--- Compute the numerical fan face Mach number, mach number, temperature and the total area ---*/
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    
-    if (config->GetMarker_All_Analyze(iMarker) == YES)  {
-      
-      for (iMarker_Analyze= 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-        
-        /*--- Add the Surface_MassFlow, and Surface_Area to the particular boundary ---*/
-        
-        if (config->GetMarker_All_TagBound(iMarker) == config->GetMarker_Analyze_TagBound(iMarker_Analyze)) {
-          Surface_MassFlow_Local[iMarker_Analyze]          += Surface_MassFlow[iMarker];
-          Surface_Mach_Local[iMarker_Analyze]              += Surface_Mach[iMarker];
-          Surface_Temperature_Local[iMarker_Analyze]       += Surface_Temperature[iMarker];
-          Surface_Density_Local[iMarker_Analyze]           += Surface_Density[iMarker];
-          Surface_Enthalpy_Local[iMarker_Analyze]          += Surface_Enthalpy[iMarker];
-          Surface_NormalVelocity_Local[iMarker_Analyze]    += Surface_NormalVelocity[iMarker];
-          Surface_StreamVelocity2_Local[iMarker_Analyze]   += Surface_StreamVelocity2[iMarker];
-          Surface_TransvVelocity2_Local[iMarker_Analyze]   += Surface_TransvVelocity2[iMarker];
-          Surface_Pressure_Local[iMarker_Analyze]          += Surface_Pressure[iMarker];
-          Surface_TotalTemperature_Local[iMarker_Analyze]  += Surface_TotalTemperature[iMarker];
-          Surface_TotalPressure_Local[iMarker_Analyze]     += Surface_TotalPressure[iMarker];
-          Surface_Area_Local[iMarker_Analyze]              += Surface_Area[iMarker];
-          Surface_MassFlow_Abs_Local[iMarker_Analyze]      += Surface_MassFlow_Abs[iMarker];
-        }
-        
-      }
-      
-    }
-    
-  }
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Allreduce(Surface_MassFlow_Local, Surface_MassFlow_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Mach_Local, Surface_Mach_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Temperature_Local, Surface_Temperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Density_Local, Surface_Density_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Enthalpy_Local, Surface_Enthalpy_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_NormalVelocity_Local, Surface_NormalVelocity_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_StreamVelocity2_Local, Surface_StreamVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_TransvVelocity2_Local, Surface_TransvVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Pressure_Local, Surface_Pressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_TotalTemperature_Local, Surface_TotalTemperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_TotalPressure_Local, Surface_TotalPressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_Area_Local, Surface_Area_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(Surface_MassFlow_Abs_Local, Surface_MassFlow_Abs_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-
-#else
-  
-  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-    Surface_MassFlow_Total[iMarker_Analyze]          = Surface_MassFlow_Local[iMarker_Analyze];
-    Surface_Mach_Total[iMarker_Analyze]              = Surface_Mach_Local[iMarker_Analyze];
-    Surface_Temperature_Total[iMarker_Analyze]       = Surface_Temperature_Local[iMarker_Analyze];
-    Surface_Density_Total[iMarker_Analyze]           = Surface_Density_Local[iMarker_Analyze];
-    Surface_Enthalpy_Total[iMarker_Analyze]          = Surface_Enthalpy_Local[iMarker_Analyze];
-    Surface_NormalVelocity_Total[iMarker_Analyze]    = Surface_NormalVelocity_Local[iMarker_Analyze];
-    Surface_StreamVelocity2_Total[iMarker_Analyze]   = Surface_StreamVelocity2_Local[iMarker_Analyze];
-    Surface_TransvVelocity2_Total[iMarker_Analyze]   = Surface_TransvVelocity2_Local[iMarker_Analyze];
-    Surface_Pressure_Total[iMarker_Analyze]          = Surface_Pressure_Local[iMarker_Analyze];
-    Surface_TotalTemperature_Total[iMarker_Analyze]  = Surface_TotalTemperature_Local[iMarker_Analyze];
-    Surface_TotalPressure_Total[iMarker_Analyze]     = Surface_TotalPressure_Local[iMarker_Analyze];
-    Surface_Area_Total[iMarker_Analyze]              = Surface_Area_Local[iMarker_Analyze];
-    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = Surface_MassFlow_Abs_Local[iMarker_Analyze];
-  }
-  
-#endif
-  
-  /*--- Compute the value of Surface_Area_Total, and Surface_Pressure_Total, and
-   set the value in the config structure for future use ---*/
-  
-  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-    
-    if (Kind_Average == AVERAGE_MASSFLUX) Weight = Surface_MassFlow_Abs_Total[iMarker_Analyze];
-    else if (Kind_Average == AVERAGE_AREA) Weight = abs(Surface_Area_Total[iMarker_Analyze]);
-    else Weight = 1.0;
-
-    if (Weight != 0.0) {
-      Surface_Mach_Total[iMarker_Analyze]             /= Weight;
-      Surface_Temperature_Total[iMarker_Analyze]      /= Weight;
-      Surface_Density_Total[iMarker_Analyze]          /= Weight;
-      Surface_Enthalpy_Total[iMarker_Analyze]         /= Weight;
-      Surface_NormalVelocity_Total[iMarker_Analyze]   /= Weight;
-      Surface_Pressure_Total[iMarker_Analyze]         /= Weight;
-      Surface_TotalTemperature_Total[iMarker_Analyze] /= Weight;
-      Surface_TotalPressure_Total[iMarker_Analyze]    /= Weight;
-    }
-    else {
-      Surface_Mach_Total[iMarker_Analyze]             = 0.0;
-      Surface_Temperature_Total[iMarker_Analyze]      = 0.0;
-      Surface_Density_Total[iMarker_Analyze]          = 0.0;
-      Surface_Enthalpy_Total[iMarker_Analyze]         = 0.0;
-      Surface_NormalVelocity_Total[iMarker_Analyze]   = 0.0;
-      Surface_Pressure_Total[iMarker_Analyze]         = 0.0;
-      Surface_TotalTemperature_Total[iMarker_Analyze] = 0.0;
-      Surface_TotalPressure_Total[iMarker_Analyze]    = 0.0;
-    }
-
-    /*--- Compute flow uniformity parameters separately (always area for now). ---*/
-
-    Area = fabs(Surface_Area_Total[iMarker_Analyze]);
-
-    if (Area != 0.0) {
-      Surface_MomentumDistortion_Total[iMarker_Analyze] = Surface_StreamVelocity2_Total[iMarker_Analyze]/(Surface_NormalVelocity_Total[iMarker_Analyze]*Surface_NormalVelocity_Total[iMarker_Analyze]*Area) - 1.0;
-      Surface_StreamVelocity2_Total[iMarker_Analyze] /= Area;
-      Surface_TransvVelocity2_Total[iMarker_Analyze] /= Area;
-    }
-    else {
-      Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
-      Surface_StreamVelocity2_Total[iMarker_Analyze]    = 0.0;
-      Surface_TransvVelocity2_Total[iMarker_Analyze]    = 0.0;
-    }
-
-  }
-  
-  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-    
-    su2double MassFlow = Surface_MassFlow_Total[iMarker_Analyze] * config->GetDensity_Ref() * config->GetVelocity_Ref();
-    if (config->GetSystemMeasurements() == US) MassFlow *= 32.174;
-    config->SetSurface_MassFlow(iMarker_Analyze, MassFlow);
-    
-    su2double Mach = Surface_Mach_Total[iMarker_Analyze];
-    config->SetSurface_Mach(iMarker_Analyze, Mach);
-    
-    su2double Temperature = Surface_Temperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
-    config->SetSurface_Temperature(iMarker_Analyze, Temperature);
-    
-    su2double Pressure = Surface_Pressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
-    config->SetSurface_Pressure(iMarker_Analyze, Pressure);
-    
-    su2double Density = Surface_Density_Total[iMarker_Analyze] * config->GetDensity_Ref();
-    config->SetSurface_Density(iMarker_Analyze, Density);
-    
-    su2double Enthalpy = Surface_Enthalpy_Total[iMarker_Analyze];
-    config->SetSurface_Enthalpy(iMarker_Analyze, Enthalpy);
-    
-    su2double NormalVelocity = Surface_NormalVelocity_Total[iMarker_Analyze] * config->GetVelocity_Ref();
-    config->SetSurface_NormalVelocity(iMarker_Analyze, NormalVelocity);
-
-    su2double Uniformity = sqrt(Surface_StreamVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
-    config->SetSurface_Uniformity(iMarker_Analyze, Uniformity);
-
-    su2double SecondaryStrength = sqrt(Surface_TransvVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
-    config->SetSurface_SecondaryStrength(iMarker_Analyze, SecondaryStrength);
-
-    su2double MomentumDistortion = Surface_MomentumDistortion_Total[iMarker_Analyze];
-    config->SetSurface_MomentumDistortion(iMarker_Analyze, MomentumDistortion);
-
-    su2double SecondOverUniform = SecondaryStrength/Uniformity;
-    config->SetSurface_SecondOverUniform(iMarker_Analyze, SecondOverUniform);
-
-    su2double TotalTemperature = Surface_TotalTemperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
-    config->SetSurface_TotalTemperature(iMarker_Analyze, TotalTemperature);
-    
-    su2double TotalPressure = Surface_TotalPressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
-    config->SetSurface_TotalPressure(iMarker_Analyze, TotalPressure);
-    
-  }
-
-  /*--- Compute the average static pressure drop between two surfaces. Note
-   that this assumes we have two surfaces being analyzed and that the outlet
-   is first followed by the inlet. This is because we may also want to choose
-   outlet values (temperature, uniformity, etc.) for our design problems,
-   which require the outlet to be listed first. This is a simple first version
-   that could be generalized to a different orders/lists/etc. ---*/
-
-  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-    if (nMarker_Analyze == 2) {
-      su2double Pressure_Drop = (Surface_Pressure_Total[1]-Surface_Pressure_Total[0]) * config->GetPressure_Ref();
-      config->SetSurface_PressureDrop(iMarker_Analyze, Pressure_Drop);
-    } else {
-      config->SetSurface_PressureDrop(iMarker_Analyze, 0.0);
-    }
-  }
-
-  if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint() && output) {
-    
-    cout.precision(6);
-    cout.setf(ios::scientific, ios::floatfield);
-    cout << endl << "Computing surface mean values." << endl << endl;
-    
-    for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-      cout << "Surface "<< config->GetMarker_Analyze_TagBound(iMarker_Analyze) << ":" << endl;
-      
-      if (nDim == 3) { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m^2): "; else cout << setw(20) << "Area (ft^2): "; }
-      else { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m): "; else cout << setw(20) << "Area (ft): "; }
-      
-      if (config->GetSystemMeasurements() == SI)      cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze]);
-      else if (config->GetSystemMeasurements() == US) cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze])*12.0*12.0;
-      
-      cout << endl;
-
-      su2double MassFlow = config->GetSurface_MassFlow(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Mf (kg/s): " << setw(15) << MassFlow;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Mf (lbs/s): " << setw(15) << MassFlow;
-      
-      su2double NormalVelocity = config->GetSurface_NormalVelocity(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Vn (m/s): " << setw(15) << NormalVelocity;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Vn (ft/s): " << setw(15) << NormalVelocity;
-      
-      cout << endl;
-
-      su2double Uniformity = config->GetSurface_Uniformity(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Uniformity (m/s): " << setw(15) << Uniformity;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Uniformity (ft/s): " << setw(15) << Uniformity;
-
-      su2double SecondaryStrength = config->GetSurface_SecondaryStrength(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Secondary (m/s): " << setw(15) << SecondaryStrength;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Secondary (ft/s): " << setw(15) << SecondaryStrength;
-
-      cout << endl;
-
-      su2double MomentumDistortion = config->GetSurface_MomentumDistortion(iMarker_Analyze);
-      cout << setw(20) << "Mom. Distortion: " << setw(15) << MomentumDistortion;
-
-      su2double SecondOverUniform = config->GetSurface_SecondOverUniform(iMarker_Analyze);
-      cout << setw(20) << "Second/Uniform: " << setw(15) << SecondOverUniform;
-
-      cout << endl;
-
-      su2double Pressure = config->GetSurface_Pressure(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "P (Pa): " << setw(15) << Pressure;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "P (psf): " << setw(15) << Pressure;
-      
-      su2double TotalPressure = config->GetSurface_TotalPressure(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "PT (Pa): " << setw(15) <<TotalPressure;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "PT (psf): " << setw(15) <<TotalPressure;
-
-      cout << endl;
-
-      su2double Mach = config->GetSurface_Mach(iMarker_Analyze);
-      cout << setw(20) << "Mach: " << setw(15) << Mach;
-
-      su2double Density = config->GetSurface_Density(iMarker_Analyze);
-      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Rho (kg/m^3): " << setw(15) << Density;
-      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Rho (lb/ft^3): " << setw(15) << Density*32.174;
-
-      cout << endl;
-
-      if (compressible || energy) {
-        su2double Temperature = config->GetSurface_Temperature(iMarker_Analyze);
-        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "T (K): " << setw(15) << Temperature;
-        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "T (R): " << setw(15) << Temperature;
-
-        su2double TotalTemperature = config->GetSurface_TotalTemperature(iMarker_Analyze);
-        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "TT (K): " << setw(15) << TotalTemperature;
-        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "TT (R): " << setw(15) << TotalTemperature;
-
-        cout << endl;
-      }
-
-    }
-    cout.unsetf(ios_base::floatfield);
-    
-  }
-  
-  delete [] Surface_MassFlow_Local;
-  delete [] Surface_Mach_Local;
-  delete [] Surface_Temperature_Local;
-  delete [] Surface_Density_Local;
-  delete [] Surface_Enthalpy_Local;
-  delete [] Surface_NormalVelocity_Local;
-  delete [] Surface_Pressure_Local;
-  delete [] Surface_TotalTemperature_Local;
-  delete [] Surface_TotalPressure_Local;
-  delete [] Surface_Area_Local;
-  delete [] Surface_MassFlow_Abs_Local;
-  
-  delete [] Surface_MassFlow_Total;
-  delete [] Surface_Mach_Total;
-  delete [] Surface_Temperature_Total;
-  delete [] Surface_Density_Total;
-  delete [] Surface_Enthalpy_Total;
-  delete [] Surface_NormalVelocity_Total;
-  delete [] Surface_Pressure_Total;
-  delete [] Surface_TotalTemperature_Total;
-  delete [] Surface_TotalPressure_Total;
-  delete [] Surface_Area_Total;
-  delete [] Surface_MassFlow_Abs_Total;
-  
-  delete [] Surface_MassFlow;
-  delete [] Surface_Mach;
-  delete [] Surface_Temperature;
-  delete [] Surface_Density;
-  delete [] Surface_Enthalpy;
-  delete [] Surface_NormalVelocity;
-  delete [] Surface_Pressure;
-  delete [] Surface_TotalTemperature;
-  delete [] Surface_TotalPressure;
-  delete [] Surface_Area;
-  delete [] Vector;
-  delete [] Surface_VelocityIdeal;
-  delete [] Surface_MassFlow_Abs;
-  
-}
-
 void COutput::SetHistoryFile_Header(CConfig *config) { 
 
   

From 4bebe3192b859d2ef5306458ae04a859d16bd129 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 16:02:45 +0200
Subject: [PATCH 037/539] Fixed a bug in per surface history output

---
 SU2_CFD/include/output_structure.inl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 4abb88d64f10..77790b409d7a 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -99,9 +99,11 @@ inline void COutput::AddHistoryOutput(string name, string field_name, unsigned s
 }
 
 inline void COutput::AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
-  for (unsigned short i = 0; i < marker_names.size(); i++){
-    HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
-    HistoryOutputPerSurface_List.push_back(field_name+"("+marker_names[i]+")");
+  if (marker_names.size() != 0){
+    HistoryOutputPerSurface_List.push_back(name);
+    for (unsigned short i = 0; i < marker_names.size(); i++){
+      HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
+    }
   }
 }
 

From 651a4048acf4d825f50085394a1b8eed81d8656d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 16:03:37 +0200
Subject: [PATCH 038/539] Enabled correct screen output for unsteady problems
 in CFlowOutput and CIncFlowOutput

---
 SU2_CFD/src/output_direct_mean.cpp     | 6 ++++--
 SU2_CFD/src/output_direct_mean_inc.cpp | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 02056a7bc412..c8a7b1d29023 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -506,9 +506,11 @@ bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime)
 
 bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header;
-  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
+  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)) ||
+     ( (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() ==DT_STEPPING_2ND) && config->GetIntIter() == 0);
+  
+  return write_header;
   
-  return true;
 }
 
 bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 0ba97de3ab7f..5dad3aefbc9b 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -177,9 +177,10 @@ inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_
 
 inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header;
-  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
+  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)) ||
+     ( (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() ==DT_STEPPING_2ND) && config->GetIntIter() == 0);
   
-  return true;
+  return write_header;
 }
 inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   return true;

From d1e58a23b5461f67eea1a9b9005e017df9aca543 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 Aug 2018 17:06:42 +0200
Subject: [PATCH 039/539] Updated some comments

---
 SU2_CFD/src/output_structure.cpp | 46 ++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 81abc8588488..c4b6da67b1c2 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8523,31 +8523,33 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   
   string currentField;
    
+  bool found_field = false;
+  
   for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
     currentField = config->GetHistoryOutput_Field(iField);   
-    
+    found_field = false;
     for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
       HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
       if (currentField == Field.OutputGroup){
         AddHistoryHeaderString(Field.FieldName);
+        found_field = true;
       }
     }
-  }
-  
-  
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);   
     
     for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
       for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
         HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
         if (currentField == Field.OutputGroup){
           AddHistoryHeaderString(Field.FieldName);
+          found_field = true;
         }
       }
     }
+    if (!found_field){
+      SU2_MPI::Error(string("There is no history output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
+    }
   }
-  
+    
   stringstream out;
   for (unsigned short iHeader = 0; iHeader < HistoryHeader.size(); iHeader++){
     out << "\"" << HistoryHeader[iHeader] << "\"";
@@ -8685,16 +8687,19 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
       
     char buffer[50];
     
-    // Retrieve the history filename
+     /*--- Retrieve the history filename ---*/
+    
     string history_filename = config->GetConv_FileName();
     
-    // Append the zone ID
+     /*--- Append the zone ID ---*/
+    
     if(config->GetnZone() > 1){
       history_filename = config->GetMultizone_HistoryFileName(history_filename, config->GetiZone());
     }
     strcpy (char_histfile, history_filename.data());
     
-    // Append the restart iteration: if dynamic problem and restart
+     /*--- Append the restart iteration: if dynamic problem and restart ---*/
+    
     if (config->GetWrt_Unsteady() && config->GetRestart()) {
       long iExtIter = config->GetDyn_RestartIter();
       if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
@@ -8705,19 +8710,27 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
       strcat(char_histfile, buffer);
     }
     
-    // Add the correct file extension depending on the file format
+    /*--- Add the correct file extension depending on the file format ---*/
+    
     if ((config->GetOutput_FileFormat() == TECPLOT) ||
         (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
     else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
              (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
+    
+    /*--- Set the History output fields using a virtual function call to the child implementation ---*/
+    
     SetHistoryOutputFields(config);
-    // Open the history file using only the master node
+    
+    /*--- Open the history file ---*/
     
     cout << "History filename: " << char_histfile << endl;
     HistFile.open(char_histfile, ios::out);
     HistFile.precision(15);
+    
+    /*--- Add the header to the history file. ---*/
+    
     SetHistoryFile_Header(config);    
   }
   
@@ -8725,6 +8738,8 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
+  /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
+  
   SetVolumeOutputFields(config);
   
   GlobalField_Counter = 0;
@@ -8742,7 +8757,7 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     /*--- Loop through all fields defined in the corresponding SetVolumeOutputFields(). 
      * If it is also defined in the config (either as part of a group or a single field), the field 
      * object gets an offset so that we know where to find the data in the Local_Data() array.
-     *  Note that the default offset is -1. ---*/
+     *  Note that the default offset is -1. An index !=-1 defines this field as part of the output. ---*/
     
     for (unsigned short iField_Output = 0; iField_Output < VolumeOutput_List.size(); iField_Output++){
       
@@ -8758,10 +8773,13 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     }
     
     if (!found_field){
-      SU2_MPI::Error(string("There is no output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
+      SU2_MPI::Error(string("There is no volume output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
     }
   }
 
+  
+  /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
+   * before writing it to file ---*/
     
   unsigned long iPoint, iVertex;
   bool Wrt_Halo, isPeriodic;

From 4860dc2092493fa37d49b4cc1a31bf575307d8fd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Sep 2018 10:16:54 +0200
Subject: [PATCH 040/539] Added default output for CIncFlowSol and CFlowSol

---
 SU2_CFD/include/output_structure.hpp   |  6 ++++
 SU2_CFD/src/output_direct_mean.cpp     | 17 +++++++++-
 SU2_CFD/src/output_direct_mean_inc.cpp | 15 +++++++++
 SU2_CFD/src/output_structure.cpp       | 43 +++++++++++++++++---------
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index bcd5519e9cef..caaf43d93800 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -253,9 +253,15 @@ class COutput {
   
   std::map<string, VolumeOutputField >          VolumeOutput_Map;
   std::vector<string>                           VolumeOutput_List;
+  
+  std::vector<string> HistoryFields;
+  unsigned short nHistoryOutput;
+  std::vector<string> ScreenFields;
+  unsigned short nScreenOutput;
   char char_histfile[200];
 
   ofstream HistFile;
+  
 public:
 
   /*! 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 3bc613783189..ea061f14b8c4 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -68,7 +68,22 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
   RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
   factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-
+  
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nHistoryOutput == 0){
+    HistoryFields.push_back("EXT_ITER");
+    HistoryFields.push_back("RESIDUALS");
+    nHistoryOutput = HistoryFields.size();
+  }
+  if (nScreenOutput == 0){
+    ScreenFields.push_back("EXT_ITER");
+    ScreenFields.push_back("DENSITY");
+    ScreenFields.push_back("MOMENTUM-X");
+    ScreenFields.push_back("MOMENTUM-Y");
+    ScreenFields.push_back("ENERGY");
+    nScreenOutput = ScreenFields.size();
+  }
 }
 
 CFlowOutput::~CFlowOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 5dad3aefbc9b..619ba91d62fe 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -73,6 +73,21 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
   factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
   
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nHistoryOutput == 0){
+    HistoryFields.push_back("EXT_ITER");
+    HistoryFields.push_back("RESIDUALS");
+    nHistoryOutput = HistoryFields.size();
+  }
+  
+  if (nScreenOutput == 0){
+    ScreenFields.push_back("EXT_ITER");
+    ScreenFields.push_back("PRESSURE");
+    ScreenFields.push_back("VELOCITY-X");
+    ScreenFields.push_back("VELOCITY-Y");
+    nScreenOutput = ScreenFields.size();
+  }
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 7d472fa8ef99..a57cccf0ea78 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -307,6 +307,17 @@ COutput::COutput(CConfig *config) {
       }
     }
   }
+  
+  nHistoryOutput = config->GetnHistoryOutput();
+  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
+    HistoryFields.push_back(config->GetHistoryOutput_Field(iField));
+  }
+  
+  nScreenOutput = config->GetnScreenOutput();
+  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+    ScreenFields.push_back(config->GetScreenOutput_Field(iField));
+  }
+  
 }
 
 COutput::~COutput(void) {
@@ -8529,11 +8540,11 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   }
   
   string currentField;
-   
+  
   bool found_field = false;
   
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);   
+  for (unsigned short iField = 0; iField <nHistoryOutput; iField++){
+    currentField = HistoryFields[iField];   
     found_field = false;
     for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
       HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
@@ -8584,8 +8595,8 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   
   HistoryValues.clear();
   
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);   
+  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
+    currentField = HistoryFields[iField];   
     
     for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
       HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
@@ -8596,8 +8607,8 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   }
   
   
-  for (unsigned short iField = 0; iField < config->GetnHistoryOutput(); iField++){
-    currentField = config->GetHistoryOutput_Field(iField);   
+  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
+    currentField = HistoryFields[iField];   
     
     for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
       for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
@@ -8619,15 +8630,18 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   HistFile.flush();
 }
 
-void COutput::SetScreen_Header(CConfig *config) { 
-  
+void COutput::SetScreen_Header(CConfig *config) {
+
+  const std::string sep = " |" ;
+  const int total_width = field_width*nScreenOutput + sep.size() * nScreenOutput ;
+  const std::string line = sep + std::string( total_width-1, '-' ) + '|' ;
   stringstream out;
   string currentField;
   // Insert line break
-  out << endl;
+  out << line << '\n' << sep;
   // Evaluate the requested output
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    currentField = config->GetScreenOutput_Field(iField);  
+  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+    currentField = ScreenFields[iField];  
     if (HistoryOutput_Map.count(currentField) > 0){
       PrintScreenHeaderString(out, HistoryOutput_Map[currentField].FieldName);
     } else {
@@ -8651,8 +8665,9 @@ void COutput::SetScreen_Output(CConfig *config) {
   stringstream out;
   string currentField;
   
-  for (unsigned short iField = 0; iField < config->GetnScreenOutput(); iField++){
-    currentField = config->GetScreenOutput_Field(iField); 
+  
+  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+    currentField = ScreenFields[iField]; 
     if (HistoryOutput_Map.count(currentField) > 0){  
       switch (HistoryOutput_Map[currentField].ScreenFormat) {
       case FORMAT_INTEGER:

From 1e66a2f8365767cf2b7732c325bf2a83223930d5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Sep 2018 10:17:40 +0200
Subject: [PATCH 041/539] Some renaming

---
 SU2_CFD/include/output_structure.hpp      |  2 +-
 SU2_CFD/include/output_structure.inl      |  2 +-
 SU2_CFD/src/output_adjoint_discrete.cpp   | 34 ++++++------
 SU2_CFD/src/output_adjoint_elasticity.cpp | 16 +++---
 SU2_CFD/src/output_adjoint_mean.cpp       | 34 ++++++------
 SU2_CFD/src/output_direct_elasticity.cpp  | 36 ++++++-------
 SU2_CFD/src/output_direct_heat.cpp        | 16 +++---
 SU2_CFD/src/output_direct_mean.cpp        | 65 ++++++++++++-----------
 SU2_CFD/src/output_direct_mean_inc.cpp    | 62 ++++++++++-----------
 9 files changed, 135 insertions(+), 132 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index caaf43d93800..4ae04df4941e 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -852,7 +852,7 @@ class COutput {
   
   void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname );
   
-  void SetHistoryOutputField(string name, su2double value);
+  void SetHistoryOutputValue(string name, su2double value);
   
   void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names);
   
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 77790b409d7a..793a5b73c458 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -107,7 +107,7 @@ inline void COutput::AddHistoryOutputPerSurface(string name, string field_name,
   }
 }
 
-inline void COutput::SetHistoryOutputField(string name, su2double value){
+inline void COutput::SetHistoryOutputValue(string name, su2double value){
   if (HistoryOutput_Map.count(name) > 0){
     HistoryOutput_Map[name].Value = value;
   } else {
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index e400df6b8dc8..9c4ffe9ddfed 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -87,34 +87,34 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
 
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputField("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputField("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetHistoryOutputField("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputField("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
-    SetHistoryOutputField("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
   } else {
-    SetHistoryOutputField("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+    SetHistoryOutputValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputField("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputField("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetHistoryOutputField("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
     break;
   default: break;
   }
-  SetHistoryOutputField("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
-  SetHistoryOutputField("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
-  SetHistoryOutputField("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
-  SetHistoryOutputField("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
-  SetHistoryOutputField("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
-  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
+  SetHistoryOutputValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
+  SetHistoryOutputValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
+  SetHistoryOutputValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
 
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index b9b59f24f8f3..7a47c75155fb 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -86,15 +86,15 @@ void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
 inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputValue("PHYS_TIME", timeused);
   
-  SetHistoryOutputField("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputField("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputValue("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputValue("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
   if (nVar_FEM == 3){
-    SetHistoryOutputField("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
+    SetHistoryOutputValue("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
   }
   su2double Total_SensE = 0.0; su2double Total_SensNu = 0.0;  
   if (config[val_iZone]->GetnElasticityMod() == 1){
@@ -112,8 +112,8 @@ inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *
     Total_SensNu = sqrt(Total_SensNu);
 
   }
-  SetHistoryOutputField("SENS_E", Total_SensE);
-  SetHistoryOutputField("SENS_NU", Total_SensNu);
+  SetHistoryOutputValue("SENS_E", Total_SensE);
+  SetHistoryOutputValue("SENS_NU", Total_SensNu);
   
 }
 
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index f4ec9971b4a8..a5a144b7035c 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -100,34 +100,34 @@ inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
   CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
   
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputField("ADJOINT_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
-  SetHistoryOutputField("ADJOINT_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
-  SetHistoryOutputField("ADJOINT_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
+  SetHistoryOutputValue("ADJOINT_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("ADJOINT_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("ADJOINT_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputField("ADJOINT_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
-    SetHistoryOutputField("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
+    SetHistoryOutputValue("ADJOINT_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
   } else {
-    SetHistoryOutputField("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
+    SetHistoryOutputValue("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputField("ADJOINT_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("ADJOINT_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputField("ADJOINT_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
-    SetHistoryOutputField("ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("ADJOINT_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
     break;
   default: break;
   }
-  SetHistoryOutputField("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
-  SetHistoryOutputField("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
-  SetHistoryOutputField("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
-  SetHistoryOutputField("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
-  SetHistoryOutputField("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
-  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
+  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
+  SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
+  SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
+  SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 8451d298c1f9..0d0f9f56459e 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -74,10 +74,10 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
   bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputValue("PHYS_TIME", timeused);
   
   /*--- Residuals: ---*/
   /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
@@ -85,32 +85,32 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 
   
   if (linear_analysis){
-    SetHistoryOutputField("UTOL", log10(fea_solver->GetRes_RMS(0)));
-    SetHistoryOutputField("RTOL", log10(fea_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("UTOL", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RTOL", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputField("ETOL", log10(fea_solver->GetRes_RMS(2)));    
+      SetHistoryOutputValue("ETOL", log10(fea_solver->GetRes_RMS(2)));    
     }
-    SetHistoryOutputField("DISP_X", log10(fea_solver->GetRes_RMS(0)));
-    SetHistoryOutputField("DISP_Y", log10(fea_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("DISP_X", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("DISP_Y", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputField("DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
+      SetHistoryOutputValue("DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
     }
   } else if (nonlinear_analysis){
-    SetHistoryOutputField("UTOL", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputField("RTOL", log10(fea_solver->GetRes_FEM(1)));
+    SetHistoryOutputValue("UTOL", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("RTOL", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputField("ETOL", log10(fea_solver->GetRes_FEM(2)));    
+      SetHistoryOutputValue("ETOL", log10(fea_solver->GetRes_FEM(2)));    
     }
-    SetHistoryOutputField("DISP_X", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputField("DISP_Y", log10(fea_solver->GetRes_FEM(1)));
+    SetHistoryOutputValue("DISP_X", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("DISP_Y", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputField("DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
+      SetHistoryOutputValue("DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
     }
   }
   
-  SetHistoryOutputField("VMS", fea_solver->GetTotal_CFEA());
-  SetHistoryOutputField("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
-  SetHistoryOutputField("LOAD_RAMP", fea_solver->GetForceCoeff());
+  SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
+  SetHistoryOutputValue("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
+  SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
   
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 79be682406d0..e54c2e6af5ef 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -71,16 +71,16 @@ void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   
   CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];  
   
-  SetHistoryOutputField("EXT_ITER",     config[val_iZone]->GetExtIter());
-  SetHistoryOutputField("INT_ITER",     config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER",     config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER",     config[val_iZone]->GetIntIter());
   
-  SetHistoryOutputField("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
-  SetHistoryOutputField("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
-  SetHistoryOutputField("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
-  SetHistoryOutputField("HEAT", log10(heat_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
+  SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
+  SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
+  SetHistoryOutputValue("HEAT", log10(heat_solver->GetRes_RMS(0)));
   
-  SetHistoryOutputField("PHYS_TIME", timeused);
-  SetHistoryOutputField("LINSOL_ITER", heat_solver->GetIterLinSolver());
+  SetHistoryOutputValue("PHYS_TIME", timeused);
+  SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
   
 }
   
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index ea061f14b8c4..918aa2ce89d6 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -439,63 +439,66 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
   CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
   
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());  
-  SetHistoryOutputField("PHYS_TIME", timeused);
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());  
+  SetHistoryOutputValue("PHYS_TIME", timeused);
   
-  SetHistoryOutputField("DENSITY", log10(flow_solver->GetRes_RMS(0)));
-  SetHistoryOutputField("MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
-  SetHistoryOutputField("MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
+  SetHistoryOutputValue("DENSITY", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
   if (nDim == 2)
-    SetHistoryOutputField("ENERGY", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("ENERGY", log10(flow_solver->GetRes_RMS(3)));
   else {
-    SetHistoryOutputField("MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
-    SetHistoryOutputField("ENERGY", log10(flow_solver->GetRes_RMS(4)));
+    SetHistoryOutputValue("MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("ENERGY", log10(flow_solver->GetRes_RMS(4)));
   }
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputField("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputField("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
-    SetHistoryOutputField("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   default: break;
   }
   
-  SetHistoryOutputField("DRAG", flow_solver->GetTotal_CD());
-  SetHistoryOutputField("LIFT", flow_solver->GetTotal_CL());
+  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
-    SetHistoryOutputField("SIDEFORCE", flow_solver->GetTotal_CSF());
-  SetHistoryOutputField("MOMENT-X", flow_solver->GetTotal_CMx());
-  SetHistoryOutputField("MOMENT-Y", flow_solver->GetTotal_CMy());
-  if (nDim == 3)
-    SetHistoryOutputField("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputField("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputField("FORCE-Y", flow_solver->GetTotal_CFy());
+    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
+  if (nDim == 3){
+    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
+    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
+  }
+  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
   if (nDim == 3)
-    SetHistoryOutputField("FORCE-Z", flow_solver->GetTotal_CFz());
-  
+    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
+  SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
       SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3){
+      SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+    }
+    SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
+      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
+    
+    SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
   }
   
-  SetHistoryOutputField("AOA", config[val_iZone]->GetAoA());
-  SetHistoryOutputField("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
-  SetHistoryOutputField("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++) {  
     SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW",               config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 619ba91d62fe..67f20222de11 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -209,53 +209,53 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];  
   CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];
   
-  SetHistoryOutputField("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputField("EXT_ITER", config[val_iZone]->GetExtIter());
-  SetHistoryOutputField("PRESSURE", log10(flow_solver->GetRes_RMS(0)));
-  SetHistoryOutputField("VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
-  SetHistoryOutputField("VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
-  if (nDim == 3) SetHistoryOutputField("VELOCITY-Z", log10(flow_solver->GetRes_RMS(3)));
+  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("PRESSURE", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
+  if (nDim == 3) SetHistoryOutputValue("VELOCITY-Z", log10(flow_solver->GetRes_RMS(3)));
  
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputField("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputField("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
-    SetHistoryOutputField("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   }
   if (weakly_coupled_heat){
-    SetHistoryOutputField("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
-    SetHistoryOutputField("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
-    SetHistoryOutputField("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
-    SetHistoryOutputField("HEAT",         log10(heat_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
+    SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
+    SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
+    SetHistoryOutputValue("HEAT",         log10(heat_solver->GetRes_RMS(0)));
   }
   if (heat){
-    SetHistoryOutputField("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
-    SetHistoryOutputField("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
-    SetHistoryOutputField("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
-    if (nDim == 3) SetHistoryOutputField("HEAT",         log10(flow_solver->GetRes_RMS(4)));
-    else           SetHistoryOutputField("HEAT",         log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
+    SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
+    SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
+    if (nDim == 3) SetHistoryOutputValue("HEAT",         log10(flow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputValue("HEAT",         log10(flow_solver->GetRes_RMS(3)));
 
   }
-  SetHistoryOutputField("DRAG", flow_solver->GetTotal_CD());
-  SetHistoryOutputField("LIFT", flow_solver->GetTotal_CL());
+  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
-    SetHistoryOutputField("SIDEFORCE", flow_solver->GetTotal_CSF());
-  SetHistoryOutputField("MOMENT-X", flow_solver->GetTotal_CMx());
-  SetHistoryOutputField("MOMENT-Y", flow_solver->GetTotal_CMy());
+    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
+  SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
+  SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
   if (nDim == 3)
-    SetHistoryOutputField("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputField("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputField("FORCE-Y", flow_solver->GetTotal_CFy());
+    SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
   if (nDim == 3)
-    SetHistoryOutputField("FORCE-Z", flow_solver->GetTotal_CFz());
+    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   
-  SetHistoryOutputField("AOA", config[val_iZone]->GetAoA());
-  SetHistoryOutputField("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
-  SetHistoryOutputField("PHYS_TIME", timeused);
-  SetHistoryOutputField("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
+  SetHistoryOutputValue("PHYS_TIME", timeused);
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {

From e6fd2e4fe63969e9e6c108ab0abdc3079e027cc2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Sep 2018 10:18:37 +0200
Subject: [PATCH 042/539] Added recent changes of develop in output_structure

---
 SU2_CFD/src/output_paraview.cpp  | 13 +----
 SU2_CFD/src/output_structure.cpp | 90 ++++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp
index 26094a9fd90e..87400771f9e9 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output_paraview.cpp
@@ -107,15 +107,6 @@ string GetVTKFilename(CConfig *config, unsigned short val_iZone,
       fileroot = config->GetStructure_FileName().c_str();
   }
   
-  if (Kind_Solver == WAVE_EQUATION)
-    fileroot = config->GetWave_FileName().c_str();
-  
-  if (Kind_Solver == POISSON_EQUATION)
-    fileroot = config->GetStructure_FileName().c_str();
-  
-  if (Kind_Solver == HEAT_EQUATION)
-    fileroot = config->GetHeat_FileName().c_str();
-  
   if (config->GetKind_SU2() == SU2_DOT) {
     if (surf_sol)
       fileroot = config->GetSurfSens_FileName();
@@ -124,9 +115,7 @@ string GetVTKFilename(CConfig *config, unsigned short val_iZone,
   }
   
   strcpy (cstr, fileroot.c_str());
-  if (Kind_Solver == POISSON_EQUATION)
-    strcpy (cstr, config->GetStructure_FileName().c_str());
-  
+
   /*--- Special cases where a number needs to be appended to the file name. ---*/
   
   if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS || Kind_Solver == FEM_ELASTICITY) &&
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index a57cccf0ea78..893440d641af 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -3146,14 +3146,6 @@ void COutput::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolve
           if (isPeriodic) Local_Halo[iPoint] = false;
         }
       }
-<<<<<<< HEAD
-=======
-
-      /*--- Deallocate the nodal data needed for writing restarts. ---*/
-
-      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
->>>>>>> dfdb1fdd2aa34c744e689046639ba8daa5c6ce23
     }
     
     /*--- Sum total number of nodes that belong to the domain ---*/
@@ -3356,14 +3348,14 @@ void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver,
     }
     
     if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
         restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
       } else
         restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
     }
     
     if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
         if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
         if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
       } else {
@@ -3373,7 +3365,7 @@ void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver,
     }
     
     if (Kind_Solver == RANS) {
-      if (config->GetOutput_FileFormat() == PARAVIEW) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
         restart_file << "\t\"Eddy_Viscosity\"";
       } else
         restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
@@ -3841,14 +3833,13 @@ void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned sho
 
   /*--- Read the name of the output and input file ---*/
 
+  if (su2_file) {
   if (rank == MASTER_NODE) {
-    if (su2_file){
       str = config[ZONE_0]->GetMesh_Out_FileName();
       strcpy (out_file, str.c_str());
       strcpy (cstr, out_file);
       output_file.precision(15);
       output_file.open(cstr, ios::out);
-
       if (val_nZone > 1){
         output_file << "NZONE= " << val_nZone << endl;
       }
@@ -3859,8 +3850,8 @@ void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned sho
     
     /*--- Flags identifying the types of files to be written. ---*/
     
-    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol() && config[iZone]->GetVisualize_Deformation();
-    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol() && config[iZone]->GetVisualize_Deformation();
+    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
+    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
     bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
     
     /*--- Merge the node coordinates and connectivity if necessary. This
@@ -3888,8 +3879,17 @@ void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned sho
         if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
         
         /*--- Write a Tecplot ASCII file ---*/
+
         if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
-        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
+          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+        }
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
+          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        }
         
       }
       
@@ -3898,29 +3898,43 @@ void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned sho
         if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
         
         /*--- Write a Tecplot ASCII file ---*/
+        
         if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
-        else SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
+          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
+        }
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
+          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+        }
         
       }
       
       /*--- Write a .su2 ASCII file ---*/
 
+      if (su2_file) {
+
       if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
 
-      if (su2_file) SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
+        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
       
       /*--- Write an stl surface file ---*/
 
       if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
       
-      if (su2_file) SetSTL_MeshASCII(config[iZone], geometry[iZone]);
+        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
+        
+      }
       
       /*--- Write a binary file with the grid coordinates alone. ---*/
       
       if (Wrt_Crd) {
-        cout <<"Writing .dat binary coordinates file." << endl;
+        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
         WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
       }
+
       
       /*--- Deallocate connectivity ---*/
       
@@ -4059,6 +4073,10 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
   unsigned short iVar, iInst;
   unsigned long iPoint;
   bool compressible = true;
+
+    /*--- Get the file output format ---*/
+    
+    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
     
     for (iInst = 0; iInst < nInst[iZone]; iInst++){
 
@@ -4077,10 +4095,11 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
 #ifdef HAVE_MPI
       /*--- Do not merge the connectivity or write the visualization files
-     if we are running in parallel. Force the use of SU2_SOL to merge and
-     write the viz. files in this case to save overhead. ---*/
+     if we are running in parallel, unless we are using ParaView binary.
+       Force the use of SU2_SOL to merge and write the viz. files in this
+       case to save overhead. ---*/
 
-      if (size > SINGLE_NODE) {
+      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
         Wrt_Vol = false;
         Wrt_Srf = false;
       }
@@ -4195,16 +4214,12 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
                      solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
     }
 
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
     /*--- Write the solution files if they are requested and we are executing
      with a single rank (all data on one proc and no comm. overhead). Once we
      have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
      can allow the write of the viz. files as well. ---*/
 
-    if ((size == SINGLE_NODE) && (rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+    if ((Wrt_Vol || Wrt_Srf)) {
       
       /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
 
@@ -4267,6 +4282,15 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
                 solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
             break;
+            
+          case PARAVIEW_BINARY:
+            
+            /*--- Write a Paraview binary file ---*/
+            
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
+            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, false);
+            break;
 
           default:
             break;
@@ -4307,6 +4331,16 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
                 solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
             break;
 
+          case PARAVIEW_BINARY:
+            
+            /*--- Write a Paraview binary file ---*/
+            
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
+            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, true);
+            break;
+            
+
           default:
             break;
           }

From 1d51f778a2d0cd650370281215113c3a4678c690 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Sep 2018 10:19:12 +0200
Subject: [PATCH 043/539] Testing new screen format

---
 SU2_CFD/src/output_structure.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 893440d641af..de6f8c153aa0 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8684,11 +8684,11 @@ void COutput::SetScreen_Header(CConfig *config) {
     if (HistoryOutputPerSurface_Map.count(currentField) > 0){
       PrintScreenHeaderString(out, HistoryOutputPerSurface_Map[currentField][0].FieldName);      
     }
+    out << sep;
   }
   
-  
   // Insert line break
-  out << endl;
+  out << '\n' << line << '\n';
   cout << out.str();
   
 }
@@ -8696,9 +8696,13 @@ void COutput::SetScreen_Header(CConfig *config) {
 
 void COutput::SetScreen_Output(CConfig *config) {
   
+  const std::string sep = " |" ;
+  const int total_width = field_width*nScreenOutput + sep.size() * nScreenOutput ;
+  const std::string line = sep + std::string( total_width-1, '-' ) + '|' ;
   stringstream out;
   string currentField;
   
+  out << sep;
   
   for (unsigned short iField = 0; iField < nScreenOutput; iField++){
     currentField = ScreenFields[iField]; 
@@ -8728,13 +8732,14 @@ void COutput::SetScreen_Output(CConfig *config) {
         break;   
       }
     }    
+    out << sep;
   }
-    
+  out << '\n';
   // Insert line break
   cout << out.str();
-  cout << endl;
 }
 
+
 void COutput::PreprocessHistoryOutput(CConfig *config){
   
   if (rank == MASTER_NODE){

From b26ea2d07b12d1d9da4b37172694463a1b6e40f8 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Mon, 3 Sep 2018 17:16:35 +0200
Subject: [PATCH 044/539] Some bug fixes.

---
 Common/include/config_structure.hpp     | 13 ++++++++++--
 SU2_CFD/src/driver_direct_multizone.cpp | 28 ++++++++++++-------------
 SU2_CFD/src/driver_structure.cpp        | 10 ++++-----
 SU2_CFD/src/iteration_structure.cpp     |  6 +++---
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 773a6aab365e..43774f075b5c 100755
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1013,8 +1013,17 @@ class CConfig {
   su2double Max_Vel2; /*!< \brief The maximum velocity^2 in the domain for the incompressible preconditioner. */
 
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
-==== BASE ====
-==== BASE ====
+  bool Time_Domain;             /*!< \brief Determines if the multizone problem is solved in time-domain */
+  unsigned long Outer_Iter,    /*!< \brief Determines the number of outer iterations in the multizone problem */
+  Inner_Iter,                   /*!< \brief Determines the number of inner iterations in each multizone block */
+  Time_Iter,                    /*!< \brief Determines the number of time iterations in the multizone problem */
+  Restart_Iter;                 /*!< \brief Determines the restart iteration in the multizone problem */
+  su2double Time_Step;          /*!< \brief Determines the time step for the multizone problem */
+  bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
+  string *ScreenOutput,    /*!< \brief Kind of the screen output. */
+  *HistoryOutput, *VolumeOutput;                  /*!< \brief Kind of the output printed to the history file. */
+  unsigned short nScreenOutput,         /*!< \brief Number of screen output variables (max: 6). */
+  nHistoryOutput, nVolumeOutput;                       /*!< \brief Number of variables printed to the history file. */
 
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 2e76a3d5858f..9efdf980816a 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -96,7 +96,7 @@ CMultizoneDriver::CMultizoneDriver(char* confFile,
     case FEM_ELASTICITY:
       structural_zone = true;
       break;
-    case HEAT_EQUATION: case HEAT_EQUATION_FVM:
+    case HEAT_EQUATION_FVM:
       heat_zone = true;
       break;
     }
@@ -182,15 +182,15 @@ void CMultizoneDriver::Preprocess(unsigned long TimeIter) {
 
     /*--- Read the target pressure for inverse design. ---------------------------------------------*/
     /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-    if (config_container[iZone]->GetInvDesign_Cp() == YES)
-      output->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-          geometry_container[iZone][INST_0][MESH_0], config_container[iZone], TimeIter);
+//    if (config_container[iZone]->GetInvDesign_Cp() == YES)
+//      output[iZone]->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
+//          geometry_container[iZone][INST_0][MESH_0], config_container[iZone], TimeIter);
 
     /*--- Read the target heat flux ----------------------------------------------------------------*/
     /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-    if (config_container[iZone]->GetInvDesign_HeatFlux() == YES)
-      output->SetHeatFlux_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-          geometry_container[iZone][INST_0][MESH_0], config_container[iZone], TimeIter);
+//    if (config_container[iZone]->GetInvDesign_HeatFlux() == YES)
+//      output->SetHeatFlux_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
+//          geometry_container[iZone][INST_0][MESH_0], config_container[iZone], TimeIter);
 
     /*--- Set the initial condition for EULER/N-S/RANS ---------------------------------------------*/
     /*--- For FSI, this is set after the mesh has been moved. --------------------------------------*/
@@ -209,7 +209,7 @@ void CMultizoneDriver::Preprocess(unsigned long TimeIter) {
   /*--- Run a predictor step ---*/
   for (iZone = 0; iZone < nZone; iZone++){
     if (config_container[iZone]->GetPredictor())
-      iteration_container[iZone][INST_0]->Predictor(output, integration_container, geometry_container, solver_container,
+      iteration_container[iZone][INST_0]->Predictor(output[iZone], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
   }
 
@@ -261,7 +261,7 @@ void CMultizoneDriver::Run() {
       }
 
       /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
-      iteration_container[iZone][INST_0]->Iterate_Block(output, integration_container, geometry_container, solver_container,
+      iteration_container[iZone][INST_0]->Iterate_Block(output[iZone], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
       /*--- A relaxation step can help preventing numerical instabilities ---*/
@@ -282,7 +282,7 @@ void CMultizoneDriver::Run() {
 void CMultizoneDriver::Relaxation() {
 
     if (config_container[iZone]->GetRelaxation())
-      iteration_container[iZone][INST_0]->Relaxation(output, integration_container, geometry_container, solver_container,
+      iteration_container[iZone][INST_0]->Relaxation(output[iZone], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
 }
@@ -381,9 +381,9 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
       if (config_container[iZone]->GetKind_Solver() == FEM_ELASTICITY) ZONE_FEA = iZone;
       if (config_container[iZone]->GetKind_Solver() == NAVIER_STOKES) ZONE_FLOW = iZone;
     }
-    output->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
-        config_container, integration_container, 0,
-        ZONE_FLOW, ZONE_FEA, false);
+ //   output->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
+ //       config_container, integration_container, 0,
+ //       ZONE_FLOW, ZONE_FEA, false);
   }
 
   return Convergence;
@@ -409,7 +409,7 @@ void CMultizoneDriver::Update() {
         }
       }
 
-    iteration_container[iZone][INST_0]->Update(output, integration_container, geometry_container,
+    iteration_container[iZone][INST_0]->Update(output[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 203f7a673e34..c322f580e046 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3506,7 +3506,7 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
     for (iZone = 0; iZone < nZone; iZone++){
       if (!(config_container[iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
-        output->SetCFL_Number(solver_container, config_container, iZone);
+        output[iZone]->SetCFL_Number(solver_container, config_container, iZone);
     }
   }
 
@@ -5647,7 +5647,7 @@ void CFSIDriver::Update() {
   /*-------------------- Update fluid solver ------------------------*/
   /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_FLOW][INST_0]->Update(output, integration_container, geometry_container,
+  iteration_container[ZONE_FLOW][INST_0]->Update(output[ZONE_FLOW], integration_container, geometry_container,
                        solver_container, numerics_container, config_container,
                        surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
 
@@ -5655,7 +5655,7 @@ void CFSIDriver::Update() {
   /*----------------- Update structural solver ----------------------*/
   /*-----------------------------------------------------------------*/
 
-  iteration_container[ZONE_STRUCT][INST_0]->Update(output, integration_container, geometry_container,
+  iteration_container[ZONE_STRUCT][INST_0]->Update(output[ZONE_STRUCT], integration_container, geometry_container,
                          solver_container, numerics_container, config_container,
                          surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
 
@@ -6293,7 +6293,7 @@ void CDiscAdjFSIDriver::Fluid_Iteration_Direct(unsigned short ZONE_FLOW, unsigne
 
   config_container[ZONE_FLOW]->SetIntIter(0);
 
-  direct_iteration[ZONE_FLOW]->Iterate(output[iZone], integration_container, geometry_container,
+  direct_iteration[ZONE_FLOW]->Iterate(output[ZONE_FLOW], integration_container, geometry_container,
       solver_container, numerics_container, config_container,
       surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
 
@@ -6330,7 +6330,7 @@ void CDiscAdjFSIDriver::Structural_Iteration_Direct(unsigned short ZONE_FLOW, un
   /*--------------- Iterate the structural solver -------------------*/
   /*-----------------------------------------------------------------*/
 
-  direct_iteration[ZONE_STRUCT]->Iterate(output[iZone], integration_container, geometry_container,
+  direct_iteration[ZONE_STRUCT]->Iterate(output[ZONE_STRUCT], integration_container, geometry_container,
                                         solver_container, numerics_container, config_container,
                                         surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 360f1f148e27..221c3304307d 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -700,7 +700,7 @@ void CFluidIteration::Iterate_Block(COutput *output,
           surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
-      if (steady) output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
+      if (steady) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
 
       /*--- If convergence was reached in every zone --*/
       StopCalc_Flow = integration_container[val_iZone][INST_0][FLOW_SOL]->GetConvergence();
@@ -1134,7 +1134,7 @@ void CHeatIteration::Iterate_Block(COutput *output,
         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
     /*--- Write the convergence history for the fluid (only screen output) ---*/
-    if (steady) output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
+    if (steady) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
 
     /*--- If convergence was reached in every zone --*/
     StopCalc = integration_container[val_iZone][INST_0][HEAT_SOL]->GetConvergence();
@@ -1570,7 +1570,7 @@ void CFEAIteration::Iterate_Block(COutput *output,
       surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
   /*--- Write the convergence history for the structure (only screen output) ---*/
-  output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
+  output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
 
   /*--- Set the structural convergence to false (to make sure outer subiterations converge) ---*/
   integration_container[val_iZone][INST_0][FEA_SOL]->SetConvergence(false);

From d12645a8965da1f7b05062f604038e3401ad7285 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 10:10:40 +0200
Subject: [PATCH 045/539] Added tools files with table printer

---
 Common/include/tools.hpp | 124 +++++++++++++++++++++++++++++++++++++++
 Common/lib/Makefile.am   |   4 +-
 Common/lib/Makefile.in   |  85 +++++++++++++++++++++++----
 Common/src/tools.cpp     | 103 ++++++++++++++++++++++++++++++++
 4 files changed, 302 insertions(+), 14 deletions(-)
 create mode 100644 Common/include/tools.hpp
 create mode 100644 Common/src/tools.cpp

diff --git a/Common/include/tools.hpp b/Common/include/tools.hpp
new file mode 100644
index 000000000000..528ac298eb38
--- /dev/null
+++ b/Common/include/tools.hpp
@@ -0,0 +1,124 @@
+#include <iostream>
+#include <iomanip>
+#include <vector>
+#include <string>
+#include <sstream>
+#include <cmath>
+
+
+
+
+class TablePrinter{
+public:
+  TablePrinter(std::ostream * output, const std::string & separator = "|");
+  ~TablePrinter();
+  class endl{};
+  int get_num_columns() const;
+  int get_table_width() const;
+  void set_separator(const std::string & separator);
+  void set_flush_left();
+  void set_flush_right();
+
+  void AddColumn(const std::string & header_name, int column_width, int precision = 0);
+  void PrintHeader();
+  void PrintFooter();
+
+  TablePrinter& operator<<(endl input){
+    while (j_ != 0){
+      *this << "";
+    }
+    return *this;
+  }
+
+  // Can we merge these?
+//  TablePrinter& operator<<(float input);
+//  TablePrinter& operator<<(double input);
+
+  template<typename T> TablePrinter& operator<<(T input){
+    if (j_ == 0)
+      *out_stream_ << "|";
+
+    if(flush_left_)
+      *out_stream_ << std::left;
+    else
+      *out_stream_ << std::right; 
+
+    // Leave 3 extra space: One for negative sign, one for zero, one for decimal
+    *out_stream_ << std::setw(column_widths_.at(j_))
+                 << input;
+
+    if (j_ == get_num_columns()-1){
+      *out_stream_ << "|\n";
+      i_ = i_ + 1;
+      j_ = 0;
+    } else {
+      *out_stream_ << separator_;
+      j_ = j_ + 1;
+    }
+
+    return *this;
+  }
+
+private:
+  void PrintHorizontalLine();
+
+//  template<typename T> void OutputDecimalNumber(T input){
+//    // If we cannot handle this number, indicate so
+//    if (input < 10*(precision_.at(j_)-1) || input > 10*precision_.at(j_)){
+//      std::stringstream string_out;
+//      string_out << std::setiosflags(std::ios::fixed)
+//                 << std::setprecision(precision_.at(j_))
+//                 << std::setw(column_widths_.at(j_))
+//                 << input;
+  
+//      std::string string_rep_of_number = string_out.str();
+  
+//      string_rep_of_number[precision_.at(j_)-1] = '*';
+//      std::string string_to_print = string_rep_of_number.substr(0, precision_.at(j_));
+//      *out_stream_ << string_to_print;
+//    } else {
+  
+//      // determine what precision we need
+//      int precision = precision_.at(j_) - 1; // leave room for the decimal point
+//      if (input < 0)
+//        --precision; // leave room for the minus sign
+  
+//      // leave room for digits before the decimal?
+//      if (input < -1 || input > 1){
+//        int num_digits_before_decimal = 1 + (int)log10(std::abs(input));
+//        precision -= num_digits_before_decimal;
+//      }
+//      else
+//        precision --; // e.g. 0.12345 or -0.1234
+  
+//      if (precision < 0)
+//        precision = 0; // don't go negative with precision
+  
+//      *out_stream_ << std::setiosflags(std::ios::fixed)
+//                   << std::setprecision(precision)
+//                   << std::setw(column_widths_.at(j_))
+//                   << input;
+//    }
+  
+//    if (j_ == get_num_columns()-1){
+//      *out_stream_ << "|\n";
+//      i_ = i_ + 1;
+//      j_ = 0;
+//    } else {
+//      *out_stream_ << separator_;
+//      j_ = j_ + 1;
+//    }
+//  }
+  
+  std::ostream * out_stream_;
+  std::vector<std::string> column_headers_;
+  std::vector<int> column_widths_;
+  std::string separator_;
+  std::vector<int> precision_;
+
+  int i_; // index of current row
+  int j_; // index of current column
+
+  int table_width_;
+  bool flush_left_;
+};
diff --git a/Common/lib/Makefile.am b/Common/lib/Makefile.am
index 2612d0c7c398..af8e53ce0ac1 100644
--- a/Common/lib/Makefile.am
+++ b/Common/lib/Makefile.am
@@ -83,6 +83,7 @@ lib_sources = \
   ../include/element_structure.inl \
   ../include/adt_structure.hpp \
   ../include/adt_structure.inl \
+  ../include/tools.hpp \
   ../src/config_structure.cpp \
   ../src/dual_grid_structure.cpp \
   ../src/geometry_structure.cpp \
@@ -99,7 +100,8 @@ lib_sources = \
   ../src/element_structure.cpp \
   ../src/element_linear.cpp \
   ../src/interpolation_structure.cpp \
-  ../src/adt_structure.cpp
+  ../src/adt_structure.cpp \
+  ../src/tools.cpp 
 
 lib_cxxflags = -fPIC
 lib_ldadd =
diff --git a/Common/lib/Makefile.in b/Common/lib/Makefile.in
index 8ac50a47560e..43683c900688 100644
--- a/Common/lib/Makefile.in
+++ b/Common/lib/Makefile.in
@@ -175,8 +175,9 @@ am__libSU2_a_SOURCES_DIST =  \
 	../include/gauss_structure.hpp ../include/gauss_structure.inl \
 	../include/element_structure.hpp \
 	../include/element_structure.inl ../include/adt_structure.hpp \
-	../include/adt_structure.inl ../src/config_structure.cpp \
-	../src/dual_grid_structure.cpp ../src/geometry_structure.cpp \
+	../include/adt_structure.inl ../include/tools.hpp \
+	../src/config_structure.cpp ../src/dual_grid_structure.cpp \
+	../src/geometry_structure.cpp \
 	../src/grid_adaptation_structure.cpp \
 	../src/grid_movement_structure.cpp \
 	../src/linear_solvers_structure.cpp \
@@ -185,7 +186,7 @@ am__libSU2_a_SOURCES_DIST =  \
 	../src/linear_solvers_structure_b.cpp ../src/ad_structure.cpp \
 	../src/gauss_structure.cpp ../src/element_structure.cpp \
 	../src/element_linear.cpp ../src/interpolation_structure.cpp \
-	../src/adt_structure.cpp
+	../src/adt_structure.cpp ../src/tools.cpp
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = ../src/libSU2_a-config_structure.$(OBJEXT) \
 	../src/libSU2_a-dual_grid_structure.$(OBJEXT) \
@@ -203,7 +204,8 @@ am__objects_1 = ../src/libSU2_a-config_structure.$(OBJEXT) \
 	../src/libSU2_a-element_structure.$(OBJEXT) \
 	../src/libSU2_a-element_linear.$(OBJEXT) \
 	../src/libSU2_a-interpolation_structure.$(OBJEXT) \
-	../src/libSU2_a-adt_structure.$(OBJEXT)
+	../src/libSU2_a-adt_structure.$(OBJEXT) \
+	../src/libSU2_a-tools.$(OBJEXT)
 @BUILD_NORMAL_TRUE@am_libSU2_a_OBJECTS = $(am__objects_1)
 libSU2_a_OBJECTS = $(am_libSU2_a_OBJECTS)
 libSU2_AD_a_AR = $(AR) $(ARFLAGS)
@@ -240,8 +242,9 @@ am__libSU2_AD_a_SOURCES_DIST =  \
 	../include/gauss_structure.hpp ../include/gauss_structure.inl \
 	../include/element_structure.hpp \
 	../include/element_structure.inl ../include/adt_structure.hpp \
-	../include/adt_structure.inl ../src/config_structure.cpp \
-	../src/dual_grid_structure.cpp ../src/geometry_structure.cpp \
+	../include/adt_structure.inl ../include/tools.hpp \
+	../src/config_structure.cpp ../src/dual_grid_structure.cpp \
+	../src/geometry_structure.cpp \
 	../src/grid_adaptation_structure.cpp \
 	../src/grid_movement_structure.cpp \
 	../src/linear_solvers_structure.cpp \
@@ -250,7 +253,7 @@ am__libSU2_AD_a_SOURCES_DIST =  \
 	../src/linear_solvers_structure_b.cpp ../src/ad_structure.cpp \
 	../src/gauss_structure.cpp ../src/element_structure.cpp \
 	../src/element_linear.cpp ../src/interpolation_structure.cpp \
-	../src/adt_structure.cpp
+	../src/adt_structure.cpp ../src/tools.cpp
 am__objects_2 = ../src/libSU2_AD_a-config_structure.$(OBJEXT) \
 	../src/libSU2_AD_a-dual_grid_structure.$(OBJEXT) \
 	../src/libSU2_AD_a-geometry_structure.$(OBJEXT) \
@@ -267,7 +270,8 @@ am__objects_2 = ../src/libSU2_AD_a-config_structure.$(OBJEXT) \
 	../src/libSU2_AD_a-element_structure.$(OBJEXT) \
 	../src/libSU2_AD_a-element_linear.$(OBJEXT) \
 	../src/libSU2_AD_a-interpolation_structure.$(OBJEXT) \
-	../src/libSU2_AD_a-adt_structure.$(OBJEXT)
+	../src/libSU2_AD_a-adt_structure.$(OBJEXT) \
+	../src/libSU2_AD_a-tools.$(OBJEXT)
 @BUILD_REVERSE_TRUE@am_libSU2_AD_a_OBJECTS = $(am__objects_2)
 libSU2_AD_a_OBJECTS = $(am_libSU2_AD_a_OBJECTS)
 libSU2_DIRECTDIFF_a_AR = $(AR) $(ARFLAGS)
@@ -305,8 +309,9 @@ am__libSU2_DIRECTDIFF_a_SOURCES_DIST =  \
 	../include/gauss_structure.hpp ../include/gauss_structure.inl \
 	../include/element_structure.hpp \
 	../include/element_structure.inl ../include/adt_structure.hpp \
-	../include/adt_structure.inl ../src/config_structure.cpp \
-	../src/dual_grid_structure.cpp ../src/geometry_structure.cpp \
+	../include/adt_structure.inl ../include/tools.hpp \
+	../src/config_structure.cpp ../src/dual_grid_structure.cpp \
+	../src/geometry_structure.cpp \
 	../src/grid_adaptation_structure.cpp \
 	../src/grid_movement_structure.cpp \
 	../src/linear_solvers_structure.cpp \
@@ -315,7 +320,7 @@ am__libSU2_DIRECTDIFF_a_SOURCES_DIST =  \
 	../src/linear_solvers_structure_b.cpp ../src/ad_structure.cpp \
 	../src/gauss_structure.cpp ../src/element_structure.cpp \
 	../src/element_linear.cpp ../src/interpolation_structure.cpp \
-	../src/adt_structure.cpp
+	../src/adt_structure.cpp ../src/tools.cpp
 am__objects_3 = ../src/libSU2_DIRECTDIFF_a-config_structure.$(OBJEXT) \
 	../src/libSU2_DIRECTDIFF_a-dual_grid_structure.$(OBJEXT) \
 	../src/libSU2_DIRECTDIFF_a-geometry_structure.$(OBJEXT) \
@@ -332,7 +337,8 @@ am__objects_3 = ../src/libSU2_DIRECTDIFF_a-config_structure.$(OBJEXT) \
 	../src/libSU2_DIRECTDIFF_a-element_structure.$(OBJEXT) \
 	../src/libSU2_DIRECTDIFF_a-element_linear.$(OBJEXT) \
 	../src/libSU2_DIRECTDIFF_a-interpolation_structure.$(OBJEXT) \
-	../src/libSU2_DIRECTDIFF_a-adt_structure.$(OBJEXT)
+	../src/libSU2_DIRECTDIFF_a-adt_structure.$(OBJEXT) \
+	../src/libSU2_DIRECTDIFF_a-tools.$(OBJEXT)
 @BUILD_DIRECTDIFF_TRUE@am_libSU2_DIRECTDIFF_a_OBJECTS =  \
 @BUILD_DIRECTDIFF_TRUE@	$(am__objects_3)
 libSU2_DIRECTDIFF_a_OBJECTS = $(am_libSU2_DIRECTDIFF_a_OBJECTS)
@@ -599,6 +605,7 @@ lib_sources = \
   ../include/element_structure.inl \
   ../include/adt_structure.hpp \
   ../include/adt_structure.inl \
+  ../include/tools.hpp \
   ../src/config_structure.cpp \
   ../src/dual_grid_structure.cpp \
   ../src/geometry_structure.cpp \
@@ -615,7 +622,8 @@ lib_sources = \
   ../src/element_structure.cpp \
   ../src/element_linear.cpp \
   ../src/interpolation_structure.cpp \
-  ../src/adt_structure.cpp
+  ../src/adt_structure.cpp \
+  ../src/tools.cpp 
 
 
 # always link to built dependencies from ./externals
@@ -723,6 +731,8 @@ clean-noinstLIBRARIES:
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_a-adt_structure.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2_a-tools.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 libSU2.a: $(libSU2_a_OBJECTS) $(libSU2_a_DEPENDENCIES) $(EXTRA_libSU2_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2.a
@@ -762,6 +772,8 @@ libSU2.a: $(libSU2_a_OBJECTS) $(libSU2_a_DEPENDENCIES) $(EXTRA_libSU2_a_DEPENDEN
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_AD_a-adt_structure.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2_AD_a-tools.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 libSU2_AD.a: $(libSU2_AD_a_OBJECTS) $(libSU2_AD_a_DEPENDENCIES) $(EXTRA_libSU2_AD_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2_AD.a
@@ -801,6 +813,8 @@ libSU2_AD.a: $(libSU2_AD_a_OBJECTS) $(libSU2_AD_a_DEPENDENCIES) $(EXTRA_libSU2_A
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
 ../src/libSU2_DIRECTDIFF_a-adt_structure.$(OBJEXT):  \
 	../src/$(am__dirstamp) ../src/$(DEPDIR)/$(am__dirstamp)
+../src/libSU2_DIRECTDIFF_a-tools.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 libSU2_DIRECTDIFF.a: $(libSU2_DIRECTDIFF_a_OBJECTS) $(libSU2_DIRECTDIFF_a_DEPENDENCIES) $(EXTRA_libSU2_DIRECTDIFF_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libSU2_DIRECTDIFF.a
@@ -830,6 +844,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_AD_a-matrix_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_AD_a-mpi_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_AD_a-primal_grid_structure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_AD_a-tools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_AD_a-vector_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-ad_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-adt_structure.Po@am__quote@
@@ -847,6 +862,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-matrix_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-mpi_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-primal_grid_structure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-vector_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-ad_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-adt_structure.Po@am__quote@
@@ -864,6 +880,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-matrix_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-mpi_structure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-primal_grid_structure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-tools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libSU2_a-vector_structure.Po@am__quote@
 
 .cpp.o:
@@ -1120,6 +1137,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_a-adt_structure.obj `if test -f '../src/adt_structure.cpp'; then $(CYGPATH_W) '../src/adt_structure.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/adt_structure.cpp'; fi`
 
+../src/libSU2_a-tools.o: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_a-tools.o -MD -MP -MF ../src/$(DEPDIR)/libSU2_a-tools.Tpo -c -o ../src/libSU2_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_a-tools.Tpo ../src/$(DEPDIR)/libSU2_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_a-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+
+../src/libSU2_a-tools.obj: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_a-tools.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2_a-tools.Tpo -c -o ../src/libSU2_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_a-tools.Tpo ../src/$(DEPDIR)/libSU2_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_a-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+
 ../src/libSU2_AD_a-config_structure.o: ../src/config_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_AD_a-config_structure.o -MD -MP -MF ../src/$(DEPDIR)/libSU2_AD_a-config_structure.Tpo -c -o ../src/libSU2_AD_a-config_structure.o `test -f '../src/config_structure.cpp' || echo '$(srcdir)/'`../src/config_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_AD_a-config_structure.Tpo ../src/$(DEPDIR)/libSU2_AD_a-config_structure.Po
@@ -1358,6 +1389,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_AD_a-adt_structure.obj `if test -f '../src/adt_structure.cpp'; then $(CYGPATH_W) '../src/adt_structure.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/adt_structure.cpp'; fi`
 
+../src/libSU2_AD_a-tools.o: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_AD_a-tools.o -MD -MP -MF ../src/$(DEPDIR)/libSU2_AD_a-tools.Tpo -c -o ../src/libSU2_AD_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_AD_a-tools.Tpo ../src/$(DEPDIR)/libSU2_AD_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_AD_a-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_AD_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+
+../src/libSU2_AD_a-tools.obj: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_AD_a-tools.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2_AD_a-tools.Tpo -c -o ../src/libSU2_AD_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_AD_a-tools.Tpo ../src/$(DEPDIR)/libSU2_AD_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_AD_a-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_AD_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_AD_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+
 ../src/libSU2_DIRECTDIFF_a-config_structure.o: ../src/config_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_DIRECTDIFF_a-config_structure.o -MD -MP -MF ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-config_structure.Tpo -c -o ../src/libSU2_DIRECTDIFF_a-config_structure.o `test -f '../src/config_structure.cpp' || echo '$(srcdir)/'`../src/config_structure.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-config_structure.Tpo ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-config_structure.Po
@@ -1596,6 +1641,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_DIRECTDIFF_a-adt_structure.obj `if test -f '../src/adt_structure.cpp'; then $(CYGPATH_W) '../src/adt_structure.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/adt_structure.cpp'; fi`
 
+../src/libSU2_DIRECTDIFF_a-tools.o: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_DIRECTDIFF_a-tools.o -MD -MP -MF ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Tpo -c -o ../src/libSU2_DIRECTDIFF_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Tpo ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_DIRECTDIFF_a-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_DIRECTDIFF_a-tools.o `test -f '../src/tools.cpp' || echo '$(srcdir)/'`../src/tools.cpp
+
+../src/libSU2_DIRECTDIFF_a-tools.obj: ../src/tools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -MT ../src/libSU2_DIRECTDIFF_a-tools.obj -MD -MP -MF ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Tpo -c -o ../src/libSU2_DIRECTDIFF_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Tpo ../src/$(DEPDIR)/libSU2_DIRECTDIFF_a-tools.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/tools.cpp' object='../src/libSU2_DIRECTDIFF_a-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSU2_DIRECTDIFF_a_CXXFLAGS) $(CXXFLAGS) -c -o ../src/libSU2_DIRECTDIFF_a-tools.obj `if test -f '../src/tools.cpp'; then $(CYGPATH_W) '../src/tools.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cpp'; fi`
+
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
diff --git a/Common/src/tools.cpp b/Common/src/tools.cpp
new file mode 100644
index 000000000000..a084cd59ed15
--- /dev/null
+++ b/Common/src/tools.cpp
@@ -0,0 +1,103 @@
+#include <stdexcept>
+#include <iomanip>
+#include <stdexcept>
+#include "../include/tools.hpp"
+
+TablePrinter::TablePrinter(std::ostream * output, const std::string & separator){
+  out_stream_ = output;
+  i_ = 0;
+  j_ = 0;
+  separator_ = separator;
+  table_width_ = 0;
+  flush_left_ = false;
+}
+
+TablePrinter::~TablePrinter(){
+
+}
+
+int TablePrinter::get_num_columns() const {
+  return column_headers_.size();
+}
+
+int TablePrinter::get_table_width() const {
+  return table_width_;
+}
+
+void TablePrinter::set_separator(const std::string &separator){
+  separator_ = separator;
+}
+
+void TablePrinter::set_flush_left(){
+  flush_left_ = true;
+}
+
+void TablePrinter::set_flush_right(){
+  flush_left_ = false;
+}
+
+/** \brief Add a column to our table
+ ** 
+ ** \param header_name Name to be print for the header
+ ** \param column_width the width of the column (has to be >=5)
+ ** */
+void TablePrinter::AddColumn(const std::string & header_name, int column_width, int precision){
+  if (column_width < 4){
+    throw std::invalid_argument("Column size has to be >= 4");
+  }
+  if (precision == 0){
+    precision_.push_back(column_width);
+  } else {
+    precision_.push_back(precision);
+  }
+
+  column_headers_.push_back(header_name);
+  column_widths_.push_back(column_width);
+  table_width_ += column_width + separator_.size(); // for the separator  
+}
+
+void TablePrinter::PrintHorizontalLine() {
+  *out_stream_ << "+"; // the left bar
+
+  for (int i=0; i<table_width_-1; ++i)
+    *out_stream_ << "-";
+
+  *out_stream_ << "+"; // the right bar
+  *out_stream_ << "\n";
+}
+
+void TablePrinter::PrintHeader(){
+  PrintHorizontalLine();
+  *out_stream_ << "|";
+
+  for (int i=0; i<get_num_columns(); ++i){
+
+    if(flush_left_)
+      *out_stream_ << std::left;
+    else
+      *out_stream_ << std::right; 
+
+    *out_stream_ << std::setw(column_widths_.at(i)) << column_headers_.at(i).substr(0, column_widths_.at(i));
+    if (i != get_num_columns()-1){
+      *out_stream_ << separator_;
+    }
+  }
+
+  *out_stream_ << "|\n";
+  PrintHorizontalLine();
+}
+
+void TablePrinter::PrintFooter(){
+  PrintHorizontalLine();
+}
+
+//TablePrinter& TablePrinter::operator<<(float input){
+//  OutputDecimalNumber<float>(input);
+//  return *this;
+//}
+
+//TablePrinter& TablePrinter::operator<<(double input){
+//  OutputDecimalNumber<double>(input);
+//  return *this;
+//}
+

From e6a57bd711b09f6a1eaf86b05169a6232f4e8eb9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 10:11:21 +0200
Subject: [PATCH 046/539] Added tabular output for MG information

---
 Common/src/config_structure.cpp   | 54 ++++++++++---------------------
 Common/src/geometry_structure.cpp | 20 ++++++++++--
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index e5b84d2c4fb9..13162c40f588 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -38,7 +38,7 @@
 #include "../include/config_structure.hpp"
 
 #include "../include/ad_structure.hpp"
-
+#include "../include/tools.hpp"
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level) {
   
@@ -5327,48 +5327,28 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       else cout << "CFL adaptation. Factor down: "<< CFL_AdaptParam[0] <<", factor up: "<< CFL_AdaptParam[1]
         <<",\n                lower limit: "<< CFL_AdaptParam[2] <<", upper limit: " << CFL_AdaptParam[3] <<"."<< endl;
 
-      if (nMGLevels !=0) {
-        cout << "Multigrid Level:                  ";
+      if (nMGLevels!= 0){
+        TablePrinter MGTable(&std::cout);
+        
+        MGTable.AddColumn("MG Level",         10);
+        MGTable.AddColumn("Presmooth",     10);
+        MGTable.AddColumn("PostSmooth",    10);
+        MGTable.AddColumn("CorrectSmooth", 10);
+        MGTable.set_flush_right();
+        MGTable.PrintHeader();
         for (unsigned short iLevel = 0; iLevel < nMGLevels+1; iLevel++) {
-          cout.width(6); cout << iLevel;
-        }
-        cout << endl;
-      }
-
-			if (Unsteady_Simulation != TIME_STEPPING) {
-				cout << "Courant-Friedrichs-Lewy number:   ";
-				cout.precision(3);
-				cout.width(6); cout << CFL[0];
-				cout << endl;
-			}
-			
-
-      if (nMGLevels !=0) {
-        cout.precision(3);
-        cout << "MG PreSmooth coefficients:        ";
-        for (unsigned short iMG_PreSmooth = 0; iMG_PreSmooth < nMGLevels+1; iMG_PreSmooth++) {
-          cout.width(6); cout << MG_PreSmooth[iMG_PreSmooth];
-        }
-        cout << endl;
-      }
-
-      if (nMGLevels !=0) {
-        cout.precision(3);
-        cout << "MG PostSmooth coefficients:       ";
-        for (unsigned short iMG_PostSmooth = 0; iMG_PostSmooth < nMGLevels+1; iMG_PostSmooth++) {
-          cout.width(6); cout << MG_PostSmooth[iMG_PostSmooth];
+          MGTable << iLevel << MG_PreSmooth[iLevel] << MG_PostSmooth[iLevel] << MG_CorrecSmooth[iLevel];
         }
-        cout << endl;
+        MGTable.PrintFooter();
       }
-
-      if (nMGLevels !=0) {
+      
+      if (Unsteady_Simulation != TIME_STEPPING) {
+        cout << "Courant-Friedrichs-Lewy number:   ";
         cout.precision(3);
-        cout << "MG CorrecSmooth coefficients:     ";
-        for (unsigned short iMG_CorrecSmooth = 0; iMG_CorrecSmooth < nMGLevels+1; iMG_CorrecSmooth++) {
-          cout.width(6); cout << MG_CorrecSmooth[iMG_CorrecSmooth];
-        }
+        cout.width(6); cout << CFL[0];
         cout << endl;
       }
+      
 
     }
 
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 4d047b06af2b..46ca3814e376 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -37,6 +37,7 @@
 
 #include "../include/geometry_structure.hpp"
 #include "../include/adt_structure.hpp"
+#include "../include/tools.hpp"
 #include <iomanip>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -20653,8 +20654,23 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry ****geometry, CConfig **config_
   }
   else {
     if (rank == MASTER_NODE) {
-      if (iMesh == 1) cout <<"MG level: "<< iMesh-1 <<" -> CVs: " << Global_nPointFine << ". Agglomeration rate 1/1.00. CFL "<< config->GetCFL(iMesh-1) <<"." << endl;
-      cout <<"MG level: "<< iMesh <<" -> CVs: " << Global_nPointCoarse << ". Agglomeration rate 1/" << ratio <<". CFL "<< CFL <<"." << endl;
+      TablePrinter MGTable(&std::cout);
+      MGTable.AddColumn("MG Level", 10);
+      MGTable.AddColumn("CVs", 10);
+      MGTable.AddColumn("Aggl. Rate", 10);
+      MGTable.AddColumn("CFL", 10);
+      MGTable.set_flush_right();
+      
+      if (iMesh == 1){
+        MGTable.PrintHeader();
+        MGTable << iMesh - 1 << Global_nPointFine << "1/1.00" << config->GetCFL(iMesh -1);
+      }
+      stringstream ss;
+      ss << "1/" << std::setprecision(3) << ratio;
+      MGTable << iMesh << Global_nPointCoarse << ss.str() << CFL;
+      if (iMesh == config->GetnMGLevels()){
+        MGTable.PrintFooter();
+      }
     }
   }
  

From ca801cdf5c55275798231c6eeca6052c5894e72e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 10:11:53 +0200
Subject: [PATCH 047/539] Use table printer for convergence output

---
 SU2_CFD/include/output_structure.hpp |  4 ++
 SU2_CFD/src/output_structure.cpp     | 99 ++++++++++++----------------
 2 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4ae04df4941e..cc3ed096695b 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -56,6 +56,8 @@
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 
+#include "../../Common/include/tools.hpp"
+
 using namespace std;
 
 /*! 
@@ -262,6 +264,8 @@ class COutput {
 
   ofstream HistFile;
   
+  TablePrinter* ConvergenceTable;
+  
 public:
 
   /*! 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index de6f8c153aa0..b580fa34cc51 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -43,6 +43,8 @@ COutput::COutput(CConfig *config) {
   size = SU2_MPI::GetSize();
   
   field_width = 12;
+  
+  ConvergenceTable = new TablePrinter(&std::cout);
 
   unsigned short iDim, iZone, iSpan, iMarker;
   
@@ -8665,78 +8667,46 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
 }
 
 void COutput::SetScreen_Header(CConfig *config) {
-
-  const std::string sep = " |" ;
-  const int total_width = field_width*nScreenOutput + sep.size() * nScreenOutput ;
-  const std::string line = sep + std::string( total_width-1, '-' ) + '|' ;
-  stringstream out;
-  string currentField;
-  // Insert line break
-  out << line << '\n' << sep;
-  // Evaluate the requested output
-  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
-    currentField = ScreenFields[iField];  
-    if (HistoryOutput_Map.count(currentField) > 0){
-      PrintScreenHeaderString(out, HistoryOutput_Map[currentField].FieldName);
-    } else {
-//      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
-    }
-    if (HistoryOutputPerSurface_Map.count(currentField) > 0){
-      PrintScreenHeaderString(out, HistoryOutputPerSurface_Map[currentField][0].FieldName);      
-    }
-    out << sep;
-  }
-  
-  // Insert line break
-  out << '\n' << line << '\n';
-  cout << out.str();
-  
+  ConvergenceTable->PrintHeader();
 }
 
 
 void COutput::SetScreen_Output(CConfig *config) {
   
-  const std::string sep = " |" ;
-  const int total_width = field_width*nScreenOutput + sep.size() * nScreenOutput ;
-  const std::string line = sep + std::string( total_width-1, '-' ) + '|' ;
-  stringstream out;
+
   string currentField;
   
-  out << sep;
-  
   for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+    stringstream out;
     currentField = ScreenFields[iField]; 
     if (HistoryOutput_Map.count(currentField) > 0){  
       switch (HistoryOutput_Map[currentField].ScreenFormat) {
-      case FORMAT_INTEGER:
-        PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[currentField].Value));
-        break;
-      case FORMAT_FIXED:
-        PrintScreenFixed(out, HistoryOutput_Map[currentField].Value);
-        break;
-      case FORMAT_SCIENTIFIC:
-        PrintScreenScientific(out, HistoryOutput_Map[currentField].Value);
-        break;      
+        case FORMAT_INTEGER:
+          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[currentField].Value));
+          break;
+        case FORMAT_FIXED:
+          PrintScreenFixed(out, HistoryOutput_Map[currentField].Value);
+          break;
+        case FORMAT_SCIENTIFIC:
+          PrintScreenScientific(out, HistoryOutput_Map[currentField].Value);
+          break;      
       }
     }
     if (HistoryOutputPerSurface_Map.count(currentField) > 0){
       switch (HistoryOutputPerSurface_Map[currentField][0].ScreenFormat) {
-      case FORMAT_INTEGER:
-        PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[currentField][0].Value));
-        break;
-      case FORMAT_FIXED:
-        PrintScreenFixed(out, HistoryOutputPerSurface_Map[currentField][0].Value);
-        break;
-      case FORMAT_SCIENTIFIC:
-        PrintScreenScientific(out, HistoryOutputPerSurface_Map[currentField][0].Value);
-        break;   
-      }
-    }    
-    out << sep;
+        case FORMAT_INTEGER:
+          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[currentField][0].Value));
+          break;
+        case FORMAT_FIXED:
+          PrintScreenFixed(out, HistoryOutputPerSurface_Map[currentField][0].Value);
+          break;
+        case FORMAT_SCIENTIFIC:
+          PrintScreenScientific(out, HistoryOutputPerSurface_Map[currentField][0].Value);
+          break;   
+      }
+    }      
+    (*ConvergenceTable) << out.str();
   }
-  out << '\n';
-  // Insert line break
-  cout << out.str();
 }
 
 
@@ -8793,6 +8763,23 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     /*--- Add the header to the history file. ---*/
     
     SetHistoryFile_Header(config);    
+    
+    string currentField;
+  
+    /*--- Set screen convergence output header ---*/
+    
+    // Evaluate the requested output
+    for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+      currentField = ScreenFields[iField];  
+      if (HistoryOutput_Map.count(currentField) > 0){ 
+        ConvergenceTable->AddColumn(HistoryOutput_Map[currentField].FieldName, field_width);
+      } else {
+  //      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
+      }
+      if (HistoryOutputPerSurface_Map.count(currentField) > 0){
+        ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[currentField][0].FieldName, field_width);
+      }
+    }
   }
   
 }

From 864c69451b09023fe72d4d87ed9e354abdb93123 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 10:12:17 +0200
Subject: [PATCH 048/539] Use table printer for non-dim. summary output

---
 SU2_CFD/src/solver_direct_mean.cpp | 359 +++++++++++------------------
 1 file changed, 141 insertions(+), 218 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 4cd673d70659..ad36f34589fb 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "../include/solver_structure.hpp"
+#include "../../Common/include/tools.hpp"
 
 CEulerSolver::CEulerSolver(void) : CSolver() {
   
@@ -3845,227 +3846,149 @@ void CEulerSolver::SetNondimensionalization(CGeometry *geometry, CConfig *config
     
     cout <<"-- Input conditions:"<< endl;
     
-    switch (config->GetKind_FluidModel()) {
-
-      case STANDARD_AIR:
-        cout << "Fluid Model: STANDARD_AIR "<< endl;
-        cout << "Specific gas constant: " << config->GetGas_Constant();
-        if (config->GetSystemMeasurements() == SI) cout << " N.m/kg.K." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " lbf.ft/slug.R." << endl;
-        cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< endl;
-        cout << "Specific Heat Ratio: "<< Gamma << endl;
-        break;
-
-      case IDEAL_GAS:
-        cout << "Fluid Model: IDEAL_GAS "<< endl;
-        cout << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
-        cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< endl;
-        cout << "Specific Heat Ratio: "<< Gamma << endl;
-        break;
-
-      case VW_GAS:
-        cout << "Fluid Model: Van der Waals "<< endl;
-        cout << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
-        cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< endl;
-        cout << "Specific Heat Ratio: "<< Gamma << endl;
-        cout << "Critical Pressure:   " << config->GetPressure_Critical()  << " Pa." << endl;
-        cout << "Critical Temperature:  " << config->GetTemperature_Critical() << " K." << endl;
-        cout << "Critical Pressure (non-dim):   " << config->GetPressure_Critical() /config->GetPressure_Ref() << endl;
-        cout << "Critical Temperature (non-dim) :  " << config->GetTemperature_Critical() /config->GetTemperature_Ref() << endl;
-        break;
-
-      case PR_GAS:
-        cout << "Fluid Model: Peng-Robinson "<< endl;
-        cout << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
-        cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< endl;
-        cout << "Specific Heat Ratio: "<< Gamma << endl;
-        cout << "Critical Pressure:   " << config->GetPressure_Critical()  << " Pa." << endl;
-        cout << "Critical Temperature:  " << config->GetTemperature_Critical() << " K." << endl;
-        cout << "Critical Pressure (non-dim):   " << config->GetPressure_Critical() /config->GetPressure_Ref() << endl;
-        cout << "Critical Temperature (non-dim) :  " << config->GetTemperature_Critical() /config->GetTemperature_Ref() << endl;
-        break;
-
-    }
-    if (viscous) {
-      switch (config->GetKind_ViscosityModel()) {
-
-        case CONSTANT_VISCOSITY:
-          cout << "Viscosity Model: CONSTANT_VISCOSITY  "<< endl;
-          cout << "Laminar Viscosity: " << config->GetMu_Constant();
-          if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-          cout << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< endl;
-          break;
-
-        case SUTHERLAND:
-          cout << "Viscosity Model: SUTHERLAND "<< endl;
-          cout << "Ref. Laminar Viscosity: " << config->GetMu_Ref();
-          if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-          cout << "Ref. Temperature: " << config->GetMu_Temperature_Ref();
-          if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-          cout << "Sutherland Constant: "<< config->GetMu_S();
-          if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-          cout << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< endl;
-          cout << "Ref. Temperature (non-dim): " << config->GetMu_Temperature_RefND()<< endl;
-          cout << "Sutherland constant (non-dim): "<< config->GetMu_SND()<< endl;
-          break;
-
-      }
-      switch (config->GetKind_ConductivityModel()) {
-
-        case CONSTANT_PRANDTL:
-          cout << "Conductivity Model: CONSTANT_PRANDTL  "<< endl;
-          cout << "Prandtl: " << config->GetPrandtl_Lam()<< endl;
-          break;
-
-        case CONSTANT_CONDUCTIVITY:
-          cout << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< endl;
-          cout << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << endl;
-          cout << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< endl;
-          break;
-
-      }
-    }
-
-    
-    cout << "Free-stream static pressure: " << config->GetPressure_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    
-    cout << "Free-stream total pressure: " << config->GetPressure_FreeStream() * pow( 1.0+Mach*Mach*0.5*(Gamma-1.0), Gamma/(Gamma-1.0) );
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    
-    cout << "Free-stream temperature: " << config->GetTemperature_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-    
-    cout << "Free-stream density: " << config->GetDensity_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " kg/m^3." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " slug/ft^3." << endl;
-    
-    if (nDim == 2) {
-      cout << "Free-stream velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
-      cout << config->GetVelocity_FreeStream()[1] << ")";
-    }
-    if (nDim == 3) {
-      cout << "Free-stream velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
-      cout << config->GetVelocity_FreeStream()[1] << ", " << config->GetVelocity_FreeStream()[2] << ")";
-    }
-    if (config->GetSystemMeasurements() == SI) cout << " m/s. ";
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s. ";
-    
-    cout << "Magnitude: "   << config->GetModVel_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " m/s (" << config->GetModVel_FreeStream()*1.94384 << " KTS)." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s (" << config->GetModVel_FreeStream()*0.592484 << " KTS)." << endl;
-    
-    cout << "Free-stream total energy per unit mass: " << config->GetEnergy_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " m^2/s^2." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft^2/s^2." << endl;
-    
-    if (viscous) {
-      cout << "Free-stream viscosity: " << config->GetViscosity_FreeStream();
-      if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-      if (turbulent) {
-        cout << "Free-stream turb. kinetic energy per unit mass: " << config->GetTke_FreeStream();
-        if (config->GetSystemMeasurements() == SI) cout << " m^2/s^2." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " ft^2/s^2." << endl;
-        cout << "Free-stream specific dissipation: " << config->GetOmega_FreeStream();
-        if (config->GetSystemMeasurements() == SI) cout << " 1/s." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " 1/s." << endl;
-      }
-    }
-    
-    if (unsteady) { cout << "Total time: " << config->GetTotal_UnstTime() << " s. Time step: " << config->GetDelta_UnstTime() << " s." << endl; }
-    
-    /*--- Print out reference values. ---*/
-    
-    cout <<"-- Reference values:"<< endl;
-    
-    cout << "Reference specific gas constant: " << config->GetGas_Constant_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " N.m/kg.K." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " lbf.ft/slug.R." << endl;
-
-    cout << "Reference pressure: " << config->GetPressure_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    
-    cout << "Reference temperature: " << config->GetTemperature_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-    
-    cout << "Reference density: " << config->GetDensity_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " kg/m^3." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " slug/ft^3." << endl;
-    
-    cout << "Reference velocity: " << config->GetVelocity_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " m/s." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s." << endl;
-    
-    cout << "Reference energy per unit mass: " << config->GetEnergy_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " m^2/s^2." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft^2/s^2." << endl;
-    
-    if (viscous) {
-      cout << "Reference viscosity: " << config->GetViscosity_Ref();
-      if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-      cout << "Reference conductivity: " << config->GetConductivity_Ref();
-      if (config->GetSystemMeasurements() == SI) cout << " W/m^2.K." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf/ft.s.R." << endl;
-    }
-    
-    
-    if (unsteady) cout << "Reference time: " << config->GetTime_Ref() <<" s." << endl;
-    
-    /*--- Print out resulting non-dim values here. ---*/
-    
-    cout << "-- Resulting non-dimensional state:" << endl;
-    cout << "Mach number (non-dim): " << config->GetMach() << endl;
-    if (viscous) {
-      cout << "Reynolds number (non-dim): " << config->GetReynolds() <<". Re length: " << config->GetLength_Reynolds();
-      if (config->GetSystemMeasurements() == SI) cout << " m." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " ft." << endl;
+    TablePrinter NonDimTableIn(&std::cout);
+    stringstream Unit;    
+    
+    NonDimTableIn.AddColumn("Name", 18);
+    NonDimTableIn.AddColumn("Dim. value", 14, 10);
+    NonDimTableIn.AddColumn("Ref. value", 14, 10);
+    NonDimTableIn.AddColumn("Unit", 10);
+    NonDimTableIn.AddColumn("Non-dim. value", 14, 10);
+    
+    NonDimTableIn.PrintHeader();
+    
+    if (viscous){
+      if (config->GetKind_ViscosityModel() == CONSTANT_VISCOSITY){
+        if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+        NonDimTableIn << "Viscosity" << config->GetMu_Constant() << config->GetMu_ConstantND()/config->GetMu_Constant() << Unit.str() << config->GetMu_ConstantND();
+        Unit.str("");
+      }
+
+      if (config->GetKind_ViscosityModel() == SUTHERLAND){
+        if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+        NonDimTableIn << "Ref. Viscosity" <<  config->GetMu_Ref() <<  config->GetViscosity_Ref() << Unit.str() << config->GetMu_RefND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "K";
+        else if (config->GetSystemMeasurements() == US) Unit << "R";
+        NonDimTableIn << "Sutherland Temp." << config->GetMu_Temperature_Ref() <<  config->GetTemperature_Ref() << Unit.str() << config->GetMu_Temperature_RefND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "K";
+        else if (config->GetSystemMeasurements() == US) Unit << "R";
+        NonDimTableIn << "Sutherland Const." << config->GetMu_S() << config->GetTemperature_Ref() << Unit.str() << config->GetMu_SND();
+        Unit.str("");
+      }
+      NonDimTableIn.PrintFooter();
+      if (config->GetKind_ConductivityModel() == CONSTANT_PRANDTL){
+        NonDimTableIn << "Prandtl (Lam.)" << "-" << "-" << "-" << config->GetPrandtl_Lam();         
+        Unit.str("");
+        NonDimTableIn << "Prandtl (Turb.)" << "-" << "-" << "-" << config->GetPrandtl_Turb();         
+        Unit.str("");
+      }
+      if (config->GetKind_ConductivityModel() == CONSTANT_CONDUCTIVITY){
+        Unit << "W/m^2.K";
+        NonDimTableIn << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_ConstantND()/config->GetKt_Constant() << Unit.str() << config->GetKt_ConstantND();         
+        Unit.str("");
+      }
+    }
+    NonDimTableIn.PrintFooter();
+    
+    if      (config->GetSystemMeasurements() == SI) Unit << "N.m/kg.K";
+    else if (config->GetSystemMeasurements() == US) Unit << "lbf.ft/slug.R";
+    NonDimTableIn << "Gas Constant" << config->GetGas_Constant() << config->GetGas_Constant_Ref() << Unit.str() << config->GetGas_ConstantND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "N.m/kg.K";
+    else if (config->GetSystemMeasurements() == US) Unit << "lbf.ft/slug.R";
+    NonDimTableIn << "Spec. Heat Ratio" << "-" << "-" << "-" << Gamma;
+    Unit.str("");
+    
+    if (config->GetKind_FluidModel() == VW_GAS || config->GetKind_FluidModel() == PR_GAS){
+        NonDimTableIn << "Critical Pressure" << config->GetPressure_Critical() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_Critical() /config->GetPressure_Ref();
+        Unit.str("");
+        Unit << "K";
+        NonDimTableIn << "Critical Temperature" << config->GetTemperature_Critical() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_Critical() /config->GetTemperature_Ref();
+        Unit.str("");
+    }
+    if (unsteady){
+      NonDimTableIn.PrintFooter();
+      NonDimTableIn << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      Unit.str("");
+      NonDimTableIn << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      Unit.str("");
+    }
+    NonDimTableIn.PrintFooter();
+    
+    cout <<"-- Free-stream conditions:"<< endl;
+    
+    TablePrinter NonDimTableFS(&std::cout);
+    
+    NonDimTableFS.AddColumn("Name", 18);
+    NonDimTableFS.AddColumn("Dim. value", 14, 10);
+    NonDimTableFS.AddColumn("Ref. value", 14, 10);
+    NonDimTableFS.AddColumn("Unit", 10);
+    NonDimTableFS.AddColumn("Non-dim. value", 14, 10);
+    
+    NonDimTableFS.set_flush_right();
+    NonDimTableFS.PrintHeader();
+
+    if      (config->GetSystemMeasurements() == SI) Unit << "Pa";
+    else if (config->GetSystemMeasurements() == US) Unit << "psf";
+    NonDimTableFS << "Static Pressure" << config->GetPressure_FreeStream() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "kg/m^3";
+    else if (config->GetSystemMeasurements() == US) Unit << "slug/ft^3";
+    NonDimTableFS << "Density" << config->GetDensity_FreeStream() << config->GetDensity_Ref() << Unit.str() << config->GetDensity_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "K";
+    else if (config->GetSystemMeasurements() == US) Unit << "R";
+    NonDimTableFS << "Temperature" << config->GetTemperature_FreeStream() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";
+    else if (config->GetSystemMeasurements() == US) Unit << "ft^2/s^2";
+    NonDimTableFS << "Total Energy" << config->GetEnergy_FreeStream() << config->GetEnergy_Ref() << Unit.str() << config->GetEnergy_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "m/s";
+    else if (config->GetSystemMeasurements() == US) Unit << "ft/s";
+    NonDimTableFS << "Velocity-X" << config->GetVelocity_FreeStream()[0] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[0];
+    NonDimTableFS << "Velocity-Y" << config->GetVelocity_FreeStream()[1] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[1];
+    if (nDim == 3){
+      NonDimTableFS << "Velocity-Z" << config->GetVelocity_FreeStream()[2] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[2];
+    }
+    NonDimTableFS << "Velocity Magnitude" << config->GetModVel_FreeStream() << config->GetVelocity_Ref() << Unit.str() << config->GetModVel_FreeStreamND();
+    Unit.str("");
+
+    if (viscous){
+      if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+      else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+      NonDimTableFS << "Viscosity" << config->GetViscosity_FreeStream() << config->GetViscosity_Ref() << Unit.str() << config->GetViscosity_FreeStreamND();
+      Unit.str("");
+      if      (config->GetSystemMeasurements() == SI) Unit << "W/m^2.K";
+      else if (config->GetSystemMeasurements() == US) Unit << "lbf/ft.s.R";
+      NonDimTableFS << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
+      Unit.str("");
+      if (turbulent){
+        if      (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "ft^2/s^2";
+        NonDimTableFS << "Turb. Kin. Energy" << config->GetTke_FreeStream() << config->GetTke_FreeStream()/config->GetTke_FreeStreamND() << Unit.str() << config->GetTke_FreeStreamND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "1/s";
+        else if (config->GetSystemMeasurements() == US) Unit << "1/s";
+        NonDimTableFS << "Spec. Dissipation" << config->GetOmega_FreeStream() << config->GetOmega_FreeStream()/config->GetOmega_FreeStreamND() << Unit.str() << config->GetOmega_FreeStreamND();
+        Unit.str("");
+      }
+    }
+    
+    NonDimTableFS.PrintFooter();
+    NonDimTableFS << "Mach Number" << "-" << "-" << "-" << config->GetMach();
+    if (viscous){
+      NonDimTableFS << "Reynolds Number" << "-" << "-" << "-" << config->GetReynolds();      
     }
     if (gravity) {
-      cout << "Froude number (non-dim): " << Froude << endl;
-      cout << "Lenght of the baseline wave (non-dim): " << 2.0*PI_NUMBER*Froude*Froude << endl;
-    }
-    
-    cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND() << endl;
-    cout << "Free-stream temperature (non-dim): " << config->GetTemperature_FreeStreamND() << endl;
-
-    cout << "Free-stream pressure (non-dim): " << config->GetPressure_FreeStreamND() << endl;
-    
-    cout << "Free-stream density (non-dim): " << config->GetDensity_FreeStreamND() << endl;
-    
-    if (nDim == 2) {
-      cout << "Free-stream velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
-      cout << config->GetVelocity_FreeStreamND()[1] << "). ";
-    } else {
-      cout << "Free-stream velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
-      cout << config->GetVelocity_FreeStreamND()[1] << ", " << config->GetVelocity_FreeStreamND()[2] << "). ";
-    }
-    cout << "Magnitude: "    << config->GetModVel_FreeStreamND() << endl;
-    
-    cout << "Free-stream total energy per unit mass (non-dim): " << config->GetEnergy_FreeStreamND() << endl;
-    
-    if (viscous) {
-      cout << "Free-stream viscosity (non-dim): " << config->GetViscosity_FreeStreamND() << endl;
-      if (turbulent) {
-        cout << "Free-stream turb. kinetic energy (non-dim): " << config->GetTke_FreeStreamND() << endl;
-        cout << "Free-stream specific dissipation (non-dim): " << config->GetOmega_FreeStreamND() << endl;
-      }
-    }
-    
-    if (unsteady) {
-      cout << "Total time (non-dim): " << config->GetTotal_UnstTimeND() << endl;
-      cout << "Time step (non-dim): " << config->GetDelta_UnstTimeND() << endl;
+      NonDimTableFS << "Froude Number" << "-" << "-" << "-" << Froude;      
+      NonDimTableFS << "Wave Length"   << "-" << "-" << "-" << 2.0*PI_NUMBER*Froude*Froude;
     }
+    NonDimTableFS.PrintFooter();
     
     cout << endl;
     

From 4bcf04c38b67bc88ada8eac7e80578ced322310b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 12:19:49 +0200
Subject: [PATCH 049/539] Removed precision variable from table printer

---
 Common/include/tools.hpp | 3 +--
 Common/src/tools.cpp     | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Common/include/tools.hpp b/Common/include/tools.hpp
index 528ac298eb38..205fff9f011b 100644
--- a/Common/include/tools.hpp
+++ b/Common/include/tools.hpp
@@ -19,7 +19,7 @@ class TablePrinter{
   void set_flush_left();
   void set_flush_right();
 
-  void AddColumn(const std::string & header_name, int column_width, int precision = 0);
+  void AddColumn(const std::string & header_name, int column_width);
   void PrintHeader();
   void PrintFooter();
 
@@ -114,7 +114,6 @@ class TablePrinter{
   std::vector<std::string> column_headers_;
   std::vector<int> column_widths_;
   std::string separator_;
-  std::vector<int> precision_;
 
   int i_; // index of current row
   int j_; // index of current column
diff --git a/Common/src/tools.cpp b/Common/src/tools.cpp
index a084cd59ed15..b4ae1bd0624c 100644
--- a/Common/src/tools.cpp
+++ b/Common/src/tools.cpp
@@ -41,15 +41,10 @@ void TablePrinter::set_flush_right(){
  ** \param header_name Name to be print for the header
  ** \param column_width the width of the column (has to be >=5)
  ** */
-void TablePrinter::AddColumn(const std::string & header_name, int column_width, int precision){
+void TablePrinter::AddColumn(const std::string & header_name, int column_width){
   if (column_width < 4){
     throw std::invalid_argument("Column size has to be >= 4");
   }
-  if (precision == 0){
-    precision_.push_back(column_width);
-  } else {
-    precision_.push_back(precision);
-  }
 
   column_headers_.push_back(header_name);
   column_widths_.push_back(column_width);

From fbcb1ca2a30c3db62debc936a8a4b128297c1167 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 12:20:20 +0200
Subject: [PATCH 050/539] Added table output for marker info

---
 Common/src/geometry_structure.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 46ca3814e376..4472f717627b 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -10279,6 +10279,13 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
         
         bool duplicate = false;
         iMarker=0;
+        TablePrinter BoundaryTable(&std::cout);
+        BoundaryTable.AddColumn("Index", 6);
+        BoundaryTable.AddColumn("Marker", 14);
+        BoundaryTable.AddColumn("Elements", 14);
+        if (rank == MASTER_NODE){
+          BoundaryTable.PrintHeader();
+        }
         do {
           
           getline (mesh_file, text_line);
@@ -10309,8 +10316,10 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
             if (duplicate)  nElem_Bound[iMarker+1]  = nElem_Bound[iMarker];
 
             if (rank == MASTER_NODE) {
-              cout << nElem_Bound[iMarker]  << " boundary elements in index "<< iMarker <<" (Marker = " <<Marker_Tag<< ")." << endl;
-              if (duplicate)  cout << nElem_Bound[iMarker+1]  << " boundary elements in index "<< iMarker+1 <<" (Marker = " <<Marker_Tag_Duplicate<< ")." << endl;
+              BoundaryTable << iMarker << Marker_Tag << nElem_Bound[iMarker];
+              if (duplicate){
+                BoundaryTable << iMarker+1 << Marker_Tag_Duplicate << nElem_Bound[iMarker+1];                
+              }
             }
             
             /*--- Allocate space for elements ---*/
@@ -10452,7 +10461,9 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
           iMarker++;
           
         } while (iMarker < nMarker);
-        
+        if (rank == MASTER_NODE){
+          BoundaryTable.PrintFooter();
+        }
         if (boundary_marker_count == nMarker) break;
         
       }

From 4c34887c42d788aa339e413715d568c6774c2c61 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 10 Sep 2018 12:20:45 +0200
Subject: [PATCH 051/539] Some changes to non-dim summary output

---
 SU2_CFD/src/solver_direct_mean.cpp | 101 ++++++++++++++---------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index ad36f34589fb..451005882867 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -3846,149 +3846,144 @@ void CEulerSolver::SetNondimensionalization(CGeometry *geometry, CConfig *config
     
     cout <<"-- Input conditions:"<< endl;
     
-    TablePrinter NonDimTableIn(&std::cout);
+    TablePrinter NonDimTable(&std::cout);
     stringstream Unit;    
     
-    NonDimTableIn.AddColumn("Name", 18);
-    NonDimTableIn.AddColumn("Dim. value", 14, 10);
-    NonDimTableIn.AddColumn("Ref. value", 14, 10);
-    NonDimTableIn.AddColumn("Unit", 10);
-    NonDimTableIn.AddColumn("Non-dim. value", 14, 10);
-    
-    NonDimTableIn.PrintHeader();
+    NonDimTable.AddColumn("Name", 18);
+    NonDimTable.AddColumn("Dim. value", 14);
+    NonDimTable.AddColumn("Ref. value", 14);
+    NonDimTable.AddColumn("Unit", 10);
+    NonDimTable.AddColumn("Non-dim. value", 14);
+    NonDimTable.set_flush_right();
+    NonDimTable.PrintHeader();
     
     if (viscous){
       if (config->GetKind_ViscosityModel() == CONSTANT_VISCOSITY){
         if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
         else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-        NonDimTableIn << "Viscosity" << config->GetMu_Constant() << config->GetMu_ConstantND()/config->GetMu_Constant() << Unit.str() << config->GetMu_ConstantND();
+        NonDimTable << "Viscosity" << config->GetMu_Constant() << config->GetMu_ConstantND()/config->GetMu_Constant() << Unit.str() << config->GetMu_ConstantND();
         Unit.str("");
+        NonDimTable.PrintFooter();
       }
 
       if (config->GetKind_ViscosityModel() == SUTHERLAND){
         if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
         else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-        NonDimTableIn << "Ref. Viscosity" <<  config->GetMu_Ref() <<  config->GetViscosity_Ref() << Unit.str() << config->GetMu_RefND();
+        NonDimTable << "Ref. Viscosity" <<  config->GetMu_Ref() <<  config->GetViscosity_Ref() << Unit.str() << config->GetMu_RefND();
         Unit.str("");
         if      (config->GetSystemMeasurements() == SI) Unit << "K";
         else if (config->GetSystemMeasurements() == US) Unit << "R";
-        NonDimTableIn << "Sutherland Temp." << config->GetMu_Temperature_Ref() <<  config->GetTemperature_Ref() << Unit.str() << config->GetMu_Temperature_RefND();
+        NonDimTable << "Sutherland Temp." << config->GetMu_Temperature_Ref() <<  config->GetTemperature_Ref() << Unit.str() << config->GetMu_Temperature_RefND();
         Unit.str("");
         if      (config->GetSystemMeasurements() == SI) Unit << "K";
         else if (config->GetSystemMeasurements() == US) Unit << "R";
-        NonDimTableIn << "Sutherland Const." << config->GetMu_S() << config->GetTemperature_Ref() << Unit.str() << config->GetMu_SND();
+        NonDimTable << "Sutherland Const." << config->GetMu_S() << config->GetTemperature_Ref() << Unit.str() << config->GetMu_SND();
         Unit.str("");
+        NonDimTable.PrintFooter();
       }
-      NonDimTableIn.PrintFooter();
+
       if (config->GetKind_ConductivityModel() == CONSTANT_PRANDTL){
-        NonDimTableIn << "Prandtl (Lam.)" << "-" << "-" << "-" << config->GetPrandtl_Lam();         
+        NonDimTable << "Prandtl (Lam.)" << "-" << "-" << "-" << config->GetPrandtl_Lam();         
         Unit.str("");
-        NonDimTableIn << "Prandtl (Turb.)" << "-" << "-" << "-" << config->GetPrandtl_Turb();         
+        NonDimTable << "Prandtl (Turb.)" << "-" << "-" << "-" << config->GetPrandtl_Turb();         
         Unit.str("");
+        NonDimTable.PrintFooter();
       }
       if (config->GetKind_ConductivityModel() == CONSTANT_CONDUCTIVITY){
         Unit << "W/m^2.K";
-        NonDimTableIn << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_ConstantND()/config->GetKt_Constant() << Unit.str() << config->GetKt_ConstantND();         
+        NonDimTable << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_ConstantND()/config->GetKt_Constant() << Unit.str() << config->GetKt_ConstantND();         
         Unit.str("");
+        NonDimTable.PrintFooter();
       }
     }
-    NonDimTableIn.PrintFooter();
     
     if      (config->GetSystemMeasurements() == SI) Unit << "N.m/kg.K";
     else if (config->GetSystemMeasurements() == US) Unit << "lbf.ft/slug.R";
-    NonDimTableIn << "Gas Constant" << config->GetGas_Constant() << config->GetGas_Constant_Ref() << Unit.str() << config->GetGas_ConstantND();
+    NonDimTable << "Gas Constant" << config->GetGas_Constant() << config->GetGas_Constant_Ref() << Unit.str() << config->GetGas_ConstantND();
     Unit.str("");
     if      (config->GetSystemMeasurements() == SI) Unit << "N.m/kg.K";
     else if (config->GetSystemMeasurements() == US) Unit << "lbf.ft/slug.R";
-    NonDimTableIn << "Spec. Heat Ratio" << "-" << "-" << "-" << Gamma;
+    NonDimTable << "Spec. Heat Ratio" << "-" << "-" << "-" << Gamma;
     Unit.str("");
     
     if (config->GetKind_FluidModel() == VW_GAS || config->GetKind_FluidModel() == PR_GAS){
-        NonDimTableIn << "Critical Pressure" << config->GetPressure_Critical() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_Critical() /config->GetPressure_Ref();
+        NonDimTable << "Critical Pressure" << config->GetPressure_Critical() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_Critical() /config->GetPressure_Ref();
         Unit.str("");
         Unit << "K";
-        NonDimTableIn << "Critical Temperature" << config->GetTemperature_Critical() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_Critical() /config->GetTemperature_Ref();
+        NonDimTable << "Critical Temperature" << config->GetTemperature_Critical() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_Critical() /config->GetTemperature_Ref();
         Unit.str("");
     }
+    NonDimTable.PrintFooter();
     if (unsteady){
-      NonDimTableIn.PrintFooter();
-      NonDimTableIn << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
-      NonDimTableIn << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
+      NonDimTable.PrintFooter();
     }
-    NonDimTableIn.PrintFooter();
     
     cout <<"-- Free-stream conditions:"<< endl;
     
-    TablePrinter NonDimTableFS(&std::cout);
-    
-    NonDimTableFS.AddColumn("Name", 18);
-    NonDimTableFS.AddColumn("Dim. value", 14, 10);
-    NonDimTableFS.AddColumn("Ref. value", 14, 10);
-    NonDimTableFS.AddColumn("Unit", 10);
-    NonDimTableFS.AddColumn("Non-dim. value", 14, 10);
-    
-    NonDimTableFS.set_flush_right();
-    NonDimTableFS.PrintHeader();
+    NonDimTable.PrintHeader();
 
     if      (config->GetSystemMeasurements() == SI) Unit << "Pa";
     else if (config->GetSystemMeasurements() == US) Unit << "psf";
-    NonDimTableFS << "Static Pressure" << config->GetPressure_FreeStream() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_FreeStreamND();
+    NonDimTable << "Static Pressure" << config->GetPressure_FreeStream() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_FreeStreamND();
     Unit.str("");
     if      (config->GetSystemMeasurements() == SI) Unit << "kg/m^3";
     else if (config->GetSystemMeasurements() == US) Unit << "slug/ft^3";
-    NonDimTableFS << "Density" << config->GetDensity_FreeStream() << config->GetDensity_Ref() << Unit.str() << config->GetDensity_FreeStreamND();
+    NonDimTable << "Density" << config->GetDensity_FreeStream() << config->GetDensity_Ref() << Unit.str() << config->GetDensity_FreeStreamND();
     Unit.str("");
     if      (config->GetSystemMeasurements() == SI) Unit << "K";
     else if (config->GetSystemMeasurements() == US) Unit << "R";
-    NonDimTableFS << "Temperature" << config->GetTemperature_FreeStream() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_FreeStreamND();
+    NonDimTable << "Temperature" << config->GetTemperature_FreeStream() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_FreeStreamND();
     Unit.str("");
     if      (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";
     else if (config->GetSystemMeasurements() == US) Unit << "ft^2/s^2";
-    NonDimTableFS << "Total Energy" << config->GetEnergy_FreeStream() << config->GetEnergy_Ref() << Unit.str() << config->GetEnergy_FreeStreamND();
+    NonDimTable << "Total Energy" << config->GetEnergy_FreeStream() << config->GetEnergy_Ref() << Unit.str() << config->GetEnergy_FreeStreamND();
     Unit.str("");
     if      (config->GetSystemMeasurements() == SI) Unit << "m/s";
     else if (config->GetSystemMeasurements() == US) Unit << "ft/s";
-    NonDimTableFS << "Velocity-X" << config->GetVelocity_FreeStream()[0] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[0];
-    NonDimTableFS << "Velocity-Y" << config->GetVelocity_FreeStream()[1] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[1];
+    NonDimTable << "Velocity-X" << config->GetVelocity_FreeStream()[0] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[0];
+    NonDimTable << "Velocity-Y" << config->GetVelocity_FreeStream()[1] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[1];
     if (nDim == 3){
-      NonDimTableFS << "Velocity-Z" << config->GetVelocity_FreeStream()[2] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[2];
+      NonDimTable << "Velocity-Z" << config->GetVelocity_FreeStream()[2] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[2];
     }
-    NonDimTableFS << "Velocity Magnitude" << config->GetModVel_FreeStream() << config->GetVelocity_Ref() << Unit.str() << config->GetModVel_FreeStreamND();
+    NonDimTable << "Velocity Magnitude" << config->GetModVel_FreeStream() << config->GetVelocity_Ref() << Unit.str() << config->GetModVel_FreeStreamND();
     Unit.str("");
 
     if (viscous){
+      NonDimTable.PrintFooter();
       if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
       else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-      NonDimTableFS << "Viscosity" << config->GetViscosity_FreeStream() << config->GetViscosity_Ref() << Unit.str() << config->GetViscosity_FreeStreamND();
+      NonDimTable << "Viscosity" << config->GetViscosity_FreeStream() << config->GetViscosity_Ref() << Unit.str() << config->GetViscosity_FreeStreamND();
       Unit.str("");
       if      (config->GetSystemMeasurements() == SI) Unit << "W/m^2.K";
       else if (config->GetSystemMeasurements() == US) Unit << "lbf/ft.s.R";
-      NonDimTableFS << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
+      NonDimTable << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
       Unit.str("");
       if (turbulent){
         if      (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";
         else if (config->GetSystemMeasurements() == US) Unit << "ft^2/s^2";
-        NonDimTableFS << "Turb. Kin. Energy" << config->GetTke_FreeStream() << config->GetTke_FreeStream()/config->GetTke_FreeStreamND() << Unit.str() << config->GetTke_FreeStreamND();
+        NonDimTable << "Turb. Kin. Energy" << config->GetTke_FreeStream() << config->GetTke_FreeStream()/config->GetTke_FreeStreamND() << Unit.str() << config->GetTke_FreeStreamND();
         Unit.str("");
         if      (config->GetSystemMeasurements() == SI) Unit << "1/s";
         else if (config->GetSystemMeasurements() == US) Unit << "1/s";
-        NonDimTableFS << "Spec. Dissipation" << config->GetOmega_FreeStream() << config->GetOmega_FreeStream()/config->GetOmega_FreeStreamND() << Unit.str() << config->GetOmega_FreeStreamND();
+        NonDimTable << "Spec. Dissipation" << config->GetOmega_FreeStream() << config->GetOmega_FreeStream()/config->GetOmega_FreeStreamND() << Unit.str() << config->GetOmega_FreeStreamND();
         Unit.str("");
       }
     }
     
-    NonDimTableFS.PrintFooter();
-    NonDimTableFS << "Mach Number" << "-" << "-" << "-" << config->GetMach();
+    NonDimTable.PrintFooter();
+    NonDimTable << "Mach Number" << "-" << "-" << "-" << config->GetMach();
     if (viscous){
-      NonDimTableFS << "Reynolds Number" << "-" << "-" << "-" << config->GetReynolds();      
+      NonDimTable << "Reynolds Number" << "-" << "-" << "-" << config->GetReynolds();      
     }
     if (gravity) {
-      NonDimTableFS << "Froude Number" << "-" << "-" << "-" << Froude;      
-      NonDimTableFS << "Wave Length"   << "-" << "-" << "-" << 2.0*PI_NUMBER*Froude*Froude;
+      NonDimTable << "Froude Number" << "-" << "-" << "-" << Froude;      
+      NonDimTable << "Wave Length"   << "-" << "-" << "-" << 2.0*PI_NUMBER*Froude*Froude;
     }
-    NonDimTableFS.PrintFooter();
+    NonDimTable.PrintFooter();
     
     cout << endl;
     

From 8b774b8bc8c5ef254615a0fcba591adc3461c852 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 13 Sep 2018 11:27:53 +0200
Subject: [PATCH 052/539] Added table output for inc. solver

---
 SU2_CFD/src/solver_direct_mean_inc.cpp | 371 ++++++++++---------------
 1 file changed, 152 insertions(+), 219 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 1d576aefa240..267ff4194d66 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "../include/solver_structure.hpp"
+#include "../../Common/include/tools.hpp"
 
 CIncEulerSolver::CIncEulerSolver(void) : CSolver() {
   /*--- Basic array initialization ---*/
@@ -2020,225 +2021,157 @@ void CIncEulerSolver::SetNondimensionalization(CGeometry *geometry, CConfig *con
 
     cout <<"-- Input conditions:"<< endl;
     
-    switch (config->GetKind_FluidModel()) {
-      
-      case CONSTANT_DENSITY:
-        cout << "Fluid Model: CONSTANT_DENSITY "<< endl;
-        if (energy) {
-          cout << "Specific heat at constant pressure (Cp): " << config->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
-        }
-        if (boussinesq) cout << "Thermal expansion coefficient: " << config->GetThermal_Expansion_Coeff() << " K^-1." << endl;
-        cout << "Thermodynamic pressure not required." << endl;
-        break;
-        
-      case INC_IDEAL_GAS:
-        cout << "Fluid Model: INC_IDEAL_GAS "<< endl;
-        cout << "Variable density incompressible flow using ideal gas law." << endl;
-        cout << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
-        cout << "Specific heat at constant pressure (Cp): " << config->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
-        cout << "Molecular weight : "<< config->GetMolecular_Weight() << " g/mol" << endl;
-        cout << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
-        cout << "Thermodynamic pressure: " << config->GetPressure_Thermodynamic();
-        if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-        break;
-      
-    }
-    if (viscous) {
-      switch (config->GetKind_ViscosityModel()) {
-
-        case CONSTANT_VISCOSITY:
-          cout << "Viscosity Model: CONSTANT_VISCOSITY  "<< endl;
-          cout << "Constant Laminar Viscosity: " << config->GetMu_Constant();
-          if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-          cout << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< endl;
-          break;
-
-        case SUTHERLAND:
-          cout << "Viscosity Model: SUTHERLAND "<< endl;
-          cout << "Ref. Laminar Viscosity: " << config->GetMu_Ref();
-          if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-          cout << "Ref. Temperature: " << config->GetMu_Temperature_Ref();
-          if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-          cout << "Sutherland Constant: "<< config->GetMu_S();
-          if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-          else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-          cout << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< endl;
-          cout << "Ref. Temperature (non-dim): " << config->GetMu_Temperature_RefND()<< endl;
-          cout << "Sutherland constant (non-dim): "<< config->GetMu_SND()<< endl;
-          break;
-
-      }
-
-      if (energy) {
-        switch (config->GetKind_ConductivityModel()) {
-
-          case CONSTANT_PRANDTL:
-            cout << "Conductivity Model: CONSTANT_PRANDTL  "<< endl;
-            cout << "Prandtl (Laminar): " << config->GetPrandtl_Lam()<< endl;
-            cout << "Prandtl (Turbulent): " << config->GetPrandtl_Turb()<< endl;
-            break;
-
-          case CONSTANT_CONDUCTIVITY:
-            cout << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< endl;
-            cout << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << endl;
-            cout << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< endl;
-            break;
-
-        }
-      }
-
-    }
-    
-    if (config->GetKind_FluidModel() == CONSTANT_DENSITY) {
-      cout << "Bulk modulus: " << config->GetBulk_Modulus();
-      if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    }
-
-    cout << "Initial dynamic pressure: " << config->GetPressure_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    
-    cout << "Initial total pressure: " << config->GetPressure_FreeStream() + 0.5*config->GetDensity_FreeStream()*config->GetModVel_FreeStream()*config->GetModVel_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-
-    if (energy) {
-      cout << "Initial temperature: " << config->GetTemperature_FreeStream();
-      if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-    }
-
-    cout << "Initial density: " << config->GetDensity_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " kg/m^3." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " slug/ft^3." << endl;
-    
-    if (nDim == 2) {
-      cout << "Initial velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
-      cout << config->GetVelocity_FreeStream()[1] << ")";
-    }
-    if (nDim == 3) {
-      cout << "Initial velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
-      cout << config->GetVelocity_FreeStream()[1] << ", " << config->GetVelocity_FreeStream()[2] << ")";
-    }
-    if (config->GetSystemMeasurements() == SI) cout << " m/s. ";
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s. ";
-    
-    cout << "Magnitude: "  << config->GetModVel_FreeStream();
-    if (config->GetSystemMeasurements() == SI) cout << " m/s." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s." << endl;
-
-    if (viscous) {
-      cout << "Initial laminar viscosity: " << config->GetViscosity_FreeStream();
-      if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-      if (turbulent) {
-        cout << "Initial turb. kinetic energy per unit mass: " << config->GetTke_FreeStream();
-        if (config->GetSystemMeasurements() == SI) cout << " m^2/s^2." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " ft^2/s^2." << endl;
-        cout << "Initial specific dissipation: " << config->GetOmega_FreeStream();
-        if (config->GetSystemMeasurements() == SI) cout << " 1/s." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " 1/s." << endl;
-      }
-    }
-    
-    if (unsteady) { cout << "Total time: " << config->GetTotal_UnstTime() << " s. Time step: " << config->GetDelta_UnstTime() << " s." << endl; }
-    
-    /*--- Print out reference values. ---*/
-    
-    cout <<"-- Reference values:"<< endl;
-
-    if (config->GetKind_FluidModel() != CONSTANT_DENSITY) {
-      cout << "Reference specific gas constant: " << config->GetGas_Constant_Ref();
-      if (config->GetSystemMeasurements() == SI) cout << " N.m/kg.K." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf.ft/slug.R." << endl;
-    } else {
-      if (energy) {
-        cout << "Reference specific heat: " << config->GetGas_Constant_Ref();
-        if (config->GetSystemMeasurements() == SI) cout << " N.m/kg.K." << endl;
-        else if (config->GetSystemMeasurements() == US) cout << " lbf.ft/slug.R." << endl;
-      }
-    }
-
-    cout << "Reference pressure: " << config->GetPressure_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " Pa." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " psf." << endl;
-    
-    if (energy) {
-      cout << "Reference temperature: " << config->GetTemperature_Ref();
-      if (config->GetSystemMeasurements() == SI) cout << " K." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " R." << endl;
-    }
-
-    cout << "Reference density: " << config->GetDensity_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " kg/m^3." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " slug/ft^3." << endl;
-    
-    cout << "Reference velocity: " << config->GetVelocity_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " m/s." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " ft/s." << endl;
-
-    cout << "Reference length: " << config->GetLength_Ref();
-    if (config->GetSystemMeasurements() == SI) cout << " m." << endl;
-    else if (config->GetSystemMeasurements() == US) cout << " in." << endl;
-
-    if (viscous) {
-      cout << "Reference viscosity: " << config->GetViscosity_Ref();
-      if (config->GetSystemMeasurements() == SI) cout << " N.s/m^2." << endl;
-      else if (config->GetSystemMeasurements() == US) cout << " lbf.s/ft^2." << endl;
-    }
-    
-    if (unsteady) cout << "Reference time: " << config->GetTime_Ref() <<" s." << endl;
-    
-    /*--- Print out resulting non-dim values here. ---*/
-    
-    cout << "-- Resulting non-dimensional state:" << endl;
-    cout << "Mach number (non-dim): " << config->GetMach() << endl;
-    if (viscous) {
-      cout << "Reynolds number (per m): " << config->GetReynolds() << endl;
-    }
-    
-    if (config->GetKind_FluidModel() != CONSTANT_DENSITY) {
-      cout << "Specific gas constant (non-dim): " << config->GetGas_ConstantND() << endl;
-      cout << "Initial thermodynamic pressure (non-dim): " << config->GetPressure_ThermodynamicND() << endl;
-    } else {
-      if (energy) {
-        cout << "Specific heat at constant pressure (non-dim): " << config->GetSpecific_Heat_CpND() << endl;
-        if (boussinesq) cout << "Thermal expansion coefficient (non-dim.): " << config->GetThermal_Expansion_CoeffND() << " K^-1." << endl;
-      }
-    }
-    
-    if (energy) cout << "Initial temperature (non-dim): " << config->GetTemperature_FreeStreamND() << endl;
-    cout << "Initial pressure (non-dim): " << config->GetPressure_FreeStreamND() << endl;
-    cout << "Initial density (non-dim): " << config->GetDensity_FreeStreamND() << endl;
-    
-    if (nDim == 2) {
-      cout << "Initial velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
-      cout << config->GetVelocity_FreeStreamND()[1] << "). ";
-    } else {
-      cout << "Initial velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
-      cout << config->GetVelocity_FreeStreamND()[1] << ", " << config->GetVelocity_FreeStreamND()[2] << "). ";
-    }
-    cout << "Magnitude: "   << config->GetModVel_FreeStreamND() << endl;
-    
-    if (viscous) {
-      cout << "Initial viscosity (non-dim): " << config->GetViscosity_FreeStreamND() << endl;
-      if (turbulent) {
-        cout << "Initial turb. kinetic energy (non-dim): " << config->GetTke_FreeStreamND() << endl;
-        cout << "Initial specific dissipation (non-dim): " << config->GetOmega_FreeStreamND() << endl;
-      }
-    }
-    
-    if (unsteady) {
-      cout << "Total time (non-dim): " << config->GetTotal_UnstTimeND() << endl;
-      cout << "Time step (non-dim): " << config->GetDelta_UnstTimeND() << endl;
-    }
-    
-    cout << endl;
+    TablePrinter NonDimTable(&std::cout);
+    stringstream Unit;  
+    
+    NonDimTable.AddColumn("Name", 18);
+    NonDimTable.AddColumn("Dim. value", 14);
+    NonDimTable.AddColumn("Ref. value", 14);
+    NonDimTable.AddColumn("Unit", 10);
+    NonDimTable.AddColumn("Non-dim. value", 14);
+    NonDimTable.set_flush_right();
+    NonDimTable.PrintHeader();
+    
+    if (viscous){
+      if (config->GetKind_ViscosityModel() == CONSTANT_VISCOSITY){
+        if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+        NonDimTable << "Viscosity" << config->GetMu_Constant() << config->GetMu_ConstantND()/config->GetMu_Constant() << Unit.str() << config->GetMu_ConstantND();
+        Unit.str("");
+        NonDimTable.PrintFooter();
+      }
+
+      if (config->GetKind_ViscosityModel() == SUTHERLAND){
+        if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+        NonDimTable << "Ref. Viscosity" <<  config->GetMu_Ref() <<  config->GetViscosity_Ref() << Unit.str() << config->GetMu_RefND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "K";
+        else if (config->GetSystemMeasurements() == US) Unit << "R";
+        NonDimTable << "Sutherland Temp." << config->GetMu_Temperature_Ref() <<  config->GetTemperature_Ref() << Unit.str() << config->GetMu_Temperature_RefND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "K";
+        else if (config->GetSystemMeasurements() == US) Unit << "R";
+        NonDimTable << "Sutherland Const." << config->GetMu_S() << config->GetTemperature_Ref() << Unit.str() << config->GetMu_SND();
+        Unit.str("");
+        NonDimTable.PrintFooter();
+      }
+
+      if (config->GetKind_ConductivityModel() == CONSTANT_PRANDTL){
+        NonDimTable << "Prandtl (Lam.)" << "-" << "-" << "-" << config->GetPrandtl_Lam();         
+        Unit.str("");
+        NonDimTable << "Prandtl (Turb.)" << "-" << "-" << "-" << config->GetPrandtl_Turb();         
+        Unit.str("");
+        NonDimTable.PrintFooter();
+      }
+      if (config->GetKind_ConductivityModel() == CONSTANT_CONDUCTIVITY){
+        Unit << "W/m^2.K";
+        NonDimTable << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_ConstantND()/config->GetKt_Constant() << Unit.str() << config->GetKt_ConstantND();         
+        Unit.str("");
+        NonDimTable.PrintFooter();
+      }
+    }
+    
+    if (config->GetKind_FluidModel() == CONSTANT_DENSITY){
+      if (energy){
+        Unit << "N.m/kg.K";
+        NonDimTable << "Spec. Heat (Cp)" << config->GetSpecific_Heat_Cp() << config->GetSpecific_Heat_CpND()/config->GetSpecific_Heat_Cp() << Unit.str() << config->GetSpecific_Heat_CpND();         
+        Unit.str("");
+      }
+      if (boussinesq){
+        Unit << "K^-1";
+        NonDimTable << "Thermal Exp." << config->GetThermal_Expansion_Coeff() << config->GetThermal_Expansion_CoeffND()/config->GetThermal_Expansion_Coeff() << Unit.str() <<  config->GetThermal_Expansion_CoeffND();         
+        Unit.str("");
+      }
+      Unit << "Pa";
+      NonDimTable << "Bulk Modulus" << config->GetBulk_Modulus() << 1.0 << Unit.str() <<  config->GetBulk_Modulus();         
+      Unit.str("");
+      NonDimTable.PrintFooter();
+    }
+    if (config->GetKind_FluidModel() == INC_IDEAL_GAS){
+      Unit << "N.m/kg.K";
+      NonDimTable << "Spec. Heat (Cp)" << config->GetSpecific_Heat_Cp() << config->GetSpecific_Heat_CpND()/config->GetSpecific_Heat_Cp() << Unit.str() << config->GetSpecific_Heat_CpND();         
+      Unit.str("");
+      Unit << "g/mol";
+      NonDimTable << "Molecular weight" << config->GetMolecular_Weight()<< 1.0 << Unit.str() << config->GetMolecular_Weight();         
+      Unit.str("");
+      Unit << "N.m/kg.K";
+      NonDimTable << "Gas Constant" << config->GetGas_Constant() << config->GetGas_Constant_Ref() << Unit.str() << config->GetGas_ConstantND();         
+      Unit.str("");
+      Unit << "Pa";
+      NonDimTable << "Therm. Pressure" << config->GetPressure_Thermodynamic() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_ThermodynamicND();         
+      Unit.str("");
+      NonDimTable.PrintFooter();
+    }
+
+    if (unsteady){
+      NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      Unit.str("");
+      NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      Unit.str("");
+      NonDimTable.PrintFooter();
+    }
+    
+    cout <<"-- Initial conditions:"<< endl;
+    NonDimTable.PrintHeader();
+
+    if      (config->GetSystemMeasurements() == SI) Unit << "Pa";
+    else if (config->GetSystemMeasurements() == US) Unit << "psf";
+    NonDimTable << "Dynamic Pressure" << config->GetPressure_FreeStream() << config->GetPressure_Ref() << Unit.str() << config->GetPressure_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "Pa";
+    else if (config->GetSystemMeasurements() == US) Unit << "psf";
+    NonDimTable << "Total Pressure" << config->GetPressure_FreeStream() + 0.5*config->GetDensity_FreeStream()*config->GetModVel_FreeStream()*config->GetModVel_FreeStream() 
+                << config->GetPressure_Ref() << Unit.str() << config->GetPressure_FreeStreamND() + 0.5*config->GetDensity_FreeStreamND()*config->GetModVel_FreeStreamND()*config->GetModVel_FreeStreamND();
+    Unit.str("");
+    if      (config->GetSystemMeasurements() == SI) Unit << "kg/m^3";
+    else if (config->GetSystemMeasurements() == US) Unit << "slug/ft^3";
+    NonDimTable << "Density" << config->GetDensity_FreeStream() << config->GetDensity_Ref() << Unit.str() << config->GetDensity_FreeStreamND();
+    Unit.str("");
+    if (energy){
+      if      (config->GetSystemMeasurements() == SI) Unit << "K";
+      else if (config->GetSystemMeasurements() == US) Unit << "R";
+      NonDimTable << "Temperature" << config->GetTemperature_FreeStream() << config->GetTemperature_Ref() << Unit.str() << config->GetTemperature_FreeStreamND();
+      Unit.str("");
+    }
+    if      (config->GetSystemMeasurements() == SI) Unit << "m/s";
+    else if (config->GetSystemMeasurements() == US) Unit << "ft/s";
+    NonDimTable << "Velocity-X" << config->GetVelocity_FreeStream()[0] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[0];
+    NonDimTable << "Velocity-Y" << config->GetVelocity_FreeStream()[1] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[1];
+    if (nDim == 3){
+      NonDimTable << "Velocity-Z" << config->GetVelocity_FreeStream()[2] << config->GetVelocity_Ref() << Unit.str() << config->GetVelocity_FreeStreamND()[2];
+    }
+    NonDimTable << "Velocity Magnitude" << config->GetModVel_FreeStream() << config->GetVelocity_Ref() << Unit.str() << config->GetModVel_FreeStreamND();
+    Unit.str("");
+
+    if (viscous){
+      NonDimTable.PrintFooter();
+      if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
+      else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
+      NonDimTable << "Viscosity" << config->GetViscosity_FreeStream() << config->GetViscosity_Ref() << Unit.str() << config->GetViscosity_FreeStreamND();
+      Unit.str("");
+      if      (config->GetSystemMeasurements() == SI) Unit << "W/m^2.K";
+      else if (config->GetSystemMeasurements() == US) Unit << "lbf/ft.s.R";
+      NonDimTable << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
+      Unit.str("");
+      if (turbulent){
+        if      (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";
+        else if (config->GetSystemMeasurements() == US) Unit << "ft^2/s^2";
+        NonDimTable << "Turb. Kin. Energy" << config->GetTke_FreeStream() << config->GetTke_FreeStream()/config->GetTke_FreeStreamND() << Unit.str() << config->GetTke_FreeStreamND();
+        Unit.str("");
+        if      (config->GetSystemMeasurements() == SI) Unit << "1/s";
+        else if (config->GetSystemMeasurements() == US) Unit << "1/s";
+        NonDimTable << "Spec. Dissipation" << config->GetOmega_FreeStream() << config->GetOmega_FreeStream()/config->GetOmega_FreeStreamND() << Unit.str() << config->GetOmega_FreeStreamND();
+        Unit.str("");
+      }
+    }
+    
+    NonDimTable.PrintFooter();
+    NonDimTable << "Mach Number" << "-" << "-" << "-" << config->GetMach();
+    if (viscous){
+      NonDimTable << "Reynolds Number" << "-" << "-" << "-" << config->GetReynolds();      
+    }
+    NonDimTable.PrintFooter();
     
   }
   

From b9fef2e6d8377bad4c1dc05f26920f3c07a6279c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 14 Sep 2018 17:03:47 +0200
Subject: [PATCH 053/539] Fixing some after-merge conflicts.

---
 SU2_CFD/include/output_structure.hpp     |  4 ++--
 SU2_CFD/src/driver_direct_multizone.cpp  |  8 +++----
 SU2_CFD/src/driver_direct_singlezone.cpp | 28 ++++++++++++------------
 SU2_CFD/src/driver_structure.cpp         |  2 +-
 SU2_CFD/src/iteration_structure.cpp      |  6 ++---
 SU2_CFD/src/output_paraview.cpp          |  1 +
 SU2_CFD/src/output_structure.cpp         | 25 +++++++++++----------
 7 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index cc3ed096695b..da27685463f8 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -441,7 +441,7 @@ class COutput {
    * \param[in] val_nZone - Total number of zones.
    * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
    */
-  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
+  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nInst, bool surf_sol);
   
   /*!
    * \brief Write a Tecplot ASCII solution file.
@@ -693,7 +693,7 @@ class COutput {
    * \param[in] val_nZone - Total number of domains in the grid file.
    */
   void SetResult_Files_Parallel(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone, unsigned short *nInst);
+                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone);
   
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index b1d1870d3f0c..6a112a1e5c4a 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -352,7 +352,7 @@ void CMultizoneDriver::Run_Jacobi() {
       config_container[iZone]->SetOuterIter(iOuter_Iter);
 
       /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
-      iteration_container[iZone][INST_0]->Solve(output, integration_container, geometry_container, solver_container,
+      iteration_container[iZone][INST_0]->Solve(output[ZONE_0], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
       /*--- A corrector step can help preventing numerical instabilities ---*/
@@ -371,7 +371,7 @@ void CMultizoneDriver::Run_Jacobi() {
 void CMultizoneDriver::Corrector(unsigned short val_iZone) {
 
     if (config_container[val_iZone]->GetRelaxation())
-      iteration_container[val_iZone][INST_0]->Relaxation(output, integration_container, geometry_container, solver_container,
+      iteration_container[val_iZone][INST_0]->Relaxation(output[ZONE_0], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
 }
@@ -584,11 +584,11 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
 
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, nZone);
+    output[ZONE_0]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, ZONE_0, nZone);
 
 
     /*--- Execute the routine for writing special output. ---*/
-    output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
+   // output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
 
 
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index cac2029a9ce0..5869061ed635 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -118,15 +118,15 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
 
   /*--- Read the target pressure for inverse design. ---------------------------------------------*/
   /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
-    output->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
+//  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
+//    output->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
+//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
 
-  /*--- Read the target heat flux ----------------------------------------------------------------*/
-  /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
-    output->SetHeatFlux_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
+//  /*--- Read the target heat flux ----------------------------------------------------------------*/
+//  /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
+//  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
+//    output->SetHeatFlux_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
+//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
 
   /*--- Set the initial condition for EULER/N-S/RANS ---------------------------------------------*/
   if ((config_container[ZONE_0]->GetKind_Solver() ==  EULER) ||
@@ -141,7 +141,7 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
 
   /*--- Run a predictor step ---*/
   if (config_container[ZONE_0]->GetPredictor())
-    iteration_container[ZONE_0][INST_0]->Predictor(output, integration_container, geometry_container, solver_container,
+    iteration_container[ZONE_0][INST_0]->Predictor(output[ZONE_0], integration_container, geometry_container, solver_container,
         numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- Perform a dynamic mesh update if required. ---*/
@@ -160,7 +160,7 @@ void CSinglezoneDriver::Run() {
   config_container[ZONE_0]->SetOuterIter(OuterIter);
 
   /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
-  iteration_container[ZONE_0][INST_0]->Solve(output, integration_container, geometry_container, solver_container,
+  iteration_container[ZONE_0][INST_0]->Solve(output[ZONE_0], integration_container, geometry_container, solver_container,
         numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- A corrector step can help preventing numerical instabilities ---*/
@@ -172,7 +172,7 @@ void CSinglezoneDriver::Run() {
 void CSinglezoneDriver::Corrector() {
 
     if (config_container[ZONE_0]->GetRelaxation())
-      iteration_container[ZONE_0][INST_0]->Relaxation(output, integration_container, geometry_container, solver_container,
+      iteration_container[ZONE_0][INST_0]->Relaxation(output[ZONE_0], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
 }
@@ -182,7 +182,7 @@ void CSinglezoneDriver::Update() {
   unsigned short jZone;
   bool UpdateMesh;
 
-  iteration_container[ZONE_0][INST_0]->Update(output, integration_container, geometry_container,
+  iteration_container[ZONE_0][INST_0]->Update(output[ZONE_0], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
@@ -258,11 +258,11 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
 
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, nZone);
+    output[ZONE_0]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, ZONE_0, nZone);
 
 
     /*--- Execute the routine for writing special output. ---*/
-    output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
+   //output[ZONE_0]->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
 
 
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index f9c87df00298..2b6a4c9bcbb8 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3607,7 +3607,7 @@ void CDriver::Output(unsigned long ExtIter) {
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
     for (iZone = 0; iZone < nZone; iZone++)
-      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, ExtIter, iZone, nZone, nInst);
+      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, ExtIter, iZone, nZone);
     
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
     
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 4d8d676fcc74..048443a28a92 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -512,10 +512,10 @@ void CIteration::Output(COutput *output,
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
 
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, Iter, nZone);
+    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, Iter, ZONE_0, nZone);
 
     /*--- Execute the routine for writing special output. ---*/
-    output->SetSpecial_Output(solver_container, geometry_container, config_container, Iter, nZone);
+    //output->SetSpecial_Output(solver_container, geometry_container, config_container, Iter, nZone);
 
 
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
@@ -761,7 +761,7 @@ bool CFluidIteration::Monitor(COutput *output,
   /*--- This needs to be generalized when the new output structure comes ---*/
   output_history = (steady && !(multizone && (config_container[val_iZone]->GetnInner_Iter()==1)));
 
-  if (output_history) output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, false, UsedTime, val_iZone, INST_0);
+  if (output_history) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, UsedTime, val_iZone, INST_0);
 
   return StopCalc;
 
diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp
index 646af4d9fadd..582b1e928b33 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output_paraview.cpp
@@ -2413,6 +2413,7 @@ void COutput::WriteParaViewBinary_Parallel(CConfig *config,
                                            CSolver **solver,
                                            unsigned short val_iZone,
                                            unsigned short val_nZone,
+                                           unsigned short val_nInst,
                                            bool surf_sol) {
   
   unsigned short iDim, nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index b580fa34cc51..06807a87ec08 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4069,19 +4069,22 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
                                        CConfig **config,
                                        unsigned long iExtIter,
                                        unsigned short iZone,
-                                       unsigned short val_nZone,
-                                       unsigned short *nInst) {
+                                       unsigned short val_nZone) {
   
   unsigned short iVar, iInst;
   unsigned long iPoint;
   bool compressible = true;
+  
+  unsigned short nInst = config[iZone]->GetnTimeInstances();
 
     /*--- Get the file output format ---*/
     
     unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
     
-    for (iInst = 0; iInst < nInst[iZone]; iInst++){
+    for (iInst = 0; iInst < nInst; iInst++){
 
+      config[iZone]->SetiInst(iInst);
+      
       bool cont_adj = config[iZone]->GetContinuous_Adjoint();
       bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
 
@@ -4245,7 +4248,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
             WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
             break;
 
           case FIELDVIEW:
@@ -4265,7 +4268,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
             WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
             break;
 
           case FIELDVIEW_BINARY:
@@ -4282,7 +4285,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
             if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
             WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], false);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
             break;
             
           case PARAVIEW_BINARY:
@@ -4291,7 +4294,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             
             if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
             WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, false);
+                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, false);
             break;
 
           default:
@@ -4310,7 +4313,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
             WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
             break;
 
           case TECPLOT_BINARY:
@@ -4321,7 +4324,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
             WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
             break;
 
           case PARAVIEW:
@@ -4330,7 +4333,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
             if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
             WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst[iZone], true);
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
             break;
 
           case PARAVIEW_BINARY:
@@ -4339,7 +4342,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             
             if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
             WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, true);
+                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, true);
             break;
             
 

From 8e6ddfb5c0ded457f008821729729639841b935b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Oct 2018 15:39:05 +0200
Subject: [PATCH 054/539] Resolved a conflict

---
 SU2_CFD/src/output_structure.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 5b4441183c87..b580fa34cc51 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -3644,28 +3644,8 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
       break;
     }
 
-<<<<<<< HEAD
     config[val_iZone]->SetCFL(iMesh, CFL);
   }
-=======
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-    
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-    
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-    
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
->>>>>>> develop
 
   switch( config[val_iZone]->GetKind_Solver()) {
   case EULER : case NAVIER_STOKES : case RANS:

From 86c826d8ed58cb627b656e3bd1263f82d71aee25 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Oct 2018 15:58:45 +0200
Subject: [PATCH 055/539] Added correct screen writing for unsteady simulation
 in CFlowOutput

---
 SU2_CFD/src/output_direct_mean.cpp | 35 +++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 918aa2ce89d6..4ed777b367a4 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -519,15 +519,40 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
 }
 
 bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- return true;
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
 }
 
 bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header;
-  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)) ||
-     ( (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() ==DT_STEPPING_2ND) && config->GetIntIter() == 0);
-  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
   return write_header;
+}
+
+bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
+      && write_dualtime && 
+      (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0)){
+    write_output = true;
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) ) && (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ){
+    write_output = true;    
+  } 
+  return write_output;
+  
+      (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0)){
+}
+
   
 }
 

From 6f2023cfd35e3df0bb8f120d57431aa9c8a47558 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Oct 2018 15:59:41 +0200
Subject: [PATCH 056/539] Added averaging routine in COutput

---
 SU2_CFD/include/output_structure.hpp |  3 +++
 SU2_CFD/src/output_structure.cpp     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index cc3ed096695b..8437a20beb13 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -876,6 +876,9 @@ class COutput {
       
   virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   virtual void SetVolumeOutputFields(CConfig *config);
+  
+  void ComputeAverage(std::map<string, std::vector<su2double> > &Signal, std::map<string, double> &Average);
+  
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index b580fa34cc51..48b4d4e88b31 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8902,3 +8902,18 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     }
   }
 }
+
+void COutput::ComputeAverage(std::map<string, std::vector<su2double>> &Signal, std::map<string, double> &Average){
+  
+  Average.clear();
+  map<string, vector<su2double>>::iterator it;
+  for (it = Signal.begin(); it != Signal.end(); it++){
+    Average[it->first] = 0.0;  
+    if (it->second.size() > 0){  
+      for (unsigned int i = 0; i < it->second.size(); i++){
+        Average[it->first] += (it->second)[i];
+      }
+      Average[it->first] /= it->second.size();
+    }
+  }
+}
\ No newline at end of file

From b72b778961ca3c8ad0c41760a634f34b69c6e27d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Oct 2018 16:00:44 +0200
Subject: [PATCH 057/539] Added new unsteady output (average and q criterion)
 to CFlowOutput

---
 SU2_CFD/include/output_structure.hpp |   6 ++
 SU2_CFD/src/output_direct_mean.cpp   | 109 +++++++++++++++++++++++----
 2 files changed, 100 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 8437a20beb13..8281278f1b76 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -896,6 +896,10 @@ class CFlowOutput : public COutput {
   bool grid_movement;
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+  
+  map<string, vector<su2double>> Time_Signal;
+  
+  map<string, su2double> Average;
 
 public:
 
@@ -943,6 +947,8 @@ class CFlowOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
   
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 4ed777b367a4..75b846a2aa02 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -84,6 +84,7 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
     ScreenFields.push_back("ENERGY");
     nScreenOutput = ScreenFields.size();
   }
+  ComputeAverage(Time_Signal, Average);
 }
 
 CFlowOutput::~CFlowOutput(void) {
@@ -112,16 +113,11 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
   AddHistoryOutput("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
   
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
-    break;  
-  case SST:
-    AddHistoryOutput("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
-    AddHistoryOutput("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
-    break;
-  default: break;
-  }
+
+  AddHistoryOutput("NU_TILDE",       "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("KINETIC_ENERGY", "Res[k]",  FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("DISSIPATION",    "Res[w]",  FORMAT_FIXED, "RESIDUALS");
+
   
   // Aerodynamic coefficients
   AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
@@ -135,6 +131,17 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
+  AddHistoryOutput("DRAG_AVG",       "CD(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("LIFT_AVG",       "CL(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("SIDEFORCE_AVG",  "CSF(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-X_AVG",   "CMx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-Y_AVG",   "CMy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-Z_AVG",   "CMz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-X_AVG",    "CFx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-Y_AVG",    "CFy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-Z_AVG",    "CFz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("EFFICIENCY_AVG", "CEff(Avg)", FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  
   // Aerodynamic coefficients (per surface)  
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
@@ -303,6 +310,15 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
     AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
   }
+  
+  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    if (nDim == 3){
+      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION");
+      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION");
+    }
+    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION");
+    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION");  
+  }
 }
 
 void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -417,6 +433,15 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
   }
   
+  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    if (nDim == 3){
+      SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity()[0]);
+      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);      
+    } 
+    SetVolumeOutputValue("VORTICITY_Z", iPoint, Node_Flow->GetVorticity()[2]);      
+    SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));      
+  }
+  
 }
 
 void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
@@ -479,6 +504,35 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
+  if (config[val_iZone]->GetUnsteady_Simulation() != STEADY && !DualTime){
+    Time_Signal["DRAG"].push_back(flow_solver->GetTotal_CD());
+    Time_Signal["LIFT"].push_back(flow_solver->GetTotal_CL());
+    Time_Signal["SIDEFORCE"].push_back(flow_solver->GetTotal_CSF());
+    Time_Signal["MOMENT-X"].push_back(flow_solver->GetTotal_CMx());
+    Time_Signal["MOMENT-Y"].push_back(flow_solver->GetTotal_CMy());
+    Time_Signal["MOMENT-Z"].push_back(flow_solver->GetTotal_CMz());
+    Time_Signal["FORCE-X"].push_back(flow_solver->GetTotal_CFx());
+    Time_Signal["FORCE-Y"].push_back(flow_solver->GetTotal_CFy());
+    Time_Signal["FORCE-Z"].push_back(flow_solver->GetTotal_CFz());
+    Time_Signal["EFFICIENCY"].push_back(flow_solver->GetTotal_CEff());
+    ComputeAverage(Time_Signal, Average);
+  }
+
+  SetHistoryOutputValue("DRAG_AVG", Average["DRAG"]);
+  SetHistoryOutputValue("LIFT_AVG", Average["LIFT"]);
+  if (nDim == 3)
+    SetHistoryOutputValue("SIDEFORCE_AVG", Average["SIDEFORCE"]);
+  if (nDim == 3){
+    SetHistoryOutputValue("MOMENT-X_AVG", Average["MOMENT-X"]);
+    SetHistoryOutputValue("MOMENT-Y_AVG", Average["MOMENT-Y"]);
+  }
+  SetHistoryOutputValue("MOMENT-Z_AVG", Average["MOMENT-Z"]);
+  SetHistoryOutputValue("FORCE-X_AVG", Average["FORCE-X"]);
+  SetHistoryOutputValue("FORCE-Y_AVG", Average["FORCE-Y"]);
+  if (nDim == 3)
+    SetHistoryOutputValue("FORCE-Z_AVG", Average["FORCE-Z"]);
+  SetHistoryOutputValue("EFFICIENCY_AVG", Average["EFFICIENCY"]);
+  
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
@@ -549,14 +603,39 @@ bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
     write_output = true;    
   } 
   return write_output;
-  
-      (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0)){
 }
 
+
+
+
+
+su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+  
+  unsigned short iDim;
+  su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
+      Grad_Vel[iDim][jDim] = node_flow->GetGradient_Primitive(iDim+1, jDim);
+      Strain[iDim][jDim]   = 0.5*(Grad_Vel[iDim][jDim] + Grad_Vel[jDim][iDim]);
+      Omega[iDim][jDim]    = 0.5*(Grad_Vel[iDim][jDim] - Grad_Vel[jDim][iDim]);
+    }
+  }
+  
+  su2double OmegaMag = 0.0, StrainMag = 0.0;
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
+      StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
+      OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
+    }
+  }
+  StrainMag = sqrt(StrainMag); OmegaMag = sqrt(OmegaMag);
+  
+  su2double Q = 0.5*(OmegaMag - StrainMag);
   
+  return Q;
 }
 
-bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  return true;
-}
+
 

From 8196a1dbf4c22ee3606d65283116558896275075 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Oct 2018 10:55:02 +0200
Subject: [PATCH 058/539] Fixed template syntax error

---
 SU2_CFD/include/output_structure.hpp | 2 +-
 SU2_CFD/src/output_structure.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 8281278f1b76..cf154f077d9d 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -897,7 +897,7 @@ class CFlowOutput : public COutput {
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
   
-  map<string, vector<su2double>> Time_Signal;
+  map<string, vector<su2double> > Time_Signal;
   
   map<string, su2double> Average;
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 48b4d4e88b31..412d7f8e10fa 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8903,10 +8903,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   }
 }
 
-void COutput::ComputeAverage(std::map<string, std::vector<su2double>> &Signal, std::map<string, double> &Average){
+void COutput::ComputeAverage(std::map<string, std::vector<su2double> > &Signal, std::map<string, double> &Average){
   
   Average.clear();
-  map<string, vector<su2double>>::iterator it;
+  map<string, vector<su2double> >::iterator it;
   for (it = Signal.begin(); it != Signal.end(); it++){
     Average[it->first] = 0.0;  
     if (it->second.size() > 0){  

From bda409eaacb9864409454aec5f2f53819f7175c4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Oct 2018 14:23:07 +0200
Subject: [PATCH 059/539] Added toolbox structure

---
 Common/include/tools.hpp               | 123 -------------------------
 Common/lib/Makefile.am                 |   3 +-
 Common/src/config_structure.cpp        |   2 +-
 Common/src/geometry_structure.cpp      |   2 +-
 Common/src/tools.cpp                   |  98 --------------------
 SU2_CFD/include/output_structure.hpp   |   3 +-
 SU2_CFD/src/solver_direct_mean.cpp     |   2 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp |   2 +-
 8 files changed, 8 insertions(+), 227 deletions(-)
 delete mode 100644 Common/include/tools.hpp
 delete mode 100644 Common/src/tools.cpp

diff --git a/Common/include/tools.hpp b/Common/include/tools.hpp
deleted file mode 100644
index 205fff9f011b..000000000000
--- a/Common/include/tools.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <cmath>
-
-
-
-
-class TablePrinter{
-public:
-  TablePrinter(std::ostream * output, const std::string & separator = "|");
-  ~TablePrinter();
-  class endl{};
-  int get_num_columns() const;
-  int get_table_width() const;
-  void set_separator(const std::string & separator);
-  void set_flush_left();
-  void set_flush_right();
-
-  void AddColumn(const std::string & header_name, int column_width);
-  void PrintHeader();
-  void PrintFooter();
-
-  TablePrinter& operator<<(endl input){
-    while (j_ != 0){
-      *this << "";
-    }
-    return *this;
-  }
-
-  // Can we merge these?
-//  TablePrinter& operator<<(float input);
-//  TablePrinter& operator<<(double input);
-
-  template<typename T> TablePrinter& operator<<(T input){
-    if (j_ == 0)
-      *out_stream_ << "|";
-
-    if(flush_left_)
-      *out_stream_ << std::left;
-    else
-      *out_stream_ << std::right; 
-
-    // Leave 3 extra space: One for negative sign, one for zero, one for decimal
-    *out_stream_ << std::setw(column_widths_.at(j_))
-                 << input;
-
-    if (j_ == get_num_columns()-1){
-      *out_stream_ << "|\n";
-      i_ = i_ + 1;
-      j_ = 0;
-    } else {
-      *out_stream_ << separator_;
-      j_ = j_ + 1;
-    }
-
-    return *this;
-  }
-
-private:
-  void PrintHorizontalLine();
-
-//  template<typename T> void OutputDecimalNumber(T input){
-//    // If we cannot handle this number, indicate so
-//    if (input < 10*(precision_.at(j_)-1) || input > 10*precision_.at(j_)){
-//      std::stringstream string_out;
-//      string_out << std::setiosflags(std::ios::fixed)
-//                 << std::setprecision(precision_.at(j_))
-//                 << std::setw(column_widths_.at(j_))
-//                 << input;
-  
-//      std::string string_rep_of_number = string_out.str();
-  
-//      string_rep_of_number[precision_.at(j_)-1] = '*';
-//      std::string string_to_print = string_rep_of_number.substr(0, precision_.at(j_));
-//      *out_stream_ << string_to_print;
-//    } else {
-  
-//      // determine what precision we need
-//      int precision = precision_.at(j_) - 1; // leave room for the decimal point
-//      if (input < 0)
-//        --precision; // leave room for the minus sign
-  
-//      // leave room for digits before the decimal?
-//      if (input < -1 || input > 1){
-//        int num_digits_before_decimal = 1 + (int)log10(std::abs(input));
-//        precision -= num_digits_before_decimal;
-//      }
-//      else
-//        precision --; // e.g. 0.12345 or -0.1234
-  
-//      if (precision < 0)
-//        precision = 0; // don't go negative with precision
-  
-//      *out_stream_ << std::setiosflags(std::ios::fixed)
-//                   << std::setprecision(precision)
-//                   << std::setw(column_widths_.at(j_))
-//                   << input;
-//    }
-  
-//    if (j_ == get_num_columns()-1){
-//      *out_stream_ << "|\n";
-//      i_ = i_ + 1;
-//      j_ = 0;
-//    } else {
-//      *out_stream_ << separator_;
-//      j_ = j_ + 1;
-//    }
-//  }
-  
-  std::ostream * out_stream_;
-  std::vector<std::string> column_headers_;
-  std::vector<int> column_widths_;
-  std::string separator_;
-
-  int i_; // index of current row
-  int j_; // index of current column
-
-  int table_width_;
-  bool flush_left_;
-};
diff --git a/Common/lib/Makefile.am b/Common/lib/Makefile.am
index af8e53ce0ac1..779f276ce15a 100644
--- a/Common/lib/Makefile.am
+++ b/Common/lib/Makefile.am
@@ -101,7 +101,8 @@ lib_sources = \
   ../src/element_linear.cpp \
   ../src/interpolation_structure.cpp \
   ../src/adt_structure.cpp \
-  ../src/tools.cpp 
+  ../src/toolboxes/printing_toolbox.cpp \
+  ../src/toolboxes/signal_processing_toolbox.cpp
 
 lib_cxxflags = -fPIC
 lib_ldadd =
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index c866bca1f82f..7c230e38c0ec 100755
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -38,7 +38,7 @@
 #include "../include/config_structure.hpp"
 
 #include "../include/ad_structure.hpp"
-#include "../include/tools.hpp"
+#include "../include/toolboxes/printing_toolbox.hpp"
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level) {
   
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index b6e46d965091..f9868404beb3 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -37,7 +37,7 @@
 
 #include "../include/geometry_structure.hpp"
 #include "../include/adt_structure.hpp"
-#include "../include/tools.hpp"
+#include "../include/toolboxes/printing_toolbox.hpp"
 #include <iomanip>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/Common/src/tools.cpp b/Common/src/tools.cpp
deleted file mode 100644
index b4ae1bd0624c..000000000000
--- a/Common/src/tools.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <stdexcept>
-#include <iomanip>
-#include <stdexcept>
-#include "../include/tools.hpp"
-
-TablePrinter::TablePrinter(std::ostream * output, const std::string & separator){
-  out_stream_ = output;
-  i_ = 0;
-  j_ = 0;
-  separator_ = separator;
-  table_width_ = 0;
-  flush_left_ = false;
-}
-
-TablePrinter::~TablePrinter(){
-
-}
-
-int TablePrinter::get_num_columns() const {
-  return column_headers_.size();
-}
-
-int TablePrinter::get_table_width() const {
-  return table_width_;
-}
-
-void TablePrinter::set_separator(const std::string &separator){
-  separator_ = separator;
-}
-
-void TablePrinter::set_flush_left(){
-  flush_left_ = true;
-}
-
-void TablePrinter::set_flush_right(){
-  flush_left_ = false;
-}
-
-/** \brief Add a column to our table
- ** 
- ** \param header_name Name to be print for the header
- ** \param column_width the width of the column (has to be >=5)
- ** */
-void TablePrinter::AddColumn(const std::string & header_name, int column_width){
-  if (column_width < 4){
-    throw std::invalid_argument("Column size has to be >= 4");
-  }
-
-  column_headers_.push_back(header_name);
-  column_widths_.push_back(column_width);
-  table_width_ += column_width + separator_.size(); // for the separator  
-}
-
-void TablePrinter::PrintHorizontalLine() {
-  *out_stream_ << "+"; // the left bar
-
-  for (int i=0; i<table_width_-1; ++i)
-    *out_stream_ << "-";
-
-  *out_stream_ << "+"; // the right bar
-  *out_stream_ << "\n";
-}
-
-void TablePrinter::PrintHeader(){
-  PrintHorizontalLine();
-  *out_stream_ << "|";
-
-  for (int i=0; i<get_num_columns(); ++i){
-
-    if(flush_left_)
-      *out_stream_ << std::left;
-    else
-      *out_stream_ << std::right; 
-
-    *out_stream_ << std::setw(column_widths_.at(i)) << column_headers_.at(i).substr(0, column_widths_.at(i));
-    if (i != get_num_columns()-1){
-      *out_stream_ << separator_;
-    }
-  }
-
-  *out_stream_ << "|\n";
-  PrintHorizontalLine();
-}
-
-void TablePrinter::PrintFooter(){
-  PrintHorizontalLine();
-}
-
-//TablePrinter& TablePrinter::operator<<(float input){
-//  OutputDecimalNumber<float>(input);
-//  return *this;
-//}
-
-//TablePrinter& TablePrinter::operator<<(double input){
-//  OutputDecimalNumber<double>(input);
-//  return *this;
-//}
-
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 8281278f1b76..27ce6295187b 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -56,7 +56,8 @@
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 
-#include "../../Common/include/tools.hpp"
+#include "../../Common/include/toolboxes/printing_toolbox.hpp"
+#include "../../Common/include/toolboxes/signal_processing_toolbox.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 68123815437a..7a9a188976e6 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "../include/solver_structure.hpp"
-#include "../../Common/include/tools.hpp"
+#include "../../Common/include/toolboxes/printing_toolbox.hpp"
 
 CEulerSolver::CEulerSolver(void) : CSolver() {
   
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 9293297adb2d..47447f4efcab 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "../include/solver_structure.hpp"
-#include "../../Common/include/tools.hpp"
+#include "../../Common/include/toolboxes/printing_toolbox.hpp"
 
 CIncEulerSolver::CIncEulerSolver(void) : CSolver() {
   /*--- Basic array initialization ---*/

From 62a9b2d361ebdbe0e1a95046c47fc9836afc61f6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Oct 2018 14:24:45 +0200
Subject: [PATCH 060/539] Use running average computation for time-averaged
 coefficients

---
 SU2_CFD/include/output_structure.hpp   | 15 +++------
 SU2_CFD/src/output_direct_mean.cpp     | 45 +++++++++++---------------
 SU2_CFD/src/output_direct_mean_inc.cpp | 30 +++++++++++++++++
 SU2_CFD/src/output_structure.cpp       | 15 ---------
 4 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 27ce6295187b..e7601ffd64df 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -877,9 +877,7 @@ class COutput {
       
   virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   virtual void SetVolumeOutputFields(CConfig *config);
-  
-  void ComputeAverage(std::map<string, std::vector<su2double> > &Signal, std::map<string, double> &Average);
-  
+    
 };
 
 /*! \class CFlowOutput
@@ -897,10 +895,8 @@ class CFlowOutput : public COutput {
   bool grid_movement;
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-  
-  map<string, vector<su2double>> Time_Signal;
-  
-  map<string, su2double> Average;
+
+  map<string, Signal_Processing::RunningAverage> RunningAverages;
 
 public:
 
@@ -960,9 +956,6 @@ class CFlowOutput : public COutput {
 class CIncFlowOutput : public COutput {
 private:
 
-  char char_histfile[200];
-
-  unsigned short nDim;
   unsigned short turb_model;
   bool heat, weakly_coupled_heat;
   
@@ -970,6 +963,8 @@ class CIncFlowOutput : public COutput {
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
  
+  map<string, Signal_Processing::RunningAverage> RunningAverages;  
+  
 public:
 
   /*!
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 75b846a2aa02..19a2c2e4a6ad 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -84,7 +84,8 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
     ScreenFields.push_back("ENERGY");
     nScreenOutput = ScreenFields.size();
   }
-  ComputeAverage(Time_Signal, Average);
+  
+
 }
 
 CFlowOutput::~CFlowOutput(void) {
@@ -504,34 +505,24 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
+  /*--- Only update time-averaged values if we are running unsteady simulation and if this is not a dual-time iteration ---*/
+  
   if (config[val_iZone]->GetUnsteady_Simulation() != STEADY && !DualTime){
-    Time_Signal["DRAG"].push_back(flow_solver->GetTotal_CD());
-    Time_Signal["LIFT"].push_back(flow_solver->GetTotal_CL());
-    Time_Signal["SIDEFORCE"].push_back(flow_solver->GetTotal_CSF());
-    Time_Signal["MOMENT-X"].push_back(flow_solver->GetTotal_CMx());
-    Time_Signal["MOMENT-Y"].push_back(flow_solver->GetTotal_CMy());
-    Time_Signal["MOMENT-Z"].push_back(flow_solver->GetTotal_CMz());
-    Time_Signal["FORCE-X"].push_back(flow_solver->GetTotal_CFx());
-    Time_Signal["FORCE-Y"].push_back(flow_solver->GetTotal_CFy());
-    Time_Signal["FORCE-Z"].push_back(flow_solver->GetTotal_CFz());
-    Time_Signal["EFFICIENCY"].push_back(flow_solver->GetTotal_CEff());
-    ComputeAverage(Time_Signal, Average);
-  }
-
-  SetHistoryOutputValue("DRAG_AVG", Average["DRAG"]);
-  SetHistoryOutputValue("LIFT_AVG", Average["LIFT"]);
-  if (nDim == 3)
-    SetHistoryOutputValue("SIDEFORCE_AVG", Average["SIDEFORCE"]);
-  if (nDim == 3){
-    SetHistoryOutputValue("MOMENT-X_AVG", Average["MOMENT-X"]);
-    SetHistoryOutputValue("MOMENT-Y_AVG", Average["MOMENT-Y"]);
+    SetHistoryOutputValue("DRAG_AVG", RunningAverages["DRAG"].Update(flow_solver->GetTotal_CD()));
+    SetHistoryOutputValue("LIFT_AVG", RunningAverages["LIFT"].Update(flow_solver->GetTotal_CL()));
+    if (nDim == 3)
+      SetHistoryOutputValue("SIDEFORCE_AVG", RunningAverages["SIDEFORCE"].Update(flow_solver->GetTotal_CSF()));
+    if (nDim == 3){
+      SetHistoryOutputValue("MOMENT-X_AVG", RunningAverages["MOMENT-X"].Update(flow_solver->GetTotal_CMx()));
+      SetHistoryOutputValue("MOMENT-Y_AVG", RunningAverages["MOMENT-Y"].Update(flow_solver->GetTotal_CMy()));
+    }
+    SetHistoryOutputValue("MOMENT-Z_AVG", RunningAverages["MOMENT-Z"].Update(flow_solver->GetTotal_CMz()));
+    SetHistoryOutputValue("FORCE-X_AVG", RunningAverages["FORCE-X"].Update(flow_solver->GetTotal_CFx()));
+    SetHistoryOutputValue("FORCE-Y_AVG", RunningAverages["FORCE-Y"].Update(flow_solver->GetTotal_CFy()));
+    if (nDim == 3)
+      SetHistoryOutputValue("FORCE-Z_AVG",  RunningAverages["FORCE-Z"].Update(flow_solver->GetTotal_CFz()));
+    SetHistoryOutputValue("EFFICIENCY_AVG", RunningAverages["EFFICIENCY"].Update(flow_solver->GetTotal_CEff()));
   }
-  SetHistoryOutputValue("MOMENT-Z_AVG", Average["MOMENT-Z"]);
-  SetHistoryOutputValue("FORCE-X_AVG", Average["FORCE-X"]);
-  SetHistoryOutputValue("FORCE-Y_AVG", Average["FORCE-Y"]);
-  if (nDim == 3)
-    SetHistoryOutputValue("FORCE-Z_AVG", Average["FORCE-Z"]);
-  SetHistoryOutputValue("EFFICIENCY_AVG", Average["EFFICIENCY"]);
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 67f20222de11..f7f4de71caa5 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -141,6 +141,17 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
   AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
   
+  AddHistoryOutput("DRAG_AVG",       "CD(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("LIFT_AVG",       "CL(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("SIDEFORCE_AVG",  "CSF(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-X_AVG",   "CMx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-Y_AVG",   "CMy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("MOMENT-Z_AVG",   "CMz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-X_AVG",    "CFx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-Y_AVG",    "CFy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("FORCE-Z_AVG",    "CFz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("EFFICIENCY_AVG", "CEff(Avg)", FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");  
+  
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
@@ -252,6 +263,25 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   if (nDim == 3)
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   
+  /*--- Only update time-averaged values if we are running unsteady simulation and if this is not a dual-time iteration ---*/  
+  
+  if (config[val_iZone]->GetUnsteady_Simulation() != STEADY && !DualTime){
+    SetHistoryOutputValue("DRAG_AVG", RunningAverages["DRAG"].Update(flow_solver->GetTotal_CD()));
+    SetHistoryOutputValue("LIFT_AVG", RunningAverages["LIFT"].Update(flow_solver->GetTotal_CL()));
+    if (nDim == 3)
+      SetHistoryOutputValue("SIDEFORCE_AVG", RunningAverages["SIDEFORCE"].Update(flow_solver->GetTotal_CSF()));
+    if (nDim == 3){
+      SetHistoryOutputValue("MOMENT-X_AVG", RunningAverages["MOMENT-X"].Update(flow_solver->GetTotal_CMx()));
+      SetHistoryOutputValue("MOMENT-Y_AVG", RunningAverages["MOMENT-Y"].Update(flow_solver->GetTotal_CMy()));
+    }
+    SetHistoryOutputValue("MOMENT-Z_AVG", RunningAverages["MOMENT-Z"].Update(flow_solver->GetTotal_CMz()));
+    SetHistoryOutputValue("FORCE-X_AVG", RunningAverages["FORCE-X"].Update(flow_solver->GetTotal_CFx()));
+    SetHistoryOutputValue("FORCE-Y_AVG", RunningAverages["FORCE-Y"].Update(flow_solver->GetTotal_CFy()));
+    if (nDim == 3)
+      SetHistoryOutputValue("FORCE-Z_AVG",  RunningAverages["FORCE-Z"].Update(flow_solver->GetTotal_CFz()));
+    SetHistoryOutputValue("EFFICIENCY_AVG", RunningAverages["EFFICIENCY"].Update(flow_solver->GetTotal_CEff()));
+  }
+  
   SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
   SetHistoryOutputValue("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
   SetHistoryOutputValue("PHYS_TIME", timeused);
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 48b4d4e88b31..b580fa34cc51 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8902,18 +8902,3 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     }
   }
 }
-
-void COutput::ComputeAverage(std::map<string, std::vector<su2double>> &Signal, std::map<string, double> &Average){
-  
-  Average.clear();
-  map<string, vector<su2double>>::iterator it;
-  for (it = Signal.begin(); it != Signal.end(); it++){
-    Average[it->first] = 0.0;  
-    if (it->second.size() > 0){  
-      for (unsigned int i = 0; i < it->second.size(); i++){
-        Average[it->first] += (it->second)[i];
-      }
-      Average[it->first] /= it->second.size();
-    }
-  }
-}
\ No newline at end of file

From a09816660bc530e89103f9c3a4c416255b40b7f1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Oct 2018 14:27:30 +0200
Subject: [PATCH 061/539] Added q criterion output for inc. solver

---
 SU2_CFD/include/output_structure.hpp   |  3 ++
 SU2_CFD/src/output_direct_mean_inc.cpp | 46 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index e7601ffd64df..21103d1103c5 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1012,6 +1012,9 @@ class CIncFlowOutput : public COutput {
   void SetVolumeOutputFields(CConfig *config);
   
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
 };
 
 /*! \class CFEAOutput
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index f7f4de71caa5..d55cea9cc61c 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -441,6 +441,15 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
     AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
   }
+  
+  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    if (nDim == 3){
+      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION");
+      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION");
+    }
+    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION");
+    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION");  
+  }
 }
 
 void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -559,6 +568,15 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
     SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
   }  
+  
+  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    if (nDim == 3){
+      SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity()[0]);
+      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);      
+    } 
+    SetVolumeOutputValue("VORTICITY_Z", iPoint, Node_Flow->GetVorticity()[2]);      
+    SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));      
+  }
 }
 
 void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
@@ -573,3 +591,31 @@ void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
     SetVolumeOutputValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
   }
 }
+
+su2double CIncFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+  
+  unsigned short iDim, jDim;
+  su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
+      Grad_Vel[iDim][jDim] = node_flow->GetGradient_Primitive(iDim+1, jDim);
+      Strain[iDim][jDim]   = 0.5*(Grad_Vel[iDim][jDim] + Grad_Vel[jDim][iDim]);
+      Omega[iDim][jDim]    = 0.5*(Grad_Vel[iDim][jDim] - Grad_Vel[jDim][iDim]);
+    }
+  }
+  
+  su2double OmegaMag = 0.0, StrainMag = 0.0;
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (jDim = 0 ; jDim < nDim; jDim++) {
+      StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
+      OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
+    }
+  }
+  StrainMag = sqrt(StrainMag); OmegaMag = sqrt(OmegaMag);
+  
+  su2double Q = 0.5*(OmegaMag - StrainMag);
+  
+  return Q;
+}
\ No newline at end of file

From 1728ace1bef725c389d260bdf026f9a56b42bc1c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 22 Oct 2018 15:33:12 +0200
Subject: [PATCH 062/539] Added type specification of history output and
 computing of rel. and average values

---
 SU2_CFD/include/output_structure.hpp   |  44 +++--
 SU2_CFD/include/output_structure.inl   |  12 +-
 SU2_CFD/src/output_direct_mean.cpp     | 226 +++++++++++++------------
 SU2_CFD/src/output_direct_mean_inc.cpp | 192 +++++++++++++--------
 SU2_CFD/src/output_structure.cpp       |  34 +++-
 5 files changed, 309 insertions(+), 199 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 21103d1103c5..495d0e69d501 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -215,6 +215,12 @@ class COutput {
     FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
   };
   
+  enum HistoryFieldType {           
+    TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
+    TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
+    TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
+  };
+  
   string HistorySep;                  /*!< \brief Character which separates values in the history file */
   
   vector<string>    HistoryHeader;    /*!< \brief Vector containing the names of the fields printed to the history file. */
@@ -231,9 +237,10 @@ class COutput {
     su2double           Value;        /*!< \brief The value of the field. */
     unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
     string              OutputGroup;  /*!< \brief The group this field belongs to. */
+    unsigned short      FieldType;
     HistoryOutputField() {}           /*!< \brief Default constructor. */
-    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup):
-      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup){}
+    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype):
+      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype){}
   };
   
   /** \brief Structure to store information for a volume output field.
@@ -267,6 +274,12 @@ class COutput {
   
   TablePrinter* ConvergenceTable;
   
+  std::map<string, su2double> Init_Residuals;
+  
+  map<string, Signal_Processing::RunningAverage> RunningAverages;
+  
+  
+  
 public:
 
   /*! 
@@ -855,11 +868,11 @@ class COutput {
   
   void PrintHistorySep(stringstream& stream);
   
-  void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname );
+  void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, unsigned short field_type = TYPE_DEFAULT );
   
   void SetHistoryOutputValue(string name, su2double value);
   
-  void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names);
+  void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type = TYPE_DEFAULT);
   
   void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker);
   
@@ -877,7 +890,14 @@ class COutput {
       
   virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   virtual void SetVolumeOutputFields(CConfig *config);
-    
+  
+  void Postprocess_HistoryData(CConfig *config, bool dualtime);
+
+  virtual bool SetInit_Residuals(CConfig *config);
+  
+  virtual bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+  void Postprocess_HistoryFields(CConfig *config);
 };
 
 /*! \class CFlowOutput
@@ -896,8 +916,6 @@ class CFlowOutput : public COutput {
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
 
-  map<string, Signal_Processing::RunningAverage> RunningAverages;
-
 public:
 
   /*!
@@ -946,6 +964,10 @@ class CFlowOutput : public COutput {
   
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
 };
 
 /*! \class CFlowOutput
@@ -962,9 +984,7 @@ class CIncFlowOutput : public COutput {
   bool grid_movement;
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
- 
-  map<string, Signal_Processing::RunningAverage> RunningAverages;  
-  
+
 public:
 
   /*!
@@ -1014,6 +1034,10 @@ class CIncFlowOutput : public COutput {
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
   
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
   
 };
 
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 793a5b73c458..61276737beda 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -93,16 +93,16 @@ inline void COutput::PrintHistorySep(stringstream& stream){
   stream << HistorySep;
 }
 
-inline void COutput::AddHistoryOutput(string name, string field_name, unsigned short format, string groupname ){
-  HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname);
+inline void COutput::AddHistoryOutput(string name, string field_name, unsigned short format, string groupname , unsigned short field_type){
+  HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
   HistoryOutput_List.push_back(name);
 }
 
-inline void COutput::AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names){
+inline void COutput::AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type){
   if (marker_names.size() != 0){
     HistoryOutputPerSurface_List.push_back(name);
     for (unsigned short i = 0; i < marker_names.size(); i++){
-      HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname));
+      HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type));
     }
   }
 }
@@ -142,3 +142,7 @@ inline void COutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
 inline void COutput::SetVolumeOutputFields(CConfig *config) {}
 
 inline void COutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) {}
+
+inline bool COutput::SetInit_Residuals(CConfig *config) {return false;}
+
+inline bool COutput::SetUpdate_Averages(CConfig *config, bool dualtime) {return false;}
\ No newline at end of file
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 19a2c2e4a6ad..8d43027ad22a 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -73,15 +73,15 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   
   if (nHistoryOutput == 0){
     HistoryFields.push_back("EXT_ITER");
-    HistoryFields.push_back("RESIDUALS");
+    HistoryFields.push_back("RMS_RES");
     nHistoryOutput = HistoryFields.size();
   }
   if (nScreenOutput == 0){
     ScreenFields.push_back("EXT_ITER");
-    ScreenFields.push_back("DENSITY");
-    ScreenFields.push_back("MOMENTUM-X");
-    ScreenFields.push_back("MOMENTUM-Y");
-    ScreenFields.push_back("ENERGY");
+    ScreenFields.push_back("RMS_DENSITY");
+    ScreenFields.push_back("RMS_MOMENTUM-X");
+    ScreenFields.push_back("RMS_MOMENTUM-Y");
+    ScreenFields.push_back("RMS_ENERGY");
     nScreenOutput = ScreenFields.size();
   }
   
@@ -108,56 +108,54 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   
   // Residuals
-  AddHistoryOutput("DENSITY",    "Res[Rho]",  FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("MOMENTUM-X", "Res[RhoU]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("MOMENTUM-Y", "Res[RhoV]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("MOMENTUM-Z", "Res[RhoW]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("ENERGY",     "Res[RhoE]", FORMAT_FIXED,   "RESIDUALS");
-  
-
-  AddHistoryOutput("NU_TILDE",       "Res[nu]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("KINETIC_ENERGY", "Res[k]",  FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("DISSIPATION",    "Res[w]",  FORMAT_FIXED, "RESIDUALS");
-
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  
+  AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  
+  AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   
   // Aerodynamic coefficients
-  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  
-  AddHistoryOutput("DRAG_AVG",       "CD(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("LIFT_AVG",       "CL(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("SIDEFORCE_AVG",  "CSF(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-X_AVG",   "CMx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-Y_AVG",   "CMy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-Z_AVG",   "CMz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-X_AVG",    "CFx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-Y_AVG",    "CFy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-Z_AVG",    "CFz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("EFFICIENCY_AVG", "CEff(Avg)", FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
+  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  
   
   // Aerodynamic coefficients (per surface)  
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
  
   
   // Misc.
@@ -169,35 +167,35 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
   }  
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze);
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
   
   // Engine output
-  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
-  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT");
+  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
   
   // Rotating Frame
-  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
-  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME");
+  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
   
   //Equivalent area
-  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
-  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA");
+  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
+  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
 
 
 }
@@ -469,23 +467,44 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());  
   SetHistoryOutputValue("PHYS_TIME", timeused);
   
-  SetHistoryOutputValue("DENSITY", log10(flow_solver->GetRes_RMS(0)));
-  SetHistoryOutputValue("MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
-  SetHistoryOutputValue("MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
+  SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
   if (nDim == 2)
-    SetHistoryOutputValue("ENERGY", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ENERGY", log10(flow_solver->GetRes_RMS(3)));
   else {
-    SetHistoryOutputValue("MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
-    SetHistoryOutputValue("ENERGY", log10(flow_solver->GetRes_RMS(4)));
+    SetHistoryOutputValue("RMS_MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ENERGY", log10(flow_solver->GetRes_RMS(4)));
   }
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
+    break;
+  default: break;
+  }
+  
+  SetHistoryOutputValue("MAX_DENSITY", log10(flow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_MOMENTUM-X", log10(flow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_MOMENTUM-Y", log10(flow_solver->GetRes_Max(2)));
+  if (nDim == 2)
+    SetHistoryOutputValue("MAX_ENERGY", log10(flow_solver->GetRes_Max(3)));
+  else {
+    SetHistoryOutputValue("MAX_MOMENTUM-Z", log10(flow_solver->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ENERGY", log10(flow_solver->GetRes_Max(4)));
+  }
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("MAX_KINETIC_ENERGY", log10(turb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
     break;
   default: break;
   }
@@ -505,25 +524,6 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
-  /*--- Only update time-averaged values if we are running unsteady simulation and if this is not a dual-time iteration ---*/
-  
-  if (config[val_iZone]->GetUnsteady_Simulation() != STEADY && !DualTime){
-    SetHistoryOutputValue("DRAG_AVG", RunningAverages["DRAG"].Update(flow_solver->GetTotal_CD()));
-    SetHistoryOutputValue("LIFT_AVG", RunningAverages["LIFT"].Update(flow_solver->GetTotal_CL()));
-    if (nDim == 3)
-      SetHistoryOutputValue("SIDEFORCE_AVG", RunningAverages["SIDEFORCE"].Update(flow_solver->GetTotal_CSF()));
-    if (nDim == 3){
-      SetHistoryOutputValue("MOMENT-X_AVG", RunningAverages["MOMENT-X"].Update(flow_solver->GetTotal_CMx()));
-      SetHistoryOutputValue("MOMENT-Y_AVG", RunningAverages["MOMENT-Y"].Update(flow_solver->GetTotal_CMy()));
-    }
-    SetHistoryOutputValue("MOMENT-Z_AVG", RunningAverages["MOMENT-Z"].Update(flow_solver->GetTotal_CMz()));
-    SetHistoryOutputValue("FORCE-X_AVG", RunningAverages["FORCE-X"].Update(flow_solver->GetTotal_CFx()));
-    SetHistoryOutputValue("FORCE-Y_AVG", RunningAverages["FORCE-Y"].Update(flow_solver->GetTotal_CFy()));
-    if (nDim == 3)
-      SetHistoryOutputValue("FORCE-Z_AVG",  RunningAverages["FORCE-Z"].Update(flow_solver->GetTotal_CFz()));
-    SetHistoryOutputValue("EFFICIENCY_AVG", RunningAverages["EFFICIENCY"].Update(flow_solver->GetTotal_CEff()));
-  }
-  
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
@@ -586,23 +586,18 @@ bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   bool write_output = false;
   
   if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime && 
-      (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0)){
-    write_output = true;
+      && write_dualtime ){
+    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) ) && (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ){
-    write_output = true;    
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
   return write_output;
 }
 
-
-
-
-
 su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
-  unsigned short iDim;
+  unsigned short iDim, jDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
   su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
   su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
@@ -616,7 +611,7 @@ su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVar
   
   su2double OmegaMag = 0.0, StrainMag = 0.0;
   for (iDim = 0; iDim < nDim; iDim++) {
-    for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
+    for (jDim = 0 ; jDim < nDim; jDim++) {
       StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
       OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
     }
@@ -629,4 +624,17 @@ su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVar
 }
 
 
+bool CFlowOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
+}
+
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index d55cea9cc61c..dcd2d39c9f33 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -77,15 +77,15 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
   if (nHistoryOutput == 0){
     HistoryFields.push_back("EXT_ITER");
-    HistoryFields.push_back("RESIDUALS");
+    HistoryFields.push_back("RMS_RES");
     nHistoryOutput = HistoryFields.size();
   }
   
   if (nScreenOutput == 0){
     ScreenFields.push_back("EXT_ITER");
-    ScreenFields.push_back("PRESSURE");
-    ScreenFields.push_back("VELOCITY-X");
-    ScreenFields.push_back("VELOCITY-Y");
+    ScreenFields.push_back("RMS_PRESSURE");
+    ScreenFields.push_back("RMS_VELOCITY-X");
+    ScreenFields.push_back("RMS_VELOCITY-Y");
     nScreenOutput = ScreenFields.size();
   }
 }
@@ -107,51 +107,58 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
   // Residuals
-  AddHistoryOutput("PRESSURE",   "Res[P]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("VELOCITY-X", "Res[U]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("VELOCITY-Y", "Res[V]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("VELOCITY-Z", "Res[W]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-X", "rms[U]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("NU_TILDE", "Res[nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;  
   case SST:
-    AddHistoryOutput("KINETIC_ENERGY", "Res[k]", FORMAT_FIXED, "RESIDUALS");
-    AddHistoryOutput("DISSIPATION",    "Res[w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    break;
+  }
+  
+  // Residuals
+  AddHistoryOutput("MAX_PRESSURE",   "max[P]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-X", "max[U]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddHistoryOutput("MAX_NU_TILDE", "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
     break;
   }
   
   if (heat || weakly_coupled_heat){
-    AddHistoryOutput("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
-    AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
-    AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
-    AddHistoryOutput("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
+    AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    
+    AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+    AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+    AddHistoryOutput("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
   }
   
   // Aerodynamic coefficients
-  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF");
-  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF");
-  
-  AddHistoryOutput("DRAG_AVG",       "CD(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("LIFT_AVG",       "CL(Avg)",   FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("SIDEFORCE_AVG",  "CSF(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-X_AVG",   "CMx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-Y_AVG",   "CMy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("MOMENT-Z_AVG",   "CMz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-X_AVG",    "CFx(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-Y_AVG",    "CFy(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("FORCE-Z_AVG",    "CFz(Avg)",  FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");
-  AddHistoryOutput("EFFICIENCY_AVG", "CEff(Avg)", FORMAT_SCIENTIFIC, "AERO_COEFF_AVG");  
-  
+  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
@@ -197,22 +204,41 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   
 }
-inline bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
-  return true;
+
+bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
 }
 
-inline bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header;
-  write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)) ||
-     ( (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() ==DT_STEPPING_2ND) && config->GetIntIter() == 0);
-  
+bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
   return write_header;
 }
-inline bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  return true;
+
+bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
+      && write_dualtime ){
+    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+  } 
+  return write_output;
 }
 
 
+
 inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
@@ -222,32 +248,54 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   
   SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
-  SetHistoryOutputValue("PRESSURE", log10(flow_solver->GetRes_RMS(0)));
-  SetHistoryOutputValue("VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
-  SetHistoryOutputValue("VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
-  if (nDim == 3) SetHistoryOutputValue("VELOCITY-Z", log10(flow_solver->GetRes_RMS(3)));
+  
+  SetHistoryOutputValue("RMS_PRESSURE", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
+  if (nDim == 3) SetHistoryOutputValue("RMS_VELOCITY-Z", log10(flow_solver->GetRes_RMS(3)));
  
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   }
+  
+  SetHistoryOutputValue("MAX_PRESSURE", log10(flow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_VELOCITY-X", log10(flow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_VELOCITY-Y", log10(flow_solver->GetRes_Max(2)));
+  if (nDim == 3) SetHistoryOutputValue("RMS_VELOCITY-Z", log10(flow_solver->GetRes_Max(3)));
+ 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("MAX_KINETIC_ENERGY", log10(turb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
+    break;
+  }
+  
   if (weakly_coupled_heat){
     SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
-    SetHistoryOutputValue("HEAT",         log10(heat_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
+    
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
-    if (nDim == 3) SetHistoryOutputValue("HEAT",         log10(flow_solver->GetRes_RMS(4)));
-    else           SetHistoryOutputValue("HEAT",         log10(flow_solver->GetRes_RMS(3)));
+    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
+    
+    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
+    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
 
   }
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
@@ -263,25 +311,6 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   if (nDim == 3)
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   
-  /*--- Only update time-averaged values if we are running unsteady simulation and if this is not a dual-time iteration ---*/  
-  
-  if (config[val_iZone]->GetUnsteady_Simulation() != STEADY && !DualTime){
-    SetHistoryOutputValue("DRAG_AVG", RunningAverages["DRAG"].Update(flow_solver->GetTotal_CD()));
-    SetHistoryOutputValue("LIFT_AVG", RunningAverages["LIFT"].Update(flow_solver->GetTotal_CL()));
-    if (nDim == 3)
-      SetHistoryOutputValue("SIDEFORCE_AVG", RunningAverages["SIDEFORCE"].Update(flow_solver->GetTotal_CSF()));
-    if (nDim == 3){
-      SetHistoryOutputValue("MOMENT-X_AVG", RunningAverages["MOMENT-X"].Update(flow_solver->GetTotal_CMx()));
-      SetHistoryOutputValue("MOMENT-Y_AVG", RunningAverages["MOMENT-Y"].Update(flow_solver->GetTotal_CMy()));
-    }
-    SetHistoryOutputValue("MOMENT-Z_AVG", RunningAverages["MOMENT-Z"].Update(flow_solver->GetTotal_CMz()));
-    SetHistoryOutputValue("FORCE-X_AVG", RunningAverages["FORCE-X"].Update(flow_solver->GetTotal_CFx()));
-    SetHistoryOutputValue("FORCE-Y_AVG", RunningAverages["FORCE-Y"].Update(flow_solver->GetTotal_CFy()));
-    if (nDim == 3)
-      SetHistoryOutputValue("FORCE-Z_AVG",  RunningAverages["FORCE-Z"].Update(flow_solver->GetTotal_CFz()));
-    SetHistoryOutputValue("EFFICIENCY_AVG", RunningAverages["EFFICIENCY"].Update(flow_solver->GetTotal_CEff()));
-  }
-  
   SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
   SetHistoryOutputValue("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
   SetHistoryOutputValue("PHYS_TIME", timeused);
@@ -618,4 +647,17 @@ su2double CIncFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
   su2double Q = 0.5*(OmegaMag - StrainMag);
   
   return Q;
+}
+
+bool CIncFlowOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CIncFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
 }
\ No newline at end of file
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index b580fa34cc51..ba6c9d12efb6 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -3553,7 +3553,9 @@ void COutput::SetConvHistory_Body(CGeometry ****geometry,
 
     LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
                     timeused, val_iZone, val_iInst);
-
+    
+    Postprocess_HistoryData(config[val_iZone], DualTime_Iteration);
+        
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
     if (write_history) SetHistoryFile_Output(config[val_iZone]);
@@ -8754,6 +8756,8 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     
     SetHistoryOutputFields(config);
     
+    Postprocess_HistoryFields(config);
+    
     /*--- Open the history file ---*/
     
     cout << "History filename: " << char_histfile << endl;
@@ -8902,3 +8906,31 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     }
   }
 }
+
+void COutput::Postprocess_HistoryData(CConfig *config, bool dualtime){
+  
+  map<string, HistoryOutputField>::iterator it;
+  for (it = HistoryOutput_Map.begin(); it != HistoryOutput_Map.end(); it++){
+    if (it->second.FieldType == TYPE_RESIDUAL){
+      if ( SetInit_Residuals(config) ) {
+        Init_Residuals[it->first] = it->second.Value;
+      }
+      SetHistoryOutputValue("REL_" + it->first, it->second.Value - Init_Residuals[it->first]);
+    }
+    if ((it->second.FieldType == TYPE_COEFFICIENT) && SetUpdate_Averages(config, dualtime)){
+      SetHistoryOutputValue("TAVG_" + it->first, RunningAverages[it->first].Update(it->second.Value));
+    }
+  }
+}
+
+void COutput::Postprocess_HistoryFields(CConfig *config){
+  map<string, HistoryOutputField>::iterator it;
+  for (it = HistoryOutput_Map.begin(); it != HistoryOutput_Map.end(); it++){
+    if (it->second.FieldType == TYPE_RESIDUAL){
+      AddHistoryOutput("REL_" + it->first, "rel" + it->second.FieldName, it->second.ScreenFormat, "REL_" + it->second.OutputGroup);
+    }
+    if (it->second.FieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("TAVG_" + it->first, "tavg" + it->second.FieldName, it->second.ScreenFormat, "TAVG_" + it->second.OutputGroup);
+    }
+  }
+}

From 6e1040d2fce78fdc2ec18e8ca19d0ea8b1694434 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 22 Oct 2018 15:51:56 +0200
Subject: [PATCH 063/539] Adding toolbox files

---
 Common/include/toolboxes/printing_toolbox.hpp | 123 ++++++++++++++++++
 .../toolboxes/signal_processing_toolbox.hpp   |  41 ++++++
 Common/src/toolboxes/printing_toolbox.cpp     |  98 ++++++++++++++
 .../toolboxes/signal_processing_toolbox.cpp   |  10 ++
 4 files changed, 272 insertions(+)
 create mode 100644 Common/include/toolboxes/printing_toolbox.hpp
 create mode 100644 Common/include/toolboxes/signal_processing_toolbox.hpp
 create mode 100644 Common/src/toolboxes/printing_toolbox.cpp
 create mode 100644 Common/src/toolboxes/signal_processing_toolbox.cpp

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
new file mode 100644
index 000000000000..205fff9f011b
--- /dev/null
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -0,0 +1,123 @@
+#include <iostream>
+#include <iomanip>
+#include <vector>
+#include <string>
+#include <sstream>
+#include <cmath>
+
+
+
+
+class TablePrinter{
+public:
+  TablePrinter(std::ostream * output, const std::string & separator = "|");
+  ~TablePrinter();
+  class endl{};
+  int get_num_columns() const;
+  int get_table_width() const;
+  void set_separator(const std::string & separator);
+  void set_flush_left();
+  void set_flush_right();
+
+  void AddColumn(const std::string & header_name, int column_width);
+  void PrintHeader();
+  void PrintFooter();
+
+  TablePrinter& operator<<(endl input){
+    while (j_ != 0){
+      *this << "";
+    }
+    return *this;
+  }
+
+  // Can we merge these?
+//  TablePrinter& operator<<(float input);
+//  TablePrinter& operator<<(double input);
+
+  template<typename T> TablePrinter& operator<<(T input){
+    if (j_ == 0)
+      *out_stream_ << "|";
+
+    if(flush_left_)
+      *out_stream_ << std::left;
+    else
+      *out_stream_ << std::right; 
+
+    // Leave 3 extra space: One for negative sign, one for zero, one for decimal
+    *out_stream_ << std::setw(column_widths_.at(j_))
+                 << input;
+
+    if (j_ == get_num_columns()-1){
+      *out_stream_ << "|\n";
+      i_ = i_ + 1;
+      j_ = 0;
+    } else {
+      *out_stream_ << separator_;
+      j_ = j_ + 1;
+    }
+
+    return *this;
+  }
+
+private:
+  void PrintHorizontalLine();
+
+//  template<typename T> void OutputDecimalNumber(T input){
+//    // If we cannot handle this number, indicate so
+//    if (input < 10*(precision_.at(j_)-1) || input > 10*precision_.at(j_)){
+//      std::stringstream string_out;
+//      string_out << std::setiosflags(std::ios::fixed)
+//                 << std::setprecision(precision_.at(j_))
+//                 << std::setw(column_widths_.at(j_))
+//                 << input;
+  
+//      std::string string_rep_of_number = string_out.str();
+  
+//      string_rep_of_number[precision_.at(j_)-1] = '*';
+//      std::string string_to_print = string_rep_of_number.substr(0, precision_.at(j_));
+//      *out_stream_ << string_to_print;
+//    } else {
+  
+//      // determine what precision we need
+//      int precision = precision_.at(j_) - 1; // leave room for the decimal point
+//      if (input < 0)
+//        --precision; // leave room for the minus sign
+  
+//      // leave room for digits before the decimal?
+//      if (input < -1 || input > 1){
+//        int num_digits_before_decimal = 1 + (int)log10(std::abs(input));
+//        precision -= num_digits_before_decimal;
+//      }
+//      else
+//        precision --; // e.g. 0.12345 or -0.1234
+  
+//      if (precision < 0)
+//        precision = 0; // don't go negative with precision
+  
+//      *out_stream_ << std::setiosflags(std::ios::fixed)
+//                   << std::setprecision(precision)
+//                   << std::setw(column_widths_.at(j_))
+//                   << input;
+//    }
+  
+//    if (j_ == get_num_columns()-1){
+//      *out_stream_ << "|\n";
+//      i_ = i_ + 1;
+//      j_ = 0;
+//    } else {
+//      *out_stream_ << separator_;
+//      j_ = j_ + 1;
+//    }
+//  }
+  
+  std::ostream * out_stream_;
+  std::vector<std::string> column_headers_;
+  std::vector<int> column_widths_;
+  std::string separator_;
+
+  int i_; // index of current row
+  int j_; // index of current column
+
+  int table_width_;
+  bool flush_left_;
+};
diff --git a/Common/include/toolboxes/signal_processing_toolbox.hpp b/Common/include/toolboxes/signal_processing_toolbox.hpp
new file mode 100644
index 000000000000..8f2128cb5390
--- /dev/null
+++ b/Common/include/toolboxes/signal_processing_toolbox.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "../datatype_structure.hpp"
+#include <vector>
+
+namespace Signal_Processing {
+  
+  su2double Average(std::vector<su2double> &data);
+  
+  class RunningAverage
+  {
+  private:
+    su2double val;
+    unsigned long count;
+  
+  public:
+    RunningAverage(){
+      this->Reset();
+    }
+ 
+    su2double Update(su2double valIn){
+      su2double scaling = 1. / (su2double)(count + 1);
+      val = valIn * scaling + val * (1. - scaling);
+      count++;
+      return val;
+    }
+  
+    su2double Get(){
+      return val;
+    }
+  
+    unsigned long Count(){
+      return count;
+    }
+  
+    void Reset(){
+      val = 0.;
+      count = 0;
+    }
+  };
+};
diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
new file mode 100644
index 000000000000..46a4f527901c
--- /dev/null
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -0,0 +1,98 @@
+#include <stdexcept>
+#include <iomanip>
+#include <stdexcept>
+#include "../include/toolboxes/printing_toolbox.hpp"
+
+TablePrinter::TablePrinter(std::ostream * output, const std::string & separator){
+  out_stream_ = output;
+  i_ = 0;
+  j_ = 0;
+  separator_ = separator;
+  table_width_ = 0;
+  flush_left_ = false;
+}
+
+TablePrinter::~TablePrinter(){
+
+}
+
+int TablePrinter::get_num_columns() const {
+  return column_headers_.size();
+}
+
+int TablePrinter::get_table_width() const {
+  return table_width_;
+}
+
+void TablePrinter::set_separator(const std::string &separator){
+  separator_ = separator;
+}
+
+void TablePrinter::set_flush_left(){
+  flush_left_ = true;
+}
+
+void TablePrinter::set_flush_right(){
+  flush_left_ = false;
+}
+
+/** \brief Add a column to our table
+ ** 
+ ** \param header_name Name to be print for the header
+ ** \param column_width the width of the column (has to be >=5)
+ ** */
+void TablePrinter::AddColumn(const std::string & header_name, int column_width){
+  if (column_width < 4){
+    throw std::invalid_argument("Column size has to be >= 4");
+  }
+
+  column_headers_.push_back(header_name);
+  column_widths_.push_back(column_width);
+  table_width_ += column_width + separator_.size(); // for the separator  
+}
+
+void TablePrinter::PrintHorizontalLine() {
+  *out_stream_ << "+"; // the left bar
+
+  for (int i=0; i<table_width_-1; ++i)
+    *out_stream_ << "-";
+
+  *out_stream_ << "+"; // the right bar
+  *out_stream_ << "\n";
+}
+
+void TablePrinter::PrintHeader(){
+  PrintHorizontalLine();
+  *out_stream_ << "|";
+
+  for (int i=0; i<get_num_columns(); ++i){
+
+    if(flush_left_)
+      *out_stream_ << std::left;
+    else
+      *out_stream_ << std::right; 
+
+    *out_stream_ << std::setw(column_widths_.at(i)) << column_headers_.at(i).substr(0, column_widths_.at(i));
+    if (i != get_num_columns()-1){
+      *out_stream_ << separator_;
+    }
+  }
+
+  *out_stream_ << "|\n";
+  PrintHorizontalLine();
+}
+
+void TablePrinter::PrintFooter(){
+  PrintHorizontalLine();
+}
+
+//TablePrinter& TablePrinter::operator<<(float input){
+//  OutputDecimalNumber<float>(input);
+//  return *this;
+//}
+
+//TablePrinter& TablePrinter::operator<<(double input){
+//  OutputDecimalNumber<double>(input);
+//  return *this;
+//}
+
diff --git a/Common/src/toolboxes/signal_processing_toolbox.cpp b/Common/src/toolboxes/signal_processing_toolbox.cpp
new file mode 100644
index 000000000000..2858aa011a5c
--- /dev/null
+++ b/Common/src/toolboxes/signal_processing_toolbox.cpp
@@ -0,0 +1,10 @@
+#include "../include/toolboxes/signal_processing_toolbox.hpp"
+
+
+su2double Signal_Processing::Average(std::vector<su2double> &data){
+  su2double avg = 0.0;
+  for (std::vector<su2double>::iterator it = data.begin(); it != data.end(); it++){
+    avg += (*it);
+  }
+  return avg/=data.size();
+}
\ No newline at end of file

From 36946e59346b866f13385d626b55c951751d3402 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Oct 2018 16:27:33 +0200
Subject: [PATCH 064/539] Some cleanup and renaming of variables

---
 SU2_CFD/include/output_structure.hpp   |  18 +-
 SU2_CFD/include/output_structure.inl   |   8 -
 SU2_CFD/src/output_direct_mean.cpp     |  31 ++--
 SU2_CFD/src/output_direct_mean_inc.cpp |  28 ++-
 SU2_CFD/src/output_structure.cpp       | 248 +++++++++++++------------
 5 files changed, 173 insertions(+), 160 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 495d0e69d501..b295ac2ac3d2 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -223,10 +223,6 @@ class COutput {
   
   string HistorySep;                  /*!< \brief Character which separates values in the history file */
   
-  vector<string>    HistoryHeader;    /*!< \brief Vector containing the names of the fields printed to the history file. */
-  vector<su2double> HistoryValues;    /*!< \brief Vector containing the values of the fields printed to the history file. */
- 
-  
   /** \brief Structure to store information for a history output field.
    * 
    *  The stored information is printed to the history file and to screen. 
@@ -264,10 +260,12 @@ class COutput {
   std::map<string, VolumeOutputField >          VolumeOutput_Map;
   std::vector<string>                           VolumeOutput_List;
   
-  std::vector<string> HistoryFields;
-  unsigned short nHistoryOutput;
-  std::vector<string> ScreenFields;
-  unsigned short nScreenOutput;
+  std::vector<string> RequestedHistoryFields;
+  unsigned short nRequestedHistoryFields;
+  std::vector<string> RequestedScreenFields;
+  unsigned short nRequestedScreenFields;
+  std::vector<string> RequestedVolumeFields;
+  unsigned short nRequestedVolumeFields;
   char char_histfile[200];
 
   ofstream HistFile;
@@ -862,10 +860,6 @@ class COutput {
   
   void PrintScreenHeaderString(stringstream &stream, string header);
   
-  void AddHistoryValue(su2double val);
-
-  void AddHistoryHeaderString(string header);
-  
   void PrintHistorySep(stringstream& stream);
   
   void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, unsigned short field_type = TYPE_DEFAULT );
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 61276737beda..a783d4c6f804 100755
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -81,14 +81,6 @@ inline void COutput::PrintScreenHeaderString(stringstream& stream, string header
   stream << std::right << std::setw(field_width) << header; 
 }
 
-inline void COutput::AddHistoryValue(su2double val) { 
-  HistoryValues.push_back(val);
-}
-
-inline void COutput::AddHistoryHeaderString(string header) {
-  HistoryHeader.push_back(header); 
-}
-
 inline void COutput::PrintHistorySep(stringstream& stream){
   stream << HistorySep;
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 8d43027ad22a..74fdbf6ff299 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -71,20 +71,25 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
-  if (nHistoryOutput == 0){
-    HistoryFields.push_back("EXT_ITER");
-    HistoryFields.push_back("RMS_RES");
-    nHistoryOutput = HistoryFields.size();
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  if (nRequestedScreenFields == 0){
+    RequestedScreenFields.push_back("EXT_ITER");
+    RequestedScreenFields.push_back("RMS_DENSITY");
+    RequestedScreenFields.push_back("RMS_MOMENTUM-X");
+    RequestedScreenFields.push_back("RMS_MOMENTUM-Y");
+    RequestedScreenFields.push_back("RMS_ENERGY");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
   }
-  if (nScreenOutput == 0){
-    ScreenFields.push_back("EXT_ITER");
-    ScreenFields.push_back("RMS_DENSITY");
-    ScreenFields.push_back("RMS_MOMENTUM-X");
-    ScreenFields.push_back("RMS_MOMENTUM-Y");
-    ScreenFields.push_back("RMS_ENERGY");
-    nScreenOutput = ScreenFields.size();
-  }
-  
 
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index dcd2d39c9f33..26ec606960f4 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -75,19 +75,27 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
-  if (nHistoryOutput == 0){
-    HistoryFields.push_back("EXT_ITER");
-    HistoryFields.push_back("RMS_RES");
-    nHistoryOutput = HistoryFields.size();
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
-  if (nScreenOutput == 0){
-    ScreenFields.push_back("EXT_ITER");
-    ScreenFields.push_back("RMS_PRESSURE");
-    ScreenFields.push_back("RMS_VELOCITY-X");
-    ScreenFields.push_back("RMS_VELOCITY-Y");
-    nScreenOutput = ScreenFields.size();
+  if (nRequestedScreenFields == 0){
+    RequestedScreenFields.push_back("EXT_ITER");
+    RequestedScreenFields.push_back("RMS_PRESSURE");
+    RequestedScreenFields.push_back("RMS_VELOCITY-X");
+    RequestedScreenFields.push_back("RMS_VELOCITY-Y");
+    nRequestedScreenFields = RequestedScreenFields.size();
   }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index ba6c9d12efb6..90e1b5e616b8 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -310,14 +310,19 @@ COutput::COutput(CConfig *config) {
     }
   }
   
-  nHistoryOutput = config->GetnHistoryOutput();
-  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
-    HistoryFields.push_back(config->GetHistoryOutput_Field(iField));
+  nRequestedHistoryFields = config->GetnHistoryOutput();
+  for (unsigned short iField = 0; iField < nRequestedHistoryFields; iField++){
+    RequestedHistoryFields.push_back(config->GetHistoryOutput_Field(iField));
   }
   
-  nScreenOutput = config->GetnScreenOutput();
-  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
-    ScreenFields.push_back(config->GetScreenOutput_Field(iField));
+  nRequestedScreenFields = config->GetnScreenOutput();
+  for (unsigned short iField = 0; iField < nRequestedScreenFields; iField++){
+    RequestedScreenFields.push_back(config->GetScreenOutput_Field(iField));
+  }
+  
+  nRequestedVolumeFields = config->GetnVolumeOutput();
+  for (unsigned short iField = 0; iField < nRequestedVolumeFields; iField++){
+    RequestedVolumeFields.push_back(config->GetVolumeOutput_Field(iField));
   }
   
 }
@@ -8577,51 +8582,51 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
     HistFile << "VARIABLES = ";
   }
   
-  string currentField;
-  
-  bool found_field = false;
-  
-  for (unsigned short iField = 0; iField <nHistoryOutput; iField++){
-    currentField = HistoryFields[iField];   
-    found_field = false;
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
-      if (currentField == Field.OutputGroup){
-        AddHistoryHeaderString(Field.FieldName);
-        found_field = true;
-      }
-    }
-    
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
-        if (currentField == Field.OutputGroup){
-          AddHistoryHeaderString(Field.FieldName);
-          found_field = true;
+  stringstream out;
+  string RequestedField;
+  std::vector<bool> found_field(nRequestedHistoryFields, false);
+    
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      RequestedField = RequestedHistoryFields[iReqField];   
+      if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutput_List[iField_Output])){
+        found_field[iReqField] = true;        
+        out << "\"" << Field.FieldName << "\"" << HistorySep;
+      }
+    }  
+  }
+  
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){  
+      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutputPerSurface_List[iField_Output])){
+          found_field[iReqField] = true;          
+          out << "\"" << Field.FieldName << "\"" << HistorySep;        
         }
       }
     }
-    if (!found_field){
-      SU2_MPI::Error(string("There is no history output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
-    }
   }
-    
-  stringstream out;
-  for (unsigned short iHeader = 0; iHeader < HistoryHeader.size(); iHeader++){
-    out << "\"" << HistoryHeader[iHeader] << "\"";
-    if (iHeader !=  HistoryHeader.size() - 1) out << HistorySep;
+  
+  
+  for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+    if (!found_field[iReqField]){
+      SU2_MPI::Error("Requested history field " + RequestedHistoryFields[iReqField] + " not defined in the current solver.", CURRENT_FUNCTION);
+    }
   }
   
-  out << endl;
-  HistFile << out.str();
-  HistFile.flush();
-
+  /*--- Print the string to file and remove the last character (a separator) ---*/
+  HistFile << out.str().substr(0, out.str().size() - 1);
+  HistFile << endl;
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
       config->GetOutput_FileFormat() == FIELDVIEW ||
       config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
     HistFile << "ZONE T= \"Convergence history\"" << endl;
   }
+  HistFile.flush();
   
 }
 
@@ -8629,42 +8634,35 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
 void COutput::SetHistoryFile_Output(CConfig *config) { 
   
   stringstream out;
-  string currentField;
+  string RequestedField;
   
-  HistoryValues.clear();
   
-  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
-    currentField = HistoryFields[iField];   
-    
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
-      if (currentField == Field.OutputGroup){
-        AddHistoryValue(Field.Value);
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      RequestedField = RequestedHistoryFields[iReqField];   
+      if (RequestedField == Field.OutputGroup){
+        out << std::setprecision(10) << Field.Value << HistorySep << " ";
       }
     }
   }
   
-  
-  for (unsigned short iField = 0; iField < nHistoryOutput; iField++){
-    currentField = HistoryFields[iField];   
-    
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
-        if (currentField == Field.OutputGroup){
-          AddHistoryValue(Field.Value);
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup){
+          out << std::setprecision(10) << Field.Value << HistorySep << " ";
         }
       }
     }
   }
   
-  for (unsigned short iValue = 0; iValue < HistoryValues.size(); iValue++){
-    out << std::setprecision(10) << HistoryValues[iValue];
-    if (iValue !=  HistoryValues.size() - 1) out << HistorySep;
-    out << " ";
-  }
-  out << endl;
-  HistFile << out.str();
+  /*--- Print the string to file and remove the last two characters (a separator and a space) ---*/
+  
+  HistFile << out.str().substr(0, out.str().size()-2);
+  HistFile << endl;
   HistFile.flush();
 }
 
@@ -8676,34 +8674,34 @@ void COutput::SetScreen_Header(CConfig *config) {
 void COutput::SetScreen_Output(CConfig *config) {
   
 
-  string currentField;
+  string RequestedField;
   
-  for (unsigned short iField = 0; iField < nScreenOutput; iField++){
+  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
     stringstream out;
-    currentField = ScreenFields[iField]; 
-    if (HistoryOutput_Map.count(currentField) > 0){  
-      switch (HistoryOutput_Map[currentField].ScreenFormat) {
+    RequestedField = RequestedScreenFields[iReqField]; 
+    if (HistoryOutput_Map.count(RequestedField) > 0){  
+      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
         case FORMAT_INTEGER:
-          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[currentField].Value));
+          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value));
           break;
         case FORMAT_FIXED:
-          PrintScreenFixed(out, HistoryOutput_Map[currentField].Value);
+          PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintScreenScientific(out, HistoryOutput_Map[currentField].Value);
+          PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value);
           break;      
       }
     }
-    if (HistoryOutputPerSurface_Map.count(currentField) > 0){
-      switch (HistoryOutputPerSurface_Map[currentField][0].ScreenFormat) {
+    if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
+      switch (HistoryOutputPerSurface_Map[RequestedField][0].ScreenFormat) {
         case FORMAT_INTEGER:
-          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[currentField][0].Value));
+          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value));
           break;
         case FORMAT_FIXED:
-          PrintScreenFixed(out, HistoryOutputPerSurface_Map[currentField][0].Value);
+          PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintScreenScientific(out, HistoryOutputPerSurface_Map[currentField][0].Value);
+          PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value);
           break;   
       }
     }      
@@ -8752,10 +8750,15 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
     
+    if(!(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), "EXT_ITER") != RequestedHistoryFields.end())) {
+      RequestedHistoryFields.push_back("EXT_ITER");
+      nRequestedHistoryFields++;
+    }
+    
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
     SetHistoryOutputFields(config);
-    
+   
     Postprocess_HistoryFields(config);
     
     /*--- Open the history file ---*/
@@ -8768,20 +8771,20 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     
     SetHistoryFile_Header(config);    
     
-    string currentField;
+    string RequestedField;
   
     /*--- Set screen convergence output header ---*/
     
     // Evaluate the requested output
-    for (unsigned short iField = 0; iField < nScreenOutput; iField++){
-      currentField = ScreenFields[iField];  
-      if (HistoryOutput_Map.count(currentField) > 0){ 
-        ConvergenceTable->AddColumn(HistoryOutput_Map[currentField].FieldName, field_width);
+    for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+      RequestedField = RequestedScreenFields[iReqField];  
+      if (HistoryOutput_Map.count(RequestedField) > 0){ 
+        ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
       } else {
   //      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
       }
-      if (HistoryOutputPerSurface_Map.count(currentField) > 0){
-        ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[currentField][0].FieldName, field_width);
+      if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
+        ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
       }
     }
   }
@@ -8790,45 +8793,55 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
+  /*--- Make sure that coordinates are always in the volume output --- */
+  
+  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
+    RequestedVolumeFields.push_back("COORDINATES");
+    nRequestedVolumeFields++;
+  }
+  
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);
+ 
+  // TODO: Add check for coordinates in solver output 
   
   GlobalField_Counter = 0;
   
-  string currentField;
-  bool found_field = false;
+  string RequestedField;
+  std::vector<bool> found_field(nRequestedVolumeFields, false);
   
-  /*--- Loop through all fields specified in the config ---*/
   
-  for (unsigned short iField = 0; iField < config->GetnVolumeOutput(); iField++){
-    currentField = config->GetVolumeOutput_Field(iField);  
+  /*--- Loop through all fields defined in the corresponding SetVolumeOutputFields(). 
+ * If it is also defined in the config (either as part of a group or a single field), the field 
+ * object gets an offset so that we know where to find the data in the Local_Data() array.
+ *  Note that the default offset is -1. An index !=-1 defines this field as part of the output. ---*/
+
+  for (unsigned short iField_Output = 0; iField_Output < VolumeOutput_List.size(); iField_Output++){
     
-    found_field = false;
+    VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField_Output]];
     
-    /*--- Loop through all fields defined in the corresponding SetVolumeOutputFields(). 
-     * If it is also defined in the config (either as part of a group or a single field), the field 
-     * object gets an offset so that we know where to find the data in the Local_Data() array.
-     *  Note that the default offset is -1. An index !=-1 defines this field as part of the output. ---*/
+    /*--- Loop through all fields specified in the config ---*/
     
-    for (unsigned short iField_Output = 0; iField_Output < VolumeOutput_List.size(); iField_Output++){
-      
-      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField_Output]];
+    for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
       
-      if (((currentField == Field.OutputGroup) || (currentField == VolumeOutput_List[iField_Output])) && (Field.Offset == -1)){
+      RequestedField = RequestedVolumeFields[iReqField];  
+            
+      if (((RequestedField == Field.OutputGroup) || (RequestedField == VolumeOutput_List[iField_Output])) && (Field.Offset == -1)){
         Field.Offset = GlobalField_Counter;
         Variable_Names.push_back(Field.FieldName);
         GlobalField_Counter++;
         
-        found_field = true;
+        found_field[iReqField] = true;
       }
     }
     
-    if (!found_field){
-      SU2_MPI::Error(string("There is no volume output field/group with name ") + currentField + string(" defined in the current solver."), CURRENT_FUNCTION);
-    }
+    
+//    if ((std::find(found_field.begin(), found_field.end(), false) != found_field.end())){
+////      SU2_MPI::Error(string("There is no volume output field/group with name ") + std::find(found_field.begin(), found_field.end(), false) + string(" defined in the current solver."), CURRENT_FUNCTION);
+//    }
   }
-
+  
   
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
@@ -8909,28 +8922,29 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
 void COutput::Postprocess_HistoryData(CConfig *config, bool dualtime){
   
-  map<string, HistoryOutputField>::iterator it;
-  for (it = HistoryOutput_Map.begin(); it != HistoryOutput_Map.end(); it++){
-    if (it->second.FieldType == TYPE_RESIDUAL){
+  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
+    if (currentField.FieldType == TYPE_RESIDUAL){
       if ( SetInit_Residuals(config) ) {
-        Init_Residuals[it->first] = it->second.Value;
+        Init_Residuals[HistoryOutput_List[iField]] = currentField.Value;
       }
-      SetHistoryOutputValue("REL_" + it->first, it->second.Value - Init_Residuals[it->first]);
+      SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
     }
-    if ((it->second.FieldType == TYPE_COEFFICIENT) && SetUpdate_Averages(config, dualtime)){
-      SetHistoryOutputValue("TAVG_" + it->first, RunningAverages[it->first].Update(it->second.Value));
+    if ((currentField.FieldType == TYPE_COEFFICIENT) && SetUpdate_Averages(config, dualtime)){
+      SetHistoryOutputValue("TAVG_" + HistoryOutput_List[iField], RunningAverages[HistoryOutput_List[iField]].Update(currentField.Value));
     }
   }
 }
 
 void COutput::Postprocess_HistoryFields(CConfig *config){
-  map<string, HistoryOutputField>::iterator it;
-  for (it = HistoryOutput_Map.begin(); it != HistoryOutput_Map.end(); it++){
-    if (it->second.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + it->first, "rel" + it->second.FieldName, it->second.ScreenFormat, "REL_" + it->second.OutputGroup);
+  
+  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
+    if (currentField.FieldType == TYPE_RESIDUAL){
+      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup);
     }
-    if (it->second.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_" + it->first, "tavg" + it->second.FieldName, it->second.ScreenFormat, "TAVG_" + it->second.OutputGroup);
+    if (currentField.FieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("TAVG_" + HistoryOutput_List[iField], "tavg" + currentField.FieldName, currentField.ScreenFormat, "TAVG_" + currentField.OutputGroup);
     }
   }
 }

From df490cd5db29a4bf09da55fa63c5331125dce2a9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Oct 2018 17:04:35 +0200
Subject: [PATCH 065/539] Fixed conflict

---
 SU2_CFD/src/output_structure.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 54e09169798e..e7701621f364 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -2720,8 +2720,6 @@ void COutput::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solv
           
           jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
-<<<<<<< HEAD
-=======
       }
     }
 

From 6874f9e2c7f15b6d29ffa374f888dce4d382c78e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Oct 2018 11:29:19 +0200
Subject: [PATCH 066/539] Adapted naming of variables in discrete adjoint
 solver output

---
 SU2_CFD/src/output_adjoint_discrete.cpp | 55 +++++++++++++++++++++----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 9c4ffe9ddfed..21c24bee49bd 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -43,6 +43,28 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
  
   turb_model = config->GetKind_Turb_Model();
   
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  
+  if (nRequestedScreenFields == 0){
+    RequestedScreenFields.push_back("EXT_ITER");
+    RequestedScreenFields.push_back("RMS_ADJ_PRESSURE");
+    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
+    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-Y");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");    
+    RequestedVolumeFields.push_back("SENSITIVITES");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
 }
 
 CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
@@ -59,21 +81,38 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
   AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
   
-  AddHistoryOutput("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("RMS_ADJOINT_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;  
   case SST:
-    AddHistoryOutput("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
-    AddHistoryOutput("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
+    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;
   default: break;
   }
+  
+  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddHistoryOutput("MAX_ADJOINT_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_ADJT_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    break;
+  default: break;
+  }
+  
   AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
   AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
   AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");

From 173a7eadc3e5556b2e5de56bebee0bd7a8680110 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 25 Oct 2018 10:36:04 +0200
Subject: [PATCH 067/539] Adapted naming of discrete adjoint solver output

---
 SU2_CFD/src/output_adjoint_discrete.cpp | 80 +++++++++++++++++++------
 SU2_CFD/src/output_direct_mean.cpp      | 20 +++----
 SU2_CFD/src/output_structure.cpp        |  2 +-
 3 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 21c24bee49bd..1416e974b83e 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -88,11 +88,11 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("RMS_ADJOINT_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;  
   case SST:
-    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;
   default: break;
   }
@@ -104,11 +104,11 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("MAX_ADJOINT_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
     break;  
   case SST:
-    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("MAX_ADJT_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
     break;
   default: break;
   }
@@ -129,22 +129,41 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputValue("ADJOINT_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputValue("ADJOINT_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetHistoryOutputValue("ADJOINT_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputValue("ADJOINT_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
-    SetHistoryOutputValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
   } else {
-    SetHistoryOutputValue("ADJOINT_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("ADJOINT_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("ADJOINT_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetHistoryOutputValue("ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    break;
+  default: break;
+  }
+  SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(2)));
+  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(4)));
+  } else {
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));    
+  }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(1)));
     break;
   default: break;
   }
@@ -297,10 +316,35 @@ void CDiscAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
 }
 
 bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
-  return true;
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
+}
+
+bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
+  return write_header;
 }
 
-bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
+bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
+      && write_dualtime ){
+    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+  } 
+  return write_output;
+}
 
-bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 74fdbf6ff299..bcc7b4afc783 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -134,16 +134,16 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   
   // Aerodynamic coefficients
-  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
   
   
   // Aerodynamic coefficients (per surface)  
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index e7701621f364..8fa4ca85baca 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8733,7 +8733,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
      /*--- Append the restart iteration: if dynamic problem and restart ---*/
     
     if (config->GetWrt_Unsteady() && config->GetRestart()) {
-      long iExtIter = config->GetDyn_RestartIter();
+      long iExtIter = config->GetUnst_RestartIter();
       if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));

From 69889f7081d89a70b15b2f01d94ccf02ed734f21 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 25 Oct 2018 10:36:18 +0200
Subject: [PATCH 068/539] Added direct diff. of coefficients in output

---
 SU2_CFD/src/output_structure.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index e7701621f364..f13c70765bb2 100755
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -8931,21 +8931,29 @@ void COutput::Postprocess_HistoryData(CConfig *config, bool dualtime){
       }
       SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
     }
-    if ((currentField.FieldType == TYPE_COEFFICIENT) && SetUpdate_Averages(config, dualtime)){
-      SetHistoryOutputValue("TAVG_" + HistoryOutput_List[iField], RunningAverages[HistoryOutput_List[iField]].Update(currentField.Value));
+    if (currentField.FieldType == TYPE_COEFFICIENT){
+      if(SetUpdate_Averages(config, dualtime)){
+        SetHistoryOutputValue("TAVG_" + HistoryOutput_List[iField], RunningAverages[HistoryOutput_List[iField]].Update(currentField.Value));
+      }
+      if (config->GetDirectDiff() != NO_DERIVATIVE){
+        SetHistoryOutputValue("D_" + HistoryOutput_List[iField], SU2_TYPE::GetDerivative(currentField.Value));      
+        SetHistoryOutputValue("D_TAVG_" + HistoryOutput_List[iField], SU2_TYPE::GetDerivative(RunningAverages[HistoryOutput_List[iField]].Get()));
+        
+      }
     }
   }
 }
 
 void COutput::Postprocess_HistoryFields(CConfig *config){
-  
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
       AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup);
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_" + HistoryOutput_List[iField], "tavg" + currentField.FieldName, currentField.ScreenFormat, "TAVG_" + currentField.OutputGroup);
+      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup);
+      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup);  
+      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup);  
     }
   }
 }

From fc70f56f52a90a105dae3c1866fcceeffe4ada9e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 7 Nov 2018 16:06:56 +0100
Subject: [PATCH 069/539] Added missing function call lost during merge

---
 SU2_CFD/src/output_structure.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 074aee055fc0..3b36847bc795 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4147,6 +4147,10 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
     /*--- Check for compressible/incompressible flow problems. ---*/
 
     compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
+    
+    /*--- First, prepare the offsets needed throughout below. ---*/    
+    
+    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
 
 //    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
     

From 31df9c641e706f176fb4998077421b8430121a5f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Nov 2018 16:37:18 +0100
Subject: [PATCH 070/539] Renamed printing toolbox and created namespace

---
 Common/include/toolboxes/printing_toolbox.hpp | 15 +++++++------
 Common/src/config_structure.cpp               |  2 +-
 Common/src/geometry_structure.cpp             |  4 ++--
 Common/src/toolboxes/printing_toolbox.cpp     | 22 +++++++++----------
 SU2_CFD/include/output_structure.hpp          |  2 +-
 SU2_CFD/src/output_structure.cpp              |  2 +-
 SU2_CFD/src/solver_direct_mean.cpp            |  2 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp        |  2 +-
 8 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 205fff9f011b..402094e6f439 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -5,13 +5,12 @@
 #include <sstream>
 #include <cmath>
 
+namespace PrintingToolbox { 
 
-
-
-class TablePrinter{
+class CTablePrinter{
 public:
-  TablePrinter(std::ostream * output, const std::string & separator = "|");
-  ~TablePrinter();
+  CTablePrinter(std::ostream * output, const std::string & separator = "|");
+  ~CTablePrinter();
   class endl{};
   int get_num_columns() const;
   int get_table_width() const;
@@ -23,7 +22,7 @@ class TablePrinter{
   void PrintHeader();
   void PrintFooter();
 
-  TablePrinter& operator<<(endl input){
+  CTablePrinter& operator<<(endl input){
     while (j_ != 0){
       *this << "";
     }
@@ -34,7 +33,7 @@ class TablePrinter{
 //  TablePrinter& operator<<(float input);
 //  TablePrinter& operator<<(double input);
 
-  template<typename T> TablePrinter& operator<<(T input){
+  template<typename T> CTablePrinter& operator<<(T input){
     if (j_ == 0)
       *out_stream_ << "|";
 
@@ -121,3 +120,5 @@ class TablePrinter{
   int table_width_;
   bool flush_left_;
 };
+
+}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 70fc7da23b38..cd09ce1c4560 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -5704,7 +5704,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
         <<",\n                lower limit: "<< CFL_AdaptParam[2] <<", upper limit: " << CFL_AdaptParam[3] <<"."<< endl;
 
       if (nMGLevels!= 0){
-        TablePrinter MGTable(&std::cout);
+        PrintingToolbox::CTablePrinter MGTable(&std::cout);
         
         MGTable.AddColumn("MG Level",         10);
         MGTable.AddColumn("Presmooth",     10);
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 187853d5fc64..1653c4838d47 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -10284,7 +10284,7 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
         
         bool duplicate = false;
         iMarker=0;
-        TablePrinter BoundaryTable(&std::cout);
+        PrintingToolbox::CTablePrinter BoundaryTable(&std::cout);
         BoundaryTable.AddColumn("Index", 6);
         BoundaryTable.AddColumn("Marker", 14);
         BoundaryTable.AddColumn("Elements", 14);
@@ -20797,7 +20797,7 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry ****geometry, CConfig **config_
   }
   else {
     if (rank == MASTER_NODE) {
-      TablePrinter MGTable(&std::cout);
+      PrintingToolbox::CTablePrinter MGTable(&std::cout);
       MGTable.AddColumn("MG Level", 10);
       MGTable.AddColumn("CVs", 10);
       MGTable.AddColumn("Aggl. Rate", 10);
diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
index 46a4f527901c..fd952c7e7cb7 100644
--- a/Common/src/toolboxes/printing_toolbox.cpp
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -3,7 +3,7 @@
 #include <stdexcept>
 #include "../include/toolboxes/printing_toolbox.hpp"
 
-TablePrinter::TablePrinter(std::ostream * output, const std::string & separator){
+PrintingToolbox::CTablePrinter::CTablePrinter(std::ostream * output, const std::string & separator){
   out_stream_ = output;
   i_ = 0;
   j_ = 0;
@@ -12,27 +12,27 @@ TablePrinter::TablePrinter(std::ostream * output, const std::string & separator)
   flush_left_ = false;
 }
 
-TablePrinter::~TablePrinter(){
+PrintingToolbox::CTablePrinter::~CTablePrinter(){
 
 }
 
-int TablePrinter::get_num_columns() const {
+int PrintingToolbox::CTablePrinter::get_num_columns() const {
   return column_headers_.size();
 }
 
-int TablePrinter::get_table_width() const {
+int PrintingToolbox::CTablePrinter::get_table_width() const {
   return table_width_;
 }
 
-void TablePrinter::set_separator(const std::string &separator){
+void PrintingToolbox::CTablePrinter::set_separator(const std::string &separator){
   separator_ = separator;
 }
 
-void TablePrinter::set_flush_left(){
+void PrintingToolbox::CTablePrinter::set_flush_left(){
   flush_left_ = true;
 }
 
-void TablePrinter::set_flush_right(){
+void PrintingToolbox::CTablePrinter::set_flush_right(){
   flush_left_ = false;
 }
 
@@ -41,7 +41,7 @@ void TablePrinter::set_flush_right(){
  ** \param header_name Name to be print for the header
  ** \param column_width the width of the column (has to be >=5)
  ** */
-void TablePrinter::AddColumn(const std::string & header_name, int column_width){
+void PrintingToolbox::CTablePrinter::AddColumn(const std::string & header_name, int column_width){
   if (column_width < 4){
     throw std::invalid_argument("Column size has to be >= 4");
   }
@@ -51,7 +51,7 @@ void TablePrinter::AddColumn(const std::string & header_name, int column_width){
   table_width_ += column_width + separator_.size(); // for the separator  
 }
 
-void TablePrinter::PrintHorizontalLine() {
+void PrintingToolbox::CTablePrinter::PrintHorizontalLine() {
   *out_stream_ << "+"; // the left bar
 
   for (int i=0; i<table_width_-1; ++i)
@@ -61,7 +61,7 @@ void TablePrinter::PrintHorizontalLine() {
   *out_stream_ << "\n";
 }
 
-void TablePrinter::PrintHeader(){
+void PrintingToolbox::CTablePrinter::PrintHeader(){
   PrintHorizontalLine();
   *out_stream_ << "|";
 
@@ -82,7 +82,7 @@ void TablePrinter::PrintHeader(){
   PrintHorizontalLine();
 }
 
-void TablePrinter::PrintFooter(){
+void PrintingToolbox::CTablePrinter::PrintFooter(){
   PrintHorizontalLine();
 }
 
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 809d7d346cdb..8878cca2e328 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -283,7 +283,7 @@ class COutput {
 
   ofstream HistFile;
   
-  TablePrinter* ConvergenceTable;
+  PrintingToolbox::CTablePrinter* ConvergenceTable;
   
   std::map<string, su2double> Init_Residuals;
   
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 3b36847bc795..0b0ebaef23c7 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -44,7 +44,7 @@ COutput::COutput(CConfig *config) {
   
   field_width = 12;
   
-  ConvergenceTable = new TablePrinter(&std::cout);
+  ConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
 
   unsigned short iDim, iZone, iSpan, iMarker;
   
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index a8ec476fb2c9..0cd1d908a352 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -3846,7 +3846,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     
     cout <<"-- Input conditions:"<< endl;
     
-    TablePrinter NonDimTable(&std::cout);
+    PrintingToolbox::CTablePrinter NonDimTable(&std::cout);
     stringstream Unit;    
     
     NonDimTable.AddColumn("Name", 18);
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 473be797dda0..0c39456beaeb 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -2021,7 +2021,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
 
     cout <<"-- Input conditions:"<< endl;
     
-    TablePrinter NonDimTable(&std::cout);
+    PrintingToolbox::CTablePrinter NonDimTable(&std::cout);
     stringstream Unit;  
     
     NonDimTable.AddColumn("Name", 18);

From 05f0169f21d024cf676a20f6d826366e7c5e6bd7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Nov 2018 16:38:12 +0100
Subject: [PATCH 071/539] Added averaging and rel. residuals to adjoint solvers

---
 SU2_CFD/include/output_structure.hpp    |  8 ++++++++
 SU2_CFD/src/output_adjoint_discrete.cpp | 12 ++++++++++++
 SU2_CFD/src/output_adjoint_mean.cpp     | 14 ++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 8878cca2e328..bd4d241e643d 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1347,6 +1347,10 @@ class CAdjFlowOutput : public COutput {
   
   void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
 };
 
 /*! \class CDiscAdjFlowOutput
@@ -1406,6 +1410,10 @@ class CDiscAdjFlowOutput : public COutput {
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
   
   void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
 
 };
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index a32a49ff8576..017bc7b98a12 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -347,4 +347,16 @@ bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime
   return write_output;
 }
 
+bool CDiscAdjFlowOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CDiscAdjFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
+}
 
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index a5a144b7035c..97d440f334f9 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -312,3 +312,17 @@ void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
   
 }
 
+bool CAdjFlowOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
+}
+
+

From 6574c870c4e9076624ea78ac2bf8f47db325fd5d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Nov 2018 16:40:01 +0100
Subject: [PATCH 072/539] added comments to output structure

---
 SU2_CFD/src/output_adjoint_discrete.cpp | 172 ++++++++++++++++--------
 SU2_CFD/src/output_direct_mean.cpp      | 109 ++++++++++++---
 2 files changed, 205 insertions(+), 76 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 017bc7b98a12..62e6fc349611 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -77,49 +77,80 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 
 void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
-  // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
-  
-  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The internal iteration index.
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The external iteration index.
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// DESCRIPTION: Root-mean square residual of the adjoint density.
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
   AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
   AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
   AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint energy.
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
+    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
     break;  
   case SST:
-    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
+    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+    /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
+    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
     break;
   default: break;
   }
+  /// END_GROUP
   
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// DESCRIPTION: Maximum residual of the adjoint density.
   AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint energy.
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
+    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
     break;  
   case SST:
-  AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
+    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+    /// DESCRIPTION: Maximum residual of the adjoint dissipation.
+    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
     break;
   default: break;
   }
-  
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  
-  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SENSITIVITIES, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
   
 }
 
@@ -178,64 +209,93 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
 
 void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
   
-  
-  // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
+  /// DESCRIPTION: x coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
+  /// DESCRIPTION: y coordinates of the mesh nodes.
   AddVolumeOutput("COORD-Y", "y", "COORDINATES");
   if (nDim == 3)
+    /// DESCRIPTION: z coordinates of the mesh nodes.
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  
-  // Conservative
-  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
+  /// DESCRIPTION: Adjoint density.
+  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "CONSERVATIVE"); 
+  /// DESCRIPTION: Adjoint momentum x-component.
+  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE"); 
+  /// DESCRIPTION: Adjoint momentum y-component.
+  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE"); 
   if (nDim == 3)
-    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "CONSERVATIVE");
-  
+    /// DESCRIPTION: Adjoint momentum z-component.
+    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE"); 
+  /// DESCRIPTION: Adjoint energy.
+  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "CONSERVATIVE");           
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE");
+    /// DESCRIPTION: Adjoint nu tilde.
+    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE"); 
     break;  
   case SST:
-    AddVolumeOutput("ADJOINT_TKE", "Adjoint_TKE", "CONSERVATIVE");
-    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Omega", "CONSERVATIVE");
+    /// DESCRIPTION: Adjoint kinetic energy.
+    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE"); 
+    /// DESCRIPTION: Adjoint dissipation.
+    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");  
     break;
   default: break;
   }
+  /// END_GROUP
   
+  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
   if (config->GetGrid_Movement()){
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    /// DESCRIPTION: Grid velocity x-component.
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
+    /// DESCRIPTION: Grid velocity y-component.
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
     if (nDim == 3)    
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+      /// DESCRIPTION: Grid velocity z-component.
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
   }
-  
-  // Residuals
-  AddVolumeOutput("RESIDUAL_ADJOINT_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
+  /// DESCRIPTION: Residual of the adjoint density.
+  AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint momentum x-component.
+  AddVolumeOutput("RES_ADJ_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint momentum y-component.
+  AddVolumeOutput("RES_ADJ_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");  
   if (nDim == 3)
-    AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");
-  
+    /// DESCRIPTION: Residual of the adjoint momentum z-component.
+    AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
+  /// DESCRIPTION: Residual of the adjoint energy. 
+  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL");
+    /// DESCRIPTION: Residual of the nu tilde. 
+    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
     break;  
   case SST:
-    AddVolumeOutput("RESIDUAL_ADJOINT_TKE", "Residual_Adjoint_TKE", "RESIDUAL");
-    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");
+    /// DESCRIPTION: Residual of the adjoint kinetic energy. 
+    AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+    /// DESCRIPTION: Residual of the adjoint dissipation.
+    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
     break;
   default: break;
   }
+  /// END_GROUP
   
-  // Sensitivity
-  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY");
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
+  /// DESCRIPTION: Sensitivity x-component.
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  /// DESCRIPTION: Sensitivity y-component.
   AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
   if (nDim == 3)
-    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");  
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY");
+    /// DESCRIPTION: Sensitivity z-component.
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+  /// DESCRIPTION: Sensitivity in normal direction.
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  /// END_GROUP
  
 }
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index bcc7b4afc783..1e27a92ea297 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -107,101 +107,170 @@ CFlowOutput::~CFlowOutput(void) {
 
 void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
-  // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",   FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",   FORMAT_INTEGER, "EXT_ITER");
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
-  
-  // Residuals
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The internal iteration index.
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The external iteration index.
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// DESCRIPTION: Root-mean square residual of the density.
   AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum x-component.
   AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum y-component.
   AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum z-component.
   AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the energy.
   AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
-  
+  /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
   AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
   AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
   AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-
+  /// END_GROUP
+   
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// DESCRIPTION: Maximum residual of the density.
   AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum x-component. 
   AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum y-component. 
   AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum z-component. 
   AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the energy.  
   AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
-  
+  /// DESCRIPTION: Maximum residual of nu tilde (SA model).
   AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
   AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
+  AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);  
+  /// END_GROUP
   
-  // Aerodynamic coefficients
+  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
+  /// DESCRIPTION: Drag coefficient 
   AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient 
   AddHistoryOutput("LIFT",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient   
   AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis    
   AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis    
   AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis      
   AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction    
   AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction    
   AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction      
   AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio
   AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// END_GROUP
   
-  
-  // Aerodynamic coefficients (per surface)  
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
+  /// DESCRIPTION: Drag coefficient   
   AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient   
   AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient     
   AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis      
   AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis      
   AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis        
   AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction      
   AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction      
   AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction        
   AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio  
   AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
- 
+  /// END_GROUP 
   
-  // Misc.
+  /// DESCRIPTION: Angle of attack  
   AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
-  // Surface output
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
   vector<string> Marker_Analyze;
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
   }  
+  /// DESCRIPTION: Average mass flow    
   AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Mach number      
   AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Temperature        
   AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Pressure  
   AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Density  
   AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Enthalpy  
   AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average velocity in normal direction of the surface
   AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Flow uniformity 
   AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary strength
   AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Momentum distortion  
   AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary over uniformity 
   AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total temperature  
   AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total pressure   
   AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Pressure drop    
   AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// END_GROUP
   
-  // Engine output
+  /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
+  /// DESCRIPTION: Aero CD drag
   AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Solid CD drag  
   AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Radial distortion 
   AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Circumferential distortion
   AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  /// END_GROUP
   
-  // Rotating Frame
+  /// BEGIN_GROUP: ROTATING_FRAME, DESCRIPTION: Coefficients related to a rotating frame of reference.
+  /// DESCRIPTION: Merit  
   AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  /// DESCRIPTION: CT 
   AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  /// DESCRIPTION: CQ  
   AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  /// END_GROUP
   
-  //Equivalent area
+  /// BEGIN_GROUP: EQUIVALENT_AREA, DESCRIPTION: Equivalent area.  
+  /// DESCRIPTION: Equivalent area    
   AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Nearfield obj. function      
   AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
-
+  /// END_GROUP
 
 }
 

From 22d05d4dd20ff7f75e1a96013bc068c17608d908 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Nov 2018 16:40:36 +0100
Subject: [PATCH 073/539] Some renaming

---
 SU2_CFD/src/output_direct_mean_inc.cpp | 20 ++++++++++----------
 SU2_CFD/src/output_structure.cpp       | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 26ec606960f4..c775655c4b4d 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -156,16 +156,16 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   }
   
   // Aerodynamic coefficients
-  AddHistoryOutput("DRAG",       "CD(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("LIFT",       "CL(Total)",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("SIDEFORCE",  "CSF(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-X",   "CMx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-Y",   "CMy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("MOMENT-Z",   "CMz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-X",    "CFx(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-Y",    "CFy(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("FORCE-Z",    "CFz(Total)",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
-  AddHistoryOutput("EFFICIENCY", "CEff(Total)", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
 
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 0b0ebaef23c7..a7c21c6947ba 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -7692,7 +7692,7 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
    fixed length of 33 for the string length to match with CGNS. This is 
    needed for when we read the strings later. ---*/
 
-  for (iVar = 0; iVar < nVar_Par; iVar++) {
+  for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
     strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
     fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
     file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
@@ -7700,8 +7700,8 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
 
   /*--- Call to write the entire restart file data in binary in one shot. ---*/
 
-  fwrite(buf, nVar_Par*nParallel_Poin, sizeof(passivedouble), fhw);
-  file_size += (su2double)nVar_Par*nParallel_Poin*sizeof(passivedouble);
+  fwrite(buf, GlobalField_Counter*nParallel_Poin, sizeof(passivedouble), fhw);
+  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
 
   /*--- Write the external iteration. ---*/
 
@@ -8039,8 +8039,8 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
 #else
   for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
     Buffer_Recv_GlobalIndex[iVertex] = Buffer_Send_GlobalIndex[iVertex];
-    for (iVar = 0; iVar < nVar_Par; iVar++) {
-      Buffer_Recv_Data[iVertex*nVar_Par+iVar] = Buffer_Send_Data[iVertex*nVar_Par+iVar];
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      Buffer_Recv_Data[iVertex*GlobalField_Counter+iVar] = Buffer_Send_Data[iVertex*GlobalField_Counter+iVar];
     }
   }
 #endif

From d5dcb9a249a0036dd9b2c547074f74ff53f8efdd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 17 Nov 2018 19:22:25 +0100
Subject: [PATCH 074/539] Solved some after-merge conflicts

---
 Common/include/config_structure.hpp  | 6 ------
 SU2_CFD/include/output_structure.hpp | 2 +-
 SU2_CFD/src/output_structure.cpp     | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 789e6cca8d65..f5ac8225df3d 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -8909,12 +8909,6 @@ class CConfig {
   */
   string GetVolumeOutput_Field(unsigned short iField);
 
-  /*!
-   * \brief Get Compute Average.
-   * \return YES if start computing averages
-   */
-  bool GetCompute_Average(void);
-
 };
 
 #include "config_structure.inl"
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 6b82d4962c9c..4642cfd5d289 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -791,7 +791,7 @@ class COutput {
    * \param[in] val_nZone - Total number of domains in the grid file.
    */
   void SetResult_Files_Parallel(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone, unsigned short *nInst);
+                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone);
 
   /*!
    * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 7b1f62a1625b..7ff1aa222c77 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -2374,8 +2374,6 @@ void COutput::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solv
           /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
           
           jPoint = (iProcessor + 1) * nBuffer_Scalar;
-<<<<<<< HEAD
-=======
         }
       }
     }

From 4f5fa9da9180cd7f5b8e516469b5e067f8a6eb72 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 19 Nov 2018 10:06:27 +0100
Subject: [PATCH 075/539] Updated heat output structure

---
 SU2_CFD/src/output_direct_heat.cpp | 66 +++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index e54c2e6af5ef..ea8d4c07f1b5 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -41,6 +41,25 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
 
   nDim = geometry->GetnDim();
 
+
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  if (nRequestedScreenFields == 0){
+    RequestedScreenFields.push_back("EXT_ITER");    
+    RequestedScreenFields.push_back("RMS_TEMPERATURE");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
 }
 
 CHeatOutput::~CHeatOutput(void) {
@@ -52,18 +71,36 @@ CHeatOutput::~CHeatOutput(void) {
 }
 
 
-inline bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) {
+bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ if (!write_dualtime){
   return true;
+ }
+ else {
+   return false;
+ }
 }
 
-inline bool CHeatOutput::WriteScreen_Header(CConfig *config) { 
-
-//  return (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
-  return true;
+bool CHeatOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0);
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
+  return write_header;
 }
 
-inline bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  return true;
+bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
+      && write_dualtime ){
+    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+  } 
+  return write_output;
 }
 
 void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
@@ -76,8 +113,9 @@ void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   
   SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
   SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
-  SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
-  SetHistoryOutputValue("HEAT", log10(heat_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("AVG_TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
+  SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
   
   SetHistoryOutputValue("PHYS_TIME", timeused);
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
@@ -93,12 +131,12 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
-  AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT");
-  AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT");
-  AddHistoryOutput("TEMPERATURE", "Temp(Total)", FORMAT_SCIENTIFIC, "HEAT");
-  
-  AddHistoryOutput("HEAT", "Res[T]", FORMAT_FIXED, "RESIDUALS");
+  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
   
+  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
 }
 
 

From a8530a7b07f51b4b1da3221d5dc810c3e2738f75 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 4 Dec 2018 15:10:41 +0100
Subject: [PATCH 076/539] Added Inner Iter variable to config structure.

---
 Common/include/config_structure.hpp    | 14 ++++++++++++++
 Common/include/config_structure.inl    |  4 ++++
 SU2_CFD/include/output_structure.hpp   |  3 ++-
 SU2_CFD/src/iteration_structure.cpp    |  4 ++++
 SU2_CFD/src/output_direct_mean_inc.cpp | 20 ++++++++++++--------
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index f5ac8225df3d..b2a6bfda0610 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -393,6 +393,7 @@ class CConfig {
   unsigned long ExtIter_OffSet;			/*!< \brief External iteration number offset. */
   unsigned long IntIter;			/*!< \brief Current internal iteration number. */
   unsigned long OuterIter;			/*!< \brief Current Outer Iteration for multizone problems. */
+  unsigned long InnerIter;			/*!< \brief Current Outer Iteration for multizone problems. */
   unsigned long Unst_nIntIter;			/*!< \brief Number of internal iterations (Dual time Method). */
   unsigned long Dyn_nIntIter;			/*!< \brief Number of internal iterations (Newton-Raphson Method for nonlinear structural analysis). */
   long Unst_RestartIter;			/*!< \brief Iteration number to restart an unsteady simulation (Dual time Method). */
@@ -3064,6 +3065,12 @@ class CConfig {
    */
   void SetOuterIter(unsigned long val_iter);
   
+  /*!
+   * \brief Set the current FSI iteration number.
+   * \param[in] val_iter - Current FSI iteration number.
+   */
+  void SetInnerIter(unsigned long val_iter);
+  
   /*!
    * \brief Set the current internal iteration number.
    * \param[in] val_iter - Current external iteration number.
@@ -3088,6 +3095,13 @@ class CConfig {
    */
   unsigned long GetOuterIter(void);
   
+  /*!
+   * \brief Get the current FSI iteration number.
+   * \return Current FSI iteration.
+   */
+  unsigned long GetInnerIter(void);
+  
+  
   /*!
    * \brief Get the current internal iteration number.
    * \return Current internal iteration.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 834b6f05fa63..5782e38d8162 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -303,6 +303,8 @@ inline void CConfig::SetExtIter_OffSet(unsigned long val_iter) { ExtIter_OffSet
 
 inline void CConfig::SetOuterIter(unsigned long val_iter) { OuterIter = val_iter; }
 
+inline void CConfig::SetInnerIter(unsigned long val_iter) { InnerIter = val_iter; }
+
 inline void CConfig::SetIntIter(unsigned long val_iter) { IntIter = val_iter; }
 
 inline unsigned long CConfig::GetExtIter(void) { return ExtIter; }
@@ -311,6 +313,8 @@ inline unsigned long CConfig::GetExtIter_OffSet(void) { return ExtIter_OffSet; }
 
 inline unsigned long CConfig::GetOuterIter(void) { return OuterIter; }
 
+inline unsigned long CConfig::GetInnerIter(void) { return InnerIter; }
+
 inline unsigned long CConfig::GetIntIter(void) { return IntIter; }
 
 inline unsigned long CConfig::GetUnst_nIntIter(void) { return Unst_nIntIter; }
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4642cfd5d289..05cf3d30fb84 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1115,7 +1115,7 @@ class CIncFlowOutput : public COutput {
   unsigned short turb_model;
   bool heat, weakly_coupled_heat;
   
-  bool grid_movement;
+  bool grid_movement, multizone;
   
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
 
@@ -1237,6 +1237,7 @@ class CFEAOutput : public COutput {
  */
 class CHeatOutput : public COutput {
 private:
+  bool multizone;
 
   char char_histfile[200];
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 4c1a12ea2d3a..d742aef76d33 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -824,6 +824,8 @@ void CFluidIteration::Solve(COutput *output,
 
     for (Inner_Iter = 0; Inner_Iter < nInner_Iter; Inner_Iter++){
 
+      config_container[val_iZone]->SetInnerIter(Inner_Iter);
+
       /*--- For steady-state flow simulations, we need to loop over ExtIter for the number of time steps ---*/
       if (steady) config_container[val_iZone]->SetExtIter(Inner_Iter);
       /*--- For unsteady flow simulations, we need to loop over IntIter for the number of time steps ---*/
@@ -1354,6 +1356,8 @@ void CHeatIteration::Solve(COutput *output,
   /*--- However, ExtIter is the number of FSI iterations, so nIntIter is used in this case ---*/
 
   for (Inner_Iter = 0; Inner_Iter < nInner_Iter; Inner_Iter++){
+		
+    config_container[val_iZone]->SetInnerIter(Inner_Iter);
 
     /*--- For steady-state flow simulations, we need to loop over ExtIter for the number of time steps ---*/
     if (steady) config_container[val_iZone]->SetExtIter(Inner_Iter);
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index c775655c4b4d..ff2ba4d88629 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -50,6 +50,8 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
   grid_movement = config->GetGrid_Movement(); 
   
+  multizone = config->GetMultizone_Problem();
+  
   su2double Gas_Constant, Mach2Vel, Mach_Motion;
   unsigned short iDim;
   su2double Gamma = config->GetGamma();
@@ -76,13 +78,14 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("EXT_ITER");
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_PRESSURE");
     RequestedScreenFields.push_back("RMS_VELOCITY-X");
     RequestedScreenFields.push_back("RMS_VELOCITY-Y");
@@ -111,8 +114,8 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
   
   // Residuals
   AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
@@ -225,7 +228,7 @@ bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtim
 bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -240,7 +243,7 @@ bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
     write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
   return write_output;
 }
@@ -254,8 +257,9 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];  
   CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];
   
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());    
+  //SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetOuterIter());
   
   SetHistoryOutputValue("RMS_PRESSURE", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));

From 90d65491a476f1329cf7359d1395439669a3de71 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 4 Dec 2018 15:12:41 +0100
Subject: [PATCH 077/539] Moved BGS residual to CVariable

---
 SU2_CFD/include/solver_structure.hpp        | 64 +------------------
 SU2_CFD/include/solver_structure.inl        |  4 --
 SU2_CFD/include/variable_structure.hpp      | 70 ++-------------------
 SU2_CFD/include/variable_structure.inl      | 44 ++-----------
 SU2_CFD/src/output_direct_heat.cpp          | 11 ++--
 SU2_CFD/src/output_direct_mean_inc.cpp      | 34 ++++++++++
 SU2_CFD/src/solver_adjoint_discrete.cpp     | 12 ----
 SU2_CFD/src/solver_adjoint_elasticity.cpp   | 13 ----
 SU2_CFD/src/solver_direct_elasticity.cpp    | 40 ------------
 SU2_CFD/src/solver_direct_heat.cpp          | 24 -------
 SU2_CFD/src/solver_direct_mean.cpp          | 39 ------------
 SU2_CFD/src/solver_direct_mean_inc.cpp      | 39 ------------
 SU2_CFD/src/solver_structure.cpp            | 41 ++++++++++++
 SU2_CFD/src/variable_adjoint_discrete.cpp   |  3 -
 SU2_CFD/src/variable_adjoint_elasticity.cpp |  1 -
 SU2_CFD/src/variable_direct_mean.cpp        | 11 ----
 SU2_CFD/src/variable_direct_mean_inc.cpp    | 12 ----
 SU2_CFD/src/variable_structure.cpp          |  7 +++
 18 files changed, 102 insertions(+), 367 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index f3e963e57631..4cd172b05f0c 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -6460,18 +6460,6 @@ class CEulerSolver : public CSolver {
   void SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                             unsigned short iRKStep, unsigned short iMesh, unsigned short RunTime_EqSystem);
   
-  /*!
-   * \brief Set the value of the max residual and RMS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
-
-  /*!
-   * \brief Store the BGS solution in the previous subiteration in the corresponding vector.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void UpdateSolution_BGS(CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief Load a solution from a restart file.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -8129,18 +8117,6 @@ class CIncEulerSolver : public CSolver {
   void SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                             unsigned short iRKStep, unsigned short iMesh, unsigned short RunTime_EqSystem);
   
-  /*!
-   * \brief Set the value of the max residual and BGS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
-
-  /*!
-   * \brief Store the BGS solution in the previous subiteration in the corresponding vector.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void UpdateSolution_BGS(CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief Load a solution from a restart file.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -11536,11 +11512,6 @@ class CHeatSolverFVM : public CSolver {
   void SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                             unsigned short iRKStep, unsigned short iMesh, unsigned short RunTime_EqSystem);
 
-  /*!
-   * \brief Set the value of the max residual and BGS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
 };
 
 /*! \class CFEASolver
@@ -12210,18 +12181,6 @@ class CFEASolver : public CSolver {
    */
   su2double Get_MassMatrix(unsigned long iPoint, unsigned long jPoint, unsigned short iVar, unsigned short jVar);
   
-  /*!
-   * \brief Set the value of the max residual and BGS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
-
-  /*!
-   * \brief Store the BGS solution in the previous subiteration in the corresponding vector.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void UpdateSolution_BGS(CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief Load a solution from a restart file.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -12721,17 +12680,8 @@ class CDiscAdjSolver : public CSolver {
    */
   void LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo);
   
-  /*!
-   * \brief Set the value of the max residual and RMS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
   void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
   
-  /*!
-   * \brief Store the BGS solution in the previous subiteration in the corresponding vector.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void UpdateSolution_BGS(CGeometry *geometry, CConfig *config);
 };
 
 /*!
@@ -13018,18 +12968,6 @@ class CDiscAdjFEASolver : public CSolver {
    * \return Pointer to the values of the design variables
    */
   su2double GetVal_DVFEA(unsigned short iVal);
-
-  /*!
-   * \brief Set the value of the max residual and RMS residual.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
-  
-  /*!
-   * \brief Store the BGS solution in the previous subiteration in the corresponding vector.
-   * \param[in] val_iterlinsolver - Number of linear iterations.
-   */
-  void UpdateSolution_BGS(CGeometry *geometry, CConfig *config);
   
   /*!
    * \brief Prepare the solver for a new recording.
@@ -13084,6 +13022,8 @@ class CDiscAdjFEASolver : public CSolver {
    */
   void LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo);
 
+  void ComputeResidual_BGS(CGeometry *geometry, CConfig *config);
+  
 };
 
 /*!
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index d9ba85488f6c..28b608de1459 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -925,10 +925,6 @@ inline void CSolver::AddRes_Max(unsigned short val_var, su2double val_residual,
 
 inline su2double CSolver::GetRes_Max(unsigned short val_var) { return Residual_Max[val_var]; }
 
-inline void CSolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config) { }
-
-inline void CSolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config) { }
-
 inline void CSolver::SetRes_BGS(unsigned short val_var, su2double val_residual) { Residual_BGS[val_var] = val_residual; }
 
 inline void CSolver::AddRes_BGS(unsigned short val_var, su2double val_residual) { Residual_BGS[val_var] += val_residual; }
diff --git a/SU2_CFD/include/variable_structure.hpp b/SU2_CFD/include/variable_structure.hpp
index 72fb445b1666..bf9787978750 100644
--- a/SU2_CFD/include/variable_structure.hpp
+++ b/SU2_CFD/include/variable_structure.hpp
@@ -92,6 +92,10 @@ class CVariable {
                                                        have different number of nVar in the same problem. */
   su2double *Solution_Adj_Old;    /*!< \brief Solution of the problem in the previous AD-BGS iteration. */
   
+  /*--- Old solution container for BGS iterations ---*/
+  
+  su2double* Solution_BGS_k;
+  
 public:
   
   /*!
@@ -2573,9 +2577,6 @@ class CFEAVariable : public CVariable {
   
   su2double *Prestretch;        /*!< \brief Prestretch geometry */
   
-  su2double* Solution_BGS_k;    /*!< \brief Old solution container for BGS iterations ---*/
-  
-  
 public:
   
   /*!
@@ -3040,17 +3041,6 @@ class CFEAVariable : public CVariable {
    * \param[in] adj_sol - The adjoint values of the solution.
    */
   void GetAdjointSolution_Accel_time_n(su2double *adj_sol);
-  
-  /*!
-   * \brief Set the value of the solution in the previous BGS subiteration.
-   */
-  void Set_BGSSolution_k(void);
-
-  /*!
-   * \brief Get the value of the solution in the previous BGS subiteration.
-   * \param[out] val_solution - solution in the previous BGS subiteration.
-   */
-  su2double Get_BGSSolution_k(unsigned short iDim);
 
 };
 
@@ -3139,9 +3129,6 @@ class CEulerVariable : public CVariable {
 
   su2double *Solution_New;
 
-  /*--- Old solution container for BGS iterations ---*/
-  su2double* Solution_BGS_k;
-  
 public:
   
   /*!
@@ -3543,16 +3530,6 @@ class CEulerVariable : public CVariable {
    */
   void SetWindGustDer(su2double* val_WindGust);
 
-  /*!
-   * \brief Set the value of the solution in the previous BGS subiteration.
-   */
-  void Set_BGSSolution_k(void);
-
-  /*!
-   * \brief Get the value of the solution in the previous BGS subiteration.
-   * \param[out] val_solution - solution in the previous BGS subiteration.
-   */
-  su2double Get_BGSSolution_k(unsigned short iDim);
 };
 
 /*!
@@ -3571,10 +3548,6 @@ class CIncEulerVariable : public CVariable {
   su2double **Gradient_Primitive;  /*!< \brief Gradient of the primitive variables (T, vx, vy, vz, P, rho). */
   su2double *Limiter_Primitive;    /*!< \brief Limiter of the primitive variables (T, vx, vy, vz, P, rho). */
   
-  /*--- Old solution container for BGS iterations ---*/
-  
-  su2double* Solution_BGS_k;
-  
   /*--- Old density for variable density turbulent flows (SST). ---*/
   
   su2double Density_Old;
@@ -3811,17 +3784,6 @@ class CIncEulerVariable : public CVariable {
    */
   su2double GetSpecificHeatCv(void);
   
-  /*!
-   * \brief Set the value of the solution in the previous BGS subiteration.
-   */
-  void Set_BGSSolution_k(void);
-
-  /*!
-   * \brief Get the value of the solution in the previous BGS subiteration.
-   * \param[out] val_solution - solution in the previous BGS subiteration.
-   */
-  su2double Get_BGSSolution_k(unsigned short iDim);
-
 };
 
 /*!
@@ -4683,7 +4645,6 @@ class CDiscAdjVariable : public CVariable {
   su2double* Geometry_Direct;
   
   su2double* Solution_BGS;
-  su2double* Solution_BGS_k;
   su2double* Solution_Geometry_BGS_k;
   
 public:
@@ -4811,24 +4772,13 @@ class CDiscAdjVariable : public CVariable {
    * \brief Set the value of the adjoint solution in the current BGS subiteration.
    */
   void Set_BGSSolution(unsigned short iDim, su2double val_solution);
-  
-  /*!
-   * \brief Set the value of the adjoint solution in the previous BGS subiteration.
-   */
-  void Set_BGSSolution_k(void);
-  
+
   /*!
    * \brief Get the value of the adjoint solution in the previous BGS subiteration.
    * \param[out] val_solution - adjoint solution in the previous BGS subiteration.
    */
   su2double Get_BGSSolution(unsigned short iDim);
   
-  /*!
-   * \brief Get the value of the adjoint solution in the previous BGS subiteration.
-   * \param[out] val_solution - adjoint solution in the previous BGS subiteration.
-   */
-  su2double Get_BGSSolution_k(unsigned short iDim);
-
   /*!
    * \brief Set the value of the adjoint geometry solution in the previous BGS subiteration.
    */
@@ -4887,7 +4837,6 @@ class CDiscAdjFEAVariable : public CVariable {
     su2double* Geometry_CrossTerm_Derivative;
 
     su2double* Solution_BGS;
-    su2double* Solution_BGS_k;
 
 public:
     /*!
@@ -5080,10 +5029,6 @@ class CDiscAdjFEAVariable : public CVariable {
      */
     void Set_BGSSolution(unsigned short iDim, su2double val_solution);
 
-    /*!
-     * \brief Set the value of the adjoint solution in the previous BGS subiteration.
-     */
-    void Set_BGSSolution_k(void);
 
     /*!
      * \brief Get the value of the adjoint solution in the previous BGS subiteration.
@@ -5091,11 +5036,6 @@ class CDiscAdjFEAVariable : public CVariable {
      */
     su2double Get_BGSSolution(unsigned short iDim);
 
-    /*!
-     * \brief Get the value of the adjoint solution in the previous BGS subiteration.
-     * \param[out] val_solution - adjoint solution in the previous BGS subiteration.
-     */
-    su2double Get_BGSSolution_k(unsigned short iDim);
 
 };
 
diff --git a/SU2_CFD/include/variable_structure.inl b/SU2_CFD/include/variable_structure.inl
index 7857c0f0c00e..8d49b56bd2ed 100644
--- a/SU2_CFD/include/variable_structure.inl
+++ b/SU2_CFD/include/variable_structure.inl
@@ -541,11 +541,14 @@ inline void CVariable::SetCross_Term_Derivative(unsigned short iVar, su2double d
 
 inline void CVariable::Set_BGSSolution(unsigned short iDim, su2double val_solution) { }
 
-inline void CVariable::Set_BGSSolution_k(void) { }
+inline void CVariable::Set_BGSSolution_k(void) { 
+  for (unsigned short iVar = 0; iVar < nVar; iVar++)
+    Solution_BGS_k[iVar] = Solution[iVar];
+}
 
-inline su2double CVariable::Get_BGSSolution(unsigned short iDim) { return 0.0;}
+inline su2double CVariable::Get_BGSSolution(unsigned short iVar) { return 0.0;}
 
-inline su2double CVariable::Get_BGSSolution_k(unsigned short iDim) { return 0.0;}
+inline su2double CVariable::Get_BGSSolution_k(unsigned short iVar) { return Solution_BGS_k[iVar];}
 
 inline void CVariable::Set_BGSSolution_Geometry(void) { }
 
@@ -855,13 +858,6 @@ inline void CEulerVariable::SetWindGustDer( su2double* val_WindGustDer) {
 
 inline su2double* CEulerVariable::GetWindGustDer() { return WindGustDer;}
 
-inline su2double CEulerVariable::Get_BGSSolution_k(unsigned short iDim) { return Solution_BGS_k[iDim];}
-
-inline void CEulerVariable::Set_BGSSolution_k(void) { 
-  for (unsigned short iVar = 0; iVar < nVar; iVar++)
-    Solution_BGS_k[iVar] = Solution[iVar];
-}
-
 inline su2double CNSVariable::GetEddyViscosity(void) { return Primitive[nDim+6]; }
 
 inline su2double CNSVariable::GetLaminarViscosity(void) { return Primitive[nDim+5]; }
@@ -1031,13 +1027,6 @@ inline su2double CIncEulerVariable::GetSpecificHeatCp(void) { return Primitive[n
 
 inline su2double CIncEulerVariable::GetSpecificHeatCv(void) { return Primitive[nDim+8]; }
 
-inline su2double CIncEulerVariable::Get_BGSSolution_k(unsigned short iDim) { return Solution_BGS_k[iDim];}
-
-inline void CIncEulerVariable::Set_BGSSolution_k(void) {
-  for (unsigned short iVar = 0; iVar < nVar; iVar++)
-    Solution_BGS_k[iVar] = Solution[iVar];
-}
-
 inline su2double CIncNSVariable::GetEddyViscosity(void) { return Primitive[nDim+5]; }
 
 inline su2double CIncNSVariable::GetLaminarViscosity(void) { return Primitive[nDim+4]; }
@@ -1254,13 +1243,6 @@ inline void CFEAVariable::RegisterSolution_Accel_time_n() {
 	    AD::RegisterInput(Solution_Accel_time_n[iVar]);
 }
 
-inline su2double CFEAVariable::Get_BGSSolution_k(unsigned short iDim) { return Solution_BGS_k[iDim];}
-
-inline void CFEAVariable::Set_BGSSolution_k(void) { 
-  for (unsigned short iVar = 0; iVar < nVar; iVar++)
-    Solution_BGS_k[iVar] = Solution[iVar];
-}
-
 inline void CFEAVariable::SetPrestretch(unsigned short iVar, su2double val_prestretch) { Prestretch[iVar] = val_prestretch;}
 
 inline su2double *CFEAVariable::GetPrestretch(void) { return Prestretch; }
@@ -1605,19 +1587,12 @@ inline su2double CDiscAdjFEAVariable::GetCross_Term_Derivative(unsigned short iV
 
 inline void CDiscAdjFEAVariable::SetCross_Term_Derivative(unsigned short iVar, su2double der) { Cross_Term_Derivative[iVar] = der; }
 
-inline void CDiscAdjVariable::Set_BGSSolution_k(void) { 
-  for (unsigned short iVar = 0; iVar < nVar; iVar++)
-    Solution_BGS_k[iVar] = Solution_BGS[iVar];
-}
-
 inline void CDiscAdjVariable::Set_BGSSolution(unsigned short iDim, su2double val_solution) { 
   Solution_BGS[iDim] = val_solution;
 }
 
 inline su2double CDiscAdjVariable::Get_BGSSolution(unsigned short iDim) { return Solution_BGS[iDim];}
 
-inline su2double CDiscAdjVariable::Get_BGSSolution_k(unsigned short iDim) { return Solution_BGS_k[iDim];}
-
 inline void CDiscAdjVariable::Set_BGSSolution_Geometry(void) { 
   for (unsigned short iDim = 0; iDim < nDim; iDim++)
     Solution_Geometry_BGS_k[iDim] = Solution_Geometry[iDim];
@@ -1629,12 +1604,5 @@ inline void CDiscAdjFEAVariable::Set_BGSSolution(unsigned short iDim, su2double
   Solution_BGS[iDim] = val_solution;
 }
 
-inline void CDiscAdjFEAVariable::Set_BGSSolution_k(void) { 
-  for (unsigned short iDim = 0; iDim < nDim; iDim++)
-    Solution_BGS_k[iDim] = Solution_BGS[iDim];
-}
-
 inline su2double CDiscAdjFEAVariable::Get_BGSSolution(unsigned short iDim) { return Solution_BGS[iDim];}
 
-inline su2double CDiscAdjFEAVariable::Get_BGSSolution_k(unsigned short iDim) { return Solution_BGS_k[iDim];}
-
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index ea8d4c07f1b5..d1ba93555f8a 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -108,14 +108,15 @@ void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   
   CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];  
   
-  SetHistoryOutputValue("EXT_ITER",     config[val_iZone]->GetExtIter());
-  SetHistoryOutputValue("INT_ITER",     config[val_iZone]->GetIntIter());
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
   
   SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
   SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
   SetHistoryOutputValue("AVG_TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
   SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
   
   SetHistoryOutputValue("PHYS_TIME", timeused);
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
@@ -125,8 +126,8 @@ void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
 
 void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("EXT_ITER", "Ext_Iter", FORMAT_INTEGER, "EXT_ITER");
-  AddHistoryOutput("INT_ITER", "Int_Iter", FORMAT_INTEGER, "INT_ITER");
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
   
   AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
@@ -137,6 +138,8 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
   AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  
 }
 
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index ff2ba4d88629..c6241eb08566 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -149,9 +149,26 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
     break;
   }
   
+  // Residuals
+  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    AddHistoryOutput("BGS_NU_TILDE", "rms[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    AddHistoryOutput("BGS_KINETIC_ENERGY", "rms[k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_DISSIPATION",    "rms[w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    break;
+  }
+  
   if (heat || weakly_coupled_heat){
     AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
     
     AddHistoryOutput("HEATFLUX", "HF(Total)",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
     AddHistoryOutput("HEATFLUX_MAX", "HF(Max)",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
@@ -291,12 +308,29 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     break;
   }
   
+  SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
+  SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
+  SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
+  if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
+ 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+    break;
+  }
+  
   if (weakly_coupled_heat){
     SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
+    
     
   }
   if (heat){
diff --git a/SU2_CFD/src/solver_adjoint_discrete.cpp b/SU2_CFD/src/solver_adjoint_discrete.cpp
index 6e5f9ba123ae..f5fa921f87b8 100644
--- a/SU2_CFD/src/solver_adjoint_discrete.cpp
+++ b/SU2_CFD/src/solver_adjoint_discrete.cpp
@@ -1075,15 +1075,3 @@ void CDiscAdjSolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
 
 }
 
-void CDiscAdjSolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned long iPoint;
-
-  /*--- To nPoint: The solution must be communicated beforehand ---*/
-  for (iPoint = 0; iPoint < nPoint; iPoint++){
-
-    node[iPoint]->Set_BGSSolution_k();
-
-  }
-
-}
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index f461eaa921a3..840f3bad60d2 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -1087,19 +1087,6 @@ void CDiscAdjFEASolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config
 }
 
 
-void CDiscAdjFEASolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned long iPoint;
-
-  /*--- To nPoint: The solution must be communicated beforehand ---*/
-  for (iPoint = 0; iPoint < nPoint; iPoint++){
-
-    node[iPoint]->Set_BGSSolution_k();
-
-  }
-
-}
-
 void CDiscAdjFEASolver::BC_Clamped_Post(CGeometry *geometry, CSolver **solver_container, CNumerics *numerics, CConfig *config,
                                             unsigned short val_marker) {
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 96729187213d..16ba7ab88844 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -4571,46 +4571,6 @@ void CFEASolver::Stiffness_Penalty(CGeometry *geometry, CSolver **solver, CNumer
 
 
 
-}
-
-void CFEASolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned short iVar;
-  unsigned long iPoint;
-  su2double residual;
-
-  /*--- Set Residuals to zero ---*/
-
-  for (iVar = 0; iVar < nVar; iVar++){
-      SetRes_BGS(iVar,0.0);
-      SetRes_Max_BGS(iVar,0.0,0);
-  }
-
-  /*--- Set the residuals ---*/
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++){
-      for (iVar = 0; iVar < nVar; iVar++){
-          residual = node[iPoint]->GetSolution(iVar) - node[iPoint]->Get_BGSSolution_k(iVar);
-          AddRes_BGS(iVar,residual*residual);
-          AddRes_Max_BGS(iVar,fabs(residual),geometry->node[iPoint]->GetGlobalIndex(),geometry->node[iPoint]->GetCoord());
-      }
-  }
-
-  SetResidual_BGS(geometry, config);
-
-}
-
-
-void CFEASolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned long iPoint;
-
-  /*--- To nPoint: The solution must be communicated beforehand ---*/
-  for (iPoint = 0; iPoint < nPoint; iPoint++){
-
-    node[iPoint]->Set_BGSSolution_k();
-
-  }
-
 }
 
 void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 122b2139f90e..0f395947701a 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -2146,28 +2146,4 @@ void CHeatSolverFVM::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_
   }
 }
 
-void CHeatSolverFVM::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
 
-  unsigned short iVar;
-  unsigned long iPoint;
-  su2double residual;
-
-  /*--- Set Residuals to zero ---*/
-
-  for (iVar = 0; iVar < nVar; iVar++){
-      SetRes_BGS(iVar,0.0);
-      SetRes_Max_BGS(iVar,0.0,0);
-  }
-
-  /*--- Set the residuals ---*/
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++){
-      for (iVar = 0; iVar < nVar; iVar++){
-          residual = node[iPoint]->GetSolution(iVar) - node[iPoint]->Get_BGSSolution_k(iVar);
-          AddRes_BGS(iVar,residual*residual);
-          AddRes_Max_BGS(iVar,fabs(residual),geometry->node[iPoint]->GetGlobalIndex(),geometry->node[iPoint]->GetCoord());
-      }
-  }
-
-  SetResidual_BGS(geometry, config);
-
-}
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index e6fe42de36b0..f9113329a687 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -13350,45 +13350,6 @@ void CEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_co
   
 }
 
-void CEulerSolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned short iVar;
-  unsigned long iPoint;
-  su2double residual;
-
-  /*--- Set Residuals to zero ---*/
-
-  for (iVar = 0; iVar < nVar; iVar++){
-      SetRes_BGS(iVar,0.0);
-      SetRes_Max_BGS(iVar,0.0,0);
-  }
-
-  /*--- Set the residuals ---*/
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++){
-      for (iVar = 0; iVar < nVar; iVar++){
-          residual = node[iPoint]->GetSolution(iVar) - node[iPoint]->Get_BGSSolution_k(iVar);
-          AddRes_BGS(iVar,residual*residual);
-          AddRes_Max_BGS(iVar,fabs(residual),geometry->node[iPoint]->GetGlobalIndex(),geometry->node[iPoint]->GetCoord());
-      }
-  }
-
-  SetResidual_BGS(geometry, config);
-
-}
-
-
-void CEulerSolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned long iPoint;
-
-  /*--- To nPoint: The solution must be communicated beforehand ---*/
-  for (iPoint = 0; iPoint < nPoint; iPoint++){
-
-    node[iPoint]->Set_BGSSolution_k();
-
-  }
-
-}
 
 void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
 
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 2a0886b07826..e2f2a48302cc 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -6054,45 +6054,6 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
   
 }
 
-void CIncEulerSolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned short iVar;
-  unsigned long iPoint;
-  su2double residual;
-
-  /*--- Set Residuals to zero ---*/
-
-  for (iVar = 0; iVar < nVar; iVar++){
-      SetRes_BGS(iVar,0.0);
-      SetRes_Max_BGS(iVar,0.0,0);
-  }
-
-  /*--- Set the residuals ---*/
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++){
-      for (iVar = 0; iVar < nVar; iVar++){
-          residual = node[iPoint]->GetSolution(iVar) - node[iPoint]->Get_BGSSolution_k(iVar);
-          AddRes_BGS(iVar,residual*residual);
-          AddRes_Max_BGS(iVar,fabs(residual),geometry->node[iPoint]->GetGlobalIndex(),geometry->node[iPoint]->GetCoord());
-      }
-  }
-
-  SetResidual_BGS(geometry, config);
-
-}
-
-
-void CIncEulerSolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
-
-  unsigned long iPoint;
-
-  /*--- To nPoint: The solution must be communicated beforehand ---*/
-  for (iPoint = 0; iPoint < nPoint; iPoint++){
-
-    node[iPoint]->Set_BGSSolution_k();
-
-  }
-
-}
 
 void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
   
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 3d3da7aa84a8..db56a7d2d281 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3425,6 +3425,47 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
   
 }
 
+void CSolver::ComputeResidual_BGS(CGeometry *geometry, CConfig *config){
+
+  unsigned short iVar;
+  unsigned long iPoint;
+  su2double residual;
+
+  /*--- Set Residuals to zero ---*/
+
+  for (iVar = 0; iVar < nVar; iVar++){
+      SetRes_BGS(iVar,0.0);
+      SetRes_Max_BGS(iVar,0.0,0);
+  }
+
+  /*--- Set the residuals ---*/
+  for (iPoint = 0; iPoint < nPointDomain; iPoint++){
+      for (iVar = 0; iVar < nVar; iVar++){
+          residual = node[iPoint]->GetSolution(iVar) - node[iPoint]->Get_BGSSolution_k(iVar);
+          AddRes_BGS(iVar,residual*residual);
+          AddRes_Max_BGS(iVar,fabs(residual),geometry->node[iPoint]->GetGlobalIndex(),geometry->node[iPoint]->GetCoord());
+      }
+  }
+
+  SetResidual_BGS(geometry, config);
+
+}
+
+
+void CSolver::UpdateSolution_BGS(CGeometry *geometry, CConfig *config){
+
+  unsigned long iPoint;
+
+  /*--- To nPoint: The solution must be communicated beforehand ---*/
+  for (iPoint = 0; iPoint < nPoint; iPoint++){
+
+    node[iPoint]->Set_BGSSolution_k();
+
+  }
+
+}
+
+
 CBaselineSolver::CBaselineSolver(void) : CSolver() { }
 
 CBaselineSolver::CBaselineSolver(CGeometry *geometry, CConfig *config) {
diff --git a/SU2_CFD/src/variable_adjoint_discrete.cpp b/SU2_CFD/src/variable_adjoint_discrete.cpp
index 79de84bb7263..0a6ed33d30d7 100644
--- a/SU2_CFD/src/variable_adjoint_discrete.cpp
+++ b/SU2_CFD/src/variable_adjoint_discrete.cpp
@@ -98,7 +98,6 @@ CDiscAdjVariable::CDiscAdjVariable(su2double* val_solution, unsigned short val_n
   Solution_Geometry_Old = NULL;
   Cross_Term_Derivative = NULL;
   Solution_BGS            = NULL;
-  Solution_BGS_k          = NULL;
   Solution_Geometry_BGS_k = NULL;
   Geometry_CrossTerm_Derivative = NULL;
   Geometry_CrossTerm_Derivative_Flow = NULL;
@@ -110,7 +109,6 @@ CDiscAdjVariable::CDiscAdjVariable(su2double* val_solution, unsigned short val_n
     Geometry_CrossTerm_Derivative_Flow = new su2double[nDim];
     Cross_Term_Derivative   = new su2double[nVar];
     Solution_BGS            = new su2double[nVar];
-    Solution_BGS_k          = new su2double[nVar];
     Solution_Geometry_BGS_k = new su2double[nDim];
     for (iDim = 0; iDim < nDim; iDim++) {
       Geometry_Direct[iDim]       = 0.0;
@@ -123,7 +121,6 @@ CDiscAdjVariable::CDiscAdjVariable(su2double* val_solution, unsigned short val_n
     for (iVar = 0; iVar < nVar; iVar++) {
       Cross_Term_Derivative[iVar] = 0.0;
       Solution_BGS[iVar]          = 0.0;
-      Solution_BGS_k[iVar]        = 0.0;
     }
   }
 
diff --git a/SU2_CFD/src/variable_adjoint_elasticity.cpp b/SU2_CFD/src/variable_adjoint_elasticity.cpp
index ed4d67bce657..fbe18b926176 100644
--- a/SU2_CFD/src/variable_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/variable_adjoint_elasticity.cpp
@@ -66,7 +66,6 @@ CDiscAdjFEAVariable::CDiscAdjFEAVariable() : CVariable(){
   Geometry_CrossTerm_Derivative = NULL;
 
   Solution_BGS          = NULL;
-  Solution_BGS_k        = NULL;
 
 }
 
diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp
index 0f3e884233a3..fa2e7a6bf39f 100644
--- a/SU2_CFD/src/variable_direct_mean.cpp
+++ b/SU2_CFD/src/variable_direct_mean.cpp
@@ -64,7 +64,6 @@ CEulerVariable::CEulerVariable(void) : CVariable() {
   
   Solution_New = NULL;
 
-  Solution_BGS_k = NULL;
 }
 
 CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, su2double val_energy, unsigned short val_nDim,
@@ -231,16 +230,6 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
       Gradient_Secondary[iVar][iDim] = 0.0;
   }
 
-  Solution_BGS_k = NULL;
-  if (fsi || multizone){
-      Solution_BGS_k  = new su2double [nVar];
-      Solution[0] = val_density;
-      for (iDim = 0; iDim < nDim; iDim++) {
-        Solution_BGS_k[iDim+1] = val_density*val_velocity[iDim];
-      }
-      Solution_BGS_k[nVar-1] = val_density*val_energy;
-  }
-
 }
 
 CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim, unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
diff --git a/SU2_CFD/src/variable_direct_mean_inc.cpp b/SU2_CFD/src/variable_direct_mean_inc.cpp
index 30962f6428c2..573ec1017c81 100644
--- a/SU2_CFD/src/variable_direct_mean_inc.cpp
+++ b/SU2_CFD/src/variable_direct_mean_inc.cpp
@@ -54,8 +54,6 @@ CIncEulerVariable::CIncEulerVariable(void) : CVariable() {
   nSecondaryVarGrad = 0;
  
   Undivided_Laplacian = NULL;
-
-  Solution_BGS_k = NULL;
  
 }
 
@@ -176,16 +174,6 @@ CIncEulerVariable::CIncEulerVariable(su2double val_pressure, su2double *val_velo
   if (axisymmetric && viscous)
     Grad_AuxVar = new su2double[nDim];
 
-  Solution_BGS_k = NULL;
-  if (fsi || multizone){
-    Solution_BGS_k  = new su2double [nVar];
-    Solution_BGS_k[0] = val_pressure;
-    for (iDim = 0; iDim < nDim; iDim++) {
-      Solution_BGS_k[iDim+1] = val_velocity[iDim]*config->GetDensity_FreeStreamND();
-    }
-    Solution_BGS_k[nDim+1] = val_temperature;
-  }
-
 }
 
 CIncEulerVariable::CIncEulerVariable(su2double *val_solution, unsigned short val_nDim, unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
diff --git a/SU2_CFD/src/variable_structure.cpp b/SU2_CFD/src/variable_structure.cpp
index 7611c43b2422..062c00efd6c0 100644
--- a/SU2_CFD/src/variable_structure.cpp
+++ b/SU2_CFD/src/variable_structure.cpp
@@ -56,6 +56,7 @@ CVariable::CVariable(void) {
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
   
 }
 
@@ -76,6 +77,7 @@ CVariable::CVariable(unsigned short val_nvar, CConfig *config) {
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
 
   /*--- Initialize the number of solution variables. This version
    of the constructor will be used primarily for converting the
@@ -142,6 +144,10 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
 	  Solution_Adj_Old = new su2double [nVar];
 	}
   
+  if (config->GetMultizone_Problem()) {
+    Solution_BGS_k = new su2double [nVar];
+  }
+  
 }
 
 CVariable::~CVariable(void) {
@@ -160,6 +166,7 @@ CVariable::~CVariable(void) {
   if (Residual_Old        != NULL) delete [] Residual_Old;
   if (Residual_Sum        != NULL) delete [] Residual_Sum;
   if (Solution_Adj_Old    != NULL) delete [] Solution_Adj_Old;
+  if (Solution_BGS_k      != NULL) delete [] Solution_BGS_k;
   
   if (Gradient != NULL) {
     for (iVar = 0; iVar < nVar; iVar++)

From e5894d3c9de1a232de63f9672bc743fb7c9aa5c9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:45:28 +0100
Subject: [PATCH 078/539] Some modifications to the tableprinter

---
 Common/include/toolboxes/printing_toolbox.hpp | 35 ++++++++++----
 Common/src/config_structure.cpp               |  2 +-
 Common/src/geometry_structure.cpp             |  3 +-
 Common/src/toolboxes/printing_toolbox.cpp     | 48 +++++++++++++------
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 402094e6f439..a5224a03238d 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -11,12 +11,20 @@ class CTablePrinter{
 public:
   CTablePrinter(std::ostream * output, const std::string & separator = "|");
   ~CTablePrinter();
+  
+  enum alignment {
+    CENTER,
+    LEFT,
+    RIGHT
+  };
+  
   class endl{};
   int get_num_columns() const;
   int get_table_width() const;
   void set_separator(const std::string & separator);
-  void set_flush_left();
-  void set_flush_right();
+  void set_align(int align_);
+  void set_print_header_bottom_line(bool print);
+  void set_print_header_top_line(bool print);
 
   void AddColumn(const std::string & header_name, int column_width);
   void PrintHeader();
@@ -34,24 +42,34 @@ class CTablePrinter{
 //  TablePrinter& operator<<(double input);
 
   template<typename T> CTablePrinter& operator<<(T input){
+    std::stringstream ss;
+    
+    ss << input;
+    
+    int indent = 0;
+   
     if (j_ == 0)
       *out_stream_ << "|";
 
-    if(flush_left_)
+    if(align_ == LEFT)
       *out_stream_ << std::left;
-    else
+    else if (align_ == RIGHT)
       *out_stream_ << std::right; 
+    else if (align_ == CENTER) {
+      *out_stream_ << std::right;       
+      indent = (column_widths_.at(j_) - ss.str().size()) / 2;
+    }
 
     // Leave 3 extra space: One for negative sign, one for zero, one for decimal
-    *out_stream_ << std::setw(column_widths_.at(j_))
+    *out_stream_ << std::setw(column_widths_.at(j_) - indent)
                  << input;
 
     if (j_ == get_num_columns()-1){
-      *out_stream_ << "|\n";
+      *out_stream_ << std::setw(indent+2) << "|\n";
       i_ = i_ + 1;
       j_ = 0;
     } else {
-      *out_stream_ << separator_;
+      *out_stream_ << std::setw(indent+1) << separator_;
       j_ = j_ + 1;
     }
 
@@ -118,7 +136,8 @@ class CTablePrinter{
   int j_; // index of current column
 
   int table_width_;
-  bool flush_left_;
+  int align_;
+  bool print_header_top_line_, print_header_bottom_line_;
 };
 
 }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index b6c051a17e49..d3a21287ed59 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -5773,7 +5773,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
         MGTable.AddColumn("Presmooth",     10);
         MGTable.AddColumn("PostSmooth",    10);
         MGTable.AddColumn("CorrectSmooth", 10);
-        MGTable.set_flush_right();
+        MGTable.set_align(PrintingToolbox::CTablePrinter::RIGHT);
         MGTable.PrintHeader();
         for (unsigned short iLevel = 0; iLevel < nMGLevels+1; iLevel++) {
           MGTable << iLevel << MG_PreSmooth[iLevel] << MG_PostSmooth[iLevel] << MG_CorrecSmooth[iLevel];
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index e327f7d58110..a21357104f26 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -20862,7 +20862,8 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry ****geometry, CConfig **config_
       MGTable.AddColumn("CVs", 10);
       MGTable.AddColumn("Aggl. Rate", 10);
       MGTable.AddColumn("CFL", 10);
-      MGTable.set_flush_right();
+      MGTable.set_align(PrintingToolbox::CTablePrinter::RIGHT);
+      
       
       if (iMesh == 1){
         MGTable.PrintHeader();
diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
index fd952c7e7cb7..54747e145658 100644
--- a/Common/src/toolboxes/printing_toolbox.cpp
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -9,7 +9,9 @@ PrintingToolbox::CTablePrinter::CTablePrinter(std::ostream * output, const std::
   j_ = 0;
   separator_ = separator;
   table_width_ = 0;
-  flush_left_ = false;
+  print_header_bottom_line_ = true;
+  print_header_top_line_    = true;
+  align_ = RIGHT;
 }
 
 PrintingToolbox::CTablePrinter::~CTablePrinter(){
@@ -28,14 +30,19 @@ void PrintingToolbox::CTablePrinter::set_separator(const std::string &separator)
   separator_ = separator;
 }
 
-void PrintingToolbox::CTablePrinter::set_flush_left(){
-  flush_left_ = true;
+void PrintingToolbox::CTablePrinter::set_print_header_bottom_line(bool print){
+  print_header_bottom_line_ = print;
 }
 
-void PrintingToolbox::CTablePrinter::set_flush_right(){
-  flush_left_ = false;
+void PrintingToolbox::CTablePrinter::set_print_header_top_line(bool print){
+  print_header_top_line_ = print;
 }
 
+void PrintingToolbox::CTablePrinter::set_align(int align){
+  align_ = align;
+}
+
+
 /** \brief Add a column to our table
  ** 
  ** \param header_name Name to be print for the header
@@ -62,24 +69,37 @@ void PrintingToolbox::CTablePrinter::PrintHorizontalLine() {
 }
 
 void PrintingToolbox::CTablePrinter::PrintHeader(){
-  PrintHorizontalLine();
-  *out_stream_ << "|";
 
+  
+  
+  if (print_header_top_line_) PrintHorizontalLine();
+  *out_stream_ << "|";
+  int indent = 0;
   for (int i=0; i<get_num_columns(); ++i){
-
-    if(flush_left_)
+    
+    std::stringstream ss;
+    
+    ss << column_headers_.at(i).substr(0, column_widths_.at(i));
+    
+    indent = 0;
+
+    if(align_ == LEFT)
       *out_stream_ << std::left;
-    else
+    else if (align_ == RIGHT)
+      *out_stream_ << std::right; 
+    else if (align_ == CENTER) {
       *out_stream_ << std::right; 
+      indent = (column_widths_.at(i) - ss.str().size()) / 2;
+    }
 
-    *out_stream_ << std::setw(column_widths_.at(i)) << column_headers_.at(i).substr(0, column_widths_.at(i));
+    *out_stream_ << std::setw(column_widths_.at(i) - indent) << column_headers_.at(i).substr(0, column_widths_.at(i));
     if (i != get_num_columns()-1){
-      *out_stream_ << separator_;
+      *out_stream_ << std::setw(1+indent) << separator_;
     }
   }
 
-  *out_stream_ << "|\n";
-  PrintHorizontalLine();
+  *out_stream_ << std::setw(2+indent) << "|\n";
+  if (print_header_bottom_line_) PrintHorizontalLine();
 }
 
 void PrintingToolbox::CTablePrinter::PrintFooter(){

From 044a2dba8c395af8067097b4e5ee26f7535a0933 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:46:50 +0100
Subject: [PATCH 079/539] Added header for multizone problems

---
 SU2_CFD/include/output_structure.hpp     |  3 +++
 SU2_CFD/src/output_direct_elasticity.cpp |  4 ++++
 SU2_CFD/src/output_direct_heat.cpp       |  4 ++++
 SU2_CFD/src/output_direct_mean.cpp       |  6 +++++-
 SU2_CFD/src/output_direct_mean_inc.cpp   |  4 ++++
 SU2_CFD/src/output_structure.cpp         | 11 ++++++++++-
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 05cf3d30fb84..9a32dcbe2be5 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -284,6 +284,9 @@ class COutput {
   ofstream HistFile;
   
   PrintingToolbox::CTablePrinter* ConvergenceTable;
+  PrintingToolbox::CTablePrinter* MultiZoneHeaderTable;
+  
+  std::string MultiZoneHeaderString;
   
   std::map<string, su2double> Init_Residuals;
   
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 0d0f9f56459e..dbf1618f3459 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -47,6 +47,10 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   if (nonlinear_analysis) nVar_FEM = 3;
   
   nDim = geometry->GetnDim();
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Structure)";
+  MultiZoneHeaderString = ss.str();
 
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index d1ba93555f8a..23dbee0e387e 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -60,6 +60,10 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
     RequestedVolumeFields.push_back("PRIMITIVE");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Solid Heat)";
+  MultiZoneHeaderString = ss.str();
 }
 
 CHeatOutput::~CHeatOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 1e27a92ea297..de0f47164e81 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -90,7 +90,11 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
     RequestedVolumeFields.push_back("PRIMITIVE");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
-
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
+  MultiZoneHeaderString = ss.str();
+  
 }
 
 CFlowOutput::~CFlowOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index c6241eb08566..7dae15e190b0 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -99,6 +99,10 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
   
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Incomp. Fluid)";
+  MultiZoneHeaderString = ss.str();
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 7ff1aa222c77..c8fee9681b85 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -45,6 +45,7 @@ COutput::COutput(CConfig *config) {
   field_width = 12;
   
   ConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  MultiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
 
   unsigned short iDim, iZone, iSpan, iMarker;
   
@@ -10931,13 +10932,14 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
 }
 
 void COutput::SetScreen_Header(CConfig *config) {
+  if (config->GetMultizone_Problem()) 
+    MultiZoneHeaderTable->PrintHeader();
   ConvergenceTable->PrintHeader();
 }
 
 
 void COutput::SetScreen_Output(CConfig *config) {
   
-
   string RequestedField;
   
   for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
@@ -11051,6 +11053,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
         ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
       }
     }
+    
+    if (config->GetMultizone_Problem()){
+      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
+      MultiZoneHeaderTable->set_align(PrintingToolbox::CTablePrinter::CENTER);
+      MultiZoneHeaderTable->set_print_header_bottom_line(false);
+    }
+    
   }
   
 }

From c565db4467b933b6ca8e943799f0f98485baf783 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:47:57 +0100
Subject: [PATCH 080/539] Adapted and added output to FEA solver

---
 SU2_CFD/src/iteration_structure.cpp      |   4 +-
 SU2_CFD/src/output_direct_elasticity.cpp | 121 ++++++++++++++++++-----
 2 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index d742aef76d33..025461649b93 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1470,6 +1470,8 @@ void CFEAIteration::Iterate(COutput *output,
       /*----------------- If the solver is non-linear, we need to subiterate using a Newton-Raphson approach ----------------------*/
 
       for (IntIter = 1; IntIter < config_container[val_iZone]->GetDyn_nIntIter(); IntIter++) {
+        
+        config_container[val_iZone]->SetInnerIter(IntIter);
 
         /*--- Limits to only one structural iteration for the discrete adjoint FEM problem ---*/
         if (disc_adj_fem) break;
@@ -1820,7 +1822,7 @@ void CFEAIteration::Solve(COutput *output,
       surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
   /*--- Write the convergence history for the structure (only screen output) ---*/
-  if (multizone) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
+//  if (multizone) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
 
   /*--- Set the structural convergence to false (to make sure outer subiterations converge) ---*/
   integration_container[val_iZone][INST_0][FEA_SOL]->SetConvergence(false);
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index dbf1618f3459..d5752ea78795 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -47,6 +47,29 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   if (nonlinear_analysis) nVar_FEM = 3;
   
   nDim = geometry->GetnDim();
+
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  
+  if (nRequestedScreenFields == 0){
+    RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
+    RequestedScreenFields.push_back("RMS_UTOL");
+    RequestedScreenFields.push_back("RMS_RTOL");
+    RequestedScreenFields.push_back("VMS");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Structure)";
@@ -78,8 +101,8 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
   bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
   
   SetHistoryOutputValue("PHYS_TIME", timeused);
   
@@ -89,29 +112,66 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 
   
   if (linear_analysis){
-    SetHistoryOutputValue("UTOL", log10(fea_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("RTOL", log10(fea_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("ETOL", log10(fea_solver->GetRes_RMS(2)));    
+      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_RMS(2)));    
     }
-    SetHistoryOutputValue("DISP_X", log10(fea_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("DISP_Y", log10(fea_solver->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
+      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
     }
   } else if (nonlinear_analysis){
-    SetHistoryOutputValue("UTOL", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("RTOL", log10(fea_solver->GetRes_FEM(1)));
+    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("ETOL", log10(fea_solver->GetRes_FEM(2)));    
+      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));    
     }
-    SetHistoryOutputValue("DISP_X", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("DISP_Y", log10(fea_solver->GetRes_FEM(1)));
+    SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
+      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
     }
   }
   
+  if (linear_analysis){
+    SetHistoryOutputValue("MAX_UTOL", log10(fea_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_RTOL", log10(fea_solver->GetRes_Max(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("MAX_ETOL", log10(fea_solver->GetRes_Max(2)));    
+    }
+    SetHistoryOutputValue("MAX_DISP_X", log10(fea_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_DISP_Y", log10(fea_solver->GetRes_Max(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("MAX_DISP_Z", log10(fea_solver->GetRes_Max(2)));    
+    }
+  } else if (nonlinear_analysis){
+    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));    
+    }
+    SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_FEM(0)));
+    SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_FEM(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
+    }
+  }
+  
+  SetHistoryOutputValue("BGS_UTOL", log10(fea_solver->GetRes_BGS(0)));
+  SetHistoryOutputValue("BGS_RTOL", log10(fea_solver->GetRes_BGS(1)));
+  if (nVar_FEM == 3){
+    SetHistoryOutputValue("BGS_ETOL", log10(fea_solver->GetRes_BGS(2)));    
+  }
+  SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
+  SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
+  if (nVar_FEM == 3){
+    SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));    
+  }
+
+  
+  
   SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
   SetHistoryOutputValue("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
   SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
@@ -121,20 +181,35 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
-  
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
+
   // Misc.
   AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
-  AddHistoryOutput("UTOL",   "Res[U]", FORMAT_FIXED,  "RESIDUALS");
-  AddHistoryOutput("RTOL",   "Res[R]", FORMAT_FIXED,  "RESIDUALS");
-  AddHistoryOutput("ETOL",   "Res[E]", FORMAT_FIXED,  "RESIDUALS");
-  AddHistoryOutput("DISP_X", "Res[DispX]", FORMAT_FIXED,  "RESIDUALS");
-  AddHistoryOutput("DISP_Y", "Res[DispY]", FORMAT_FIXED,  "RESIDUALS");
-  AddHistoryOutput("DISP_Z", "Res[DispZ]", FORMAT_FIXED,  "RESIDUALS");
+  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  
+  AddHistoryOutput("MAX_UTOL",   "max[U]", FORMAT_FIXED,  "MAX_RES");
+  AddHistoryOutput("MAX_RTOL",   "max[R]", FORMAT_FIXED,  "MAX_RES");
+  AddHistoryOutput("MAX_ETOL",   "max[E]", FORMAT_FIXED,  "MAX_RES");
+  AddHistoryOutput("MAX_DISP_X", "max[DispX]", FORMAT_FIXED,  "MAX_RES");
+  AddHistoryOutput("MAX_DISP_Y", "max[DispY]", FORMAT_FIXED,  "MAX_RES");
+  AddHistoryOutput("MAX_DISP_Z", "max[DispZ]", FORMAT_FIXED,  "MAX_RES");
+  
+  AddHistoryOutput("BGS_UTOL",   "bgs[U]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_RTOL",   "bgs[R]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ETOL",   "bgs[E]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  
   
   
   AddHistoryOutput("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");

From 6a490e89756f08f16a7da479d408b8b8bcb76c27 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:51:19 +0100
Subject: [PATCH 081/539] Soem smaller fixes to output

---
 SU2_CFD/src/output_adjoint_discrete.cpp |  6 ++++--
 SU2_CFD/src/output_direct_heat.cpp      | 10 ++++++----
 SU2_CFD/src/output_direct_mean.cpp      | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 62e6fc349611..5c5dabdf0a9e 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -48,6 +48,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   if (nRequestedHistoryFields == 0){
     RequestedHistoryFields.push_back("EXT_ITER");
     RequestedHistoryFields.push_back("RMS_RES");
+    RequestedHistoryFields.push_back("SENSITIVITIES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
@@ -55,14 +56,15 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
     RequestedScreenFields.push_back("EXT_ITER");
     RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
     RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
-    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-Y");
+    RequestedScreenFields.push_back("SENS_GEO");
+    RequestedScreenFields.push_back("SENS_AOA");
     nRequestedScreenFields = RequestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("CONSERVATIVE");    
-    RequestedVolumeFields.push_back("SENSITIVITES");
+    RequestedVolumeFields.push_back("SENSITIVITIES");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
 }
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 23dbee0e387e..1366415c33b9 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -41,16 +41,18 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
 
   nDim = geometry->GetnDim();
 
+  multizone = config->GetMultizone_Problem();
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("EXT_ITER");    
+    RequestedScreenFields.push_back("OUTER_ITER");    
+    RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_TEMPERATURE");
     nRequestedScreenFields = RequestedScreenFields.size();
   }
@@ -87,7 +89,7 @@ bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime)
 bool CHeatOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0);
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -102,7 +104,7 @@ bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
     write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
   return write_output;
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index de0f47164e81..52779f1840b3 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -72,12 +72,13 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("EXT_ITER");
+    RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_DENSITY");
     RequestedScreenFields.push_back("RMS_MOMENTUM-X");
     RequestedScreenFields.push_back("RMS_MOMENTUM-Y");
@@ -113,9 +114,9 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
   /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
   /// END_GROUP
   
   /// DESCRIPTION: Currently used wall-clock time.
@@ -541,8 +542,8 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
   CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
   
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());  
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
   SetHistoryOutputValue("PHYS_TIME", timeused);
   
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
@@ -642,7 +643,7 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
 }
 
 bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
+ if (!write_dualtime && config->GetnInner_Iter() == config->GetInnerIter() - 1){
    return true;
  }
  else {
@@ -653,7 +654,7 @@ bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime)
 bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -668,7 +669,7 @@ bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
     write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
   return write_output;
 }

From 93cd48e704036c8b82d9ffed9e88ae6c4f55cf53 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:51:54 +0100
Subject: [PATCH 082/539] commenting some stuff to solver later

---
 SU2_CFD/src/driver_direct_multizone.cpp | 54 ++++++++++++-------------
 SU2_CFD/src/driver_structure.cpp        | 14 +++----
 SU2_CFD/src/iteration_structure.cpp     |  2 +-
 SU2_CFD/src/output_direct_mean_inc.cpp  | 18 ++++-----
 SU2_CFD/src/output_structure.cpp        |  8 ++--
 SU2_CFD/src/solver_structure.cpp        | 12 +++---
 6 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 6a112a1e5c4a..e0914b47f15f 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -419,33 +419,33 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
   }
 
   /*--- This still has to be generalised ---*/
-  if (fsi){
-
-    /*--- This should be possible to change dinamically in the config ---*/
-    if (rank == MASTER_NODE){
-
-      cout << endl << "-------------------------------------------------------------------------" << endl;
-      cout << endl;
-      cout << "Convergence summary for BGS iteration ";
-      cout << OuterIter << endl;
-      cout << endl;
-      /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
-      cout << "Iter[ID]" << "    BGSRes[Rho]" << "   BGSRes[RhoE]" << "     BGSRes[Ux]" << "     BGSRes[Uy]" << endl;
-      cout.precision(6); cout.setf(ios::fixed, ios::floatfield);
-      cout.width(8); cout << OuterIter*1000;
-      cout.width(15); cout << residual[ZONE_0][0];
-      cout.width(15); cout << residual[ZONE_0][3];
-      cout.width(15); cout << residual[ZONE_1][0];
-      cout.width(15); cout << residual[ZONE_1][1];
-      cout << endl;
-    }
-    for (iZone = 0; iZone < nZone; iZone++){
-      if (config_container[iZone]->GetKind_Solver() == FEM_ELASTICITY){
-        integration_container[iZone][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[iZone][INST_0][MESH_0], config_container[iZone], solver_container[iZone][INST_0][MESH_0][FEA_SOL], OuterIter);
-        Convergence = integration_container[iZone][INST_0][FEA_SOL]->GetConvergence_FSI();
-      }
-    }
-  }
+//  if (fsi){
+
+//    /*--- This should be possible to change dinamically in the config ---*/
+//    if (rank == MASTER_NODE){
+
+//      cout << endl << "-------------------------------------------------------------------------" << endl;
+//      cout << endl;
+//      cout << "Convergence summary for BGS iteration ";
+//      cout << OuterIter << endl;
+//      cout << endl;
+//      /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
+//      cout << "Iter[ID]" << "    BGSRes[Rho]" << "   BGSRes[RhoE]" << "     BGSRes[Ux]" << "     BGSRes[Uy]" << endl;
+//      cout.precision(6); cout.setf(ios::fixed, ios::floatfield);
+//      cout.width(8); cout << OuterIter*1000;
+//      cout.width(15); cout << residual[ZONE_0][0];
+//      cout.width(15); cout << residual[ZONE_0][3];
+//      cout.width(15); cout << residual[ZONE_1][0];
+//      cout.width(15); cout << residual[ZONE_1][1];
+//      cout << endl;
+//    }
+//    for (iZone = 0; iZone < nZone; iZone++){
+//      if (config_container[iZone]->GetKind_Solver() == FEM_ELASTICITY){
+//        integration_container[iZone][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[iZone][INST_0][MESH_0], config_container[iZone], solver_container[iZone][INST_0][MESH_0][FEA_SOL], OuterIter);
+//        Convergence = integration_container[iZone][INST_0][FEA_SOL]->GetConvergence_FSI();
+//      }
+//    }
+//  }
 
   /*--- Update the residual for the all the zones ---*/
   for (iZone = 0; iZone < nZone; iZone++){
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 80550d2f06b9..d27311edbc11 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3891,13 +3891,13 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   
   /*--- Update the convergence history file (serial and parallel computations). ---*/
   
-  if (!fsi) {
-    for (iZone = 0; iZone < nZone; iZone++) {
-      for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
-            config_container, integration_container, false, UsedTime, iZone, iInst);
-    }
-  }
+//  if (!fsi) {
+//    for (iZone = 0; iZone < nZone; iZone++) {
+//      for (iInst = 0; iInst < nInst[iZone]; iInst++)
+//        output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
+//            config_container, integration_container, false, UsedTime, iZone, iInst);
+//    }
+//  }
 
   /*--- Evaluate the new CFL number (adaptive). ---*/
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 025461649b93..10e25890b24d 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -759,7 +759,7 @@ bool CFluidIteration::Monitor(COutput *output,
 
   /*--- The logic is right now case dependent ----*/
   /*--- This needs to be generalized when the new output structure comes ---*/
-  output_history = (steady && !(multizone && (config_container[val_iZone]->GetnInner_Iter()==1)));
+  output_history = (steady);
 
   if (output_history) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, UsedTime, val_iZone, INST_0);
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 7dae15e190b0..b8e57b7ebb69 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -337,17 +337,17 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     
     
   }
-  if (heat){
-    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
-    SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
-    SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
-    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
-    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
+//  if (heat){
+//    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
+//    SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
+//    SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
+//    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
+//    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
     
-    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
-    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
+//    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
+//    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
 
-  }
+//  }
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index c8fee9681b85..9c7ed2d6eca4 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -11016,10 +11016,10 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
     
-    if(!(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), "EXT_ITER") != RequestedHistoryFields.end())) {
-      RequestedHistoryFields.push_back("EXT_ITER");
-      nRequestedHistoryFields++;
-    }
+//    if(!(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), "EXT_ITER") != RequestedHistoryFields.end())) {
+//      RequestedHistoryFields.push_back("EXT_ITER");
+//      nRequestedHistoryFields++;
+//    }
     
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index db56a7d2d281..3341aa00fd3d 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -306,9 +306,9 @@ void CSolver::SetResidual_BGS(CGeometry *geometry, CConfig *config) {
 
   for (iVar = 0; iVar < nVar; iVar++) {
 
-    if (GetRes_BGS(iVar) != GetRes_BGS(iVar)) {
-      SU2_MPI::Error("SU2 has diverged.", CURRENT_FUNCTION);
-    }
+//    if (GetRes_BGS(iVar) != GetRes_BGS(iVar)) {
+//      SU2_MPI::Error("SU2 has diverged.", CURRENT_FUNCTION);
+//    }
 
     SetRes_BGS(iVar, max(EPS*EPS, sqrt(GetRes_BGS(iVar)/geometry->GetnPoint())));
 
@@ -337,11 +337,11 @@ void CSolver::SetResidual_BGS(CGeometry *geometry, CConfig *config) {
 
   for (iVar = 0; iVar < nVar; iVar++) {
 
-    if (rbuf_residual[iVar] != rbuf_residual[iVar]) {
+//    if (rbuf_residual[iVar] != rbuf_residual[iVar]) {
 
-      SU2_MPI::Error("SU2 has diverged (NaN detected)", CURRENT_FUNCTION);
+//      SU2_MPI::Error("SU2 has diverged (NaN detected)", CURRENT_FUNCTION);
 
-    }
+//    }
 
     SetRes_BGS(iVar, max(EPS*EPS, sqrt(rbuf_residual[iVar]/Global_nPointDomain)));
 

From cbb6cb613905e5cb829995d19d384035b5572ec4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:52:21 +0100
Subject: [PATCH 083/539] Added bgs res to compr. solver

---
 SU2_CFD/src/output_direct_mean.cpp | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 52779f1840b3..231b72132015 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -160,6 +160,25 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);  
   /// END_GROUP
   
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// DESCRIPTION: Root-mean square residual of the density.
+  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum x-component.
+  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum y-component.
+  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum z-component.
+  AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the energy.
+  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
+  AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
+  AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
+  AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  /// END_GROUP
+  
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
   AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
@@ -588,6 +607,27 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   default: break;
   }
   
+  SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
+  SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
+  SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
+  if (nDim == 2)
+    SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(3)));
+  else {
+    SetHistoryOutputValue("BGS_MOMENTUM-Z", log10(flow_solver->GetRes_BGS(3)));
+    SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(4)));
+  }
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+    break;
+  default: break;
+  }
+  
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)

From a0b073e807c36c54130f17b34df14f4d48c66c2a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 11:52:42 +0100
Subject: [PATCH 084/539] Fixed table alignment

---
 SU2_CFD/src/solver_direct_mean.cpp     | 3 ++-
 SU2_CFD/src/solver_direct_mean_inc.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index f9113329a687..5fc5bf5739d1 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -3855,7 +3855,8 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     NonDimTable.AddColumn("Ref. value", 14);
     NonDimTable.AddColumn("Unit", 10);
     NonDimTable.AddColumn("Non-dim. value", 14);
-    NonDimTable.set_flush_right();
+    NonDimTable.set_align(PrintingToolbox::CTablePrinter::RIGHT);
+    
     NonDimTable.PrintHeader();
     
     if (viscous){
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index e2f2a48302cc..e509b2f5e87c 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -2030,7 +2030,8 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
     NonDimTable.AddColumn("Ref. value", 14);
     NonDimTable.AddColumn("Unit", 10);
     NonDimTable.AddColumn("Non-dim. value", 14);
-    NonDimTable.set_flush_right();
+    NonDimTable.set_align(PrintingToolbox::CTablePrinter::RIGHT);
+    
     NonDimTable.PrintHeader();
     
     if (viscous){

From aec530fc796239f67faf0a1a86e3e9aa53030892 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 17:39:32 +0100
Subject: [PATCH 085/539] Added volume output to elasticity solver

---
 SU2_CFD/include/output_structure.hpp     |  3 +
 SU2_CFD/src/output_direct_elasticity.cpp | 95 ++++++++++++++++++++----
 2 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4d1166b8d0c1..9d075725537f 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1230,6 +1230,9 @@ class CFEAOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
   
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
 
 };
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index d5752ea78795..2ec65915f776 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -65,8 +65,8 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");
-    RequestedVolumeFields.push_back("PRIMITIVE");
+    RequestedVolumeFields.push_back("DISPLACEMENT");
+    RequestedVolumeFields.push_back("STRESS");    
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
 
@@ -159,24 +159,25 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
     }
   }
   
-  SetHistoryOutputValue("BGS_UTOL", log10(fea_solver->GetRes_BGS(0)));
-  SetHistoryOutputValue("BGS_RTOL", log10(fea_solver->GetRes_BGS(1)));
-  if (nVar_FEM == 3){
-    SetHistoryOutputValue("BGS_ETOL", log10(fea_solver->GetRes_BGS(2)));    
-  }
-  SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
-  SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
-  if (nVar_FEM == 3){
-    SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));    
+  if (config[val_iZone]->GetMultizone_Problem()){
+    SetHistoryOutputValue("BGS_UTOL", log10(fea_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_RTOL", log10(fea_solver->GetRes_BGS(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("BGS_ETOL", log10(fea_solver->GetRes_BGS(2)));    
+    }
+    SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
+    if (nVar_FEM == 3){
+      SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));    
+    }
   }
-
   
   
   SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
   SetHistoryOutputValue("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
   SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
   
-}
+} 
 
 void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
@@ -218,6 +219,74 @@ void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
+void CFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+ 
+  CVariable* Node_Struc = solver[FEA_SOL]->node[iPoint]; 
+  CPoint*    Node_Geo  = geometry->node[iPoint];
+          
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputValue("DISPLACEMENT-X", iPoint, Node_Struc->GetSolution(0));
+  SetVolumeOutputValue("DISPLACEMENT-Y", iPoint, Node_Struc->GetSolution(1));
+  if (nDim == 3) SetVolumeOutputValue("DISPLACEMENT-Z", iPoint, Node_Struc->GetSolution(2));
+  
+  SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Struc->GetSolution_Vel(0));
+  SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Struc->GetSolution_Vel(1));
+  if (nDim == 3) SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Struc->GetSolution_Vel(2));
+  
+  SetVolumeOutputValue("ACCELERATION-X", iPoint, Node_Struc->GetSolution_Accel(0));
+  SetVolumeOutputValue("ACCELERATION-Y", iPoint, Node_Struc->GetSolution_Accel(1));
+  if (nDim == 3) SetVolumeOutputValue("ACCELERATION-Z", iPoint, Node_Struc->GetSolution_Accel(2));
+  
+  SetVolumeOutputValue("STRESS-XX", iPoint, Node_Struc->GetStress_FEM()[0]);
+  SetVolumeOutputValue("STRESS-YY", iPoint, Node_Struc->GetStress_FEM()[1]);
+  SetVolumeOutputValue("STRESS-YY", iPoint, Node_Struc->GetStress_FEM()[2]);
+  if (nDim == 3){
+    SetVolumeOutputValue("STRESS-ZZ", iPoint, Node_Struc->GetStress_FEM()[3]);
+    SetVolumeOutputValue("STRESS-XZ", iPoint, Node_Struc->GetStress_FEM()[4]);
+    SetVolumeOutputValue("STRESS-YZ", iPoint, Node_Struc->GetStress_FEM()[5]);
+  }
+  SetVolumeOutputValue("VON_MISES_STRESS", iPoint, Node_Struc->GetVonMises_Stress());
+  
+}
+
+void CFEAOutput::SetVolumeOutputFields(CConfig *config){
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+
+  AddVolumeOutput("DISPLACEMENT-X",    "Displacement_x", "DISPLACEMENT");
+  AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "DISPLACEMENT");
+  if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "DISPLACEMENT");
+  
+  AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY");
+  AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY");
+  if (nDim == 3) AddVolumeOutput("VELOCITY-Z", "Velocity_z", "VELOCITY");
+  
+  AddVolumeOutput("ACCELERATION-X",    "Acceleration_x", "ACCELERATION");
+  AddVolumeOutput("ACCELERATION-Y",    "Acceleration_y", "ACCELERATION");
+  if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "ACCELERATION");
+  
+  AddVolumeOutput("STRESS-XX",    "Sxx", "STRESS");
+  AddVolumeOutput("STRESS-YY",    "Syy", "STRESS");
+  AddVolumeOutput("STRESS-XY",    "Sxy", "STRESS");
+  
+  if (nDim == 3) {
+    AddVolumeOutput("STRESS-ZZ",    "Szz", "STRESS");
+    AddVolumeOutput("STRESS-XZ",    "Sxz", "STRESS");
+    AddVolumeOutput("STRESS-YZ",    "Syz", "STRESS");
+  }
+    
+  AddVolumeOutput("VON_MISES_STRESS", "Von_Mises_Stress", "STRESS");
+  
+}
+
 inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
 
 inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {  

From 05362cd7a3ee29e1defb00d0fccaef281ead45ae Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 17:39:59 +0100
Subject: [PATCH 086/539] Added check whether running multizone problem to BGS
 output

---
 SU2_CFD/src/output_direct_mean.cpp     | 40 ++++++++++++++------------
 SU2_CFD/src/output_direct_mean_inc.cpp | 32 ++++++++++-----------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 231b72132015..4cd941ee7522 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -607,25 +607,27 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   default: break;
   }
   
-  SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
-  SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
-  SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
-  if (nDim == 2)
-    SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(3)));
-  else {
-    SetHistoryOutputValue("BGS_MOMENTUM-Z", log10(flow_solver->GetRes_BGS(3)));
-    SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(4)));
-  }
-  
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
-    break;
-  default: break;
+  if (config[val_iZone]->GetMultizone_Problem()){    
+    SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
+    if (nDim == 2)
+      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(3)));
+    else {
+      SetHistoryOutputValue("BGS_MOMENTUM-Z", log10(flow_solver->GetRes_BGS(3)));
+      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(4)));
+    }
+    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+      break;
+    default: break;
+    }
   }
   
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index b8e57b7ebb69..07f12b2a34db 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -312,19 +312,21 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     break;
   }
   
-  SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
-  SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
-  SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
-  if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
- 
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
-    break;
+  if (config[val_iZone]->GetMultizone_Problem()){
+    SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
+    if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
+    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+      break;
+    }
   }
   
   if (weakly_coupled_heat){
@@ -333,9 +335,7 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
-    
-    
+    if (config[val_iZone]->GetMultizone_Problem()) {SetHistoryOutputValue("BGS_HEAT", log10(heat_solver->GetRes_BGS(0)));}
   }
 //  if (heat){
 //    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());

From 0adc9f58799666be14d3339fab5e4be26200bc31 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 5 Dec 2018 18:18:24 +0100
Subject: [PATCH 087/539] Fixed memory leaks

---
 SU2_CFD/src/variable_adjoint_discrete.cpp   | 1 -
 SU2_CFD/src/variable_adjoint_elasticity.cpp | 1 -
 SU2_CFD/src/variable_direct_elasticity.cpp  | 2 --
 SU2_CFD/src/variable_direct_heat.cpp        | 6 ------
 SU2_CFD/src/variable_direct_mean.cpp        | 2 --
 SU2_CFD/src/variable_direct_mean_inc.cpp    | 2 --
 SU2_CFD/src/variable_structure.cpp          | 3 +++
 7 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/variable_adjoint_discrete.cpp b/SU2_CFD/src/variable_adjoint_discrete.cpp
index 0a6ed33d30d7..624b25a5a395 100644
--- a/SU2_CFD/src/variable_adjoint_discrete.cpp
+++ b/SU2_CFD/src/variable_adjoint_discrete.cpp
@@ -135,7 +135,6 @@ CDiscAdjVariable::~CDiscAdjVariable() {
   if (Geometry_CrossTerm_Derivative != NULL) delete [] Geometry_CrossTerm_Derivative;
   if (Geometry_CrossTerm_Derivative_Flow != NULL) delete [] Geometry_CrossTerm_Derivative_Flow;
   if (Solution_BGS          != NULL) delete [] Solution_BGS;
-  if (Solution_BGS_k        != NULL) delete [] Solution_BGS_k;
   if (Solution_Geometry_BGS_k != NULL) delete [] Solution_Geometry_BGS_k;
 
   if (Solution_Direct != NULL) delete [] Solution_Direct;
diff --git a/SU2_CFD/src/variable_adjoint_elasticity.cpp b/SU2_CFD/src/variable_adjoint_elasticity.cpp
index fbe18b926176..6ce256470ef2 100644
--- a/SU2_CFD/src/variable_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/variable_adjoint_elasticity.cpp
@@ -245,7 +245,6 @@ CDiscAdjFEAVariable::~CDiscAdjFEAVariable(){
   if (Geometry_CrossTerm_Derivative    != NULL) delete [] Geometry_CrossTerm_Derivative;
 
   if (Solution_BGS             != NULL) delete [] Solution_BGS;
-  if (Solution_BGS_k           != NULL) delete [] Solution_BGS_k;
 
 }
 
diff --git a/SU2_CFD/src/variable_direct_elasticity.cpp b/SU2_CFD/src/variable_direct_elasticity.cpp
index d5b34bfdafb8..dbe1334b90a6 100644
--- a/SU2_CFD/src/variable_direct_elasticity.cpp
+++ b/SU2_CFD/src/variable_direct_elasticity.cpp
@@ -205,7 +205,5 @@ CFEAVariable::~CFEAVariable(void) {
 
   if (Prestretch            != NULL) delete [] Prestretch;
   
-  if (Solution_BGS_k        != NULL) delete [] Solution_BGS_k;
-
 
 }
diff --git a/SU2_CFD/src/variable_direct_heat.cpp b/SU2_CFD/src/variable_direct_heat.cpp
index f3443c3e8728..05b3a99b13e2 100644
--- a/SU2_CFD/src/variable_direct_heat.cpp
+++ b/SU2_CFD/src/variable_direct_heat.cpp
@@ -88,12 +88,6 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
     Undivided_Laplacian = new su2double [nVar];
   }
 
-  Solution_BGS_k = NULL;
-  if (multizone){
-      Solution_BGS_k  = new su2double [1];
-      Solution_BGS_k[0] = val_Heat;
-  }
-
 }
 
 CHeatFVMVariable::~CHeatFVMVariable(void) {  }
diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp
index fa2e7a6bf39f..585caf76e0b3 100644
--- a/SU2_CFD/src/variable_direct_mean.cpp
+++ b/SU2_CFD/src/variable_direct_mean.cpp
@@ -424,8 +424,6 @@ CEulerVariable::~CEulerVariable(void) {
 
   if (Solution_New != NULL) delete [] Solution_New;
   
-  if (Solution_BGS_k  != NULL) delete [] Solution_BGS_k;
-
 }
 
 void CEulerVariable::SetGradient_PrimitiveZero(unsigned short val_primvar) {
diff --git a/SU2_CFD/src/variable_direct_mean_inc.cpp b/SU2_CFD/src/variable_direct_mean_inc.cpp
index 573ec1017c81..97feb0357a35 100644
--- a/SU2_CFD/src/variable_direct_mean_inc.cpp
+++ b/SU2_CFD/src/variable_direct_mean_inc.cpp
@@ -309,8 +309,6 @@ CIncEulerVariable::~CIncEulerVariable(void) {
 
   if (Undivided_Laplacian != NULL) delete [] Undivided_Laplacian;
   
-  if (Solution_BGS_k  != NULL) delete [] Solution_BGS_k;
-
 }
 
 void CIncEulerVariable::SetGradient_PrimitiveZero(unsigned short val_primvar) {
diff --git a/SU2_CFD/src/variable_structure.cpp b/SU2_CFD/src/variable_structure.cpp
index 062c00efd6c0..c0441dca6a1d 100644
--- a/SU2_CFD/src/variable_structure.cpp
+++ b/SU2_CFD/src/variable_structure.cpp
@@ -146,6 +146,9 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
   
   if (config->GetMultizone_Problem()) {
     Solution_BGS_k = new su2double [nVar];
+    for (iVar = 0; iVar < nVar; iVar++) {
+      Solution_BGS_k[iVar] = 0.0;
+    }
   }
   
 }

From 573726b26bb3e49f7056dda39c93e0ba5f095bdc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 7 Dec 2018 14:43:55 +0100
Subject: [PATCH 088/539] Fixed multizone file output

---
 SU2_CFD/src/driver_direct_multizone.cpp | 138 ++++++++++++------------
 1 file changed, 71 insertions(+), 67 deletions(-)

diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 45845ff87c4f..956a2901ef46 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -516,82 +516,86 @@ void CMultizoneDriver::Update() {
 
 void CMultizoneDriver::Output(unsigned long TimeIter) {
 
-  bool output_files = false;
-
-  /*--- Determine whether a solution needs to be written
+  
+  for (iZone = 0; iZone < nZone; iZone++){
+    
+    bool output_files = false;
+    
+    /*--- Determine whether a solution needs to be written
    after the current iteration ---*/
-
-  if (
-
-      /*--- General if statements to print output statements ---*/
-
-      (TimeIter+1 >= config_container[ZONE_0]->GetnTime_Iter()) || (StopCalc) ||
-
-      /*--- Unsteady problems ---*/
-
-      (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
-       ((TimeIter == 0) || (ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
-       ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0) ||
-                           ((TimeIter-1) % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
-       ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-
-      ((config_container[ZONE_0]->GetDynamic_Analysis() == DYNAMIC) &&
-       ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-
-      /*--- No inlet profile file found. Print template. ---*/
-
-      (config_container[ZONE_0]->GetWrt_InletFile())
-
-      ) {
-
-    output_files = true;
-
-  }
-
-  /*--- Determine whether a solution doesn't need to be written
+    
+    if (
+        
+        /*--- General if statements to print output statements ---*/
+        
+        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter()) || (StopCalc) ||
+        
+        /*--- Unsteady problems ---*/
+        
+        (((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+          (config_container[iZone]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
+         ((TimeIter == 0) || (ExtIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
+        
+        ((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+         ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0) ||
+                              ((TimeIter-1) % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
+        
+        ((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+         ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
+        
+        ((config_container[iZone]->GetDynamic_Analysis() == DYNAMIC) &&
+         ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
+        
+        /*--- No inlet profile file found. Print template. ---*/
+        
+        (config_container[iZone]->GetWrt_InletFile())
+        
+        ) {
+      
+      output_files = true;
+      
+    }
+    
+    /*--- Determine whether a solution doesn't need to be written
    after the current iteration ---*/
-
-  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
-    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-    if (config_container[ZONE_0]->GetnExtIter() - 1 == ExtIter) output_files = true;
-  }
-
-  /*--- write the solution ---*/
-
-  if (output_files) {
-
-    /*--- Time the output for performance benchmarking. ---*/
+    
+    if (config_container[iZone]->GetFixed_CL_Mode()) {
+      if (config_container[iZone]->GetnExtIter()-config_container[iZone]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
+      if (config_container[iZone]->GetnExtIter() - 1 == ExtIter) output_files = true;
+    }
+    
+    /*--- write the solution ---*/
+    
+    if (output_files) {
+      
+      /*--- Time the output for performance benchmarking. ---*/
 #ifndef HAVE_MPI
-    StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+      StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
-    StopTime = MPI_Wtime();
+      StopTime = MPI_Wtime();
 #endif
-    UsedTimeCompute += StopTime-StartTime;
+      UsedTimeCompute += StopTime-StartTime;
 #ifndef HAVE_MPI
-    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+      StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
-    StartTime = MPI_Wtime();
+      StartTime = MPI_Wtime();
 #endif
-
-    if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
-
-    /*--- Execute the routine for writing restart, volume solution,
+      
+      if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
+      
+      /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
-
-    output[ZONE_0]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, ZONE_0, nZone);
-
-
-    /*--- Execute the routine for writing special output. ---*/
-   // output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
-
-
-    if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
-
+      
+      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, iZone, nZone);
+      
+      
+      /*--- Execute the routine for writing special output. ---*/
+      // output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
+      
+      
+      if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
+      
+    }
     /*--- Store output time and restart the timer for the compute phase. ---*/
 #ifndef HAVE_MPI
     StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);

From 29aab9ed9ec236a7a0453ba397fec9b82daf7559 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 7 Dec 2018 14:47:02 +0100
Subject: [PATCH 089/539] Bugfixes

---
 SU2_CFD/src/output_direct_heat.cpp | 2 +-
 SU2_CFD/src/output_structure.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 1366415c33b9..8201f49a5b8e 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -179,7 +179,7 @@ void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
  
   // Conservative
-  SetVolumeOutputValue("TEMPEATURE", iPoint, Node_Heat->GetSolution(0));
+  SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(0));
   
   // Residuals    
   SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[HEAT_SOL]->LinSysRes.GetBlock(iPoint, 0));
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 44a7e6c7e4e3..272a11fe3e7c 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -11002,8 +11002,8 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     
      /*--- Append the restart iteration: if dynamic problem and restart ---*/
     
-    if (config->GetWrt_Unsteady() && config->GetRestart()) {
-      long iExtIter = config->GetUnst_RestartIter();
+    if (config->GetTime_Domain() && config->GetRestart()) {
+      long iExtIter = config->GetRestart_Iter();
       if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));

From 29dac3578a9dcd33ce4c85905d55688017958537 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 4 Jan 2019 11:54:15 +0100
Subject: [PATCH 090/539] Added time iteration variable to config

---
 Common/include/config_structure.hpp      | 13 +++++++++++++
 Common/include/config_structure.inl      |  4 ++++
 SU2_CFD/src/driver_direct_multizone.cpp  |  7 +++++++
 SU2_CFD/src/driver_direct_singlezone.cpp |  4 ++++
 SU2_CFD/src/output_direct_elasticity.cpp |  2 ++
 SU2_CFD/src/output_direct_mean.cpp       |  3 +++
 SU2_CFD/src/variable_structure.cpp       |  1 +
 7 files changed, 34 insertions(+)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 599f8e9346fc..910fa8180194 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -397,6 +397,7 @@ class CConfig {
   unsigned long IntIter;			/*!< \brief Current internal iteration number. */
   unsigned long OuterIter;			/*!< \brief Current Outer Iteration for multizone problems. */
   unsigned long InnerIter;			/*!< \brief Current Outer Iteration for multizone problems. */
+  unsigned long TimeIter;			/*!< \brief Current Outer Iteration for multizone problems. */
   unsigned long Unst_nIntIter;			/*!< \brief Number of internal iterations (Dual time Method). */
   unsigned long Dyn_nIntIter;			/*!< \brief Number of internal iterations (Newton-Raphson Method for nonlinear structural analysis). */
   long Unst_RestartIter;			/*!< \brief Iteration number to restart an unsteady simulation (Dual time Method). */
@@ -3087,6 +3088,18 @@ class CConfig {
    */
   void SetInnerIter(unsigned long val_iter);
   
+  /*!
+   * \brief Set the current time iteration number.
+   * \param[in] val_iter - Current FSI iteration number.
+   */
+  void SetTimeIter(unsigned long val_iter);
+  
+  /*!
+   * \brief Get the current time iteration number.
+   * \param[in] val_iter - Current time iterationnumber.
+   */
+  unsigned long GetTimeIter();
+  
   /*!
    * \brief Set the current internal iteration number.
    * \param[in] val_iter - Current external iteration number.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 1dc804cb061c..7443fca99eb2 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -305,6 +305,8 @@ inline void CConfig::SetOuterIter(unsigned long val_iter) { OuterIter = val_iter
 
 inline void CConfig::SetInnerIter(unsigned long val_iter) { InnerIter = val_iter; }
 
+inline void CConfig::SetTimeIter(unsigned long val_iter) { TimeIter = val_iter; }
+
 inline void CConfig::SetIntIter(unsigned long val_iter) { IntIter = val_iter; }
 
 inline unsigned long CConfig::GetExtIter(void) { return ExtIter; }
@@ -315,6 +317,8 @@ inline unsigned long CConfig::GetOuterIter(void) { return OuterIter; }
 
 inline unsigned long CConfig::GetInnerIter(void) { return InnerIter; }
 
+inline unsigned long CConfig::GetTimeIter(void) { return TimeIter; }
+
 inline unsigned long CConfig::GetIntIter(void) { return IntIter; }
 
 inline unsigned long CConfig::GetUnst_nIntIter(void) { return Unst_nIntIter; }
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 956a2901ef46..4befcfec8dbe 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -201,12 +201,19 @@ void CMultizoneDriver::StartSolver() {
 void CMultizoneDriver::Preprocess(unsigned long TimeIter) {
 
   bool unsteady = driver_config->GetTime_Domain();
+  
+  
+  /*--- Set the current time iteration in the config ---*/
+  
+  driver_config->SetTimeIter(TimeIter);
 
   for (iZone = 0; iZone < nZone; iZone++){
 
     /*--- Set the value of the external iteration to TimeIter. -------------------------------------*/
     /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
     config_container[iZone]->SetExtIter(TimeIter);
+    config_container[iZone]->SetTimeIter(TimeIter);
+    
 
     /*--- Read the target pressure for inverse design. ---------------------------------------------*/
     /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index 4e736bbaedd0..9e13d51bb9d4 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -109,6 +109,10 @@ void CSinglezoneDriver::StartSolver() {
 }
 
 void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
+  
+  /*--- Set the current time iteration in the config ---*/
+  
+  config_container[ZONE_0]->SetTimeIter(TimeIter);
 
   /*--- Set the value of the external iteration to TimeIter. -------------------------------------*/
   /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 2ec65915f776..605b272c23c7 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -101,6 +101,7 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
   bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
 
+  SetHistoryOutputValue("TIME_ITER",  config[val_iZone]->GetTimeIter());    
   SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
   SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
   
@@ -182,6 +183,7 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
   AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
   AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 4cd941ee7522..c42d3683473e 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -113,6 +113,8 @@ CFlowOutput::~CFlowOutput(void) {
 void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
   /// DESCRIPTION: The internal iteration index.
   AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
   /// DESCRIPTION: The external iteration index.
@@ -561,6 +563,7 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
   CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
   
+  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
   SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
   SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
   SetHistoryOutputValue("PHYS_TIME", timeused);
diff --git a/SU2_CFD/src/variable_structure.cpp b/SU2_CFD/src/variable_structure.cpp
index c0441dca6a1d..c7c2dc4f7c83 100644
--- a/SU2_CFD/src/variable_structure.cpp
+++ b/SU2_CFD/src/variable_structure.cpp
@@ -112,6 +112,7 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
   
   /*--- Initializate the number of dimension and number of variables ---*/
   nDim = val_nDim;

From 44b0bbddb239fdda7baa2a0fc07bdd9a7750775f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 10 Jan 2019 15:09:09 +0100
Subject: [PATCH 091/539] Added CDiscAdjFlowIncOutput

---
 SU2_CFD/include/output_structure.hpp        |  65 +++
 SU2_CFD/obj/Makefile.am                     |   1 +
 SU2_CFD/src/driver_structure.cpp            |   6 +-
 SU2_CFD/src/output_adjoint_discrete.cpp     |  47 ++-
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 417 ++++++++++++++++++++
 5 files changed, 515 insertions(+), 21 deletions(-)
 create mode 100644 SU2_CFD/src/output_adjoint_discrete_inc.cpp

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 9f9a6f1970e7..ef9775ecc64f 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1422,6 +1422,71 @@ class CDiscAdjFlowOutput : public COutput {
 
 };
 
+
+/*! \class CDiscAdjFlowOutput
+ *  \brief Output class for flow discrete adjoint problems.
+ *  \author R. Sanchez.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFlowIncOutput : public COutput {
+private:
+
+  unsigned short nDim, turb_model;
+  
+public:
+
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFlowIncOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+
+};
+
 /*! \class CDiscAdjFEAOutput
  *  \brief Output class for elasticity discrete adjoint problems.
  *  \author R. Sanchez.
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 69e3036bf502..c2240f3a83c4 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -124,6 +124,7 @@ libSU2Core_sources = \
   ../src/output_direct_heat.cpp \
   ../src/output_adjoint_elasticity.cpp \
   ../src/output_adjoint_discrete.cpp \
+  ../src/output_adjoint_discrete_inc.cpp \
   ../src/output_adjoint_mean.cpp \
   ../src/output_driver.cpp \
   ../src/python_wrapper_structure.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index ebb65e6d51dc..0331b8d9c383 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3669,7 +3669,11 @@ void CDriver::Output_Preprocessing(){
     case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint Euler/Navier-Stokes/RANS output structure." << endl;
-      output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE){      
+        output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      } else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE){
+        output[iZone] = new CDiscAdjFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      }
       break;
 
     case DISC_ADJ_FEM:
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 5c5dabdf0a9e..912d52330b39 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -67,6 +67,11 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
     RequestedVolumeFields.push_back("SENSITIVITIES");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Discrete Adjoint)";
+  MultiZoneHeaderString = ss.str();
+  
 }
 
 CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
@@ -80,10 +85,12 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
   /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
   /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
   /// END_GROUP
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
@@ -316,49 +323,49 @@ void CDiscAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CS
   if (nDim == 3)
     SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
   
-  SetVolumeOutputValue("ADJOINT_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
-  SetVolumeOutputValue("ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
-  SetVolumeOutputValue("ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
+  SetVolumeOutputValue("ADJ_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
+  SetVolumeOutputValue("ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
+  SetVolumeOutputValue("ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
   if (nDim == 3){
-    SetVolumeOutputValue("ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
-    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+    SetVolumeOutputValue("ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
+    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
   } else {
-    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
+    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
   }
   
   // Turbulent 
   switch(turb_model){
   case SST:
-    SetVolumeOutputValue("ADJOINT_ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
-    SetVolumeOutputValue("ADJOINT_ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+    SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+    SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+    SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
     break;
   case NONE:
     break;
   }
   
   // Residuals
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_DENSITY", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
+  SetVolumeOutputValue("RES_ADJ_DENSITY", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
+  SetVolumeOutputValue("RES_ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
+  SetVolumeOutputValue("RES_ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
   if (nDim == 3){
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetSolution(4) - Node_AdjFlow->GetSolution_Old(4));
+    SetVolumeOutputValue("RES_ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
+    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(4) - Node_AdjFlow->GetSolution_Old(4));
   } else {
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
+    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+    SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
     break;
   case NONE:
     break;
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
new file mode 100644
index 000000000000..205e58f4a842
--- /dev/null
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -0,0 +1,417 @@
+/*!
+ * \file output_adjoint_mean.cpp
+ * \brief Main subroutines for flow discrete adjoint output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure.hpp"
+
+CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+  
+  nDim = geometry->GetnDim();
+ 
+  turb_model = config->GetKind_Turb_Model();
+  
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    RequestedHistoryFields.push_back("SENSITIVITIES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  
+  if (nRequestedScreenFields == 0){
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");    
+    RequestedScreenFields.push_back("RMS_ADJ_PRESSURE");
+    RequestedScreenFields.push_back("RMS_ADJ_VELOCITY-X");
+    RequestedScreenFields.push_back("SENS_GEO");
+    RequestedScreenFields.push_back("SENS_AOA");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("CONSERVATIVE");    
+    RequestedVolumeFields.push_back("SENSITIVITIES");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Discrete Adjoint)";
+  MultiZoneHeaderString = ss.str();
+  
+}
+
+CDiscAdjFlowIncOutput::~CDiscAdjFlowIncOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+}
+
+void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
+
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The internal iteration index.
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The external iteration index.
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
+  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Root-mean square residual of the adjoint Velocity x-component.
+  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint Velocity y-component.
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint energy.
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
+    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+    break;  
+  case SST:
+    /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
+    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+    /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
+    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+    break;
+  default: break;
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// DESCRIPTION: Maximum residual of the adjoint Pressure.
+  AddHistoryOutput("MAX_ADJ_Pressure",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
+  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint Velocity y-component
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint Velocity z-component
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
+    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+    break;  
+  case SST:
+    /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
+    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+    /// DESCRIPTION: Maximum residual of the adjoint dissipation.
+    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+    break;
+  default: break;
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SENSITIVITIES, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+  
+}
+
+void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+  
+  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter()); 
+  
+  SetHistoryOutputValue("RMS_ADJ_PRESSURE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_ADJ_VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_ADJ_VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  if (nDim == 3) {
+    SetHistoryOutputValue("RMS_ADJ_VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+  }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    break;
+  default: break;
+  }
+  SetHistoryOutputValue("MAX_ADJ_Pressure", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_ADJ_VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_ADJ_VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(2)));
+  if (nDim == 3) {
+    SetHistoryOutputValue("MAX_ADJ_VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));
+  }
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(1)));
+    break;
+  default: break;
+  }
+  SetHistoryOutputValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
+  SetHistoryOutputValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
+  SetHistoryOutputValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
+  SetHistoryOutputValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetHistoryOutputValue("PHYS_TIME", timeused);
+
+}
+
+void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
+  
+  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
+  /// DESCRIPTION: x coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
+  /// DESCRIPTION: y coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    /// DESCRIPTION: z coordinates of the mesh nodes.
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
+  /// DESCRIPTION: Adjoint Pressure.
+  AddVolumeOutput("ADJ_PRESSURE",    "Adjoint_Pressure",    "CONSERVATIVE"); 
+  /// DESCRIPTION: Adjoint Velocity x-component.
+  AddVolumeOutput("ADJ_VELOCITY-X", "Adjoint_Velocity_x", "CONSERVATIVE"); 
+  /// DESCRIPTION: Adjoint Velocity y-component.
+  AddVolumeOutput("ADJ_VELOCITY-Y", "Adjoint_Velocity_y", "CONSERVATIVE"); 
+  if (nDim == 3)
+    /// DESCRIPTION: Adjoint Velocity z-component.
+    AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "CONSERVATIVE"); 
+ 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Adjoint nu tilde.
+    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE"); 
+    break;  
+  case SST:
+    /// DESCRIPTION: Adjoint kinetic energy.
+    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE"); 
+    /// DESCRIPTION: Adjoint dissipation.
+    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");  
+    break;
+  default: break;
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
+  if (config->GetGrid_Movement()){
+    /// DESCRIPTION: Grid velocity x-component.
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
+    /// DESCRIPTION: Grid velocity y-component.
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
+    if (nDim == 3)    
+      /// DESCRIPTION: Grid velocity z-component.
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
+  /// DESCRIPTION: Residual of the adjoint Pressure.
+  AddVolumeOutput("RES_ADJ_PRESSURE",    "Residual_Adjoint_Pressure",    "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint Velocity x-component.
+  AddVolumeOutput("RES_ADJ_VELOCITY-X", "Residual_Adjoint_Velocity_x", "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint Velocity y-component.
+  AddVolumeOutput("RES_ADJ_VELOCITY-Y", "Residual_Adjoint_Velocity_y", "RESIDUAL");  
+  if (nDim == 3)
+    /// DESCRIPTION: Residual of the adjoint Velocity z-component.
+    AddVolumeOutput("RES_ADJ_Velocity-Z", "Residual_Adjoint_Velocity_z", "RESIDUAL"); 
+  /// DESCRIPTION: Residual of the adjoint energy. 
+  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Residual of the nu tilde. 
+    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+    break;  
+  case SST:
+    /// DESCRIPTION: Residual of the adjoint kinetic energy. 
+    AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+    /// DESCRIPTION: Residual of the adjoint dissipation.
+    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+    break;
+  default: break;
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
+  /// DESCRIPTION: Sensitivity x-component.
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  /// DESCRIPTION: Sensitivity y-component.
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  if (nDim == 3)
+    /// DESCRIPTION: Sensitivity z-component.
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+  /// DESCRIPTION: Sensitivity in normal direction.
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  /// END_GROUP
+ 
+}
+
+void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
+  CVariable* Node_AdjTurb = NULL;
+  CPoint*    Node_Geo     = geometry->node[iPoint];
+  
+  if (config->GetKind_Turb_Model() != NONE){
+    Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
+  }
+  
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputValue("ADJ_PRESSURE",    iPoint, Node_AdjFlow->GetSolution(0));
+  SetVolumeOutputValue("ADJ_VELOCITY-X", iPoint, Node_AdjFlow->GetSolution(1));
+  SetVolumeOutputValue("ADJ_VELOCITY-Y", iPoint, Node_AdjFlow->GetSolution(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("ADJ_VELOCITY-Z", iPoint, Node_AdjFlow->GetSolution(3));
+    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+  }
+  // Turbulent 
+  switch(turb_model){
+  case SST:
+    SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+    SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Residuals
+  SetVolumeOutputValue("RES_ADJ_PRESSURE", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
+  SetVolumeOutputValue("RES_ADJ_VELOCITY-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
+  SetVolumeOutputValue("RES_ADJ_VELOCITY-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
+  if (nDim == 3){
+    SetVolumeOutputValue("RES_ADJ_VELOCITY-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
+  } 
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+    break;
+  case NONE:
+    break;
+  }
+  
+  SetVolumeOutputValue("SENSITIVITY_X", iPoint, Node_AdjFlow->GetSensitivity(0));
+  SetVolumeOutputValue("SENSITIVITY_Y", iPoint, Node_AdjFlow->GetSensitivity(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("SENSITIVITY_Z", iPoint, Node_AdjFlow->GetSensitivity(2));
+  
+}
+
+void CDiscAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
+  
+}
+
+bool CDiscAdjFlowIncOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
+}
+
+bool CDiscAdjFlowIncOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
+  return write_header;
+}
+
+bool CDiscAdjFlowIncOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
+      && write_dualtime ){
+    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+  } 
+  return write_output;
+}
+
+bool CDiscAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CDiscAdjFlowIncOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
+}
+

From 69de14682fe6f4b82931844c622351217d7094e2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 11 Jan 2019 10:20:50 +0100
Subject: [PATCH 092/539] Added adj. heat output to disc, adj. output

---
 SU2_CFD/include/output_structure.hpp        |  1 +
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 75 ++++++++++++++-------
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index ef9775ecc64f..db15e096daf4 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1432,6 +1432,7 @@ class CDiscAdjFlowIncOutput : public COutput {
 private:
 
   unsigned short nDim, turb_model;
+  bool heat, weakly_coupled_heat;
   
 public:
 
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index 205e58f4a842..1d03a4d854e3 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -43,6 +43,10 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
  
   turb_model = config->GetKind_Turb_Model();
   
+  heat = config->GetEnergy_Equation();
+  
+  weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+  
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
@@ -103,8 +107,8 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
   AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the adjoint energy.
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the temperature.
+  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
@@ -122,13 +126,15 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_Pressure",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
   AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity y-component
   AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity z-component
   AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the temperature.
+  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
@@ -144,6 +150,7 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
+  
   /// BEGIN_GROUP: SENSITIVITIES, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
   AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
@@ -165,47 +172,66 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
   
+  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
+  CSolver* adjheat_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJHEAT_SOL];
+  
   SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
   SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
   SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter()); 
   
-  SetHistoryOutputValue("RMS_ADJ_PRESSURE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputValue("RMS_ADJ_VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetHistoryOutputValue("RMS_ADJ_VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputValue("RMS_ADJ_PRESSURE", log10(adjflow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_ADJ_VELOCITY-Y", log10(adjflow_solver->GetRes_RMS(2)));
   if (nDim == 3) {
-    SetHistoryOutputValue("RMS_ADJ_VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ADJ_VELOCITY-Z", log10(adjflow_solver->GetRes_RMS(3)));
+  }
+  if (weakly_coupled_heat){
+    SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjheat_solver->GetRes_RMS(0)));
+  }
+  if (heat){
+    if (nDim == 3) SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(3)));
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
     break;
   default: break;
   }
-  SetHistoryOutputValue("MAX_ADJ_Pressure", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(0)));
-  SetHistoryOutputValue("MAX_ADJ_VELOCITY-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(1)));
-  SetHistoryOutputValue("MAX_ADJ_VELOCITY-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(2)));
+  SetHistoryOutputValue("MAX_ADJ_PRESSURE", log10(adjflow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_ADJ_VELOCITY-Y", log10(adjflow_solver->GetRes_Max(2)));
   if (nDim == 3) {
-    SetHistoryOutputValue("MAX_ADJ_VELOCITY-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ADJ_VELOCITY-Z", log10(adjflow_solver->GetRes_Max(3)));
+  }
+  if (weakly_coupled_heat){
+    SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjheat_solver->GetRes_Max(0)));
+  }
+  if (heat){
+    if (nDim == 3) SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(4)));
+    else           SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(3)));
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(1)));
+    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
     break;
   default: break;
   }
-  SetHistoryOutputValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
-  SetHistoryOutputValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
-  SetHistoryOutputValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
-  SetHistoryOutputValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  
+  SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
+  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
+  SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
+  SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
   SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
@@ -233,6 +259,7 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     /// DESCRIPTION: Adjoint Velocity z-component.
     AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "CONSERVATIVE"); 
  
+  AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "CONSERVATIVE");
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Adjoint nu tilde.
@@ -382,7 +409,7 @@ bool CDiscAdjFlowIncOutput::WriteHistoryFile_Output(CConfig *config, bool write_
 bool CDiscAdjFlowIncOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -397,7 +424,7 @@ bool CDiscAdjFlowIncOutput::WriteScreen_Output(CConfig *config, bool write_dualt
     write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
   return write_output;
 }

From 4d4d66bb1b37bc919f5aeaf5fd56c933855a0306 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 11 Jan 2019 14:28:20 +0100
Subject: [PATCH 093/539] Some fixes

---
 SU2_CFD/src/output_adjoint_discrete.cpp     | 51 +++++++++++----------
 SU2_CFD/src/output_adjoint_discrete_inc.cpp |  2 +-
 SU2_CFD/src/output_direct_mean.cpp          |  4 +-
 SU2_CFD/src/output_direct_mean_inc.cpp      | 18 ++++----
 SU2_CFD/src/output_structure.cpp            |  2 +-
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 912d52330b39..e361cc5860e9 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -69,7 +69,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   }
   
   stringstream ss;
-  ss << "Zone " << config->GetiZone() << " (Discrete Adjoint)";
+  ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
 }
@@ -165,53 +165,56 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
 void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+ 
+  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
 
   SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
   
-  SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1)));
-  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(2)));
+  SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));
-    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(4)));
+    SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
   } else {
-    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(3)));    
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(0)));
-    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_RMS(1)));
+    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
     break;
   default: break;
   }
-  SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(0)));
-  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(1)));
-  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(2)));
+  SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_Max(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));
-    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(4)));
+    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(4)));
   } else {
-    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_Max(3)));    
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->GetRes_Max(1)));
+    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
     break;
   default: break;
   }
-  SetHistoryOutputValue("SENS_GEO", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_AoA());
-  SetHistoryOutputValue("SENS_MACH", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Mach());
-  SetHistoryOutputValue("SENS_PRESS", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Press());
-  SetHistoryOutputValue("SENS_TEMP", solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetTotal_Sens_Temp());
+  SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
+  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
+  SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
+  SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
   SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index 1d03a4d854e3..b93fce591d4c 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -74,7 +74,7 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   }
   
   stringstream ss;
-  ss << "Zone " << config->GetiZone() << " (Discrete Adjoint)";
+  ss << "Zone " << config->GetiZone() << " (Adj. Incomp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 1681e088882e..e4c070d9b809 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -115,9 +115,9 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
   AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
+  /// DESCRIPTION: The outer iteration index.
   AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
+  /// DESCRIPTION: The inner iteration index.
   AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
   /// END_GROUP
   
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 40fd861ca1f0..1790b538fa65 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -385,17 +385,17 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
     if (config[val_iZone]->GetMultizone_Problem()) {SetHistoryOutputValue("BGS_HEAT", log10(heat_solver->GetRes_BGS(0)));}
   }
-//  if (heat){
-//    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
-//    SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
-//    SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
-//    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
-//    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
+  if (heat){
+    SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
+    SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
+    SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
+    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
     
-//    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
-//    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
+    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
+    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
 
-//  }
+  }
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index cb2fa566cacb..b8280d1cf405 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -11022,7 +11022,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
         (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
     else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
              (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW)  SPRINTF (buffer, ".csv");
+    else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
     
 //    if(!(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), "EXT_ITER") != RequestedHistoryFields.end())) {

From 6078c4fc5a380231459ee19c219aa15409b0d30e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 11 Jan 2019 14:28:40 +0100
Subject: [PATCH 094/539] Fix for multizone in SU2_DOT

---
 SU2_DOT/src/SU2_DOT.cpp | 44 +++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 9ed48d30d52d..75fcfda08565 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -47,7 +47,8 @@ int main(int argc, char *argv[]) {
   ofstream Gradient_file;
   bool fem_solver = false;
   bool periodic   = false;
-
+  bool multizone = false;
+  
   su2double** Gradient;
   unsigned short iDV, iDV_Value;
   int rank, size;
@@ -71,6 +72,7 @@ int main(int argc, char *argv[]) {
   CSurfaceMovement **surface_movement   = NULL;
   CVolumetricMovement **grid_movement   = NULL;
   COutput *output                       = NULL;
+  CConfig *driver_config                = NULL;  
   unsigned short *nInst                 = NULL;
 
   /*--- Load in the number of zones and spatial dimensions in the mesh file (if no config
@@ -95,6 +97,7 @@ int main(int argc, char *argv[]) {
   geometry_container  = new CGeometry**[nZone];
   surface_movement    = new CSurfaceMovement*[nZone];
   grid_movement       = new CVolumetricMovement*[nZone];
+  
   nInst               = new unsigned short[nZone];
   
   for (iZone = 0; iZone < nZone; iZone++) {
@@ -105,21 +108,50 @@ int main(int argc, char *argv[]) {
     nInst[iZone]                  = 1;
   }
   
+  /*--- Initialize the configuration of the driver ---*/
+  driver_config = new CConfig(config_file_name, SU2_CFD, ZONE_0, nZone, 0, VERB_NONE);
+
+  /*--- Initialize a char to store the zone filename ---*/
+  char zone_file_name[MAX_STRING_SIZE];
+
+  /*--- Store a boolean for multizone problems ---*/
+  multizone = (driver_config->GetKind_Solver() == MULTIZONE);
+
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
    differential equation on a single block, unstructured mesh. ---*/
-  
+
   for (iZone = 0; iZone < nZone; iZone++) {
-    
+
     /*--- Definition of the configuration option class for all zones. In this
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
-    
-    config_container[iZone] = new CConfig(config_file_name, SU2_DOT, iZone, nZone, 0, VERB_HIGH);
 
-    /*--- Set the MPI communicator ---*/
+    if (multizone){
+      strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
+      config_container[iZone] = new CConfig(zone_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+    }
+    else{
+      config_container[iZone] = new CConfig(config_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+    }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
 
+  }
+  
+  /*--- Set the multizone part of the problem. ---*/
+  if (driver_config->GetKind_Solver() == MULTIZONE){
+    for (iZone = 0; iZone < nZone; iZone++) {
+      /*--- Set the interface markers for multizone ---*/
+      config_container[iZone]->SetMultizone(driver_config, config_container);
+    }
+  }
+  
+  /*--- Loop over all zones to initialize the various classes. In most
+   cases, nZone is equal to one. This represents the solution of a partial
+   differential equation on a single block, unstructured mesh. ---*/
+  
+  for (iZone = 0; iZone < nZone; iZone++) {
+
     /*--- Determine whether or not the FEM solver is used, which decides the
      type of geometry classes that are instantiated. ---*/
     fem_solver = ((config_container[iZone]->GetKind_Solver() == FEM_EULER)          ||

From 1e6d5a081742f2953bb7f7da68f2774d87ca9a22 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 16 Jan 2019 14:39:29 +0100
Subject: [PATCH 095/539] Some bugfixes

---
 Common/src/config_structure.cpp         |  2 +-
 SU2_CFD/src/driver_direct_multizone.cpp |  3 ++-
 SU2_CFD/src/output_direct_mean.cpp      |  7 ++++---
 SU2_CFD/src/output_direct_mean_inc.cpp  |  5 ++---
 SU2_CFD/src/output_structure.cpp        | 21 ++++++++++++++-------
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 3c856acf0034..fa631ca544b7 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -6263,7 +6263,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
   if (nMarker_Euler != 0) {   
     BoundaryTable << "Euler wall";
     for (iMarker_Euler = 0; iMarker_Euler < nMarker_Euler; iMarker_Euler++) {
-      BoundaryTable << Marker_Euler[iMarker_Euler] << " ";
+      BoundaryTable << Marker_Euler[iMarker_Euler];
       if (iMarker_Euler < nMarker_Euler-1)  BoundaryTable << " ";
     }
     BoundaryTable.PrintFooter();
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 4befcfec8dbe..093cb0d3c77a 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -535,8 +535,9 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         
         /*--- General if statements to print output statements ---*/
         
-        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter()) || (StopCalc) ||
+        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter() && config_container[iZone]->GetTime_Domain()) || (StopCalc) ||
         
+        (config_container[iZone]->GetOuterIter() % config_container[iZone]->GetWrt_Sol_Freq() == 0) ||
         /*--- Unsteady problems ---*/
         
         (((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index e4c070d9b809..4e6f10dd56d5 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -77,6 +77,7 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
+    if (config->GetTime_Domain()) RequestedHistoryFields.push_back("TIME_ITER");    
     if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_DENSITY");
@@ -688,7 +689,7 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
 }
 
 bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime && config->GetnInner_Iter() == config->GetInnerIter() - 1){
+ if (!write_dualtime){
    return true;
  }
  else {
@@ -699,7 +700,7 @@ bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime)
 bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
+    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -711,7 +712,7 @@ bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   
   if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
       && write_dualtime ){
-    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
     write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 1790b538fa65..24eeafe3a0e5 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -467,7 +467,8 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("VELOCITY-Y", "Velocity_y", "CONSERVATIVE");
   if (nDim == 3)
     AddVolumeOutput("VELOCITY-Z", "Velocity_z", "CONSERVATIVE");
-  AddVolumeOutput("TEMPERATURE",  "Temperature","CONSERVATIVE");  
+  if (config->GetEnergy_Equation())
+    AddVolumeOutput("TEMPERATURE",  "Temperature","CONSERVATIVE");  
   
   switch(config->GetKind_Turb_Model()){
   case SST:
@@ -491,7 +492,6 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   }
   
   // Primitive variables
-  AddVolumeOutput("MACH",           "Mach",                 "PRIMITIVE");
   AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
   AddVolumeOutput("DENSITY",        "Density",              "PRIMITIVE");
   
@@ -625,7 +625,6 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
       SetVolumeOutputValue("GRID_VELOCITY-Z", iPoint, Node_Geo->GetGridVel()[2]);
   }
   
-  SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
   SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
   SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetDensity());
   
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index b8280d1cf405..ad7c17db5560 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -11075,13 +11075,18 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
-  /*--- Make sure that coordinates are always in the volume output --- */
+  /*--- Make sure that coordinates and conservative variables are always in the volume output --- */
   
   if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
     RequestedVolumeFields.push_back("COORDINATES");
     nRequestedVolumeFields++;
   }
   
+  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "CONSERVATIVE") != RequestedVolumeFields.end())) {
+    RequestedVolumeFields.push_back("CONSERVATIVE");
+    nRequestedVolumeFields++;
+  }
+  
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);
@@ -11116,14 +11121,16 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
         
         found_field[iReqField] = true;
       }
-    }
-    
-    
-//    if ((std::find(found_field.begin(), found_field.end(), false) != found_field.end())){
-////      SU2_MPI::Error(string("There is no volume output field/group with name ") + std::find(found_field.begin(), found_field.end(), false) + string(" defined in the current solver."), CURRENT_FUNCTION);
-//    }
+    }    
   }
   
+  /*--- Check if all requested fields were found ---*/
+  
+  for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
+    if (!found_field[iReqField]){
+      SU2_MPI::Error(string("There is no volume output field/group with name ") + RequestedVolumeFields[iReqField] + string(" defined in the current solver."), CURRENT_FUNCTION);
+    }
+  }
   
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/

From b9b26e13b24e84df206974585dae8504a3804260 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 16 Jan 2019 14:40:22 +0100
Subject: [PATCH 096/539] Added legacy output

---
 SU2_CFD/include/output_structure.hpp |   5 ++
 SU2_CFD/include/output_structure.inl |   4 +-
 SU2_CFD/obj/Makefile.am              |   3 +
 SU2_CFD/src/driver_structure.cpp     | 115 ++++++++++++++++++---------
 SU2_CFD/src/iteration_structure.cpp  |  19 ++---
 SU2_CFD/src/output_physics.cpp       |   4 +-
 SU2_CFD/src/output_structure.cpp     |   7 +-
 7 files changed, 102 insertions(+), 55 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index db15e096daf4..4295b58a97b1 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -60,6 +60,7 @@
 
 #include "../../Common/include/toolboxes/printing_toolbox.hpp"
 #include "../../Common/include/toolboxes/signal_processing_toolbox.hpp"
+#include "../include/output_structure_legacy.hpp"
 
 using namespace std;
 
@@ -72,6 +73,8 @@ using namespace std;
 class COutput {
 
 protected:
+  
+  COutputLegacy *output_legacy;
 
   unsigned long nGlobal_Poin;   // Global number of nodes with halos
   unsigned long nSurf_Poin;   // Global number of nodes of the surface
@@ -1035,6 +1038,8 @@ class COutput {
   virtual bool SetUpdate_Averages(CConfig *config, bool dualtime);
   
   void Postprocess_HistoryFields(CConfig *config);
+  
+  COutputLegacy* GetLegacyOutput();
 };
 
 /*! \class CFlowOutput
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index a783d4c6f804..16e9bb0e4efe 100644
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -137,4 +137,6 @@ inline void COutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
 
 inline bool COutput::SetInit_Residuals(CConfig *config) {return false;}
 
-inline bool COutput::SetUpdate_Averages(CConfig *config, bool dualtime) {return false;}
\ No newline at end of file
+inline bool COutput::SetUpdate_Averages(CConfig *config, bool dualtime) {return false;}
+
+inline COutputLegacy* COutput::GetLegacyOutput() {return output_legacy;}
\ No newline at end of file
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index c2240f3a83c4..e4ee49a1da30 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -73,6 +73,8 @@ libSU2Core_sources = \
   ../include/numerics_structure.inl \
   ../include/output_structure.hpp \
   ../include/output_structure.inl \
+  ../include/output_structure_legacy.hpp \
+  ../include/output_structure_legacy.inl \
   ../include/sgs_model.hpp \
   ../include/sgs_model.inl \
   ../include/solver_structure.hpp \
@@ -127,6 +129,7 @@ libSU2Core_sources = \
   ../src/output_adjoint_discrete_inc.cpp \
   ../src/output_adjoint_mean.cpp \
   ../src/output_driver.cpp \
+  ../src/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 0331b8d9c383..d88f90fe0a03 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -475,7 +475,23 @@ CDriver::CDriver(char* confFile,
   if (rank == MASTER_NODE) cout << endl << "-------------------------- Output Preprocessing ---------------------------" << endl;
   Output_Preprocessing();
 
+//  output = new COutput(config_container[ZONE_0]);
 
+  if  (!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()){
+    /*--- Open the convergence history file ---*/
+    ConvHist_file = NULL;
+    ConvHist_file = new ofstream*[nZone];
+    for (iZone = 0; iZone < nZone; iZone++) {
+      ConvHist_file[iZone] = NULL;
+      if (rank == MASTER_NODE){
+        ConvHist_file[iZone] = new ofstream[nInst[iZone]];
+        for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+          output[iZone]->GetLegacyOutput()->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
+          config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
+        }
+      }
+    }
+  }
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
     ExtIter = config_container[ZONE_0]->GetUnst_RestartIter();
@@ -555,6 +571,17 @@ void CDriver::Postprocessing() {
     if (config_container[ZONE_0]->GetNonphysical_Reconstr() > 0)
       cout << "Warning: " << config_container[ZONE_0]->GetNonphysical_Reconstr() << " reconstructed states for upwinding are non-physical." << endl;
 
+    if  (!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()){
+    
+    /*--- Close the convergence history file. ---*/
+    for (iZone = 0; iZone < nZone; iZone++) {
+      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+        ConvHist_file[iZone][iInst].close();
+      }
+      delete [] ConvHist_file[iZone];
+    }
+    delete [] ConvHist_file;
+    }
   }
 
   if (rank == MASTER_NODE)
@@ -3681,6 +3708,12 @@ void CDriver::Output_Preprocessing(){
         cout << ": discrete adjoint FEA output structure." << endl;
       output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
+      
+    default:
+      if (rank == MASTER_NODE)
+        cout << ": default output structure." << endl;
+      output[iZone] = new COutput(config_container[iZone]);
+      break;
     }
     
     output[iZone]->PreprocessHistoryOutput(config_container[iZone]);
@@ -3936,13 +3969,14 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   
   /*--- Update the convergence history file (serial and parallel computations). ---*/
   
-//  if (!fsi) {
-//    for (iZone = 0; iZone < nZone; iZone++) {
-//      for (iInst = 0; iInst < nInst[iZone]; iInst++)
-//        output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
-//            config_container, integration_container, false, UsedTime, iZone, iInst);
-//    }
-//  }
+  if (!fsi) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      for (iInst = 0; iInst < nInst[iZone]; iInst++)
+        if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+        output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+            config_container, integration_container, false, UsedTime, iZone, iInst);
+    }
+  }
 
   /*--- Evaluate the new CFL number (adaptive). ---*/
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
@@ -4370,7 +4404,7 @@ void CTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone){
 
   /* --- compute turboperformance for each stage and the global machine ---*/
 
-  output[ZONE_0]->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
+  output[ZONE_0]->GetLegacyOutput()->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
 
 }
 
@@ -4409,7 +4443,8 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInst[iZone]; iInst++)
-      output[iZone]->SetConvHistory_Body(geometry_container, solver_container,
+      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))      
+      output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone, iInst);
   }
 
@@ -4643,9 +4678,10 @@ void CDiscAdjFluidDriver::Run() {
 
     /*--- Write the convergence history (only screen output) ---*/
 
-    if (unsteady)
-      output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0, INST_0);
-
+    if (unsteady){
+      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+         output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_0, INST_0);
+    }
   }
 
   /*--- Compute the geometrical sensitivities ---*/
@@ -4797,27 +4833,27 @@ void CDiscAdjFluidDriver::SetObjFunction(){
 
   /*--- Specific scalar objective functions ---*/
 
-//  for (iZone = 0; iZone < nZone; iZone++){
-//    switch (config_container[iZone]->GetKind_Solver()) {
-//     case EULER:                    case NAVIER_STOKES:                   case RANS:
-//      case DISC_ADJ_EULER:           case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-//     case DISC_ADJ_FEM_EULER:       case DISC_ADJ_FEM_NS:                 case DISC_ADJ_FEM_RANS:
+  for (iZone = 0; iZone < nZone; iZone++){
+    switch (config_container[iZone]->GetKind_Solver()) {
+     case EULER:                    case NAVIER_STOKES:                   case RANS:
+      case DISC_ADJ_EULER:           case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+     case DISC_ADJ_FEM_EULER:       case DISC_ADJ_FEM_NS:                 case DISC_ADJ_FEM_RANS:
         
-//        if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
-//          output[iZone]->SpecialOutput_AnalyzeSurface(solver_container[iZone][INST_0][MESH_0][FLOW_SOL], geometry_container[iZone][INST_0][MESH_0], config_container[iZone], false);
+        if (config_container[ZONE_0]->GetnMarker_Analyze() != 0)
+          output[iZone]->GetLegacyOutput()->SpecialOutput_AnalyzeSurface(solver_container[iZone][INST_0][MESH_0][FLOW_SOL], geometry_container[iZone][INST_0][MESH_0], config_container[iZone], false);
         
-//        if ((config_container[ZONE_0]->GetnMarker_Analyze() != 0) && compressible)
-//          output[iZone]->SpecialOutput_Distortion(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+        if ((config_container[ZONE_0]->GetnMarker_Analyze() != 0) && compressible)
+          output[iZone]->GetLegacyOutput()->SpecialOutput_Distortion(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
         
-//        if (config_container[ZONE_0]->GetnMarker_NearFieldBound() != 0)
-//          output[iZone]->SpecialOutput_SonicBoom(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+        if (config_container[ZONE_0]->GetnMarker_NearFieldBound() != 0)
+          output[iZone]->GetLegacyOutput()->SpecialOutput_SonicBoom(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
           
-//        if (config_container[ZONE_0]->GetPlot_Section_Forces())
-//          output[iZone]->SpecialOutput_SpanLoad(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
+        if (config_container[ZONE_0]->GetPlot_Section_Forces())
+          output[iZone]->GetLegacyOutput()->SpecialOutput_SpanLoad(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], false);
         
-//        break;
-//    }
-//  }
+        break;
+    }
+  }
 
   /*--- Surface based obj. function ---*/
 
@@ -4990,7 +5026,7 @@ void CDiscAdjTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone
 
   /* --- compute turboperformance for each stage and the global machine ---*/
 
-  output[ZONE_0]->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
+  output[ZONE_0]->GetLegacyOutput()->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
 
 }
 
@@ -5680,8 +5716,8 @@ void CFSIDriver::Run() {
           surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
-
-      output[ZONE_FLOW]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
+      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+        output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst],geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
 
       /*--- If the convergence criteria is met for the flow, break the loop ---*/
       StopCalc_Flow = integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence();
@@ -5708,8 +5744,8 @@ void CFSIDriver::Run() {
     }
 
     /*--- Write the convergence history for the fluid (only screen output) ---*/
-
-     output[ZONE_FLOW]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
+    if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+      output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
 
   } else {
 
@@ -5736,8 +5772,8 @@ void CFSIDriver::Run() {
                                   surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
 
     /*--- Write the convergence history for the structure (only screen output) ---*/
-
-    output[ZONE_STRUCT]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
+   if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+     output[ZONE_STRUCT]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
 
     /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
 
@@ -7408,8 +7444,9 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   unsigned long BGS_Iter = config_container[ZONE_FLOW]->GetOuterIter();
 
 
-  if (rank == MASTER_NODE)
-    output[ZONE_0]->SetConvHistory_Header(config_container[ZONE_0], ZONE_0, INST_0);
+  if (rank == MASTER_NODE)  
+    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
+     output[ZONE_0]->GetLegacyOutput()->SetConvHistory_Header(&ConvHist_file[ZONE_0][INST_0], config_container[ZONE_0], ZONE_0, INST_0);
 
   if (kind_recording == FLOW_CONS_VARS) {
 
@@ -7434,9 +7471,9 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   }
 
   if (kind_recording == FEA_DISP_VARS) {
-
+    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
     /*--- Set the convergence criteria (only residual possible) ---*/
-    output[ZONE_0]->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
+       output[ZONE_0]->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
 
   }
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 2ef42ef8471f..61bc8bfd3332 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -663,12 +663,11 @@ void CFluidIteration::Iterate(COutput *output,
     
   }
   
-  
   /*--- Write the convergence history ---*/
 
-  if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() ) {
+  if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() && (!config_container[val_iZone]->GetMultizone_Problem() && !config_container[val_iZone]->GetSinglezone_Driver())) {
     
-    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+    output->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
     
   }
   
@@ -754,13 +753,9 @@ bool CFluidIteration::Monitor(COutput *output,
   /*--- If convergence was reached --*/
   StopCalc = integration_container[val_iZone][INST_0][FLOW_SOL]->GetConvergence();
 
-  /*--- Write the convergence history for the fluid (only screen output) ---*/
-
-  /*--- The logic is right now case dependent ----*/
-  /*--- This needs to be generalized when the new output structure comes ---*/
-  output_history = (steady);
-
-  if (output_history) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, UsedTime, val_iZone, INST_0);
+  if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
+    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);    
+  }
 
   return StopCalc;
 
@@ -1265,9 +1260,9 @@ void CHeatIteration::Iterate(COutput *output,
   
   /*--- Write the convergence history ---*/
 
-  if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() ) {
+  if ( unsteady && !config_container[val_iZone]->GetDiscrete_Adjoint() && (!config_container[val_iZone]->GetMultizone_Problem() && !config_container[val_iZone]->GetSinglezone_Driver())) {
 
-    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+    output->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
   }
 }
 
diff --git a/SU2_CFD/src/output_physics.cpp b/SU2_CFD/src/output_physics.cpp
index ccb525fd0b83..5020d3860561 100644
--- a/SU2_CFD/src/output_physics.cpp
+++ b/SU2_CFD/src/output_physics.cpp
@@ -35,10 +35,10 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output_structure_legacy.hpp"
 
 
-void COutput::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
+void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
 
   CFluidModel *FluidModel;
   unsigned short nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index ad7c17db5560..24b3d747bc5e 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -38,7 +38,12 @@
 #include "../include/output_structure.hpp"
 
 COutput::COutput(CConfig *config) {
-
+  
+  
+  if(!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()){
+    output_legacy = new COutputLegacy(config);
+  }
+  
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   

From abe8051c7929b500f72b86ce6e059b8a22b9fc71 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 17 Jan 2019 10:18:01 +0100
Subject: [PATCH 097/539] Added legacy output files

---
 SU2_CFD/include/output_structure_legacy.hpp |  1059 +
 SU2_CFD/include/output_structure_legacy.inl |    46 +
 SU2_CFD/src/output_structure_legacy.cpp     | 21450 ++++++++++++++++++
 3 files changed, 22555 insertions(+)
 create mode 100644 SU2_CFD/include/output_structure_legacy.hpp
 create mode 100644 SU2_CFD/include/output_structure_legacy.inl
 create mode 100644 SU2_CFD/src/output_structure_legacy.cpp

diff --git a/SU2_CFD/include/output_structure_legacy.hpp b/SU2_CFD/include/output_structure_legacy.hpp
new file mode 100644
index 000000000000..ca76b8d3b13b
--- /dev/null
+++ b/SU2_CFD/include/output_structure_legacy.hpp
@@ -0,0 +1,1059 @@
+/*!
+ * \file output_structure.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.1.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "../../Common/include/mpi_structure.hpp"
+
+#ifdef HAVE_CGNS
+  #include "cgnslib.h"
+#endif
+#ifdef HAVE_TECIO
+  #include "TECIO.h"
+#endif
+#include <fstream>
+#include <cmath>
+#include <time.h>
+#include <fstream>
+
+#include "solver_structure.hpp"
+#include "integration_structure.hpp"
+#include "../../Common/include/geometry_structure.hpp"
+#include "../../Common/include/fem_geometry_structure.hpp"
+#include "../../Common/include/fem_standard_element.hpp"
+#include "../../Common/include/config_structure.hpp"
+
+using namespace std;
+
+/*! 
+ * \class COutputLegacy
+ * \brief Class for writing the flow, adjoint and linearized solver 
+ *        solution (including the history solution, and parallel stuff).
+ * \author F. Palacios, T. Economon, M. Colonno.
+ */
+class COutputLegacy {
+
+  unsigned long nGlobal_Poin;   // Global number of nodes with halos
+  unsigned long nSurf_Poin;   // Global number of nodes of the surface
+  unsigned long nGlobal_Doma;   // Global number of nodes without halos
+  unsigned long nGlobal_Elem;  // Global number of elems without halos
+  unsigned long nSurf_Elem,  // Global number of surface elems without halos
+  nGlobal_Line,
+  nGlobal_BoundTria,
+  nGlobal_BoundQuad,
+  nGlobal_Tria,
+  nGlobal_Quad,
+  nGlobal_Tetr,
+  nGlobal_Hexa,
+  nGlobal_Pris,
+  nGlobal_Pyra;
+  su2double **Coords;              // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
+  int *Conn_Line;
+  int *Conn_BoundTria;
+  int *Conn_BoundQuad;
+  int *Conn_Tria;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
+  int *Conn_Quad;
+  int *Conn_Tetr;
+  int *Conn_Hexa;
+  int *Conn_Pris;
+  int *Conn_Pyra;
+  
+  
+  unsigned long nGlobal_Poin_Par;   // Global number of nodes with halos
+  unsigned long nGlobal_Elem_Par;  // Global number of elems without halos
+  unsigned long nGlobal_Surf_Poin;
+  unsigned long nSurf_Elem_Par;
+  unsigned long nSurf_Poin_Par;
+  unsigned long nParallel_Poin;
+  unsigned long nParallel_Line,
+  nParallel_BoundTria,
+  nParallel_BoundQuad,
+  nParallel_Tria,
+  nParallel_Quad,
+  nParallel_Tetr,
+  nParallel_Hexa,
+  nParallel_Pris,
+  nParallel_Pyra;
+  int *Conn_BoundLine_Par;
+  int *Conn_BoundTria_Par;
+  int *Conn_BoundQuad_Par;
+  int *Conn_Tria_Par;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
+  int *Conn_Quad_Par;
+  int *Conn_Tetr_Par;
+  int *Conn_Hexa_Par;
+  int *Conn_Pris_Par;
+  int *Conn_Pyra_Par;
+
+  unsigned long nGlobalPoint_Sort;
+  unsigned long nLocalPoint_Sort;
+  unsigned long nPoint_Restart;
+  int *Local_Halo_Sort;
+
+  unsigned long *beg_node;
+  unsigned long *end_node;
+
+  unsigned long *nPoint_Lin;
+  unsigned long *nPoint_Cum;
+  
+  unsigned short nVar_Par;
+  su2double **Local_Data;
+  su2double **Local_Data_Copy;      // Local data copy for cte. lift mode
+  su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
+  su2double **Parallel_Surf_Data;   // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
+  vector<string> Variable_Names;
+
+  su2double **Data;
+  unsigned short nVar_Consv, nVar_Total, nVar_Extra, nZones;
+  bool wrote_surf_file, wrote_CGNS_base, wrote_Tecplot_base, wrote_Paraview_base;
+  unsigned short wrote_base_file;
+  su2double RhoRes_New, *RhoRes_Old;
+  int cgns_base, cgns_zone, cgns_base_results, cgns_zone_results;
+  
+  su2double Sum_Total_RadialDistortion, Sum_Total_CircumferentialDistortion; // Add all the distortion to compute a run average.
+  bool turbo;
+  unsigned short   nSpanWiseSections,
+		   nMarkerTurboPerf;
+
+  su2double **TotalStaticEfficiency,
+        **TotalTotalEfficiency,
+        **KineticEnergyLoss,
+        **TRadius,
+        **TotalPressureLoss,
+        **MassFlowIn,
+        **MassFlowOut,
+        **FlowAngleIn,
+        **FlowAngleIn_BC,
+        **FlowAngleOut,
+        **EulerianWork,
+        **TotalEnthalpyIn,
+        **TotalEnthalpyIn_BC,
+        **EntropyIn,
+        **EntropyOut,
+        **EntropyIn_BC,
+        **PressureRatio,
+        **TotalTemperatureIn,
+        **EnthalpyOut,
+        ***MachIn,
+        ***MachOut,
+        **VelocityOutIs,
+        **DensityIn,
+        **PressureIn,
+        ***TurboVelocityIn,
+        **DensityOut,
+        **PressureOut,
+        ***TurboVelocityOut,
+        **EnthalpyOutIs,
+        **EntropyGen,
+        **AbsFlowAngleIn,
+        **TotalEnthalpyOut,
+        **RothalpyIn,
+        **RothalpyOut,
+        **TotalEnthalpyOutIs,
+        **AbsFlowAngleOut,
+        **PressureOut_BC,
+        **TemperatureIn,
+        **TemperatureOut,
+        **TotalPressureIn,
+        **TotalPressureOut,
+        **TotalTemperatureOut,
+        **EnthalpyIn,
+        **TurbIntensityIn,
+        **Turb2LamViscRatioIn,
+        **TurbIntensityOut,
+        **Turb2LamViscRatioOut,
+        **NuFactorIn,
+        **NuFactorOut;
+
+  unsigned long nMarker_InletFile;       /*!< \brief Counter for total number of inlet boundaries written to inlet profile file. */
+  vector<string> Marker_Tags_InletFile;   /*!< \brief Marker tags for the strings of the markers in the inlet profile file. */
+  unsigned long *nRow_InletFile;         /*!< \brief Counters for the number of points per marker in the inlet profile file. */
+  unsigned long *nRowCum_InletFile;      /*!< \brief Counters for the number of points per marker in cumulative storage format in the inlet profile file. */
+  su2double **InletCoords;  /*!< \brief Data structure for holding the merged inlet boundary coordinates from all ranks. */
+
+protected:
+
+  int rank, 	/*!< \brief MPI Rank. */
+  size;       	/*!< \brief MPI Size. */
+
+public:
+
+  /*! 
+   * \brief Constructor of the class. 
+   */
+  COutputLegacy(CConfig *congig);
+
+  /*! 
+   * \brief Destructor of the class. 
+   */
+  ~COutputLegacy(void);
+
+  /*! 
+   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
+                       unsigned long iExtIter, unsigned short val_nZone);
+  
+  /*!
+   * \brief Writes and organizes the all the output files, except the history one, for serial computations with the FEM solver.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetResult_Files_FEM(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
+                       unsigned long iExtIter, unsigned short val_nZone);
+  
+  /*!
+   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                               unsigned long iExtIter, unsigned short val_nZone);
+
+  /*!
+   * \brief Writes and organizes the all the output files, except the history one, for DG-FEM simulations (SU2_SOL).
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                                   unsigned long iExtIter, unsigned short val_nZone);
+
+  /*!
+   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file);
+
+  /*!
+   * \brief Writes equivalent area.
+   * \param[in] solver - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_SonicBoom(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  
+  /*!
+   * \brief Writes inverse design.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   */
+  void SetCp_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config,
+                         unsigned long iExtIter);
+  
+  /*!
+   * \brief Writes inverse design.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   */
+  void SetHeatFlux_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config,
+                        unsigned long iExtIter);
+  
+  /*!
+   * \brief Writes forces at different sections.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  
+  /*!
+   * \brief Writes one dimensional output.
+   * \author H. Kline
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_AnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  
+  /*!
+   * \brief Create and write the file with the flow coefficient on the surface.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] FlowSolution - Flow solution.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Current zone number in the grid file.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_Distortion(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+
+  /*!
+   * \brief Create and write the file with the FSI convergence history.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Solver for all physical problems.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Current zone number in the grid file.
+   */
+  void SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config, CIntegration ****integration,
+                         unsigned long iExtIter, unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT, bool header);
+
+  /*!
+   * \brief Create and write the file with the FSI convergence history.
+   * \param[in] iIter - Current iteration.
+   * \param[in] iFreq - Frequency of output printing.
+   */
+  bool PrintOutput(unsigned long iIter, unsigned long iFreq);
+
+  /*! 
+   * \brief Create and write the file with the flow coefficient on the surface.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] FlowSolution - Flow solution.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Current zone number in the grid file.
+   */
+  void SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*! 
+   * \brief Create and write the file with the adjoint coefficients on the surface for serial computations.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] AdjSolution - Adjoint solution.
+   * \param[in] FlowSolution - Flow solution.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Current zone number in the grid file.
+   */
+  void SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry, CSolver *AdjSolver, CSolver *FlowSolution, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Merge the geometry into a data structure used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+  /*!
+   * \brief Merge the FEM geometry into a data structure used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+  /*!
+   * \brief Merge the node coordinates from all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void MergeCoordinates(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Merge the node coordinates from all processors for the FEM solver.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void MergeCoordinates_FEM(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Merge the connectivity for a single element type from all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  
+  /*!
+   * \brief Merge the connectivity for a single element type from all processors for the FEM solver.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void MergeVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  
+  /*!
+   * \brief Merge the connectivity for a single element type from all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  
+  /*!
+   * \brief Merge the connectivity for a single element type from all processors for the FEM solver.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void MergeSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  
+  /*!
+   * \brief Merge the solution into a data structure used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Merge the FEM solution into a data structure used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeSolution_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+  
+  /*!
+   * \brief Merge the solution into a data structure used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Merge the solution into a data structure used for output file writing (DG-FEM).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void MergeBaselineSolution_FEM(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Write a native SU2 restart file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - Flow, adjoint or linearized solution.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Write a native SU2 restart file (ASCII) in parallel.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - Flow, adjoint or linearized solution.
+   * \param[in] val_iZone - iZone index.
+   */
+  void WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write a native SU2 restart file (binary) in parallel.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - Flow, adjoint or linearized solution.
+   * \param[in] val_iZone - iZone index.
+   */
+  void WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Write the x, y, & z coordinates to a CGNS output file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+  /*!
+   * \brief Write the element connectivity to a CGNS output file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+  /*!
+   * \brief Write solution data to a CGNS output file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+//  /*!
+//   * \brief Write a Paraview ASCII solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   */
+//  void SetParaview_ASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
+
+//  /*!
+//   * \brief Write a Paraview ASCII solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   */
+//  void SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol, bool new_file);
+
+//  /*!
+//   * \brief Write a Paraview ASCII solution file with parallel output.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
+//   */
+//  void WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol);
+
+//  /*!
+//   * \brief Write a Paraview binary solution file with parallel output.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
+//   */
+//  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
+  
+//  /*!
+//   * \brief Write a Tecplot ASCII solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   */
+//  void SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
+  
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a Tecplot ASCII mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplot_MeshASCII(CConfig *config, CGeometry *geometry, bool surf_sol, bool new_file);
+
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a stl ASCII mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetSTL_MeshASCII(CConfig *config, CGeometry *geometry);
+
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a n3d ASCII mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   */
+//  void SetCSV_MeshASCII(CConfig *config, CGeometry *geometry);
+  
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a n3d ASCII mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplotASCII_Mesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool surf_sol, bool new_file);
+
+//  /*!
+//   * \brief Write the solution data and connectivity to a Tecplot ASCII mesh file in parallel.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
+//   */
+//  void WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol);
+  
+  /*!
+   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  string AssembleVariableNames(CGeometry *geometry, CConfig *config, unsigned short nVar_Consv, unsigned short *NVar);
+
+  /*!
+   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetSU2_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, ofstream &output_file);
+  
+  /*!
+   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void SetSU2_MeshBinary(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Write the nodal coordinates to a binary file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_iZone - iZone index.
+   */
+  void WriteCoordinates_Binary(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplotBinary_DomainMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+//  /*!
+//   * \brief Write the coordinates and connectivity to a Tecplot binary surface mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplotBinary_SurfaceMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+//  /*!
+//   * \brief Write solution data to a Tecplot binary volume solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+
+//  /*!
+//   * \brief Write solution data to a Tecplot binary surface solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  
+//  /*!
+//   * \brief Write a Tecplot ASCII solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - Current zone.
+//   * \param[in] val_nZone - Total number of zones.
+//   */
+//  void SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
+  
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetFieldViewASCII_Mesh(CConfig *config, CGeometry *geometry);
+  
+//  /*!
+//   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetFieldViewBinary_Mesh(CConfig *config, CGeometry *geometry);
+  
+//  /*!
+//   * \brief Write solution data to a Tecplot binary volume solution file.
+//   * \param[in] config - Definition of the particular problem.
+//   * \param[in] geometry - Geometrical definition of the problem.
+//   * \param[in] val_iZone - iZone index.
+//   */
+//  void SetFieldViewBinary(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing coordinates.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateCoordinates(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing connectivity.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing solution variables.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateSolution(CConfig *config, CGeometry *geometry);
+  
+  /*! 
+   * \brief Write the header of the history file.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*! 
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(ofstream *ConvHist_file, CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+                              CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] solver - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output);
+  
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone);
+  
+  /*!
+   * \brief Write the sensitivity (including mesh sensitivity) computed with the discrete adjoint method
+   *  on the surface and in the volume to a file.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_nZone - Number of Zones.
+   */
+  void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone);
+
+  /*!
+   * \brief Compute .
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   */
+  void ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config);
+
+  /*!
+   * \brief Compute .
+   * \param[in] config - Definition of the particular problem.
+   */
+  void WriteTurboPerfConvHistory(CConfig *config);
+
+  /*!
+   * \brief Write the output file for spanwise turboperformance.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_nZone - iZone index.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_Turbo(CSolver *****solver_container, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output);
+
+  /*!
+   * \brief Give the Entropy Generation performance parameters for turbomachinery.
+   * \param[in] iMarkerTP - Marker turbo-performance.
+   * \param[in] iSpan - span section.
+   */
+  su2double GetEntropyGen(unsigned short iMarkerTP, unsigned short iSpan);
+
+  /*!
+   * \brief Give the Entropy Generation performance parameters for turbomachinery.
+   * \param[in] iMarkerTP - Marker turbo-performance.
+   * \param[in] iSpan - span section.
+   */
+  su2double GetFlowAngleOut(unsigned short iMarkerTP, unsigned short iSpan);
+
+  /*!
+   * \brief Give the Entropy Generation performance parameters for turbomachinery.
+   * \param[in] iMarkerTP - Marker turbo-performance.
+   * \param[in] iSpan - span section.
+   */
+  su2double GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan);
+
+  /*!
+   * \brief Write the output file for harmonic balance for each time-instance.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_nZone - Number of Zones.
+   * \param[in] val_iZone - Zone index.
+   * \param[in] output - Create output files.
+   */
+  void SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short iZone, unsigned short val_nZone, bool output);
+
+  /*!
+   * \brief Writes and organizes the all the output files, except the history one, for parallel computations.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetResult_Files_Parallel(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
+                                unsigned long iExtIter, unsigned short val_nZone);
+  
+  /*!
+   * \brief Writes the special output files.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Total number of domains in the grid file.
+   * \param[in] val_nZone - Total number of domains in the grid file.
+   */
+  void SetSpecial_Output(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
+                         unsigned long iExtIter, unsigned short val_nZone);
+
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for flow problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+  
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for incmopressible flow problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_iZone - iZone index.
+   */
+  void LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for adjoint flow problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+  
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for elasticity problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+  
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for generic problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solution - Flow, adjoint or linearized solution.
+   * \param[in] val_nZone - iZone index.
+   */
+  void LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
+
+  /*!
+   * \brief Prepare the number of points and offsets for linear partitioning that are needed for output.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void PrepareOffsets(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_nZone - iZone index.
+   */
+  void SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_nZone - iZone index.
+   */
+  void SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+
+  /*!
+   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+  /*!
+   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+  /*!
+   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+  /*!
+   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData_FEM(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Sort the surface output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData_Surface(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Sort the surface output data for each grid node into a linear partitioning across all processors (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateData_Parallel(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Merge the node coordinates of all inlet boundaries from all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void MergeInletCoordinates(CConfig *config, CGeometry *geometry);
+
+  /*!
+   * \brief Write a template inlet profile file for all inlets for flow problems.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - Solver container.
+   */
+  void Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver);
+
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing inlet boundary coordinates.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void DeallocateInletCoordinates(CConfig *config, CGeometry *geometry);
+  
+  /*! 
+   * \brief Create and write a CSV file with a slice of data.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] FlowSolution - Flow solution.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] val_iZone - Current zone number in the grid file.
+   * \param[in] val_direction - Controls the slice direction (0 for constant x/vertical, 1 for constant y/horizontal.
+   */
+  void WriteCSV_Slice(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_direction);
+
+};
+
+#include "output_structure_legacy.inl"
diff --git a/SU2_CFD/include/output_structure_legacy.inl b/SU2_CFD/include/output_structure_legacy.inl
new file mode 100644
index 000000000000..bd53a05dbc47
--- /dev/null
+++ b/SU2_CFD/include/output_structure_legacy.inl
@@ -0,0 +1,46 @@
+/*!
+ * \file output_structure.inl
+ * \brief In-Line subroutines of the <i>output_structure.hpp</i> file.
+ * \author J. Smith
+ * \version 6.1.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+inline su2double COutputLegacy::GetEntropyGen(unsigned short iMarkerTP, unsigned short iSpan) { return EntropyGen[iMarkerTP][iSpan]; }
+
+inline su2double COutputLegacy::GetFlowAngleOut(unsigned short iMarkerTP, unsigned short iSpan) { return FlowAngleOut[iMarkerTP][iSpan]*180.0/PI_NUMBER; }
+
+inline su2double COutputLegacy::GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan) { return MassFlowIn[iMarkerTP][iSpan]; }
+
+inline bool COutputLegacy::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
new file mode 100644
index 000000000000..ba46791a9c81
--- /dev/null
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -0,0 +1,21450 @@
+/*!
+ * \file output_structure.cpp
+ * \brief Main subroutines for output solver information
+ * \author F. Palacios, T. Economon
+ * \version 6.1.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output_structure_legacy.hpp"
+
+COutputLegacy::COutputLegacy(CConfig *config) {
+
+  rank = SU2_MPI::GetRank();
+  size = SU2_MPI::GetSize();
+
+  unsigned short iDim, iZone, iSpan, iMarker;
+  
+  /*--- Initialize point and connectivity counters to zero. ---*/
+  
+  nGlobal_Poin      = 0;
+  nSurf_Poin        = 0;
+  nGlobal_Elem      = 0;
+  nSurf_Elem        = 0;
+  nGlobal_Tria      = 0;
+  nGlobal_Quad      = 0;
+  nGlobal_Tetr      = 0;
+  nGlobal_Hexa      = 0;
+  nGlobal_Pris      = 0;
+  nGlobal_Pyra      = 0;
+  nGlobal_Line      = 0;
+  nGlobal_BoundTria = 0;
+  nGlobal_BoundQuad = 0;
+
+  /*--- Initialize pointers to NULL ---*/
+  
+  Coords = NULL;
+  Conn_Line = NULL;     Conn_BoundTria = NULL;  Conn_BoundQuad = NULL;
+  Conn_Tria = NULL;     Conn_Quad = NULL;       Conn_Tetr = NULL;
+  Conn_Hexa = NULL;     Conn_Pris = NULL;       Conn_Pyra = NULL;
+  Data = NULL;
+  
+  /*--- Initialize parallel pointers to NULL ---*/
+  
+  nGlobal_Poin_Par    = 0;
+  nGlobal_Elem_Par    = 0;
+  nGlobal_Surf_Poin   = 0;
+  nParallel_Poin      = 0;
+  nSurf_Poin_Par      = 0;
+  nSurf_Elem_Par      = 0;
+  nParallel_Tria      = 0;
+  nParallel_Quad      = 0;
+  nParallel_Tetr      = 0;
+  nParallel_Hexa      = 0;
+  nParallel_Pris      = 0;
+  nParallel_Pyra      = 0;
+  nParallel_Line      = 0;
+  nParallel_BoundTria = 0;
+  nParallel_BoundQuad = 0;
+  
+  /*--- Initialize pointers to NULL ---*/
+  
+  Conn_BoundLine_Par = NULL;  Conn_BoundTria_Par = NULL;  Conn_BoundQuad_Par = NULL;
+  Conn_Tria_Par = NULL;  Conn_Quad_Par = NULL;       Conn_Tetr_Par = NULL;
+  Conn_Hexa_Par = NULL;  Conn_Pris_Par = NULL;       Conn_Pyra_Par = NULL;
+  
+  Local_Data         = NULL;
+  Local_Data_Copy    = NULL;
+  Parallel_Data      = NULL;
+  Parallel_Surf_Data = NULL;
+
+  /*--- Initialize structures for storing linear partitioning offsets ---*/
+
+  nGlobalPoint_Sort = 0;
+  nLocalPoint_Sort  = 0;
+  nPoint_Restart    = 0;
+
+  Local_Halo_Sort = NULL;
+
+  beg_node = NULL;
+  end_node = NULL;
+
+  nPoint_Lin = NULL;
+  nPoint_Cum = NULL;
+  
+  /*--- Inlet profile data structures. ---*/
+
+  nRow_InletFile    = NULL;
+  nRowCum_InletFile = NULL;
+  InletCoords       = NULL;
+
+  Marker_Tags_InletFile.clear();
+
+  /*--- Initialize CGNS write flag ---*/
+  
+  wrote_base_file = false;
+  
+  /*--- Initialize CGNS write flag ---*/
+  
+  wrote_CGNS_base = false;
+  
+  /*--- Initialize Tecplot surface flag ---*/
+  
+  wrote_surf_file = false;
+  
+  /*--- Initialize Paraview write flag ---*/
+  
+  wrote_Paraview_base = false;
+  
+  /*--- Initialize residual ---*/
+  
+  RhoRes_New = EPS;
+  RhoRes_Old = new su2double[config->GetnZone()];
+  for (iZone = 0; iZone < config->GetnZone(); iZone++) RhoRes_Old[iZone] = EPS;
+  
+  wrote_Paraview_base = false;
+
+  /*--- Initialize turbo flag ---*/
+  turbo = config->GetBoolTurbomachinery();
+
+  if(turbo){
+    /*--- Initializate quantities for turboperformace ---*/
+    nSpanWiseSections = config->GetnSpanMaxAllZones();
+    nMarkerTurboPerf  = config->GetnMarker_TurboPerformance();
+
+
+    TotalStaticEfficiency         = new su2double*[nMarkerTurboPerf];
+    TotalTotalEfficiency          = new su2double*[nMarkerTurboPerf];
+    KineticEnergyLoss             = new su2double*[nMarkerTurboPerf];
+    TRadius                       = new su2double*[nMarkerTurboPerf];
+    TotalPressureLoss             = new su2double*[nMarkerTurboPerf];
+    MassFlowIn                    = new su2double*[nMarkerTurboPerf];
+    MassFlowOut                   = new su2double*[nMarkerTurboPerf];
+    FlowAngleIn                   = new su2double*[nMarkerTurboPerf];
+    FlowAngleIn_BC                = new su2double*[nMarkerTurboPerf];
+    FlowAngleOut                  = new su2double*[nMarkerTurboPerf];
+    EulerianWork                  = new su2double*[nMarkerTurboPerf];
+    TotalEnthalpyIn               = new su2double*[nMarkerTurboPerf];
+    TotalEnthalpyIn_BC            = new su2double*[nMarkerTurboPerf];
+    EntropyIn                     = new su2double*[nMarkerTurboPerf];
+    EntropyOut                    = new su2double*[nMarkerTurboPerf];
+    EntropyIn_BC                  = new su2double*[nMarkerTurboPerf];
+    PressureRatio                 = new su2double*[nMarkerTurboPerf];
+    TotalTemperatureIn            = new su2double*[nMarkerTurboPerf];
+    EnthalpyOut                   = new su2double*[nMarkerTurboPerf];
+    MachIn                        = new su2double**[nMarkerTurboPerf];
+    MachOut                       = new su2double**[nMarkerTurboPerf];
+    VelocityOutIs                 = new su2double*[nMarkerTurboPerf];
+    DensityIn                     = new su2double*[nMarkerTurboPerf];
+    PressureIn                    = new su2double*[nMarkerTurboPerf];
+    TurboVelocityIn               = new su2double**[nMarkerTurboPerf];
+    DensityOut                    = new su2double*[nMarkerTurboPerf];
+    PressureOut                   = new su2double*[nMarkerTurboPerf];
+    TurboVelocityOut              = new su2double**[nMarkerTurboPerf];
+    EnthalpyOutIs                 = new su2double*[nMarkerTurboPerf];
+    EntropyGen                    = new su2double*[nMarkerTurboPerf];
+    AbsFlowAngleIn                = new su2double*[nMarkerTurboPerf];
+    TotalEnthalpyOut              = new su2double*[nMarkerTurboPerf];
+    TotalEnthalpyOutIs            = new su2double*[nMarkerTurboPerf];
+    RothalpyIn                    = new su2double*[nMarkerTurboPerf];
+    RothalpyOut                   = new su2double*[nMarkerTurboPerf];
+    AbsFlowAngleOut               = new su2double*[nMarkerTurboPerf];
+    PressureOut_BC                = new su2double*[nMarkerTurboPerf];
+    TemperatureIn                 = new su2double*[nMarkerTurboPerf];
+    TemperatureOut                = new su2double*[nMarkerTurboPerf];
+    TotalPressureIn               = new su2double*[nMarkerTurboPerf];
+    TotalPressureOut              = new su2double*[nMarkerTurboPerf];
+    TotalTemperatureOut           = new su2double*[nMarkerTurboPerf];
+    EnthalpyIn                    = new su2double*[nMarkerTurboPerf];
+    TurbIntensityIn               = new su2double*[nMarkerTurboPerf];
+    Turb2LamViscRatioIn           = new su2double*[nMarkerTurboPerf];
+    TurbIntensityOut              = new su2double*[nMarkerTurboPerf];
+    Turb2LamViscRatioOut          = new su2double*[nMarkerTurboPerf];
+    NuFactorIn                    = new su2double*[nMarkerTurboPerf];
+    NuFactorOut                   = new su2double*[nMarkerTurboPerf];
+
+    for (iMarker = 0; iMarker < nMarkerTurboPerf; iMarker++){
+      TotalStaticEfficiency   [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalTotalEfficiency    [iMarker] = new su2double [nSpanWiseSections + 1];
+      KineticEnergyLoss       [iMarker] = new su2double [nSpanWiseSections + 1];
+      TRadius                 [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalPressureLoss       [iMarker] = new su2double [nSpanWiseSections + 1];
+      MassFlowIn              [iMarker] = new su2double [nSpanWiseSections + 1];
+      MassFlowOut             [iMarker] = new su2double [nSpanWiseSections + 1];
+      FlowAngleIn             [iMarker] = new su2double [nSpanWiseSections + 1];
+      FlowAngleIn_BC          [iMarker] = new su2double [nSpanWiseSections + 1];
+      FlowAngleOut            [iMarker] = new su2double [nSpanWiseSections + 1];
+      EulerianWork            [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalEnthalpyIn         [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalEnthalpyIn_BC      [iMarker] = new su2double [nSpanWiseSections + 1];
+      EntropyIn               [iMarker] = new su2double [nSpanWiseSections + 1];
+      EntropyOut              [iMarker] = new su2double [nSpanWiseSections + 1];
+      EntropyIn_BC            [iMarker] = new su2double [nSpanWiseSections + 1];
+      PressureRatio           [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalTemperatureIn      [iMarker] = new su2double [nSpanWiseSections + 1];
+      EnthalpyOut             [iMarker] = new su2double [nSpanWiseSections + 1];
+      MachIn                  [iMarker] = new su2double*[nSpanWiseSections + 1];
+      MachOut                 [iMarker] = new su2double*[nSpanWiseSections + 1];
+      VelocityOutIs           [iMarker] = new su2double [nSpanWiseSections + 1];
+      DensityIn               [iMarker] = new su2double [nSpanWiseSections + 1];
+      PressureIn              [iMarker] = new su2double [nSpanWiseSections + 1];
+      TurboVelocityIn         [iMarker] = new su2double*[nSpanWiseSections + 1];
+      DensityOut              [iMarker] = new su2double [nSpanWiseSections + 1];
+      PressureOut             [iMarker] = new su2double [nSpanWiseSections + 1];
+      TurboVelocityOut        [iMarker] = new su2double*[nSpanWiseSections + 1];
+      EnthalpyOutIs           [iMarker] = new su2double [nSpanWiseSections + 1];
+      EntropyGen              [iMarker] = new su2double [nSpanWiseSections + 1];
+      AbsFlowAngleIn          [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalEnthalpyOut        [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalEnthalpyOutIs      [iMarker] = new su2double [nSpanWiseSections + 1];
+      RothalpyIn              [iMarker] = new su2double [nSpanWiseSections + 1];
+      RothalpyOut             [iMarker] = new su2double [nSpanWiseSections + 1];
+      AbsFlowAngleOut         [iMarker] = new su2double [nSpanWiseSections + 1];
+      PressureOut_BC          [iMarker] = new su2double [nSpanWiseSections + 1];
+      TemperatureIn           [iMarker] = new su2double [nSpanWiseSections + 1];
+      TemperatureOut          [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalPressureIn         [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalPressureOut        [iMarker] = new su2double [nSpanWiseSections + 1];
+      TotalTemperatureOut     [iMarker] = new su2double [nSpanWiseSections + 1];
+      EnthalpyIn              [iMarker] = new su2double [nSpanWiseSections + 1];
+      TurbIntensityIn         [iMarker] = new su2double [nSpanWiseSections + 1];
+      Turb2LamViscRatioIn     [iMarker] = new su2double [nSpanWiseSections + 1];
+      TurbIntensityOut        [iMarker] = new su2double [nSpanWiseSections + 1];
+      Turb2LamViscRatioOut    [iMarker] = new su2double [nSpanWiseSections + 1];
+      NuFactorIn              [iMarker] = new su2double [nSpanWiseSections + 1];
+      NuFactorOut             [iMarker] = new su2double [nSpanWiseSections + 1];
+
+
+      for (iSpan = 0; iSpan < nSpanWiseSections + 1; iSpan++){
+        TotalStaticEfficiency   [iMarker][iSpan] = 0.0;
+        TotalTotalEfficiency    [iMarker][iSpan] = 0.0;
+        KineticEnergyLoss       [iMarker][iSpan] = 0.0;
+        TRadius                 [iMarker][iSpan] = 0.0;
+        TotalPressureLoss       [iMarker][iSpan] = 0.0;
+        MassFlowIn              [iMarker][iSpan] = 0.0;
+        MassFlowOut             [iMarker][iSpan] = 0.0;
+        FlowAngleIn             [iMarker][iSpan] = 0.0;
+        FlowAngleIn_BC          [iMarker][iSpan] = config->GetFlowAngleIn_BC();
+        FlowAngleOut            [iMarker][iSpan] = 0.0;
+        EulerianWork            [iMarker][iSpan] = 0.0;
+        TotalEnthalpyIn         [iMarker][iSpan] = 0.0;
+        TotalEnthalpyIn_BC      [iMarker][iSpan] = 0.0;
+        EntropyIn               [iMarker][iSpan] = 0.0;
+        EntropyOut              [iMarker][iSpan] = 0.0;
+        EntropyIn_BC            [iMarker][iSpan] = 0.0;
+        PressureRatio           [iMarker][iSpan] = 0.0;
+        TotalTemperatureIn      [iMarker][iSpan] = 0.0;
+        EnthalpyOut             [iMarker][iSpan] = 0.0;
+
+
+        VelocityOutIs           [iMarker][iSpan] = 0.0;
+        DensityIn               [iMarker][iSpan] = 0.0;
+        PressureIn              [iMarker][iSpan] = 0.0;
+
+        DensityOut              [iMarker][iSpan] = 0.0;
+        PressureOut             [iMarker][iSpan] = 0.0;
+
+        EnthalpyOutIs           [iMarker][iSpan] = 0.0;
+        EntropyGen              [iMarker][iSpan] = 0.0;
+        AbsFlowAngleIn          [iMarker][iSpan] = 0.0;
+        TotalEnthalpyOut        [iMarker][iSpan] = 0.0;
+        TotalEnthalpyOutIs      [iMarker][iSpan] = 0.0;
+        RothalpyIn              [iMarker][iSpan] = 0.0;
+        RothalpyOut             [iMarker][iSpan] = 0.0;
+        AbsFlowAngleOut         [iMarker][iSpan] = 0.0;
+        PressureOut_BC          [iMarker][iSpan] = config->GetPressureOut_BC();
+
+        TemperatureIn           [iMarker][iSpan] = 0.0;
+        TemperatureOut          [iMarker][iSpan] = 0.0;
+        TotalPressureIn         [iMarker][iSpan] = 0.0;
+        TotalPressureOut        [iMarker][iSpan] = 0.0;
+        TotalTemperatureOut     [iMarker][iSpan] = 0.0;
+        EnthalpyIn              [iMarker][iSpan] = 0.0;
+        TurbIntensityIn         [iMarker][iSpan] = 0.0;
+        Turb2LamViscRatioIn     [iMarker][iSpan] = 0.0;
+        TurbIntensityOut        [iMarker][iSpan] = 0.0;
+        Turb2LamViscRatioOut    [iMarker][iSpan] = 0.0;
+        NuFactorIn              [iMarker][iSpan] = 0.0;
+        NuFactorOut             [iMarker][iSpan] = 0.0;
+        MachIn                  [iMarker][iSpan] = new su2double[4];
+        MachOut                 [iMarker][iSpan] = new su2double[4];
+        TurboVelocityIn         [iMarker][iSpan] = new su2double[4];
+        TurboVelocityOut        [iMarker][iSpan] = new su2double[4];
+
+        for (iDim = 0; iDim < 4; iDim++){
+          MachIn           [iMarker][iSpan][iDim]   = 0.0;
+          MachOut          [iMarker][iSpan][iDim]   = 0.0;
+          TurboVelocityIn  [iMarker][iSpan][iDim]   = 0.0;
+          TurboVelocityOut [iMarker][iSpan][iDim]   = 0.0;
+        }
+      }
+    }
+  }
+}
+
+COutputLegacy::~COutputLegacy(void) {
+  /* delete pointers initialized at construction*/
+  /* Coords and Conn_*(Connectivity) have their own dealloc functions */
+  /* Data is taken care of in DeallocateSolution function */
+
+  if (RhoRes_Old != NULL) delete [] RhoRes_Old;
+
+  /*--- Delete turboperformance pointers initiliazed at constrction  ---*/
+  unsigned short iMarker, iSpan;
+  if(turbo){
+    for(iMarker = 0; iMarker< nMarkerTurboPerf; iMarker++){
+      for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+        delete [] MachIn          [iMarker][iSpan];
+        delete [] MachOut         [iMarker][iSpan];
+        delete [] TurboVelocityIn [iMarker][iSpan];
+        delete [] TurboVelocityOut[iMarker][iSpan];
+      }
+    }
+    for(iMarker = 0; iMarker< nMarkerTurboPerf; iMarker++){
+      delete [] TotalStaticEfficiency[iMarker];
+      delete [] TotalTotalEfficiency [iMarker];
+      delete [] KineticEnergyLoss    [iMarker];
+      delete [] TRadius              [iMarker];
+      delete [] TotalPressureLoss    [iMarker];
+      delete [] MassFlowIn           [iMarker];
+      delete [] MassFlowOut          [iMarker];
+      delete [] FlowAngleIn          [iMarker];
+      delete [] FlowAngleOut         [iMarker];
+      delete [] EulerianWork         [iMarker];
+      delete [] TotalEnthalpyIn      [iMarker];
+      delete [] TotalEnthalpyOut     [iMarker];
+      delete [] TotalEnthalpyOutIs   [iMarker];
+      delete [] PressureRatio        [iMarker];
+      delete [] EnthalpyOut          [iMarker];
+      delete [] VelocityOutIs        [iMarker];
+      delete [] TotalTemperatureIn   [iMarker];
+      delete [] FlowAngleIn_BC       [iMarker];
+      delete [] EntropyIn            [iMarker];
+      delete [] EntropyIn_BC         [iMarker];
+      delete [] EntropyOut           [iMarker];
+      delete [] TotalEnthalpyIn_BC   [iMarker];
+      delete [] DensityIn            [iMarker];
+      delete [] PressureIn           [iMarker];
+      delete [] DensityOut           [iMarker];
+      delete [] PressureOut          [iMarker];
+      delete [] EnthalpyOutIs        [iMarker];
+      delete [] EntropyGen           [iMarker];
+      delete [] AbsFlowAngleIn       [iMarker];
+      delete [] RothalpyIn           [iMarker];
+      delete [] RothalpyOut          [iMarker];
+      delete [] AbsFlowAngleOut      [iMarker];
+      delete [] PressureOut_BC       [iMarker];
+      delete [] MachIn               [iMarker];
+      delete [] MachOut              [iMarker];
+      delete [] TurboVelocityIn      [iMarker];
+      delete [] TurboVelocityOut     [iMarker];
+      delete [] TemperatureIn        [iMarker];
+      delete [] TemperatureOut       [iMarker];
+      delete [] TotalPressureIn      [iMarker];
+      delete [] TotalPressureOut     [iMarker];
+      delete [] TotalTemperatureOut  [iMarker];
+      delete [] EnthalpyIn           [iMarker];
+      delete [] TurbIntensityIn      [iMarker];
+      delete [] Turb2LamViscRatioIn  [iMarker];
+      delete [] TurbIntensityOut     [iMarker];
+      delete [] Turb2LamViscRatioOut [iMarker];
+      delete [] NuFactorIn           [iMarker];
+      delete [] NuFactorOut          [iMarker];
+
+
+    }
+    delete [] TotalStaticEfficiency;
+    delete [] TotalTotalEfficiency;
+    delete [] KineticEnergyLoss;
+    delete [] TRadius;
+    delete [] TotalPressureLoss;
+    delete [] MassFlowIn;
+    delete [] MassFlowOut;
+    delete [] FlowAngleIn;
+    delete [] FlowAngleOut;
+    delete [] EulerianWork;
+    delete [] TotalEnthalpyIn;
+    delete [] TotalEnthalpyOut;
+    delete [] TotalEnthalpyOutIs;
+    delete [] PressureRatio;
+    delete [] EnthalpyOut;
+    delete [] VelocityOutIs;
+    delete [] TotalTemperatureIn;
+    delete [] FlowAngleIn_BC;
+    delete [] EntropyIn;
+    delete [] EntropyIn_BC;
+    delete [] EntropyOut;
+    delete [] TotalEnthalpyIn_BC;
+    delete [] DensityIn;
+    delete [] PressureIn;
+    delete [] DensityOut;
+    delete [] PressureOut;
+    delete [] EnthalpyOutIs;
+    delete [] EntropyGen;
+    delete [] AbsFlowAngleIn;
+    delete [] RothalpyIn;
+    delete [] RothalpyOut;
+    delete [] AbsFlowAngleOut;
+    delete [] PressureOut_BC;
+    delete [] MachIn;
+    delete [] MachOut;
+    delete [] TurboVelocityIn;
+    delete [] TurboVelocityOut;
+    delete [] TemperatureIn;
+    delete [] TemperatureOut;
+    delete [] TotalPressureIn;
+    delete [] TotalPressureOut;
+    delete [] TotalTemperatureOut;
+    delete [] EnthalpyIn;
+    delete [] TurbIntensityIn;
+    delete [] Turb2LamViscRatioIn;
+    delete [] TurbIntensityOut;
+    delete [] Turb2LamViscRatioOut;
+    delete [] NuFactorIn;
+    delete [] NuFactorOut;
+  }
+}
+
+void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
+                                 CSolver *FlowSolver, unsigned long iExtIter,
+                                 unsigned short val_iZone, unsigned short val_iInst) {
+  
+  unsigned short iMarker;
+  unsigned long iPoint, iVertex, Global_Index;
+  su2double PressCoeff = 0.0, SkinFrictionCoeff[3], HeatFlux;
+  su2double xCoord = 0.0, yCoord = 0.0, zCoord = 0.0, Mach, Pressure;
+  char cstr[200];
+  
+  unsigned short solver = config->GetKind_Solver();
+  unsigned short nDim = geometry->GetnDim();
+  
+#ifndef HAVE_MPI
+  
+  unsigned short iDim;
+  char buffer [50];
+  ofstream SurfFlow_file;
+  
+  /*--- Write file name with extension if unsteady ---*/
+  strcpy (cstr, config->GetSurfFlowCoeff_FileName().c_str());
+  
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+
+  }else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+  }
+  else
+    SPRINTF (buffer, ".csv");
+  
+  strcat (cstr, buffer);
+  SurfFlow_file.precision(15);
+  SurfFlow_file.open(cstr, ios::out);
+  
+  SurfFlow_file << "\"Global_Index\", \"x_coord\", \"y_coord\", ";
+  if (nDim == 3) SurfFlow_file << "\"z_coord\", ";
+  SurfFlow_file << "\"Pressure\", \"Pressure_Coefficient\", ";
+  
+  switch (solver) {
+    case EULER : SurfFlow_file <<  "\"Mach_Number\"" << "\n"; break;
+    case NAVIER_STOKES: case RANS:
+      if (nDim == 2) SurfFlow_file <<  "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Heat_Flux\"" << "\n";
+      if (nDim == 3) SurfFlow_file <<  "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Skin_Friction_Coefficient_Z\", \"Heat_Flux\"" << "\n";
+      break;
+  }
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        xCoord = geometry->node[iPoint]->GetCoord(0);
+        yCoord = geometry->node[iPoint]->GetCoord(1);
+        if (nDim == 3) zCoord = geometry->node[iPoint]->GetCoord(2);
+        
+        /*--- The output should be in inches ---*/
+        
+        if (config->GetSystemMeasurements() == US) {
+          xCoord *= 12.0; yCoord *= 12.0;
+          if (nDim == 3) zCoord *= 12.0;
+        }
+        
+        Pressure = FlowSolver->node[iPoint]->GetPressure();
+        PressCoeff = FlowSolver->GetCPressure(iMarker, iVertex);
+        SurfFlow_file << scientific << Global_Index << ", " << xCoord << ", " << yCoord << ", ";
+        if (nDim == 3) SurfFlow_file << scientific << zCoord << ", ";
+        SurfFlow_file << scientific << Pressure << ", " << PressCoeff << ", ";
+        switch (solver) {
+          case EULER : case FEM_EULER:
+            Mach = sqrt(FlowSolver->node[iPoint]->GetVelocity2()) / FlowSolver->node[iPoint]->GetSoundSpeed();
+            SurfFlow_file << scientific << Mach << "\n";
+            break;
+          case NAVIER_STOKES: case RANS: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+            for (iDim = 0; iDim < nDim; iDim++)
+              SkinFrictionCoeff[iDim] = FlowSolver->GetCSkinFriction(iMarker, iVertex, iDim);
+            HeatFlux = FlowSolver->GetHeatFlux(iMarker, iVertex);
+            
+            if (nDim == 2) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << HeatFlux << "\n";
+            if (nDim == 3) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << SkinFrictionCoeff[2] << ", " << HeatFlux << "\n";
+            
+            break;
+        }
+      }
+    }
+  }
+  
+  SurfFlow_file.close();
+  
+#else
+  
+  int iProcessor, nProcessor = size;
+
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long nVertex_Surface = 0, nLocalVertex_Surface = 0;
+  unsigned long MaxLocalVertex_Surface = 0;
+  
+  /*--- Find the max number of surface vertices among all
+   partitions and set up buffers. The master node will handle the
+   writing of the CSV file after gathering all of the data. ---*/
+  
+  nLocalVertex_Surface = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface++;
+      }
+  
+  /*--- Communicate the number of local vertices on each partition
+   to the master node ---*/
+  
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
+  
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Send and Recv buffers ---*/
+  
+  su2double *Buffer_Send_Coord_x = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_Coord_x = NULL;
+  
+  su2double *Buffer_Send_Coord_y = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_Coord_y = NULL;
+  
+  su2double *Buffer_Send_Coord_z = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_Coord_z = NULL;
+  
+  su2double *Buffer_Send_Press = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_Press = NULL;
+  
+  su2double *Buffer_Send_CPress = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_CPress = NULL;
+  
+  su2double *Buffer_Send_Mach = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_Mach = NULL;
+  
+  su2double *Buffer_Send_SkinFriction_x = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_SkinFriction_x = NULL;
+  
+  su2double *Buffer_Send_SkinFriction_y = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_SkinFriction_y = NULL;
+  
+  su2double *Buffer_Send_SkinFriction_z = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_SkinFriction_z = NULL;
+  
+  su2double *Buffer_Send_HeatTransfer = new su2double [MaxLocalVertex_Surface];
+  su2double *Buffer_Recv_HeatTransfer = NULL;
+  
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  
+  /*--- Prepare the receive buffers on the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if (nDim == 3) Buffer_Recv_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_Press   = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_CPress  = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_Mach    = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_SkinFriction_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_SkinFriction_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if (nDim == 3) Buffer_Recv_SkinFriction_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_HeatTransfer = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
+  }
+  
+  /*--- Loop over all vertices in this partition and load the
+   data of the specified type into the buffer to be sent to
+   the master node. ---*/
+  
+  nVertex_Surface = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if (geometry->node[iPoint]->GetDomain()) {
+          Buffer_Send_Press[nVertex_Surface] = FlowSolver->node[iPoint]->GetPressure();
+          Buffer_Send_CPress[nVertex_Surface] = FlowSolver->GetCPressure(iMarker, iVertex);
+          Buffer_Send_Coord_x[nVertex_Surface] = geometry->node[iPoint]->GetCoord(0);
+          Buffer_Send_Coord_y[nVertex_Surface] = geometry->node[iPoint]->GetCoord(1);
+          if (nDim == 3) { Buffer_Send_Coord_z[nVertex_Surface] = geometry->node[iPoint]->GetCoord(2); }
+          
+          /*--- If US system, the output should be in inches ---*/
+          
+          if (config->GetSystemMeasurements() == US) {
+            Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
+            Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
+            if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
+          }
+          
+          Buffer_Send_GlobalIndex[nVertex_Surface] = geometry->node[iPoint]->GetGlobalIndex();
+          
+          if (solver == EULER || solver == FEM_EULER)
+            Buffer_Send_Mach[nVertex_Surface] = sqrt(FlowSolver->node[iPoint]->GetVelocity2()) / FlowSolver->node[iPoint]->GetSoundSpeed();
+
+          if (solver == NAVIER_STOKES     || solver == RANS     ||
+              solver == FEM_NAVIER_STOKES || solver == FEM_RANS || solver == FEM_LES) {
+            Buffer_Send_SkinFriction_x[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 0);
+            Buffer_Send_SkinFriction_y[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 1);
+            if (nDim == 3) Buffer_Send_SkinFriction_z[nVertex_Surface] = FlowSolver->GetCSkinFriction(iMarker, iVertex, 2);
+            Buffer_Send_HeatTransfer[nVertex_Surface] = FlowSolver->GetHeatFlux(iMarker, iVertex);
+          }
+          nVertex_Surface++;
+        }
+      }
+  
+  /*--- Send the information to the master node ---*/
+  
+  SU2_MPI::Gather(Buffer_Send_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Press, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Press, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_CPress, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_CPress, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (solver == EULER || solver == FEM_EULER) SU2_MPI::Gather(Buffer_Send_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if ((solver == NAVIER_STOKES) || (solver == RANS) || (solver == FEM_NAVIER_STOKES) || (solver == FEM_RANS) || (solver == FEM_LES)) {
+    SU2_MPI::Gather(Buffer_Send_SkinFriction_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_SkinFriction_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_SkinFriction_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_SkinFriction_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_HeatTransfer, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_HeatTransfer, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- The master node unpacks the data and writes the surface CSV file ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Write file name with extension if unsteady ---*/
+    char buffer[50];
+    string filename = config->GetSurfFlowCoeff_FileName();
+    ofstream SurfFlow_file;
+    
+    /*--- Write file name with extension if unsteady ---*/
+    strcpy (cstr, filename.c_str());
+    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+      SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+      
+    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+      if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+    }
+    else
+      SPRINTF (buffer, ".csv");
+    
+    strcat (cstr, buffer);
+    SurfFlow_file.precision(15);
+    SurfFlow_file.open(cstr, ios::out);
+    
+    SurfFlow_file << "\"Global_Index\", \"x_coord\", \"y_coord\", ";
+    if (nDim == 3) SurfFlow_file << "\"z_coord\", ";
+    SurfFlow_file << "\"Pressure\", \"Pressure_Coefficient\", ";
+    
+    switch (solver) {
+      case EULER : case FEM_EULER: SurfFlow_file <<  "\"Mach_Number\"" << "\n"; break;
+      case NAVIER_STOKES: case RANS: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+        if (nDim == 2) SurfFlow_file << "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Heat_Flux\"" << "\n";
+        if (nDim == 3) SurfFlow_file << "\"Skin_Friction_Coefficient_X\", \"Skin_Friction_Coefficient_Y\", \"Skin_Friction_Coefficient_Z\", \"Heat_Flux\"" << "\n";
+        break;
+    }
+    
+    /*--- Loop through all of the collected data and write each node's values ---*/
+    
+    unsigned long Total_Index;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+        
+        /*--- Current index position and global index ---*/
+        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
+        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
+        
+        /*--- Retrieve the merged data for this node ---*/
+        xCoord = Buffer_Recv_Coord_x[Total_Index];
+        yCoord = Buffer_Recv_Coord_y[Total_Index];
+        if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+        Pressure   = Buffer_Recv_Press[Total_Index];
+        PressCoeff = Buffer_Recv_CPress[Total_Index];
+        
+        /*--- Write the first part of the data ---*/
+        SurfFlow_file << scientific << Global_Index << ", " << xCoord << ", " << yCoord << ", ";
+        if (nDim == 3) SurfFlow_file << scientific << zCoord << ", ";
+        SurfFlow_file << scientific << Pressure << ", " << PressCoeff << ", ";
+        
+        /*--- Write the solver-dependent part of the data ---*/
+        switch (solver) {
+          case EULER :
+          case FEM_EULER:
+            Mach = Buffer_Recv_Mach[Total_Index];
+            SurfFlow_file << scientific << Mach << "\n";
+            break;
+          case NAVIER_STOKES: case RANS:
+          case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+            SkinFrictionCoeff[0] = Buffer_Recv_SkinFriction_x[Total_Index];
+            SkinFrictionCoeff[1] = Buffer_Recv_SkinFriction_y[Total_Index];
+            if (nDim == 3) SkinFrictionCoeff[2] = Buffer_Recv_SkinFriction_z[Total_Index];
+            HeatFlux = Buffer_Recv_HeatTransfer[Total_Index];
+            if (nDim == 2) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << HeatFlux << "\n";
+            if (nDim == 3) SurfFlow_file << scientific << SkinFrictionCoeff[0] << ", " << SkinFrictionCoeff[1] << ", " << SkinFrictionCoeff[2] << ", " << HeatFlux << "\n";
+            break;
+        }
+      }
+    }
+    
+    /*--- Close the CSV file ---*/
+    SurfFlow_file.close();
+    
+    /*--- Release the recv buffers on the master node ---*/
+    
+    delete [] Buffer_Recv_Coord_x;
+    delete [] Buffer_Recv_Coord_y;
+    if (nDim == 3) delete [] Buffer_Recv_Coord_z;
+    delete [] Buffer_Recv_Press;
+    delete [] Buffer_Recv_CPress;
+    delete [] Buffer_Recv_Mach;
+    delete [] Buffer_Recv_SkinFriction_x;
+    delete [] Buffer_Recv_SkinFriction_y;
+    if (nDim == 3) delete [] Buffer_Recv_SkinFriction_z;
+    delete [] Buffer_Recv_HeatTransfer;
+    delete [] Buffer_Recv_GlobalIndex;
+    
+    delete [] Buffer_Recv_nVertex;
+    
+  }
+  
+  /*--- Release the memory for the remaining buffers and exit ---*/
+  
+  delete [] Buffer_Send_Coord_x;
+  delete [] Buffer_Send_Coord_y;
+  delete [] Buffer_Send_Coord_z;
+  delete [] Buffer_Send_Press;
+  delete [] Buffer_Send_CPress;
+  delete [] Buffer_Send_Mach;
+  delete [] Buffer_Send_SkinFriction_x;
+  delete [] Buffer_Send_SkinFriction_y;
+  delete [] Buffer_Send_SkinFriction_z;
+  delete [] Buffer_Send_HeatTransfer;
+  delete [] Buffer_Send_GlobalIndex;
+  
+#endif
+  
+}
+
+void COutputLegacy::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry, CSolver *AdjSolver, CSolver *FlowSolution, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_iInst) {
+  
+#ifndef HAVE_MPI
+  
+  unsigned long iPoint, iVertex, Global_Index;
+  su2double *Solution, xCoord, yCoord, zCoord;
+  unsigned short iMarker;
+  char cstr[200], buffer[50];
+  ofstream SurfAdj_file;
+  
+  /*--- Write file name with extension if unsteady ---*/
+  
+  strcpy (cstr, config->GetSurfAdjCoeff_FileName().c_str());
+  
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+    
+  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+  }
+  else
+    SPRINTF (buffer, ".csv");
+  
+  strcat(cstr, buffer);
+  SurfAdj_file.precision(15);
+  SurfAdj_file.open(cstr, ios::out);
+  
+  SurfAdj_file << "SENS_AOA=" << AdjSolver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+
+  if (geometry->GetnDim() == 2) {
+    if (config ->GetKind_Regime() == COMPRESSIBLE)
+      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"PsiE\",\"x_coord\",\"y_coord\"";
+    else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
+      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"x_coord\",\"y_coord\"";
+
+    if (config->GetDiscrete_Adjoint()) {
+      SurfAdj_file << ",\"x_Sens\",\"y_Sens\"";
+    }
+    SurfAdj_file << "\n";
+    
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_Plotting(iMarker) == YES)
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+          Solution = AdjSolver->node[iPoint]->GetSolution();
+          xCoord = geometry->node[iPoint]->GetCoord(0);
+          yCoord = geometry->node[iPoint]->GetCoord(1);
+          
+          /*--- If US system, the output should be in inches ---*/
+          
+          if (config->GetSystemMeasurements() == US) {
+            xCoord *= 12.0;
+            yCoord *= 12.0;
+          }
+          if (config ->GetKind_Regime() == COMPRESSIBLE)
+            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
+                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] <<", " << xCoord <<", "<< yCoord;
+          else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
+              SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
+                           << Solution[1] << ", " << Solution[2] <<", " << xCoord <<", "<< yCoord;
+          if (config->GetDiscrete_Adjoint()) {
+            SurfAdj_file << ", " << AdjSolver->node[iPoint]->GetSensitivity(0) << ", " << AdjSolver->node[iPoint]->GetSensitivity(1);
+          }
+          SurfAdj_file << "\n";
+        }
+    }
+  }
+  
+  if (geometry->GetnDim() == 3) {
+    if (config ->GetKind_Regime() == COMPRESSIBLE)
+      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"PsiE\",\"x_coord\",\"y_coord\",\"z_coord\"";
+    else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
+      SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"x_coord\",\"y_coord\",\"z_coord\"";
+
+    if (config->GetDiscrete_Adjoint()) {
+      SurfAdj_file << ",\"x_Sens\",\"y_Sens\",\"z_Sens\"";
+    }
+    SurfAdj_file << "\n";
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_Plotting(iMarker) == YES)
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+          Solution = AdjSolver->node[iPoint]->GetSolution();
+          
+          xCoord = geometry->node[iPoint]->GetCoord(0);
+          yCoord = geometry->node[iPoint]->GetCoord(1);
+          zCoord = geometry->node[iPoint]->GetCoord(2);
+          
+          /*--- If US system, the output should be in inches ---*/
+          
+          if (config->GetSystemMeasurements() == US) {
+            xCoord *= 12.0;
+            yCoord *= 12.0;
+            zCoord *= 12.0;
+          }
+          if (config ->GetKind_Regime() == COMPRESSIBLE)
+            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
+                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] << ", " << Solution[4] << ", "<< xCoord <<", "<< yCoord <<", "<< zCoord;
+          else if (config ->GetKind_Regime() == INCOMPRESSIBLE)
+            SurfAdj_file << scientific << Global_Index << ", " << AdjSolver->GetCSensitivity(iMarker, iVertex) << ", " << Solution[0] << ", "
+                         << Solution[1] << ", " << Solution[2] << ", " << Solution[3] << ", " << xCoord <<", "<< yCoord <<", "<< zCoord;
+          if (config->GetDiscrete_Adjoint()) {
+            SurfAdj_file << ", " << AdjSolver->node[iPoint]->GetSensitivity(0) << ", " << AdjSolver->node[iPoint]->GetSensitivity(1)
+            << ", " << AdjSolver->node[iPoint]->GetSensitivity(2);
+          }
+          SurfAdj_file << "\n";
+        }
+    }
+  }
+  
+  SurfAdj_file.close();
+  
+#else
+  int iProcessor, nProcessor = size;
+
+  unsigned short nDim = geometry->GetnDim(), iMarker;
+  su2double *Solution, *Coord;
+  unsigned long Buffer_Send_nVertex[1], iVertex, iPoint, nVertex_Surface = 0, nLocalVertex_Surface = 0,
+  MaxLocalVertex_Surface = 0, nBuffer_Scalar;
+  unsigned long *Buffer_Receive_nVertex = NULL;
+  ofstream SurfAdj_file;
+  
+  /*--- Write the surface .csv file ---*/
+  nLocalVertex_Surface = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface ++;
+      }
+  
+  if (rank == MASTER_NODE)
+    Buffer_Receive_nVertex = new unsigned long [nProcessor];
+  
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  su2double *Buffer_Send_Coord_x = new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Coord_y= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Coord_z= new su2double[MaxLocalVertex_Surface];
+  unsigned long *Buffer_Send_GlobalPoint= new unsigned long[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Sensitivity= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_PsiRho= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Phi_x= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Phi_y= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_Phi_z= new su2double[MaxLocalVertex_Surface];
+  su2double *Buffer_Send_PsiE = NULL;
+
+  if (config ->GetKind_Regime() == COMPRESSIBLE)
+    Buffer_Send_PsiE =  new su2double[MaxLocalVertex_Surface];
+
+  su2double *Buffer_Send_Sens_x = NULL, *Buffer_Send_Sens_y = NULL, *Buffer_Send_Sens_z = NULL;
+  
+  if (config->GetDiscrete_Adjoint()) {
+    Buffer_Send_Sens_x = new su2double[MaxLocalVertex_Surface];
+    Buffer_Send_Sens_y = new su2double[MaxLocalVertex_Surface];
+    if (nDim == 3) {
+      Buffer_Send_Sens_z = new su2double[MaxLocalVertex_Surface];
+    }
+  }
+  
+  nVertex_Surface = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if (geometry->node[iPoint]->GetDomain()) {
+          Solution = AdjSolver->node[iPoint]->GetSolution();
+          //Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+          Coord = geometry->node[iPoint]->GetCoord();
+          //d = AdjSolver->node[iPoint]->GetForceProj_Vector();
+          Buffer_Send_GlobalPoint[nVertex_Surface] = geometry->node[iPoint]->GetGlobalIndex();
+          Buffer_Send_Coord_x[nVertex_Surface] = Coord[0];
+          Buffer_Send_Coord_y[nVertex_Surface] = Coord[1];
+          Buffer_Send_Sensitivity[nVertex_Surface] =  AdjSolver->GetCSensitivity(iMarker, iVertex);
+          Buffer_Send_PsiRho[nVertex_Surface] = Solution[0];
+          Buffer_Send_Phi_x[nVertex_Surface] = Solution[1];
+          Buffer_Send_Phi_y[nVertex_Surface] = Solution[2];
+          if ((nDim == 2) && (config->GetKind_Regime() == COMPRESSIBLE)) Buffer_Send_PsiE[nVertex_Surface] = Solution[3];
+          if (nDim == 3) {
+            Buffer_Send_Coord_z[nVertex_Surface] = Coord[2];
+            Buffer_Send_Phi_z[nVertex_Surface] = Solution[3];
+            if(config->GetKind_Regime() == COMPRESSIBLE) Buffer_Send_PsiE[nVertex_Surface] = Solution[4];
+          }
+          if (config->GetDiscrete_Adjoint()) {
+            Buffer_Send_Sens_x[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(0);
+            Buffer_Send_Sens_y[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(1);
+            if (nDim == 3) {
+              Buffer_Send_Sens_z[nVertex_Surface] = AdjSolver->node[iPoint]->GetSensitivity(2);
+            }
+          }
+          
+          /*--- If US system, the output should be in inches ---*/
+          
+          if (config->GetSystemMeasurements() == US) {
+            Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
+            Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
+            if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
+          }
+          
+          nVertex_Surface++;
+        }
+      }
+  
+  su2double *Buffer_Receive_Coord_x = NULL, *Buffer_Receive_Coord_y = NULL, *Buffer_Receive_Coord_z = NULL, *Buffer_Receive_Sensitivity = NULL,
+  *Buffer_Receive_PsiRho = NULL, *Buffer_Receive_Phi_x = NULL, *Buffer_Receive_Phi_y = NULL, *Buffer_Receive_Phi_z = NULL,
+  *Buffer_Receive_PsiE = NULL, *Buffer_Receive_Sens_x = NULL, *Buffer_Receive_Sens_y = NULL, *Buffer_Receive_Sens_z = NULL;
+  unsigned long *Buffer_Receive_GlobalPoint = NULL;
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Receive_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if (nDim == 3) Buffer_Receive_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_GlobalPoint = new unsigned long [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_Sensitivity = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_PsiRho = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_Phi_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+    Buffer_Receive_Phi_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if (nDim == 3) Buffer_Receive_Phi_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if  (config->GetKind_Regime() == COMPRESSIBLE)
+      Buffer_Receive_PsiE = new su2double [nProcessor*MaxLocalVertex_Surface];
+    if (config->GetDiscrete_Adjoint()) {
+      Buffer_Receive_Sens_x = new su2double[nProcessor*MaxLocalVertex_Surface];
+      Buffer_Receive_Sens_y = new su2double[nProcessor*MaxLocalVertex_Surface];
+      if (nDim == 3) {
+        Buffer_Receive_Sens_z = new su2double[nProcessor*MaxLocalVertex_Surface];
+      }
+    }
+  }
+  
+  nBuffer_Scalar = MaxLocalVertex_Surface;
+  
+  /*--- Send the information to the Master node ---*/
+  SU2_MPI::Gather(Buffer_Send_Coord_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Coord_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Coord_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_GlobalPoint, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Receive_GlobalPoint, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Sensitivity, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sensitivity, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_PsiRho, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_PsiRho, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Phi_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Phi_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Phi_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Phi_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (config->GetKind_Regime() == COMPRESSIBLE)
+      SU2_MPI::Gather(Buffer_Send_PsiE, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_PsiE, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (config->GetDiscrete_Adjoint()) {
+    SU2_MPI::Gather(Buffer_Send_Sens_x, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_x, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Sens_y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (nDim == 3) {
+      SU2_MPI::Gather(Buffer_Send_Sens_z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Receive_Sens_z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    }
+  }
+  
+  /*--- The master node is the one who writes the surface files ---*/
+  if (rank == MASTER_NODE) {
+    unsigned long iVertex, GlobalPoint, position;
+    char cstr[200], buffer[50];
+    ofstream SurfAdj_file;
+    string filename = config->GetSurfAdjCoeff_FileName();
+    
+    /*--- Write file name with extension if unsteady ---*/
+    strcpy (cstr, filename.c_str());
+    
+    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+      SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
+      
+    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+      if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.csv", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.csv", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+    }
+    else
+      SPRINTF (buffer, ".csv");
+    
+    strcat (cstr, buffer);
+    SurfAdj_file.open(cstr, ios::out);
+    SurfAdj_file.precision(15);
+    
+    SurfAdj_file << "SENS_AOA=" << AdjSolver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+
+    /*--- Write the 2D surface flow coefficient file ---*/
+    if (geometry->GetnDim() == 2) {
+      if (config->GetKind_Regime() == COMPRESSIBLE)
+        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"PsiE\",\"x_coord\",\"y_coord\"";
+      else if (config->GetKind_Regime() == INCOMPRESSIBLE)
+        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"x_coord\",\"y_coord\"";
+
+      if (config->GetDiscrete_Adjoint()) {
+        SurfAdj_file << ",\" x_Sens\",\"y_Sens\"";
+      }
+      SurfAdj_file << "\n";
+      
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
+        for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
+          
+          position = iProcessor*MaxLocalVertex_Surface+iVertex;
+          GlobalPoint = Buffer_Receive_GlobalPoint[position];
+
+          if (config->GetKind_Regime() == COMPRESSIBLE)
+            SurfAdj_file << scientific << GlobalPoint <<
+                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
+                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] <<
+                            ", " << Buffer_Receive_PsiE[position] << ", " << Buffer_Receive_Coord_x[position] <<
+                            ", "<< Buffer_Receive_Coord_y[position];
+          else if (config->GetKind_Regime() == INCOMPRESSIBLE)
+            SurfAdj_file << scientific << GlobalPoint <<
+                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
+                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] <<
+                            ", " << Buffer_Receive_Coord_x[position] <<
+                            ", "<< Buffer_Receive_Coord_y[position];
+          if (config->GetDiscrete_Adjoint()) {
+            SurfAdj_file << ", " << Buffer_Receive_Sens_x[position] << ", " << Buffer_Receive_Sens_y[position];
+          }
+          SurfAdj_file << "\n";
+        }
+    }
+    
+    /*--- Write the 3D surface flow coefficient file ---*/
+    if (geometry->GetnDim() == 3) {
+      if (config->GetKind_Regime() == COMPRESSIBLE)
+        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"PsiE\",\"x_coord\",\"y_coord\",\"z_coord\"";
+      else if (config->GetKind_Regime() == INCOMPRESSIBLE)
+        SurfAdj_file <<  "\"Point\",\"Sensitivity\",\"PsiRho\",\"Phi_x\",\"Phi_y\",\"Phi_z\",\"x_coord\",\"y_coord\",\"z_coord\"";
+
+      if (config->GetDiscrete_Adjoint()) {
+        SurfAdj_file << ",\"x_Sens\",\"y_Sens\",\"z_Sens\"";
+      }
+      SurfAdj_file << "\n";
+      
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
+        for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
+          position = iProcessor*MaxLocalVertex_Surface+iVertex;
+          GlobalPoint = Buffer_Receive_GlobalPoint[position];
+          
+          if (config->GetKind_Regime() == COMPRESSIBLE)
+            SurfAdj_file << scientific << GlobalPoint <<
+                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
+                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] << ", " << Buffer_Receive_Phi_z[position] <<
+                            ", " << Buffer_Receive_PsiE[position] <<", "<< Buffer_Receive_Coord_x[position] <<
+                            ", "<< Buffer_Receive_Coord_y[position] <<", "<< Buffer_Receive_Coord_z[position];
+          else if (config->GetKind_Regime() == INCOMPRESSIBLE)
+            SurfAdj_file << scientific << GlobalPoint <<
+                            ", " << Buffer_Receive_Sensitivity[position] << ", " << Buffer_Receive_PsiRho[position] <<
+                            ", " << Buffer_Receive_Phi_x[position] << ", " << Buffer_Receive_Phi_y[position] << ", " << Buffer_Receive_Phi_z[position] <<
+                            ", "<< Buffer_Receive_Coord_x[position] <<
+                            ", "<< Buffer_Receive_Coord_y[position] <<", "<< Buffer_Receive_Coord_z[position];
+
+          if (config->GetDiscrete_Adjoint()) {
+            SurfAdj_file << ", " << Buffer_Receive_Sens_x[position] << ", " << Buffer_Receive_Sens_y[position] << ", " << Buffer_Receive_Sens_z[position];
+          }
+          SurfAdj_file << "\n";
+        }
+    }
+    
+  }
+  
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Receive_nVertex;
+    delete [] Buffer_Receive_Coord_x;
+    delete [] Buffer_Receive_Coord_y;
+    if (nDim == 3) delete [] Buffer_Receive_Coord_z;
+    delete [] Buffer_Receive_Sensitivity;
+    delete [] Buffer_Receive_PsiRho;
+    delete [] Buffer_Receive_Phi_x;
+    delete [] Buffer_Receive_Phi_y;
+    if (nDim == 3) delete [] Buffer_Receive_Phi_z;
+    if (config->GetKind_Regime() == COMPRESSIBLE)
+      delete [] Buffer_Receive_PsiE;
+    delete [] Buffer_Receive_GlobalPoint;
+    if (config->GetDiscrete_Adjoint()) {
+      delete [] Buffer_Receive_Sens_x;
+      delete [] Buffer_Receive_Sens_y;
+      if (nDim == 3) {
+        delete [] Buffer_Receive_Sens_z;
+      }
+    }
+  }
+  
+  delete [] Buffer_Send_Coord_x;
+  delete [] Buffer_Send_Coord_y;
+  delete [] Buffer_Send_Coord_z;
+  delete [] Buffer_Send_GlobalPoint;
+  delete [] Buffer_Send_Sensitivity;
+  delete [] Buffer_Send_PsiRho;
+  delete [] Buffer_Send_Phi_x;
+  delete [] Buffer_Send_Phi_y;
+  delete [] Buffer_Send_Phi_z;
+  delete [] Buffer_Send_PsiE;
+  if (Buffer_Send_Sens_x != NULL) delete [] Buffer_Send_Sens_x;
+  if (Buffer_Send_Sens_y != NULL) delete [] Buffer_Send_Sens_y;
+  if (Buffer_Send_Sens_z != NULL) delete [] Buffer_Send_Sens_z;
+  
+  SurfAdj_file.close();
+  
+#endif
+}
+
+void COutputLegacy::MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+  
+  /*--- Flags identifying the types of files to be written. ---*/
+  
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+  
+  /*--- Merge connectivity for each type of element (excluding halos). Note
+   that we only need to merge the connectivity once, as it does not change
+   during computation. Check whether the base file has been written. ---*/
+  
+  /*--- Merge volumetric grid. ---*/
+  
+  if (Wrt_Vol) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
+      cout <<"Merging volumetric triangle grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, TRIANGLE    );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
+      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, QUADRILATERAL   );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
+      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, TETRAHEDRON );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
+      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, HEXAHEDRON  );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
+      cout <<"Merging volumetric prism grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, PRISM       );
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
+      cout <<"Merging volumetric pyramid grid connectivity." << endl;
+    MergeVolumetricConnectivity(config, geometry, PYRAMID     );
+    
+  }
+  
+  /*--- Merge surface grid. ---*/
+  
+  if (Wrt_Srf) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
+      cout <<"Merging surface line grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, LINE);
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
+      cout <<"Merging surface triangle grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, TRIANGLE);
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
+      cout <<"Merging surface quadrilateral grid connectivity." << endl;
+    MergeSurfaceConnectivity(config, geometry, QUADRILATERAL);
+    
+  }
+  
+  /*--- Update total number of volume elements after merge. ---*/
+  
+  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
+  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
+  
+  /*--- Update total number of surface elements after merge. ---*/
+  
+  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
+  
+}
+
+void COutputLegacy::MergeCoordinates(CConfig *config, CGeometry *geometry) {
+  
+  /*--- Local variables needed on all processors ---*/
+  
+  unsigned short iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint;
+  
+  unsigned short kind_SU2 = config->GetKind_SU2();
+  
+#ifndef HAVE_MPI
+  
+  /*--- In serial, the single process has access to all geometry, so simply
+   load the coordinates into the data structure. ---*/
+  
+  unsigned short iMarker;
+  unsigned long iVertex, nTotalPoints = 0;
+  int SendRecv;
+  
+  bool isPeriodic;
+  
+  /*--- First, create a structure to locate any periodic halo nodes ---*/
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+
+        /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
+         * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
+         * is different in each case ---*/
+
+        if (kind_SU2 == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+
+        if (isPeriodic && (SendRecv < 0)) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+      
+    }
+  }
+  
+  /*--- Total number of points in the mesh (this might include periodic points). ---*/
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (!Local_Halo[iPoint]) nTotalPoints++;
+  
+  nGlobal_Poin = nTotalPoints;
+  nGlobal_Doma = geometry->GetnPointDomain();
+  
+  /*--- Allocate the coordinates data structure. ---*/
+  
+  Coords = new su2double*[nDim];
+  for (iDim = 0; iDim < nDim; iDim++) {
+    Coords[iDim] = new su2double[nGlobal_Poin];
+  }
+  
+  /*--- Loop over the mesh to collect the coords of the local points ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check if the node belongs to the domain (i.e, not a halo node).
+     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
+    
+    if (!Local_Halo[iPoint]) {
+      
+      /*--- Retrieve the current coordinates at this node. ---*/
+      
+      unsigned long iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      for (iDim = 0; iDim < nDim; iDim++) {
+        Coords[iDim][iGlobal_Index] = geometry->node[iPoint]->GetCoord(iDim);
+        
+        /*--- If US system, the output should be in inches ---*/
+        
+        if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+          Coords[iDim][iGlobal_Index] *= 12.0;
+        }
+        
+      }
+      
+    }
+  }
+  
+  
+  delete [] Local_Halo;
+  
+#else
+  
+  /*--- MPI preprocessing ---*/
+  int iProcessor, nProcessor = size;
+  unsigned long jPoint;
+
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
+  
+  /*--- Local variables needed for merging the geometry with MPI. ---*/
+  
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  
+  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
+  
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+
+          /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
+           * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
+           * is different in each case ---*/
+
+          if (kind_SU2 == SU2_DEF) {
+            isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+          }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          }
+          if (isPeriodic) {
+            Local_Halo[iPoint] = false;
+          }
+        }
+      }
+    }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+  }
+  Buffer_Send_nPoin[0] = nLocalPoint;
+  
+  /*--- Communicate the total number of nodes on this domain. ---*/
+  
+  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  
+  if (rank == MASTER_NODE) {
+    nGlobal_Doma = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
+    }
+  }
+  nBuffer_Scalar = MaxLocalPoint;
+  
+  /*--- Send and Recv buffers. ---*/
+  
+  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_X = NULL;
+  
+  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Y = NULL;
+  
+  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
+  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
+  
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  
+  /*--- Prepare the receive buffers in the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
+    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
+    }
+    Coords = new su2double*[nDim];
+    for (iDim = 0; iDim < nDim; iDim++) {
+      Coords[iDim] = new su2double[nGlobal_Poin];
+    }
+  }
+  
+  /*--- Main communication routine. Loop over each coordinate and perform
+   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
+   all nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+  
+  /*--- Loop over this partition to collect the coords of the local points. ---*/
+  su2double *Coords_Local; jPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos and write only if requested ---*/
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      /*--- Retrieve local coordinates at this node. ---*/
+      Coords_Local = geometry->node[iPoint]->GetCoord();
+      
+      /*--- Load local coords into the temporary send buffer. ---*/
+      Buffer_Send_X[jPoint] = Coords_Local[0];
+      Buffer_Send_Y[jPoint] = Coords_Local[1];
+      if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
+      
+      /*--- If US system, the output should be in inches ---*/
+      
+      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+        Buffer_Send_X[jPoint] *= 12.0;
+        Buffer_Send_Y[jPoint] *= 12.0;
+        if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+      }
+      
+      /*--- Store the global index for this local node. ---*/
+      Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Increment jPoint as the counter. We need this because iPoint
+       may include halo nodes that we skip over during this loop. ---*/
+      jPoint++;
+    }
+  }
+  
+  /*--- Gather the coordinate data on the master node using MPI. ---*/
+  
+  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) {
+    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- The master node unpacks and sorts this variable by global index ---*/
+  
+  if (rank == MASTER_NODE) {
+    jPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        /*--- Get global index, then loop over each variable and store ---*/
+        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+        if (iGlobal_Index >= nGlobal_Poin) {
+          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
+        }
+        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
+        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
+        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
+        jPoint++;
+      }
+      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+      jPoint = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+  
+  /*--- Immediately release the temporary data buffers. ---*/
+  
+  delete [] Local_Halo;
+  delete [] Buffer_Send_X;
+  delete [] Buffer_Send_Y;
+  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_X;
+    delete [] Buffer_Recv_Y;
+    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
+    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nPoin;
+  }
+  
+#endif
+  
+}
+
+void COutputLegacy::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  int iProcessor;
+  unsigned short NODES_PER_ELEMENT = 0;
+  unsigned long iPoint, iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
+  
+  unsigned long iVertex, iMarker;
+  unsigned long jElem;
+  int SendRecv, RecvFrom;
+  
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
+  
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  unsigned short kind_SU2 = config->GetKind_SU2();
+  
+  int *Conn_Elem = NULL;
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nLocalElem = geometry->GetnElemTria();
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      nLocalElem = geometry->GetnElemQuad();
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      nLocalElem = geometry->GetnElemTetr();
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      nLocalElem = geometry->GetnElemHexa();
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      nLocalElem = geometry->GetnElemPris();
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      nLocalElem = geometry->GetnElemPyra();
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+  
+  /*--- Find the max number of this element type among all
+   partitions and set up buffers. ---*/
+  
+  Buffer_Send_nElem[0] = nLocalElem;
+  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalElem = nLocalElem;
+  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+#endif
+  
+  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+  
+  /*--- Send and Recv buffers ---*/
+  
+  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
+  unsigned long *Buffer_Recv_Elem = NULL;
+  
+  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
+  unsigned short *Buffer_Recv_Halo = NULL;
+  
+  /*--- Prepare the receive buffers on the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
+    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
+    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that we part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (kind_SU2 != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found ---*/
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (kind_SU2 == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--- Loop over all elements in this partition and load the
+   elements of the current type into the buffer to be sent to
+   the master node. ---*/
+  
+  jNode = 0; jElem = 0;
+  for (iElem = 0; iElem < geometry->GetnElem(); iElem++) {
+    if (geometry->elem[iElem]->GetVTK_Type() == Elem_Type) {
+      
+      /*--- Loop over all nodes in this element and load the
+       connectivity into the send buffer. ---*/
+      
+      Buffer_Send_Halo[jElem] = false;
+      for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+        
+        /*--- Store the global index values directly. ---*/
+        
+        iPoint = geometry->elem[iElem]->GetNode(iNode);
+        Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Check if this is a halo node. If so, flag this element
+         as a halo cell. We will use this later to sort and remove
+         any duplicates from the connectivity list. ---*/
+        
+        if (Local_Halo[iPoint]) {
+          Buffer_Send_Halo[jElem] = true;
+        }
+        
+        /*--- Increment jNode as the counter. We need this because iElem
+         may include other elements that we skip over during this loop. ---*/
+        
+        jNode++;
+      }
+      jElem++;
+    }
+  }
+  
+  /*--- Gather the element connectivity information. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
+  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+#endif
+  
+  /*--- The master node unpacks and sorts the connectivity. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*---  We need to remove any duplicate elements (halo cells) that
+     exist on multiple partitions. Start by initializing all elements
+     to the "write" state by using a boolean array. ---*/
+    
+    Write_Elem = new bool[size*MaxLocalElem];
+    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
+      Write_Elem[iElem] = true;
+    }
+    
+    /*--- Remove the rind layer from the solution only if requested ---*/
+    
+    if (!Wrt_Halo) {
+      
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
+      
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+          
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
+          
+        }
+        kElem = (iProcessor+1)*MaxLocalElem;
+      }
+    }
+    
+    /*--- Store the unique connectivity list for this element type. ---*/
+    
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+        
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
+          
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
+          
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+          
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
+          }
+        }
+      }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+  
+  /*--- Immediately release the temporary buffers. ---*/
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] Local_Halo;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
+  }
+  
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  if (rank == MASTER_NODE) {
+    switch (Elem_Type) {
+      case TRIANGLE:
+        nGlobal_Tria = nElem_Total;
+        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_Quad = nElem_Total;
+        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
+        break;
+      case TETRAHEDRON:
+        nGlobal_Tetr = nElem_Total;
+        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
+        break;
+      case HEXAHEDRON:
+        nGlobal_Hexa = nElem_Total;
+        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
+        break;
+      case PRISM:
+        nGlobal_Pris = nElem_Total;
+        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
+        break;
+      case PYRAMID:
+        nGlobal_Pyra = nElem_Total;
+        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
+    }
+  }
+  
+}
+
+void COutputLegacy::MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  unsigned short NODES_PER_ELEMENT;
+  
+  unsigned short iMarker;
+  unsigned long iPoint, iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
+  
+  int iProcessor;
+  unsigned long jElem;
+  
+  unsigned long iVertex;
+  
+  int SendRecv, RecvFrom;
+  
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
+  
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic;
+  
+  
+  int *Conn_Elem = NULL;
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  nLocalElem = 0;
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
+        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
+          nLocalElem++;
+        }
+      }
+    }
+  }
+  
+  switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      NODES_PER_ELEMENT = 0;
+      break;
+  }
+  
+  /*--- Find the max number of this element type among all
+   partitions and set up buffers. ---*/
+  
+  Buffer_Send_nElem[0] = nLocalElem;
+  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalElem = nLocalElem;
+  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+#endif
+  
+  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+  
+  /*--- Send and Recv buffers ---*/
+  
+  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
+  unsigned long *Buffer_Recv_Elem = NULL;
+  
+  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
+  unsigned short *Buffer_Recv_Halo = NULL;
+  
+  /*--- Prepare the receive buffers on the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
+    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
+    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that we part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+            (SendRecv < 0)) {
+          Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found ---*/
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain ---*/
+        notPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                       (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
+                       (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--- Loop over all elements in this partition and load the
+   elements of the current type into the buffer to be sent to
+   the master node. ---*/
+  jNode = 0; jElem = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES)
+      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
+        
+        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
+          
+          /*--- Loop over all nodes in this element and load the
+           connectivity into the send buffer. ---*/
+          
+          Buffer_Send_Halo[jElem] = false;
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            
+            /*--- Store the global index values directly. ---*/
+            
+            iPoint = geometry->bound[iMarker][iElem]->GetNode(iNode);
+            Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. ---*/
+            
+            if (Local_Halo[iPoint])
+              Buffer_Send_Halo[jElem] = true;
+            
+            /*--- Increment jNode as the counter. We need this because iElem
+             may include other elements that we skip over during this loop. ---*/
+            
+            jNode++;
+          }
+          jElem++;
+        }
+      }
+  
+  /*--- Gather the element connectivity information. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
+  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+#endif
+  
+  /*--- The master node unpacks and sorts the connectivity. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*---  We need to remove any duplicate elements (halo cells) that
+     exist on multiple partitions. Start by initializing all elements
+     to the "write" state by using a boolean array. ---*/
+    
+    Write_Elem = new bool[size*MaxLocalElem];
+    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
+      Write_Elem[iElem] = true;
+    }
+    
+    /*--- Remove the rind layer from the solution only if requested ---*/
+    
+    if (!Wrt_Halo) {
+      
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
+      
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+          
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
+          
+        }
+        kElem = (iProcessor+1)*MaxLocalElem;
+      }
+    }
+    
+    /*--- Store the unique connectivity list for this element type. ---*/
+    
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+        
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
+          
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
+          
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+          
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
+          }
+        }
+      }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+  
+  /*--- Immediately release the temporary buffers. ---*/
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] Local_Halo;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
+  }
+  
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  if (rank == MASTER_NODE) {
+    switch (Elem_Type) {
+      case LINE:
+        nGlobal_Line = nElem_Total;
+        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
+        break;
+      case TRIANGLE:
+        nGlobal_BoundTria = nElem_Total;
+        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_BoundQuad = nElem_Total;
+        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
+    }
+  }
+  
+}
+
+void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  unsigned short Kind_Solver  = config->GetKind_Solver();
+  unsigned short iVar = 0, jVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
+  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
+  unsigned short iVar_GridVel = 0, iVar_PressCp = 0, iVar_Lam = 0, iVar_MachMean = 0,
+  iVar_ViscCoeffs = 0, iVar_HeatCoeffs = 0, iVar_Sens = 0, iVar_Extra = 0, iVar_Eddy = 0, iVar_Sharp = 0,
+  iVar_FEA_Vel = 0, iVar_FEA_Accel = 0, iVar_FEA_Stress = 0, iVar_FEA_Stress_3D = 0,
+  iVar_FEA_Extra = 0, iVar_SensDim = 0;
+  unsigned long iPoint = 0, jPoint = 0, iVertex = 0, iMarker = 0;
+  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
+  
+  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Sens = NULL;
+  
+  unsigned short CurrentIndex;
+  int *Local_Halo;
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
+  
+  int iProcessor;
+  
+  bool grid_movement  = (config->GetGrid_Movement());
+  bool compressible   = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool transition     = (config->GetKind_Trans_Model() == LM);
+  bool flow           = (( config->GetKind_Solver() == EULER             ) ||
+                         ( config->GetKind_Solver() == NAVIER_STOKES     ) ||
+                         ( config->GetKind_Solver() == RANS              ) ||
+                         ( config->GetKind_Solver() == FEM_EULER         ) ||
+                         ( config->GetKind_Solver() == FEM_NAVIER_STOKES ) ||
+                         ( config->GetKind_Solver() == FEM_RANS          ) ||
+                         ( config->GetKind_Solver() == FEM_LES           ) ||
+                         ( config->GetKind_Solver() == ADJ_EULER         ) ||
+                         ( config->GetKind_Solver() == ADJ_NAVIER_STOKES ) ||
+                         ( config->GetKind_Solver() == ADJ_RANS          )   );
+  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
+  
+  unsigned short iDim;
+  unsigned short nDim = geometry->GetnDim();
+  su2double RefArea = config->GetRefArea();
+  su2double Gamma = config->GetGamma();
+  su2double RefVel2, *Normal, Area;
+  
+  /*--- Set the non-dimensionalization ---*/
+  if (flow) {
+    if (grid_movement) {
+      Gas_Constant = config->GetGas_ConstantND();
+      Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+      Mach_Motion = config->GetMach_Motion();
+      RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+    }
+    else {
+      RefVel2 = 0.0;
+      for (iDim = 0; iDim < nDim; iDim++)
+        RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+    }
+    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+    RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+    factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+  }
+  
+  /*--- Prepare send buffers for the conservative variables. Need to
+   find the total number of conservative variables and also the
+   index for their particular solution container. ---*/
+  
+  switch (Kind_Solver) {
+    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; if(config->GetWeakly_Coupled_Heat()) SecondIndex = HEAT_SOL; else SecondIndex = NONE; ThirdIndex = NONE; break;
+    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; if (transition) ThirdIndex=TRANS_SOL; else ThirdIndex = NONE;  if(config->GetWeakly_Coupled_Heat()) ThirdIndex = HEAT_SOL; else ThirdIndex = NONE; break;
+    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case FEM_RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
+    case FEM_ELASTICITY: FirstIndex = FEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
+    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    default: SecondIndex = NONE; ThirdIndex = NONE; break;
+  }
+  
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
+  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
+  nVar_Total = nVar_Consv;
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the limiters ---*/
+    
+    if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
+    
+    /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
+    
+    if (grid_movement && !fem) {
+      iVar_GridVel = nVar_Total;
+      if (geometry->GetnDim() == 2) nVar_Total += 2;
+      else if (geometry->GetnDim() == 3) nVar_Total += 3;
+    }
+    
+    /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
+
+    if (Kind_Solver == EULER     || Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS ||
+        Kind_Solver == FEM_EULER || Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS ||
+        Kind_Solver == FEM_LES) {
+      iVar_PressCp = nVar_Total; nVar_Total += 3;
+      iVar_MachMean = nVar_Total; nVar_Total += 1;
+    }
+    
+    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+
+    if (Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS     ||
+        Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
+      iVar_Lam = nVar_Total;
+      nVar_Total += 1;
+      iVar_ViscCoeffs = nVar_Total;
+      if (geometry->GetnDim() == 2) nVar_Total += 2;
+      else if (geometry->GetnDim() == 3) nVar_Total += 3;
+      iVar_HeatCoeffs = nVar_Total;
+      nVar_Total += 2;
+    }
+    
+    /*--- Add Eddy Viscosity to the restart file ---*/
+
+    if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
+      iVar_Eddy = nVar_Total; nVar_Total += 1;
+    }
+    
+    /*--- Add Sharp edges to the restart file ---*/
+    
+    if (config->GetWrt_SharpEdges()) {
+      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+        iVar_Sharp = nVar_Total; nVar_Total += 1;
+      }
+    }
+    
+    
+    if (( Kind_Solver == ADJ_EULER              ) ||
+        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+        ( Kind_Solver == ADJ_RANS               )) {
+      iVar_Sens   = nVar_Total; nVar_Total += 2;
+    }
+    
+    if (Kind_Solver == FEM_ELASTICITY)  {
+      /*--- If the analysis is dynamic... ---*/
+      if (config->GetDynamic_Analysis() == DYNAMIC) {
+        /*--- Velocities ---*/
+        iVar_FEA_Vel = nVar_Total;
+        if (geometry->GetnDim() == 2) nVar_Total += 2;
+        else if (geometry->GetnDim() == 3) nVar_Total += 3;
+        /*--- Accelerations ---*/
+        iVar_FEA_Accel = nVar_Total;
+        if (geometry->GetnDim() == 2) nVar_Total += 2;
+        else if (geometry->GetnDim() == 3) nVar_Total += 3;
+      }
+      iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
+      if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
+      iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_EULER)         ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      iVar_Sens    = nVar_Total; nVar_Total += 1;
+      iVar_SensDim = nVar_Total; nVar_Total += nDim;
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+      iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
+    }
+
+    if (config->GetExtraOutput()) {
+      if (Kind_Solver == RANS) {
+        iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
+      }
+    }
+    
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+    
+  }
+  Buffer_Send_nPoint[0] = nLocalPoint;
+  
+  /*--- Each processor sends its local number of nodes to the master. ---*/
+  
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalPoint = nLocalPoint;
+  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
+#endif
+  
+  nBuffer_Scalar = MaxLocalPoint;
+  
+  /*--- Send and Recv buffers. ---*/
+  
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
+  
+  su2double *Buffer_Send_Res = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Res = NULL;
+  
+  su2double *Buffer_Send_Vol = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Vol = NULL;
+  
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  
+  /*--- Auxiliary vectors for surface coefficients ---*/
+  
+  if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS))  ||
+      ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+    Aux_Frict_x = new su2double[geometry->GetnPoint()];
+    Aux_Frict_y = new su2double[geometry->GetnPoint()];
+    Aux_Frict_z = new su2double[geometry->GetnPoint()];
+    Aux_Heat  = new su2double[geometry->GetnPoint()];
+    Aux_yPlus = new su2double[geometry->GetnPoint()];
+  }
+  
+  if ((Kind_Solver == ADJ_EULER) ||
+      (Kind_Solver == ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == ADJ_RANS)  ||
+      (Kind_Solver == DISC_ADJ_EULER) ||
+      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == DISC_ADJ_RANS)) {
+    Aux_Sens = new su2double[geometry->GetnPoint()];
+  }
+  
+  /*--- Prepare the receive buffers in the master node only. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_Res = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_Vol = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+  }
+  
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+  
+  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+    
+    /*--- Logic for which solution class to draw from. ---*/
+    
+    jVar = iVar;
+    CurrentIndex = FirstIndex;
+    if ((SecondIndex != NONE) && (iVar > nVar_First-1)) {
+      jVar = iVar - nVar_First;
+      CurrentIndex = SecondIndex;
+    }
+    if ((SecondIndex != NONE) && (ThirdIndex != NONE) && (iVar > (nVar_First + nVar_Second-1))) {
+      jVar = iVar - nVar_First - nVar_Second;
+      CurrentIndex = ThirdIndex;
+    }
+    
+    /*--- Loop over this partition to collect the current variable ---*/
+    
+    jPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      
+      /*--- Check for halos & write only if requested ---*/
+      
+      if (!Local_Halo[iPoint] || Wrt_Halo) {
+        
+        /*--- Get this variable into the temporary send buffer. ---*/
+        
+        Buffer_Send_Var[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar);
+        
+        if (!config->GetLow_MemoryOutput()) {
+          
+          if (config->GetWrt_Limiters()) {
+            Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+          }
+          
+          if (config->GetWrt_Residuals()) {
+            if (!config->GetDiscrete_Adjoint()) {
+              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            } else {
+              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
+              solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
+            }
+          }
+          
+        }
+        
+        /*--- Only send/recv the volumes & global indices during the first loop ---*/
+        
+        if (iVar == 0) {
+          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
+        }
+        
+        jPoint++;
+        
+      }
+    }
+    
+    /*--- Gather the data on the master node. ---*/
+    
+#ifdef HAVE_MPI
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+    if (!config->GetLow_MemoryOutput()) {
+      
+      if (config->GetWrt_Limiters()) {
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      }
+      
+      if (config->GetWrt_Residuals()) {
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+#endif
+      }
+      
+    }
+    
+    if (iVar == 0) {
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
+#endif
+    }
+    
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+    
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+          
+          /*--- Get global index, then loop over each variable and store ---*/
+          
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+          
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+          
+          if (!config->GetLow_MemoryOutput()) {
+            
+            if (config->GetWrt_Limiters()) {
+              Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            }
+            
+            if (config->GetWrt_Residuals()) {
+              unsigned short ExtraIndex;
+              ExtraIndex = nVar_Consv;
+              if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
+              Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            }
+            
+          }
+          
+          jPoint++;
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
+    }
+    
+  }
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Additional communication routine for the grid velocity. Note that
+     we are reusing the same temporary buffers from above for efficiency.
+     Also, in the future more routines like this could be used to write
+     an arbitrary number of additional variables to the file. ---*/
+    
+    if (grid_movement && !fem) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Grid_Vel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Grid_Vel = geometry->node[iPoint]->GetGridVel();
+          Buffer_Send_Var[jPoint] = Grid_Vel[0];
+          Buffer_Send_Res[jPoint] = Grid_Vel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Grid_Vel[2];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_GridVel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Communicate Pressure, Cp, and Mach ---*/
+    
+    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+      ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the coefficient of pressure at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the pressure, Cp, and mach variables. ---*/
+
+          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetPressure();
+          if (compressible){
+            Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetTemperature();
+          } else{
+            Buffer_Send_Res[jPoint] =  0.0;
+          }
+          Buffer_Send_Vol[jPoint] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea;
+
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_PressCp;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Communicate Mach---*/
+    
+    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+      ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
+          
+          if (compressible) {
+            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
+            solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed();
+          }
+          if (incompressible) {
+            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())*config->GetVelocity_Ref()/
+            sqrt(config->GetBulk_Modulus()/(solver[FLOW_SOL]->node[iPoint]->GetDensity()*config->GetDensity_Ref()));
+          }
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_MachMean;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Laminar Viscosity ---*/
+    
+    if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+      ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
+          
+          Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity();
+
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Lam;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+      
+      /*--- Communicate skin friction ---*/
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the viscous coefficients at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        Aux_Frict_x[iPoint] = 0.0;
+        Aux_Frict_y[iPoint] = 0.0;
+        Aux_Frict_z[iPoint] = 0.0;
+      }
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
+            Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
+            if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
+          }
+        }
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Buffer_Send_Var[jPoint] = Aux_Frict_x[iPoint];
+          Buffer_Send_Res[jPoint] = Aux_Frict_y[iPoint];
+          if (geometry->GetnDim() == 3)
+            Buffer_Send_Vol[jPoint] = Aux_Frict_z[iPoint];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+          Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0;
+        iVar = iVar_ViscCoeffs;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar + 2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor + 1) * nBuffer_Scalar;
+        }
+      }
+      
+      /*--- Communicate heat transfer, y+ ---*/
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the viscous coefficients at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        Aux_Heat[iPoint] = 0.0;
+        Aux_yPlus[iPoint] = 0.0;
+      }
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
+            Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
+          }
+        }
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          if (compressible) {
+            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
+            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
+          }
+          if (incompressible) {
+            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
+            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
+          }
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
+        Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0;
+        iVar = iVar_HeatCoeffs;
+
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar + 0][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor + 1) * nBuffer_Scalar;
+        }
+      }
+    }
+    
+    
+    /*--- Communicate the Eddy Viscosity ---*/
+    
+    if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the pressure and mach variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity();
+
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Eddy;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+      
+    }
+    
+    /*--- Communicate the Sharp Edges ---*/
+    
+    if (config->GetWrt_SharpEdges()) {
+      
+      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+        
+        /*--- Loop over this partition to collect the current variable ---*/
+        jPoint = 0;
+        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+          
+          /*--- Check for halos & write only if requested ---*/
+          
+          if (!Local_Halo[iPoint] || Wrt_Halo) {
+            
+            /*--- Load buffers with the pressure and mach variables. ---*/
+            
+            Buffer_Send_Var[jPoint] = geometry->node[iPoint]->GetSharpEdge_Distance();
+            jPoint++;
+          }
+        }
+        
+        /*--- Gather the data on the master node. ---*/
+        
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+        
+        /*--- The master node unpacks and sorts this variable by global index ---*/
+        
+        if (rank == MASTER_NODE) {
+          jPoint = 0; iVar = iVar_Sharp;
+          for (iProcessor = 0; iProcessor < size; iProcessor++) {
+            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+              
+              /*--- Get global index, then loop over each variable and store ---*/
+              
+              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+              Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+              jPoint++;
+            }
+            
+            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+            
+            jPoint = (iProcessor+1)*nBuffer_Scalar;
+          }
+        }
+      }
+    }
+    
+    /*--- Communicate the surface sensitivity ---*/
+    
+    if ((Kind_Solver == ADJ_EULER)         ||
+        (Kind_Solver == ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == ADJ_RANS)          ||
+        (Kind_Solver == DISC_ADJ_EULER)    ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      
+      /*--- First, loop through the mesh in order to find and store the
+       value of the surface sensitivity at any surface nodes. They
+       will be placed in an auxiliary vector and then communicated like
+       all other volumetric variables. ---*/
+      
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) Aux_Sens[iPoint] = 0.0;
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+            Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+            Area = 0.0;
+            for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
+            Area = sqrt (Area);
+            Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
+          }
+        }
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = Aux_Sens[iPoint];
+          if ((config->GetKind_ConvNumScheme() == SPACE_CENTERED) && (!config->GetDiscrete_Adjoint()))
+            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint);
+          if ((config->GetKind_ConvNumScheme() == SPACE_UPWIND) && (!config->GetDiscrete_Adjoint()))
+            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0);
+          
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (!config->GetDiscrete_Adjoint())
+        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      if (!config->GetDiscrete_Adjoint())
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_Sens;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            if (!config->GetDiscrete_Adjoint())
+              Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_EULER)    ||
+        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+        (Kind_Solver == DISC_ADJ_RANS)) {
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0);
+          Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1);
+          if (nDim == 3)
+            Buffer_Send_Vol[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (nDim == 3)
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (nDim == 3)
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_SensDim;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (nDim == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    
+    /*--- Communicate the Velocities for dynamic FEM problem ---*/
+    
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Node_Vel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
+          Buffer_Send_Var[jPoint] = Node_Vel[0];
+          Buffer_Send_Res[jPoint] = Node_Vel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Vel[2];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Vel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Communicate the Accelerations for dynamic FEM problem ---*/
+    
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Node_Accel;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
+          Buffer_Send_Var[jPoint] = Node_Accel[0];
+          Buffer_Send_Res[jPoint] = Node_Accel[1];
+          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Accel[2];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (geometry->GetnDim() == 3) {
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      }
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (geometry->GetnDim() == 3) {
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      }
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Accel;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (geometry->GetnDim() == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+
+    /*--- Communicate the FEM elasticity stresses (2D) - New elasticity solver---*/
+    
+    if (Kind_Solver == FEM_ELASTICITY) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Stress;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+          /*--- Sigma xx ---*/
+          Buffer_Send_Var[jPoint] = Stress[0];
+          /*--- Sigma yy ---*/
+          Buffer_Send_Res[jPoint] = Stress[1];
+          /*--- Sigma xy ---*/
+          Buffer_Send_Vol[jPoint] = Stress[2];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Stress;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    /*--- Communicate the FEM elasticity stresses (3D) - New elasticity solver---*/
+    
+    if ((Kind_Solver == FEM_ELASTICITY) && (geometry->GetnDim() == 3)) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      
+      jPoint = 0; su2double *Stress;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the three grid velocity components. ---*/
+          
+          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+          /*--- Sigma zz ---*/
+          Buffer_Send_Var[jPoint] = Stress[3];
+          /*--- Sigma xz ---*/
+          Buffer_Send_Res[jPoint] = Stress[4];
+          /*--- Sigma yz ---*/
+          Buffer_Send_Vol[jPoint] = Stress[5];
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Stress_3D;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    
+    /*--- Communicate the Linear elasticity ---*/
+    
+    if ( Kind_Solver == FEM_ELASTICITY ) {
+      
+      /*--- Loop over this partition to collect the current variable ---*/
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        
+        /*--- Check for halos & write only if requested ---*/
+        
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+          
+          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
+          
+          Buffer_Send_Var[jPoint] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress();
+          jPoint++;
+        }
+      }
+      
+      /*--- Gather the data on the master node. ---*/
+      
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+      
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+      
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Extra;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+            
+            /*--- Get global index, then loop over each variable and store ---*/
+            
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            jPoint++;
+          }
+          
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())) {
+      /*--- Loop over this partition to collect the current variable ---*/
+
+      jPoint = 0;
+      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+
+        /*--- Check for halos & write only if requested ---*/
+
+        if (!Local_Halo[iPoint] || Wrt_Halo) {
+
+          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
+
+          Buffer_Send_Var[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(0);
+          Buffer_Send_Res[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(1);
+          if (geometry->GetnDim() == 3)
+            Buffer_Send_Vol[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(2);
+          jPoint++;
+        }
+      }
+
+      /*--- Gather the data on the master node. ---*/
+
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      if (nDim == 3)
+        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      if (nDim == 3)
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+#endif
+
+      /*--- The master node unpacks and sorts this variable by global index ---*/
+
+      if (rank == MASTER_NODE) {
+        jPoint = 0; iVar = iVar_FEA_Extra;
+        for (iProcessor = 0; iProcessor < size; iProcessor++) {
+          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+
+            /*--- Get global index, then loop over each variable and store ---*/
+
+            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+            if (nDim == 3)
+              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
+            jPoint++;
+          }
+
+          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+
+          jPoint = (iProcessor+1)*nBuffer_Scalar;
+        }
+      }
+    }
+
+    if (config->GetExtraOutput()) {
+      
+      for (jVar = 0; jVar < nVar_Extra; jVar++) {
+        
+        /*--- Loop over this partition to collect the current variable ---*/
+        
+        jPoint = 0;
+        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+          
+          /*--- Check for halos & write only if requested ---*/
+          
+          if (!Local_Halo[iPoint] || Wrt_Halo) {
+            
+            /*--- Get this variable into the temporary send buffer. ---*/
+            
+            if (Kind_Solver == RANS) {
+              Buffer_Send_Var[jPoint] = solver[TURB_SOL]->OutputVariables[iPoint*nVar_Extra+jVar];
+            }
+            jPoint++;
+            
+          }
+        }
+        
+        /*--- Gather the data on the master node. ---*/
+        
+#ifdef HAVE_MPI
+        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+        
+        /*--- The master node unpacks and sorts this variable by global index ---*/
+        
+        if (rank == MASTER_NODE) {
+          jPoint = 0; iVar = iVar_Extra;
+          for (iProcessor = 0; iProcessor < size; iProcessor++) {
+            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+              
+              /*--- Get global index, then loop over each variable and store ---*/
+              
+              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+              Data[iVar+jVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+              jPoint++;
+            }
+            
+            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+            
+            jPoint = (iProcessor+1)*nBuffer_Scalar;
+          }
+        }
+      }
+    }
+    
+  }
+  
+  /*--- Immediately release the temporary buffers. ---*/
+  
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_Res;
+  delete [] Buffer_Send_Vol;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nPoint;
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_Res;
+    delete [] Buffer_Recv_Vol;
+    delete [] Buffer_Recv_GlobalIndex;
+  }
+  
+  /*--- Release memory needed for surface coefficients ---*/
+  
+  delete [] Local_Halo;
+  
+  if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+    ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+    delete[] Aux_Frict_x; delete[] Aux_Frict_y; delete[] Aux_Frict_z;
+    delete [] Aux_Heat; delete [] Aux_yPlus;
+  }
+  if (( Kind_Solver == ADJ_EULER              ) ||
+      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+      ( Kind_Solver == ADJ_RANS               ) ||
+      ( Kind_Solver == DISC_ADJ_EULER         ) ||
+      ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
+      ( Kind_Solver == DISC_ADJ_RANS          )) {
+    delete [] Aux_Sens;
+  }
+  
+}
+
+void COutputLegacy::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
+  
+  /*--- Local variables needed on all processors ---*/
+  unsigned short iVar;
+  unsigned long iPoint = 0, jPoint = 0;
+  
+  nVar_Total = config->fields.size() - 1;
+  
+  /*--- Merge the solution either in serial or parallel. ---*/
+  
+#ifndef HAVE_MPI
+  
+  /*--- In serial, the single process has access to all solution data,
+   so it is simple to retrieve and store inside Solution_Data. ---*/
+  
+  unsigned short iMarker;
+  unsigned long iVertex, nTotalPoints = 0;
+  int SendRecv;
+  
+  /*--- First, create a structure to locate any periodic halo nodes ---*/
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
+            (SendRecv < 0)) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+      
+    }
+  }
+  
+  /*--- Total number of points in the mesh (this might include periodic points). ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (!Local_Halo[iPoint]) nTotalPoints++;
+  
+  nGlobal_Poin = nTotalPoints;
+  Data = new su2double*[nVar_Total];
+  for (iVar = 0; iVar < nVar_Total; iVar++) {
+    Data[iVar] = new su2double[nGlobal_Poin];
+  }
+  
+  /*--- Loop over all points in the mesh, but only write data
+   for nodes in the domain (ignore periodic halo nodes). ---*/
+  
+  jPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    if (!Local_Halo[iPoint]) {
+      
+      /*--- Solution (first, and second system of equations) ---*/
+      
+      unsigned short jVar = 0;
+      for (iVar = 0; iVar < nVar_Total; iVar++) {
+        Data[jVar][jPoint] = solver->node[iPoint]->GetSolution(iVar);
+        jVar++;
+      }
+    }
+    
+    /*--- Increment jPoint as the counter. We need this because iPoint
+     may include halo nodes that we skip over during this loop. ---*/
+    
+    jPoint++;
+    
+  }
+  
+#else
+  
+  /*--- MPI preprocessing ---*/
+  
+  int nProcessor = size, iProcessor;
+  
+  /*--- Local variables needed for merging with MPI ---*/
+  
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (Wrt_Halo) {
+    nLocalPoint = geometry->GetnPoint();
+  } else {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+    
+    /*--- Sum total number of nodes that belong to the domain ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+    
+  }
+  Buffer_Send_nPoint[0] = nLocalPoint;
+  
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[nProcessor];
+  
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  nBuffer_Scalar = MaxLocalPoint;
+  
+  /*--- Send and Recv buffers. ---*/
+  
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
+  
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  
+  /*--- Prepare the receive buffers in the master node only. ---*/
+  if (rank == MASTER_NODE) {
+    
+    Buffer_Recv_Var = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
+    
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+    
+  }
+  
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+  
+  for (iVar = 0; iVar < nVar_Total; iVar++) {
+    
+    /*--- Loop over this partition to collect the current variable ---*/
+    jPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      
+      /*--- Check for halos and write only if requested ---*/
+      if (!Local_Halo[iPoint] || Wrt_Halo) {
+        
+        /*--- Get this variable into the temporary send buffer. ---*/
+        Buffer_Send_Var[jPoint] = solver->node[iPoint]->GetSolution(iVar);
+        
+        /*--- Only send/recv the volumes & global indices during the first loop ---*/
+        if (iVar == 0) {
+          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
+        }
+        jPoint++;
+      }
+    }
+    
+    /*--- Gather the data on the master node. ---*/
+    
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (iVar == 0) {
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+    }
+    
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+          
+          /*--- Get global index, then loop over each variable and store ---*/
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+          jPoint++;
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
+    }
+  }
+  
+  /*--- Immediately release the temporary buffers. ---*/
+  
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_GlobalIndex;
+  }
+  
+#endif
+  
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  /*--- Local variables ---*/
+  
+  unsigned short nZone = geometry->GetnZone();
+  unsigned short Kind_Solver  = config->GetKind_Solver();
+  unsigned short iVar, iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool grid_movement = config->GetGrid_Movement();
+  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
+  ofstream restart_file;
+  ofstream meta_file;
+  string filename, meta_filename;
+  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  
+  /*--- Retrieve filename from config ---*/
+  
+  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else if (disc_adj_fem){
+    filename = config->GetRestart_AdjFEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
+  }
+  
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
+  
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
+  
+  /*--- Open the restart file and write the solution. ---*/
+  
+  restart_file.open(filename.c_str(), ios::out);
+  restart_file.precision(15);
+  
+  /*--- Write the header line based on the particular solver ----*/
+  
+  restart_file << "\"PointID\"";
+  
+  /*--- Mesh coordinates are always written to the restart first ---*/
+  
+  if (nDim == 2) {
+    restart_file << "\t\"x\"\t\"y\"";
+  } else {
+    restart_file << "\t\"x\"\t\"y\"\t\"z\"";
+  }
+  
+  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+  if (( Kind_Solver == FEM_ELASTICITY ) || ( Kind_Solver == DISC_ADJ_FEM))
+      restart_file << "\t\"Displacement_" << iVar+1<<"\"";
+    else
+      restart_file << "\t\"Conservative_" << iVar+1<<"\"";
+  }
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    if (config->GetWrt_Limiters()) {
+      for (iVar = 0; iVar < nVar_Consv; iVar++) {
+        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
+      }
+    }
+    if (config->GetWrt_Residuals()) {
+      for (iVar = 0; iVar < nVar_Consv; iVar++) {
+        restart_file << "\t\"Residual_" << iVar+1<<"\"";
+      }
+    }
+    
+    /*--- Mesh velocities for dynamic mesh cases ---*/
+    
+    if (grid_movement && !fem) {
+      if (nDim == 2) {
+        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
+      } else {
+        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
+      }
+    }
+    
+    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
+      } else
+        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
+    }
+    
+    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
+        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
+      } else {
+        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
+        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
+      }
+    }
+    
+    if (Kind_Solver == RANS) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+        restart_file << "\t\"Eddy_Viscosity\"";
+      } else
+        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
+    }
+    
+    if (config->GetWrt_SharpEdges()) {
+      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)))  {
+        restart_file << "\t\"Sharp_Edge_Dist\"";
+      }
+    }
+    
+    if ((Kind_Solver == ADJ_EULER              ) ||
+        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+        (Kind_Solver == ADJ_RANS               )   ) {
+      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
+    }
+    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
+        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
+        ( Kind_Solver == DISC_ADJ_RANS               )) {
+      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
+      if (geometry->GetnDim() == 3) {
+        restart_file << "\t\"Sensitivity_z\"";
+      }
+    }
+    
+    if (Kind_Solver == FEM_ELASTICITY) {
+      if (!dynamic_fem) {
+        if (geometry->GetnDim() == 2)
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
+        if (geometry->GetnDim() == 3)
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
+      }
+      else if (dynamic_fem) {
+        if (geometry->GetnDim() == 2) {
+          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
+        }
+        if (geometry->GetnDim() == 3) {
+          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
+          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
+        }
+      }
+    }
+    
+    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+      if (geometry->GetnDim() == 2)
+        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
+      if (geometry->GetnDim() == 3)
+        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
+    }
+
+    
+    if (config->GetExtraOutput()) {
+      string *headings = NULL;
+      //if (Kind_Solver == RANS) {
+      headings = solver[TURB_SOL]->OutputHeadingNames;
+      //}
+      
+      for (iVar = 0; iVar < nVar_Extra; iVar++) {
+        if (headings == NULL) {
+          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
+        } else {
+          restart_file << "\t\""<< headings[iVar] <<"\"";
+        }
+      }
+    }
+  }
+  
+  restart_file << "\n";
+  
+  /*--- Write the restart file ---*/
+  
+  /*--- Determine whether or not the FEM solver is used, which decides the
+   type of geometry classes that are instantiated. ---*/
+  bool fem_solver = ((config->GetKind_Solver() == FEM_EULER)         ||
+                (config->GetKind_Solver() == FEM_NAVIER_STOKES) ||
+                (config->GetKind_Solver() == FEM_RANS)          ||
+                (config->GetKind_Solver() == FEM_LES));
+  
+  unsigned long nPointTotal = 0;
+  if ( fem_solver ) {
+    nPointTotal = solver[FLOW_SOL]->GetnDOFsGlobal();
+  } else {
+    nPointTotal = geometry->GetGlobal_nPointDomain();
+  }
+  
+  for (iPoint = 0; iPoint < nPointTotal; iPoint++) {
+    
+    /*--- Index of the point ---*/
+    restart_file << iPoint << "\t";
+    
+    /*--- Write the grid coordinates first ---*/
+    for (iDim = 0; iDim < nDim; iDim++) {
+      restart_file << scientific << Coords[iDim][iPoint] << "\t";
+    }
+    
+    /*--- Loop over the variables and write the values to file ---*/
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      restart_file << scientific << Data[iVar][iPoint] << "\t";
+    }
+    restart_file << "\n";
+  }
+
+  /*--- Write the general header and flow conditions ----*/
+
+  if (dual_time)
+    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+  else
+    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+  restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+  restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+  restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+  restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+  restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+  restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+  restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+  if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+
+  /*--- Close the data portion of the restart file. ---*/
+
+  restart_file.close();
+
+}
+
+void COutputLegacy::DeallocateCoordinates(CConfig *config, CGeometry *geometry) {
+  
+  unsigned short iDim, nDim = geometry->GetnDim();
+  
+  /*--- The master node alone owns all data found in this routine. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Deallocate memory for coordinate data ---*/
+    
+    for (iDim = 0; iDim < nDim; iDim++) {
+      delete [] Coords[iDim];
+    }
+    delete [] Coords;
+  }
+}
+
+void COutputLegacy::DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol) {
+
+  /*--- The master node alone owns all data found in this routine. ---*/
+  if (rank == MASTER_NODE) {
+    
+    /*--- Deallocate memory for connectivity data ---*/
+    if (surf_sol) {
+      if (nGlobal_Line > 0      && Conn_Line      != NULL) delete [] Conn_Line;
+      if (nGlobal_BoundTria > 0 && Conn_BoundTria != NULL) delete [] Conn_BoundTria;
+      if (nGlobal_BoundQuad > 0 && Conn_BoundQuad != NULL) delete [] Conn_BoundQuad;
+    }
+    else {
+      if (nGlobal_Tria > 0 && Conn_Tria != NULL) delete [] Conn_Tria;
+      if (nGlobal_Quad > 0 && Conn_Quad != NULL) delete [] Conn_Quad;
+      if (nGlobal_Tetr > 0 && Conn_Tetr != NULL) delete [] Conn_Tetr;
+      if (nGlobal_Hexa > 0 && Conn_Hexa != NULL) delete [] Conn_Hexa;
+      if (nGlobal_Pris > 0 && Conn_Pris != NULL) delete [] Conn_Pris;
+      if (nGlobal_Pyra > 0 && Conn_Pyra != NULL) delete [] Conn_Pyra;
+      
+    }
+    
+  }
+}
+
+void COutputLegacy::DeallocateSolution(CConfig *config, CGeometry *geometry) {
+
+  /*--- The master node alone owns all data found in this routine. ---*/
+  if (rank == MASTER_NODE) {
+    
+    /*--- Deallocate memory for solution data ---*/
+    for (unsigned short iVar = 0; iVar < nVar_Total; iVar++) {
+      delete [] Data[iVar];
+    }
+    delete [] Data;
+    
+  }
+}
+
+void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
+  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
+  unsigned short iMarker_Monitoring;
+  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+  
+  bool rotating_frame = config->GetRotating_Frame();
+  bool aeroelastic = config->GetAeroelastic_Simulation();
+  bool equiv_area = config->GetEquivArea();
+  bool buffet = (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR);
+  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
+  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
+                    (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool cont_adj = config->GetContinuous_Adjoint();
+  bool disc_adj = config->GetDiscrete_Adjoint();
+  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
+  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
+  
+  bool output_surface = (config->GetnMarker_Analyze() != 0);
+  bool output_comboObj = (config->GetnObj() > 1);
+  bool output_per_surface = config->GetWrt_Surface();
+  bool turbo = config->GetBoolTurbomachinery();
+  unsigned short direct_diff = config->GetDirectDiff();
+
+  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool incload = config->GetIncrementalLoad();
+
+  bool thermal = false; /* Flag for whether to print heat flux values */
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
+
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
+    thermal = true;
+  }
+  
+  /*--- Write file name with extension ---*/
+  string filename = config->GetConv_FileName();
+  if(config->GetnZone() > 1){
+    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
+  }
+  if(config->GetnTimeInstances() > 1){
+    filename = config->GetMultiInstance_HistoryFileName(filename, val_iInst);
+  }
+  strcpy (cstr, filename.data());
+  
+  if (config->GetWrt_Unsteady() && config->GetRestart()) {
+    long iExtIter = config->GetUnst_RestartIter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(cstr, buffer);
+  }
+  
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".csv");
+  strcat(cstr, buffer);
+  
+  ConvHist_file->open(cstr, ios::out);
+  ConvHist_file->precision(15);
+  
+  /*--- Begin of the header ---*/
+  
+  char begin[]= "\"Iteration\"";
+  
+  /*--- Header for the coefficients ---*/
+  
+  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
+  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
+  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
+  char buffet_coeff[]= ",\"Buffet_Metric\"";
+  char engine_coeff[]= ",\"NetThrust\",\"Power\",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
+  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
+  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
+  char fem_incload[]= ",\"IncLoad\"";
+  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
+  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
+  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
+  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
+  char Cp_inverse_design[]= ",\"Cp_Diff\"";
+  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
+  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
+  char d_engine[] = ",\"D(NetThrust)\",\"D(Power)\",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
+  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
+  char d_surface_outputs[]= ",\"D(Uniformity)\",\"D(Secondary_Strength)\",\"D(Momentum_Distortion)\",\"D(Secondary_Over_Uniformity)\",\"D(Pressure_Drop)\"";
+
+  /*--- Find the markers being monitored and create a header for them ---*/
+  
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
+    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
+    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
+    if(buffet) monitoring_coeff += ",\"Buffet_Metric_"    + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
+    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
+  }
+
+  if (turbo){
+    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
+
+      stringstream tag;
+      tag << iMarker_Monitoring + 1;
+
+      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
+      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
+      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
+      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
+      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
+      // different from zero only in multi-zone computation
+      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
+      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
+
+    }
+  }
+
+  char combo_obj[] = ",\"ComboObj\"";
+  
+  /*--- Header for the residuals ---*/
+  
+  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
+  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP: 
+      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
+      break;
+    case SST:   	SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
+  }
+  switch (config->GetKind_Turb_Model()) {
+    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
+      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
+      break;
+    case SST:   	SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
+  }
+  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
+  char heat_resid[]= ",\"Res_Heat\"";
+  
+  /*--- End of the header ---*/
+  
+  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
+  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
+  
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
+    ConvHist_file[0] << "VARIABLES = ";
+  }
+  
+  /*--- Write the header, case depending ---*/
+  
+  switch (config->GetKind_Solver()) {
+      
+    case EULER : case NAVIER_STOKES: case RANS :
+    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS : case FEM_LES:
+      ConvHist_file[0] << begin;
+      if (!turbo) ConvHist_file[0] << flow_coeff;
+      if (buffet) ConvHist_file[0] << buffet_coeff;
+      if (turbo) ConvHist_file[0] << turbo_coeff;
+      if (thermal && !turbo) ConvHist_file[0] << heat_coeff;
+      if (equiv_area) ConvHist_file[0] << equivalent_area_coeff;
+      if (engine || actuator_disk) ConvHist_file[0] << engine_coeff;
+      if (inv_design) {
+        ConvHist_file[0] << Cp_inverse_design;
+        if (thermal && !turbo) ConvHist_file[0] << Heat_inverse_design;
+      }
+      if (rotating_frame && !turbo) ConvHist_file[0] << rotating_frame_coeff;
+
+      ConvHist_file[0] << flow_resid;
+      if (turbulent) ConvHist_file[0] << turb_resid;
+      if (weakly_coupled_heat) ConvHist_file[0] << heat_resid;
+      if (aeroelastic) ConvHist_file[0] << aeroelastic_coeff;
+      if (output_per_surface) ConvHist_file[0] << monitoring_coeff;
+      if (output_surface) ConvHist_file[0] << surface_outputs;
+      if (direct_diff != NO_DERIVATIVE) {
+        if (!turbo) ConvHist_file[0] << d_flow_coeff;
+        else        ConvHist_file[0] << d_turbo_coeff;
+        if (engine || actuator_disk) ConvHist_file[0] << d_engine;
+        if (thermal) ConvHist_file[0] << d_thermal_coeff;
+        if (output_surface) ConvHist_file[0] << d_surface_outputs;
+      }
+      if (output_comboObj) ConvHist_file[0] << combo_obj;
+      ConvHist_file[0] << end;
+      
+      break;
+      
+    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+      if (!turbo) {
+        if (compressible) {
+          ConvHist_file[0] << begin << adj_coeff << adj_flow_resid;
+        }
+        if (incompressible) {
+          ConvHist_file[0] << begin << adj_inc_coeff << adj_flow_resid;
+        }
+      }
+      else ConvHist_file[0] << begin << adj_turbo_coeff << adj_flow_resid;
+      if ((turbulent) && (!frozen_visc)) ConvHist_file[0] << adj_turb_resid;
+      ConvHist_file[0] << end;
+      break;
+      
+    case HEAT_EQUATION_FVM:
+      ConvHist_file[0] << begin << heat_coeff;
+      ConvHist_file[0] << heat_resid << end;
+      break;
+      
+    case FEM_ELASTICITY:
+      ConvHist_file[0] << begin << fem_coeff;
+      if (incload) ConvHist_file[0] << fem_incload;
+      ConvHist_file[0] << fem_resid << endfea;
+      break;
+      
+    case DISC_ADJ_FEM:
+      ConvHist_file[0] << begin << fem_coeff;
+      ConvHist_file[0] << fem_resid << endfea;
+      break;
+
+  }
+
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
+  }
+  
+}
+
+
+void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
+                                  CGeometry ****geometry,
+                                  CSolver *****solver_container,
+                                  CConfig **config,
+                                  CIntegration ****integration,
+                                  bool DualTime_Iteration,
+                                  su2double timeused,
+                                  unsigned short val_iZone,
+                                  unsigned short val_iInst) {
+  
+  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
+  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
+  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
+  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
+  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
+  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nZone      = config[val_iZone]->GetnZone();
+  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
+  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
+  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
+  bool energy               = config[val_iZone]->GetEnergy_Equation();
+  bool incload              = config[val_iZone]->GetIncrementalLoad();
+  bool output_files         = true;
+
+  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+
+  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
+    
+    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
+        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+      output_files = false;
+    }
+    
+    if (fea || fluid_structure) output_files = false;
+    if (config[val_iZone]->GetMultizone_Problem()) output_files = false;
+
+    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
+    
+    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+
+      
+      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
+      
+      switch (config[val_iZone]->GetKind_Solver()) {
+
+        case EULER: case NAVIER_STOKES: case RANS:
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
+            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                         geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the surface. ---*/
+
+          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
+            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                     geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
+          }
+
+          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
+
+          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
+            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                    geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
+          }
+          
+          /*--- For specific applications, evaluate and plot the cp coefficent at different stations. ---*/
+          
+          if (config[val_iZone]->GetPlot_Section_Forces()) {
+            SpecialOutput_SpanLoad(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
+                                   geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
+          }
+          
+          break;
+      }
+      
+      /*--- Output a file with the forces breakdown. ---*/
+      
+      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
+      }
+      
+      /*--- Compute span-wise values file for turbomachinery. ---*/
+      
+      if (config[val_iZone]->GetBoolTurbomachinery()) {
+        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
+      }
+      
+      /*--- Output a file with the forces breakdown. ---*/
+      
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
+      
+      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
+      
+    }
+    
+  }
+  
+  /*--- Output using only the master node ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*-- Compute the total objective if a "combo" objective is used ---*/
+    
+    if (output_comboObj) {
+      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
+      switch (config[val_iZone]->GetKind_Solver()) {
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
+        break;
+      }
+    }
+    
+    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
+    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      ExtIter_OffSet = 0;
+
+    /*--- WARNING: These buffers have hard-coded lengths. Note that you
+     may have to adjust them to be larger if adding more entries. ---*/
+    
+    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000], buffet_coeff[1000],
+    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
+    adj_turb_resid[1000],
+    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
+    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
+
+
+    su2double dummy = 0.0, *Coord;
+    unsigned short iVar, iMarker_Monitoring;
+    
+    unsigned long LinSolvIter = 0, iPointMaxResid;
+    su2double timeiter = timeused/su2double(iExtIter+1);
+    
+    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
+
+    
+    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
+    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
+    bool equiv_area = config[val_iZone]->GetEquivArea();
+    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
+    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
+    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
+    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
+    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
+    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
+                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
+    bool adjoint =  cont_adj || disc_adj;
+    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
+    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
+    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == FEM_EULER) || (config[val_iZone]->GetKind_Solver() == FEM_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == FEM_RANS) || (config[val_iZone]->GetKind_Solver() == FEM_LES) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
+    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
+    bool buffet = (config[val_iZone]->GetBuffet_Monitoring() || config[val_iZone]->GetKind_ObjFunc() == BUFFET_SENSOR);
+    
+    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
+                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
+    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
+    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
+    
+    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
+
+    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
+
+    bool output_per_surface = config[val_iZone]->GetWrt_Surface();    
+
+    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
+
+    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
+    bool extra_heat_output = false;
+    su2double Extra_Total_Heat = 0.0;
+    //su2double Extra_Total_Temperature = 0.0;
+    su2double Extra_Heat_Residual = 0.0;
+
+    if (ExtraHeatOutputZone > -1) {
+      if (ExtraHeatOutputZone > nZone) {
+        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
+      }
+      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
+        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
+      }
+      else {
+        extra_heat_output = true;
+      }
+    }
+
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+    
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
+    Total_CT = 0.0, Total_CQ = 0.0,
+    Total_Heat = 0.0, Total_MaxHeat = 0.0, Total_Temperature = 0.0, Total_Custom_ObjFunc = 0.0,
+    Total_ComboObj = 0.0, Total_NetThrust = 0.0, Total_Power = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
+    Total_AoA = 0.0, Total_Buffet_Metric = 0.0;
+    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
+
+    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
+    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
+
+    unsigned short iSpan;
+
+    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
+    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
+    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
+
+    su2double Total_Sens_BPressure = 0.0;
+    su2double Total_Sens_ModVel = 0.0;
+
+    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
+    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
+        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_NetThrust = 0.0, D_Total_Power = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
+        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
+        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0, 
+        D_Surface_Uniformity = 0.0, D_Surface_SecondaryStrength = 0.0, D_Surface_MomentumDistortion = 0.0, D_Surface_SecondOverUniform = 0.0, D_Surface_PressureDrop = 0.0;
+    
+    /*--- Residual arrays ---*/
+    su2double *residual_flow         = NULL,
+    *residual_turbulent    = NULL,
+    *residual_transition   = NULL;
+    su2double *residual_adjflow      = NULL,
+    *residual_adjturbulent = NULL,
+    *residual_adjheat = NULL;
+    su2double *residual_fea          = NULL;
+    su2double *residual_fem          = NULL;
+    su2double *residual_heat         = NULL;
+    
+    /*--- Coefficients Monitored arrays ---*/
+    su2double *aeroelastic_plunge = NULL,
+    *aeroelastic_pitch     = NULL,
+    *Surface_CL            = NULL,
+    *Surface_CD            = NULL,
+    *Surface_CSF           = NULL,
+    *Surface_CEff          = NULL,
+    *Surface_CFx           = NULL,
+    *Surface_CFy           = NULL,
+    *Surface_CFz           = NULL,
+    *Surface_CMx           = NULL,
+    *Surface_CMy           = NULL,
+    *Surface_CMz           = NULL,
+    *Surface_Buffet_Metric = NULL;
+    
+    /*--- Initialize number of variables ---*/
+    unsigned short nVar_Flow = 0, nVar_Turb = 0,
+    nVar_Trans = 0, nVar_Heat = 0,
+    nVar_AdjFlow = 0, nVar_AdjTurb = 0, nVar_AdjHeat = 0,
+    nVar_FEM = 0;
+    
+    /*--- Direct problem variables ---*/
+    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
+        case SST:    nVar_Turb = 2; break;
+      }
+    }
+    if (transition) nVar_Trans = 2;
+    if (heat) nVar_Heat = 1;
+
+    if (fem) {
+      if (linear_analysis) nVar_FEM = nDim;
+      if (nonlinear_analysis) nVar_FEM = 3;
+
+      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
+
+    }
+    
+    /*--- Adjoint problem variables ---*/
+    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
+    if (turbulent) {
+      switch (config[val_iZone]->GetKind_Turb_Model()) {
+        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
+        case SST:    nVar_AdjTurb = 2; break;
+      }
+    }
+    if (weakly_coupled_heat) nVar_AdjHeat = 1;
+    
+    /*--- Allocate memory for the residual ---*/
+    residual_flow       = new su2double[nVar_Flow];
+    residual_turbulent  = new su2double[nVar_Turb];
+    residual_transition = new su2double[nVar_Trans];
+    residual_heat       = new su2double[nVar_Heat];
+    residual_fem        = new su2double[nVar_FEM];
+    
+    residual_adjflow      = new su2double[nVar_AdjFlow];
+    residual_adjturbulent = new su2double[nVar_AdjTurb];
+    residual_adjheat      = new su2double[nVar_AdjHeat];
+    
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    if(buffet) Surface_Buffet_Metric = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    
+    /*--- Write information from nodes ---*/
+    
+    switch (config[val_iZone]->GetKind_Solver()) {
+        
+      case EULER:                   case NAVIER_STOKES:                   case RANS:
+      case FEM_EULER:               case FEM_NAVIER_STOKES:               case FEM_RANS:      case FEM_LES:
+      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
+      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
+        
+        /*--- Flow solution coefficients ---*/
+        
+        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
+        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
+        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
+        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
+        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
+
+        if (thermal) {
+          Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
+          Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
+          Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
+
+          if(weakly_coupled_heat) {
+            Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+            Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+            Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+          }
+        }
+            
+        if(buffet){
+          Total_Buffet_Metric = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Buffet_Metric();
+        }
+
+        if (direct_diff != NO_DERIVATIVE) {
+          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
+          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
+          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
+          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
+          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
+          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
+          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
+          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
+          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
+          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
+          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
+
+          if (thermal) {
+            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
+            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
+            //Davg Temp
+          }
+
+          if (engine || actuator_disk) {
+            D_Total_NetThrust = SU2_TYPE::GetDerivative(Total_NetThrust);
+            D_Total_Power     = SU2_TYPE::GetDerivative(Total_Power);
+            D_Total_AeroCD    = SU2_TYPE::GetDerivative(Total_AeroCD);
+            D_Total_SolidCD   = SU2_TYPE::GetDerivative(Total_SolidCD);
+            D_Total_IDR       = SU2_TYPE::GetDerivative(Total_IDR);
+            D_Total_IDC       = SU2_TYPE::GetDerivative(Total_IDC);
+          }
+          
+        }
+        
+        if (equiv_area) {
+          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
+          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
+          
+          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
+          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
+        }
+        
+        if (engine || actuator_disk) {
+          Total_NetThrust = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_NetThrust();
+          Total_Power     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Power();
+          Total_AeroCD    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
+          Total_SolidCD   = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
+          Total_IDR       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
+          Total_IDC       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
+        }
+        
+        if (rotating_frame) {
+          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
+          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
+          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
+        }
+        
+        if (aeroelastic) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
+            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
+          }
+        }
+        
+        if (output_per_surface) {
+          /*--- Look over the markers being monitored and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
+            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
+            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
+            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
+            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
+            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
+            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
+            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
+            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
+            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
+              
+            if(buffet) Surface_Buffet_Metric[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_Buffet_Metric(iMarker_Monitoring);
+          }
+        }
+        
+        if (turbo) {
+          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
+            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
+              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
+                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
+                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
+              }
+            }
+          }
+          if (direct_diff != NO_DERIVATIVE){
+            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
+            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
+          }
+        }
+        
+        /*--- Get flux-averaged values at the specified surface ---*/
+
+        if (output_surface) {
+
+          unsigned short iMarker_Analyze = 0;
+          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
+          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
+          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
+          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
+          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
+          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
+          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
+          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
+          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
+          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
+          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
+          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
+          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
+          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
+
+          if (direct_diff != NO_DERIVATIVE){
+            D_Surface_Uniformity = SU2_TYPE::GetDerivative(Surface_Uniformity);
+            D_Surface_SecondaryStrength = SU2_TYPE::GetDerivative(Surface_SecondaryStrength);
+            D_Surface_MomentumDistortion = SU2_TYPE::GetDerivative(Surface_MomentumDistortion);
+            D_Surface_SecondOverUniform = SU2_TYPE::GetDerivative(Surface_SecondOverUniform);
+            D_Surface_PressureDrop = SU2_TYPE::GetDerivative(Surface_PressureDrop);
+          }
+        }
+        
+        /*--- Flow Residuals ---*/
+        
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
+        
+        /*--- Turbulent residual ---*/
+        
+        if (turbulent) {
+          for (iVar = 0; iVar < nVar_Turb; iVar++)
+            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
+        }
+
+        if (weakly_coupled_heat) {
+          for (iVar = 0; iVar < nVar_Heat; iVar++) {
+            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+          }
+
+        }
+        
+        /*--- Transition residual ---*/
+        
+        if (transition) {
+          for (iVar = 0; iVar < nVar_Trans; iVar++)
+            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
+        }
+        
+        
+        /*--- FEA residual ---*/
+        //        if (fluid_structure) {
+        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
+        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+        //        }
+        
+        /*--- Iterations of the linear solver ---*/
+        
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
+        
+        /*--- Adjoint solver ---*/
+        
+        if (adjoint) {
+          
+          /*--- Adjoint solution coefficients ---*/
+          
+          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
+          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
+          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
+          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
+          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
+          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
+          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
+
+          /*--- Adjoint flow residuals ---*/
+          
+          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
+            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
+          }
+          
+          /*--- Adjoint turbulent residuals ---*/
+          
+          if (turbulent) {
+            if (!frozen_visc) {
+              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
+                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
+            }
+          }
+
+          if (weakly_coupled_heat) {
+            for (iVar = 0; iVar < nVar_Heat; iVar++) {
+              residual_adjheat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJHEAT_SOL]->GetRes_RMS(iVar);
+            }
+          }
+          
+        }
+        
+        break;
+        
+
+      case HEAT_EQUATION_FVM:
+
+        /*--- Heat coefficients  ---*/
+
+        Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+        Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
+        Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
+
+        /*--- Heat Residuals ---*/
+
+        for (iVar = 0; iVar < nVar_Heat; iVar++) {
+          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
+        }
+
+        break;
+        
+      case FEM_ELASTICITY:
+        
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+        
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+        
+        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
+
+        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
+
+        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+        
+        if (linear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
+          }
+        }
+        else if (nonlinear_analysis) {
+          for (iVar = 0; iVar < nVar_FEM; iVar++) {
+            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
+          }
+        }
+        
+        break;
+
+      case DISC_ADJ_FEM:
+
+        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
+
+        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
+
+        /*--- Residuals: ---*/
+        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
+        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
+         for (iVar = 0; iVar < nVar_FEM; iVar++) {
+           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
+         }
+
+        break;
+
+
+    }
+
+    if (extra_heat_output) {
+      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
+      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
+      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
+    }
+    
+    /*--- Header frequency ---*/
+    
+    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    
+    /*--- Header frequency: analogy for dynamic structural analysis ---*/
+    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
+    /*--- We maintain the name, as it is an input of the function ---*/
+    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
+    /*--- dynamic determines if the problem is, or not, time dependent ---*/
+    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    
+    bool write_heads;
+    if (Unsteady) write_heads = (iIntIter == 0);
+    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+    
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+    
+    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
+    bool write_heads_FEM;
+    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+
+    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
+        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
+        ) {
+      
+      
+      /*--- Prepare the history file output, note that the dual
+       time output don't write to the history file ---*/
+      if (!DualTime_Iteration) {
+        
+        /*--- Write the begining of the history file ---*/
+        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
+        
+        /*--- Write the end of the history file ---*/
+        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
+        
+        /*--- Write the solution and residual of the history file ---*/
+        switch (config[val_iZone]->GetKind_Solver()) {
+            
+          case EULER : case NAVIER_STOKES: case RANS:
+          case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
+          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+            
+            /*--- Direct coefficients ---*/
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
+                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
+            if (buffet) SPRINTF (buffet_coeff, ", %14.8e",  Total_Buffet_Metric);
+            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Total_Temperature);
+            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
+            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Total_NetThrust, Total_Power, Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
+            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
+            if (inv_design) {
+              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
+              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
+            }
+            
+            if (direct_diff != NO_DERIVATIVE) {
+              if (!turbo)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
+              else
+                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
+                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
+              if (engine || actuator_disk)
+              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_NetThrust, D_Total_Power, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
+              if (thermal)
+                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
+                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
+                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
+            }
+
+            if (aeroelastic) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
+                  strcat(aeroelastic_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
+                strcat(aeroelastic_coeff, surface_coeff);
+              }
+            }
+            
+            if (output_per_surface) {
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
+                if (iMarker_Monitoring == 0) {
+                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                }
+                else {
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
+                strcat(monitoring_coeff, surface_coeff);
+                  
+                if(buffet){
+                  SPRINTF(surface_coeff, ", %12.10f", Surface_Buffet_Metric[iMarker_Monitoring]);
+                  strcat(monitoring_coeff, surface_coeff);
+                }
+              }
+            }
+
+            if (turbo){
+              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
+                if (iMarker_Monitoring == 0){
+                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                }else{
+                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
+                  strcat(turbo_coeff, surface_coeff);
+                }
+                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
+								strcat(turbo_coeff, surface_coeff);
+								//
+                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
+								strcat(turbo_coeff, surface_coeff);
+
+              }
+            }
+            
+            
+            /*--- Flow residual ---*/
+            if (nDim == 2) {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+            }
+            else {
+              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
+            }
+            
+            /*--- Turbulent residual ---*/
+            if (turbulent) {
+              switch(nVar_Turb) {
+                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
+                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
+              }
+            }
+            
+            /*---- Averaged stagnation pressure at an exit ----*/
+            
+            if (output_surface) {
+              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
+
+              if (direct_diff != NO_DERIVATIVE) {
+                SPRINTF( d_surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", 
+                        D_Surface_Uniformity, D_Surface_SecondaryStrength, D_Surface_MomentumDistortion, D_Surface_SecondOverUniform, D_Surface_PressureDrop);
+              }
+            }
+            
+            /*--- Transition residual ---*/
+            if (transition) {
+              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
+            }
+
+            /*--- Combo objective ---*/
+            if (output_comboObj) {
+              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
+            }
+
+            /*--- Fluid structure residual ---*/
+            //            if (fluid_structure) {
+            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
+            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
+            //            }
+
+            if (adjoint) {
+              
+              /*--- Adjoint coefficients ---*/
+              if (!turbo) {
+                if (compressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
+                }
+                if (incompressible) {
+                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
+                }
+              } else
+                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
+
+              /*--- Adjoint flow residuals ---*/
+              if (nDim == 2) {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
+              }
+              else {
+                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
+                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
+              }
+              
+              /*--- Adjoint turbulent residuals ---*/
+              if (turbulent)
+                if (!frozen_visc) {
+                  if (nVar_AdjTurb == 1) {
+                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
+                  } else if (nVar_AdjTurb > 1) {
+                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
+                  }
+                }
+
+            }
+
+            if (weakly_coupled_heat) {
+              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+            }
+            
+            break;
+
+          case HEAT_EQUATION_FVM:
+
+            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Total_Temperature);
+            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
+
+            break;
+            
+          case FEM_ELASTICITY:
+            
+            SPRINTF (begin_fem, ", %14.8e", 0.0);
+
+            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
+            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
+            /*--- FEM residual ---*/
+            if (nDim == 2) {
+              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
+            }
+            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
+
+            break;
+
+          case DISC_ADJ_FEM:
+
+            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
+            if (nDim == 2) {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
+            }
+            else {
+              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
+            }
+
+            break;
+
+        }
+      }
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        /*--- Write the screen header---*/
+        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
+            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
+        ) {
+
+          if (!fem) {
+            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+              switch (config[val_iZone]->GetKind_Solver()) {
+              case EULER : case NAVIER_STOKES: case RANS:
+              case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+
+                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
+
+                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
+                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
+                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
+
+                if (nZone > 1)
+                  cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
+
+                cout << "-------------------------------------------------------------------------" << endl;
+
+                if (direct_diff != NO_DERIVATIVE) {
+                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
+                  cout << "Coefficients are differentiated with respect to ";
+                  switch (direct_diff) {
+                  case D_MACH:
+                    cout << "Mach number." << endl;
+                    break;
+                  case D_AOA:
+                    cout << "AoA." << endl;
+                    break;
+                  case D_SIDESLIP:
+                    cout << "AoS." << endl;
+                    break;
+                  case D_REYNOLDS:
+                    cout << "Reynolds number." << endl;
+                    break;
+                  case D_TURB2LAM:
+                    cout << "Turb/Lam ratio." << endl;
+                    break;
+                  case D_PRESSURE:
+                    cout << "Freestream Pressure." << endl;
+                    break;
+                  case D_TEMPERATURE:
+                    cout << "Freestream Temperature." << endl;
+                    break;
+                  case D_DENSITY:
+                    cout << "Freestream Density." << endl;
+                    break;
+                  case D_VISCOSITY:
+                    cout << "Freestream Viscosity." << endl;
+                    break;
+                  case D_DESIGN:
+                    cout << "Design Variables." << endl;
+                    break;
+                  default:
+                    break;
+                  }
+
+                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
+                  cout.width(18); cout << D_Total_CL;
+                  cout.width(18); cout << D_Total_CD;
+                  cout.width(18); cout << D_Total_CMz;
+                  cout.width(18); cout << D_Total_CEff;
+                  cout << endl << "-------------------------------------------------------------------------" << endl;
+                  cout << endl;
+                }
+                if (turbo && write_turbo && val_iZone== 0){
+                  WriteTurboPerfConvHistory(config[val_iZone]);
+                }
+                break;
+
+              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+                cout << endl;
+                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout << Total_Sens_Geo;
+                cout << endl << "-------------------------------------------------------------------------" << endl;
+                break;
+
+              }
+            }
+            else {
+              if (flow) {
+                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
+                } else {
+                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+                }
+              } else {
+                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
+              }
+            }
+          }
+          else if (fem && !fsi) {
+            if (dynamic) {
+              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
+            }
+          }
+
+          switch (config[val_iZone]->GetKind_Solver()) {
+          case EULER :                  case NAVIER_STOKES:
+          case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES:
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+
+            //            if (!fluid_structure) {
+              if (incompressible && !weakly_coupled_heat) {
+              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
+              }
+              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
+            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
+            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
+            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
+              
+            else if (turbo){
+
+              if(nZone  < 2){
+                /*--- single zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /* --- multi-zone output ---*/
+                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
+              }
+            }
+              
+            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
+            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "     Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+          case RANS :
+
+            /*--- Visualize the maximum residual ---*/
+            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
+            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
+
+            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
+
+            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
+            if (config[val_iZone]->GetSystemMeasurements() == SI) {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+              if (nDim == 3) cout << ", " << Coord[2];
+              cout <<   ")." << endl;
+            }
+            else {
+              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+              if (nDim == 3) cout << ", " << Coord[2]*12.0;
+              cout <<   ")." << endl;
+            }
+            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
+
+            /*--- Print out the number of non-physical points and reconstructions ---*/
+            if (config[val_iZone]->GetNonphysical_Points() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
+              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
+
+            cout << "-------------------------------------------------------------------------" << endl;
+
+            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+            else cout << endl << " IntIter" << " ExtIter";
+            if (incompressible) cout << "   Res[Press]";
+            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
+
+            switch (config[val_iZone]->GetKind_Turb_Model()) {
+              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
+              case SST:	      cout << "     Res[kine]" << "     Res[omega]"; break;
+            }
+
+            if (weakly_coupled_heat) {
+              cout <<  "     Res[Heat]";
+            }
+
+            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
+            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
+            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
+            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
+            else if (turbo){
+              if (nZone < 2){
+                /*--- single zone output ---*/
+                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
+              }
+              else{
+                /*--- multi zone output ---*/
+                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
+
+              }
+            }
+            else if (weakly_coupled_heat) {
+              cout << "   HFlux(Total)";
+            }
+            else cout << "   CLift(Total)"   << "   CDrag(Total)";
+
+            if(extra_heat_output) {
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+            }
+
+            cout << endl;
+
+            break;
+
+            case HEAT_EQUATION_FVM :
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              cout <<  "      Res[Heat]" << "   HFlux(Total)";
+              break;
+
+            case FEM_ELASTICITY :
+              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << " ExtIter";
+
+              if (linear_analysis) {
+                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
+                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
+              }
+              else if (nonlinear_analysis) {
+                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
+                  case RESFEM_RELATIVE:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  case RESFEM_ABSOLUTE:
+                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
+                    break;
+                  default:
+                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
+                    break;
+                }
+            }
+           break;
+
+            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) {
+                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
+                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
+              }
+              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    if (energy) {
+                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
+                    } else {
+                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                    }
+                  }                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
+                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case ADJ_RANS : case DISC_ADJ_RANS:
+
+              /*--- Visualize the maximum residual ---*/
+              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
+              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
+              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
+              if (config[val_iZone]->GetSystemMeasurements() == SI) {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
+                if (nDim == 3) cout << ", " << Coord[2];
+                cout <<   ")." << endl;
+              }
+              else {
+                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
+                if (nDim == 3) cout << ", " << Coord[2]*12.0;
+                cout <<   ")." << endl;
+              }
+
+              /*--- Print out the number of non-physical points and reconstructions ---*/
+              if (config[val_iZone]->GetNonphysical_Points() > 0)
+                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
+
+              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
+              else cout << endl << " IntIter" << "  ExtIter";
+
+              if (incompressible) cout << "     Res[Psi_Press]";
+              else cout << "     Res[Psi_Rho]";
+
+              if (!frozen_visc) {
+                cout << " Res[Psi_Turb[0]]";
+              }
+              else {
+                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
+                  else {cout << "   Res[Psi_Velx]";}}
+                else cout << "     Res[Psi_E]";
+              }
+              if (weakly_coupled_heat) {
+                cout << "     Res[Psi_E]";
+              }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
+                  }
+                  if (incompressible) {
+                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
+                  }
+                } else {
+                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
+              } else {
+                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
+              }
+              break;
+
+            case DISC_ADJ_FEM :
+              cout << endl << " IntIter" << " ExtIter";
+
+              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
+
+           break;
+
+          }
+
+        }
+      }
+
+      /*--- Write the solution on the screen ---*/
+      
+      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+        cout.precision(6);
+        cout.setf(ios::fixed, ios::floatfield);
+        if (!fem) {
+          if (!Unsteady) {
+            cout.width(5); cout << iExtIter + ExtIter_OffSet;
+            cout.width(11); cout << timeiter;
+
+          } else if (Unsteady && DualTime_Iteration) {
+            cout.width(8); cout << iIntIter;
+            cout.width(8); cout << iExtIter;
+          }
+        }
+        else if (fem) {
+          if (!DualTime_Iteration) {
+            if (!nonlinear_analysis) {
+              cout.width(5); cout << iExtIter;
+              cout.width(11); cout << timeiter;
+
+            } else {
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+            }
+          }
+          else if (discadj_fem){
+              cout.width(8); cout << iIntIter;
+              cout.width(8); cout << iExtIter;
+          }
+        }
+      }
+      
+      switch (config[val_iZone]->GetKind_Solver()) {
+        case EULER : case NAVIER_STOKES:
+        case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES:
+          
+          /*--- Write history file ---*/
+          
+          if ((!DualTime_Iteration) && (output_files)) {
+            if (!turbo) {
+              config[val_iZone]->GetHistFile()[0] << begin << direct_coeff;
+              if (buffet) config[val_iZone]->GetHistFile()[0] << buffet_coeff;
+              if (thermal) config[val_iZone]->GetHistFile()[0] << heat_coeff;
+              if (equiv_area) config[val_iZone]->GetHistFile()[0] << equivalent_area_coeff;
+              if (engine || actuator_disk) config[val_iZone]->GetHistFile()[0] << engine_coeff;
+              if (inv_design) {
+                config[val_iZone]->GetHistFile()[0] << Cp_inverse_design;
+                if (thermal) config[val_iZone]->GetHistFile()[0] << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) config[val_iZone]->GetHistFile()[0] << rotating_frame_coeff;
+              config[val_iZone]->GetHistFile()[0] << flow_resid;
+              if (weakly_coupled_heat) config[val_iZone]->GetHistFile()[0] << heat_resid;
+            }
+            else {
+              config[val_iZone]->GetHistFile()[0] << begin << turbo_coeff << flow_resid;
+            }
+            
+            if (aeroelastic) config[val_iZone]->GetHistFile()[0] << aeroelastic_coeff;
+            if (output_per_surface) config[val_iZone]->GetHistFile()[0] << monitoring_coeff;
+            if (output_surface) config[val_iZone]->GetHistFile()[0] << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) {
+              config[val_iZone]->GetHistFile()[0] << d_direct_coeff;
+              if (output_surface) config[val_iZone]->GetHistFile()[0] << d_surface_outputs;
+            }
+            if (output_comboObj) config[val_iZone]->GetHistFile()[0] << combo_obj;
+            config[val_iZone]->GetHistFile()[0] << end;
+            config[val_iZone]->GetHistFile()[0].flush();
+          }
+
+          /*--- Write screen output ---*/
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(13); cout << log10(residual_flow[0]);
+              if (!equiv_area) {
+                if (compressible) {
+                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
+                  else { cout.width(14); cout << log10(residual_flow[4]); }
+                }
+                if (incompressible && !weakly_coupled_heat) {
+                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
+                  else {cout.width(14); cout << log10(residual_flow[1]);}
+                }
+                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
+
+              }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT;
+                cout.width(15); cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                
+                if (nZone < 2) {
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else {
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                }
+                
+                cout.unsetf(ios_base::floatfield);
+                
+              }
+              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+            }
+            cout << endl;
+          }
+          break;
+          
+        case RANS :
+          
+          /*--- Write history file ---*/
+          
+          if ((!DualTime_Iteration) && (output_files)) {
+
+            if (!turbo) {
+              config[val_iZone]->GetHistFile()[0] << begin << direct_coeff;
+              if (buffet) config[val_iZone]->GetHistFile()[0] << buffet_coeff;
+              if (thermal) config[val_iZone]->GetHistFile()[0] << heat_coeff;
+              if (equiv_area) config[val_iZone]->GetHistFile()[0] << equivalent_area_coeff;
+              if (engine || actuator_disk) config[val_iZone]->GetHistFile()[0] << engine_coeff;
+              if (inv_design) {
+                config[val_iZone]->GetHistFile()[0] << Cp_inverse_design;
+                if (thermal) config[val_iZone]->GetHistFile()[0] << Heat_inverse_design;
+              }
+              if (rotating_frame && !turbo) config[val_iZone]->GetHistFile()[0] << rotating_frame_coeff;
+              config[val_iZone]->GetHistFile()[0] << flow_resid << turb_resid;
+              if (weakly_coupled_heat) config[val_iZone]->GetHistFile()[0] << heat_resid;
+            }
+            else {
+              config[val_iZone]->GetHistFile()[0] << begin << turbo_coeff << flow_resid << turb_resid;
+            }
+            
+            if (aeroelastic) config[val_iZone]->GetHistFile()[0] << aeroelastic_coeff;
+            if (output_per_surface) config[val_iZone]->GetHistFile()[0] << monitoring_coeff;
+            if (output_surface) config[val_iZone]->GetHistFile()[0] << surface_outputs;
+            if (direct_diff != NO_DERIVATIVE) {
+              config[val_iZone]->GetHistFile()[0] << d_direct_coeff;
+              if (output_surface) config[val_iZone]->GetHistFile()[0] << d_surface_outputs;
+            }
+            if (output_comboObj) config[val_iZone]->GetHistFile()[0] << combo_obj;
+            config[val_iZone]->GetHistFile()[0] << end;
+            config[val_iZone]->GetHistFile()[0].flush();
+          }
+          
+          /*--- Write screen output ---*/
+
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if(DualTime_Iteration || !Unsteady) {
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+
+              if (incompressible) cout.width(13);
+              else  cout.width(14);
+              cout << log10(residual_flow[0]);
+              switch(nVar_Turb) {
+              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
+              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
+              cout.width(15); cout << log10(residual_turbulent[1]); break;
+              }
+
+              if (weakly_coupled_heat) {
+                cout.width(14); cout << log10(residual_heat[0]);
+              }
+
+              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
+
+              if (rotating_frame && nDim == 3 && !turbo ) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << Total_CT; cout.width(15);
+                cout << Total_CQ;
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
+              cout.precision(4);
+              cout.setf(ios::scientific, ios::floatfield);
+              cout << Total_CNearFieldOF; }
+              else if (turbo) {
+                cout.setf(ios::scientific, ios::floatfield);
+                if (nZone < 2){
+                  /*--- single zone output ---*/
+                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
+                }
+                else{
+                  /*--- multi zone output ---*/
+                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
+                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
+                  if (direct_diff){
+                    cout.width(15); cout << D_EntropyGen;
+                  }
+                }
+                cout.unsetf(ios_base::floatfield);
+              }
+              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
+              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
+
+              if (aeroelastic) {
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
+                cout.width(15); cout << aeroelastic_pitch[0];
+                cout.unsetf(ios_base::floatfield);
+              }
+
+              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
+              cout << endl;              
+            }
+          }
+          break;
+          
+
+        case HEAT_EQUATION_FVM:
+
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << direct_coeff << heat_resid << end;
+            config[val_iZone]->GetHistFile()[0].flush();
+          }
+          break;
+
+        case FEM_ELASTICITY:
+          
+          if (!DualTime_Iteration) {
+            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
+            config[val_iZone]->GetHistFile()[0].flush();
+          
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+          if (linear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
+          }
+          else if (nonlinear_analysis) {
+            cout.width(14); cout << log10(residual_fem[0]);
+            cout.width(14); cout << log10(residual_fem[1]);
+            cout.width(14); cout << log10(residual_fem[2]);
+          }
+          
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+          cout.width(14); cout << Total_VMStress;
+          cout << endl;
+          }
+          break;
+          
+        case DISC_ADJ_FEM:
+
+          cout.precision(6);
+          cout.setf(ios::fixed, ios::floatfield);
+
+          cout.width(15); cout << log10(residual_fem[0]);
+          cout.width(15); cout << log10(residual_fem[1]);
+          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
+
+          cout.precision(4);
+          cout.setf(ios::scientific, ios::floatfield);
+
+
+          if (config[val_iZone]->GetnElasticityMod() == 1){
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+          }
+          else{
+            Total_SensE = 0.0; Total_SensNu = 0.0;
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
+                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+            }
+            Total_SensE = sqrt(Total_SensE);
+            Total_SensNu = sqrt(Total_SensNu);
+            cout.width(14); cout << Total_SensE;
+            cout.width(14); cout << Total_SensNu;
+          }
+
+          cout << endl;
+          break;
+
+        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
+        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
+          
+          if (!DualTime_Iteration) {
+            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid << end;
+            ConvHist_file[0].flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              if (compressible) {
+                cout.width(15); cout << log10(residual_adjflow[0]);
+                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
+              }
+              if (incompressible) {
+                cout.width(17); cout << log10(residual_adjflow[0]);
+                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
+                else {cout.width(16); cout << log10(residual_adjflow[1]);}
+              }
+
+              if (disc_adj) {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }
+                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+          
+        case ADJ_RANS : case DISC_ADJ_RANS:
+          
+          if (!DualTime_Iteration) {
+            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid;
+            if (!frozen_visc)
+              ConvHist_file[0] << adj_turb_resid;
+            ConvHist_file[0] << end;
+            ConvHist_file[0].flush();
+          }
+          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
+            if (DualTime_Iteration || !Unsteady){
+              cout.precision(6);
+              cout.setf(ios::fixed, ios::floatfield);
+              cout.width(17); cout << log10(residual_adjflow[0]);
+            if (!frozen_visc) {
+                cout.width(17); cout << log10(residual_adjturbulent[0]);
+              }
+              else {
+                if (compressible) {
+                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
+                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
+                }
+                if (incompressible) {
+                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
+                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
+                }
+              }
+            if (weakly_coupled_heat) {
+              cout.width(17); cout << log10(residual_adjheat[0]);
+            }
+              if (disc_adj) {
+                if (!turbo){
+                  if (compressible) {
+                  cout.width(14); cout << Total_Sens_Press;
+                  cout.width(14); cout << Total_Sens_AoA;
+                  }
+                  if (incompressible) {
+                    cout.width(14); cout << Total_Sens_ModVel;
+                    if (energy) {
+                      cout.width(14); cout << Total_Sens_Temp;
+                    } else {
+                      cout.width(14); cout << Total_Sens_BPressure;
+                    }                  }
+                } else {
+                  cout.width(14); cout << Total_Sens_BPressure;
+                  cout.width(15); cout << Total_Sens_Temp;
+                }
+              }else {
+                cout.precision(4);
+                cout.setf(ios::scientific, ios::floatfield);
+                cout.width(14); cout << Total_Sens_Geo;
+                cout.width(14); cout << Total_Sens_AoA;
+              }
+              cout << endl;
+              cout.unsetf(ios_base::floatfield);
+            }
+          }
+          break;
+          
+      }
+      cout.unsetf(ios::fixed);
+
+    }
+    
+
+    delete [] residual_flow;
+    delete [] residual_turbulent;
+    delete [] residual_transition;
+    delete [] residual_fea;
+    delete [] residual_fem;
+    delete [] residual_heat;
+
+    delete [] residual_adjflow;
+    delete [] residual_adjturbulent;
+
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    delete [] aeroelastic_pitch;
+    delete [] aeroelastic_plunge;
+    
+  }
+}
+
+void COutputLegacy::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
+  
+  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
+  unsigned short iMesh;
+  
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned long ExtIter = config[val_iZone]->GetExtIter();
+  unsigned short nVar = 1;
+
+  bool energy = config[val_iZone]->GetEnergy_Equation();
+  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+
+  switch( config[val_iZone]->GetKind_Solver()) {
+    case EULER : case NAVIER_STOKES : case RANS:
+      if (energy) {
+        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+      }
+      else if (weakly_coupled_heat) {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      }
+      else {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+      }
+      break;
+    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+      break;
+    case HEAT_EQUATION_FVM:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      break;
+  }
+  
+  if (RhoRes_New < EPS) RhoRes_New = EPS;
+  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
+
+  Div = RhoRes_Old[val_iZone]/RhoRes_New;
+  Diff = RhoRes_New-RhoRes_Old[val_iZone];
+
+  /*--- Compute MG factor ---*/
+
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
+    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
+  }
+
+  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
+  else power = config[val_iZone]->GetCFL_AdaptParam(1);
+
+  /*--- Detect a stall in the residual ---*/
+
+  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
+
+  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
+  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
+
+  CFLFactor = pow(Div, power);
+
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    CFL = config[val_iZone]->GetCFL(iMesh);
+    CFL *= CFLFactor;
+
+    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
+      }
+      break;
+    }
+    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
+      break;
+    }
+
+    config[val_iZone]->SetCFL(iMesh, CFL);
+  }
+
+  switch( config[val_iZone]->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES : case RANS:
+    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+    break;
+  case HEAT_EQUATION_FVM:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    break;
+  }
+  
+}
+
+void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output) {
+  
+  char cstr[200];
+  unsigned short iDim, iMarker_Monitoring;
+  ofstream Breakdown_file;
+  
+  bool compressible       = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible     = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
+  bool unsteady           = (config[val_iZone]->GetUnsteady_Simulation() != NO);
+  bool viscous            = config[val_iZone]->GetViscous();
+  bool grid_movement      = config[val_iZone]->GetGrid_Movement();
+  bool gravity            = config[val_iZone]->GetGravityForce();
+  bool turbulent          = config[val_iZone]->GetKind_Solver() == RANS;
+  bool fixed_cl           = config[val_iZone]->GetFixed_CL_Mode();
+  unsigned short Kind_Solver = config[val_iZone]->GetKind_Solver();
+  unsigned short Kind_Regime = config[val_iZone]->GetKind_Regime();
+  unsigned short Kind_Turb_Model = config[val_iZone]->GetKind_Turb_Model();
+  unsigned short Ref_NonDim = config[val_iZone]->GetRef_NonDim();
+
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short nDim = geometry[val_iZone][INST_0][FinestMesh]->GetnDim();
+  bool flow = ((config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
+               (config[val_iZone]->GetKind_Solver() == RANS));
+  
+  /*--- Output the mean flow solution using only the master node ---*/
+  
+  if ((rank == MASTER_NODE) && (flow) && (output)) {
+    
+    cout << endl << "Writing the forces breakdown file ("<< config[val_iZone]->GetBreakdown_FileName() << ")." << endl;
+    
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+    
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0,
+    Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CoPx = 0.0, Total_CoPy = 0.0, Total_CoPz = 0.0,
+    Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Inv_CL = 0.0,
+    Inv_CD = 0.0, Inv_CSF = 0.0, Inv_CMx = 0.0, Inv_CMy = 0.0,
+    Inv_CMz = 0.0, Inv_CEff = 0.0, Inv_CFx = 0.0, Inv_CFy = 0.0, Inv_CFz =
+    0.0,      Mnt_CL = 0.0,
+    Mnt_CD = 0.0, Mnt_CSF = 0.0, Mnt_CMx = 0.0, Mnt_CMy = 0.0,
+    Mnt_CMz = 0.0, Mnt_CEff = 0.0, Mnt_CFx = 0.0, Mnt_CFy = 0.0, Mnt_CFz =
+    0.0, Visc_CL = 0.0,
+    Visc_CD = 0.0, Visc_CSF = 0.0, Visc_CMx = 0.0, Visc_CMy = 0.0,
+    Visc_CMz = 0.0, Visc_CEff = 0.0, Visc_CFx = 0.0, Visc_CFy = 0.0, Visc_CFz =
+    0.0, *Surface_CL = NULL, *Surface_CD = NULL,
+    *Surface_CSF = NULL, *Surface_CEff = NULL, *Surface_CFx = NULL,
+    *Surface_CFy = NULL, *Surface_CFz = NULL,
+    *Surface_CMx = NULL, *Surface_CMy = NULL, *Surface_CMz = NULL,
+    *Surface_CL_Inv = NULL,
+    *Surface_CD_Inv = NULL, *Surface_CSF_Inv = NULL,
+    *Surface_CEff_Inv = NULL, *Surface_CFx_Inv = NULL, *Surface_CFy_Inv =
+    NULL, *Surface_CFz_Inv = NULL, *Surface_CMx_Inv = NULL,
+    *Surface_CMy_Inv = NULL, *Surface_CMz_Inv = NULL,
+    *Surface_CL_Visc = NULL,
+    *Surface_CD_Visc = NULL, *Surface_CSF_Visc = NULL,
+    *Surface_CEff_Visc = NULL, *Surface_CFx_Visc = NULL, *Surface_CFy_Visc =
+    NULL, *Surface_CFz_Visc = NULL, *Surface_CMx_Visc = NULL,
+    *Surface_CMy_Visc = NULL, *Surface_CMz_Visc = NULL,
+    *Surface_CL_Mnt = NULL,
+    *Surface_CD_Mnt = NULL, *Surface_CSF_Mnt = NULL,
+    *Surface_CEff_Mnt = NULL, *Surface_CFx_Mnt = NULL, *Surface_CFy_Mnt =
+    NULL, *Surface_CFz_Mnt = NULL, *Surface_CMx_Mnt = NULL,
+    *Surface_CMy_Mnt = NULL, *Surface_CMz_Mnt = NULL;
+    
+    /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
+     the two lines below that use the dt variable. ---*/
+    //time_t now = time(0);
+    //string dt = ctime(&now); dt[24] = '.';
+    
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    
+    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    
+    Surface_CL_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF_Inv = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff_Inv       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    
+    Surface_CL_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF_Visc =
+    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    
+    
+    Surface_CL_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CD_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CSF_Mnt =
+    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CEff_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CFz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+    Surface_CMz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
+
+    /*--- Flow solution coefficients ---*/
+    
+    Total_CL       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CL();
+    Total_CD       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CD();
+    Total_CSF      = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CSF();
+    Total_CEff        = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CEff();
+    Total_CMx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMx();
+    Total_CMy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMy();
+    Total_CMz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMz();
+    Total_CFx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    Total_CFy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+    Total_CFz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+    
+    if (nDim == 2) {
+      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
+      Total_CoPy = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPy() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+      Total_CoPz = 0.0;
+    }
+    if (nDim == 3) {
+      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
+      Total_CoPy = 0.0;
+      Total_CoPz = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPz() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+    }
+    
+    if (config[ZONE_0]->GetSystemMeasurements() == US) { Total_CoPx *= 12.0; Total_CoPy *= 12.0; Total_CoPz *= 12.0; }
+    
+    /*--- Flow inviscid solution coefficients ---*/
+    
+    Inv_CL =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Inv();
+    Inv_CD =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Inv();
+    Inv_CSF =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Inv();
+    Inv_CEff =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Inv();
+    Inv_CMx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Inv();
+    Inv_CMy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Inv();
+    Inv_CMz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Inv();
+    Inv_CFx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Inv();
+    Inv_CFy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Inv();
+    Inv_CFz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Inv();
+    
+    /*--- Flow viscous solution coefficients ---*/
+    
+    Visc_CL =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Visc();
+    Visc_CD =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Visc();
+    Visc_CSF =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Visc();
+    Visc_CEff =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Visc();
+    Visc_CMx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Visc();
+    Visc_CMy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Visc();
+    Visc_CMz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Visc();
+    Visc_CFx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Visc();
+    Visc_CFy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Visc();
+    Visc_CFz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Visc();
+    
+    /*--- Flow momentum solution coefficients ---*/
+    
+    Mnt_CL =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Mnt();
+    Mnt_CD =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Mnt();
+    Mnt_CSF =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Mnt();
+    Mnt_CEff =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Mnt();
+    Mnt_CMx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Mnt();
+    Mnt_CMy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Mnt();
+    Mnt_CMz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Mnt();
+    Mnt_CFx =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Mnt();
+    Mnt_CFy =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Mnt();
+    Mnt_CFz =
+    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Mnt();
+    
+    
+    /*--- Look over the markers being monitored and get the desired values ---*/
+    
+    for (iMarker_Monitoring = 0;
+         iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring();
+         iMarker_Monitoring++) {
+      Surface_CL[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL(
+                                                             iMarker_Monitoring);
+      Surface_CD[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD(
+                                                             iMarker_Monitoring);
+      Surface_CSF[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF(
+                                                              iMarker_Monitoring);
+      Surface_CEff[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff(
+                                                               iMarker_Monitoring);
+      Surface_CMx[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx(
+                                                              iMarker_Monitoring);
+      Surface_CMy[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy(
+                                                              iMarker_Monitoring);
+      Surface_CMz[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz(
+                                                              iMarker_Monitoring);
+      Surface_CFx[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx(
+                                                              iMarker_Monitoring);
+      Surface_CFy[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy(
+                                                              iMarker_Monitoring);
+      Surface_CFz[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz(
+                                                              iMarker_Monitoring);
+      
+      Surface_CL_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Inv(
+                                                                 iMarker_Monitoring);
+      Surface_CD_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Inv(
+                                                                 iMarker_Monitoring);
+      Surface_CSF_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CEff_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Inv(
+                                                                   iMarker_Monitoring);
+      Surface_CMx_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CMy_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CMz_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFx_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFy_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFz_Inv[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CL_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Visc(
+                                                                  iMarker_Monitoring);
+      Surface_CD_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Visc(
+                                                                  iMarker_Monitoring);
+      Surface_CSF_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CEff_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Visc(
+                                                                    iMarker_Monitoring);
+      Surface_CMx_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CMy_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CMz_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFx_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFy_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFz_Visc[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Visc(
+                                                                   iMarker_Monitoring);
+      
+      Surface_CL_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Mnt(
+                                                                 iMarker_Monitoring);
+      Surface_CD_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Mnt(
+                                                                 iMarker_Monitoring);
+      Surface_CSF_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CEff_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Mnt(
+                                                                   iMarker_Monitoring);
+      Surface_CMx_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CMy_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CMz_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFx_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFy_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFz_Mnt[iMarker_Monitoring] =
+      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Mnt(
+                                                                  iMarker_Monitoring);
+      
+    }
+    
+    
+    /*--- Write file name with extension ---*/
+    
+    string filename = config[val_iZone]->GetBreakdown_FileName();
+    strcpy (cstr, filename.data());
+    
+    Breakdown_file.open(cstr, ios::out);
+    
+    Breakdown_file << "\n" <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file <<"|    ___ _   _ ___                                                      |" << "\n";
+    Breakdown_file <<"|   / __| | | |_  )   Release 6.1.0  \"Falcon\"                           |" << "\n";
+    Breakdown_file <<"|   \\__ \\ |_| |/ /                                                      |" << "\n";
+    Breakdown_file <<"|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    //Breakdown_file << "|   Local date and time: " << dt << "                      |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| The current SU2 release has been coordinated by the                   |" << "\n";
+    Breakdown_file << "| SU2 International Developers Society <www.su2devsociety.org>          |" << "\n";
+    Breakdown_file << "| with selected contributions from the open-source community            |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| The main research teams contributing to the current release are:      |" << "\n";
+    Breakdown_file << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << "\n";
+    Breakdown_file << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << "\n";
+    Breakdown_file << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << "\n";
+    Breakdown_file << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << "\n";
+    Breakdown_file << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << "\n";
+    Breakdown_file << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << "\n";
+    Breakdown_file << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << "\n";
+    Breakdown_file << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,       |" << "\n";
+    Breakdown_file << "|                      Tim Albring, and the SU2 contributors.           |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| SU2 is free software; you can redistribute it and/or                  |" << "\n";
+    Breakdown_file << "| modify it under the terms of the GNU Lesser General Public            |" << "\n";
+    Breakdown_file << "| License as published by the Free Software Foundation; either          |" << "\n";
+    Breakdown_file << "| version 2.1 of the License, or (at your option) any later version.    |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| SU2 is distributed in the hope that it will be useful,                |" << "\n";
+    Breakdown_file << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << "\n";
+    Breakdown_file << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << "\n";
+    Breakdown_file << "| Lesser General Public License for more details.                       |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| You should have received a copy of the GNU Lesser General Public      |" << "\n";
+    Breakdown_file << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    
+    Breakdown_file.precision(6);
+
+    Breakdown_file << "\n" << "\n" << "Problem definition:" << "\n" << "\n";
+    
+    switch (Kind_Solver) {
+      case EULER:
+        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Euler equations." << "\n";
+        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Euler equations." << "\n";
+        break;
+      case NAVIER_STOKES:
+        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Laminar Navier-Stokes' equations." << "\n";
+        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Laminar Navier-Stokes' equations." << "\n";
+        break;
+      case RANS:
+        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible RANS equations." << "\n";
+        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible RANS equations." << "\n";
+        Breakdown_file << "Turbulence model: ";
+        switch (Kind_Turb_Model) {
+          case SA:        Breakdown_file << "Spalart Allmaras" << "\n"; break;
+          case SA_NEG:    Breakdown_file << "Negative Spalart Allmaras" << "\n"; break;
+          case SST:       Breakdown_file << "Menter's SST"     << "\n"; break;
+        }
+        break;
+    }
+
+
+    /*--- Compressible version of console output ---*/
+
+    if (compressible) {
+
+
+    if ((Kind_Regime == COMPRESSIBLE) && (Kind_Solver != FEM_ELASTICITY)) {
+      Breakdown_file << "Mach number: " << config[val_iZone]->GetMach() <<"."<< "\n";
+      Breakdown_file << "Angle of attack (AoA): " << config[val_iZone]->GetAoA() <<" deg, and angle of sideslip (AoS): " << config[val_iZone]->GetAoS() <<" deg."<< "\n";
+      if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == ADJ_NAVIER_STOKES) ||
+          (Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS))
+        Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() <<"."<< "\n";
+    }
+    
+    if (fixed_cl) {
+      Breakdown_file << "Simulation at a cte. CL: " << config[val_iZone]->GetTarget_CL() << ".\n";
+      Breakdown_file << "Approx. Delta CL / Delta AoA: " << config[val_iZone]->GetdCL_dAlpha() << " (1/deg).\n";
+      Breakdown_file << "Approx. Delta CD / Delta CL: " << config[val_iZone]->GetdCD_dCL() << ".\n";
+      if (nDim == 3 ) {
+        Breakdown_file << "Approx. Delta CMx / Delta CL: " << config[val_iZone]->GetdCMx_dCL() << ".\n";
+        Breakdown_file << "Approx. Delta CMy / Delta CL: " << config[val_iZone]->GetdCMy_dCL() << ".\n";
+      }
+      Breakdown_file << "Approx. Delta CMz / Delta CL: " << config[val_iZone]->GetdCMz_dCL() << ".\n";
+    }
+    
+    if (Ref_NonDim == DIMENSIONAL) { Breakdown_file << "Dimensional simulation." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_PRESS_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (P=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_VEL_EQ_MACH) { Breakdown_file << "Non-Dimensional simulation (V=Mach, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_VEL_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (V=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    
+    if (config[val_iZone]->GetSystemMeasurements() == SI) {
+      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
+      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength() << " m." << "\n";
+    }
+    
+    if (config[val_iZone]->GetSystemMeasurements() == US) {
+      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea()*12.0*12.0 << " in^2." << "\n";
+      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength()*12.0 << " in." << "\n";
+    }
+    Breakdown_file << "\n" << "\n" <<"Problem definition:" << "\n" << "\n";
+    if (compressible) {
+      if (viscous) {
+        Breakdown_file << "Viscous flow: Computing pressure using the ideal gas law" << "\n";
+        Breakdown_file << "based on the free-stream temperature and a density computed" << "\n";
+        Breakdown_file << "from the Reynolds number." << "\n";
+      } else {
+        Breakdown_file << "Inviscid flow: Computing density based on free-stream" << "\n";
+        Breakdown_file << "temperature and pressure using the ideal gas law." << "\n";
+      }
+    }
+    
+    if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+    else Breakdown_file << "Force coefficients computed using free-stream values." << "\n";
+    
+    if (incompressible) {
+      Breakdown_file << "Viscous and Inviscid flow: rho_ref, and vel_ref" << "\n";
+      Breakdown_file << "are based on the free-stream values, p_ref = rho_ref*vel_ref^2." << "\n";
+      Breakdown_file << "The free-stream value of the pressure is 0." << "\n";
+      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach() << ", computed using the Bulk modulus." << "\n";
+      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the the free-stream velocity." << "\n";
+      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the the free-stream velocity." << "\n";
+      if (viscous) Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() << ", computed using free-stream values."<< "\n";
+      Breakdown_file << "Only dimensional computation, the grid should be dimensional." << "\n";
+    }
+    
+    Breakdown_file <<"-- Input conditions:"<< "\n";
+    
+    if (compressible) {
+      switch (config[val_iZone]->GetKind_FluidModel()) {
+          
+        case STANDARD_AIR:
+          Breakdown_file << "Fluid Model: STANDARD_AIR "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: 1.4000 "<< "\n";
+          break;
+          
+        case IDEAL_GAS:
+          Breakdown_file << "Fluid Model: IDEAL_GAS "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
+          break;
+          
+        case VW_GAS:
+          Breakdown_file << "Fluid Model: Van der Waals "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
+          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
+          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
+          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
+          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
+          break;
+          
+        case PR_GAS:
+          Breakdown_file << "Fluid Model: Peng-Robinson "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant(non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
+          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
+          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
+          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
+          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
+          break;
+      }
+      
+      if (viscous) {
+        
+        switch (config[val_iZone]->GetKind_ViscosityModel()) {
+            
+          case CONSTANT_VISCOSITY:
+            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
+            Breakdown_file << "Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
+            break;
+            
+          case SUTHERLAND:
+            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
+            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
+            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
+            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
+            break;
+            
+        }
+        switch (config[val_iZone]->GetKind_ConductivityModel()) {
+            
+          case CONSTANT_PRANDTL:
+            Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
+            Breakdown_file << "Prandtl: " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
+            break;
+            
+          case CONSTANT_CONDUCTIVITY:
+            Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
+            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
+            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
+            break;
+            
+        }
+        
+        if ((Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS) || (Kind_Solver == DISC_ADJ_RANS)) {
+          switch (config[val_iZone]->GetKind_ConductivityModel_Turb()) {
+            case CONSTANT_PRANDTL_TURB:
+              Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
+              Breakdown_file << "Turbulent Prandtl: " << config[val_iZone]->GetPrandtl_Turb()<< "\n";
+              break;
+            case NO_CONDUCTIVITY_TURB:
+              Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
+              Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
+              break;
+          }
+        }
+        
+      }
+    }
+    
+    if (incompressible) {
+      Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+      Breakdown_file << "Epsilon^2 multiplier of Beta for incompressible preconditioner: " << config[val_iZone]->GetBeta_Factor();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    }
+    
+    Breakdown_file << "Free-stream static pressure: " << config[val_iZone]->GetPressure_FreeStream();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    Breakdown_file << "Free-stream total pressure: " << config[val_iZone]->GetPressure_FreeStream() * pow( 1.0+config[val_iZone]->GetMach()*config[val_iZone]->GetMach()*0.5*(config[val_iZone]->GetGamma()-1.0), config[val_iZone]->GetGamma()/(config[val_iZone]->GetGamma()-1.0) );
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Free-stream temperature: " << config[val_iZone]->GetTemperature_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      
+      Breakdown_file << "Free-stream total temperature: " << config[val_iZone]->GetTemperature_FreeStream() * (1.0 + config[val_iZone]->GetMach() * config[val_iZone]->GetMach() * 0.5 * (config[val_iZone]->GetGamma() - 1.0));
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+    }
+    
+    Breakdown_file << "Free-stream density: " << config[val_iZone]->GetDensity_FreeStream();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+    
+    if (nDim == 2) {
+      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
+      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
+    }
+    if (nDim == 3) {
+      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
+      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
+    }
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
+    
+    Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Free-stream total energy per unit mass: " << config[val_iZone]->GetEnergy_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+    }
+    
+    if (viscous) {
+      Breakdown_file << "Free-stream viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      if (turbulent) {
+        Breakdown_file << "Free-stream turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+        Breakdown_file << "Free-stream specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
+      }
+    }
+    
+    if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
+    
+    /*--- Print out reference values. ---*/
+    
+    Breakdown_file <<"-- Reference values:"<< "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+    }
+    
+    Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+    }
+    
+    Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+    
+    Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
+    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference energy per unit mass: " << config[val_iZone]->GetEnergy_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+    }
+    
+    if (incompressible) {
+      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
+    }
+    
+    if (viscous) {
+      Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      if (compressible){
+        Breakdown_file << "Reference conductivity: " << config[val_iZone]->GetConductivity_Ref();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " W/m^2.K." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf/ft.s.R." << "\n";
+      }
+    }
+    
+    
+    if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
+    
+    /*--- Print out resulting non-dim values here. ---*/
+    
+    Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
+    Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
+    if (viscous) {
+      Breakdown_file << "Reynolds number (non-dim): " << config[val_iZone]->GetReynolds() <<". Re length: " << config[val_iZone]->GetLength_Reynolds();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft." << "\n";
+    }
+    if (gravity) {
+      Breakdown_file << "Froude number (non-dim): " << config[val_iZone]->GetFroude() << "\n";
+      Breakdown_file << "Lenght of the baseline wave (non-dim): " << 2.0*PI_NUMBER*config[val_iZone]->GetFroude()*config[val_iZone]->GetFroude() << "\n";
+    }
+    
+    if (compressible) {
+      Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
+      Breakdown_file << "Free-stream temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
+    }
+    
+    Breakdown_file << "Free-stream pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
+    
+    Breakdown_file << "Free-stream density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
+    
+    if (nDim == 2) {
+      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
+      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
+    } else {
+      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
+      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
+    }
+    Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
+    
+    if (compressible)
+      Breakdown_file << "Free-stream total energy per unit mass (non-dim): " << config[val_iZone]->GetEnergy_FreeStreamND() << "\n";
+    
+    if (viscous) {
+      Breakdown_file << "Free-stream viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
+      if (turbulent) {
+        Breakdown_file << "Free-stream turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
+        Breakdown_file << "Free-stream specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
+      }
+    }
+    
+    if (unsteady) {
+      Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
+      Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
+    }
+
+    } else {
+
+    /*--- Incompressible version of the console output ---*/
+
+      bool energy     = config[val_iZone]->GetEnergy_Equation();
+      bool boussinesq = (config[val_iZone]->GetKind_DensityModel() == BOUSSINESQ);
+
+      if (config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, temp_ref, p_ref" << "\n";
+        Breakdown_file << "are set to 1.0 in order to perform a dimensional calculation." << "\n";
+        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
+      }
+      else if (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
+        Breakdown_file << "are based on the initial values, p_ref = rho_ref*vel_ref^2." << "\n";
+        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
+      }
+      else if (config[val_iZone]->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
+        Breakdown_file << "are user-provided reference values, p_ref = rho_ref*vel_ref^2." << "\n";
+        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using reference values." << "\n";
+      }
+      Breakdown_file << "The reference area for force coeffs. is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
+      Breakdown_file << "The reference length for force coeffs. is " << config[val_iZone]->GetRefLength() << " m." << "\n";
+
+      Breakdown_file << "The pressure is decomposed into thermodynamic and dynamic components." << "\n";
+      Breakdown_file << "The initial value of the dynamic pressure is 0." << "\n";
+
+      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach();
+      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
+        Breakdown_file << ", computed using the Bulk modulus." << "\n";
+      } else {
+        Breakdown_file << ", computed using fluid speed of sound." << "\n";
+      }
+
+      Breakdown_file << "For external flows, the initial state is imposed at the far-field." << "\n";
+      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the initial velocity." << "\n";
+      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the initial velocity." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Reynolds number per meter: " << config[val_iZone]->GetReynolds() << ", computed using initial values."<< "\n";
+        Breakdown_file << "Reynolds number is a byproduct of inputs only (not used internally)." << "\n";
+      }
+      Breakdown_file << "SI units only. The grid should be dimensional (meters)." << "\n";
+
+      switch (config[val_iZone]->GetKind_DensityModel()) {
+
+        case CONSTANT:
+          if (energy) Breakdown_file << "Energy equation is active and decoupled." << "\n";
+          else Breakdown_file << "No energy equation." << "\n";
+          break;
+
+        case BOUSSINESQ:
+          if (energy) Breakdown_file << "Energy equation is active and coupled through Boussinesq approx." << "\n";
+          break;
+
+        case VARIABLE:
+          if (energy) Breakdown_file << "Energy equation is active and coupled for variable density." << "\n";
+          break;
+
+      }
+
+      Breakdown_file <<"-- Input conditions:"<< "\n";
+
+      switch (config[val_iZone]->GetKind_FluidModel()) {
+
+        case CONSTANT_DENSITY:
+          Breakdown_file << "Fluid Model: CONSTANT_DENSITY "<< "\n";
+          if (energy) {
+            Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << "\n";
+          }
+          if (boussinesq) Breakdown_file << "Thermal expansion coefficient: " << config[val_iZone]->GetThermal_Expansion_Coeff() << " K^-1." << "\n";
+          Breakdown_file << "Thermodynamic pressure not required." << "\n";
+          break;
+
+        case INC_IDEAL_GAS:
+          Breakdown_file << "Fluid Model: INC_IDEAL_GAS "<< endl;
+          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
+          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
+          Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
+          Breakdown_file << "Molecular weight : "<< config[val_iZone]->GetMolecular_Weight() << " g/mol" << endl;
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << endl;
+          Breakdown_file << "Thermodynamic pressure: " << config[val_iZone]->GetPressure_Thermodynamic();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
+          break;
+          
+        case INC_IDEAL_GAS_POLY:
+          Breakdown_file << "Fluid Model: INC_IDEAL_GAS_POLY "<< endl;
+          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
+          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
+          Breakdown_file << "Molecular weight: " << config[val_iZone]->GetMolecular_Weight() << " g/mol." << endl;
+          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << endl;
+          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << endl;
+          Breakdown_file << "Thermodynamic pressure: " << config[val_iZone]->GetPressure_Thermodynamic();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
+          Breakdown_file << "Cp(T) polynomial coefficients: \n  (";
+          for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+            Breakdown_file << config[val_iZone]->GetCp_PolyCoeff(iVar);
+            if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+          }
+          Breakdown_file << ")." << endl;
+          Breakdown_file << "Cp(T) polynomial coefficients (non-dim.): \n  (";
+          for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+            Breakdown_file << config[val_iZone]->GetCp_PolyCoeffND(iVar);
+            if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+          }
+          Breakdown_file << ")." << endl;
+          break;
+
+      }
+      if (viscous) {
+        switch (config[val_iZone]->GetKind_ViscosityModel()) {
+
+          case CONSTANT_VISCOSITY:
+            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
+            Breakdown_file << "Constant Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
+            break;
+
+          case SUTHERLAND:
+            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
+            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
+            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
+            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
+            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
+            break;
+            
+          case POLYNOMIAL_VISCOSITY:
+            Breakdown_file << "Viscosity Model: POLYNOMIAL_VISCOSITY  "<< endl;
+            Breakdown_file << "Mu(T) polynomial coefficients: \n  (";
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+              Breakdown_file << config[val_iZone]->GetMu_PolyCoeff(iVar);
+              if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+            }
+            Breakdown_file << ")." << endl;
+            Breakdown_file << "Mu(T) polynomial coefficients (non-dim.): \n  (";
+            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+              Breakdown_file << config[val_iZone]->GetMu_PolyCoeffND(iVar);
+              if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+            }
+            Breakdown_file << ")." << endl;
+            break;
+
+        }
+
+        if (energy) {
+          switch (config[val_iZone]->GetKind_ConductivityModel()) {
+
+            case CONSTANT_PRANDTL:
+              Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
+              Breakdown_file << "Prandtl (Laminar): " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
+              break;
+
+            case CONSTANT_CONDUCTIVITY:
+              Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
+              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
+              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
+              break;
+
+            case POLYNOMIAL_CONDUCTIVITY:
+              Breakdown_file << "Viscosity Model: POLYNOMIAL_CONDUCTIVITY "<< endl;
+              Breakdown_file << "Kt(T) polynomial coefficients: \n  (";
+              for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+                Breakdown_file << config[val_iZone]->GetKt_PolyCoeff(iVar);
+                if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+              }
+              Breakdown_file << ")." << endl;
+              Breakdown_file << "Kt(T) polynomial coefficients (non-dim.): \n  (";
+              for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
+                Breakdown_file << config[val_iZone]->GetKt_PolyCoeffND(iVar);
+                if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+              }
+              Breakdown_file << ")." << endl;
+              break;
+              
+          }
+          
+          if ((Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS) || (Kind_Solver == DISC_ADJ_RANS)) {
+            switch (config[val_iZone]->GetKind_ConductivityModel_Turb()) {
+              case CONSTANT_PRANDTL_TURB:
+                Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
+                Breakdown_file << "Turbulent Prandtl: " << config[val_iZone]->GetPrandtl_Turb()<< "\n";
+                break;
+              case NO_CONDUCTIVITY_TURB:
+                Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
+                Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
+                break;
+            }
+          }
+          
+        }
+
+      }
+
+      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
+        Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+      }
+
+      Breakdown_file << "Initial dynamic pressure: " << config[val_iZone]->GetPressure_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      Breakdown_file << "Initial total pressure: " << config[val_iZone]->GetPressure_FreeStream() + 0.5*config[val_iZone]->GetDensity_FreeStream()*config[val_iZone]->GetModVel_FreeStream()*config[val_iZone]->GetModVel_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      if (energy) {
+        Breakdown_file << "Initial temperature: " << config[val_iZone]->GetTemperature_FreeStream();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      }
+
+      Breakdown_file << "Initial density: " << config[val_iZone]->GetDensity_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+
+      if (nDim == 2) {
+        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
+        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
+      }
+      if (nDim == 3) {
+        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
+        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
+      }
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
+
+      Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Initial laminar viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+        if (turbulent) {
+          Breakdown_file << "Initial turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+          Breakdown_file << "Initial specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
+        }
+      }
+
+      if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
+
+      /*--- Print out reference values. ---*/
+
+      Breakdown_file <<"-- Reference values:"<< "\n";
+
+      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
+        Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+      } else {
+        if (energy) {
+          Breakdown_file << "Reference specific heat: " << config[val_iZone]->GetGas_Constant_Ref();
+          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+        }
+      }
+
+      Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      if (energy) {
+        Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      }
+
+      Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+
+      Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+
+      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
+        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      }
+
+      if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
+
+      /*--- Print out resulting non-dim values here. ---*/
+
+      Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
+      Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
+      if (viscous) {
+        Breakdown_file << "Reynolds number (per m): " << config[val_iZone]->GetReynolds() << "\n";
+      }
+
+      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
+        Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
+        Breakdown_file << "Initial thermodynamic pressure (non-dim): " << config[val_iZone]->GetPressure_ThermodynamicND() << "\n";
+      } else {
+        if (energy) {
+          Breakdown_file << "Specific heat at constant pressure (non-dim): " << config[val_iZone]->GetSpecific_Heat_CpND() << "\n";
+          if (boussinesq) Breakdown_file << "Thermal expansion coefficient (non-dim.): " << config[val_iZone]->GetThermal_Expansion_CoeffND() << " K^-1." << "\n";
+        }
+      }
+
+      if (energy) Breakdown_file << "Initial temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
+      Breakdown_file << "Initial pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
+      Breakdown_file << "Initial density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
+
+      if (nDim == 2) {
+        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
+        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
+      } else {
+        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
+        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
+      }
+      Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
+      
+      if (viscous) {
+        Breakdown_file << "Initial viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
+        if (turbulent) {
+          Breakdown_file << "Initial turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
+          Breakdown_file << "Initial specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
+        }
+      }
+      
+      if (unsteady) {
+        Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
+        Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
+      }
+
+    }
+
+    /*--- Begin forces breakdown info. ---*/
+    
+    Breakdown_file << fixed;
+    Breakdown_file << "\n" << "\n" <<"Forces breakdown:" << "\n" << "\n";
+
+    if (nDim == 3) {
+      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+      su2double term = (Total_CoPz/m)-Total_CoPx;
+      
+      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z-"<< term << "." << "\n\n";
+      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z+"<< fabs(term);
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
+      else Breakdown_file << " in." << "\n\n";
+    }
+    else {
+      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
+      su2double term = (Total_CoPy/m)-Total_CoPx;
+      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y-"<< term << "." << "\n\n";
+      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y+"<< fabs(term);
+      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
+      else Breakdown_file << " in." << "\n\n";
+    }
+
+    /*--- Reference area and force factors. ---*/
+
+    su2double RefDensity, RefArea, RefVel, Factor, Ref;
+    RefArea     = config[val_iZone]->GetRefArea();
+    if (compressible) {
+      RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
+      RefVel = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetModVelocity_Inf();
+    } else {
+      if ((config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) ||
+          (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
+        RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
+        RefVel = 0.0;
+        for (iDim = 0; iDim < nDim; iDim++)
+          RefVel  += solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim)*solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim);
+        RefVel = sqrt(RefVel);
+      } else {
+        RefDensity = config[val_iZone]->GetInc_Density_Ref();
+        RefVel    = config[val_iZone]->GetInc_Velocity_Ref();
+      }
+    }
+    Factor = (0.5*RefDensity*RefArea*RefVel*RefVel);
+    Ref = config[val_iZone]->GetDensity_Ref() * config[val_iZone]->GetVelocity_Ref() * config[val_iZone]->GetVelocity_Ref() * 1.0 * 1.0;
+
+    Breakdown_file << "NOTE: Multiply forces by the non-dimensional factor: " << Factor << ", and the reference factor: " << Ref  << "\n";
+    Breakdown_file << "to obtain the dimensional force."  << "\n" << "\n";
+
+    Breakdown_file << "Total CL:    ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CL;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CL;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CL;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CL << "\n";
+    
+    Breakdown_file << "Total CD:    ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CD;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CD;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CD;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CD << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CSF:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CSF;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CSF;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file <<  SU2_TYPE::Int((Visc_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CSF;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CSF << "\n";
+    }
+    
+    Breakdown_file << "Total CL/CD: ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CEff;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CEff;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file <<  SU2_TYPE::Int((Visc_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CEff;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CEff << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CMx:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CMx;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CMx;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CMx;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CMx << "\n";
+      
+      Breakdown_file << "Total CMy:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CMy;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CMy * 100.0) / (Total_CMy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CMy;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CMy * 100.0) / (Total_CMy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CMy;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CMy << "\n";
+    }
+    
+    Breakdown_file << "Total CMz:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CMz;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CMz;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CMz;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CMz << "\n";
+    
+    Breakdown_file << "Total CFx:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CFx;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CFx;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CFx;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CFx << "\n";
+    
+    Breakdown_file << "Total CFy:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CFy;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CFy;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CFy;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CFy << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CFz:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CFz;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CFz;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CFz;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CFz << "\n";
+    }
+    
+    Breakdown_file << "\n" << "\n";
+    
+    for (iMarker_Monitoring = 0;
+         iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring();
+         iMarker_Monitoring++) {
+      
+      Breakdown_file << "Surface name: "
+      << config[val_iZone]->GetMarker_Monitoring_TagBound(
+                                                          iMarker_Monitoring) << "\n" << "\n";
+      
+      Breakdown_file << "Total CL    (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL[iMarker_Monitoring] * 100.0)
+                       / (Total_CL + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CD    (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD[iMarker_Monitoring] * 100.0)
+                       / (Total_CD + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        Breakdown_file << "Total CSF   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF[iMarker_Monitoring] * 100.0)
+                         / (Total_CSF + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CSF[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CSF_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CSF_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CSF_Mnt[iMarker_Monitoring] << "\n";
+      }
+      
+      Breakdown_file << "Total CL/CD (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff[iMarker_Monitoring] * 100.0) / (Total_CEff + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CEff[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CEff_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CEff_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CEff_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        
+        Breakdown_file << "Total CMx   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx[iMarker_Monitoring] * 100.0) / (Total_CMx + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMx[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMx_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMx_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMx_Mnt[iMarker_Monitoring] << "\n";
+        
+        Breakdown_file << "Total CMy   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy[iMarker_Monitoring] * 100.0) / (Total_CMy + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMy[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMy_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMy_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMy_Mnt[iMarker_Monitoring] << "\n";
+      }
+      
+      Breakdown_file << "Total CMz   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CMz[iMarker_Monitoring] * 100.0) / (Total_CMz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CMz[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CMz_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CMz_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CMz_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CFx   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CFx[iMarker_Monitoring] * 100.0) / (Total_CFx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFx[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFx_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFx_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFx_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CFy   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CFy[iMarker_Monitoring] * 100.0) / (Total_CFy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFy[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFy_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFy_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFy_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        Breakdown_file << "Total CFz   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz[iMarker_Monitoring] * 100.0) / (Total_CFz + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CFz[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CFz_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CFz_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CFz_Mnt[iMarker_Monitoring] << "\n";
+        
+      }
+      
+      Breakdown_file << "\n";
+      
+      
+    }
+    
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    
+    delete [] Surface_CL_Inv;
+    delete [] Surface_CD_Inv;
+    delete [] Surface_CSF_Inv;
+    delete [] Surface_CEff_Inv;
+    delete [] Surface_CFx_Inv;
+    delete [] Surface_CFy_Inv;
+    delete [] Surface_CFz_Inv;
+    delete [] Surface_CMx_Inv;
+    delete [] Surface_CMy_Inv;
+    delete [] Surface_CMz_Inv;
+    
+    delete [] Surface_CL_Visc;
+    delete [] Surface_CD_Visc;
+    delete [] Surface_CSF_Visc;
+    delete [] Surface_CEff_Visc;
+    delete [] Surface_CFx_Visc;
+    delete [] Surface_CFy_Visc;
+    delete [] Surface_CFz_Visc;
+    delete [] Surface_CMx_Visc;
+    delete [] Surface_CMy_Visc;
+    delete [] Surface_CMz_Visc;
+
+    delete [] Surface_CL_Mnt;
+    delete [] Surface_CD_Mnt;
+    delete [] Surface_CSF_Mnt;
+    delete [] Surface_CEff_Mnt;
+    delete [] Surface_CFx_Mnt;
+    delete [] Surface_CFy_Mnt;
+    delete [] Surface_CFz_Mnt;
+    delete [] Surface_CMx_Mnt;
+    delete [] Surface_CMy_Mnt;
+    delete [] Surface_CMz_Mnt;
+
+    Breakdown_file.close();
+    
+  }
+  
+}
+
+void COutputLegacy::SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
+                              unsigned long iExtIter, unsigned short val_nZone) {
+  
+//  unsigned short iZone;
+  
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+//    /*--- Flags identifying the types of files to be written. ---*/
+    
+//    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+//    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+//    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+
+//#ifdef HAVE_MPI
+//    /*--- Do not merge the volume solutions if we are running in parallel.
+//     Force the use of SU2_SOL to merge the volume sols in this case. ---*/
+    
+//    SU2_MPI::Comm_size(MPI_COMM_WORLD, &size);
+//    if (size > SINGLE_NODE) {
+//      Wrt_Vol = false;
+//      Wrt_Srf = false;
+//    }
+//#endif
+    
+//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+    
+//    switch (config[iZone]->GetKind_Solver()) {
+        
+//      case EULER : case NAVIER_STOKES : case RANS :
+//      case FEM_EULER : case FEM_NAVIER_STOKES : case FEM_RANS : case FEM_LES :
+        
+//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
+//        break;
+        
+
+//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS : case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
+//        break;
+        
+//    }
+    
+//    /*--- Get the file output format ---*/
+    
+//    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    
+//    /*--- Merge the node coordinates and connectivity, if necessary. This
+//     is only performed if a volume solution file is requested, and it
+//     is active by default. ---*/
+    
+//    if (Wrt_Vol || Wrt_Srf) {
+//      if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+//      MergeConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+//    }
+    
+//    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+//     The grid coordinates are always merged and included first in the
+//     restart files. ---*/
+    
+//    if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
+//    MergeCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
+    
+//    if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+//      if (FileFormat == TECPLOT_BINARY) {
+//        if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
+//        SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+//        SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+//        if (!wrote_base_file)
+//          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//        if (!wrote_surf_file)
+//          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], wrote_surf_file);
+//      }
+//    }
+    
+//    /*--- Merge the solution data needed for volume solutions and restarts ---*/
+    
+//    if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+//    MergeSolution(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+    
+//    /*--- Write restart, or Tecplot files using the merged data.
+//     This data lives only on the master, and these routines are currently
+//     executed by the master proc alone (as if in serial). ---*/
+    
+//    if (rank == MASTER_NODE) {
+      
+//      /*--- Write a native restart file ---*/
+      
+//      if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
+//      SetRestart(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone);
+      
+//      if (Wrt_Vol) {
+        
+//        switch (FileFormat) {
+            
+//          case TECPLOT:
+            
+//            /*--- Write a Tecplot ASCII file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+//            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//            break;
+            
+//          case FIELDVIEW:
+            
+//            /*--- Write a FieldView ASCII file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
+//            SetFieldViewASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//            break;
+            
+//          case TECPLOT_BINARY:
+            
+//            /*--- Write a Tecplot binary solution file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
+//            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+//            break;
+            
+//          case FIELDVIEW_BINARY:
+            
+//            /*--- Write a FieldView binary file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
+//            SetFieldViewBinary(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//            break;
+            
+//          case PARAVIEW:
+            
+//            /*--- Write a Paraview ASCII file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//            break;
+            
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            
+//            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
+//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+//            break;
+            
+//          default:
+//            break;
+//        }
+        
+//      }
+      
+//      if (Wrt_Srf) {
+        
+//        switch (FileFormat) {
+            
+//          case TECPLOT:
+            
+//            /*--- Write a Tecplot ASCII file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
+//            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+//            break;
+            
+//          case TECPLOT_BINARY:
+            
+//            /*--- Write a Tecplot binary solution file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
+//            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+//            break;
+            
+//          case PARAVIEW:
+            
+//            /*--- Write a Paraview ASCII file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+//            break;
+            
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            
+//            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
+//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+//            break;
+            
+//          default:
+//            break;
+//        }
+        
+//      }
+      
+//      /*--- Release memory needed for merging the solution data. ---*/
+      
+//      DeallocateCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
+//      DeallocateSolution(config[iZone], geometry[iZone][INST_0][MESH_0]);
+      
+//    }
+    
+//    /*--- Final broadcast (informing other procs that the base output
+//     file was written). ---*/
+    
+//#ifdef HAVE_MPI
+//    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//    SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//#endif
+    
+//  }
+}
+
+void COutputLegacy::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                                      unsigned long iExtIter, unsigned short val_nZone) {
+  
+//  unsigned short iZone, iInst, nInst;
+  
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+//    nInst = config[iZone]->GetnTimeInstances();
+
+//    for (iInst = 0; iInst < nInst; iInst++) {
+
+//      config[iZone]->SetiInst(iInst);
+
+//      /*--- Flags identifying the types of files to be written. ---*/
+
+//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+//      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
+//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+
+//      /*--- Get the file output format ---*/
+
+//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+
+//      /*--- Merge the node coordinates and connectivity if necessary. This
+//     is only performed if a volume solution file is requested, and it
+//     is active by default. ---*/
+
+//      if ((Wrt_Vol || Wrt_Srf)) {
+//        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+//        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
+//      }
+
+//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+
+//      if ((Wrt_Vol || Wrt_Srf)) {
+//        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+//        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+//      }
+
+//      /*--- Write restart, Tecplot or Paraview files using the merged data.
+//     This data lives only on the master, and these routines are currently
+//     executed by the master proc alone (as if in serial). ---*/
+
+
+//      if (rank == MASTER_NODE) {
+
+//        if (Wrt_Vol) {
+
+//          switch (FileFormat) {
+
+//          case TECPLOT:
+
+//            /*--- Write a Tecplot ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+//            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//            break;
+
+//          case FIELDVIEW:
+
+//            /*--- Write a FieldView ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+//            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//            break;
+
+//          case TECPLOT_BINARY:
+
+//            /*--- Write a Tecplot binary solution file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+//            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
+//            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
+//            break;
+
+//          case FIELDVIEW_BINARY:
+
+//            /*--- Write a binary binary file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+//            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//            break;
+
+//          case PARAVIEW:
+
+//            /*--- Write a Paraview ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//            break;
+              
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            
+//            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
+//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//            break;
+
+//          default:
+//            break;
+//          }
+
+//        }
+
+//        if (Wrt_Srf) {
+
+//          switch (FileFormat) {
+
+//          case TECPLOT:
+
+//            /*--- Write a Tecplot ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+//            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+//            break;
+
+//          case TECPLOT_BINARY:
+
+//            /*--- Write a Tecplot binary solution file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+//            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
+//            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
+//            break;
+
+//          case PARAVIEW:
+
+//            /*--- Write a Paraview ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+//            break;
+
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            
+//            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
+//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
+//            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+//            break;
+              
+//          default:
+//            break;
+//          }
+//        }
+
+//        if (FileFormat == TECPLOT_BINARY) {
+//          if (!wrote_base_file)
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//          if (!wrote_surf_file)
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
+//        }
+
+//        if (Wrt_Vol || Wrt_Srf)
+//          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+//      }
+
+
+
+//      /*--- Final broadcast (informing other procs that the base output
+//     file was written). ---*/
+
+//#ifdef HAVE_MPI
+//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//#endif
+
+//    }
+
+//  }
+}
+
+void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
+
+//  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
+//  unsigned short iZone;
+//  ofstream output_file;
+//  string str;
+
+//  /*--- Read the name of the output and input file ---*/
+
+//  if (su2_file) {
+//    if (rank == MASTER_NODE) {
+//      str = config[ZONE_0]->GetMesh_Out_FileName();
+//      strcpy (out_file, str.c_str());
+//      strcpy (cstr, out_file);
+//      output_file.precision(15);
+//      output_file.open(cstr, ios::out);
+//      if (val_nZone > 1) {
+//        output_file << "NZONE= " << val_nZone << endl;
+//      }
+//    }
+//  }
+
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+//    /*--- Flags identifying the types of files to be written. ---*/
+    
+//    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
+//    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
+//    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
+    
+//    /*--- Merge the node coordinates and connectivity if necessary. This
+//     is only performed if a volume solution file is requested, and it
+//     is active by default. ---*/
+    
+//    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
+//    MergeConnectivity(config[iZone], geometry[iZone], iZone);
+    
+//    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+//     The grid coordinates are always merged and included first in the
+//     restart files. ---*/
+    
+//    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
+//    MergeCoordinates(config[iZone], geometry[iZone]);
+    
+//    /*--- Write restart, Tecplot or Paraview files using the merged data.
+//     This data lives only on the master, and these routines are currently
+//     executed by the master proc alone (as if in serial). ---*/
+    
+//    if (rank == MASTER_NODE) {
+      
+//      if (Wrt_Vol) {
+        
+//        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
+
+//        /*--- Write a Tecplot ASCII file ---*/
+
+//        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+//        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
+//          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+//        }
+//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
+//          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+//        }
+        
+//      }
+      
+//      if (Wrt_Srf) {
+        
+//        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
+        
+//        /*--- Write a Tecplot ASCII file ---*/
+        
+//        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
+//        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
+//          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
+//        }
+//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
+//          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+//        }
+        
+//      }
+      
+//      /*--- Write a .su2 ASCII file ---*/
+
+//      if (su2_file) {
+        
+//        if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
+        
+//        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
+        
+//        /*--- Write an stl surface file ---*/
+        
+//        if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
+        
+//        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
+        
+//      }
+      
+//      /*--- Write a binary file with the grid coordinates alone. ---*/
+      
+//      if (Wrt_Crd) {
+//        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
+//        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
+//      }
+
+      
+//      /*--- Deallocate connectivity ---*/
+      
+//      DeallocateConnectivity(config[iZone], geometry[iZone], true);
+//      DeallocateConnectivity(config[iZone], geometry[iZone], false);
+//      DeallocateCoordinates(config[iZone], geometry[iZone]);
+      
+//    }
+
+//    /*--- Final broadcast (informing other procs that the base output
+//     file was written). ---*/
+    
+//#ifdef HAVE_MPI
+//    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//#endif
+    
+//    /*--- Write an csv surface file, done in parallel ---*/
+
+//    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
+
+//    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
+
+//  }
+
+//  if (rank == MASTER_NODE) {
+//    if (su2_file){
+//      output_file.close();
+//    }
+//  }
+}
+
+void COutputLegacy::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
+  
+  short iSection, nSection;
+  unsigned long iVertex, iPoint, Trailing_Point;
+  su2double *Plane_P0, *Plane_P0_, *Plane_Normal, *Plane_Normal_, *CPressure,
+  Force[3], ForceInviscid[3], MomentInviscid[3] =
+  { 0.0, 0.0, 0.0 }, MomentDist[3] = { 0.0, 0.0, 0.0 }, RefDensity,
+  RefPressure, RefArea, *Velocity_Inf, Gas_Constant, Mach2Vel,
+  Mach_Motion, Gamma, RefVel2 = 0.0, factor, NDPressure, *Origin,
+  RefLength, Alpha, CL_Inv,
+  Xcoord_LeadingEdge = 0.0, Ycoord_LeadingEdge = 0.0, Zcoord_LeadingEdge = 0.0,
+  Xcoord_TrailingEdge = 0.0, Ycoord_TrailingEdge = 0.0, Zcoord_TrailingEdge = 0.0,
+  Xcoord_LeadingEdge_ = 0.0, 
+  Xcoord_TrailingEdge_ = 0.0, Ycoord_TrailingEdge_ = 0.0, Zcoord_TrailingEdge_ = 0.0,
+  MaxDistance, Distance, Chord, Aux, Dihedral_Trailing;
+  
+  su2double B, Y, C_L, C_L0, Elliptic_Spanload;
+  
+  vector<su2double> Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
+  CPressure_Airfoil;
+  vector<su2double> Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
+  CPressure_Airfoil_;
+  string Marker_Tag, Slice_Filename, Slice_Ext;
+  ofstream Cp_File;
+  unsigned short iDim;
+  
+  bool grid_movement = config->GetGrid_Movement();
+  
+  Plane_P0 = new su2double[3];
+  Plane_P0_ = new su2double[3];
+  Plane_Normal = new su2double[3];
+  Plane_Normal_ = new su2double[3];
+  CPressure = new su2double[geometry->GetnPoint()];
+  
+  if ((rank == MASTER_NODE) && (output)) {
+    cout << endl << "Writing the spanload file (load_distribution.dat).";
+  }
+  
+  /*--- Compute some reference quantities and necessary values ---*/
+  
+  RefDensity = solver->GetDensity_Inf();
+  RefPressure = solver->GetPressure_Inf();
+  RefArea = config->GetRefArea();
+  Velocity_Inf = solver->GetVelocity_Inf();
+  Gamma = config->GetGamma();
+  Origin = config->GetRefOriginMoment(0);
+  RefLength = config->GetRefLength();
+  Alpha = config->GetAoA() * PI_NUMBER / 180.0;
+  
+  if (grid_movement) {
+    Gas_Constant = config->GetGas_ConstantND();
+    Mach2Vel = sqrt(
+                    Gamma * Gas_Constant * config->GetTemperature_FreeStreamND());
+    Mach_Motion = config->GetMach_Motion();
+    RefVel2 = (Mach_Motion * Mach2Vel) * (Mach_Motion * Mach2Vel);
+  } else {
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
+      RefVel2 += Velocity_Inf[iDim] * Velocity_Inf[iDim];
+  }
+  factor = 1.0 / (0.5 * RefDensity * RefArea * RefVel2);
+  
+  if (geometry->GetnDim() == 3) {
+    
+    /*--- Copy the pressure to an auxiliar structure ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      CPressure[iPoint] = (solver->node[iPoint]->GetPressure()
+                           - RefPressure) * factor * RefArea;
+    }
+    
+    nSection = config->GetnLocationStations();
+    
+    for (iSection = 0; iSection < nSection; iSection++) {
+      
+      /*--- Read the values from the config file ---*/
+      
+      Plane_Normal[0] = 0.0; Plane_P0[0] = 0.0;
+      Plane_Normal[1] = 0.0; Plane_P0[1] = 0.0;
+      Plane_Normal[2] = 0.0; Plane_P0[2] = 0.0;
+      
+      if (config->GetGeo_Description() == FUSELAGE) {
+        Plane_Normal[0] = 1.0;
+        Plane_P0[0] = config->GetLocationStations(iSection);
+      }
+      else if (config->GetGeo_Description() == NACELLE) {
+        Plane_Normal[0] = 0.0;
+        Plane_Normal[1] = -sin(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
+        Plane_Normal[2] = cos(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
+        
+        /*--- Apply tilt angle to the plane ---*/
+        
+        su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
+        su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
+        su2double Plane_NormalY_Tilt = Plane_Normal[1];
+        su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
+        
+        /*--- Apply toe angle to the plane ---*/
+        
+        su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
+        su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
+        su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
+        su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
+        
+        /*--- Update normal vector ---*/
+        
+        Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
+        Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
+        Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
+        
+      }
+      else {
+        Plane_Normal[1] = 1.0;
+        Plane_P0[1] = config->GetLocationStations(iSection);
+      }
+
+      /*--- Compute the airfoil sections (note that we feed in the Cp) ---*/
+      
+      geometry->ComputeAirfoil_Section(Plane_P0, Plane_Normal, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
+                                       CPressure, Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
+                                       CPressure_Airfoil, true, config);
+      
+      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() == 0)) {
+        if ((config->GetGeo_Description() == FUSELAGE) || (config->GetGeo_Description() == WING))
+          cout << endl << "Please check the config file, the section (" << Plane_P0[0] <<", " << Plane_P0[1] <<", " << Plane_P0[2] << ") has not been detected." << endl;
+        if (config->GetGeo_Description() == NACELLE)
+          cout << endl << "Please check the config file, the section (" << Plane_Normal[0] <<", " << Plane_Normal[1] <<", " << Plane_Normal[2] << ") has not been detected." << endl;
+      }
+      
+      
+      /*--- Compute dihedral using a step in the station value ---*/
+      
+      Plane_P0_[0] = 0.0; Plane_Normal_[0] = 0.0;
+      Plane_P0_[1] = 0.0; Plane_Normal_[1] = 0.0;
+      Plane_P0_[2] = 0.0; Plane_Normal_[2] = 0.0;
+
+      if (config->GetGeo_Description() == FUSELAGE) {
+        Plane_Normal_[0] = 1.0;
+        if (iSection == 0) Plane_P0_[0] = config->GetLocationStations(iSection) + 0.01;
+        else Plane_P0_[0] = config->GetLocationStations(iSection) - 0.01;
+      }
+      else if (config->GetGeo_Description() == NACELLE) {
+        if (iSection == 0) {
+          Plane_Normal_[0] = 0.0;
+          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
+          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
+          
+          /*--- Apply tilt angle to the plane ---*/
+          
+          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
+          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
+          su2double Plane_NormalY_Tilt = Plane_Normal[1];
+          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
+          
+          /*--- Apply toe angle to the plane ---*/
+          
+          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
+          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
+          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
+          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
+          
+          /*--- Update normal vector ---*/
+          
+          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
+          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
+          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
+          
+        }
+        else {
+          Plane_Normal_[0] = 0.0;
+          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
+          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
+          
+          /*--- Apply tilt angle to the plane ---*/
+          
+          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
+          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
+          su2double Plane_NormalY_Tilt = Plane_Normal[1];
+          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
+          
+          /*--- Apply toe angle to the plane ---*/
+          
+          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
+          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
+          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
+          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
+          
+          /*--- Update normal vector ---*/
+          
+          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
+          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
+          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
+          
+        }
+      }
+      else {
+        Plane_Normal_[1] = 1.0;
+        if (iSection == 0) Plane_P0_[1] = config->GetLocationStations(iSection) + 0.01;
+        else Plane_P0_[1] = config->GetLocationStations(iSection) - 0.01;
+      }
+   
+      geometry->ComputeAirfoil_Section(Plane_P0_, Plane_Normal_, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
+                                       CPressure, Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
+                                       CPressure_Airfoil_, true, config);
+      
+      /*--- Output the pressure on each section (tecplot format) ---*/
+      
+      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() != 0)) {
+        
+        /*--- Find leading and trailing edge ---*/
+        
+        Xcoord_LeadingEdge = 1E6; Xcoord_TrailingEdge = -1E6;
+        for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
+          if (Xcoord_Airfoil[iVertex] < Xcoord_LeadingEdge) {
+            Xcoord_LeadingEdge = Xcoord_Airfoil[iVertex];
+            Ycoord_LeadingEdge = Ycoord_Airfoil[iVertex];
+            Zcoord_LeadingEdge = Zcoord_Airfoil[iVertex];
+          }
+          if (Xcoord_Airfoil[iVertex] > Xcoord_TrailingEdge) {
+            Xcoord_TrailingEdge = Xcoord_Airfoil[iVertex];
+            Ycoord_TrailingEdge = Ycoord_Airfoil[iVertex];
+            Zcoord_TrailingEdge = Zcoord_Airfoil[iVertex];
+          }
+        }
+        
+        Chord = (Xcoord_TrailingEdge-Xcoord_LeadingEdge);
+        
+        /*--- Compute dihedral ---*/
+        
+        Xcoord_LeadingEdge_ = 1E6; Xcoord_TrailingEdge_ = -1E6;
+        for (iVertex = 0; iVertex < Xcoord_Airfoil_.size(); iVertex++) {
+          if (Xcoord_Airfoil_[iVertex] < Xcoord_LeadingEdge_) {
+            Xcoord_LeadingEdge_ = Xcoord_Airfoil_[iVertex];
+          }
+          if (Xcoord_Airfoil_[iVertex] > Xcoord_TrailingEdge_) {
+            Xcoord_TrailingEdge_ = Xcoord_Airfoil_[iVertex];
+            Ycoord_TrailingEdge_ = Ycoord_Airfoil_[iVertex];
+            Zcoord_TrailingEdge_ = Zcoord_Airfoil_[iVertex];
+          }
+        }
+        
+        if (iSection == 0) {
+          Dihedral_Trailing = atan((Zcoord_TrailingEdge_ - Zcoord_TrailingEdge) / (Ycoord_TrailingEdge_ - Ycoord_TrailingEdge))*180/PI_NUMBER;
+        }
+        else {
+          Dihedral_Trailing = atan((Zcoord_TrailingEdge - Zcoord_TrailingEdge_) / (Ycoord_TrailingEdge - Ycoord_TrailingEdge_))*180/PI_NUMBER;
+        }
+        
+        /*--- Write Cp at each section (tecplot format) ---*/
+        
+        if (output) {
+          
+          ofstream Cp_File;
+          
+          if (iSection == 0) {
+            Cp_File.open("cp_sections.dat", ios::out);
+            Cp_File << "TITLE = \"Airfoil sections\"" << endl;
+            Cp_File << "VARIABLES = \"x/c\",\"C<sub>p</sub>\",\"x\",\"y\",\"z\",\"y/c\",\"z/c\"" << endl;
+          } else
+            Cp_File.open("cp_sections.dat", ios::app);
+          
+          if (config->GetGeo_Description() == NACELLE) {
+            su2double theta_deg = atan2(Plane_Normal[1], -Plane_Normal[2])/PI_NUMBER*180 + 180;
+            Cp_File << "ZONE T=\"Theta = " << theta_deg << " deg\", I= " << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
+          }
+          else {
+            if (config->GetSystemMeasurements() == SI) Cp_File << "ZONE T=\"y = " << Plane_P0[1] << " m\", I= "
+              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
+            
+            if (config->GetSystemMeasurements() == US) Cp_File << "ZONE T=\"y = " << Plane_P0[1]*12.0 << " in\", I= "
+              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
+          }
+          
+
+          
+          /*--- Coordinates and pressure value ---*/
+          
+          for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
+            
+            su2double XCoord = Xcoord_Airfoil[iVertex];
+            su2double YCoord = Ycoord_Airfoil[iVertex];
+            su2double ZCoord = Zcoord_Airfoil[iVertex];
+            
+            /*--- Undo the transformation based on the Theta angle ---*/
+            
+            if (config->GetGeo_Description() == NACELLE) {
+              su2double theta_deg = atan2(Plane_Normal[1],-Plane_Normal[2])/PI_NUMBER*180 + 180;
+              su2double Angle = theta_deg*PI_NUMBER/180 - 0.5*PI_NUMBER;
+              
+              XCoord = Xcoord_Airfoil[iVertex] + config->GetNacelleLocation(0);
+              YCoord = (Ycoord_Airfoil[iVertex]*cos(Angle) - Zcoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(1);
+              ZCoord = (Zcoord_Airfoil[iVertex]*cos(Angle) + Ycoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(2);
+              
+            }
+            
+            if (config->GetSystemMeasurements() == US) {
+              Cp_File <<  (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord  << " " << CPressure_Airfoil[iVertex]
+              << " " << XCoord * 12.0 << " " << YCoord * 12.0 << " " << ZCoord * 12.0
+              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
+            }
+            else {
+              Cp_File << (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord << " " << CPressure_Airfoil[iVertex]
+              << " " << XCoord << " " << YCoord << " " << ZCoord
+              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
+            }
+            
+          }
+          
+          Cp_File.close();
+          
+        }
+        
+        /*--- Compute load distribution ---*/
+        
+        ForceInviscid[0] = 0.0; ForceInviscid[1] = 0.0; ForceInviscid[2] = 0.0; MomentInviscid[1] = 0.0;
+        
+        for (iVertex = 0; iVertex < Xcoord_Airfoil.size() - 1; iVertex++) {
+          
+          NDPressure = 0.5 * (CPressure_Airfoil[iVertex] + CPressure_Airfoil[iVertex + 1]);
+          
+          Force[0] = -(Zcoord_Airfoil[iVertex + 1] - Zcoord_Airfoil[iVertex]) * NDPressure;
+          Force[1] = 0.0;
+          Force[2] = (Xcoord_Airfoil[iVertex + 1] - Xcoord_Airfoil[iVertex]) * NDPressure;
+          
+          ForceInviscid[0] += Force[0];
+          ForceInviscid[1] += Force[1];
+          ForceInviscid[2] += Force[2];
+          
+          MomentDist[0] = 0.5 	* (Xcoord_Airfoil[iVertex] + Xcoord_Airfoil[iVertex + 1]) - Origin[0];
+          MomentDist[1] = 0.5 * (Ycoord_Airfoil[iVertex] + Ycoord_Airfoil[iVertex + 1]) - Origin[1];
+          MomentDist[2] = 0.5 	* (Zcoord_Airfoil[iVertex] + Zcoord_Airfoil[iVertex + 1]) - Origin[3];
+          
+          MomentInviscid[1] += (Force[0] * MomentDist[2] - Force[2] * MomentDist[0]) / RefLength;
+          
+        }
+        
+        /*--- Compute local chord, for the nondimensionalization  ---*/
+        
+        MaxDistance = 0.0; Trailing_Point = 0;
+        
+        for (iVertex = 1; iVertex < Xcoord_Airfoil.size(); iVertex++) {
+          
+          Distance = sqrt(pow(Xcoord_Airfoil[iVertex] - Xcoord_Airfoil[Trailing_Point], 2.0) +
+                          pow(Ycoord_Airfoil[iVertex] - Ycoord_Airfoil[Trailing_Point], 2.0) +
+                          pow(Zcoord_Airfoil[iVertex] - Zcoord_Airfoil[Trailing_Point], 2.0));
+          
+          if (MaxDistance < Distance) { MaxDistance = Distance; }
+          
+        }
+        
+        Chord = MaxDistance;
+        
+        CL_Inv = cos(Dihedral_Trailing * PI_NUMBER / 180.0) * fabs( -ForceInviscid[0] * sin(Alpha) + ForceInviscid[2] * cos(Alpha) )/ Chord;
+        
+        /*--- Compute sectional lift at the root ---*/
+        
+        B                  = 2.0*config->GetSemiSpan();
+        RefArea            = config->GetRefArea();
+        C_L                = solver->GetTotal_CL();
+        C_L0               = 8.0*C_L*RefArea/(B*PI_NUMBER);
+        Y                  = Ycoord_Airfoil[0];
+        Aux                = Y/(0.5*B);
+        Elliptic_Spanload  = (C_L0 / RefLength) * sqrt(fabs(1.0-Aux*Aux));
+        
+        
+        /*--- Write load distribution ---*/
+        
+        if (output) {
+          
+          ofstream Load_File;
+          if (iSection == 0) {
+            
+            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+              Load_File.open("load_distribution.csv", ios::out);
+              Load_File << "\"Percent Semispan\",\"Sectional C_L\",\"Spanload (c C_L / c_ref) \",\"Elliptic Spanload\"" << endl;
+            }
+            else {
+              Load_File.open("load_distribution.dat", ios::out);
+              Load_File << "TITLE = \"Load distribution\"" << endl;
+              Load_File << "VARIABLES = \"Percent Semispan\",\"Sectional C<sub>L</sub>\",\"Spanload (c C<sub>L</sub> / c<sub>ref</sub>) \",\"Elliptic Spanload\"" << endl;
+              Load_File << "ZONE T=\"Wing load distribution\"" << endl;
+            }
+          } else {
+            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) Load_File.open("load_distribution.csv", ios::app);
+            else Load_File.open("load_distribution.dat", ios::app);
+          }
+          
+          
+          /*--- CL and spanload ---*/
+          
+          if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))
+            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << ", " << CL_Inv  << ", " << Chord*CL_Inv / RefLength <<", " << Elliptic_Spanload   << endl;
+          else
+            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << " " << CL_Inv  << " " << Chord*CL_Inv / RefLength <<" " << Elliptic_Spanload   << endl;
+          
+          Load_File.close();
+          
+        }
+        
+      }
+      
+    }
+    
+  }
+  
+  /*--- Delete dynamically allocated memory ---*/
+  
+  delete[] Plane_P0;
+  delete[] Plane_P0_;
+  delete[] Plane_Normal;
+  delete[] Plane_Normal_;
+  delete[] CPressure;
+  
+}
+
+
+void COutputLegacy::SetCp_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
+  
+  unsigned short iMarker, icommas, Boundary, iDim;
+  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
+  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff;
+  bool *PointInDomain;
+  string text_line, surfCp_filename;
+  ifstream Surface_file;
+  char buffer[50], cstr[200];
+  
+  
+  nPointLocal = geometry->GetnPoint();
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nPointGlobal = nPointLocal;
+#endif
+  
+  Point2Vertex = new unsigned long[nPointGlobal][2];
+  PointInDomain = new bool[nPointGlobal];
+  
+  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
+    PointInDomain[iPoint] = false;
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        /*--- The Pressure file uses the global numbering ---*/
+        
+#ifndef HAVE_MPI
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+#else
+        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
+#endif
+        
+        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
+          Point2Vertex[iPoint][0] = iMarker;
+          Point2Vertex[iPoint][1] = iVertex;
+          PointInDomain[iPoint] = true;
+          solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Prepare to read the surface pressure files (CSV) ---*/
+  
+  surfCp_filename = "TargetCp";
+  strcpy (cstr, surfCp_filename.c_str());
+  
+  /*--- Write file name with extension if unsteady or steady ---*/
+  
+  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
+      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
+    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
+  }
+  else
+    SPRINTF (buffer, ".dat");
+  
+  strcat (cstr, buffer);
+  
+  /*--- Read the surface pressure file ---*/
+  
+  string::size_type position;
+  
+  Surface_file.open(cstr, ios::in);
+  
+  if (!(Surface_file.fail())) {
+    
+    getline(Surface_file, text_line);
+    
+    while (getline(Surface_file, text_line)) {
+      for (icommas = 0; icommas < 50; icommas++) {
+        position = text_line.find( ",", 0 );
+        if (position!=string::npos) text_line.erase (position,1);
+      }
+      stringstream  point_line(text_line);
+      
+      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff;
+      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff;
+      
+      if (PointInDomain[iPoint]) {
+        
+        /*--- Find the vertex for the Point and Marker ---*/
+        
+        iMarker = Point2Vertex[iPoint][0];
+        iVertex = Point2Vertex[iPoint][1];
+        
+        solver_container->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
+        
+      }
+      
+    }
+    
+    Surface_file.close();
+    
+  }
+  
+  /*--- Compute the pressure difference ---*/
+  
+  PressDiff = 0.0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        
+        Cp = solver_container->GetCPressure(iMarker, iVertex);
+        CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
+        
+        Area = 0.0;
+        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
+          Area += Normal[iDim]*Normal[iDim];
+        Area = sqrt(Area);
+        
+        PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
+      }
+      
+    }
+  }
+  
+#ifdef HAVE_MPI
+  su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
+  SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Update the total Cp difference coeffient ---*/
+  
+  solver_container->SetTotal_CpDiff(PressDiff);
+  
+  delete [] Point2Vertex;
+  delete [] PointInDomain;
+  
+}
+
+void COutputLegacy::SetHeatFlux_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
+  
+  unsigned short iMarker, icommas, Boundary, iDim;
+  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
+  su2double XCoord, YCoord, ZCoord, PressureCoeff, HeatFlux = 0.0, HeatFluxDiff, HeatFluxTarget, *Normal = NULL, Area,
+  Pressure, Cf;
+  bool *PointInDomain;
+  string text_line, surfHeatFlux_filename;
+  ifstream Surface_file;
+  char buffer[50], cstr[200];
+  
+  
+  nPointLocal = geometry->GetnPoint();
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nPointGlobal = nPointLocal;
+#endif
+  
+  Point2Vertex = new unsigned long[nPointGlobal][2];
+  PointInDomain = new bool[nPointGlobal];
+  
+  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
+    PointInDomain[iPoint] = false;
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        /*--- The Pressure file uses the global numbering ---*/
+        
+#ifndef HAVE_MPI
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+#else
+        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
+#endif
+        
+        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
+          Point2Vertex[iPoint][0] = iMarker;
+          Point2Vertex[iPoint][1] = iVertex;
+          PointInDomain[iPoint] = true;
+          solver_container->SetHeatFluxTarget(iMarker, iVertex, 0.0);
+        }
+      }
+    }
+  }
+  
+  /*--- Prepare to read the surface pressure files (CSV) ---*/
+  
+  surfHeatFlux_filename = "TargetHeatFlux";
+  strcpy (cstr, surfHeatFlux_filename.c_str());
+  
+  /*--- Write file name with extension if unsteady or steady ---*/
+  
+  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
+      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
+    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
+  }
+  else
+    SPRINTF (buffer, ".dat");
+  
+  strcat (cstr, buffer);
+  
+  /*--- Read the surface pressure file ---*/
+  
+  string::size_type position;
+  
+  Surface_file.open(cstr, ios::in);
+  
+  if (!(Surface_file.fail())) {
+    
+    getline(Surface_file, text_line);
+    
+    while (getline(Surface_file, text_line)) {
+      for (icommas = 0; icommas < 50; icommas++) {
+        position = text_line.find( ",", 0 );
+        if (position!=string::npos) text_line.erase (position,1);
+      }
+      stringstream  point_line(text_line);
+      
+      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
+      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
+      
+      if (PointInDomain[iPoint]) {
+        
+        /*--- Find the vertex for the Point and Marker ---*/
+        
+        iMarker = Point2Vertex[iPoint][0];
+        iVertex = Point2Vertex[iPoint][1];
+        
+        solver_container->SetHeatFluxTarget(iMarker, iVertex, HeatFlux);
+        
+      }
+      
+    }
+    
+    Surface_file.close();
+  }
+  
+  /*--- Compute the pressure difference ---*/
+  
+  HeatFluxDiff = 0.0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        
+        HeatFlux = solver_container->GetHeatFlux(iMarker, iVertex);
+        HeatFluxTarget = solver_container->GetHeatFluxTarget(iMarker, iVertex);
+        
+        Area = 0.0;
+        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
+          Area += Normal[iDim]*Normal[iDim];
+        Area = sqrt(Area);
+        
+        HeatFluxDiff += Area * (HeatFluxTarget - HeatFlux) * (HeatFluxTarget - HeatFlux);
+        
+      }
+      
+    }
+  }
+  
+#ifdef HAVE_MPI
+  su2double MyHeatFluxDiff = HeatFluxDiff;   HeatFluxDiff = 0.0;
+  SU2_MPI::Allreduce(&MyHeatFluxDiff, &HeatFluxDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Update the total HeatFlux difference coeffient ---*/
+  
+  solver_container->SetTotal_HeatFluxDiff(HeatFluxDiff);
+  
+  delete [] Point2Vertex;
+  delete [] PointInDomain;
+  
+}
+
+void COutputLegacy::SpecialOutput_SonicBoom(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
+  
+  ofstream EquivArea_file, FuncGrad_file;
+  unsigned short iMarker = 0, iDim;
+  short *AzimuthalAngle = NULL;
+  su2double Gamma, auxXCoord, auxYCoord, auxZCoord, InverseDesign = 0.0, DeltaX, Coord_i, Coord_j, jp1Coord, *Coord = NULL, MeanFuntion,
+  *Face_Normal = NULL, auxArea, auxPress, Mach, Beta, R_Plane, Pressure_Inf,
+  ModVelocity_Inf, Velocity_Inf[3], factor, *Xcoord = NULL, *Ycoord = NULL, *Zcoord = NULL,
+  *Pressure = NULL, *FaceArea = NULL, *EquivArea = NULL, *TargetArea = NULL, *NearFieldWeight = NULL,
+  *Weight = NULL, jFunction, jp1Function;
+  unsigned long jVertex, iVertex, iPoint, nVertex_NearField = 0, auxPoint,
+  *IdPoint = NULL, *IdDomain = NULL, auxDomain;
+  unsigned short iPhiAngle;
+  ofstream NearFieldEA_file; ifstream TargetEA_file;
+  
+  su2double XCoordBegin_OF = config->GetEA_IntLimit(0);
+  su2double XCoordEnd_OF = config->GetEA_IntLimit(1);
+  
+  unsigned short nDim = geometry->GetnDim();
+  su2double AoA = -(config->GetAoA()*PI_NUMBER/180.0);
+  su2double EAScaleFactor = config->GetEA_ScaleFactor(); // The EA Obj. Func. should be ~ force based Obj. Func.
+  
+  Mach  = config->GetMach();
+  Gamma = config->GetGamma();
+  Beta = sqrt(Mach*Mach-1.0);
+  R_Plane = fabs(config->GetEA_IntLimit(2));
+  Pressure_Inf = config->GetPressure_FreeStreamND();
+  Velocity_Inf[0] = config->GetVelocity_FreeStreamND()[0];
+  Velocity_Inf[1] = config->GetVelocity_FreeStreamND()[1];
+  Velocity_Inf[2] = config->GetVelocity_FreeStreamND()[2];
+  ModVelocity_Inf = 0;
+  for (iDim = 0; iDim < 3; iDim++)
+    ModVelocity_Inf += Velocity_Inf[iDim] * Velocity_Inf[iDim];
+  
+  factor = 4.0*sqrt(2.0*Beta*R_Plane) / (Gamma*Pressure_Inf*Mach*Mach);
+  
+  if (rank == MASTER_NODE) cout << endl << "Writing Equivalent Area files.";
+
+#ifndef HAVE_MPI
+  
+  /*--- Compute the total number of points on the near-field ---*/
+  
+  nVertex_NearField = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        Coord = geometry->node[iPoint]->GetCoord();
+        
+        /*--- Using Face_Normal(z), and Coord(z) we identify only a surface,
+         note that there are 2 NEARFIELD_BOUNDARY surfaces ---*/
+        
+        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) nVertex_NearField ++;
+      }
+  
+  /*--- Create an array with all the coordinates, points, pressures, face area,
+   equivalent area, and nearfield weight ---*/
+  
+  Xcoord = new su2double[nVertex_NearField];
+  Ycoord = new su2double[nVertex_NearField];
+  Zcoord = new su2double[nVertex_NearField];
+  AzimuthalAngle = new short[nVertex_NearField];
+  IdPoint = new unsigned long[nVertex_NearField];
+  IdDomain = new unsigned long[nVertex_NearField];
+  Pressure = new su2double[nVertex_NearField];
+  FaceArea = new su2double[nVertex_NearField];
+  EquivArea = new su2double[nVertex_NearField];
+  TargetArea = new su2double[nVertex_NearField];
+  NearFieldWeight = new su2double[nVertex_NearField];
+  Weight = new su2double[nVertex_NearField];
+  
+  /*--- Copy the boundary information to an array ---*/
+  
+  nVertex_NearField = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        Coord = geometry->node[iPoint]->GetCoord();
+        
+        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
+          
+          IdPoint[nVertex_NearField] = iPoint;
+          Xcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
+          Ycoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
+          
+          if (nDim ==2) {
+            AzimuthalAngle[nVertex_NearField] = 0;
+          }
+          
+          if (nDim == 3) {
+            Zcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
+            
+            /*--- Rotate the nearfield cylinder (AoA) only 3D ---*/
+            
+            su2double YcoordRot = Ycoord[nVertex_NearField];
+            su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
+            
+            /*--- Compute the Azimuthal angle (resolution of degress in the Azimuthal angle)---*/
+            
+            su2double AngleDouble; short AngleInt;
+            AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
+            
+            /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
+            
+            su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
+            
+            if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1)) AngleDouble = FixAzimuthalLine - 0.1;
+            
+            AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
+            if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
+            else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
+          }
+          
+          if (AzimuthalAngle[nVertex_NearField] <= 60) {
+            Pressure[nVertex_NearField] = solver->node[iPoint]->GetPressure();
+            FaceArea[nVertex_NearField] = fabs(Face_Normal[nDim-1]);
+            nVertex_NearField ++;
+          }
+          
+        }
+      }
+  
+#else
+  
+  int nProcessor;
+  SU2_MPI::Comm_size(MPI_COMM_WORLD, &nProcessor);
+  
+  unsigned long nLocalVertex_NearField = 0, MaxLocalVertex_NearField = 0;
+  int iProcessor;
+  
+  unsigned long *Buffer_Receive_nVertex = NULL;
+  if (rank == MASTER_NODE) {
+    Buffer_Receive_nVertex = new unsigned long [nProcessor];
+  }
+  
+  /*--- Compute the total number of points of the near-field ghost nodes ---*/
+  
+  nLocalVertex_NearField = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        Coord = geometry->node[iPoint]->GetCoord();
+        
+        if (geometry->node[iPoint]->GetDomain())
+          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0))
+            nLocalVertex_NearField ++;
+      }
+  
+  unsigned long *Buffer_Send_nVertex = new unsigned long [1];
+  Buffer_Send_nVertex[0] = nLocalVertex_NearField;
+  
+  /*--- Send Near-Field vertex information --*/
+  
+  SU2_MPI::Allreduce(&nLocalVertex_NearField, &nVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalVertex_NearField, &MaxLocalVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  delete [] Buffer_Send_nVertex;
+  
+  su2double *Buffer_Send_Xcoord = new su2double[MaxLocalVertex_NearField];
+  su2double *Buffer_Send_Ycoord = new su2double[MaxLocalVertex_NearField];
+  su2double *Buffer_Send_Zcoord = new su2double[MaxLocalVertex_NearField];
+  unsigned long *Buffer_Send_IdPoint = new unsigned long [MaxLocalVertex_NearField];
+  su2double *Buffer_Send_Pressure = new su2double [MaxLocalVertex_NearField];
+  su2double *Buffer_Send_FaceArea = new su2double[MaxLocalVertex_NearField];
+  
+  su2double *Buffer_Receive_Xcoord = NULL;
+  su2double *Buffer_Receive_Ycoord = NULL;
+  su2double *Buffer_Receive_Zcoord = NULL;
+  unsigned long *Buffer_Receive_IdPoint = NULL;
+  su2double *Buffer_Receive_Pressure = NULL;
+  su2double *Buffer_Receive_FaceArea = NULL;
+  
+  if (rank == MASTER_NODE) {
+    Buffer_Receive_Xcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
+    Buffer_Receive_Ycoord = new su2double[nProcessor*MaxLocalVertex_NearField];
+    Buffer_Receive_Zcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
+    Buffer_Receive_IdPoint = new unsigned long[nProcessor*MaxLocalVertex_NearField];
+    Buffer_Receive_Pressure = new su2double[nProcessor*MaxLocalVertex_NearField];
+    Buffer_Receive_FaceArea = new su2double[nProcessor*MaxLocalVertex_NearField];
+  }
+  
+  unsigned long nBuffer_Xcoord = MaxLocalVertex_NearField;
+  unsigned long nBuffer_Ycoord = MaxLocalVertex_NearField;
+  unsigned long nBuffer_Zcoord = MaxLocalVertex_NearField;
+  unsigned long nBuffer_IdPoint = MaxLocalVertex_NearField;
+  unsigned long nBuffer_Pressure = MaxLocalVertex_NearField;
+  unsigned long nBuffer_FaceArea = MaxLocalVertex_NearField;
+  
+  for (iVertex = 0; iVertex < MaxLocalVertex_NearField; iVertex++) {
+    Buffer_Send_IdPoint[iVertex] = 0; Buffer_Send_Pressure[iVertex] = 0.0;
+    Buffer_Send_FaceArea[iVertex] = 0.0; Buffer_Send_Xcoord[iVertex] = 0.0;
+    Buffer_Send_Ycoord[iVertex] = 0.0; Buffer_Send_Zcoord[iVertex] = 0.0;
+  }
+  
+  /*--- Copy coordinates, index points, and pressures to the auxiliar vector --*/
+  
+  nLocalVertex_NearField = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        Coord = geometry->node[iPoint]->GetCoord();
+        
+        if (geometry->node[iPoint]->GetDomain())
+          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
+            Buffer_Send_IdPoint[nLocalVertex_NearField] = iPoint;
+            Buffer_Send_Xcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
+            Buffer_Send_Ycoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
+            Buffer_Send_Zcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
+            Buffer_Send_Pressure[nLocalVertex_NearField] = solver->node[iPoint]->GetPressure();
+            Buffer_Send_FaceArea[nLocalVertex_NearField] = fabs(Face_Normal[nDim-1]);
+            nLocalVertex_NearField++;
+          }
+      }
+  
+  /*--- Send all the information --*/
+  
+  SU2_MPI::Gather(Buffer_Send_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, Buffer_Receive_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, Buffer_Receive_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, Buffer_Receive_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, Buffer_Receive_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Pressure, nBuffer_Pressure, MPI_DOUBLE, Buffer_Receive_Pressure, nBuffer_Pressure, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, Buffer_Receive_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  delete [] Buffer_Send_Xcoord;
+  delete [] Buffer_Send_Ycoord;
+  delete [] Buffer_Send_Zcoord;
+  delete [] Buffer_Send_IdPoint;
+  delete [] Buffer_Send_Pressure;
+  delete [] Buffer_Send_FaceArea;
+  
+  if (rank == MASTER_NODE) {
+    
+    Xcoord = new su2double[nVertex_NearField];
+    Ycoord = new su2double[nVertex_NearField];
+    Zcoord = new su2double[nVertex_NearField];
+    AzimuthalAngle = new short[nVertex_NearField];
+    IdPoint = new unsigned long[nVertex_NearField];
+    IdDomain = new unsigned long[nVertex_NearField];
+    Pressure = new su2double[nVertex_NearField];
+    FaceArea = new su2double[nVertex_NearField];
+    EquivArea = new su2double[nVertex_NearField];
+    TargetArea = new su2double[nVertex_NearField];
+    NearFieldWeight = new su2double[nVertex_NearField];
+    Weight = new su2double[nVertex_NearField];
+    
+    nVertex_NearField = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
+      for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
+        Xcoord[nVertex_NearField] = Buffer_Receive_Xcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
+        Ycoord[nVertex_NearField] = Buffer_Receive_Ycoord[iProcessor*MaxLocalVertex_NearField+iVertex];
+        
+        if (nDim == 2) {
+          AzimuthalAngle[nVertex_NearField] = 0;
+        }
+        
+        if (nDim == 3) {
+          Zcoord[nVertex_NearField] = Buffer_Receive_Zcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
+          
+          /*--- Rotate the nearfield cylinder  ---*/
+          
+          su2double YcoordRot = Ycoord[nVertex_NearField];
+          su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
+          
+          /*--- Compute the Azimuthal angle ---*/
+          
+          su2double AngleDouble; short AngleInt;
+          AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
+          
+          /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
+          
+          su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
+          
+          if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1))
+            AngleDouble = FixAzimuthalLine - 0.1;
+          
+          AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
+          
+          if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
+          else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
+        }
+        
+        if (AzimuthalAngle[nVertex_NearField] <= 60) {
+          IdPoint[nVertex_NearField] = Buffer_Receive_IdPoint[iProcessor*MaxLocalVertex_NearField+iVertex];
+          Pressure[nVertex_NearField] = Buffer_Receive_Pressure[iProcessor*MaxLocalVertex_NearField+iVertex];
+          FaceArea[nVertex_NearField] = Buffer_Receive_FaceArea[iProcessor*MaxLocalVertex_NearField+iVertex];
+          IdDomain[nVertex_NearField] = iProcessor;
+          nVertex_NearField++;
+        }
+        
+      }
+    
+    delete [] Buffer_Receive_nVertex;
+    
+    delete [] Buffer_Receive_Xcoord;
+    delete [] Buffer_Receive_Ycoord;
+    delete [] Buffer_Receive_Zcoord;
+    delete [] Buffer_Receive_IdPoint;
+    delete [] Buffer_Receive_Pressure;
+    delete [] Buffer_Receive_FaceArea;
+    
+  }
+  
+#endif
+  
+  if (rank == MASTER_NODE) {
+    
+    vector<short> PhiAngleList;
+    vector<short>::iterator IterPhiAngleList;
+    
+    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
+      PhiAngleList.push_back(AzimuthalAngle[iVertex]);
+    
+    sort( PhiAngleList.begin(), PhiAngleList.end());
+    IterPhiAngleList = unique( PhiAngleList.begin(), PhiAngleList.end());
+    PhiAngleList.resize( IterPhiAngleList - PhiAngleList.begin() );
+    
+    /*--- Create vectors and distribute the values among the different PhiAngle queues ---*/
+    
+    vector<vector<su2double> > Xcoord_PhiAngle; Xcoord_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > Ycoord_PhiAngle; Ycoord_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > Zcoord_PhiAngle; Zcoord_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<unsigned long> > IdPoint_PhiAngle; IdPoint_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<unsigned long> > IdDomain_PhiAngle; IdDomain_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > Pressure_PhiAngle; Pressure_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > FaceArea_PhiAngle; FaceArea_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > EquivArea_PhiAngle; EquivArea_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > TargetArea_PhiAngle; TargetArea_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > NearFieldWeight_PhiAngle; NearFieldWeight_PhiAngle.resize(PhiAngleList.size());
+    vector<vector<su2double> > Weight_PhiAngle; Weight_PhiAngle.resize(PhiAngleList.size());
+    
+    /*--- Distribute the values among the different PhiAngles ---*/
+    
+    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+        if (AzimuthalAngle[iVertex] == PhiAngleList[iPhiAngle]) {
+          Xcoord_PhiAngle[iPhiAngle].push_back(Xcoord[iVertex]);
+          Ycoord_PhiAngle[iPhiAngle].push_back(Ycoord[iVertex]);
+          Zcoord_PhiAngle[iPhiAngle].push_back(Zcoord[iVertex]);
+          IdPoint_PhiAngle[iPhiAngle].push_back(IdPoint[iVertex]);
+          IdDomain_PhiAngle[iPhiAngle].push_back(IdDomain[iVertex]);
+          Pressure_PhiAngle[iPhiAngle].push_back(Pressure[iVertex]);
+          FaceArea_PhiAngle[iPhiAngle].push_back(FaceArea[iVertex]);
+          EquivArea_PhiAngle[iPhiAngle].push_back(EquivArea[iVertex]);
+          TargetArea_PhiAngle[iPhiAngle].push_back(TargetArea[iVertex]);
+          NearFieldWeight_PhiAngle[iPhiAngle].push_back(NearFieldWeight[iVertex]);
+          Weight_PhiAngle[iPhiAngle].push_back(Weight[iVertex]);
+        }
+    
+    /*--- Order the arrays (x Coordinate, Pressure, Point, and Domain) ---*/
+    
+    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+      for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++)
+        for (jVertex = 0; jVertex < Xcoord_PhiAngle[iPhiAngle].size() - 1 - iVertex; jVertex++)
+          if (Xcoord_PhiAngle[iPhiAngle][jVertex] > Xcoord_PhiAngle[iPhiAngle][jVertex+1]) {
+            auxXCoord = Xcoord_PhiAngle[iPhiAngle][jVertex]; Xcoord_PhiAngle[iPhiAngle][jVertex] = Xcoord_PhiAngle[iPhiAngle][jVertex+1]; Xcoord_PhiAngle[iPhiAngle][jVertex+1] = auxXCoord;
+            auxYCoord = Ycoord_PhiAngle[iPhiAngle][jVertex]; Ycoord_PhiAngle[iPhiAngle][jVertex] = Ycoord_PhiAngle[iPhiAngle][jVertex+1]; Ycoord_PhiAngle[iPhiAngle][jVertex+1] = auxYCoord;
+            auxZCoord = Zcoord_PhiAngle[iPhiAngle][jVertex]; Zcoord_PhiAngle[iPhiAngle][jVertex] = Zcoord_PhiAngle[iPhiAngle][jVertex+1]; Zcoord_PhiAngle[iPhiAngle][jVertex+1] = auxZCoord;
+            auxPress = Pressure_PhiAngle[iPhiAngle][jVertex]; Pressure_PhiAngle[iPhiAngle][jVertex] = Pressure_PhiAngle[iPhiAngle][jVertex+1]; Pressure_PhiAngle[iPhiAngle][jVertex+1] = auxPress;
+            auxArea = FaceArea_PhiAngle[iPhiAngle][jVertex]; FaceArea_PhiAngle[iPhiAngle][jVertex] = FaceArea_PhiAngle[iPhiAngle][jVertex+1]; FaceArea_PhiAngle[iPhiAngle][jVertex+1] = auxArea;
+            auxPoint = IdPoint_PhiAngle[iPhiAngle][jVertex]; IdPoint_PhiAngle[iPhiAngle][jVertex] = IdPoint_PhiAngle[iPhiAngle][jVertex+1]; IdPoint_PhiAngle[iPhiAngle][jVertex+1] = auxPoint;
+            auxDomain = IdDomain_PhiAngle[iPhiAngle][jVertex]; IdDomain_PhiAngle[iPhiAngle][jVertex] = IdDomain_PhiAngle[iPhiAngle][jVertex+1]; IdDomain_PhiAngle[iPhiAngle][jVertex+1] = auxDomain;
+          }
+    
+    
+    /*--- Check that all the azimuth lists have the same size ---*/
+    
+    unsigned short nVertex = Xcoord_PhiAngle[0].size();
+    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
+      unsigned short nVertex_aux = Xcoord_PhiAngle[iPhiAngle].size();
+      if (nVertex_aux != nVertex) cout <<"Be careful!!! one azimuth list is shorter than the other"<< endl;
+      nVertex = min(nVertex, nVertex_aux);
+    }
+    
+    /*--- Compute equivalent area distribution at each azimuth angle ---*/
+    
+    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
+      EquivArea_PhiAngle[iPhiAngle][0] = 0.0;
+      for (iVertex = 1; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
+        EquivArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
+        
+        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][iVertex]*sin(AoA);
+        
+        for (jVertex = 0; jVertex < iVertex-1; jVertex++) {
+          
+          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex]*sin(AoA);
+          jp1Coord = Xcoord_PhiAngle[iPhiAngle][jVertex+1]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex+1]*sin(AoA);
+          
+          jFunction = factor*(Pressure_PhiAngle[iPhiAngle][jVertex] - Pressure_Inf)*sqrt(Coord_i-Coord_j);
+          jp1Function = factor*(Pressure_PhiAngle[iPhiAngle][jVertex+1] - Pressure_Inf)*sqrt(Coord_i-jp1Coord);
+          
+          DeltaX = (jp1Coord-Coord_j);
+          MeanFuntion = 0.5*(jp1Function + jFunction);
+          EquivArea_PhiAngle[iPhiAngle][iVertex] += DeltaX * MeanFuntion;
+        }
+      }
+    }
+    
+    /*--- Create a file with the equivalent area distribution at each azimuthal angle ---*/
+    
+    NearFieldEA_file.precision(15);
+    
+    if (output) {
+      
+      NearFieldEA_file.open("Equivalent_Area.dat", ios::out);
+      NearFieldEA_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
+      
+      if (config->GetSystemMeasurements() == US)
+        NearFieldEA_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\"";
+      else
+        NearFieldEA_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\"";
+      
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
+        if (config->GetSystemMeasurements() == US)
+          NearFieldEA_file << ", \"Equivalent Area (ft<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
+        else
+          NearFieldEA_file << ", \"Equivalent Area (m<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
+      }
+      
+      NearFieldEA_file << "\n";
+      for (iVertex = 0; iVertex < EquivArea_PhiAngle[0].size(); iVertex++) {
+        
+        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
+        su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
+        
+        if (config->GetSystemMeasurements() == US)
+          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
+        else
+          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init);
+        
+        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
+          NearFieldEA_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex];
+        }
+        
+        NearFieldEA_file << "\n";
+        
+      }
+      NearFieldEA_file.close();
+      
+    }
+    
+    /*--- Read target equivalent area from the configuration file,
+     this first implementation requires a complete table (same as the original
+     EA table). so... no interpolation. ---*/
+    
+    vector<vector<su2double> > TargetArea_PhiAngle_Trans;
+    TargetEA_file.open("TargetEA.dat", ios::in);
+    
+    if (TargetEA_file.fail()) {
+      /*--- Set the table to 0 ---*/
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+        for (iVertex = 0; iVertex < TargetArea_PhiAngle[iPhiAngle].size(); iVertex++)
+          TargetArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
+    }
+    else {
+      
+      /*--- skip header lines ---*/
+      
+      string line;
+      getline(TargetEA_file, line);
+      getline(TargetEA_file, line);
+      
+      while (TargetEA_file) {
+        
+        string line;
+        getline(TargetEA_file, line);
+        istringstream is(line);
+        vector<su2double> row;
+        unsigned short iter = 0;
+        
+        while (is.good()) {
+          string token;
+          getline(is, token,',');
+          
+          istringstream js(token);
+          
+          su2double data;
+          js >> data;
+          
+          /*--- The first element in the table is the coordinate (in or m)---*/
+          
+          if (iter != 0) row.push_back(data);
+          iter++;
+          
+        }
+        TargetArea_PhiAngle_Trans.push_back(row);
+      }
+      
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+        for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++)
+          TargetArea_PhiAngle[iPhiAngle][iVertex] = TargetArea_PhiAngle_Trans[iVertex][iPhiAngle];
+      
+    }
+    
+    /*--- Divide by the number of Phi angles in the nearfield ---*/
+    
+    su2double PhiFactor = 1.0/su2double(PhiAngleList.size());
+    
+    /*--- Evaluate the objective function ---*/
+    
+    InverseDesign = 0;
+    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
+        Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
+        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
+        
+        su2double Difference = EquivArea_PhiAngle[iPhiAngle][iVertex]-TargetArea_PhiAngle[iPhiAngle][iVertex];
+        su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][iVertex]);
+        
+        if ((percentage < 0.1) || (Coord_i < XCoordBegin_OF) || (Coord_i > XCoordEnd_OF)) Difference = 0.0;
+        
+        InverseDesign += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*Difference*Difference;
+        
+      }
+    
+    /*--- Evaluate the weight of the nearfield pressure (adjoint input) ---*/
+    
+    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
+        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
+        NearFieldWeight_PhiAngle[iPhiAngle][iVertex] = 0.0;
+        for (jVertex = iVertex; jVertex < EquivArea_PhiAngle[iPhiAngle].size(); jVertex++) {
+          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex];
+          Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
+          
+          su2double Difference = EquivArea_PhiAngle[iPhiAngle][jVertex]-TargetArea_PhiAngle[iPhiAngle][jVertex];
+          su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][jVertex]);
+          
+          if ((percentage < 0.1) || (Coord_j < XCoordBegin_OF) || (Coord_j > XCoordEnd_OF)) Difference = 0.0;
+          
+          NearFieldWeight_PhiAngle[iPhiAngle][iVertex] += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*2.0*Difference*factor*sqrt(Coord_j-Coord_i);
+        }
+      }
+    
+    /*--- Write the Nearfield pressure at each Azimuthal PhiAngle ---*/
+    
+    EquivArea_file.precision(15);
+    
+    if (output) {
+      
+      EquivArea_file.open("nearfield_flow.dat", ios::out);
+      EquivArea_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
+      
+      if (config->GetSystemMeasurements() == US)
+        EquivArea_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\",\"Equivalent Area (ft<sup>2</sup>)\",\"Target Equivalent Area (ft<sup>2</sup>)\",\"Cp\"" << "\n";
+      else
+        EquivArea_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\",\"Equivalent Area (m<sup>2</sup>)\",\"Target Equivalent Area (m<sup>2</sup>)\",\"Cp\"" << "\n";
+      
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
+        EquivArea_file << fixed << "ZONE T= \"<greek>F</greek>=" << PhiAngleList[iPhiAngle] << " deg.\"" << "\n";
+        for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++) {
+          
+          su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
+          su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
+          
+          if (config->GetSystemMeasurements() == US)
+            EquivArea_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
+          else
+            EquivArea_file << scientific << (XcoordRot - XcoordRot_init);
+          
+          EquivArea_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex]
+          << ", " << TargetArea_PhiAngle[iPhiAngle][iVertex] << ", " << (Pressure_PhiAngle[iPhiAngle][iVertex]-Pressure_Inf)/Pressure_Inf << "\n";
+        }
+      }
+      
+      EquivArea_file.close();
+      
+    }
+    
+    /*--- Write Weight file for adjoint computation ---*/
+    
+    FuncGrad_file.precision(15);
+    
+    if (output) {
+      
+      FuncGrad_file.open("WeightNF.dat", ios::out);
+      
+      FuncGrad_file << scientific << "-1.0";
+      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+        FuncGrad_file << scientific << "\t" << PhiAngleList[iPhiAngle];
+      FuncGrad_file << "\n";
+      
+      for (iVertex = 0; iVertex < NearFieldWeight_PhiAngle[0].size(); iVertex++) {
+        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
+        FuncGrad_file << scientific << XcoordRot;
+        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
+          FuncGrad_file << scientific << "\t" << NearFieldWeight_PhiAngle[iPhiAngle][iVertex];
+        FuncGrad_file << "\n";
+      }
+      FuncGrad_file.close();
+      
+    }
+    
+    /*--- Delete structures ---*/
+    
+    delete [] Xcoord; delete [] Ycoord; delete [] Zcoord;
+    delete [] AzimuthalAngle; delete [] IdPoint; delete [] IdDomain;
+    delete [] Pressure; delete [] FaceArea;
+    delete [] EquivArea; delete [] TargetArea;
+    delete [] NearFieldWeight; delete [] Weight;
+    
+  }
+  
+#ifndef HAVE_MPI
+  
+  /*--- Store the value of the NearField coefficient ---*/
+  
+  solver->SetTotal_CEquivArea(InverseDesign);
+  
+#else
+  
+  /*--- Send the value of the NearField coefficient to all the processors ---*/
+  
+  SU2_MPI::Bcast(&InverseDesign, 1, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Store the value of the NearField coefficient ---*/
+  
+  solver->SetTotal_CEquivArea(InverseDesign);
+  
+#endif
+  
+}
+
+void COutputLegacy::SpecialOutput_Distortion(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
+  
+  unsigned short iMarker, iDim, iMarker_Analyze;
+  unsigned long iPoint, iVertex;
+  su2double xCoord = 0.0, yCoord = 0.0, zCoord = 0.0, Area = 0.0, *Vector, TotalArea = 0.0;
+  su2double xCoord_CG = 0.0, yCoord_CG = 0.0, zCoord_CG = 0.0, TipRadius, HubRadius, Distance = 0.0, Distance_Mirror = 0.0;
+  su2double *r, MinDistance, xCoord_ = 0.0, yCoord_ = 0.0, zCoord_ = 0;
+  unsigned short iStation, iAngle, nAngle;
+  char cstr[200];
+  su2double *** ProbeArray, dx = 0.0, dy = 0.0, dz = 0.0, dx_ = 0.0, dy_ = 0.0, dz_ = 0.0, UpVector[3], radians, RotatedVector[3];
+  su2double Pressure, SoundSpeed, Velocity2, Mach,  Gamma, TotalPressure, Mach_Inf, TotalPressure_Inf,
+  Temperature, TotalTemperature, Pressure_Inf, Temperature_Inf, TotalTemperature_Inf, Velocity_Inf, Density;
+  unsigned short nDim = geometry->GetnDim();
+  unsigned short Theta, nStation;
+  unsigned long nVertex_Surface, nLocalVertex_Surface, MaxLocalVertex_Surface;
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long Total_Index;
+  unsigned short Theta_DC60 = 60, nStation_DC60 = 5;
+  su2double PT_Mean, Mach_Mean, q_Mean, PT, q, *PT_Sector, PT_Sector_Min, DC60, *PT_Station, *PT_Station_Min, *Mach_Station, *Mach_Station_Min, IDR, IDC, IDC_Mach;
+  
+  
+  bool Engine_HalfModel = config->GetEngine_HalfModel();
+  su2double SignFlip = 1.0;
+  su2double Beta, Alpha;
+  su2double Mach_ij, Mach_ip1j, Mach_im1j, Mach_ijp1, Mach_ijm1, Filtered_Mach;
+  su2double Alpha_ij, Alpha_ip1j, Alpha_im1j, Alpha_ijp1, Alpha_ijm1, Filtered_Alpha;
+  su2double Beta_ij, Beta_ip1j, Beta_im1j, Beta_ijp1, Beta_ijm1, Filtered_Beta;
+  su2double a, b, c, d;
+
+  int iProcessor, nProcessor;
+  nProcessor = size;
+
+
+  if (rank == MASTER_NODE && !config->GetDiscrete_Adjoint()) cout << endl << "Writing Surface Analysis file (surface_analysis.dat).";
+
+  /*--- Open and rrite file name with extension if unsteady ---*/
+
+  ofstream SurfFlow_file;
+
+  if (output && (rank == MASTER_NODE)) {
+
+    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) strcpy (cstr, "surface_analysis.vtk");
+    else strcpy (cstr, "surface_analysis.dat");
+    
+    SurfFlow_file.precision(15);
+
+    SurfFlow_file.open(cstr, ios::out);
+    
+    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+      SurfFlow_file << "# vtk DataFile Version 3.0" << endl;
+      SurfFlow_file << "vtk output" << endl;
+      SurfFlow_file << "ASCII" << endl;
+    }
+    else {
+      SurfFlow_file <<"TITLE = \"Surface Analysis\"" <<endl;
+      SurfFlow_file <<"VARIABLES = \"y(in)\", \"z(in)\", \"PT/PT<sub>inf</sub>\", \"TT/TT<sub>inf</sub>\", \"P/P<sub>inf</sub>\", \"T/T<sub>inf</sub>\", \"v<sub>x</sub>/v<sub>inf</sub>\", \"v<sub>y</sub>/v<sub>inf</sub>\", \"v<sub>z</sub>/v<sub>inf</sub>\", \"<greek>a</greek> (deg)\", \"<greek>b</greek> (deg)\", \"Mach\", \"Filtered <greek>a</greek> (deg)\", \"Filtered <greek>b</greek> (deg)\", \"Filtered Mach\"" << endl;
+    }
+    
+  }
+  
+  /*--- Loop over all the markers to analyze ---*/
+
+  for (iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++) {
+
+    string Analyze_TagBound = config->GetMarker_Analyze_TagBound(iMarker_Analyze);
+
+    nVertex_Surface = 0; nLocalVertex_Surface = 0; MaxLocalVertex_Surface = 0;
+
+    /*--- Find the max number of surface vertices among all
+     partitions and set up buffers. The master node will handle the
+     writing of the CSV file after gathering all of the data. ---*/
+
+    nLocalVertex_Surface = 0;
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
+      if (Marker_TagBound == Analyze_TagBound) {
+        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface++;
+        }
+      }
+    }
+
+    /*--- Communicate the number of local vertices on each partition
+     to the master node ---*/
+    
+    Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+    if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
+
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+    SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+    MaxLocalVertex_Surface = nLocalVertex_Surface;
+    Buffer_Recv_nVertex[MASTER_NODE] = Buffer_Send_nVertex[MASTER_NODE];
+#endif
+
+    /*--- Send and Recv buffers ---*/
+
+    su2double *Buffer_Send_Coord_x = NULL, *Buffer_Recv_Coord_x = NULL;
+    Buffer_Send_Coord_x = new su2double [MaxLocalVertex_Surface];
+
+    su2double *Buffer_Send_Coord_y = NULL, *Buffer_Recv_Coord_y = NULL;
+    Buffer_Send_Coord_y = new su2double [MaxLocalVertex_Surface];
+
+    su2double *Buffer_Send_Coord_z = NULL, *Buffer_Recv_Coord_z = NULL;
+    if (nDim == 3)  Buffer_Send_Coord_z = new su2double [MaxLocalVertex_Surface];
+
+    su2double *Buffer_Send_PT = NULL, *Buffer_Recv_PT = NULL;
+    Buffer_Send_PT = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_TT = NULL, *Buffer_Recv_TT = NULL;
+    Buffer_Send_TT = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_P = NULL, *Buffer_Recv_P = NULL;
+    Buffer_Send_P = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_T = NULL, *Buffer_Recv_T = NULL;
+    Buffer_Send_T = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_Mach = NULL, *Buffer_Recv_Mach = NULL;
+    Buffer_Send_Mach = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_Vel_x = NULL, *Buffer_Recv_Vel_x = NULL;
+    Buffer_Send_Vel_x = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_Vel_y = NULL, *Buffer_Recv_Vel_y = NULL;
+    Buffer_Send_Vel_y = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_Vel_z = NULL, *Buffer_Recv_Vel_z = NULL;
+    if (nDim == 3) Buffer_Send_Vel_z = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_q = NULL, *Buffer_Recv_q = NULL;
+    Buffer_Send_q = new su2double [MaxLocalVertex_Surface];
+    
+    su2double *Buffer_Send_Area = NULL, *Buffer_Recv_Area = NULL;
+    Buffer_Send_Area = new su2double [MaxLocalVertex_Surface];
+    
+    /*--- Prepare the receive buffers on the master node only. ---*/
+    
+    if (rank == MASTER_NODE) {
+      Buffer_Recv_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+      if (nDim == 3) Buffer_Recv_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_PT = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_TT = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_P = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_T = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_Mach = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_Vel_x = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_Vel_y = new su2double [nProcessor*MaxLocalVertex_Surface];
+      if (nDim == 3) {
+        Buffer_Recv_Vel_z = new su2double [nProcessor*MaxLocalVertex_Surface];
+      }
+      Buffer_Recv_q = new su2double [nProcessor*MaxLocalVertex_Surface];
+      Buffer_Recv_Area = new su2double [nProcessor*MaxLocalVertex_Surface];
+    }
+    
+    /*--- Loop over all vertices in this partition and load the
+     data of the specified type into the buffer to be sent to
+     the master node. ---*/
+    
+    nVertex_Surface = 0;
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
+      if (Marker_TagBound == Analyze_TagBound) {
+        
+        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if (geometry->node[iPoint]->GetDomain()) {
+            
+            Buffer_Send_Coord_x[nVertex_Surface] = geometry->node[iPoint]->GetCoord(0);
+            Buffer_Send_Coord_y[nVertex_Surface] = geometry->node[iPoint]->GetCoord(1);
+            if (nDim == 3) { Buffer_Send_Coord_z[nVertex_Surface] = geometry->node[iPoint]->GetCoord(2); }
+            
+            Pressure         = solver->node[iPoint]->GetPressure();
+            Density          = solver->node[iPoint]->GetDensity();
+            Temperature      = solver->node[iPoint]->GetTemperature();
+            SoundSpeed       = solver->node[iPoint]->GetSoundSpeed();
+            Velocity2        = solver->node[iPoint]->GetVelocity2();
+            Mach             = sqrt(Velocity2)/SoundSpeed;
+            Gamma            = config->GetGamma();
+            
+            Mach_Inf         = config->GetMach();
+            Pressure_Inf     = config->GetPressure_FreeStreamND();
+            Temperature_Inf  = config->GetTemperature_FreeStreamND();
+            Velocity_Inf     = sqrt(config->GetVelocity_FreeStreamND()[0]*config->GetVelocity_FreeStreamND()[0]
+                                    + config->GetVelocity_FreeStreamND()[1]*config->GetVelocity_FreeStreamND()[1]
+                                    + config->GetVelocity_FreeStreamND()[2]*config->GetVelocity_FreeStreamND()[2]);
+            
+            Buffer_Send_P[nVertex_Surface] = Pressure / Pressure_Inf;
+            Buffer_Send_T[nVertex_Surface]     = Temperature / Temperature_Inf;
+            Buffer_Send_Mach[nVertex_Surface] = Mach;
+            
+            TotalPressure    = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
+            TotalPressure_Inf  = Pressure_Inf * pow( 1.0 + Mach_Inf * Mach_Inf * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
+            Buffer_Send_PT[nVertex_Surface] = TotalPressure / TotalPressure_Inf;
+            
+            TotalTemperature = Temperature * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
+            TotalTemperature_Inf  = Temperature_Inf * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
+            Buffer_Send_TT[nVertex_Surface] = TotalTemperature / TotalTemperature_Inf;
+            
+            Buffer_Send_Vel_x[nVertex_Surface] = solver->node[iPoint]->GetVelocity(0) / Velocity_Inf;
+            Buffer_Send_Vel_y[nVertex_Surface] = solver->node[iPoint]->GetVelocity(1) / Velocity_Inf;
+            if (nDim == 3) {
+              Buffer_Send_Vel_z[nVertex_Surface] = solver->node[iPoint]->GetVelocity(2) / Velocity_Inf;
+            }
+            
+            Buffer_Send_q[nVertex_Surface] = 0.5*Density*Velocity2;
+            
+            Vector = geometry->vertex[iMarker][iVertex]->GetNormal();
+            Area = 0.0; for (iDim = 0; iDim < nDim; iDim++) { Area += Vector[iDim]*Vector[iDim]; } Area = sqrt(Area);
+            Buffer_Send_Area[nVertex_Surface] = Area;
+            
+            /*--- If US system, the output should be in inches ---*/
+            
+            if (config->GetSystemMeasurements() == US) {
+              
+              Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
+              Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
+              if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
+              Buffer_Send_Area[nVertex_Surface] *= 144.0;
+              
+            }
+            
+            nVertex_Surface++;
+            
+          }
+        }
+        break;
+      }
+    }
+    
+    /*--- Send the information to the master node ---*/
+    
+#ifdef HAVE_MPI
+    
+    SU2_MPI::Gather(Buffer_Send_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_PT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_PT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_TT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_TT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_P, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_P, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_T, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_T, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_q, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_q, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Gather(Buffer_Send_Area, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Area, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+    
+#else
+    
+    for (iVertex = 0; iVertex < MaxLocalVertex_Surface; iVertex++) {
+      Buffer_Recv_Coord_x[iVertex] = Buffer_Send_Coord_x[iVertex];
+      Buffer_Recv_Coord_y[iVertex] = Buffer_Send_Coord_y[iVertex];
+      if (nDim == 3) Buffer_Recv_Coord_z[iVertex] = Buffer_Send_Coord_z[iVertex];
+      Buffer_Recv_PT[iVertex] = Buffer_Send_PT[iVertex];
+      Buffer_Recv_TT[iVertex] = Buffer_Send_TT[iVertex];
+      Buffer_Recv_P[iVertex] = Buffer_Send_P[iVertex];
+      Buffer_Recv_T[iVertex] = Buffer_Send_T[iVertex];
+      Buffer_Recv_Mach[iVertex] = Buffer_Send_Mach[iVertex];
+      Buffer_Recv_Vel_x[iVertex] = Buffer_Send_Vel_x[iVertex];
+      Buffer_Recv_Vel_y[iVertex] = Buffer_Send_Vel_y[iVertex];
+      if (nDim == 3) Buffer_Recv_Vel_z[iVertex] = Buffer_Send_Vel_z[iVertex];
+      Buffer_Recv_q[iVertex] = Buffer_Send_q[iVertex];
+      Buffer_Recv_Area[iVertex] = Buffer_Send_Area[iVertex];
+    }
+    
+#endif
+    
+    if (rank == MASTER_NODE) {
+      
+      /*--- Compute the location of the critical points of the distortion measure, and center of gravity ---*/
+      
+      TotalArea = 0.0; xCoord_CG = 0.0; yCoord_CG = 0.0; zCoord_CG = 0.0; PT_Mean = 0.0; Mach_Mean = 0.0;  q_Mean = 0.0;
+      
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+          
+          /*--- Current index position and global index ---*/
+          
+          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+          
+          /*--- Retrieve the merged data for this node ---*/
+          
+          xCoord = Buffer_Recv_Coord_x[Total_Index];
+          yCoord = Buffer_Recv_Coord_y[Total_Index];
+          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+          PT   = Buffer_Recv_PT[Total_Index];
+          Mach = Buffer_Recv_Mach[Total_Index];
+          q    = Buffer_Recv_q[Total_Index];
+          
+          Area       = Buffer_Recv_Area[Total_Index];
+          TotalArea += Area;
+          xCoord_CG += xCoord*Area;
+          yCoord_CG += yCoord*Area;
+          zCoord_CG += zCoord*Area;
+          PT_Mean   += PT*Area;
+          Mach_Mean += PT*Area;
+          q_Mean    += q*Area;
+          
+        }
+      }
+      
+      /*--- Evaluate the area averaged pressure and CG ---*/
+      
+      xCoord_CG = xCoord_CG / TotalArea;
+      yCoord_CG = yCoord_CG / TotalArea;
+      zCoord_CG = zCoord_CG / TotalArea;
+      PT_Mean   /= TotalArea;
+      Mach_Mean /= TotalArea;
+      q_Mean    /=  TotalArea;
+      
+      /*--- If it is a half model, CGy = 0 ---*/
+      
+      if (Engine_HalfModel) { yCoord_CG = 0.0; }
+      
+      /*--- Compute hub and tip radius ---*/
+      
+      TipRadius = 1E-6; HubRadius = 1E6;
+      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+          
+          /*--- Current index position and global index ---*/
+          
+          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+          
+          /*--- Retrieve the merged data for this node ---*/
+          
+          xCoord = Buffer_Recv_Coord_x[Total_Index];
+          yCoord = Buffer_Recv_Coord_y[Total_Index];
+          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+          
+          if (nDim == 2)
+            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
+                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord));
+          
+          if (nDim == 3)
+            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
+                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord) +
+                            (zCoord_CG-zCoord)*(zCoord_CG-zCoord));
+          
+          if (Distance > TipRadius) TipRadius = Distance;
+          if (Distance < HubRadius) HubRadius = Distance;
+          
+        }
+      }
+      
+      if (HubRadius/TipRadius < 0.05) HubRadius = 0.0;
+      
+      /*--- Evaluate the DC60 parameter ---*/
+      
+      Theta = Theta_DC60;
+      nStation = nStation_DC60;
+      
+      nAngle = SU2_TYPE::Int(360/float(Theta));
+      r = new su2double [nStation+1];
+      
+      /*--- Allocate memory ---*/
+      
+      PT_Sector = new su2double [nAngle];
+      ProbeArray = new su2double ** [nAngle];
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        ProbeArray[iAngle] = new su2double * [nStation];
+        for (iStation = 0; iStation < nStation; iStation++) {
+          ProbeArray[iAngle][iStation] = new su2double [5];
+        }
+      }
+      
+      /*--- Define the radius for each probe ---*/
+      
+      r[0] = HubRadius; r[nStation] = TipRadius;
+      for (iStation = 1; iStation < nStation; iStation++) {
+        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
+      }
+      
+      /*--- Define the probe rack ---*/
+      
+      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        
+        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
+        RotatedVector[0] =  UpVector[0];
+        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
+        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
+        
+        for (iStation = 1; iStation <= nStation; iStation++) {
+          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+        }
+        
+      }
+      
+      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        
+        for (iStation = 0; iStation < nStation; iStation++) {
+          xCoord_ = ProbeArray[iAngle][iStation][0];
+          yCoord_ = ProbeArray[iAngle][iStation][1];
+          zCoord_ = ProbeArray[iAngle][iStation][2];
+          
+          MinDistance = 1E6;
+          
+          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+              
+              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+              xCoord = Buffer_Recv_Coord_x[Total_Index];
+              yCoord = Buffer_Recv_Coord_y[Total_Index];
+              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+              
+              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
+              if (nDim == 3) dz = (zCoord_ - zCoord);
+              
+              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
+              
+              if (Engine_HalfModel) {
+                
+                yCoord = -yCoord;
+                
+                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
+                if (nDim == 3) dz_ = (zCoord_ - zCoord);
+                
+                Distance_Mirror = dx_*dx_ + dy_*dy_;
+                if (nDim == 3) Distance_Mirror += dz_*dz_;
+                Distance_Mirror = sqrt(Distance_Mirror);
+                
+                if (Distance_Mirror < Distance) {
+                  Distance = Distance_Mirror;
+                  dx = dx_; dy = dy_;
+                  if (nDim == 3) dz = dz_;
+                }
+                
+              }
+              
+              if (Distance <= MinDistance) {
+                MinDistance = Distance;
+                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
+                ProbeArray[iAngle][iStation][4] = Buffer_Recv_q[Total_Index];
+              }
+              
+            }
+          }
+          
+        }
+        
+      }
+      
+      /*--- Evaluate the average pressure at each sector, fan face and dynamic pressure ---*/
+      
+      PT_Mean = 0.0; q_Mean = 0.0;
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        PT_Sector[iAngle] = 0.0;
+        for (iStation = 0; iStation < nStation; iStation++) {
+          PT_Sector[iAngle] += ProbeArray[iAngle][iStation][3]/float(nStation);
+          PT_Mean           += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
+          q_Mean            += ProbeArray[iAngle][iStation][4]/float(nStation*nAngle);
+        }
+      }
+      
+      /*--- Compute the min value of the averaged pressure at each sector ---*/
+      
+      PT_Sector_Min = PT_Sector[0];
+      for (iAngle = 1; iAngle < nAngle; iAngle++) {
+        if (PT_Sector[iAngle] <= PT_Sector_Min) PT_Sector_Min = PT_Sector[iAngle];
+      }
+      
+      /*--- Set the value of the distortion, it only works for one surface ---*/
+      
+      Mach_Inf           = config->GetMach();
+      Gamma              = config->GetGamma();
+      TotalPressure_Inf  = config->GetPressure_FreeStreamND() * pow( 1.0 + Mach_Inf * Mach_Inf *
+                                                                    0.5 * (Gamma - 1.0), Gamma    / (Gamma - 1.0));
+      
+      if (q_Mean != 0.0) DC60 = ((PT_Mean - PT_Sector_Min)*TotalPressure_Inf)/q_Mean;
+      else DC60 = 0.0;
+      
+      config->SetSurface_DC60(iMarker_Analyze, DC60);
+      
+      solver->SetTotal_DC60(DC60);
+      
+      /*--- Deallocate the memory ---*/
+      
+      delete[] r;
+      
+      delete [] PT_Sector;
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          delete[] ProbeArray[iAngle][iStation];
+        }
+      }
+      delete[] ProbeArray;
+      
+      
+      /*--- Evaluate the IDC, and IDR parameters ---*/
+      
+      nStation = SU2_TYPE::Int(config->GetDistortionRack()[0]);
+      Theta = SU2_TYPE::Int(config->GetDistortionRack()[1]);
+      nAngle = SU2_TYPE::Int(360/float(Theta));
+      
+      /*--- Allocate memory ---*/
+      
+      r = new su2double [nStation+1];
+      ProbeArray = new su2double ** [nAngle];
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        ProbeArray[iAngle] = new su2double * [nStation];
+        for (iStation = 0; iStation < nStation; iStation++) {
+          ProbeArray[iAngle][iStation] = new su2double [4];
+        }
+      }
+      
+      /*--- Define the radius for each probe ---*/
+      
+      r[0] = HubRadius; r[nStation] = TipRadius;
+      for (iStation = 1; iStation < nStation; iStation++) {
+        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
+      }
+      
+      /*--- Define the probe rack ---*/
+      
+      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        
+        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
+        RotatedVector[0] =  UpVector[0];
+        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
+        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
+        
+        for (iStation = 1; iStation <= nStation; iStation++) {
+          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+        }
+        
+      }
+      
+      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          xCoord_ = ProbeArray[iAngle][iStation][0];
+          yCoord_ = ProbeArray[iAngle][iStation][1];
+          zCoord_ = ProbeArray[iAngle][iStation][2];
+          
+          MinDistance = 1E6;
+          
+          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+              
+              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+              xCoord = Buffer_Recv_Coord_x[Total_Index];
+              yCoord = Buffer_Recv_Coord_y[Total_Index];
+              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+              
+              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
+              if (nDim == 3) dz = (zCoord_ - zCoord);
+              
+              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
+              
+              if (Engine_HalfModel) {
+                
+                yCoord = -yCoord;
+                
+                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
+                if (nDim == 3) dz_ = (zCoord_ - zCoord);
+                
+                Distance_Mirror = dx_*dx_ + dy_*dy_;
+                if (nDim == 3) Distance_Mirror += dz_*dz_;
+                Distance_Mirror = sqrt(Distance_Mirror);
+                
+                if (Distance_Mirror < Distance) {
+                  Distance = Distance_Mirror;
+                  dx = dx_; dy = dy_;
+                  if (nDim == 3) dz = dz_;
+                }
+                
+              }
+              
+              if (Distance <= MinDistance) {
+                MinDistance = Distance;
+                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
+              }
+              
+            }
+          }
+          
+        }
+        
+      }
+      
+      /*--- Evaluate the average and min. pressure at each station/radius and fan  ---*/
+      
+      PT_Station = new su2double [nStation];
+      PT_Station_Min = new su2double [nStation];
+      
+      PT_Mean = 0.0;
+      for (iStation = 0; iStation < nStation; iStation++) {
+        PT_Station[iStation] = 0.0;
+        PT_Station_Min[iStation] = ProbeArray[0][iStation][3];
+        for (iAngle = 0; iAngle < nAngle; iAngle++) {
+          PT = ProbeArray[iAngle][iStation][3];
+          PT_Station[iStation] += PT / float(nAngle);
+          if (PT <= PT_Station_Min[iStation] ) PT_Station_Min[iStation] = PT;
+          PT_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
+        }
+      }
+      
+      /*--- Set the value of the distortion, it only works for one surface ---*/
+      
+      IDC = 0.0;
+      for (iStation = 0; iStation < nStation-1; iStation++) {
+        IDC = max (IDC, 0.5*((PT_Station[iStation] - PT_Station_Min[iStation])/PT_Mean
+                             + (PT_Station[iStation+1] - PT_Station_Min[iStation+1])/PT_Mean) );
+        
+      }
+      
+      config->SetSurface_IDC(iMarker_Analyze, IDC);
+      solver->SetTotal_IDC(IDC);
+      
+      IDR = 0.0;
+      for (iStation = 0; iStation < nStation; iStation++) {
+        IDR = max (IDR, (PT_Mean-PT_Station[iStation])/PT_Mean);
+      }
+      
+      config->SetSurface_IDR(iMarker_Analyze, IDR);
+      
+      solver->SetTotal_IDR(IDR);
+      
+      /*--- Release IDX parameters ---*/
+      
+      delete [] PT_Station_Min;
+      delete [] PT_Station;
+      
+      /*--- Evaluate the IDC Mach parameter ---*/
+      
+      /*--- Compute the Mach number at each probe, closes grid point to the location ---*/
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          xCoord_ = ProbeArray[iAngle][iStation][0];
+          yCoord_ = ProbeArray[iAngle][iStation][1];
+          zCoord_ = ProbeArray[iAngle][iStation][2];
+          
+          MinDistance = 1E6;
+          
+          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+              
+              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+              
+              xCoord = Buffer_Recv_Coord_x[Total_Index];
+              yCoord = Buffer_Recv_Coord_y[Total_Index];
+              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+              
+              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
+              if (nDim == 3) dz = (zCoord_ - zCoord);
+              
+              Distance = dx*dx + dy*dy;
+              if (nDim == 3) Distance += dz*dz;
+              Distance = sqrt(Distance);
+              
+              if (Engine_HalfModel) {
+                
+                yCoord = -yCoord;
+                
+                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
+                if (nDim == 3) dz_ = (zCoord_ - zCoord);
+                
+                Distance_Mirror = dx_*dx_ + dy_*dy_;
+                if (nDim == 3) Distance_Mirror += dz_*dz_;
+                Distance_Mirror = sqrt(Distance_Mirror);
+                
+                if (Distance_Mirror < Distance) {
+                  Distance = Distance_Mirror;
+                  dx = dx_; dy = dy_;
+                  if (nDim == 3) dz = dz_;
+                }
+                
+              }
+              
+              if (Distance <= MinDistance) {
+                MinDistance = Distance;
+                ProbeArray[iAngle][iStation][3] = Buffer_Recv_Mach[Total_Index];
+              }
+              
+            }
+          }
+          
+        }
+        
+      }
+      
+      /*--- Evaluate the average and min. pressure at each station/radius and fan face ---*/
+      
+      Mach_Station = new su2double [nStation];
+      Mach_Station_Min = new su2double [nStation];
+      
+      Mach_Mean = 0.0;
+      for (iStation = 0; iStation < nStation; iStation++) {
+        Mach_Station[iStation] = 0.0;
+        Mach_Station_Min[iStation] = ProbeArray[0][iStation][3];
+        for (iAngle = 0; iAngle < nAngle; iAngle++) {
+          Mach = ProbeArray[iAngle][iStation][3];
+          Mach_Station[iStation] += Mach / float(nAngle);
+          if (Mach <= Mach_Station_Min[iStation] ) Mach_Station_Min[iStation] = Mach;
+          Mach_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
+        }
+      }
+      
+      /*--- Set the value of the distortion, it only works for one surface ---*/
+      
+      IDC_Mach = 0.0;
+      for (iStation = 0; iStation < nStation-1; iStation++) {
+        if (Mach_Mean != 0)
+          IDC_Mach = max (IDC_Mach, 0.5*((Mach_Station[iStation] - Mach_Station_Min[iStation])/Mach_Mean
+                                         + (Mach_Station[iStation+1] - Mach_Station_Min[iStation+1])/Mach_Mean)   );
+        
+      }
+      
+      config->SetSurface_IDC_Mach(iMarker_Analyze, IDC_Mach);
+      
+      solver->SetTotal_IDC_Mach(IDC_Mach);
+      
+      delete [] Mach_Station_Min;
+      delete [] Mach_Station;
+      
+      /*--- Release distortion parameters ---*/
+      
+      delete[] r;
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          delete[] ProbeArray[iAngle][iStation];
+        }
+      }
+      delete[] ProbeArray;
+      
+      /*--- Create the distortion plot ---*/
+      
+      Theta = 10; nStation = 20;
+      
+      nAngle = SU2_TYPE::Int(360/float(Theta));
+      r = new su2double [nStation+1];
+      
+      /*--- Allocate memory ---*/
+      
+      ProbeArray = new su2double ** [nAngle];
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        ProbeArray[iAngle] = new su2double * [nStation];
+        for (iStation = 0; iStation < nStation; iStation++) {
+          ProbeArray[iAngle][iStation] = new su2double [11];
+        }
+      }
+      
+      /*--- Define the radius for each probe ---*/
+      
+      r[0] = HubRadius;
+      r[nStation] = TipRadius;
+      
+      for (iStation = 1; iStation < nStation; iStation++) {
+        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
+      }
+      
+      /*--- Define the probe rack ---*/
+      
+      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        
+        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
+        RotatedVector[0] =  UpVector[0];
+        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
+        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
+        
+        for (iStation = 1; iStation <= nStation; iStation++) {
+          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
+        }
+        
+      }
+      
+      /*--- Compute the primitieve variables, closest grid point to the location + gradient ---*/
+      
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          xCoord_ = ProbeArray[iAngle][iStation][0];
+          yCoord_ = ProbeArray[iAngle][iStation][1];
+          zCoord_ = ProbeArray[iAngle][iStation][2];
+          
+          MinDistance = 1E6;
+          
+          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+              
+              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
+              xCoord = Buffer_Recv_Coord_x[Total_Index];
+              yCoord = Buffer_Recv_Coord_y[Total_Index];
+              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
+              
+              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
+              if (nDim == 3) dz = (zCoord_ - zCoord);
+              
+              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
+              
+              SignFlip = 1.0;
+              
+              if (Engine_HalfModel) {
+                
+                yCoord = -yCoord;
+                
+                dx_ = (xCoord_ - xCoord);
+                dy_ = (yCoord_ - yCoord);
+                if (nDim == 3) dz_ = (zCoord_ - zCoord);
+                
+                Distance_Mirror = dx_*dx_ + dy_*dy_;
+                if (nDim == 3) Distance_Mirror += dz_*dz_;
+                Distance_Mirror = sqrt(Distance_Mirror);
+                
+                if (Distance_Mirror < Distance) {
+                  SignFlip = -1.0;
+                  Distance = Distance_Mirror;
+                  dx = dx_; dy = dy_;
+                  if (nDim == 3) dz = dz_;
+                }
+                
+              }
+              
+              
+              if (Distance <= MinDistance) {
+                MinDistance = Distance;
+                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
+                ProbeArray[iAngle][iStation][4] = Buffer_Recv_TT[Total_Index];
+                ProbeArray[iAngle][iStation][5] = Buffer_Recv_P[Total_Index];
+                ProbeArray[iAngle][iStation][6] = Buffer_Recv_T[Total_Index];
+                ProbeArray[iAngle][iStation][7] = Buffer_Recv_Mach[Total_Index];
+                ProbeArray[iAngle][iStation][8] = Buffer_Recv_Vel_x[Total_Index];
+                ProbeArray[iAngle][iStation][9] =  SignFlip * Buffer_Recv_Vel_y[Total_Index];
+                if (nDim == 3) ProbeArray[iAngle][iStation][10] = Buffer_Recv_Vel_z[Total_Index];
+              }
+              
+            }
+          }
+          
+        }
+        
+      }
+      
+      /*--- Reverse in the Y direction to move the solution from 3D to 2D ---*/
+      
+      yCoord_CG = -yCoord_CG;
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          ProbeArray[iAngle][iStation][9] = -ProbeArray[iAngle][iStation][9];
+          ProbeArray[iAngle][iStation][1] = -ProbeArray[iAngle][iStation][1];
+        }
+      }
+      
+      if (output) {
+        
+        if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+          
+          SurfFlow_file << "\nDATASET UNSTRUCTURED_GRID" << endl;
+          SurfFlow_file <<"POINTS " << nAngle*nStation << " float" << endl;
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              SurfFlow_file << ProbeArray[iAngle][iStation][1]-yCoord_CG << " " << ProbeArray[iAngle][iStation][2]-zCoord_CG << " 0.0 " <<" ";
+            }
+          }
+          
+          SurfFlow_file <<"\nCELLS " << nAngle*(nStation-1) <<" "<< nAngle*(nStation-1)*5 << endl;
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation-1; iStation++) {
+              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
+              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
+              SurfFlow_file << "4 " << a  <<" "<< b <<" "<< c <<" "<< d <<" ";
+            }
+          }
+          
+          SurfFlow_file <<"\nCELL_TYPES " << nAngle*(nStation-1) << endl;
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation-1; iStation++) {
+              SurfFlow_file << "9 " ;
+            }
+          }
+          
+          SurfFlow_file <<"\nPOINT_DATA " << nAngle*nStation << endl;
+          SurfFlow_file <<"SCALARS PT/PT_inf float" << endl;
+          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              SurfFlow_file << ProbeArray[iAngle][iStation][3] << " ";
+            }
+          }
+          
+          SurfFlow_file <<"SCALARS TT/TT_inf float" << endl;
+          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              SurfFlow_file << ProbeArray[iAngle][iStation][4] << " ";
+            }
+          }
+          
+          SurfFlow_file <<"SCALARS Alpha float" << endl;
+          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              SurfFlow_file << Alpha << " ";
+            }
+          }
+          
+          SurfFlow_file <<"SCALARS Beta float" << endl;
+          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              SurfFlow_file << Beta << " ";
+            }
+          }
+          
+          SurfFlow_file <<"SCALARS Mach float" << endl;
+          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              SurfFlow_file << ProbeArray[iAngle][iStation][7] << " ";
+            }
+          }
+          
+          SurfFlow_file <<"VECTORS Velocity float" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              SurfFlow_file << ProbeArray[iAngle][iStation][8] << " " << ProbeArray[iAngle][iStation][9] << " " << ProbeArray[iAngle][iStation][10] << " ";
+            }
+          }
+          
+        }
+        else {
+          
+          SurfFlow_file <<"ZONE T= \"" << Analyze_TagBound <<"\", NODES=" << nAngle*nStation << " , ELEMENTS= " << nAngle*(nStation-1) <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL" << endl;
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation; iStation++) {
+              
+              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              
+              Mach_ij = ProbeArray[iAngle][iStation][7];
+              if (iAngle+1 != nAngle) Mach_ip1j = ProbeArray[iAngle+1][iStation][7];
+              else Mach_ip1j = ProbeArray[0][iStation][7];
+              if (iAngle-1 != -1) Mach_im1j = ProbeArray[iAngle-1][iStation][7];
+              else Mach_im1j = ProbeArray[nAngle-1][iStation][7];
+              if (iStation+1 != nStation) Mach_ijp1 = ProbeArray[iAngle][iStation+1][7];
+              else Mach_ijp1 = ProbeArray[iAngle][0][7];
+              if (iStation-1 != -1) Mach_ijm1 = ProbeArray[iAngle][iStation-1][7];
+              else Mach_ijm1 = ProbeArray[iAngle][nStation-1][7];
+              Filtered_Mach = (4.0*Mach_ij+Mach_ip1j+Mach_im1j+Mach_ijp1+Mach_ijm1)/8.0;
+              
+              Alpha_ij = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iAngle+1 != nAngle) Alpha_ip1j = atan(ProbeArray[iAngle+1][iStation][10]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              else Alpha_ip1j = atan(ProbeArray[0][iStation][10]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iAngle-1 != -1) Alpha_im1j = atan(ProbeArray[iAngle-1][iStation][10]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              else Alpha_im1j = atan(ProbeArray[nAngle-1][iStation][10]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iStation+1 != nStation) Alpha_ijp1 = atan(ProbeArray[iAngle][iStation+1][10]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
+              else Alpha_ijp1 = atan(ProbeArray[iAngle][0][10]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
+              if (iStation-1 != -1) Alpha_ijm1 = atan(ProbeArray[iAngle][iStation-1][10]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
+              else Alpha_ijm1 = atan(ProbeArray[iAngle][nStation-1][10]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
+              Filtered_Alpha = (4.0*Alpha_ij+Alpha_ip1j+Alpha_im1j+Alpha_ijp1+Alpha_ijm1)/8.0;
+              
+              Beta_ij = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iAngle+1 != nAngle) Beta_ip1j = atan(ProbeArray[iAngle+1][iStation][9]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              else Beta_ip1j = atan(ProbeArray[0][iStation][9]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iAngle-1 != -1) Beta_im1j = atan(ProbeArray[iAngle-1][iStation][9]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              else Beta_im1j = atan(ProbeArray[nAngle-1][iStation][9]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
+              if (iStation+1 != nStation) Beta_ijp1 = atan(ProbeArray[iAngle][iStation+1][9]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
+              else Beta_ijp1 = atan(ProbeArray[iAngle][0][9]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
+              if (iStation-1 != -1) Beta_ijm1 = atan(ProbeArray[iAngle][iStation-1][9]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
+              else Beta_ijm1 = atan(ProbeArray[iAngle][nStation-1][9]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
+              Filtered_Beta = (4.0*Beta_ij+Beta_ip1j+Beta_im1j+Beta_ijp1+Beta_ijm1)/8.0;
+              
+              
+              SurfFlow_file
+              << " "  << ProbeArray[iAngle][iStation][1]-yCoord_CG
+              <<" " << ProbeArray[iAngle][iStation][2]-zCoord_CG
+              <<" " << ProbeArray[iAngle][iStation][3] <<" " << ProbeArray[iAngle][iStation][4]
+              <<" " << ProbeArray[iAngle][iStation][5] <<" " << ProbeArray[iAngle][iStation][6]
+              <<" " << ProbeArray[iAngle][iStation][8] <<" " << ProbeArray[iAngle][iStation][9]
+              <<" " << ProbeArray[iAngle][iStation][10]
+              <<" " << Alpha <<" " << Beta << " " << ProbeArray[iAngle][iStation][7]
+              <<" " << Filtered_Alpha <<" " << Filtered_Beta << " " << Filtered_Mach << endl;
+              
+            }
+          }
+          
+          for (iAngle = 0; iAngle < nAngle; iAngle++) {
+            for (iStation = 0; iStation < nStation-1; iStation++) {
+              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
+              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
+              SurfFlow_file << a+1  <<" "<< b+1  <<" "<< c+1 <<" "<< d+1 << endl;
+            }
+          }
+          
+          /*--- Add extra info ---*/
+          
+          SurfFlow_file << "TEXT X=14, Y=86, F=HELV-BOLD, C=BLUE, H=2.0, ";
+          unsigned short RackProbes = SU2_TYPE::Int(config->GetDistortionRack()[0]);
+          unsigned short RackAngle = SU2_TYPE::Int(config->GetDistortionRack()[1]);
+          SurfFlow_file << "T=\"Rack Size: " << RackProbes << " probes at "<< RackAngle << "deg." << "\\" << "\\n";
+          SurfFlow_file << "Mach " << config->GetMach() << ", Reynolds " << config->GetReynolds() << ", <greek>a</greek> "
+          << config->GetAoA() << "deg, <greek>b</greek> " << config->GetAoS() << "deg." << "\\" << "\\n";
+          SurfFlow_file.precision(1);
+          SurfFlow_file << fixed << "Net Thrust " << solver->GetTotal_NetThrust() << "lbs, Power " << solver->GetTotal_Power() <<  "HP";
+          SurfFlow_file.precision(4);
+          SurfFlow_file << ", MassFlow " << config->GetSurface_MassFlow(iMarker_Analyze) << ",\\" << "\\n";
+          SurfFlow_file << "IDC " << config->GetSurface_IDC(iMarker_Analyze)*100 << "%, IDCM " << config->GetSurface_IDC_Mach(iMarker_Analyze)*100 << "%, IDR " << config->GetSurface_IDR(iMarker_Analyze)*100 << "%,\\" << "\\n";
+          SurfFlow_file << "DC60 " << config->GetSurface_DC60(iMarker_Analyze) << ".\"" << endl;
+          
+        }
+        
+      }
+
+      /*--- Release the recv buffers on the master node ---*/
+      
+      delete [] Buffer_Recv_Coord_x;
+      delete [] Buffer_Recv_Coord_y;
+      if (nDim == 3) delete [] Buffer_Recv_Coord_z;
+      
+      delete [] Buffer_Recv_PT;
+      delete [] Buffer_Recv_TT;
+      delete [] Buffer_Recv_P;
+      delete [] Buffer_Recv_T;
+      delete [] Buffer_Recv_Mach;
+      delete [] Buffer_Recv_Vel_x;
+      delete [] Buffer_Recv_Vel_y;
+      if (nDim == 3) delete [] Buffer_Recv_Vel_z;
+      delete [] Buffer_Recv_q;
+      
+      delete [] Buffer_Recv_Area;
+      
+      delete [] Buffer_Recv_nVertex;
+      
+      delete[] r;
+      for (iAngle = 0; iAngle < nAngle; iAngle++) {
+        for (iStation = 0; iStation < nStation; iStation++) {
+          delete[] ProbeArray[iAngle][iStation];
+        }
+      }
+      delete[] ProbeArray;
+      
+    }
+    
+//    if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint()) {
+//
+//      cout << "Surface ("<< Analyze_TagBound << "): ";
+//      cout.precision(4);
+//      cout.setf(ios::fixed, ios::floatfield);
+//      cout << setprecision(1) << "IDC " << 100*config->GetSurface_IDC(iMarker_Analyze)
+//      << "%. IDC Mach " << 100*config->GetSurface_IDC_Mach(iMarker_Analyze)
+//      << "%. IDR " << 100*config->GetSurface_IDR(iMarker_Analyze)
+//      << "%. DC60 " << config->GetSurface_DC60(iMarker_Analyze) << "." << endl;
+//
+//    }
+    
+    /*--- Release the memory for the remaining buffers and exit ---*/
+    
+    delete [] Buffer_Send_Coord_x;
+    delete [] Buffer_Send_Coord_y;
+    if (nDim == 3) delete [] Buffer_Send_Coord_z;
+    
+    delete [] Buffer_Send_PT;
+    delete [] Buffer_Send_TT;
+    delete [] Buffer_Send_P;
+    delete [] Buffer_Send_T;
+    delete [] Buffer_Send_Mach;
+    delete [] Buffer_Send_Vel_x;
+    delete [] Buffer_Send_Vel_y;
+    if (nDim == 3) delete [] Buffer_Send_Vel_z;
+    delete [] Buffer_Send_q;
+    
+    delete [] Buffer_Send_Area;
+    
+  }
+  
+  /*--- Close the tecplot  file ---*/
+  
+  if (output) {
+    SurfFlow_file.close();
+  }
+
+}
+
+void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geometry, CSolver *****solver_container,
+                                CConfig **config, CIntegration ****integration, unsigned long iExtIter,
+                                unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT, bool header) {
+
+  int rank = MASTER_NODE;
+#ifdef HAVE_MPI
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+#endif
+
+  /*--- Output only using the Master Node ---*/
+
+  if ((rank == MASTER_NODE) && (header)){
+
+    char cstr[200], buffer[50], turb_resid[1000];
+    string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
+
+    bool turbulent = ((config[ZONE_FLOW]->GetKind_Solver() == RANS) || (config[ZONE_FLOW]->GetKind_Solver() == ADJ_RANS) ||
+                       (config[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS));
+
+    unsigned short direct_diff = config[ZONE_FLOW]->GetDirectDiff();
+
+    /*--- Write file name with extension ---*/
+    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
+    strcpy (cstr, filename.data());
+
+    if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
+      long iExtIter = config[ZONE_FLOW]->GetUnst_RestartIter();
+      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+      strcat(cstr, buffer);
+    }
+
+    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
+        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+             (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW) || (config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".vtk");
+    strcat(cstr, buffer);
+
+    FSIHist_file->open(cstr, ios::out);
+    FSIHist_file->precision(15);
+
+    /*--- Begin of the header ---*/
+
+    char begin[]= "\"ExtIter\",\"BGSIter\"";
+
+    /*--- Header for the coefficients ---*/
+
+    char flow_coeff[]= ",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CL/CD\"";
+    char fem_coeff[]= ",\"VM_Stress\"";
+    char of_1[] = ",\"TgtGeom\"";
+    char of_2[] = ",\"TgtNode\"";
+
+    char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
+
+     /*--- Header for the residuals ---*/
+
+    char fsi_resid[]= ",\"Res_FSI\",\"RelaxCoeff\",\"ForceCoeff\"";
+
+    char flow_resid[]= ",\"Res_BGS[F0]\",\"Res_BGS[F1]\",\"Res_BGS[F2]\",\"Res_BGS[F3]\",\"Res_BGS[F4]\"";
+    char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
+    char fem_resid[]= ",\"Res_BGS[S0]\",\"Res_BGS[S1]\",\"Res_BGS[S2]\"";
+
+    /*--- End of the header ---*/
+
+    char end[]= ",\"Time(min)\"\n";
+
+    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
+        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW) ||
+        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+        FSIHist_file[0] << "TITLE = \"SU2 FSI Simulation\"" << endl;
+        FSIHist_file[0] << "VARIABLES = ";
+    }
+
+    /*--- Write the header, case depending ---*/
+
+    FSIHist_file[0] << begin;
+
+    FSIHist_file[0] << fsi_resid;
+
+    switch (config[ZONE_FLOW]->GetKind_Solver()) {
+
+      /*--- Flow residual output ---*/
+
+      case EULER : case NAVIER_STOKES: case RANS :
+        FSIHist_file[0] << flow_resid;
+        if (turbulent) FSIHist_file[0] << turb_resid;
+      break;
+
+      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+        FSIHist_file[0] << adj_flow_resid;
+        break;
+
+     }
+
+    /*--- FEA residual output ---*/
+
+     switch (config[ZONE_STRUCT]->GetKind_Solver()) {
+
+       case FEM_ELASTICITY:
+         FSIHist_file[0] << fem_resid;
+         break;
+
+       case DISC_ADJ_FEM:
+         FSIHist_file[0] << fem_resid ;
+         break;
+
+     }
+
+     /*--- Flow coefficients output ---*/
+     switch (config[ZONE_FLOW]->GetKind_Solver()) {
+
+     case EULER : case NAVIER_STOKES: case RANS :
+       FSIHist_file[0] << flow_coeff;
+       if (turbulent) FSIHist_file[0] << turb_resid;
+       if (direct_diff != NO_DERIVATIVE) {
+         FSIHist_file[0] << d_flow_coeff;
+       }
+       break;
+
+       case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+         FSIHist_file[0] << adj_flow_resid;
+         break;
+
+      }
+
+      switch (config[ZONE_STRUCT]->GetKind_Solver()) {
+
+        case FEM_ELASTICITY:
+          FSIHist_file[0] << fem_coeff;
+          break;
+
+        case DISC_ADJ_FEM:
+          FSIHist_file[0] << fem_coeff;
+          break;
+
+      }
+
+      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
+        case REFERENCE_GEOMETRY:
+          FSIHist_file[0] << of_1;
+          break;
+        case REFERENCE_NODE:
+          FSIHist_file[0] << of_2;
+          break;
+        default:
+          break;
+      }
+
+     FSIHist_file[0] << end;
+
+
+  }
+
+  if ((rank == MASTER_NODE) && (!header)){
+
+      unsigned short nDim = geometry[ZONE_STRUCT][INST_0][MESH_0]->GetnDim();
+
+      unsigned long iExtIter = config[ZONE_STRUCT]->GetExtIter();
+      unsigned long ExtIter_OffSet = config[ZONE_STRUCT]->GetExtIter_OffSet();
+      unsigned long iOuterIter = config[ZONE_STRUCT]->GetOuterIter();
+      su2double dummy = 0.0;
+
+      bool first_iter = ((iExtIter==0) && (iOuterIter == 0));
+
+
+      bool compressible = (config[ZONE_FLOW]->GetKind_Regime() == COMPRESSIBLE);
+      bool incompressible = (config[ZONE_FLOW]->GetKind_Regime() == INCOMPRESSIBLE);
+
+
+      bool fem = ((config[ZONE_STRUCT]->GetKind_Solver() == FEM_ELASTICITY) ||
+              (config[ZONE_STRUCT]->GetKind_Solver() == DISC_ADJ_FEM));
+      bool linear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == SMALL_DEFORMATIONS);
+      bool nonlinear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == LARGE_DEFORMATIONS);
+
+      bool disc_adj_flow = config[ZONE_FLOW]->GetDiscrete_Adjoint();
+      bool disc_adj_fem = config[ZONE_STRUCT]->GetDiscrete_Adjoint();
+
+
+      /*--- WARNING: These buffers have hard-coded lengths. Note that you
+       may have to adjust them to be larger if adding more entries. ---*/
+
+      char begin[1000], direct_coeff[1000],
+      fsi_resid[1000], fsi_coeffs[1000],
+      flow_resid[1000], fem_resid[1000],
+      objective_function[1000], end[1000];
+
+      su2double *residual_flow         = NULL;
+      su2double *residual_fem          = NULL;
+      su2double *residual_fsi          = NULL;
+      su2double *coeffs_fsi            = NULL;
+
+      /*--- Initialize number of variables ---*/
+      unsigned short nVar_FSI = 1, nCoeff_FSI = 2, nVar_Flow = 0, nVar_FEM = 0;
+
+      unsigned short iVar;
+
+      /*--- Direct problem variables ---*/
+      if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+1;
+
+      if (fem) {
+        if (linear_analysis) nVar_FEM = nDim;
+        if (nonlinear_analysis) nVar_FEM = 3;
+        if (disc_adj_fem) nVar_FEM = nDim;
+      }
+
+      residual_flow       = new su2double[nVar_Flow];
+      residual_fem        = new su2double[nVar_FEM];
+      residual_fsi        = new su2double[nVar_FSI];
+      coeffs_fsi          = new su2double[nCoeff_FSI];
+
+      /*--- Initialize variables to store information from all domains (direct solution) ---*/
+
+      su2double Total_CL = 0.0, Total_CD = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+                Total_OF = 0.0;
+
+      Total_CL       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CL();
+      Total_CD       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CD();
+      Total_CEff     = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CEff();
+      Total_CMx      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMx();
+      Total_CMy      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMy();
+      Total_CMz      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMz();
+
+      bool print_of = false;
+
+      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
+        case REFERENCE_GEOMETRY:
+          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefGeom();
+          print_of = true;
+          break;
+        case REFERENCE_NODE:
+          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefNode();
+          print_of = true;
+          break;
+        default:
+          break;
+      }
+
+      if ((!disc_adj_flow) && (!disc_adj_fem)){
+        /*--- Flow Residuals ---*/
+        for (iVar = 0; iVar < nVar_Flow; iVar++)
+          residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetRes_BGS(iVar);
+
+        /*--- FEA Residuals ---*/
+        for (iVar = 0; iVar < nVar_FEM; iVar++)
+          residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRes_BGS(iVar);
+
+        residual_fsi[0] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetFSI_Residual();
+        coeffs_fsi[0]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRelaxCoeff();
+        coeffs_fsi[1]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
+
+      }
+      else{
+          /*--- Flow Residuals ---*/
+          for (iVar = 0; iVar < nVar_Flow; iVar++)
+            residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_BGS(iVar);
+          /*--- FEA Residuals ---*/
+          for (iVar = 0; iVar < nVar_FEM; iVar++)
+            residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_BGS(iVar);
+      }
+
+      /*--- Write the begining of the history file ---*/
+      SPRINTF(begin, "%12d, %12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet), SU2_TYPE::Int(iOuterIter));
+      /*--- Write the end of the history file ---*/
+      SPRINTF (end, "\n");
+
+      SPRINTF (fsi_resid, ", %14.8e", log10 (residual_fsi[0]));
+      SPRINTF (fsi_coeffs, ", %14.8e,  %14.8e", coeffs_fsi[0], coeffs_fsi[1]);
+
+      /*--- Flow residual ---*/
+      if (nDim == 2) {
+        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), dummy, dummy);
+      }
+      else {
+        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
+        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
+      }
+
+      /*--- FEM residual ---*/
+      if (nDim == 2) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
+      else SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[1]));
+
+      /*--- Direct coefficients ---*/
+      SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",Total_CL, Total_CD, Total_CMx, Total_CMy, Total_CMz, Total_CEff);
+
+      if (print_of) SPRINTF (objective_function, ", %14.8e", Total_OF);
+
+      if (!first_iter){
+          if (!print_of) FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << end;
+          else FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << objective_function << end;
+            FSIHist_file[0].flush();
+      }
+
+      delete [] residual_flow;
+      delete [] residual_fem;
+      delete [] residual_fsi;
+      delete [] coeffs_fsi;
+
+
+  }
+
+}
+
+void COutputLegacy::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
+
+  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
+  unsigned long iVertex, iPoint, nPoint, nVertex;
+  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
+
+  unsigned short iZone;
+
+  CSolver ***solver = new CSolver**[val_nZone];
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    solver[iZone] = new CSolver*[1];
+  }
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+    nPoint = geometry[iZone][INST_0]->GetnPoint();
+    nDim   = geometry[iZone][INST_0]->GetnDim();
+    nMarker = config[iZone]->GetnMarker_All();
+    nVar = nDim + 1;
+
+    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
+
+    vector<string> fieldnames;
+    fieldnames.push_back("\"Point\"");
+    fieldnames.push_back("\"x\"");
+    fieldnames.push_back("\"y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"z\"");
+    }
+    fieldnames.push_back("\"Sensitivity_x\"");
+    fieldnames.push_back("\"Sensitivity_y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"Sensitivity_z\"");
+    }
+    fieldnames.push_back("\"Surface_Sensitivity\"");
+
+    solver[iZone][INST_0] = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
+
+    for (iPoint = 0; iPoint < nPoint; iPoint++) {
+      for (iDim = 0; iDim < nDim; iDim++) {
+        solver[iZone][INST_0]->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
+      }
+      for (iVar = 0; iVar < nDim; iVar++) {
+        solver[iZone][INST_0]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
+      }
+    }
+
+    /*--- Compute the sensitivity in normal direction ---*/
+
+    for (iMarker = 0; iMarker < nMarker; iMarker++) {
+
+      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
+
+        
+        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
+
+        for (iVertex = 0; iVertex < nVertex; iVertex++) {
+          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
+          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
+          Prod = 0.0;
+          Area = 0.0;
+          for (iDim = 0; iDim < nDim; iDim++) {
+
+            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
+
+            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
+
+            /*--- Calculate scalar product for projection onto the normal vector ---*/
+
+            Prod += Normal[iDim]*SensDim;
+
+            Area += Normal[iDim]*Normal[iDim];
+          }
+
+          Area = sqrt(Area);
+
+          /*--- Projection of the gradient onto the normal vector of the surface ---*/
+
+          Sens = Prod/Area;
+
+          solver[iZone][INST_0]->node[iPoint]->SetSolution(2*nDim, Sens);
+
+        }
+      }
+    }
+  }
+
+  /*--- Merge the information and write the output files ---*/
+
+  SetBaselineResult_Files(solver, geometry, config, 0, val_nZone);
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    delete solver[iZone][0];
+    delete solver[iZone];
+  }
+  delete [] solver;
+}
+
+void COutputLegacy::WriteTurboPerfConvHistory(CConfig *config){
+
+  unsigned short iMarker_Monitoring;
+  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
+  unsigned short nZone       = config->GetnZone();
+  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == DISC_ADJ_RANS));
+  bool menter_sst       = (config->GetKind_Turb_Model() == SST);
+
+  unsigned short nBladesRow, nStages;
+  unsigned short iStage;
+  nBladesRow = config->GetnMarker_Turbomachinery();
+  nStages    = SU2_TYPE::Int(nBladesRow/2);
+
+  cout << endl << "------------------------- Turbomachinery Summary ------------------------" << endl;
+  cout << endl;
+  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Turbomachinery(); iMarker_Monitoring++){
+    cout << endl << "----------------------------- Blade " << iMarker_Monitoring + 1 << " -----------------------------------" << endl;
+    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring);
+    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iMarker_Monitoring);
+    if(iMarker_Monitoring == 0){
+      cout << "BC Inlet convergence monitoring marker " << inMarker_Tag << " : "<<endl;
+      cout << endl;
+      cout << "     Inlet Total Enthalpy" << "     Inlet Total Enthalpy BC" << "     err(%)" <<  endl;
+      cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+      cout.width(25); cout << TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+      cout.width(25); cout << abs((TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Inlet Entropy" << "            Inlet Entropy BC" << "            err(%)" <<  endl;
+      cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+      cout.width(25); cout << EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Inlet Absolute Angle" << "     Inlet Absolute Angle BC" << "     err(%)" <<  endl;
+      cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+      cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+      cout.width(25); cout << abs((AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+      cout << endl;
+      cout << endl;
+      if(turbulent){
+        if(menter_sst){
+          cout << "     Inlet TurbIntensity" << "      Inlet TurbIntensity BC" << "      err(%)" <<  endl;
+          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << config->GetTurbulenceIntensity_FreeStream();
+          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurbulenceIntensity_FreeStream())/config->GetTurbulenceIntensity_FreeStream())*100.0;
+          cout << endl;
+          cout << endl;
+          cout << "     Inlet Turb2LamRatio" << "      Inlet Turb2LamRatio BC" << "      err(%)" <<  endl;
+          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << config->GetTurb2LamViscRatio_FreeStream();
+          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurb2LamViscRatio_FreeStream())/config->GetTurb2LamViscRatio_FreeStream())*100.0;
+          cout << endl;
+          cout << endl;
+        }
+        else{
+          cout << "     Inlet Nu Factor" << "          Inlet Nu Factor BC" << "          err(%)" <<  endl;
+          cout.width(25); cout << NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << config->GetNuFactor_FreeStream();
+          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetNuFactor_FreeStream())/config->GetNuFactor_FreeStream())*100.0;
+          cout << endl;
+          cout << endl;
+        }
+      }
+    }
+    if(iMarker_Monitoring == config->GetnMarker_Turbomachinery() -1 ){
+      // if BC outlet
+      cout << "BC outlet convergence monitoring  marker " << outMarker_Tag << " : "<<endl;
+      cout << endl;
+      cout << "     Outlet Pressure" << "          Outlet Pressure BC" << "          err(%)" <<  endl;
+      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
+      cout.width(25); cout << PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
+      cout.width(25); cout << abs((PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+      cout << endl;
+      cout << endl;
+    }
+
+    cout << "Convergence monitoring for integral quantities between markers " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
+    cout << endl;
+    cout << "     Inlet Mass Flow " << "         Outlet Mass Flow" << "            err(%)" <<  endl;
+    cout.width(25); cout << MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
+    cout.width(25); cout << MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
+    cout.width(25); cout << abs((MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+    cout << endl;
+    cout << endl;
+    //if(stator)
+    //cout << "     Inlet Total Enthalpy " << "    Outlet Total Enthalpy" << "     err(%)" <<  endl;
+    //else
+    cout << "     Inlet Total Rothalpy " << "    Outlet Total Rothalpy" << "       err(%)" <<  endl;
+    cout.width(25); cout << RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+    cout.width(25); cout << RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+    cout.width(25); cout << abs((RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
+    cout << endl;
+    cout << endl;
+    cout << "Blade performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
+    cout << endl;
+    cout << "     Total Pressure Loss(%)" << "   Kinetic Energy Loss(%)" << "      Entropy Generation(%)" << endl;
+    cout.width(25); cout << TotalPressureLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
+    cout.width(25); cout << KineticEnergyLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
+    cout.width(25); cout << EntropyGen[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
+    cout << endl;
+    cout << endl;
+    cout << "     Total Inlet Enthalpy" << "     Eulerian Work" << "               Pressure Ratio" <<  endl;
+    cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+    cout.width(25); cout << EulerianWork[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+    cout.width(25); cout << PressureRatio[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+    cout << endl;
+    cout << endl;
+    cout << "     Inlet Entropy" << "            Outlet Entropy" << "             Outlet Is. Enthalpy" <<  endl;
+    cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+    cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+    cout.width(25); cout << EnthalpyOutIs[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
+    cout << endl;
+    cout << endl;
+    cout << "Cinematic quantities between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
+    cout << endl;
+    cout << "     Inlet Mach"<< "               Inlet Normal Mach" << "            Inlet Tang. Mach" << endl;
+    cout.width(25); cout << sqrt(MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
+    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
+    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];
+    cout << endl;
+    cout << endl;
+    cout << "     Outlet Mach"<< "              Outlet Normal Mach" << "           Outlet Tang. Mach" << endl;
+    cout.width(25); cout << sqrt(MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
+    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
+    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];cout << endl;
+    cout << endl;
+    cout << "     Inlet Flow Angle" << "         Outlet flow Angle  " << endl;
+    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+    cout << endl;
+    cout << endl;
+    // if gridmov
+    cout << "     Inlet Abs Flow Angle" << "     Outlet Abs Flow Angle  " << endl;
+    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+    cout << endl;
+    cout << endl << "-------------------------------------------------------------------------" << endl;
+    cout << endl;
+    if(nZone > 0 && iMarker_Monitoring < config->GetnMarker_Turbomachinery() -1){
+      cout << endl << "---------- Mixing-Plane Interface between Blade " << iMarker_Monitoring + 1 << " and Blade " << iMarker_Monitoring + 2 << " -----------" << endl;
+      cout << endl;
+      inMarkerTag_Mix = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring + 1);
+      cout << "Convergence monitoring for the outlet  " << outMarker_Tag << " and the inlet  "<< inMarkerTag_Mix << " : "<<endl;
+      cout << endl;
+      cout << "     Outlet Density " << "          Inlet Density" << "               err(%)" <<  endl;
+      cout.width(25); cout << DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetDensity_Ref();
+      cout.width(25); cout << DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring + 1)]*config->GetDensity_Ref();
+      cout.width(25); cout << abs((DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Outlet Pressure " << "         Inlet Pressure" << "              err(%)" <<  endl;
+      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
+      cout.width(25); cout << PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetPressure_Ref();
+      cout.width(25); cout << abs((PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Outlet Normal Velocity " << "  Inlet Normal Velocity" << "       err(%)" <<  endl;
+      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*config->GetVelocity_Ref();
+      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0]*config->GetVelocity_Ref();
+      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Outlet Tang. Velocity " << "   Inlet Tang. Velocity" << "        err(%)" <<  endl;
+      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*config->GetVelocity_Ref();
+      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1]*config->GetVelocity_Ref();
+      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1])*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Outlet Entropy " << "          Inlet Entropy" << "               err(%)" <<  endl;
+      cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+      cout.width(25); cout << EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
+      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+      if(turbulent){
+        cout << endl;
+        cout << endl;
+        if(menter_sst){
+          cout << "     Outlet TurbIntensity " << "    Inlet TurbIntensity" << "         err(%)" <<  endl;
+          cout.width(25); cout << TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
+          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+          cout << endl;
+          cout << endl;
+          cout << "     Outlet Turb2LamRatio " << "    Inlet Turb2LamRatio" << "         err(%)" <<  endl;
+          cout.width(25); cout << Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
+          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+        }
+        else{
+          cout << "     Outlet Nu Factor " << "        Inlet Nu Factor" << "             err(%)" <<  endl;
+          cout.width(25); cout << NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
+          cout.width(25); cout << NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
+          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
+        }
+      }
+      cout << endl;
+      cout << endl << "-------------------------------------------------------------------------" << endl;
+      cout << endl;
+    }
+
+  }
+  if(nZone > 1){
+    /*--- Stage Performance ---*/
+    for(iStage = 0; iStage < nStages; iStage++ ){
+      cout << endl << "----------------------------- Stage " << iStage + 1 << " -----------------------------------" << endl;
+      inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iStage*2);
+      outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iStage*2+1);
+      cout << "Stage performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
+      cout << endl;
+      cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
+      cout.width(25); cout << TotalTotalEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
+      cout.width(25); cout << TotalStaticEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
+      cout.width(25); cout << EntropyGen[nBladesRow + iStage][nSpanWiseSections]*100.0;
+      cout << endl;
+      cout << endl;
+      cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
+      cout.width(25); cout << PressureRatio[nBladesRow + iStage][nSpanWiseSections];
+      cout.width(25); cout << EnthalpyOutIs[nBladesRow + iStage][nSpanWiseSections]*config->GetEnergy_Ref();
+      cout.width(25); cout << abs((MassFlowIn[nBladesRow + iStage][nSpanWiseSections] - MassFlowOut[nBladesRow + iStage][nSpanWiseSections])/MassFlowIn[nBladesRow + iStage][nSpanWiseSections])*100.0;
+    }
+    cout << endl;
+    cout << endl << "-------------------------------------------------------------------------" << endl;
+    cout << endl;
+
+    /*--- Full Machine Performance ---*/
+    // if(turbine)
+    cout << endl << "---------------------------- Turbine ------------------------------------" << endl;
+    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(0);
+    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(nBladesRow-1);
+    cout << "Turbine performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
+    cout << endl;
+    cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
+    cout.width(25); cout << TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
+    cout.width(25); cout << TotalStaticEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
+    cout.width(25); cout << EntropyGen[nBladesRow + nStages][nSpanWiseSections]*100.0;
+    cout << endl;
+    cout << endl;
+    cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
+    cout.width(25); cout << PressureRatio[nBladesRow + nStages][nSpanWiseSections];
+    cout.width(25); cout << EnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]*config->GetEnergy_Ref();;
+    cout.width(25); cout << abs((MassFlowIn[nBladesRow + nStages][nSpanWiseSections] - MassFlowOut[nBladesRow + nStages][nSpanWiseSections])/MassFlowIn[nBladesRow + nStages][nSpanWiseSections])*100.0;
+    cout << endl;
+    cout << endl << "-------------------------------------------------------------------------" << endl;
+    cout << endl;
+  }
+  
+}
+
+void COutputLegacy::SpecialOutput_Turbo(CSolver *****solver, CGeometry ****geometry, CConfig **config,
+                                       unsigned short val_iZone, bool output) {
+  
+  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
+  unsigned short nZone       = config[val_iZone]->GetnZone();
+
+  unsigned short iDim, iSpan;
+
+  unsigned long iExtIter = config[val_iZone]->GetExtIter();
+  su2double* SpanWiseValuesIn, *SpanWiseValuesOut;
+  ofstream myfile;
+  string spanwise_performance_filename;
+
+
+  /*--- Start of write file turboperformance spanwise ---*/
+  if (rank == MASTER_NODE){
+    SpanWiseValuesIn = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(1);
+    SpanWiseValuesOut = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(2);
+
+
+
+    /*--- Writing Span wise inflow thermodynamic quantities. ---*/
+    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_thermodynamic_values.dat";
+    char buffer[50];
+    if (nZone > 1){
+      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+      spanwise_performance_filename.append(string(buffer));
+    }
+
+
+    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+    myfile.setf(ios::scientific);
+    myfile.precision(12);
+
+    myfile << "TITLE = \"Inflow Spanwise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
+    myfile << "VARIABLES =" << endl;
+
+    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
+    myfile.width(15); myfile << "\"iSpan\"";
+    myfile.width(30); myfile << "\"Pressure[Pa]\"";
+    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
+    myfile.width(30); myfile << "\"Temperature[K]\"";
+    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
+    myfile.width(30); myfile << "\"Enthalpy[J]\"";
+    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
+    myfile.width(30); myfile << "\"Density[kg/m3]\"";
+    myfile.width(30); myfile << "\"Entropy[J/K]\"";
+    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
+    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
+    myfile.width(30); myfile << "\"NuFactor[-]\"";
+    myfile << endl;
+
+    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+
+      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
+      myfile.width(15); myfile << iSpan;
+      myfile.width(30); myfile << PressureIn           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
+      myfile.width(30); myfile << TotalPressureIn      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
+      myfile.width(30); myfile << TemperatureIn        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
+      myfile.width(30); myfile << TotalTemperatureIn   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
+      myfile.width(30); myfile << EnthalpyIn           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
+      myfile.width(30); myfile << TotalEnthalpyIn      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
+      myfile.width(30); myfile << DensityIn            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
+      myfile.width(30); myfile << EntropyIn            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
+      if(TurbIntensityIn[val_iZone][iSpan] > 1.0){
+        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
+      }else{
+        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][iSpan];
+      }
+      myfile.width(30); myfile << Turb2LamViscRatioIn  [val_iZone][iSpan];
+      myfile.width(30); myfile << NuFactorIn           [val_iZone][iSpan];
+      myfile << endl;
+    }
+
+    myfile.close();
+
+    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
+    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_thermodynamic_values.dat";
+    if (nZone > 1){
+      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+      spanwise_performance_filename.append(string(buffer));
+    }
+
+    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+    myfile.setf(ios::scientific);
+    myfile.precision(12);
+
+    myfile << "TITLE = \"Outflow Span-wise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
+    myfile << "VARIABLES =" << endl;
+
+    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
+    myfile.width(15); myfile << "\"iSpan\"";
+    myfile.width(30); myfile << "\"Pressure[Pa]\"";
+    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
+    myfile.width(30); myfile << "\"Temperature[K]\"";
+    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
+    myfile.width(30); myfile << "\"Enthalpy[J]\"";
+    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
+    myfile.width(30); myfile << "\"Density[kg/m3]\"";
+    myfile.width(30); myfile << "\"Entropy[J/K]\"";
+    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
+    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
+    myfile.width(30); myfile << "\"NuFactor[-]\"";
+    myfile << endl;
+
+
+    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+
+      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
+      myfile.width(15); myfile << iSpan;
+      myfile.width(30); myfile << PressureOut           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
+      myfile.width(30); myfile << TotalPressureOut      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
+      myfile.width(30); myfile << TemperatureOut        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
+      myfile.width(30); myfile << TotalTemperatureOut   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
+      myfile.width(30); myfile << EnthalpyOut           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
+      myfile.width(30); myfile << TotalEnthalpyOut      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
+      myfile.width(30); myfile << DensityOut            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
+      myfile.width(30); myfile << EntropyOut            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
+      if(TurbIntensityOut[val_iZone][iSpan] > 1.0){
+        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
+      }else{
+        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][iSpan];
+      }
+      myfile.width(30); myfile << Turb2LamViscRatioOut  [val_iZone][iSpan];
+      myfile.width(30); myfile << NuFactorOut           [val_iZone][iSpan];
+      myfile << endl;
+    }
+
+    myfile.close();
+
+    /*--- Writing Span wise inflow kinematic quantities. ---*/
+    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_kinematic_values.dat";
+    if (nZone > 1){
+      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+      spanwise_performance_filename.append(string(buffer));
+    }
+    
+    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+    myfile.setf(ios::scientific);
+    myfile.precision(12);
+    
+    myfile << "TITLE = \"Inflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
+    myfile << "VARIABLES =" << endl;
+    
+    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
+    myfile.width(15); myfile << "\"iSpan\"";
+    myfile.width(30); myfile << "\"Normal Mach[-]\"";
+    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
+    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
+    myfile.width(30); myfile << "\"Mach Module[-]\"";
+    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
+    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
+    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
+    myfile << endl;
+    
+    
+    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+      
+      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
+      myfile.width(15); myfile << iSpan;
+      for (iDim = 0; iDim < 4; iDim++){
+        myfile.width(30); myfile << MachIn              [val_iZone][iSpan][iDim];
+      }
+      for (iDim = 0; iDim < 4; iDim++){
+        myfile.width(30); myfile << TurboVelocityIn     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
+      }
+      if(AbsFlowAngleIn[val_iZone][iSpan] != AbsFlowAngleIn[val_iZone][iSpan]){
+        myfile.width(30); myfile << "0.0000";
+      }
+      else{
+        myfile.width(30); myfile << AbsFlowAngleIn     [val_iZone][iSpan]*180.0/PI_NUMBER;
+      }
+      if(FlowAngleIn[val_iZone][iSpan] != FlowAngleIn[val_iZone][iSpan]){
+        myfile.width(30); myfile << "0.0000";
+      }
+      else{
+        myfile.width(30); myfile << FlowAngleIn      [val_iZone][iSpan]*180.0/PI_NUMBER;
+      }
+      myfile << endl;
+    }
+    
+    myfile.close();
+    
+    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
+    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_kinematic_values.dat";
+    if (nZone > 1){
+      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+      spanwise_performance_filename.append(string(buffer));
+    }
+    
+    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+    myfile.setf(ios::scientific);
+    myfile.precision(12);
+    
+    myfile << "TITLE = \"Outflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
+    myfile << "VARIABLES =" << endl;
+    
+    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
+    myfile.width(15); myfile << "\"iSpan\"";
+    myfile.width(30); myfile << "\"Normal Mach[-]\"";
+    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
+    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
+    myfile.width(30); myfile << "\"Mach Module[-]\"";
+    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
+    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
+    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
+    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
+    myfile << endl;
+    
+    
+    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
+      
+      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
+      myfile.width(15); myfile << iSpan;
+      for (iDim = 0; iDim < 4; iDim++){
+        myfile.width(30); myfile << MachOut              [val_iZone][iSpan][iDim];
+      }
+      for (iDim = 0; iDim < 4; iDim++){
+        myfile.width(30); myfile << TurboVelocityOut     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
+      }
+      if(AbsFlowAngleOut[val_iZone][iSpan] != AbsFlowAngleOut[val_iZone][iSpan]){
+        myfile.width(30); myfile << "0.0000";
+      }
+      else{
+        myfile.width(30); myfile << AbsFlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
+      }
+      if(FlowAngleOut[val_iZone][iSpan] != FlowAngleOut[val_iZone][iSpan]){
+        myfile.width(30); myfile << "0.0000";
+      }
+      else{
+        myfile.width(30); myfile << FlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
+      }
+      myfile << endl;
+    }
+    
+    myfile.close();
+    
+  }
+}
+
+void COutputLegacy::SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short iInst, unsigned short val_nInst, bool output) {
+  
+  /*--- Write file with flow quantities for harmonic balance HB ---*/
+  ofstream HB_output_file;
+  ofstream mean_HB_file;
+
+  /*--- MPI Send/Recv buffers ---*/
+  su2double *sbuf_var = NULL,  *rbuf_var = NULL;
+
+  /*--- Other variables ---*/
+  unsigned short iVar, kInst;
+  unsigned short nVar_output = 5;
+  unsigned long current_iter = config[ZONE_0]->GetExtIter();
+
+  /*--- Allocate memory for send buffer ---*/
+  sbuf_var = new su2double[nVar_output];
+
+  su2double *averages = new su2double[nVar_output];
+  for (iVar = 0; iVar < nVar_output; iVar++)
+    averages[iVar] = 0;
+
+  /*--- Allocate memory for receive buffer ---*/
+  if (rank == MASTER_NODE) {
+    rbuf_var = new su2double[nVar_output];
+
+    HB_output_file.precision(15);
+    HB_output_file.open("HB_output.csv", ios::out);
+    HB_output_file <<  "\"time_instance\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\"" << endl;
+
+    mean_HB_file.precision(15);
+    if (current_iter == 0 && iInst == 1) {
+      mean_HB_file.open("history_HB.plt", ios::trunc);
+      mean_HB_file << "TITLE = \"SU2 HARMONIC BALANCE SIMULATION\"" << endl;
+      mean_HB_file <<  "VARIABLES = \"Iteration\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CT\",\"CQ\",\"CMerit\"" << endl;
+      mean_HB_file << "ZONE T= \"Average Convergence History\"" << endl;
+    }
+    else
+      mean_HB_file.open("history_HB.plt", ios::out | ios::app);
+  }
+
+  if (rank == MASTER_NODE) {
+
+    /*--- Run through the zones, collecting the output variables
+       N.B. Summing across processors within a given zone is being done
+       elsewhere. ---*/
+    for (kInst = 0; kInst < val_nInst; kInst++) {
+      
+      /*--- Flow solution coefficients (parallel) ---*/
+      sbuf_var[0] = solver[ZONE_0][kInst][MESH_0][FLOW_SOL]->GetTotal_CL();
+      sbuf_var[1] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CD();
+      sbuf_var[2] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMx();
+      sbuf_var[3] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMy();
+      sbuf_var[4] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMz();
+      
+      for (iVar = 0; iVar < nVar_output; iVar++) {
+        rbuf_var[iVar] = sbuf_var[iVar];
+      }
+
+      HB_output_file << kInst << ", ";
+      for (iVar = 0; iVar < nVar_output; iVar++)
+        HB_output_file << rbuf_var[iVar] << ", ";
+      HB_output_file << endl;
+
+      /*--- Increment the total contributions from each zone, dividing by nZone as you go ---*/
+      for (iVar = 0; iVar < nVar_output; iVar++) {
+        averages[iVar] += (1.0/su2double(val_nInst))*rbuf_var[iVar];
+      }
+    }
+  }
+
+  if (rank == MASTER_NODE && iInst == INST_0) {
+
+    mean_HB_file << current_iter << ", ";
+    for (iVar = 0; iVar < nVar_output; iVar++) {
+      mean_HB_file << averages[iVar];
+      if (iVar < nVar_output-1)
+        mean_HB_file << ", ";
+    }
+    mean_HB_file << endl;
+  }
+
+  if (rank == MASTER_NODE) {
+    HB_output_file.close();
+    mean_HB_file.close();
+    delete [] rbuf_var;
+  }
+
+  delete [] sbuf_var;
+  delete [] averages;
+}
+
+void COutputLegacy::SetSpecial_Output(CSolver *****solver_container,
+                                       CGeometry ****geometry,
+                                       CConfig **config,
+                                       unsigned long iExtIter,
+                                       unsigned short val_nZone) {
+
+  bool special_output = false;
+  unsigned short iZone;
+
+  for (iZone = 0; iZone < val_nZone; iZone++){
+
+    special_output = config[iZone]->GetSpecial_Output();
+
+    /*--- Output a file with the forces breakdown. ---*/
+    if (config[iZone]->GetWrt_ForcesBreakdown())
+      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, iZone, special_output);
+
+  }
+
+}
+
+void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
+                                       CGeometry ****geometry,
+                                       CConfig **config,
+                                       unsigned long iExtIter,
+                                       unsigned short val_nZone) {
+  
+//  unsigned short iZone, iVar, iInst;
+//  unsigned long iPoint;
+//  unsigned short nInst = 1;
+//  bool compressible = true;
+
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+//    /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
+//    unsigned short KindSolver = config[iZone]->GetKind_Solver();
+//    bool fem_solver = ((KindSolver == FEM_EULER) ||
+//                       (KindSolver == FEM_NAVIER_STOKES) ||
+//                       (KindSolver == FEM_RANS) ||
+//                       (KindSolver == FEM_LES));
+    
+//    /*--- Get the file output format ---*/
+    
+//    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+//    nInst = config[iZone]->GetnTimeInstances();
+    
+//    for (iInst = 0; iInst < nInst; iInst++){
+
+//      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
+//      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
+
+//      /*--- Flags identifying the types of files to be written. ---*/
+//      /*--- For now, we are disabling the parallel writers for Tecplot
+//          ASCII until we have parallel versions of all file formats
+//          available. SU2_SOL will remain intact for writing files
+//          until this capability is completed. ---*/
+
+//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+//      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+
+//#ifdef HAVE_MPI
+//      /*--- Do not merge the connectivity or write the visualization files
+//     if we are running in parallel, unless we are using ParaView binary.
+//       Force the use of SU2_SOL to merge and write the viz. files in this
+//       case to save overhead. ---*/
+
+//      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
+//        Wrt_Vol = false;
+//        Wrt_Srf = false;
+//      }
+//#endif
+
+//    /*--- Check for compressible/incompressible flow problems. ---*/
+
+//    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
+
+//    /*--- First, prepare the offsets needed throughout below. ---*/
+
+//    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+//    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+    
+//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+    
+//    switch (config[iZone]->GetKind_Solver()) {
+//      case EULER : case NAVIER_STOKES : case RANS :
+//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
+//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+//        break;
+//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
+//            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
+//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+//        break;
+//      default: break;
+//    }
+
+//    /*--- Write a template inlet profile file if requested. ---*/
+
+//    if (config[iZone]->GetWrt_InletFile()) {
+//      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+//      if (rank == MASTER_NODE) {
+//        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+//        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+//      }
+//      config[iZone]->SetWrt_InletFile(false);
+//    }
+
+//    /*--- This switch statement will become a call to a virtual function
+//     defined within each of the "physics" output child classes that loads
+//     the local data for that particular problem alone. ---*/
+
+//      if (rank == MASTER_NODE)
+//        cout << "Loading solution output data locally on each rank." << endl;
+
+//      switch (config[iZone]->GetKind_Solver()) {
+//      case EULER : case NAVIER_STOKES: case RANS :
+//        if (compressible)
+//          LoadLocalData_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//        else
+//          LoadLocalData_IncFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//        break;
+//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+//        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//        break;
+//      case FEM_ELASTICITY: case DISC_ADJ_FEM:
+//        LoadLocalData_Elasticity(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//        break;
+//      case HEAT_EQUATION_FVM:
+//        LoadLocalData_Base(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//        break;
+//      case FEM_EULER: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+//        LoadLocalData_FEM(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+//      default: break;
+//    }
+    
+//    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+
+//    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+//        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+
+//      if (rank == MASTER_NODE)
+//        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
+      
+//      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
+//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+//        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
+//      }
+      
+//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+//        for (iVar = 0; iVar < nVar_Par; iVar++) {
+//          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
+//        }
+//      }
+      
+//    }
+    
+//    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
+
+//    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+//        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+
+//      if (rank == MASTER_NODE)
+//        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+      
+//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+//        for (iVar = 0; iVar < nVar_Par; iVar++) {
+//          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
+//        }
+//      }
+      
+//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
+//        delete [] Local_Data_Copy[iPoint];
+//      delete [] Local_Data_Copy;
+      
+//    }
+    
+//    /*--- After loading the data local to a processor, we perform a sorting,
+//     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
+    
+//    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
+
+//    if (fem_solver)
+//      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+//    else
+//      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
+    
+//    /*--- Write either a binary or ASCII restart file in parallel. ---*/
+
+//    if (config[iZone]->GetWrt_Binary_Restart()) {
+//      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
+//      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+//    } else {
+//      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
+//      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+//    }
+
+//    /*--- Write a slice on a structured mesh if requested. ---*/
+
+//    if (config[iZone]->GetWrt_Slice()) {
+//      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+//                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
+//      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+//                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
+//    }
+    
+//    /*--- Write the solution files if they are requested and we are executing
+//     with a single rank (all data on one proc and no comm. overhead). Once we
+//     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
+//     can allow the write of the viz. files as well. ---*/
+
+//    if ((Wrt_Vol || Wrt_Srf) && !fem_solver) {
+      
+//      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
+
+//      if (rank == MASTER_NODE)
+//        cout << "Preparing element connectivity across all ranks." << endl;
+
+//      if (fem_solver)
+//        SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+//      else
+//        SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+
+//      /*--- Sort the surface data and renumber if for writing. ---*/
+//      if (Wrt_Srf){
+//        if (fem_solver)
+//          SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+//        else
+//          SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
+//      }
+//      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
+
+//      if (Wrt_Vol) {
+
+//        switch (FileFormat) {
+
+//          case TECPLOT:
+
+//            /*--- Write a Tecplot ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+//            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+//            break;
+
+//          case FIELDVIEW:
+
+//            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
+
+//            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+
+//            break;
+
+//          case TECPLOT_BINARY:
+
+//            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+
+//            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
+//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
+//            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+//            break;
+
+//          case FIELDVIEW_BINARY:
+
+//            /*--- FieldView binary files not yet available for parallel output. ---*/
+
+//            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+//            break;
+
+//          case PARAVIEW:
+
+//            /*--- Write a Paraview ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+//            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+//            break;
+            
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a Paraview binary file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
+//            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, false);
+//            break;
+
+//          default:
+//            break;
+//          }
+
+//        }
+
+//        if (Wrt_Srf) {
+
+//          switch (FileFormat) {
+
+//          case TECPLOT:
+
+//            /*--- Write a Tecplot ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
+//            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+//            break;
+
+//          case TECPLOT_BINARY:
+
+//            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+
+//            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
+//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
+//            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+//            break;
+
+//          case PARAVIEW:
+
+//            /*--- Write a Paraview ASCII file ---*/
+
+//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+//            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+//            break;
+            
+//          case PARAVIEW_BINARY:
+            
+//            /*--- Write a Paraview binary file ---*/
+            
+//            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
+//            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+//                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, true);
+//            break;
+            
+
+//          default:
+//            break;
+//          }
+
+//        }
+
+//        /*--- Clean up the connectivity data that was allocated for output. ---*/
+
+//        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
+//        if (Wrt_Srf) DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
+
+//        /*--- Clean up the surface data that was only needed for output. ---*/
+
+//        if (Wrt_Srf) DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+//      }
+
+//      /*--- Deallocate the nodal data needed for writing restarts. ---*/
+
+//      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+//      /*--- Clear the variable names list. ---*/
+
+//      Variable_Names.clear();
+
+//    }
+//  }
+}
+
+void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  unsigned short iDim;
+  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short nDim = geometry->GetnDim();
+  
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
+  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+  
+  su2double RefArea = config->GetRefArea();
+  su2double Gamma = config->GetGamma();
+  su2double RefVel2;
+  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
+  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Buffet = NULL;
+  su2double *Grid_Vel = NULL;
+  
+  bool transition           = (config->GetKind_Trans_Model() == BC);
+  bool grid_movement        = (config->GetGrid_Movement());
+  bool Wrt_Halo             = config->GetWrt_Halo(), isPeriodic;
+  
+  int *Local_Halo = NULL;
+  
+  stringstream varname;
+  
+  /*--- Set the non-dimensionalization for coefficients. ---*/
+  
+  if (grid_movement) {
+    Gas_Constant = config->GetGas_ConstantND();
+    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+    Mach_Motion = config->GetMach_Motion();
+    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+  }
+  else {
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  }
+  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+  
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+  
+  switch (config->GetKind_Solver()) {
+    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
+    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
+    default: SecondIndex = NONE; break;
+  }
+  
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First + nVar_Second;
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- All output files first need the grid coordinates. ---*/
+  
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+  
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+  
+  nVar_Par += nVar_Consv_Par;
+  
+  Variable_Names.push_back("Density");
+  Variable_Names.push_back("Momentum_x");
+  Variable_Names.push_back("Momentum_y");
+  if (geometry->GetnDim() == 3) Variable_Names.push_back("Momentum_z");
+  Variable_Names.push_back("Energy");
+  
+  if (SecondIndex != NONE) {
+    if (config->GetKind_Turb_Model() == SST) {
+      Variable_Names.push_back("TKE");
+      Variable_Names.push_back("Omega");
+    } else {
+      /*--- S-A variants ---*/
+      Variable_Names.push_back("Nu_Tilde");
+    }
+  }
+  
+  /*--- If requested, register the limiter and residuals for all of the
+   equations in the current flow problem. ---*/
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the limiters ---*/
+    
+    if (config->GetWrt_Limiters()) {
+      nVar_Par += nVar_Consv_Par;
+      
+      Variable_Names.push_back("Limiter_Density");
+      Variable_Names.push_back("Limiter_Momentum_x");
+      Variable_Names.push_back("Limiter_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Momentum_z");
+      Variable_Names.push_back("Limiter_Energy");
+      
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Limiter_TKE");
+          Variable_Names.push_back("Limiter_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Limiter_Nu_Tilde");
+        }
+      }
+    }
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) {
+      nVar_Par += nVar_Consv_Par;
+      
+      Variable_Names.push_back("Residual_Density");
+      Variable_Names.push_back("Residual_Momentum_x");
+      Variable_Names.push_back("Residual_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Momentum_z");
+      Variable_Names.push_back("Residual_Energy");
+      
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Residual_TKE");
+          Variable_Names.push_back("Residual_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Residual_Nu_Tilde");
+        }
+      }
+    }
+    
+    /*--- Add the grid velocity. ---*/
+    
+    if (grid_movement) {
+      if (geometry->GetnDim() == 2) nVar_Par += 2;
+      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      
+      Variable_Names.push_back("Grid_Velocity_x");
+      Variable_Names.push_back("Grid_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+    }
+    
+    
+    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
+    
+    nVar_Par += 1;
+    Variable_Names.push_back("Pressure");
+    
+    nVar_Par += 2;
+    Variable_Names.push_back("Temperature");
+    Variable_Names.push_back("Mach");
+    
+    nVar_Par += 1;
+    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+      Variable_Names.push_back("Pressure_Coefficient");
+    } else {
+      Variable_Names.push_back("C<sub>p</sub>");
+    }
+    
+    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+    
+    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
+        nVar_Par += 2;
+        Variable_Names.push_back("Skin_Friction_Coefficient_x");
+        Variable_Names.push_back("Skin_Friction_Coefficient_y");
+        if (geometry->GetnDim() == 3) {
+          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
+        }
+        nVar_Par += 1;
+        Variable_Names.push_back("Heat_Flux");
+      } else {
+        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
+        nVar_Par += 2;
+        Variable_Names.push_back("C<sub>f</sub>_x");
+        Variable_Names.push_back("C<sub>f</sub>_y");
+        if (geometry->GetnDim() == 3) {
+          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
+        }
+        if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR){
+          Variable_Names.push_back("Buffet_Sensor");
+          nVar_Par += 1;
+        }
+        nVar_Par += 1;
+        Variable_Names.push_back("h");
+      }
+    }
+    
+    /*--- Add Eddy Viscosity. ---*/
+    
+    if (Kind_Solver == RANS) {
+      nVar_Par += 2;
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        Variable_Names.push_back("Y_Plus");
+        Variable_Names.push_back("Eddy_Viscosity");
+      } else {
+        Variable_Names.push_back("y<sup>+</sup>");
+        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
+      }
+    }
+    
+    /*--- Add the distance to the nearest sharp edge if requested. ---*/
+    
+    if (config->GetWrt_SharpEdges()) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Sharp_Edge_Dist");
+    }
+    
+    /*--- Add the intermittency for the BC trans. model. ---*/
+    
+    if (transition) {
+      nVar_Par += 1;
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        Variable_Names.push_back("gamma_BC");
+      } else {
+        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+      }
+    }
+    
+    if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
+      nVar_Par +=1;
+      Variable_Names.push_back("DES_LengthScale");
+      nVar_Par +=1;
+      Variable_Names.push_back("Wall_Distance");
+    }
+    
+    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+      nVar_Par +=1;
+      Variable_Names.push_back("Roe_Dissipation");
+    }
+    
+    /*--- New variables get registered here before the end of the loop. ---*/
+    
+  }
+  
+  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    Aux_Frict_x = new su2double[geometry->GetnPoint()];
+    Aux_Frict_y = new su2double[geometry->GetnPoint()];
+    Aux_Frict_z = new su2double[geometry->GetnPoint()];
+    Aux_Heat    = new su2double[geometry->GetnPoint()];
+    Aux_yPlus   = new su2double[geometry->GetnPoint()];
+    Aux_Buffet  = new su2double[geometry->GetnPoint()];
+    
+    /*--- First, loop through the mesh in order to find and store the
+     value of the viscous coefficients at any surface nodes. They
+     will be placed in an auxiliary vector and then communicated like
+     all other volumetric variables. ---*/
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      Aux_Frict_x[iPoint] = 0.0;
+      Aux_Frict_y[iPoint] = 0.0;
+      Aux_Frict_z[iPoint] = 0.0;
+      Aux_Heat[iPoint]    = 0.0;
+      Aux_yPlus[iPoint]   = 0.0;
+      Aux_Buffet[iPoint]  = 0.0;
+    }
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_Plotting(iMarker) == YES) {
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
+          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
+          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
+          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
+          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
+          if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR) Aux_Buffet[iPoint] = solver[FLOW_SOL]->GetBuffetSensor(iMarker, iVertex);
+        }
+      }
+    }
+  }
+  
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+  
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure.          ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  jPoint = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos & write only if requested ---*/
+    
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      /*--- Restart the column index with each new point. ---*/
+      
+      iVar = 0;
+      
+      /*--- Load the grid node coordinate values. ---*/
+      
+      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
+        if (config->GetSystemMeasurements() == US)
+          Local_Data[jPoint][iVar] *= 12.0;
+        iVar++;
+      }
+      
+      /*--- Load the conservative variable states for the mean flow variables. ---*/
+      
+      for (jVar = 0; jVar < nVar_First; jVar++) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
+        iVar++;
+      }
+      
+      /*--- If this is RANS, i.e., the second solver container is not empty,
+       then load data for the conservative turbulence variables. ---*/
+      
+      if (SecondIndex != NONE) {
+        for (jVar = 0; jVar < nVar_Second; jVar++) {
+          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
+          iVar++;
+        }
+      }
+      
+      /*--- If limiters and/or residuals are requested. ---*/
+      if (!config->GetLow_MemoryOutput()) {
+        
+        /*--- Limiters ---*/
+        if (config->GetWrt_Limiters()) {
+          /*--- Mean Flow Limiters ---*/
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+            iVar++;
+          }
+          /*--- RANS Limiters ---*/
+          if (SecondIndex != NONE) {
+            for (jVar = 0; jVar < nVar_Second; jVar++) {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+              iVar++;
+            }
+          }
+        }
+        
+        /*--- Residuals ---*/
+        if (config->GetWrt_Residuals()) {
+          /*--- Mean Flow Residuals ---*/
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            iVar++;
+          }
+          /*--- RANS Residuals ---*/
+          if (SecondIndex != NONE) {
+            for (jVar = 0; jVar < nVar_Second; jVar++) {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
+              iVar++;
+            }
+          }
+        }
+      }
+      
+      if (!config->GetLow_MemoryOutput()) {
+        
+        /*--- Load buffers with the three grid velocity components. ---*/
+        
+        if (grid_movement) {
+          Grid_Vel = geometry->node[iPoint]->GetGridVel();
+          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
+          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Grid_Vel[2];
+            iVar++;
+          }
+        }
+        
+        /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
+        
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetPressure(); iVar++;
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetTemperature(); iVar++;
+        Local_Data[jPoint][iVar] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed(); iVar++;
+        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
+        
+        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+          
+          /*--- Load data for the laminar viscosity. ---*/
+          
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
+          
+          /*--- Load data for the skin friction, heat flux, buffet, and y-plus. ---*/
+          
+          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
+          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
+            iVar++;
+          }
+          if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR) {
+            Local_Data[jPoint][iVar] = Aux_Buffet[iPoint]; 
+            iVar++;
+          }
+          Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
+          
+        }
+        
+        /*--- Load data for the Eddy viscosity for RANS. ---*/
+        
+        if (Kind_Solver == RANS) {
+          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
+        }
+        
+        /*--- Load data for the distance to the nearest sharp edge. ---*/
+        
+        if (config->GetWrt_SharpEdges()) {
+          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
+        }
+        
+        /*--- Load data for the intermittency of the BC trans. model. ---*/
+        
+        if (transition) {
+          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
+        }
+        
+        if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDES_LengthScale(); iVar++;
+          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetWall_Distance(); iVar++;
+        }
+        
+        if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetRoe_Dissipation(); iVar++;
+        }
+        
+        /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+        
+      }
+      
+      /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+      
+      jPoint++;
+      
+    }
+  }
+  
+  /*--- Free memory for auxiliary vectors. ---*/
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    delete [] Aux_Frict_x;
+    delete [] Aux_Frict_y;
+    delete [] Aux_Frict_z;
+    delete [] Aux_Heat;
+    delete [] Aux_yPlus;
+    delete [] Aux_Buffet;
+  }
+  
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+
+  unsigned short iDim;
+  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short nDim = geometry->GetnDim();
+
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
+  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+
+  su2double RefArea = config->GetRefArea();
+  su2double RefVel2 = 0.0;
+  su2double factor = 0.0;
+  su2double RefDensity = 0.0, RefPressure = 0.0;
+  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL;
+  su2double *Grid_Vel = NULL;
+
+  bool transition           = (config->GetKind_Trans_Model() == BC);
+  bool grid_movement        = (config->GetGrid_Movement());
+  bool Wrt_Halo             = config->GetWrt_Halo(), isPeriodic;
+  bool variable_density     = (config->GetKind_DensityModel() == VARIABLE);
+  bool energy               = config->GetEnergy_Equation();
+  bool weakly_coupled_heat  = config->GetWeakly_Coupled_Heat();
+  bool wrt_cp           = (variable_density &&
+                           (config->GetKind_FluidModel() == INC_IDEAL_GAS_POLY));
+  bool wrt_kt           = ((config->GetKind_ConductivityModel() != CONSTANT_CONDUCTIVITY) &&
+                           (config->GetViscous()));
+  int *Local_Halo = NULL;
+
+  stringstream varname;
+
+  /*--- Evaluate reference values for non-dimensionalization.
+   For dimensional or non-dim based on initial values, use
+   the far-field state (inf). For a custom non-dim based
+   on user-provided reference values, use the ref values
+   to compute the forces. ---*/
+
+  if ((config->GetRef_Inc_NonDim() == DIMENSIONAL) ||
+      (config->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
+    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  }
+  else if (config->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
+    RefDensity = config->GetInc_Density_Ref();
+    RefVel2    = config->GetInc_Velocity_Ref()*config->GetInc_Velocity_Ref();
+  }
+
+  /*--- Reference pressure is always the far-field value (0.0). ---*/
+
+  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+
+  /*--- Compute factor for force coefficients. ---*/
+
+  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+
+  switch (config->GetKind_Solver()) {
+    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
+    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
+    default: SecondIndex = NONE; break;
+  }
+
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if ((!energy) && (!weakly_coupled_heat)) nVar_First--;
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First + nVar_Second;
+
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+
+  /*--- All output files first need the grid coordinates. ---*/
+
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+
+  nVar_Par += nVar_Consv_Par;
+
+  /*--- The incompressible solver uses primitives as the working variables. ---*/
+
+  Variable_Names.push_back("Pressure");
+  Variable_Names.push_back("Velocity_x");
+  Variable_Names.push_back("Velocity_y");
+  if (geometry->GetnDim() == 3) Variable_Names.push_back("Velocity_z");
+  if (energy || weakly_coupled_heat) Variable_Names.push_back("Temperature");
+
+  if (SecondIndex != NONE) {
+    if (config->GetKind_Turb_Model() == SST) {
+      Variable_Names.push_back("TKE");
+      Variable_Names.push_back("Omega");
+    } else {
+      /*--- S-A variants ---*/
+      Variable_Names.push_back("Nu_Tilde");
+    }
+  }
+
+  /*--- If requested, register the limiter and residuals for all of the
+   equations in the current flow problem. ---*/
+
+  if (!config->GetLow_MemoryOutput()) {
+
+    /*--- Add the limiters ---*/
+
+    if (config->GetWrt_Limiters()) {
+      nVar_Par += nVar_Consv_Par;
+
+      Variable_Names.push_back("Limiter_Pressure");
+      Variable_Names.push_back("Limiter_Velocity_x");
+      Variable_Names.push_back("Limiter_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Velocity_z");
+      if (energy || weakly_coupled_heat)
+        Variable_Names.push_back("Limiter_Temperature");
+
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Limiter_TKE");
+          Variable_Names.push_back("Limiter_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Limiter_Nu_Tilde");
+        }
+      }
+    }
+
+    /*--- Add the residuals ---*/
+
+    if (config->GetWrt_Residuals()) {
+      nVar_Par += nVar_Consv_Par;
+
+      Variable_Names.push_back("Residual_Pressure");
+      Variable_Names.push_back("Residual_Velocity_x");
+      Variable_Names.push_back("Residual_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Velocity_z");
+      if (energy || weakly_coupled_heat)
+        Variable_Names.push_back("Residual_Temperature");
+
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Residual_TKE");
+          Variable_Names.push_back("Residual_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Residual_Nu_Tilde");
+        }
+      }
+    }
+
+    /*--- Add the grid velocity. ---*/
+
+    if (grid_movement) {
+      if (geometry->GetnDim() == 2) nVar_Par += 2;
+      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+
+      Variable_Names.push_back("Grid_Velocity_x");
+      Variable_Names.push_back("Grid_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+    }
+
+    /*--- Add Cp. ---*/
+
+    nVar_Par += 1;
+    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+      Variable_Names.push_back("Pressure_Coefficient");
+    } else {
+      Variable_Names.push_back("C<sub>p</sub>");
+    }
+
+    /*--- Add Laminar Viscosity, Skin Friction, and Heat Flux to the restart file ---*/
+
+    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
+        nVar_Par += 2;
+        Variable_Names.push_back("Skin_Friction_Coefficient_x");
+        Variable_Names.push_back("Skin_Friction_Coefficient_y");
+        if (geometry->GetnDim() == 3) {
+          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
+        }
+        if (energy || weakly_coupled_heat) {
+          nVar_Par += 1;
+          Variable_Names.push_back("Heat_Flux");
+        }
+      } else {
+        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
+        nVar_Par += 2;
+        Variable_Names.push_back("C<sub>f</sub>_x");
+        Variable_Names.push_back("C<sub>f</sub>_y");
+        if (geometry->GetnDim() == 3) {
+          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
+        }
+        if (energy || weakly_coupled_heat) {
+          nVar_Par += 1;
+          Variable_Names.push_back("h");
+        }
+      }
+    }
+
+    /*--- Add Y+ and Eddy Viscosity. ---*/
+
+    if (Kind_Solver == RANS) {
+      nVar_Par += 2;
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        Variable_Names.push_back("Y_Plus");
+        Variable_Names.push_back("Eddy_Viscosity");
+      } else {
+        Variable_Names.push_back("y<sup>+</sup>");
+        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
+      }
+    }
+
+    /*--- Add the distance to the nearest sharp edge if requested. ---*/
+
+    if (config->GetWrt_SharpEdges()) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Sharp_Edge_Dist");
+    }
+
+    /*--- Add the intermittency for the BC trans. model. ---*/
+
+    if (transition) {
+      nVar_Par += 1;
+      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
+          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
+        Variable_Names.push_back("gamma_BC");
+      } else {
+        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+      }
+    }
+
+    if (variable_density) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Density");
+    }
+    
+    if (wrt_cp) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Specific_Heat");
+    }
+    
+    if (wrt_kt) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Thermal_Conductivity");
+    }
+    
+    /*--- New variables get registered here before the end of the loop. ---*/
+
+  }
+
+  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
+
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    Aux_Frict_x = new su2double[geometry->GetnPoint()];
+    Aux_Frict_y = new su2double[geometry->GetnPoint()];
+    Aux_Frict_z = new su2double[geometry->GetnPoint()];
+    Aux_Heat    = new su2double[geometry->GetnPoint()];
+    Aux_yPlus   = new su2double[geometry->GetnPoint()];
+
+    /*--- First, loop through the mesh in order to find and store the
+     value of the viscous coefficients at any surface nodes. They
+     will be placed in an auxiliary vector and then communicated like
+     all other volumetric variables. ---*/
+
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+      Aux_Frict_x[iPoint] = 0.0;
+      Aux_Frict_y[iPoint] = 0.0;
+      Aux_Frict_z[iPoint] = 0.0;
+      Aux_Heat[iPoint]    = 0.0;
+      Aux_yPlus[iPoint]   = 0.0;
+    }
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_Plotting(iMarker) == YES) {
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
+          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
+          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
+          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
+          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
+        }
+      }
+    }
+  }
+
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure.          ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+
+  jPoint = 0;
+
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+
+    /*--- Check for halos & write only if requested ---*/
+
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+
+      /*--- Restart the column index with each new point. ---*/
+
+      iVar = 0;
+
+      /*--- Load the grid node coordinate values. ---*/
+
+      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim); iVar++;
+      }
+
+      /*--- Load the conservative variable states for the mean flow variables. ---*/
+
+      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(0); iVar++;
+      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(1); iVar++;
+      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(2); iVar++;
+      if (nDim == 3) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(3); iVar++;
+      }
+      if (weakly_coupled_heat) {
+        Local_Data[jPoint][iVar] = solver[HEAT_SOL]->node[iPoint]->GetSolution(0);
+        iVar++;
+      } else if (energy) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(nDim+1);
+        iVar++;
+      }
+
+      /*--- If this is RANS, i.e., the second solver container is not empty,
+       then load data for the conservative turbulence variables. ---*/
+
+      if (SecondIndex != NONE) {
+        for (jVar = 0; jVar < nVar_Second; jVar++) {
+          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar); iVar++;
+        }
+      }
+
+      /*--- If limiters and/or residuals are requested. ---*/
+      if (!config->GetLow_MemoryOutput()) {
+
+        /*--- Limiters ---*/
+        if (config->GetWrt_Limiters()) {
+          /*--- Mean Flow Limiters ---*/
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+            iVar++;
+          }
+          /*--- RANS Limiters ---*/
+          if (SecondIndex != NONE) {
+            for (jVar = 0; jVar < nVar_Second; jVar++) {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+              iVar++;
+            }
+          }
+        }
+
+        /*--- Residuals ---*/
+        if (config->GetWrt_Residuals()) {
+          /*--- Mean Flow Residuals ---*/
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            iVar++;
+          }
+          /*--- RANS Residuals ---*/
+          if (SecondIndex != NONE) {
+            for (jVar = 0; jVar < nVar_Second; jVar++) {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
+              iVar++;
+            }
+          }
+        }
+      }
+
+      if (!config->GetLow_MemoryOutput()) {
+
+        /*--- Load buffers with the three grid velocity components. ---*/
+
+        if (grid_movement) {
+          Grid_Vel = geometry->node[iPoint]->GetGridVel();
+          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
+          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Grid_Vel[2];
+            iVar++;
+          }
+        }
+
+        /*--- Load data for Cp and Mach variables. ---*/
+
+        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
+
+        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+
+          /*--- Load data for the laminar viscosity. ---*/
+
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
+
+          /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
+
+          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
+          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
+            iVar++;
+          }
+          
+          if (energy || weakly_coupled_heat) {
+            Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
+          }
+
+        }
+
+        /*--- Load data for the Eddy viscosity for RANS. ---*/
+
+        if (Kind_Solver == RANS) {
+          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
+        }
+
+        /*--- Load data for the distance to the nearest sharp edge. ---*/
+
+        if (config->GetWrt_SharpEdges()) {
+          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
+        }
+
+        /*--- Load data for the intermittency of the BC trans. model. ---*/
+
+        if (transition) {
+          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
+        }
+
+        /*--- Load density if we are solving a variable density problem. ---*/
+        
+        if (variable_density) {
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDensity(); iVar++;
+        }
+        
+        /*--- Load Cp and conductivity if they are temperature-dependent. ---*/
+        if (wrt_cp) {
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCp(); iVar++;
+        }
+        
+        if (wrt_kt) {
+          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetThermalConductivity(); iVar++;
+        }
+        
+        /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+
+      }
+
+      /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+
+      jPoint++;
+
+    }
+  }
+
+  /*--- Free memory for auxiliary vectors. ---*/
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    delete [] Aux_Frict_x;
+    delete [] Aux_Frict_y;
+    delete [] Aux_Frict_z;
+    delete [] Aux_Heat;
+    delete [] Aux_yPlus;
+  }
+
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  unsigned short iDim;
+  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short nDim = geometry->GetnDim();
+  
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
+  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+  
+  su2double *Aux_Sens = NULL;
+  su2double *Grid_Vel = NULL;
+  su2double *Normal, Area;
+  
+  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool grid_movement  = (config->GetGrid_Movement());
+  bool Wrt_Halo       = config->GetWrt_Halo(), isPeriodic;
+  
+  int *Local_Halo;
+  
+  stringstream varname;
+  
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+  
+  switch (config->GetKind_Solver()) {
+    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; break;
+    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; break;
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE;  break;
+    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL;  break;
+  }
+  
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First + nVar_Second;
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- All output files first need the grid coordinates. ---*/
+  
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+  
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+  
+  nVar_Par += nVar_Consv_Par;
+  
+  /*--- For now, leave the names as "Conservative_", etc., in order
+   to avoid confusion with the serial version, which still prints these
+   names. Names can be set alternatively by using the commented code
+   below. ---*/
+
+  if (incompressible) {
+    Variable_Names.push_back("Adjoint_Pressure");
+    Variable_Names.push_back("Adjoint_Velocity_x");
+    Variable_Names.push_back("Adjoint_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Adjoint_Velocity_z");
+    Variable_Names.push_back("Adjoint_Temperature");
+  } else {
+    Variable_Names.push_back("Adjoint_Density");
+    Variable_Names.push_back("Adjoint_Momentum_x");
+    Variable_Names.push_back("Adjoint_Momentum_y");
+    if (geometry->GetnDim() == 3)
+      Variable_Names.push_back("Adjoint_Momentum_z");
+    Variable_Names.push_back("Adjoint_Energy");
+  }
+  if (SecondIndex != NONE) {
+    if (config->GetKind_Turb_Model() == SST) {
+      Variable_Names.push_back("Adjoint_TKE");
+      Variable_Names.push_back("Adjoint_Omega");
+    } else {
+      /*--- S-A variants ---*/
+      Variable_Names.push_back("Adjoint_Nu_Tilde");
+    }
+  }
+
+  /*--- For the discrete adjoint, we have the full field of sensitivity
+   in each coordinate direction. ---*/
+
+  if ((Kind_Solver == DISC_ADJ_EULER)         ||
+      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == DISC_ADJ_RANS)) {
+    nVar_Par += nDim;
+    Variable_Names.push_back("Sensitivity_x");
+    Variable_Names.push_back("Sensitivity_y");
+    if (geometry->GetnDim()== 3)
+      Variable_Names.push_back("Sensitivity_z");
+  }
+
+  /*--- If requested, register the limiter and residuals for all of the
+   equations in the current flow problem. ---*/
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the limiters ---*/
+    
+    if (config->GetWrt_Limiters()) {
+      nVar_Par += nVar_Consv_Par;
+      if (incompressible) {
+        Variable_Names.push_back("Limiter_Adjoint_Pressure");
+        Variable_Names.push_back("Limiter_Adjoint_Velocity_x");
+        Variable_Names.push_back("Limiter_Adjoint_Velocity_y");
+        if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Adjoint_Velocity_z");
+        Variable_Names.push_back("Limiter_Adjoint_Temperature");
+      } else {
+        Variable_Names.push_back("Limiter_Adjoint_Density");
+        Variable_Names.push_back("Limiter_Adjoint_Momentum_x");
+        Variable_Names.push_back("Limiter_Adjoint_Momentum_y");
+        if (geometry->GetnDim() == 3)
+          Variable_Names.push_back("Limiter_Adjoint_Momentum_z");
+        Variable_Names.push_back("Limiter_Adjoint_Energy");
+      }
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Limiter_Adjoint_TKE");
+          Variable_Names.push_back("Limiter_Adjoint_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Limiter_Adjoint_Nu_Tilde");
+        }
+      }
+    }
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) {
+      nVar_Par += nVar_Consv_Par;
+      if (incompressible) {
+        Variable_Names.push_back("Residual_Adjoint_Pressure");
+        Variable_Names.push_back("Residual_Adjoint_Velocity_x");
+        Variable_Names.push_back("Residual_Adjoint_Velocity_y");
+        if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Adjoint_Velocity_z");
+        Variable_Names.push_back("Residual_Adjoint_Temperature");
+      } else {
+        Variable_Names.push_back("Residual_Adjoint_Density");
+        Variable_Names.push_back("Residual_Adjoint_Momentum_x");
+        Variable_Names.push_back("Residual_Adjoint_Momentum_y");
+        if (geometry->GetnDim() == 3)
+          Variable_Names.push_back("Residual_Adjoint_Momentum_z");
+        Variable_Names.push_back("Residual_Adjoint_Energy");
+      }
+      if (SecondIndex != NONE) {
+        if (config->GetKind_Turb_Model() == SST) {
+          Variable_Names.push_back("Residual_Adjoint_TKE");
+          Variable_Names.push_back("Residual_Adjoint_Omega");
+        } else {
+          /*--- S-A variants ---*/
+          Variable_Names.push_back("Residual_Adjoint_Nu_Tilde");
+        }
+      }
+    }
+    
+    /*--- Add the grid velocity. ---*/
+    
+    if (grid_movement) {
+      if (geometry->GetnDim() == 2) nVar_Par += 2;
+      else if (geometry->GetnDim() == 3) nVar_Par += 3;
+      Variable_Names.push_back("Grid_Velocity_x");
+      Variable_Names.push_back("Grid_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+    }
+    
+    /*--- All adjoint solvers write the surface sensitivity. ---*/
+    
+    nVar_Par += 1; Variable_Names.push_back("Surface_Sensitivity");
+    
+    /*--- For the continouus adjoint, we write either convective scheme's
+     dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
+    
+    if (( Kind_Solver == ADJ_EULER              ) ||
+        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+        ( Kind_Solver == ADJ_RANS               )) {
+      nVar_Par += 1;
+      if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
+        Variable_Names.push_back("Dissipation_Sensor");
+      } else {
+        Variable_Names.push_back("Limiter_Adjoint_Density");
+      }
+    }
+    
+    /*--- New variables get registered here before the end of the loop. ---*/
+    
+  }
+  
+  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
+  
+  Aux_Sens = new su2double[geometry->GetnPoint()];
+  
+  /*--- First, loop through the mesh in order to find and store the
+   value of the viscous coefficients at any surface nodes. They
+   will be placed in an auxiliary vector and then communicated like
+   all other volumetric variables. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Aux_Sens[iPoint] = 0.0;
+  }
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        Area = 0.0;
+        for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
+        Area = sqrt (Area);
+        Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
+      }
+    }
+  
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+  
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure. This     ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  jPoint = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos & write only if requested ---*/
+    
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      /*--- Restart the column index with each new point. ---*/
+      
+      iVar = 0;
+      
+      /*--- Load the grid node coordinate values. ---*/
+      
+      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
+        if (config->GetSystemMeasurements() == US)
+        	Local_Data[jPoint][iVar] *= 12.0;
+        iVar++;
+      }
+      
+      /*--- Load the conservative variable states for the mean flow variables.
+       If requested, load the limiters and residuals as well. ---*/
+      
+      for (jVar = 0; jVar < nVar_First; jVar++) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
+        iVar++;
+      }
+      
+      
+      /*--- If this is Adj. RANS, i.e., the second solver container is not empty,
+       then load data for the conservative turbulence variables and the
+       limiters / residuals (if requested). ----*/
+      
+      if (SecondIndex != NONE) {
+        for (jVar = 0; jVar < nVar_Second; jVar++) {
+          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
+          iVar++;
+        }
+      }
+
+      /*--- Load data for the discrete sensitivities. ---*/
+
+      if ((Kind_Solver == DISC_ADJ_EULER)         ||
+          (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+          (Kind_Solver == DISC_ADJ_RANS)) {
+        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0); iVar++;
+        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1); iVar++;
+        if (geometry->GetnDim()== 3) {
+          Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
+          iVar++;
+        }
+      }
+      
+      if (!config->GetLow_MemoryOutput()) {
+
+          if (config->GetWrt_Limiters()) {
+            for (jVar = 0; jVar < nVar_First; jVar++) {
+              Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter(jVar);
+              iVar++;
+            }
+            if (SecondIndex != NONE) {
+              for (jVar = 0; jVar < nVar_Second; jVar++) {
+                Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter(jVar);
+                iVar++;
+              }
+            }
+          }
+
+          if (config->GetWrt_Residuals()) {
+            for (jVar = 0; jVar < nVar_First; jVar++) {
+              if (!config->GetDiscrete_Adjoint()) {
+                Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+              } else {
+                Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar) -
+                solver[FirstIndex]->node[iPoint]->GetSolution_Old(jVar);
+              }
+              iVar++;
+            }
+            if (SecondIndex != NONE) {
+              for (jVar = 0; jVar < nVar_Second; jVar++) {
+                if (!config->GetDiscrete_Adjoint()) {
+                  Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
+                } else {
+                  Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar) -
+                                             solver[SecondIndex]->node[iPoint]->GetSolution_Old(jVar);
+                }
+                iVar++;
+              }
+            }
+          }
+        
+        /*--- Load buffers with the three grid velocity components. ---*/
+        
+        if (grid_movement) {
+          Grid_Vel = geometry->node[iPoint]->GetGridVel();
+          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
+          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Grid_Vel[2];
+            iVar++;
+          }
+        }
+        
+        /*--- Load data for the surface sensitivity. ---*/
+        
+        Local_Data[iPoint][iVar] = Aux_Sens[iPoint]; iVar++;
+        
+        /*--- Load data for the convective scheme sensor. ---*/
+        
+        if (( Kind_Solver == ADJ_EULER              ) ||
+            ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+            ( Kind_Solver == ADJ_RANS               )) {
+          if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
+            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint); iVar++;
+          } else {
+            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0); iVar++;
+          }
+        }
+        
+        /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+        
+      }
+
+      /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+
+      jPoint++;
+    }
+  }
+  
+  /*--- Free memory for auxiliary vectors. ---*/
+  
+  delete [] Aux_Sens;
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  unsigned short iDim;
+  
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
+  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
+  
+  su2double *Node_Vel = NULL, *Node_Accel = NULL, *Stress = NULL;
+
+  bool Wrt_Halo   = config->GetWrt_Halo(), isPeriodic;
+  int *Local_Halo = NULL;
+  
+  stringstream varname;
+  
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+  
+  switch (config->GetKind_Solver()) {
+    case FEM_ELASTICITY: FirstIndex = FEA_SOL; break;
+    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; break;
+  }
+  
+  nVar_First = solver[FirstIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First;
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- All output files first need the grid coordinates. ---*/
+  
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+  
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+  
+  nVar_Par += nVar_Consv_Par;
+  
+  /*--- For now, leave the names as "Conservative_", etc., in order
+   to avoid confusion with the serial version, which still prints these
+   names. Names can be set alternatively by using the commented code
+   below. ---*/
+  
+  Variable_Names.push_back("Displacement_x");
+  Variable_Names.push_back("Displacement_y");
+  if (geometry->GetnDim() == 3)
+    Variable_Names.push_back("Displacement_z");
+
+  /*--- If requested, register the limiter and residuals for all of the
+   equations in the current flow problem. ---*/
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) {
+      nVar_Par += nVar_Consv_Par;
+      Variable_Names.push_back("Residual_Displacement_x");
+      Variable_Names.push_back("Residual_Displacement_y");
+      if (geometry->GetnDim() == 3)
+        Variable_Names.push_back("Residual_Displacement_z");
+    }
+    
+    /*--- If the analysis is dynamic... ---*/
+    if (config->GetDynamic_Analysis() == DYNAMIC) {
+      
+      /*--- Velocities ---*/
+      nVar_Par += 2;
+      Variable_Names.push_back("Velocity_x");
+      Variable_Names.push_back("Velocity_y");
+      if (geometry->GetnDim() == 3) {
+        nVar_Par += 1;
+        Variable_Names.push_back("Velocity_z");
+      }
+      
+      /*--- Accelerations ---*/
+      nVar_Par += 2;
+      Variable_Names.push_back("Acceleration_x");
+      Variable_Names.push_back("Acceleration_y");
+      if (geometry->GetnDim() == 3) {
+        nVar_Par += 1;
+        Variable_Names.push_back("Acceleration_z");
+      }
+    }
+    
+    if (!(config->GetDiscrete_Adjoint())) {
+
+      /*--- Add the stresses. ---*/
+    
+      nVar_Par += 3;
+      Variable_Names.push_back("Sxx");
+      Variable_Names.push_back("Syy");
+      Variable_Names.push_back("Sxy");
+      if (geometry->GetnDim() == 3) {
+        nVar_Par += 3;
+        Variable_Names.push_back("Szz");
+        Variable_Names.push_back("Sxz");
+        Variable_Names.push_back("Syz");
+      }
+
+      /*--- Add the Von Mises Stress. ---*/
+    
+      nVar_Par += 1;
+      Variable_Names.push_back("Von_Mises_Stress");
+    
+    }
+    
+    /*--- New variables get registered here before the end of the loop. ---*/
+    
+  }
+  
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+  
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure. This     ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  jPoint = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos & write only if requested ---*/
+    
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      /*--- Restart the column index with each new point. ---*/
+      
+      iVar = 0;
+      
+      /*--- Load the grid node coordinate values. ---*/
+      
+      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
+        if (config->GetSystemMeasurements() == US)
+        	Local_Data[jPoint][iVar] *= 12.0;
+        iVar++;
+      }
+      
+      /*--- Load the conservative variable states for the mean flow variables.
+       If requested, load the limiters and residuals as well. ---*/
+      
+      for (jVar = 0; jVar < nVar_First; jVar++) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
+        iVar++;
+      }
+      
+      if (!config->GetLow_MemoryOutput()) {
+        if (config->GetWrt_Residuals()) {
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            iVar++;
+          }
+        }
+      }
+      
+      if (!config->GetLow_MemoryOutput()) {
+        
+        /*--- Load the velocities and accelerations (dynamic calculations). ---*/
+        
+        if (config->GetDynamic_Analysis() == DYNAMIC) {
+          
+          /*--- Velocities ---*/
+          
+          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
+          Local_Data[jPoint][iVar] = Node_Vel[0]; iVar++;
+          Local_Data[jPoint][iVar] = Node_Vel[1]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Node_Vel[2];
+            iVar++;
+          }
+          
+          /*--- Accelerations ---*/
+          
+          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
+          Local_Data[jPoint][iVar] = Node_Accel[0]; iVar++;
+          Local_Data[jPoint][iVar] = Node_Accel[1]; iVar++;
+          if (geometry->GetnDim() == 3) {
+            Local_Data[jPoint][iVar] = Node_Accel[2];
+            iVar++;
+          }
+        }
+        
+        if (!(config->GetDiscrete_Adjoint())) {
+
+          /*--- Add the stresses. ---*/
+        
+          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+        
+          /*--- Sigma xx ---*/
+          Local_Data[jPoint][iVar] = Stress[0]; iVar++;
+          /*--- Sigma yy ---*/
+          Local_Data[jPoint][iVar] = Stress[1]; iVar++;
+          /*--- Sigma xy ---*/
+          Local_Data[jPoint][iVar] = Stress[2]; iVar++;
+        
+          if (geometry->GetnDim() == 3) {
+            /*--- Sigma zz ---*/
+            Local_Data[jPoint][iVar] = Stress[3]; iVar++;
+            /*--- Sigma xz ---*/
+            Local_Data[jPoint][iVar] = Stress[4]; iVar++;
+            /*--- Sigma yz ---*/
+            Local_Data[jPoint][iVar] = Stress[5]; iVar++;
+          }
+        
+          /*--- Add the Von Mises Stress. ---*/
+        
+          Local_Data[iPoint][iVar] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress(); iVar++;
+        
+        
+          /*--- New variables can be loaded to the Local_Data structure here,
+           assuming they were registered above correctly. ---*/
+
+        }
+
+      }
+
+      /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+        
+      jPoint++;
+    }
+  }
+  
+  /*--- Free memory for auxiliary vectors. ---*/
+  
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  
+  unsigned short iDim;
+  
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
+  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
+  
+  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
+  
+  int *Local_Halo;
+  
+  stringstream varname;
+  
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+  
+  switch (config->GetKind_Solver()) {
+    case HEAT_EQUATION_FVM: FirstIndex = HEAT_SOL;     break;
+  }
+  
+  nVar_First = solver[FirstIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First;
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- All output files first need the grid coordinates. ---*/
+  
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+  
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+  
+  nVar_Par += nVar_Consv_Par;
+  for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
+    varname << "Conservative_" << iVar+1;
+    Variable_Names.push_back(varname.str());
+    varname.str("");
+  }
+  
+  /*--- If requested, register the residuals for all of the
+   equations in the current problem. ---*/
+  
+  if (!config->GetLow_MemoryOutput()) {
+    
+    /*--- Add the residuals ---*/
+    
+    if (config->GetWrt_Residuals()) {
+      nVar_Par += nVar_Consv_Par;
+      for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
+        varname << "Residual_" << iVar+1;
+        Variable_Names.push_back(varname.str());
+        varname.str("");
+      }
+    }
+    
+    /*--- New variables get registered here before the end of the loop. ---*/
+    
+  }
+  
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+  
+  Local_Data = new su2double*[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  if (!Wrt_Halo) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+        
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure. This     ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  jPoint = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- Check for halos & write only if requested ---*/
+    
+    if (!Local_Halo[iPoint] || Wrt_Halo) {
+      
+      /*--- Restart the column index with each new point. ---*/
+      
+      iVar = 0;
+      
+      /*--- Load the grid node coordinate values. ---*/
+      
+      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
+        if (config->GetSystemMeasurements() == US)
+        	Local_Data[jPoint][iVar] *= 12.0;
+        iVar++;
+      }
+      
+      /*--- Load the conservative variable states for the mean flow variables.
+       If requested, load the limiters and residuals as well. ---*/
+      
+      for (jVar = 0; jVar < nVar_First; jVar++) {
+        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
+        iVar++;
+      }
+      
+      if (!config->GetLow_MemoryOutput()) {
+        if (config->GetWrt_Residuals()) {
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            iVar++;
+          }
+        }
+      }
+      
+      /*--- New variables can be loaded to the Local_Data structure here,
+       assuming they were registered above correctly. ---*/
+      
+      /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+      
+      jPoint++;
+      
+    }
+  }
+  
+  /*--- Free memory for auxiliary vectors. ---*/
+  
+  delete [] Local_Halo;
+  
+}
+
+void COutputLegacy::SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+
+  /*--- Flags identifying the types of files to be written. ---*/
+  
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+  
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+  
+  if (Wrt_Vol) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting volumetric grid connectivity." << endl;
+    
+    SortVolumetricConnectivity(config, geometry, TRIANGLE     );
+    SortVolumetricConnectivity(config, geometry, QUADRILATERAL);
+    SortVolumetricConnectivity(config, geometry, TETRAHEDRON  );
+    SortVolumetricConnectivity(config, geometry, HEXAHEDRON   );
+    SortVolumetricConnectivity(config, geometry, PRISM        );
+    SortVolumetricConnectivity(config, geometry, PYRAMID      );
+    
+  }
+  
+  /*--- Sort surface grid connectivity. ---*/
+  
+  if (Wrt_Srf) {
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting surface grid connectivity." << endl;
+    
+    SortSurfaceConnectivity(config, geometry, LINE         );
+    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
+    
+  }
+  
+  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  
+  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+  nSurf_Elem_Par   = nTotal_Surf_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+}
+
+void COutputLegacy::SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT = 0;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
+  
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++ ) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+        
+        /*--- Get the index of the current point. ---*/
+        
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
+        
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+        
+        /*--- Search for the processor that owns this point ---*/
+        
+        iProcessor = Global_Index/npoint_procs[0];
+        if (iProcessor >= (unsigned long)size)
+          iProcessor = (unsigned long)size-1;
+        if (Global_Index >= nPoint_Linear[iProcessor])
+          while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+        else
+          while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        
+        /*--- If we have not visited this element yet, increment our
+         number of elements that must be sent to a particular proc. ---*/
+        
+        if ((nElem_Flag[iProcessor] != ii)) {
+          nElem_Flag[iProcessor] = ii;
+          nElem_Send[iProcessor+1]++;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
+  
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+        
+        /*--- Get the index of the current point. ---*/
+        
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
+        
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+        
+        /*--- Search for the processor that owns this point ---*/
+        
+        iProcessor = Global_Index/npoint_procs[0];
+        if (iProcessor >= (unsigned long)size)
+          iProcessor = (unsigned long)size-1;
+        if (Global_Index >= nPoint_Linear[iProcessor])
+          while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+        else
+          while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        
+        /*--- Load connectivity into the buffer for sending ---*/
+        
+        if (nElem_Flag[iProcessor] != ii) {
+          
+          nElem_Flag[iProcessor] = ii;
+          unsigned long nn = index[iProcessor];
+          unsigned long mm = haloIndex[iProcessor];
+          
+          /*--- Load the connectivity values. ---*/
+          
+          for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+            iPoint = geometry->elem[ii]->GetNode(kk);
+            connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+            
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. ---*/
+            
+            if (Local_Halo[iPoint]) haloSend[mm] = true;
+            
+          }
+          
+          /*--- Increment the index by the message length ---*/
+          
+          index[iProcessor]    += NODES_PER_ELEMENT;
+          haloIndex[iProcessor]++;
+          
+        }
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] haloIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
+  
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
+    }
+  }
+  
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nParallel_Tria = nElem_Total;
+      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nElem_Total;
+      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
+      break;
+    case TETRAHEDRON:
+      nParallel_Tetr = nElem_Total;
+      if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
+      break;
+    case HEXAHEDRON:
+      nParallel_Hexa = nElem_Total;
+      if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
+      break;
+    case PRISM:
+      nParallel_Pris = nElem_Total;
+      if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
+      break;
+    case PYRAMID:
+      nParallel_Pyra = nElem_Total;
+      if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic; 
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+
+}
+
+void COutputLegacy::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
+  
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      NODES_PER_ELEMENT = 0;
+      break;
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- If we have not visited this element yet, increment our
+             number of elements that must be sent to a particular proc. ---*/
+            
+            if ((nElem_Flag[iProcessor] != ii)) {
+              nElem_Flag[iProcessor] = ii;
+              nElem_Send[iProcessor+1]++;
+            }
+            
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
+  
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- Load connectivity into the buffer for sending ---*/
+            
+            if (nElem_Flag[iProcessor] != ii) {
+              
+              nElem_Flag[iProcessor] = ii;
+              unsigned long nn = index[iProcessor];
+              unsigned long mm = haloIndex[iProcessor];
+              
+              /*--- Load the connectivity values. ---*/
+              
+              for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+                iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+                connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+                
+                /*--- Check if this is a halo node. If so, flag this element
+                 as a halo cell. We will use this later to sort and remove
+                 any duplicates from the connectivity list. ---*/
+                
+                if (Local_Halo[iPoint]) haloSend[mm] = true;
+                
+              }
+              
+              /*--- Increment the index by the message length ---*/
+              
+              index[iProcessor]    += NODES_PER_ELEMENT;
+              haloIndex[iProcessor]++;
+              
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] haloIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
+  
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
+    }
+  }
+
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  switch (Elem_Type) {
+    case LINE:
+      nParallel_Line = nElem_Total;
+      if (nParallel_Line > 0) Conn_BoundLine_Par = Conn_Elem;
+      break;
+    case TRIANGLE:
+      nParallel_BoundTria = nElem_Total;
+      if (nParallel_BoundTria > 0) Conn_BoundTria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_BoundQuad = nElem_Total;
+      if (nParallel_BoundQuad > 0) Conn_BoundQuad_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+  
+}
+
+void COutputLegacy::SortOutputData(CConfig *config, CGeometry *geometry) {
+  
+  unsigned short iMarker;
+  unsigned long iProcessor;
+  unsigned long iPoint, Global_Index, nLocalPoint, nTotalPoint, iVertex;
+  
+  int VARS_PER_POINT = nVar_Par;
+  int *Local_Halo = NULL;
+
+  bool isPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
+      }
+    }
+  }
+  
+  /*--- Sum total number of nodes that belong to the domain ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+    nPoint_Flag[ii]= -1;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
+    
+    /*--- We only write interior points and recovered periodic points. ---*/
+    
+    if (!Local_Halo[iPoint]) {
+      
+      /*--- Get the global index of the current point. ---*/
+      
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this node yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        nPoint_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+  
+  /*--- Prepare to send coordinates. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
+    
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  su2double *connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- We only write interior points and recovered periodic points. ---*/
+    
+    if (!Local_Halo[iPoint]) {
+      
+      /*--- Get the index of the current point. ---*/
+      
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Search for the processor that owns this point. ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+      
+      /*--- Load node coordinates into the buffer for sending. ---*/
+      
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        unsigned long nn = index[iProcessor];
+        
+        /*--- Load the data values. ---*/
+        
+        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+          connSend[nn] = Local_Data[iPoint][kk]; nn++;
+        }
+        
+        /*--- Load the global ID (minus offset) for sorting the
+         points once they all reach the correct processor. ---*/
+        
+        nn = idIndex[iProcessor];
+        idSend[nn] = Global_Index - starting_node[iProcessor];
+        
+        /*--- Increment the index by the message length ---*/
+        
+        index[iProcessor]  += VARS_PER_POINT;
+        idIndex[iProcessor]++;
+        
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] idIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  su2double *connRecv = NULL;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the global IDs. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. First, allocate the
+   appropriate amount of memory for this section. ---*/
+  
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
+      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+    }
+  }
+  
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
+  
+  nParallel_Poin = nPoint_Recv[size];
+  
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] nPoint_Recv;
+  delete [] nPoint_Send;
+  delete [] nPoint_Flag;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    delete [] Local_Data[iPoint];
+  delete [] Local_Data;
+  
+  delete [] Local_Halo;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+  
+}
+
+void COutputLegacy::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
+  
+  unsigned short iMarker;
+  unsigned long iProcessor;
+  unsigned long iPoint, jPoint, kPoint, iElem;
+  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
+  
+  int VARS_PER_POINT = nVar_Par;
+  int *Local_Halo = NULL;
+  int iNode, count;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
+  /*---         linear partitions across all procs and the output data     ---*/
+  /*---         for the entire field is similarly linearly partitioned.    ---*/
+  /*---         We need to identify which nodes in the volume data are     ---*/
+  /*---         also surface points. Our first step is to loop over all    ---*/
+  /*---         of the sorted surface connectivity and create a data       ---*/
+  /*---         structure on each proc that can identify the local surf    ---*/
+  /*---         points. Note that the linear partitioning is slightly      ---*/
+  /*---         different between the nodes and elements, so we will       ---*/
+  /*---         have to move between the two systems in this routine.      ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. This is the linear partitioning for nodes. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
+      }
+    }
+  }
+  
+  /*--- Sum total number of nodes that belong to the domain ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  
+  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
+  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Nodes[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Nodes[size] = nTotalPoint;
+  
+  /*--- Prepare to check and communicate the nodes that each proc has
+   locally from the surface connectivity. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  /*--- Loop through our local line elements and check where each
+   of the grid nodes resides based on global index. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Reset out flags and then loop through our local triangle surface
+   elements performing the same check for where each grid node resides. ---*/
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Reset out flags and then loop through our local quad surface
+   elements performing the same check for where each grid node resides. ---*/
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many nodes it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Now loop back through the local connectivities for the surface
+   elements and load up the global IDs for sending to their home proc. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  /*--- Allocate the memory that we need for receiving the global IDs
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *idRecv = NULL;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the global IDs. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = nElem_Recv[rank];
+  int ll = nElem_Send[rank];
+  int kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Each proc now knows which is its local grid nodes from     ---*/
+  /*---         the entire volume solution are part of the surface. We     ---*/
+  /*---         now apply a mask to extract just those points on the       ---*/
+  /*---         surface. We also need to perform a renumbering so that     ---*/
+  /*---         the surface data (nodes and connectivity) have their       ---*/
+  /*---         own global numbering. This is important for writing        ---*/
+  /*---         output files in a later routine.                           ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Create a local data structure that acts as a mask to extract the
+   set of points within the local set that are on the surface. ---*/
+  
+  int *surfPoint = new int[nParallel_Poin];
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) surfPoint[iPoint] = -1;
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
+  }
+  
+  /*--- First, add up the number of surface points I have on my rank. ---*/
+  
+  nSurf_Poin_Par = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      nSurf_Poin_Par++;
+    }
+  }
+  
+  /*--- Communicate this number of local surface points to all other
+   processors so that it can be used to create offsets for the new
+   global numbering for the surface points. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  
+  for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nSurf_Poin_Par;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+  
+  /*--- Go to cumulative storage format to compute the offsets. ---*/
+  
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+  
+  /*--- Now that we know the number of local surface points that we have,
+   we can allocate the new data structure to hold these points alone. Here,
+   we also copy the data for those points from our volume data structure. ---*/
+  
+  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
+    count = 0;
+    for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
+      if (surfPoint[ii] !=-1) {
+        Parallel_Surf_Data[jj][count] = Parallel_Data[jj][ii];
+        count++;
+      }
+    }
+  }
+  
+  /*--- Reduce the total number of surf points we have. This will be
+   needed for writing the surface solution files later. ---*/
+  
+#ifndef HAVE_MPI
+  nGlobal_Surf_Poin = nSurf_Poin_Par;
+#else
+  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Now that we know every proc's global offset for the number of
+   surface points, we can create the new global numbering. Here, we
+   create a new mapping using two arrays, which will need to be
+   communicated. We use our mask again here.  ---*/
+  
+  unsigned long *globalP = new unsigned long[nSurf_Poin_Par];
+  unsigned long *renumbP = new unsigned long[nSurf_Poin_Par];
+  
+  count = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      globalP[count] = surfPoint[iPoint];
+      renumbP[count] = count + nPoint_Recv[rank];
+      count++;
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 3: Communicate the arrays with the new global surface point   ---*/
+  /*---         numbering to the procs that hold the connectivity for      ---*/
+  /*---         each element. This will be done in two phases. First,      ---*/
+  /*---         we send the arrays around to the other procs based on      ---*/
+  /*---         the linear partitioning for the elems. This gets us        ---*/
+  /*---         most of the way there, however, due to the type of         ---*/
+  /*---         linear partitioning for the elements, there may exist      ---*/
+  /*---         elements that have nodes outside of the linear part.       ---*/
+  /*---         bounds. This is because the elems are distributed based    ---*/
+  /*---         on the node with the smallest global ID.                   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- First, we perform the linear partitioning again as it is done
+   for elements, which is slightly different than for nodes (above). ---*/
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Elems[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Elems[size] = nTotalPoint;
+  
+  /*--- Reset our flags and counters ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  /*--- Loop through my local surface nodes, find which proc the global
+   value lives on, then communicate the global ID and remumbered value. ---*/
+  
+  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
+    }
+    
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the globals that we are
+   sending. ---*/
+  
+  unsigned long *globalSend = NULL;
+  globalSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    globalSend[ii] = 0;
+  
+  /*--- Allocate memory to hold the renumbering that we are
+   sending. ---*/
+  
+  unsigned long *renumbSend = NULL;
+  renumbSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    renumbSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
+  
+  /*--- Loop back through and load up the buffers for the global IDs
+   and their new renumbering values. ---*/
+  
+  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    
+    if (nElem_Flag[iProcessor] != ii) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = index[iProcessor];
+      
+      globalSend[nn] = Global_Index;
+      renumbSend[nn] = renumbP[ii];
+      
+      /*--- Increment the index by the message length ---*/
+      
+      index[iProcessor]++;
+      
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *globalRecv = NULL;
+  globalRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    globalRecv[ii] = 0;
+  
+  unsigned long *renumbRecv = NULL;
+  renumbRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    renumbRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(globalRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(globalSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking recv's for the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(renumbRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(renumbSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+  
+#endif
+  
+  /*--- Load our own procs data into the buffers directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) globalRecv[mm] = globalSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) renumbRecv[mm] = renumbSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*-- Now update my local connectivitiy for the surface with the new
+   numbering. Create a new mapping for global -> renumber for nodes. Note
+   the adding of 1 back in here for the eventual viz. purposes. ---*/
+  
+  map<unsigned long,unsigned long> Global2Renumber;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
+  }
+  
+  
+  /*--- The final step is one last pass over all elements to check
+   for points outside of the linear partitions of the elements. Again,
+   note that elems were distributed based on their smallest global ID,
+   so some nodes of the elem may have global IDs lying outside of the
+   linear partitioning. We need to recover the mapping for these
+   outliers. We loop over all local surface elements to find these. ---*/
+  
+  vector<unsigned long>::iterator it;
+  vector<unsigned long> outliers;
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  /*--- Create a unique list of global IDs that fall outside of our procs
+   linear partition. ---*/
+  
+  sort(outliers.begin(), outliers.end());
+  it = unique(outliers.begin(), outliers.end());
+  outliers.resize(it - outliers.begin());
+  
+  /*--- Now loop over the outliers and communicate to those procs that
+   hold the new numbering for our outlier points. We need to ask for the
+   new numbering from these procs. ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
+    }
+    
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  delete [] idSend;
+  idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Reset our index variable for reuse. ---*/
+  
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop over the outliers again and load up the global IDs. ---*/
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = idIndex[iProcessor];
+      
+      /*--- Load the global ID values. ---*/
+      
+      idSend[nn] = Global_Index; nn++;
+      
+      /*--- Increment the index by the message length ---*/
+      
+      idIndex[iProcessor]++;
+      
+    }
+  }
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  delete [] idRecv;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- The procs holding the outlier grid nodes now have the global IDs
+   that they need to have their renumbering shared. ---*/
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
+      if (idRecv[ii] == globalP[iPoint]) {
+        idRecv[ii] = renumbP[iPoint];
+      }
+    }
+  }
+  
+  /*--- Now simply reverse the last communication to give the renumbered IDs
+   back to the owner of the outlier points. Note everything is flipped. ---*/
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nRecvs];
+  recv_req = new SU2_MPI::Request[nSends];
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Send[rank];
+  ll = nElem_Recv[rank];
+  kk = nElem_Recv[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idSend[mm] = idRecv[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Add the renumbering for the outliers to the map from before carrying
+   the global -> renumber transformation. Note that by construction, 
+   nElem_Send[ii] == outliers.size(). We also add in the 1 for viz. here. ---*/
+  
+  for (int ii = 0; ii < nElem_Send[size]; ii++) {
+    Global2Renumber[outliers[ii]] = idSend[ii] + 1;
+  }
+  
+  /*--- We can now overwrite the local connectivity for our surface elems
+   using our completed map with the new global renumbering. Whew!! Note
+   the -1 when accessing the conn from the map. ---*/
+  
+  for (iElem = 0; iElem < nParallel_Line; iElem++) {
+    iNode = (int)iElem*N_POINTS_LINE;
+    Conn_BoundLine_Par[iNode+0] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+0]-1];
+    Conn_BoundLine_Par[iNode+1] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+1]-1];
+  }
+  
+  for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
+    iNode = (int)iElem*N_POINTS_TRIANGLE;
+    Conn_BoundTria_Par[iNode+0] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+0]-1];
+    Conn_BoundTria_Par[iNode+1] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+1]-1];
+    Conn_BoundTria_Par[iNode+2] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+2]-1];
+  }
+  
+  for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
+    iNode = (int)iElem*N_POINTS_QUADRILATERAL;
+    Conn_BoundQuad_Par[iNode+0] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+0]-1];
+    Conn_BoundQuad_Par[iNode+1] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+1]-1];
+    Conn_BoundQuad_Par[iNode+2] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+2]-1];
+    Conn_BoundQuad_Par[iNode+3] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+3]-1];
+  }
+  
+  /*--- Free temporary memory ---*/
+  
+  delete [] idIndex;
+  delete [] surfPoint;
+  delete [] globalP;
+  delete [] renumbP;
+  
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] globalSend;
+  delete [] globalRecv;
+  delete [] renumbSend;
+  delete [] renumbRecv;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Local_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear_Elems;
+  delete [] nPoint_Linear_Nodes;
+  delete [] nPoint_Send;
+  delete [] nPoint_Recv;
+  
+}
+
+void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+  
+  /*--- Local variables ---*/
+  
+  unsigned short nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
+  unsigned short iVar;
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
+  bool adjoint   = (config->GetContinuous_Adjoint() ||
+                    config->GetDiscrete_Adjoint());
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  ofstream restart_file;
+  string filename;
+  
+  int iProcessor;
+
+  /*--- Retrieve filename from config ---*/
+  
+  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else if (disc_adj_fem){
+    filename = config->GetRestart_AdjFEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
+  }
+  
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
+  
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (nInst > 1)
+    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
+  
+  /*--- Only the master node writes the header. ---*/
+  
+  if (rank == MASTER_NODE) {
+    restart_file.open(filename.c_str(), ios::out);
+    restart_file.precision(15);
+    restart_file << "\"PointID\"";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++)
+      restart_file << "\t\"" << Variable_Names[iVar] << "\"";
+    restart_file << "\t\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
+    restart_file.close();
+  }
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  
+  /*--- All processors open the file. ---*/
+  
+  restart_file.open(filename.c_str(), ios::out | ios::app);
+  restart_file.precision(15);
+  
+  /*--- Write the restart file in parallel, processor by processor. ---*/
+  
+  unsigned long myPoint = 0, offset = 0, Global_Index;
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+        
+        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+        
+        Global_Index = iPoint + offset;
+        
+        /*--- Only write original domain points, i.e., exclude any periodic
+         or halo nodes, even if they are output in the viz. files. ---*/
+        
+        if (Global_Index < nPoint_Restart) {
+          
+          /*--- Write global index. (note outer loop over procs) ---*/
+          
+          restart_file << Global_Index << "\t";
+          myPoint++;
+          
+          /*--- Loop over the variables and write the values to file ---*/
+          
+          for (iVar = 0; iVar < nVar_Par; iVar++) {
+            restart_file << scientific << Parallel_Data[iVar][iPoint] << "\t";
+          }
+          restart_file << "\n";
+        }
+      }
+    }
+    /*--- Flush the file and wait for all processors to arrive. ---*/
+    restart_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+    
+  }
+
+  /*--- Write the metadata (master rank alone) ----*/
+
+  if (rank == MASTER_NODE) {
+    if (dual_time)
+      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+    else
+      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+    if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+  }
+
+  /*--- All processors close the file. ---*/
+
+  restart_file.close();
+  
+}
+
+void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+
+  /*--- Local variables ---*/
+
+  unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool adjoint   = (config->GetContinuous_Adjoint() ||
+                    config->GetDiscrete_Adjoint());
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool wrt_perf  = config->GetWrt_Performance();
+  ofstream restart_file;
+  string filename;
+  char str_buf[CGNS_STRING_SIZE], fname[100];
+  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
+
+  /*--- Retrieve filename from config ---*/
+
+  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
+  }
+
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
+
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (nInst > 1)
+    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
+
+  strcpy(fname, filename.c_str());
+
+  /*--- Prepare the first ints containing the counts. The first is a
+   magic number that we can use to check for binary files (it is the hex
+   representation for "SU2"). The second two values are number of variables
+   and number of points (DoFs). The last two values are for metadata: 
+   one int for ExtIter and 8 su2doubles. ---*/
+
+  int var_buf_size = 5;
+  int var_buf[5] = {535532, nVar_Par, (int)nGlobalPoint_Sort, 1, 8};
+
+  /*--- Prepare the 1D data buffer on this rank. ---*/
+
+  passivedouble *buf = new passivedouble[nParallel_Poin*nVar_Par];
+
+  /*--- For now, create a temp 1D buffer to load up the data for writing.
+   This will be replaced with a derived data type most likely. ---*/
+
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
+    for (iVar = 0; iVar < nVar_Par; iVar++)
+      buf[iPoint*nVar_Par+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
+
+  /*--- Prepare metadata. ---*/
+
+  int Restart_ExtIter;
+  if (dual_time)
+    Restart_ExtIter= (int)config->GetExtIter() + 1;
+  else
+    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
+
+  passivedouble Restart_Metadata[8] = {
+    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
+    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
+    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
+    SU2_TYPE::GetValue(config->GetdCD_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
+    0.0
+  };
+
+  if (adjoint) Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
+
+  /*--- Set a timer for the binary file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
+#ifndef HAVE_MPI
+
+  FILE* fhw;
+  fhw = fopen(fname, "wb");
+
+  /*--- Error check for opening the file. ---*/
+
+  if (!fhw) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  }
+
+  /*--- First, write the number of variables and points. ---*/
+
+  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
+  file_size += (su2double)var_buf_size*sizeof(int);
+  
+  /*--- Write the variable names to the file. Note that we are adopting a
+   fixed length of 33 for the string length to match with CGNS. This is 
+   needed for when we read the strings later. ---*/
+
+  for (iVar = 0; iVar < nVar_Par; iVar++) {
+    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
+    fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
+    file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
+  }
+
+  /*--- Call to write the entire restart file data in binary in one shot. ---*/
+
+  fwrite(buf, nVar_Par*nParallel_Poin, sizeof(passivedouble), fhw);
+  file_size += (su2double)nVar_Par*nParallel_Poin*sizeof(passivedouble);
+
+  /*--- Write the external iteration. ---*/
+
+  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
+  file_size += (su2double)sizeof(int);
+
+  /*--- Write the metadata. ---*/
+
+  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
+  file_size += (su2double)8*sizeof(passivedouble);
+
+  /*--- Close the file. ---*/
+
+  fclose(fhw);
+
+#else
+
+  /*--- Parallel binary output using MPI I/O. ---*/
+
+  MPI_File fhw;
+  SU2_MPI::Status status;
+  MPI_Datatype etype, filetype;
+  MPI_Offset disp;
+  int ierr;
+
+  /*--- We're writing only su2doubles in the data portion of the file. ---*/
+
+  etype = MPI_DOUBLE;
+
+  /*--- Define a derived datatype for this ranks contiguous chunk of data
+   that will be placed in the restart (1D array size = num points * num vars). ---*/
+
+  MPI_Type_contiguous(nVar_Par*nParallel_Poin, MPI_DOUBLE, &filetype);
+  MPI_Type_commit(&filetype);
+
+  /*--- All ranks open the file using MPI. Here, we try to open the file with
+   exclusive so that an error is generated if the file exists. We always want
+   to write a fresh restart file, so we delete any existing files and create
+   a new one. ---*/
+
+  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                       MPI_INFO_NULL, &fhw);
+  if (ierr != MPI_SUCCESS)  {
+    MPI_File_close(&fhw);
+    if (rank == 0)
+      MPI_File_delete(fname, MPI_INFO_NULL);
+    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                         MPI_INFO_NULL, &fhw);
+  }
+
+  /*--- Error check opening the file. ---*/
+
+  if (ierr) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  }
+
+  /*--- First, write the number of variables and points (i.e., cols and rows),
+   which we will need in order to read the file later. Also, write the 
+   variable string names here. Only the master rank writes the header. ---*/
+
+  if (rank == MASTER_NODE) {
+    MPI_File_write(fhw, var_buf, var_buf_size, MPI_INT, MPI_STATUS_IGNORE);
+    file_size += (su2double)var_buf_size*sizeof(int);
+
+    /*--- Write the variable names to the file. Note that we are adopting a
+     fixed length of 33 for the string length to match with CGNS. This is
+     needed for when we read the strings later. ---*/
+
+    for (iVar = 0; iVar < nVar_Par; iVar++) {
+      disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
+      strcpy(str_buf, Variable_Names[iVar].c_str());
+      MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
+      file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
+    }
+  }
+
+  /*--- Compute the offset for this rank's linear partition of the data in bytes.
+   After the calculations above, we have the partition sizes store in nPoint_Linear
+   in cumulative storage format. ---*/
+
+  disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
+          nVar_Par*nPoint_Cum[rank]*sizeof(passivedouble));
+
+  /*--- Set the view for the MPI file write, i.e., describe the location in
+   the file that this rank "sees" for writing its piece of the restart file. ---*/
+
+  MPI_File_set_view(fhw, disp, etype, filetype, (char*)"native", MPI_INFO_NULL);
+
+  /*--- Collective call for all ranks to write to their view simultaneously. ---*/
+
+  MPI_File_write_all(fhw, buf, nVar_Par*nParallel_Poin, MPI_DOUBLE, &status);
+  file_size += (su2double)nVar_Par*nParallel_Poin*sizeof(passivedouble);
+
+  /*--- Free the derived datatype. ---*/
+
+  MPI_Type_free(&filetype);
+
+  /*--- Reset the file view before writing the metadata. ---*/
+
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
+
+  /*--- Finally, the master rank writes the metadata. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*--- External iteration. ---*/
+
+    disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
+            nVar_Par*nGlobalPoint_Sort*sizeof(passivedouble));
+    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
+    file_size += (su2double)sizeof(int);
+
+    /*--- Additional doubles for AoA, AoS, etc. ---*/
+
+    disp = (var_buf_size*sizeof(int) + nVar_Par*CGNS_STRING_SIZE*sizeof(char) +
+            nVar_Par*nGlobalPoint_Sort*sizeof(passivedouble) + 1*sizeof(int));
+    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
+    file_size += (su2double)8*sizeof(passivedouble);
+
+  }
+
+  /*--- All ranks close the file after writing. ---*/
+
+  MPI_File_close(&fhw);
+
+#endif
+
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  /*--- Communicate the total file size for the restart ---*/
+  
+#ifdef HAVE_MPI
+  su2double my_file_size = file_size;
+  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
+                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
+  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
+  
+  if ((rank == MASTER_NODE) && (wrt_perf)) {
+    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
+    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
+  }
+  
+  /*--- Free temporary data buffer for writing the binary file. ---*/
+
+  delete [] buf;
+
+}
+
+void COutputLegacy::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
+                             CSolver *FlowSolver, unsigned long iExtIter,
+                             unsigned short val_iZone, unsigned short val_direction) {
+
+  /*--- This routine is for exporting slices of field data for 2D cartesian
+   grids. It assumes that the grid points lie on lines of constant x-
+   or y-coordinates. It is a simple way to export slices or profiles on
+   these meshes for use in verification and validation work. It will
+   eventually be replaced by general routines for probing/slicing.  ---*/
+
+  int DIRECTION = (int)val_direction;
+
+  su2double coordMin, coordMax;
+  coordMin = config->GetStations_Bounds(0);
+  coordMax = config->GetStations_Bounds(1);
+
+  unsigned short iVar;
+  unsigned long iPoint, iVertex, Global_Index;
+  char cstr[200];
+
+  int rank = MASTER_NODE, iProcessor, nProcessor = SINGLE_NODE;
+#ifdef HAVE_MPI
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nProcessor);
+#endif
+
+  bool isPeriodic;
+
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+
+  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
+
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
+      }
+    }
+  }
+
+  /*--- Sum total number of nodes that belong to the domain ---*/
+
+  unsigned long nTotalPoint;
+  unsigned long nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+
+  unsigned long *npoint_procs  = new unsigned long[nProcessor];
+  unsigned long *nPoint_Linear = new unsigned long[nProcessor+1];
+
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < nProcessor; ii++) {
+    npoint_procs[ii] = nTotalPoint/nProcessor;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+
+  /*--- Get the number of remainder points after the even division. ---*/
+
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+
+  /*--- Store the point offsets for each rank. ---*/
+
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < nProcessor; ii++) {
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[nProcessor] = nTotalPoint;
+
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long nLocalVertex_Surface = 0;
+  unsigned long MaxLocalVertex_Surface = 0;
+
+  /*--- Find the max number of vertices we will send from among all
+   partitions and set up buffers. The master node will handle the
+   writing of the CSV file after gathering all of the data. ---*/
+
+  nLocalVertex_Surface = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+
+    /*--- Global Index of the current point. (note outer loop over procs) ---*/
+
+    Global_Index = iPoint + nPoint_Linear[rank];
+
+    /*--- Only write original domain points, i.e., exclude any periodic
+     or halo nodes, even if they are output in the viz. files. ---*/
+
+    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
+          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
+        nLocalVertex_Surface++;
+      }
+    }
+  }
+
+  /*--- Communicate the number of local vertices on each partition
+   to the master node ---*/
+
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalVertex_Surface = nLocalVertex_Surface;
+  Buffer_Recv_nVertex[0] = Buffer_Send_nVertex[0];
+#endif
+
+  /*--- Send and Recv buffers ---*/
+
+  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*nVar_Par];
+  su2double *Buffer_Recv_Data = NULL;
+
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+
+  /*--- Prepare the receive buffers on the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*nVar_Par];
+    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
+  }
+
+  /*--- Loop over all vertices in this partition and load the
+   data of the specified type into the buffer to be sent to
+   the master node. ---*/
+
+  nLocalVertex_Surface = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+
+    /*--- Global Index of the current point. (note outer loop over procs) ---*/
+
+    Global_Index = iPoint + nPoint_Linear[rank];
+
+    /*--- Only write original domain points, i.e., exclude any periodic
+     or halo nodes, even if they are output in the viz. files. ---*/
+
+    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
+          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
+        Buffer_Send_GlobalIndex[nLocalVertex_Surface] = Global_Index;
+        for (iVar = 0; iVar < nVar_Par; iVar++) {
+          Buffer_Send_Data[nLocalVertex_Surface*nVar_Par+iVar] = Parallel_Data[iVar][iPoint];
+        }
+        nLocalVertex_Surface++;
+      }
+    }
+  }
+
+  /*--- Send the information to the master node ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*nVar_Par, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*nVar_Par, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
+    Buffer_Recv_GlobalIndex[iVertex] = Buffer_Send_GlobalIndex[iVertex];
+    for (iVar = 0; iVar < nVar_Par; iVar++) {
+      Buffer_Recv_Data[iVertex*nVar_Par+iVar] = Buffer_Send_Data[iVertex*nVar_Par+iVar];
+    }
+  }
+#endif
+
+  /*--- The master node unpacks the data and writes the surface CSV file ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*--- Write file name with extension if unsteady ---*/
+    char buffer[50];
+    string filename = "slice";
+    if (DIRECTION == 0) {
+      SPRINTF (buffer, "_vert.csv");
+    } else if (DIRECTION == 1) {
+      SPRINTF (buffer, "_hori.csv");
+    }
+    ofstream SurfFlow_file;
+
+    /*--- Write file name with extension if unsteady ---*/
+    strcpy (cstr, filename.c_str());
+    strcat (cstr, buffer);
+    SurfFlow_file.precision(15);
+    SurfFlow_file.open(cstr, ios::out);
+
+    /*--- Global index is first, then the rest of the data. We already have the names. ---*/
+
+    SurfFlow_file << "\"Global_Index\",";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
+      SurfFlow_file << "\"" << Variable_Names[iVar] << "\",";
+    }
+    SurfFlow_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
+
+    /*--- Loop through all of the collected data and write each node's values ---*/
+
+    unsigned long Total_Index;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
+
+        /*--- Current index position and global index ---*/
+
+        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
+        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
+
+        /*--- Write the the data ---*/
+
+        SurfFlow_file << scientific << Global_Index;
+        Total_Index  = iProcessor*MaxLocalVertex_Surface*nVar_Par+iVertex*nVar_Par;
+        for (iVar = 0; iVar < nVar_Par; iVar++) {
+          SurfFlow_file << scientific << ", " << Buffer_Recv_Data[Total_Index+iVar];
+        }
+        SurfFlow_file << endl;
+
+      }
+    }
+
+    /*--- Close the CSV file ---*/
+
+    SurfFlow_file.close();
+
+    /*--- Release the recv buffers on the master node ---*/
+
+    delete [] Buffer_Recv_Data;
+    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nVertex;
+
+  }
+
+  /*--- Release the memory for the remaining buffers and exit ---*/
+
+  delete [] Buffer_Send_Data;
+  delete [] Buffer_Send_GlobalIndex;
+  
+}
+
+void COutputLegacy::DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol) {
+  
+  /*--- Deallocate memory for connectivity data on each processor. ---*/
+  
+  if (surf_sol) {
+    if (nParallel_Line > 0      && Conn_BoundLine_Par      != NULL)
+      delete [] Conn_BoundLine_Par;
+    if (nParallel_BoundTria > 0 && Conn_BoundTria_Par != NULL)
+      delete [] Conn_BoundTria_Par;
+    if (nParallel_BoundQuad > 0 && Conn_BoundQuad_Par != NULL)
+      delete [] Conn_BoundQuad_Par;
+  }
+  else {
+    if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
+    if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
+    if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
+    if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
+    if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
+    if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
+  }
+  
+}
+
+void COutputLegacy::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
+  
+  /*--- Deallocate memory for solution data ---*/
+  
+  for (unsigned short iVar = 0; iVar < nVar_Par; iVar++) {
+    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  }
+  if (Parallel_Data != NULL) delete [] Parallel_Data;
+
+  /*--- Deallocate the structures holding the linear partitioning ---*/
+
+  if (Local_Halo_Sort != NULL) delete [] Local_Halo_Sort;
+
+  if (beg_node != NULL) delete [] beg_node;
+  if (end_node != NULL) delete [] end_node;
+
+  if (nPoint_Lin != NULL) delete [] nPoint_Lin;
+  if (nPoint_Cum != NULL) delete [] nPoint_Cum;
+
+}
+
+void COutputLegacy::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
+  
+  /*--- Deallocate memory for surface solution data ---*/
+
+  for (unsigned short iVar = 0; iVar < nVar_Par; iVar++) {
+    if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
+  }
+  if (Parallel_Surf_Data != NULL) delete [] Parallel_Surf_Data;
+  
+}
+
+void COutputLegacy::MergeInletCoordinates(CConfig *config, CGeometry *geometry) {
+
+  /*--- Local variables needed on all processors ---*/
+
+  unsigned short iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint, jPoint, kPoint;
+
+  int iProcessor, nProcessor = size;
+
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+
+  unsigned long index, iChar;
+
+  char str_buf[MAX_STRING_SIZE];
+  vector<string> Marker_Tags;
+  vector<string>::iterator it;
+
+  unsigned long *nRowCum_Counter = NULL;
+
+  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
+
+  /*--- Search all boundaries on the present rank to count the number
+   of nodes found on inlet markers. ---*/
+
+  nLocalPoint = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+
+        /*--- Only communicate owned nodes to avoid duplicates. ---*/
+
+        if (geometry->node[iPoint]->GetDomain())
+          nLocalPoint++;
+
+      }
+    }
+  }
+  Buffer_Send_nPoin[0] = nLocalPoint;
+
+  /*--- Communicate the total number of nodes on this domain. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+#else
+  Buffer_Recv_nPoin[0] = Buffer_Send_nPoin[0];
+  MaxLocalPoint        = nLocalPoint;
+#endif
+
+  /*--- Send and Recv buffers. ---*/
+
+  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_X = NULL;
+
+  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Y = NULL;
+
+  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
+  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
+
+  char *Buffer_Send_Str = new char[MaxLocalPoint*MAX_STRING_SIZE];
+  char *Buffer_Recv_Str = NULL;
+
+  /*--- Prepare the receive buffers in the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
+    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Str = new char[nProcessor*MaxLocalPoint*MAX_STRING_SIZE];
+
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+
+    unsigned long nGlobal_InletPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_InletPoint += Buffer_Recv_nPoin[iProcessor];
+    }
+    InletCoords = new su2double*[nDim];
+    for (iDim = 0; iDim < nDim; iDim++) {
+      InletCoords[iDim] = new su2double[nGlobal_InletPoint];
+    }
+  }
+
+  /*--- Main communication routine. Loop over each coordinate and perform
+   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
+   all nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by marker tag in one large n-dim. array. ---*/
+
+  /*--- Loop over this partition to collect the coords of the local points. ---*/
+
+  su2double *Coords_Local; jPoint = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
+
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+
+        /*--- Only communicate owned nodes to avoid duplicates. ---*/
+
+        if (geometry->node[iPoint]->GetDomain()) {
+
+          /*--- Retrieve local coordinates at this node. ---*/
+
+          Coords_Local = geometry->node[iPoint]->GetCoord();
+
+          /*--- Load local coords into the temporary send buffer. ---*/
+
+          Buffer_Send_X[jPoint] = Coords_Local[0];
+          Buffer_Send_Y[jPoint] = Coords_Local[1];
+          if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
+
+          /*--- If US system, the output should be in inches ---*/
+
+          if (config->GetSystemMeasurements() == US) {
+            Buffer_Send_X[jPoint] *= 12.0;
+            Buffer_Send_Y[jPoint] *= 12.0;
+            if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+          }
+
+          /*--- Store the marker tag for this particular node. ---*/
+
+          SPRINTF(&Buffer_Send_Str[jPoint*MAX_STRING_SIZE], "%s",
+                  config->GetMarker_All_TagBound(iMarker).c_str());
+
+          /*--- Increment jPoint as the counter. We need this because iPoint
+           may include halo nodes that we skip over during this loop. ---*/
+          
+          jPoint++;
+          
+        }
+      }
+    }
+  }
+
+  /*--- Gather the coordinate data on the master node using MPI. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_X, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_X, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Y, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Y, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) {
+    SU2_MPI::Gather(Buffer_Send_Z, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Z, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, Buffer_Recv_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < MaxLocalPoint; iPoint++) {
+    Buffer_Recv_X[iPoint] = Buffer_Send_X[iPoint];
+    Buffer_Recv_Y[iPoint] = Buffer_Send_Y[iPoint];
+    if (nDim == 3) Buffer_Recv_Z[iPoint] = Buffer_Send_Z[iPoint];
+    index = iPoint*MAX_STRING_SIZE;
+    for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
+      Buffer_Recv_Str[index + iChar] = Buffer_Send_Str[index + iChar];
+    }
+  }
+#endif
+
+  /*--- The master node unpacks and sorts this variable by marker tag. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    Marker_Tags_InletFile.clear();
+
+    /*--- First, parse the marker tags to count how many total inlet markers
+     we have now on the master. ---*/
+
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        index = (iProcessor*MaxLocalPoint + iPoint)*MAX_STRING_SIZE;
+        for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
+          str_buf[iChar] = Buffer_Recv_Str[index + iChar];
+        }
+        Marker_Tags.push_back(str_buf);
+        Marker_Tags_InletFile.push_back(str_buf);
+      }
+    }
+
+    /*--- Sort and remove the duplicate inlet marker strings. ---*/
+
+    sort(Marker_Tags_InletFile.begin(), Marker_Tags_InletFile.end());
+    Marker_Tags_InletFile.erase(unique(Marker_Tags_InletFile.begin(),
+                                       Marker_Tags_InletFile.end()),
+                                Marker_Tags_InletFile.end());
+
+    /*--- Store the unique number of markers for writing later. ---*/
+
+    nMarker_InletFile = Marker_Tags_InletFile.size();
+
+    /*--- Count the number of rows (nodes) per marker. ---*/
+
+    nRow_InletFile = new unsigned long[nMarker_InletFile];
+    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+      nRow_InletFile[iMarker] = 0;
+    }
+
+    /*--- Now count the number of points per marker. ---*/
+
+    jPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[jPoint]) {
+            nRow_InletFile[iMarker]++;
+          }
+        }
+        jPoint++;
+      }
+    }
+
+    /*--- Now put the number of points per marker into cumulative storage.
+     We will also create an extra counter to make sorting easier. ---*/
+
+    nRowCum_InletFile = new unsigned long[nMarker_InletFile+1];
+    nRowCum_Counter   = new unsigned long[nMarker_InletFile+1];
+
+    nRowCum_InletFile[0] = 0; nRowCum_Counter[0] = 0;
+    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+      nRowCum_InletFile[iMarker+1] = nRowCum_InletFile[iMarker] + nRow_InletFile[iMarker];
+      nRowCum_Counter[iMarker+1]   = nRowCum_Counter[iMarker]   + nRow_InletFile[iMarker];
+    }
+
+    /*--- Load up the coordinates, sorted into chunks per marker. ---*/
+
+    jPoint = 0; kPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[kPoint]) {
+
+            /*--- Find our current index for this marker and store coords. ---*/
+
+            index = nRowCum_Counter[iMarker];
+            InletCoords[0][index] = Buffer_Recv_X[jPoint];
+            InletCoords[1][index] = Buffer_Recv_Y[jPoint];
+            if (nDim == 3) InletCoords[2][index] = Buffer_Recv_Z[jPoint];
+
+            /*--- Increment the counter for this marker. ---*/
+
+            nRowCum_Counter[iMarker]++;
+
+          }
+        }
+
+        /*--- Increment point counter for marker tags and data. ---*/
+
+        kPoint++;
+        jPoint++;
+        
+      }
+
+      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+
+      jPoint = (iProcessor+1)*MaxLocalPoint;
+
+    }
+  }
+
+  /*--- Immediately release the temporary data buffers. ---*/
+
+  delete [] Buffer_Send_X;
+  delete [] Buffer_Send_Y;
+  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
+  delete [] Buffer_Send_Str;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_X;
+    delete [] Buffer_Recv_Y;
+    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
+    delete [] Buffer_Recv_nPoin;
+    delete [] Buffer_Recv_Str;
+    delete [] nRowCum_Counter;
+  }
+
+}
+
+void COutputLegacy::Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver) {
+
+  unsigned short iMarker, iDim, iVar;
+  unsigned long iPoint;
+  su2double turb_val[2] = {0.0,0.0};
+
+  const unsigned short nDim = geometry->GetnDim();
+
+  bool turbulent = (config->GetKind_Solver() == RANS ||
+                    config->GetKind_Solver() == ADJ_RANS ||
+                    config->GetKind_Solver() == DISC_ADJ_RANS);
+
+  unsigned short nVar_Turb = 0;
+  if (turbulent)
+    switch (config->GetKind_Turb_Model()) {
+      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+        nVar_Turb = 1;
+        turb_val[0] = solver[TURB_SOL]->GetNuTilde_Inf();
+        break;
+      case SST:
+        nVar_Turb = 2;
+        turb_val[0] = solver[TURB_SOL]->GetTke_Inf();
+        turb_val[1] = solver[TURB_SOL]->GetOmega_Inf();
+        break;
+      default:
+        SU2_MPI::Error("Specified turbulence model unavailable or none selected", CURRENT_FUNCTION);
+        break;
+    }
+
+  /*--- Count the number of columns that we have for this flow case.
+   Here, we have nDim entries for node coordinates, 2 entries for the total
+   conditions or mass flow, another nDim for the direction vector, and
+   finally entries for the number of turbulence variables. ---*/
+
+  unsigned short nCol_InletFile = nDim + 2 + nDim + nVar_Turb;
+
+  /*--- Write the inlet profile file. Note that we have already merged
+   all of the information for the markers and coordinates previously
+   in the MergeInletCoordinates() routine. ---*/
+
+  ofstream node_file("inlet_example.dat");
+
+  node_file << "NMARK= " << nMarker_InletFile << endl;
+
+  for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+
+    /*--- Access the default data for this marker. ---*/
+
+    string Marker_Tag   = Marker_Tags_InletFile[iMarker];
+    su2double p_total   = config->GetInlet_Ptotal(Marker_Tag);
+    su2double t_total   = config->GetInlet_Ttotal(Marker_Tag);
+    su2double* flow_dir = config->GetInlet_FlowDir(Marker_Tag);
+
+    /*--- Header information for this marker. ---*/
+
+    node_file << "MARKER_TAG= " << Marker_Tag              << endl;
+    node_file << "NROW="        << nRow_InletFile[iMarker] << endl;
+    node_file << "NCOL="        << nCol_InletFile          << endl;
+
+    node_file << setprecision(15);
+    node_file << std::scientific;
+
+    /*--- Loop over the data structure and write the coords and vars to file. ---*/
+
+    for (iPoint = nRowCum_InletFile[iMarker]; iPoint < nRowCum_InletFile[iMarker+1]; iPoint++) {
+
+      for (iDim = 0; iDim < nDim; iDim++) {
+        node_file << InletCoords[iDim][iPoint] << "\t";
+      }
+      node_file << t_total << "\t" << p_total;
+      for (iDim = 0; iDim < nDim; iDim++) {
+        node_file << "\t" << flow_dir[iDim];
+      }
+      for (iVar = 0; iVar < nVar_Turb; iVar++) {
+        node_file << "\t" << turb_val[iVar];
+      }
+      node_file << endl;
+    }
+
+  }
+  node_file.close();
+
+  /*--- Print a message to inform the user about the template file. ---*/
+  
+  stringstream err;
+  err << endl;
+  err << "  Created a template inlet profile file with node coordinates" << endl;
+  err << "  and solver variables at `inlet_example.dat`." << endl;
+  err << "  You can use this file as a guide for making your own inlet" << endl;
+  err << "  specification." << endl << endl;
+  SU2_MPI::Error(err.str(), CURRENT_FUNCTION);
+
+}
+
+void COutputLegacy::DeallocateInletCoordinates(CConfig *config, CGeometry *geometry) {
+
+  unsigned short iDim, nDim = geometry->GetnDim();
+
+  /*--- The master node alone owns all data found in this routine. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*--- Deallocate memory for inlet coordinate data ---*/
+
+    if (nRow_InletFile != NULL)    delete [] nRow_InletFile;
+    if (nRowCum_InletFile != NULL) delete [] nRowCum_InletFile;
+
+    Marker_Tags_InletFile.clear();
+
+    for (iDim = 0; iDim < nDim; iDim++) {
+      if (InletCoords[iDim] != NULL) delete [] InletCoords[iDim];
+    }
+    if (InletCoords != NULL) delete [] InletCoords;
+  }
+
+}
+
+void COutputLegacy::SpecialOutput_AnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
+  
+  unsigned short iDim, iMarker, iMarker_Analyze;
+  unsigned long iVertex, iPoint;
+  su2double Mach = 0.0, Pressure, Temperature = 0.0, TotalPressure = 0.0, TotalTemperature = 0.0,
+  Enthalpy, Velocity[3], TangVel[3], Velocity2, MassFlow, Density, Area,
+  AxiFactor = 1.0, SoundSpeed, Vn, Vn2, Vtang2, Weight = 1.0;
+
+  su2double Gas_Constant      = config->GetGas_ConstantND();
+  su2double Gamma             = config->GetGamma();
+  unsigned short nMarker      = config->GetnMarker_All();
+  unsigned short nDim         = geometry->GetnDim();
+  unsigned short Kind_Average = config->GetKind_Average();
+
+  bool compressible   = config->GetKind_Regime() == COMPRESSIBLE;
+  bool incompressible = config->GetKind_Regime() == INCOMPRESSIBLE;
+  bool energy         = config->GetEnergy_Equation();
+
+
+  bool axisymmetric               = config->GetAxisymmetric();
+  unsigned short nMarker_Analyze  = config->GetnMarker_Analyze();
+  
+  su2double  *Vector                    = new su2double[nDim];
+  su2double  *Surface_MassFlow          = new su2double[nMarker];
+  su2double  *Surface_Mach              = new su2double[nMarker];
+  su2double  *Surface_Temperature       = new su2double[nMarker];
+  su2double  *Surface_Density           = new su2double[nMarker];
+  su2double  *Surface_Enthalpy          = new su2double[nMarker];
+  su2double  *Surface_NormalVelocity    = new su2double[nMarker];
+  su2double  *Surface_StreamVelocity2   = new su2double[nMarker];
+  su2double  *Surface_TransvVelocity2   = new su2double[nMarker];
+  su2double  *Surface_Pressure          = new su2double[nMarker];
+  su2double  *Surface_TotalTemperature  = new su2double[nMarker];
+  su2double  *Surface_TotalPressure     = new su2double[nMarker];
+  su2double  *Surface_VelocityIdeal     = new su2double[nMarker];
+  su2double  *Surface_Area              = new su2double[nMarker];
+  su2double  *Surface_MassFlow_Abs      = new su2double[nMarker];
+  
+  /*--- Compute the numerical fan face Mach number, and the total area of the inflow ---*/
+  
+  for (iMarker = 0; iMarker < nMarker; iMarker++) {
+    
+    Surface_MassFlow[iMarker]          = 0.0;
+    Surface_Mach[iMarker]              = 0.0;
+    Surface_Temperature[iMarker]       = 0.0;
+    Surface_Density[iMarker]           = 0.0;
+    Surface_Enthalpy[iMarker]          = 0.0;
+    Surface_NormalVelocity[iMarker]    = 0.0;
+    Surface_StreamVelocity2[iMarker]   = 0.0;
+    Surface_TransvVelocity2[iMarker]   = 0.0;
+    Surface_Pressure[iMarker]          = 0.0;
+    Surface_TotalTemperature[iMarker]  = 0.0;
+    Surface_TotalPressure[iMarker]     = 0.0;
+    Surface_VelocityIdeal[iMarker]     = 0.0;
+    Surface_Area[iMarker]              = 0.0;
+    Surface_MassFlow_Abs[iMarker]      = 0.0;
+
+    if (config->GetMarker_All_Analyze(iMarker) == YES) {
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        
+        if (geometry->node[iPoint]->GetDomain()) {
+          
+          geometry->vertex[iMarker][iVertex]->GetNormal(Vector);
+          
+          if (axisymmetric) {
+            if (geometry->node[iPoint]->GetCoord(1) != 0.0)
+              AxiFactor = 2.0*PI_NUMBER*geometry->node[iPoint]->GetCoord(1);
+            else
+              AxiFactor = 1.0;
+          } else {
+            AxiFactor = 1.0;
+          }
+
+          Density = solver->node[iPoint]->GetDensity();
+          Velocity2 = 0.0; Area = 0.0; MassFlow = 0.0; Vn = 0.0; Vtang2 = 0.0;
+
+          for (iDim = 0; iDim < nDim; iDim++) {
+            Area += (Vector[iDim] * AxiFactor) * (Vector[iDim] * AxiFactor);
+            Velocity[iDim] = solver->node[iPoint]->GetVelocity(iDim);
+            Velocity2 += Velocity[iDim] * Velocity[iDim];
+            Vn += Velocity[iDim] * Vector[iDim] * AxiFactor;
+            MassFlow += Vector[iDim] * AxiFactor * Density * Velocity[iDim];
+          }
+          
+          Area       = sqrt (Area);
+          if (AxiFactor == 0.0) Vn = 0.0; else Vn /= Area;
+          Vn2        = Vn * Vn;
+          Pressure   = solver->node[iPoint]->GetPressure();
+          SoundSpeed = solver->node[iPoint]->GetSoundSpeed();
+
+          for (iDim = 0; iDim < nDim; iDim++) {
+            TangVel[iDim] = Velocity[iDim] - Vn*Vector[iDim]*AxiFactor/Area;
+            Vtang2       += TangVel[iDim]*TangVel[iDim];
+          }
+
+          if (incompressible){
+            if (config->GetKind_DensityModel() == VARIABLE) {
+              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
+              sqrt(solver->node[iPoint]->GetSpecificHeatCp()*config->GetPressure_ThermodynamicND()/(solver->node[iPoint]->GetSpecificHeatCv()*solver->node[iPoint]->GetDensity()));
+            } else {
+              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
+              sqrt(config->GetBulk_Modulus()/(solver->node[iPoint]->GetDensity()));
+            }
+            Temperature       = solver->node[iPoint]->GetTemperature();
+            Enthalpy          = solver->node[iPoint]->GetSpecificHeatCp()*Temperature;
+            TotalTemperature  = Temperature + 0.5*Velocity2/solver->node[iPoint]->GetSpecificHeatCp();
+            TotalPressure     = Pressure + 0.5*Density*Velocity2;
+          }
+          else{
+            Mach              = sqrt(Velocity2)/SoundSpeed;
+            Temperature       = Pressure / (Gas_Constant * Density);
+            Enthalpy          = solver->node[iPoint]->GetEnthalpy();
+            TotalTemperature  = Temperature * (1.0 + Mach * Mach * 0.5 * (Gamma - 1.0));
+            TotalPressure     = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
+          }
+
+          /*--- Compute the mass Surface_MassFlow ---*/
+
+          Surface_Area[iMarker]             += Area;
+          Surface_MassFlow[iMarker]         += MassFlow;
+          Surface_MassFlow_Abs[iMarker]     += abs(MassFlow);
+
+          if (Kind_Average == AVERAGE_MASSFLUX) Weight = abs(MassFlow);
+          else if (Kind_Average == AVERAGE_AREA) Weight = abs(Area);
+          else Weight = 1.0;
+          
+          Surface_Mach[iMarker]             += Mach*Weight;
+          Surface_Temperature[iMarker]      += Temperature*Weight;
+          Surface_Density[iMarker]          += Density*Weight;
+          Surface_Enthalpy[iMarker]         += Enthalpy*Weight;
+          Surface_NormalVelocity[iMarker]   += Vn*Weight;
+          Surface_Pressure[iMarker]         += Pressure*Weight;
+          Surface_TotalTemperature[iMarker] += TotalTemperature*Weight;
+          Surface_TotalPressure[iMarker]    += TotalPressure*Weight;
+
+          /*--- For now, always used the area to weight the uniformities. ---*/
+
+          Weight = abs(Area);
+
+          Surface_StreamVelocity2[iMarker]   += Vn2*Weight;
+          Surface_TransvVelocity2[iMarker]   += Vtang2*Weight;
+
+        }
+      }
+      
+    }
+    
+  }
+  
+  /*--- Copy to the appropriate structure ---*/
+  
+  su2double *Surface_MassFlow_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_Mach_Local              = new su2double [nMarker_Analyze];
+  su2double *Surface_Temperature_Local       = new su2double [nMarker_Analyze];
+  su2double *Surface_Density_Local           = new su2double [nMarker_Analyze];
+  su2double *Surface_Enthalpy_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_NormalVelocity_Local    = new su2double [nMarker_Analyze];
+  su2double *Surface_StreamVelocity2_Local   = new su2double [nMarker_Analyze];
+  su2double *Surface_TransvVelocity2_Local   = new su2double [nMarker_Analyze];
+  su2double *Surface_Pressure_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalTemperature_Local  = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalPressure_Local     = new su2double [nMarker_Analyze];
+  su2double *Surface_Area_Local              = new su2double [nMarker_Analyze];
+  su2double *Surface_MassFlow_Abs_Local      = new su2double [nMarker_Analyze];
+  
+  su2double *Surface_MassFlow_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_Mach_Total              = new su2double [nMarker_Analyze];
+  su2double *Surface_Temperature_Total       = new su2double [nMarker_Analyze];
+  su2double *Surface_Density_Total           = new su2double [nMarker_Analyze];
+  su2double *Surface_Enthalpy_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_NormalVelocity_Total    = new su2double [nMarker_Analyze];
+  su2double *Surface_StreamVelocity2_Total   = new su2double [nMarker_Analyze];
+  su2double *Surface_TransvVelocity2_Total   = new su2double [nMarker_Analyze];
+  su2double *Surface_Pressure_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalTemperature_Total  = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalPressure_Total     = new su2double [nMarker_Analyze];
+  su2double *Surface_Area_Total              = new su2double [nMarker_Analyze];
+  su2double *Surface_MassFlow_Abs_Total      = new su2double [nMarker_Analyze];
+
+  su2double *Surface_MomentumDistortion_Total = new su2double [nMarker_Analyze];
+
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    Surface_MassFlow_Local[iMarker_Analyze]          = 0.0;
+    Surface_Mach_Local[iMarker_Analyze]              = 0.0;
+    Surface_Temperature_Local[iMarker_Analyze]       = 0.0;
+    Surface_Density_Local[iMarker_Analyze]           = 0.0;
+    Surface_Enthalpy_Local[iMarker_Analyze]          = 0.0;
+    Surface_NormalVelocity_Local[iMarker_Analyze]    = 0.0;
+    Surface_StreamVelocity2_Local[iMarker_Analyze]   = 0.0;
+    Surface_TransvVelocity2_Local[iMarker_Analyze]   = 0.0;
+    Surface_Pressure_Local[iMarker_Analyze]          = 0.0;
+    Surface_TotalTemperature_Local[iMarker_Analyze]  = 0.0;
+    Surface_TotalPressure_Local[iMarker_Analyze]     = 0.0;
+    Surface_Area_Local[iMarker_Analyze]              = 0.0;
+    Surface_MassFlow_Abs_Local[iMarker_Analyze]      = 0.0;
+    
+    Surface_MassFlow_Total[iMarker_Analyze]          = 0.0;
+    Surface_Mach_Total[iMarker_Analyze]              = 0.0;
+    Surface_Temperature_Total[iMarker_Analyze]       = 0.0;
+    Surface_Density_Total[iMarker_Analyze]           = 0.0;
+    Surface_Enthalpy_Total[iMarker_Analyze]          = 0.0;
+    Surface_NormalVelocity_Total[iMarker_Analyze]    = 0.0;
+    Surface_StreamVelocity2_Total[iMarker_Analyze]   = 0.0;
+    Surface_TransvVelocity2_Total[iMarker_Analyze]   = 0.0;
+    Surface_Pressure_Total[iMarker_Analyze]          = 0.0;
+    Surface_TotalTemperature_Total[iMarker_Analyze]  = 0.0;
+    Surface_TotalPressure_Total[iMarker_Analyze]     = 0.0;
+    Surface_Area_Total[iMarker_Analyze]              = 0.0;
+    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = 0.0;
+
+    Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
+
+  }
+  
+  /*--- Compute the numerical fan face Mach number, mach number, temperature and the total area ---*/
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    
+    if (config->GetMarker_All_Analyze(iMarker) == YES)  {
+      
+      for (iMarker_Analyze= 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+        
+        /*--- Add the Surface_MassFlow, and Surface_Area to the particular boundary ---*/
+        
+        if (config->GetMarker_All_TagBound(iMarker) == config->GetMarker_Analyze_TagBound(iMarker_Analyze)) {
+          Surface_MassFlow_Local[iMarker_Analyze]          += Surface_MassFlow[iMarker];
+          Surface_Mach_Local[iMarker_Analyze]              += Surface_Mach[iMarker];
+          Surface_Temperature_Local[iMarker_Analyze]       += Surface_Temperature[iMarker];
+          Surface_Density_Local[iMarker_Analyze]           += Surface_Density[iMarker];
+          Surface_Enthalpy_Local[iMarker_Analyze]          += Surface_Enthalpy[iMarker];
+          Surface_NormalVelocity_Local[iMarker_Analyze]    += Surface_NormalVelocity[iMarker];
+          Surface_StreamVelocity2_Local[iMarker_Analyze]   += Surface_StreamVelocity2[iMarker];
+          Surface_TransvVelocity2_Local[iMarker_Analyze]   += Surface_TransvVelocity2[iMarker];
+          Surface_Pressure_Local[iMarker_Analyze]          += Surface_Pressure[iMarker];
+          Surface_TotalTemperature_Local[iMarker_Analyze]  += Surface_TotalTemperature[iMarker];
+          Surface_TotalPressure_Local[iMarker_Analyze]     += Surface_TotalPressure[iMarker];
+          Surface_Area_Local[iMarker_Analyze]              += Surface_Area[iMarker];
+          Surface_MassFlow_Abs_Local[iMarker_Analyze]      += Surface_MassFlow_Abs[iMarker];
+        }
+        
+      }
+      
+    }
+    
+  }
+  
+#ifdef HAVE_MPI
+  
+  SU2_MPI::Allreduce(Surface_MassFlow_Local, Surface_MassFlow_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Mach_Local, Surface_Mach_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Temperature_Local, Surface_Temperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Density_Local, Surface_Density_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Enthalpy_Local, Surface_Enthalpy_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_NormalVelocity_Local, Surface_NormalVelocity_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_StreamVelocity2_Local, Surface_StreamVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TransvVelocity2_Local, Surface_TransvVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Pressure_Local, Surface_Pressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TotalTemperature_Local, Surface_TotalTemperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TotalPressure_Local, Surface_TotalPressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Area_Local, Surface_Area_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_MassFlow_Abs_Local, Surface_MassFlow_Abs_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+
+#else
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    Surface_MassFlow_Total[iMarker_Analyze]          = Surface_MassFlow_Local[iMarker_Analyze];
+    Surface_Mach_Total[iMarker_Analyze]              = Surface_Mach_Local[iMarker_Analyze];
+    Surface_Temperature_Total[iMarker_Analyze]       = Surface_Temperature_Local[iMarker_Analyze];
+    Surface_Density_Total[iMarker_Analyze]           = Surface_Density_Local[iMarker_Analyze];
+    Surface_Enthalpy_Total[iMarker_Analyze]          = Surface_Enthalpy_Local[iMarker_Analyze];
+    Surface_NormalVelocity_Total[iMarker_Analyze]    = Surface_NormalVelocity_Local[iMarker_Analyze];
+    Surface_StreamVelocity2_Total[iMarker_Analyze]   = Surface_StreamVelocity2_Local[iMarker_Analyze];
+    Surface_TransvVelocity2_Total[iMarker_Analyze]   = Surface_TransvVelocity2_Local[iMarker_Analyze];
+    Surface_Pressure_Total[iMarker_Analyze]          = Surface_Pressure_Local[iMarker_Analyze];
+    Surface_TotalTemperature_Total[iMarker_Analyze]  = Surface_TotalTemperature_Local[iMarker_Analyze];
+    Surface_TotalPressure_Total[iMarker_Analyze]     = Surface_TotalPressure_Local[iMarker_Analyze];
+    Surface_Area_Total[iMarker_Analyze]              = Surface_Area_Local[iMarker_Analyze];
+    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = Surface_MassFlow_Abs_Local[iMarker_Analyze];
+  }
+  
+#endif
+  
+  /*--- Compute the value of Surface_Area_Total, and Surface_Pressure_Total, and
+   set the value in the config structure for future use ---*/
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    
+    if (Kind_Average == AVERAGE_MASSFLUX) Weight = Surface_MassFlow_Abs_Total[iMarker_Analyze];
+    else if (Kind_Average == AVERAGE_AREA) Weight = abs(Surface_Area_Total[iMarker_Analyze]);
+    else Weight = 1.0;
+
+    if (Weight != 0.0) {
+      Surface_Mach_Total[iMarker_Analyze]             /= Weight;
+      Surface_Temperature_Total[iMarker_Analyze]      /= Weight;
+      Surface_Density_Total[iMarker_Analyze]          /= Weight;
+      Surface_Enthalpy_Total[iMarker_Analyze]         /= Weight;
+      Surface_NormalVelocity_Total[iMarker_Analyze]   /= Weight;
+      Surface_Pressure_Total[iMarker_Analyze]         /= Weight;
+      Surface_TotalTemperature_Total[iMarker_Analyze] /= Weight;
+      Surface_TotalPressure_Total[iMarker_Analyze]    /= Weight;
+    }
+    else {
+      Surface_Mach_Total[iMarker_Analyze]             = 0.0;
+      Surface_Temperature_Total[iMarker_Analyze]      = 0.0;
+      Surface_Density_Total[iMarker_Analyze]          = 0.0;
+      Surface_Enthalpy_Total[iMarker_Analyze]         = 0.0;
+      Surface_NormalVelocity_Total[iMarker_Analyze]   = 0.0;
+      Surface_Pressure_Total[iMarker_Analyze]         = 0.0;
+      Surface_TotalTemperature_Total[iMarker_Analyze] = 0.0;
+      Surface_TotalPressure_Total[iMarker_Analyze]    = 0.0;
+    }
+
+    /*--- Compute flow uniformity parameters separately (always area for now). ---*/
+
+    Area = fabs(Surface_Area_Total[iMarker_Analyze]);
+
+    if (Area != 0.0) {
+      Surface_MomentumDistortion_Total[iMarker_Analyze] = Surface_StreamVelocity2_Total[iMarker_Analyze]/(Surface_NormalVelocity_Total[iMarker_Analyze]*Surface_NormalVelocity_Total[iMarker_Analyze]*Area) - 1.0;
+      Surface_StreamVelocity2_Total[iMarker_Analyze] /= Area;
+      Surface_TransvVelocity2_Total[iMarker_Analyze] /= Area;
+    }
+    else {
+      Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
+      Surface_StreamVelocity2_Total[iMarker_Analyze]    = 0.0;
+      Surface_TransvVelocity2_Total[iMarker_Analyze]    = 0.0;
+    }
+
+  }
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    
+    su2double MassFlow = Surface_MassFlow_Total[iMarker_Analyze] * config->GetDensity_Ref() * config->GetVelocity_Ref();
+    if (config->GetSystemMeasurements() == US) MassFlow *= 32.174;
+    config->SetSurface_MassFlow(iMarker_Analyze, MassFlow);
+    
+    su2double Mach = Surface_Mach_Total[iMarker_Analyze];
+    config->SetSurface_Mach(iMarker_Analyze, Mach);
+    
+    su2double Temperature = Surface_Temperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
+    config->SetSurface_Temperature(iMarker_Analyze, Temperature);
+    
+    su2double Pressure = Surface_Pressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
+    config->SetSurface_Pressure(iMarker_Analyze, Pressure);
+    
+    su2double Density = Surface_Density_Total[iMarker_Analyze] * config->GetDensity_Ref();
+    config->SetSurface_Density(iMarker_Analyze, Density);
+    
+    su2double Enthalpy = Surface_Enthalpy_Total[iMarker_Analyze];
+    config->SetSurface_Enthalpy(iMarker_Analyze, Enthalpy);
+    
+    su2double NormalVelocity = Surface_NormalVelocity_Total[iMarker_Analyze] * config->GetVelocity_Ref();
+    config->SetSurface_NormalVelocity(iMarker_Analyze, NormalVelocity);
+
+    su2double Uniformity = sqrt(Surface_StreamVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
+    config->SetSurface_Uniformity(iMarker_Analyze, Uniformity);
+
+    su2double SecondaryStrength = sqrt(Surface_TransvVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
+    config->SetSurface_SecondaryStrength(iMarker_Analyze, SecondaryStrength);
+
+    su2double MomentumDistortion = Surface_MomentumDistortion_Total[iMarker_Analyze];
+    config->SetSurface_MomentumDistortion(iMarker_Analyze, MomentumDistortion);
+
+    su2double SecondOverUniform = SecondaryStrength/Uniformity;
+    config->SetSurface_SecondOverUniform(iMarker_Analyze, SecondOverUniform);
+
+    su2double TotalTemperature = Surface_TotalTemperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
+    config->SetSurface_TotalTemperature(iMarker_Analyze, TotalTemperature);
+    
+    su2double TotalPressure = Surface_TotalPressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
+    config->SetSurface_TotalPressure(iMarker_Analyze, TotalPressure);
+    
+  }
+
+  /*--- Compute the average static pressure drop between two surfaces. Note
+   that this assumes we have two surfaces being analyzed and that the outlet
+   is first followed by the inlet. This is because we may also want to choose
+   outlet values (temperature, uniformity, etc.) for our design problems,
+   which require the outlet to be listed first. This is a simple first version
+   that could be generalized to a different orders/lists/etc. ---*/
+
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    if (nMarker_Analyze == 2) {
+      su2double Pressure_Drop = (Surface_Pressure_Total[1]-Surface_Pressure_Total[0]) * config->GetPressure_Ref();
+      config->SetSurface_PressureDrop(iMarker_Analyze, Pressure_Drop);
+    } else {
+      config->SetSurface_PressureDrop(iMarker_Analyze, 0.0);
+    }
+  }
+
+  if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint() && output) {
+    
+    cout.precision(6);
+    cout.setf(ios::scientific, ios::floatfield);
+    cout << endl << "Computing surface mean values." << endl << endl;
+    
+    for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+      cout << "Surface "<< config->GetMarker_Analyze_TagBound(iMarker_Analyze) << ":" << endl;
+      
+      if (nDim == 3) { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m^2): "; else cout << setw(20) << "Area (ft^2): "; }
+      else { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m): "; else cout << setw(20) << "Area (ft): "; }
+      
+      if (config->GetSystemMeasurements() == SI)      cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze]);
+      else if (config->GetSystemMeasurements() == US) cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze])*12.0*12.0;
+      
+      cout << endl;
+
+      su2double MassFlow = config->GetSurface_MassFlow(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Mf (kg/s): " << setw(15) << MassFlow;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Mf (lbs/s): " << setw(15) << MassFlow;
+      
+      su2double NormalVelocity = config->GetSurface_NormalVelocity(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Vn (m/s): " << setw(15) << NormalVelocity;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Vn (ft/s): " << setw(15) << NormalVelocity;
+      
+      cout << endl;
+
+      su2double Uniformity = config->GetSurface_Uniformity(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Uniformity (m/s): " << setw(15) << Uniformity;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Uniformity (ft/s): " << setw(15) << Uniformity;
+
+      su2double SecondaryStrength = config->GetSurface_SecondaryStrength(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Secondary (m/s): " << setw(15) << SecondaryStrength;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Secondary (ft/s): " << setw(15) << SecondaryStrength;
+
+      cout << endl;
+
+      su2double MomentumDistortion = config->GetSurface_MomentumDistortion(iMarker_Analyze);
+      cout << setw(20) << "Mom. Distortion: " << setw(15) << MomentumDistortion;
+
+      su2double SecondOverUniform = config->GetSurface_SecondOverUniform(iMarker_Analyze);
+      cout << setw(20) << "Second/Uniform: " << setw(15) << SecondOverUniform;
+
+      cout << endl;
+
+      su2double Pressure = config->GetSurface_Pressure(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "P (Pa): " << setw(15) << Pressure;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "P (psf): " << setw(15) << Pressure;
+      
+      su2double TotalPressure = config->GetSurface_TotalPressure(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "PT (Pa): " << setw(15) <<TotalPressure;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "PT (psf): " << setw(15) <<TotalPressure;
+
+      cout << endl;
+
+      su2double Mach = config->GetSurface_Mach(iMarker_Analyze);
+      cout << setw(20) << "Mach: " << setw(15) << Mach;
+
+      su2double Density = config->GetSurface_Density(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Rho (kg/m^3): " << setw(15) << Density;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Rho (lb/ft^3): " << setw(15) << Density*32.174;
+
+      cout << endl;
+
+      if (compressible || energy) {
+        su2double Temperature = config->GetSurface_Temperature(iMarker_Analyze);
+        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "T (K): " << setw(15) << Temperature;
+        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "T (R): " << setw(15) << Temperature;
+
+        su2double TotalTemperature = config->GetSurface_TotalTemperature(iMarker_Analyze);
+        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "TT (K): " << setw(15) << TotalTemperature;
+        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "TT (R): " << setw(15) << TotalTemperature;
+
+        cout << endl;
+      }
+
+    }
+    cout.unsetf(ios_base::floatfield);
+    
+  }
+  
+  delete [] Surface_MassFlow_Local;
+  delete [] Surface_Mach_Local;
+  delete [] Surface_Temperature_Local;
+  delete [] Surface_Density_Local;
+  delete [] Surface_Enthalpy_Local;
+  delete [] Surface_NormalVelocity_Local;
+  delete [] Surface_Pressure_Local;
+  delete [] Surface_TotalTemperature_Local;
+  delete [] Surface_TotalPressure_Local;
+  delete [] Surface_Area_Local;
+  delete [] Surface_MassFlow_Abs_Local;
+  
+  delete [] Surface_MassFlow_Total;
+  delete [] Surface_Mach_Total;
+  delete [] Surface_Temperature_Total;
+  delete [] Surface_Density_Total;
+  delete [] Surface_Enthalpy_Total;
+  delete [] Surface_NormalVelocity_Total;
+  delete [] Surface_Pressure_Total;
+  delete [] Surface_TotalTemperature_Total;
+  delete [] Surface_TotalPressure_Total;
+  delete [] Surface_Area_Total;
+  delete [] Surface_MassFlow_Abs_Total;
+  
+  delete [] Surface_MassFlow;
+  delete [] Surface_Mach;
+  delete [] Surface_Temperature;
+  delete [] Surface_Density;
+  delete [] Surface_Enthalpy;
+  delete [] Surface_NormalVelocity;
+  delete [] Surface_Pressure;
+  delete [] Surface_TotalTemperature;
+  delete [] Surface_TotalPressure;
+  delete [] Surface_Area;
+  delete [] Vector;
+  delete [] Surface_VelocityIdeal;
+  delete [] Surface_MassFlow_Abs;
+  
+}
+
+void COutputLegacy::MergeConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+
+  /*--- Flags identifying the types of files to be written. ---*/
+
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+
+  /*--- Merge connectivity for each type of element (excluding halos). Note
+   that we only need to merge the connectivity once, as it does not change
+   during computation. Check whether the base file has been written. ---*/
+
+  /*--- Merge volumetric grid. ---*/
+
+  if (Wrt_Vol) {
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
+      cout <<"Merging volumetric triangle grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, TRIANGLE    );
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
+      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL   );
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
+      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON );
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
+      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON  );
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
+      cout <<"Merging volumetric prism grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, PRISM       );
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
+      cout <<"Merging volumetric pyramid grid connectivity." << endl;
+    MergeVolumetricConnectivity_FEM(config, geometry, PYRAMID     );
+
+  }
+
+  /*--- Merge surface grid. ---*/
+
+  if (Wrt_Srf) {
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
+      cout <<"Merging surface line grid connectivity." << endl;
+    MergeSurfaceConnectivity_FEM(config, geometry, LINE);
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
+      cout <<"Merging surface triangle grid connectivity." << endl;
+    MergeSurfaceConnectivity_FEM(config, geometry, TRIANGLE);
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
+      cout <<"Merging surface quadrilateral grid connectivity." << endl;
+    MergeSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);
+
+  }
+
+  /*--- Update total number of volume elements after merge. ---*/
+
+  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
+  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
+
+  /*--- Update total number of surface elements after merge. ---*/
+
+  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
+
+}
+
+void COutputLegacy::MergeCoordinates_FEM(CConfig *config, CGeometry *geometry) {
+
+  /*--- Local variables needed on all processors ---*/
+
+  unsigned short iDim;
+  unsigned long iPoint;
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned short nDim = DGGeometry->GetnDim();
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+  vector<su2double> DOFsCoords;
+  vector<unsigned long> globalID;
+
+  /*--- Set the global ID and the coordinates of the local DOFs
+        by looping over the owned volume elements. ---*/
+  unsigned long nLocalPoint = 0;
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+
+      const su2double *coor = volElem[l].coorSolDOFs.data() + j*nDim;
+      for(unsigned short k=0; k<nDim; ++k) DOFsCoords.push_back(coor[k]);
+
+      nLocalPoint++;
+    }
+  }
+
+#ifndef HAVE_MPI
+
+  /*--- In serial, the single process has access to all geometry, so simply
+   load the coordinates into the data structure. ---*/
+
+  // need to double check for halos in parallel
+
+  nGlobal_Poin = nLocalPoint;
+  nGlobal_Doma = nLocalPoint;
+
+  /*--- Allocate the coordinates data structure. ---*/
+
+  Coords = new su2double*[nDim];
+  for (iDim = 0; iDim < nDim; iDim++) {
+    Coords[iDim] = new su2double[nGlobal_Poin];
+  }
+
+  /*--- Loop over the mesh to collect the coords of the local points ---*/
+
+  for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+
+    /*--- Check if the node belongs to the domain (i.e, not a halo node).
+     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
+
+    /*--- Retrieve the current coordinates at this node. ---*/
+
+    unsigned long iGlobal_Index = globalID[iPoint];
+
+    for (iDim = 0; iDim < nDim; iDim++) {
+      Coords[iDim][iGlobal_Index] = DOFsCoords[iPoint*nDim+iDim];
+
+      /*--- If US system, the output should be in inches ---*/
+
+      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+        Coords[iDim][iGlobal_Index] *= 12.0;
+      }
+    }
+  }
+
+#else
+
+  /*--- MPI preprocessing ---*/
+  int iProcessor, nProcessor = size;
+  unsigned long jPoint;
+
+  /*--- Local variables needed for merging the geometry with MPI. ---*/
+
+  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
+  unsigned long MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+
+  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
+
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. ---*/
+
+  // Need to double check halo layers
+
+  Buffer_Send_nPoin[0] = nLocalPoint;
+
+  /*--- Communicate the total number of nodes on this domain. ---*/
+
+  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+
+  if (rank == MASTER_NODE) {
+    nGlobal_Doma = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
+    }
+  }
+  nBuffer_Scalar = MaxLocalPoint;
+
+  /*--- Send and Recv buffers. ---*/
+
+  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_X = NULL;
+
+  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Y = NULL;
+
+  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
+  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
+
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+
+  /*--- Prepare the receive buffers in the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
+    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
+
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
+    }
+    Coords = new su2double*[nDim];
+    for (iDim = 0; iDim < nDim; iDim++) {
+      Coords[iDim] = new su2double[nGlobal_Poin];
+    }
+  }
+
+  /*--- Main communication routine. Loop over each coordinate and perform
+   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
+   all nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+
+  /*--- Loop over this partition to collect the coords of the local points. ---*/
+  jPoint = 0;
+  for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+
+    /*--- Check for halos and write only if requested ---*/
+    //    if (!Local_Halo[iPoint] || Wrt_Halo) {
+
+    /*--- Load local coords into the temporary send buffer. These were stored above ---*/
+    Buffer_Send_X[jPoint] = DOFsCoords[iPoint*nDim+0];
+    Buffer_Send_Y[jPoint] = DOFsCoords[iPoint*nDim+1];
+    if (nDim == 3) Buffer_Send_Z[jPoint] = DOFsCoords[iPoint*nDim+2];
+
+    /*--- If US system, the output should be in inches ---*/
+
+    if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
+      Buffer_Send_X[jPoint] *= 12.0;
+      Buffer_Send_Y[jPoint] *= 12.0;
+      if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+    }
+
+    /*--- Store the global index for this local node. ---*/
+    Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
+
+    /*--- Increment jPoint as the counter. We need this because iPoint
+     may include halo nodes that we skip over during this loop. ---*/
+    jPoint++;
+    //    }
+  }
+
+  /*--- Gather the coordinate data on the master node using MPI. ---*/
+
+  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) {
+    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+
+  /*--- The master node unpacks and sorts this variable by global index ---*/
+
+  if (rank == MASTER_NODE) {
+    jPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        /*--- Get global index, then loop over each variable and store ---*/
+        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+        if (iGlobal_Index >= nGlobal_Poin){
+          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
+        }
+        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
+        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
+        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
+        jPoint++;
+      }
+      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+      jPoint = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+
+  /*--- Immediately release the temporary data buffers. ---*/
+
+  //  delete [] Local_Halo;
+  delete [] Buffer_Send_X;
+  delete [] Buffer_Send_Y;
+  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_X;
+    delete [] Buffer_Recv_Y;
+    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
+    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nPoin;
+  }
+
+#endif
+
+}
+
+void COutputLegacy::MergeVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+
+  int iProcessor;
+  unsigned short NODES_PER_ELEMENT = 0;
+  unsigned long iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
+
+  unsigned long jElem;
+
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0;
+
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL;
+
+  int *Conn_Elem = NULL;
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+
+  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+
+  const CFEMStandardElement *standardElementsSol = DGGeometry->GetStandardElementsSol();
+
+  /* Define the vectors for the connectivity of the local linear subelements. */
+  vector<unsigned long> volumeConn;
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+  map<unsigned long, unsigned long> mapLocal2Global;
+  unsigned long ii = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+    for(unsigned short j=0; j<volElem[i].nDOFsSol; ++j, ++ii) {
+      mapLocal2Global[ii] = volElem[i].offsetDOFsSolGlobal+j;
+    }
+  }
+
+  /*--- Counter for keeping track of the number of this element locally. ---*/
+  nLocalElem = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+
+    /* Determine the necessary data from the corresponding standard elem,
+     such as the number of linear sub elements, the number of DOFs per
+     linear sub element and the corresponding local connectivity. */
+    const unsigned short ind       = volElem[i].indStandardElement;
+    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
+    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
+
+    /*--- Only store the linear sub elements if they are of
+     the current type that we are merging. ---*/
+    if (Elem_Type == VTK_Type1) {
+
+      const unsigned short nSubElems       = standardElementsSol[ind].GetNSubElemsType1();
+      const unsigned short nDOFsPerSubElem = standardElementsSol[ind].GetNDOFsPerSubElem(VTK_Type1);
+      const unsigned short *connSubElems   = standardElementsSol[ind].GetSubConnType1();
+
+      /* Loop over the number of subfaces and store the required data. */
+      unsigned short kk = 0;
+      for(unsigned short j=0; j<nSubElems; ++j) {
+
+        /*--- Store the global index for the surface conn ---*/
+        for(unsigned short k=0; k<nDOFsPerSubElem; ++k, ++kk)
+          volumeConn.push_back(mapLocal2Global[volElem[i].offsetDOFsSolLocal+connSubElems[kk]]);
+
+        nLocalElem++;
+      }
+
+    } else if (Elem_Type == VTK_Type2) {
+
+      const unsigned short nSubElems       = standardElementsSol[ind].GetNSubElemsType2();
+      const unsigned short nDOFsPerSubElem = standardElementsSol[ind].GetNDOFsPerSubElem(VTK_Type2);
+      const unsigned short *connSubElems   = standardElementsSol[ind].GetSubConnType2();
+
+      /* Loop over the number of subfaces and store the required data. */
+      unsigned short kk = 0;
+      for(unsigned short j=0; j<nSubElems; ++j) {
+
+        /*--- Store the global index for the surface conn ---*/
+        for(unsigned short k=0; k<nDOFsPerSubElem; ++k, ++kk)
+          volumeConn.push_back(mapLocal2Global[volElem[i].offsetDOFsSolLocal+connSubElems[kk]]);
+
+        nLocalElem++;
+      }
+    }
+  }
+
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+
+  /*--- Find the max number of this element type among all
+   partitions and set up buffers. ---*/
+
+  Buffer_Send_nElem[0] = nLocalElem;
+  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalElem = nLocalElem;
+  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+#endif
+
+  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+
+  /*--- Send and Recv buffers ---*/
+
+  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
+  unsigned long *Buffer_Recv_Elem = NULL;
+
+  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
+  unsigned short *Buffer_Recv_Halo = NULL;
+
+  /*--- Prepare the receive buffers on the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
+    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
+    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
+  }
+
+  /*--- Loop over all elements in this partition and load the
+   elements of the current type into the buffer to be sent to
+   the master node. ---*/
+
+  jNode = 0;
+  for (iElem = 0; iElem < nLocalElem; iElem++) {
+
+    /*--- Loop over all nodes in this element and load the
+     connectivity into the send buffer. ---*/
+    Buffer_Send_Halo[iElem] = false;
+    for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+
+      /*--- Store the global index values directly. ---*/
+
+      Buffer_Send_Elem[jNode] = volumeConn[iElem*NODES_PER_ELEMENT+iNode];
+
+      /*--- Increment jNode as the counter. We need this because iElem
+       may include other elements that we skip over during this loop. ---*/
+
+      jNode++;
+    }
+  }
+
+  /*--- Gather the element connectivity information. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (unsigned long iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
+  for (unsigned long iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+#endif
+
+  /*--- The master node unpacks and sorts the connectivity. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*---  We need to remove any duplicate elements (halo cells) that
+     exist on multiple partitions. Start by initializing all elements
+     to the "write" state by using a boolean array. ---*/
+
+    Write_Elem = new bool[size*MaxLocalElem];
+    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
+      Write_Elem[iElem] = true;
+    }
+
+    /*--- Remove the rind layer from the solution only if requested ---*/
+
+    if (!Wrt_Halo) {
+
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
+
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
+
+        }
+        kElem = (iProcessor+1)*MaxLocalElem;
+      }
+    }
+
+    /*--- Store the unique connectivity list for this element type. ---*/
+
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
+
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
+
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
+          }
+        }
+      }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+
+  /*--- Immediately release the temporary buffers. ---*/
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
+  }
+
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+
+  if (rank == MASTER_NODE) {
+    switch (Elem_Type) {
+      case TRIANGLE:
+        nGlobal_Tria = nElem_Total;
+        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_Quad = nElem_Total;
+        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
+        break;
+      case TETRAHEDRON:
+        nGlobal_Tetr = nElem_Total;
+        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
+        break;
+      case HEXAHEDRON:
+        nGlobal_Hexa = nElem_Total;
+        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
+        break;
+      case PRISM:
+        nGlobal_Pris = nElem_Total;
+        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
+        break;
+      case PYRAMID:
+        nGlobal_Pyra = nElem_Total;
+        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+    }
+  }
+  
+}
+
+void COutputLegacy::MergeSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+
+  unsigned short NODES_PER_ELEMENT = 0;
+
+  unsigned long iNode, jNode;
+  unsigned long iElem = 0;
+  unsigned long nLocalElem = 0, nElem_Total = 0;
+
+  int iProcessor;
+  unsigned long jElem;
+
+  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
+  unsigned long nBuffer_Scalar = 0;
+  unsigned long kNode = 0, kElem = 0;
+  unsigned long MaxLocalElem = 0;
+
+  bool Wrt_Halo = config->GetWrt_Halo();
+  bool *Write_Elem = NULL;
+
+  int *Conn_Elem = NULL;
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+
+  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+
+  const CBoundaryFEM *boundaries = DGGeometry->GetBoundaries();
+
+  const CFEMStandardBoundaryFace *standardBoundaryFacesSol = DGGeometry->GetStandardBoundaryFacesSol();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+  map<unsigned long, unsigned long> mapLocal2Global;
+  unsigned long ii = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+    for(unsigned short j=0; j<volElem[i].nDOFsSol; ++j, ++ii) {
+      mapLocal2Global[ii] = volElem[i].offsetDOFsSolGlobal+j;
+    }
+  }
+
+  /* Define the vectors for the connectivity of the local linear subelements. */
+  vector<unsigned long>  surfaceConn;
+
+  /*--- Counter for keeping track of the number of this element locally. ---*/
+  nLocalElem = 0;
+
+  /* Loop over the boundary markers. */
+  for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
+    if( !boundaries[iMarker].periodicBoundary ) {
+
+      /* Check for markers to be plotted. */
+      if (config->GetMarker_All_Plotting(iMarker) == YES) {
+
+        /* Loop over the surface elements of this marker. */
+        const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
+        for(unsigned long i=0; i<surfElem.size(); ++i) {
+
+          /* Determine the necessary data from the corresponding standard face,
+           such as the number of linear subfaces, the number of DOFs per
+           linear subface and the corresponding local connectivity. */
+          const unsigned short ind           = surfElem[i].indStandardElement;
+          const unsigned short VTK_Type      = standardBoundaryFacesSol[ind].GetVTK_Type();
+
+          /*--- Only store the linear sub-elements if they are of
+           the current type that we are merging. ---*/
+          if (VTK_Type == Elem_Type) {
+
+            const unsigned short nSubFaces     = standardBoundaryFacesSol[ind].GetNSubFaces();
+            const unsigned short nDOFsPerFace  = standardBoundaryFacesSol[ind].GetNDOFsPerSubFace();
+            const unsigned short *connSubFaces = standardBoundaryFacesSol[ind].GetSubFaceConn();
+
+            /* Loop over the number of subfaces and store the required data. */
+            unsigned short ii = 0;
+            for(unsigned short j=0; j<nSubFaces; ++j) {
+
+              /*--- Store the global index for the surface conn ---*/
+              for(unsigned short k=0; k<nDOFsPerFace; ++k, ++ii)
+                surfaceConn.push_back(mapLocal2Global[surfElem[i].DOFsSolFace[connSubFaces[ii]]]);
+
+              nLocalElem++;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+
+  /*--- Find the max number of this element type among all
+   partitions and set up buffers. ---*/
+
+  Buffer_Send_nElem[0] = nLocalElem;
+  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalElem = nLocalElem;
+  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+#endif
+
+  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+
+  /*--- Send and Recv buffers ---*/
+
+  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
+  unsigned long *Buffer_Recv_Elem = NULL;
+
+  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
+  unsigned short *Buffer_Recv_Halo = NULL;
+
+  /*--- Prepare the receive buffers on the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
+    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
+    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
+  }
+
+  /*--- Loop over all elements in this partition and load the
+   elements of the current type into the buffer to be sent to
+   the master node. ---*/
+  jNode = 0;
+  for (iElem = 0; iElem < nLocalElem; iElem++) {
+
+    /*--- Loop over all nodes in this element and load the
+     connectivity into the send buffer. ---*/
+    Buffer_Send_Halo[iElem] = false;
+    for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+
+      /*--- Store the global index values directly. ---*/
+      Buffer_Send_Elem[jNode] = surfaceConn[iElem*NODES_PER_ELEMENT+iNode];
+
+      /*--- Increment jNode as the counter for the buffer array. ---*/
+      jNode++;
+    }
+  }
+
+  /*--- Gather the element connectivity information. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (unsigned long iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
+  for (unsigned long iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+#endif
+
+  /*--- The master node unpacks and sorts the connectivity. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*---  We need to remove any duplicate elements (halo cells) that
+     exist on multiple partitions. Start by initializing all elements
+     to the "write" state by using a boolean array. ---*/
+
+    Write_Elem = new bool[size*MaxLocalElem];
+    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
+      Write_Elem[iElem] = true;
+    }
+
+    /*--- Remove the rind layer from the solution only if requested ---*/
+
+    if (!Wrt_Halo) {
+
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
+
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
+
+        }
+        kElem = (iProcessor+1)*MaxLocalElem;
+      }
+    }
+
+    /*--- Store the unique connectivity list for this element type. ---*/
+
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
+
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
+
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
+          }
+        }
+      }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
+    }
+  }
+
+  /*--- Immediately release the temporary buffers. ---*/
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
+  }
+
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+
+  if (rank == MASTER_NODE) {
+    switch (Elem_Type) {
+      case LINE:
+        nGlobal_Line = nElem_Total;
+        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
+        break;
+      case TRIANGLE:
+        nGlobal_BoundTria = nElem_Total;
+        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_BoundQuad = nElem_Total;
+        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+    }
+  }
+}
+
+void COutputLegacy::MergeSolution_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+
+  unsigned short Kind_Solver  = config->GetKind_Solver();
+  unsigned short iVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
+  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
+
+  unsigned long iPoint = 0, jPoint = 0;
+
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+
+  int iProcessor;
+
+  /*--- Prepare send buffers for the conservative variables. Need to
+   find the total number of conservative variables and also the
+   index for their particular solution container. ---*/
+
+  switch (Kind_Solver) {
+    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
+    default: SecondIndex = NONE; ThirdIndex = NONE; break;
+  }
+
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
+  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
+  nVar_Total = nVar_Consv;
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+  map<unsigned long, unsigned long> mapLocal2Global;
+  vector<su2double> DOFsSol;
+  vector<unsigned long> globalID;
+
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+    /* Set the pointers for the residual and solution for this element. */
+    const unsigned long offset  = nVar_Consv*volElem[l].offsetDOFsSolLocal;
+    su2double *solDOFs          = solver[FirstIndex]->GetVecSolDOFs() + offset;
+
+    /* Loop over the DOFs for this element and store the solution. */
+
+    unsigned int i = 0;
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+
+      nLocalPoint++;
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+
+      for(unsigned short iVar=0; iVar<nVar_Consv; ++iVar, ++i) {
+        DOFsSol.push_back(solDOFs[i]);
+      }
+    }
+  }
+  Buffer_Send_nPoint[0] = nLocalPoint;
+
+  /*--- Each processor sends its local number of nodes to the master. ---*/
+
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalPoint = nLocalPoint;
+  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
+#endif
+
+  nBuffer_Scalar = MaxLocalPoint;
+
+  /*--- Send and Recv buffers. ---*/
+
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
+
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+
+  /*--- Prepare the receive buffers in the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+  }
+
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+
+  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+
+    /*--- Loop over this partition to collect the current variable ---*/
+
+    jPoint = 0;
+    for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+
+      /*--- Get this variable into the temporary send buffer. ---*/
+
+      Buffer_Send_Var[jPoint] = DOFsSol[iPoint*nVar_Consv+iVar];
+
+      /*--- Only send/recv the volumes & global indices during the first loop ---*/
+
+      if (iVar == 0) {
+        Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
+      }
+
+      jPoint++;
+
+    }
+
+    /*--- Gather the data on the master node. ---*/
+
+#ifdef HAVE_MPI
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+
+    if (iVar == 0) {
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
+#endif
+    }
+
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+
+          /*--- Get global index, then loop over each variable and store ---*/
+
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+
+          jPoint++;
+
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
+    }
+
+  }
+
+  /*--- Immediately release the temporary buffers. ---*/
+
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nPoint;
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_GlobalIndex;
+  }
+
+}
+
+void COutputLegacy::MergeBaselineSolution_FEM(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
+
+  /*--- Local variables needed on all processors ---*/
+  unsigned short iVar;
+  unsigned long iPoint = 0, jPoint = 0;
+
+  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
+  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+
+  int iProcessor;
+
+  /*--- We know the number of fields from reading the restart. ---*/
+
+  nVar_Total = config->fields.size() - 1;
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+  vector<su2double> DOFsSol;
+  vector<unsigned long> globalID;
+
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+    /* Set the pointers for the residual and solution for this element. */
+    const unsigned long offset  = nVar_Total*volElem[l].offsetDOFsSolLocal;
+    su2double *solDOFs          = solver->GetVecSolDOFs() + offset;
+
+    /* Loop over the DOFs for this element and store the solution. */
+
+    unsigned int i = 0;
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+
+      nLocalPoint++;
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+
+      for(unsigned short iVar=0; iVar<nVar_Total; ++iVar, ++i) {
+        DOFsSol.push_back(solDOFs[i]);
+      }
+    }
+  }
+  Buffer_Send_nPoint[0] = nLocalPoint;
+
+  /*--- Each processor sends its local number of nodes to the master. ---*/
+
+  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  MaxLocalPoint = nLocalPoint;
+  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
+#endif
+
+  nBuffer_Scalar = MaxLocalPoint;
+
+  /*--- Send and Recv buffers. ---*/
+
+  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Var = NULL;
+
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+
+  /*--- Prepare the receive buffers in the master node only. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
+    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
+    nGlobal_Poin = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
+    }
+    Data = new su2double*[nVar_Total];
+    for (iVar = 0; iVar < nVar_Total; iVar++) {
+      Data[iVar] = new su2double[nGlobal_Poin];
+    }
+  }
+
+  /*--- Main communication routine. Loop over each variable that has
+   been requested by the user and perform the MPI comm. Temporary
+   1-D buffers are used to send the solution for each variable at all
+   nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by global index in one large n-dim. array. ---*/
+
+  for (iVar = 0; iVar < nVar_Total; iVar++) {
+
+    /*--- Loop over this partition to collect the current variable ---*/
+
+    jPoint = 0;
+    for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+
+      /*--- Get this variable into the temporary send buffer. ---*/
+
+      Buffer_Send_Var[jPoint] = DOFsSol[iPoint*nVar_Total+iVar];
+
+      /*--- Only send/recv the volumes & global indices during the first loop ---*/
+
+      if (iVar == 0) {
+        Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
+      }
+
+      jPoint++;
+
+    }
+
+    /*--- Gather the data on the master node. ---*/
+
+#ifdef HAVE_MPI
+    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+#else
+    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
+#endif
+
+    if (iVar == 0) {
+#ifdef HAVE_MPI
+      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
+#endif
+    }
+
+    /*--- The master node unpacks and sorts this variable by global index ---*/
+
+    if (rank == MASTER_NODE) {
+      jPoint = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+
+          /*--- Get global index, then loop over each variable and store ---*/
+
+          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+
+          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+
+          jPoint++;
+
+        }
+        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+        jPoint = (iProcessor+1)*nBuffer_Scalar;
+      }
+    }
+
+  }
+
+  /*--- Immediately release the temporary buffers. ---*/
+
+  delete [] Buffer_Send_Var;
+  delete [] Buffer_Send_GlobalIndex;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_nPoint;
+    delete [] Buffer_Recv_Var;
+    delete [] Buffer_Recv_GlobalIndex;
+  }
+  
+}
+
+void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
+                                  unsigned long iExtIter, unsigned short val_nZone) {
+
+//  unsigned short iZone;
+
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+//    /*--- Check whether we are writing any output at all. We can
+//     disable all output to avoid serial bottleneck at scale. ---*/
+//    if (config[iZone]->GetWrt_Output()) {
+
+//      /*--- Flags identifying the types of files to be written. ---*/
+
+//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+
+//      /*--- Get the file output format ---*/
+
+//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+
+//      /*--- Merge the node coordinates and connectivity, if necessary. This
+//       is only performed if a volume solution file is requested, and it
+//       is active by default. ---*/
+
+//      if (Wrt_Vol || Wrt_Srf) {
+//        if (rank == MASTER_NODE) cout << endl << "Merging connectivities in the Master node." << endl;
+//        MergeConnectivity_FEM(config[iZone], geometry[iZone][MESH_0], iZone);
+//      }
+
+//      /*--- Merge coordinates of all grid nodes (excluding ghost points).
+//       The grid coordinates are always merged and included first in the
+//       restart files. ---*/
+
+//      if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
+//      MergeCoordinates_FEM(config[iZone], geometry[iZone][MESH_0]);
+
+//      if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+//        if (FileFormat == TECPLOT_BINARY) {
+//          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
+//          SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][MESH_0], iZone);
+//          SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][MESH_0], iZone);
+//        }
+//      }
+
+//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+
+//      if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+//      MergeSolution_FEM(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+
+//      /*--- Write restart, or Tecplot files using the merged data.
+//       This data lives only on the master, and these routines are currently
+//       executed by the master proc alone (as if in serial). ---*/
+
+//      if (rank == MASTER_NODE) {
+
+//        /*--- Write a native restart file ---*/
+
+//        if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
+//        SetRestart(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone);
+
+//        if (Wrt_Vol) {
+
+//          switch (FileFormat) {
+
+//            case TECPLOT:
+
+//              /*--- Write a Tecplot ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+//              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone, val_nZone, false);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+//              break;
+
+//            case FIELDVIEW:
+
+//              /*--- Write a FieldView ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
+//              SetFieldViewASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+//              break;
+
+//            case TECPLOT_BINARY:
+
+//              /*--- Write a Tecplot binary solution file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
+//              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][MESH_0], iZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+//              break;
+
+//            case FIELDVIEW_BINARY:
+
+//              /*--- Write a FieldView binary file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
+//              SetFieldViewBinary(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+//              break;
+
+//            case PARAVIEW:
+
+//              /*--- Write a Paraview ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+//              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, false);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+//              break;
+
+//            default:
+//              break;
+//          }
+
+//        }
+
+//        if (Wrt_Srf) {
+
+//          switch (FileFormat) {
+
+//            case TECPLOT:
+
+//              /*--- Write a Tecplot ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
+//              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone, val_nZone, true);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+//              break;
+
+//            case TECPLOT_BINARY:
+
+//              /*--- Write a Tecplot binary solution file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
+//              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][MESH_0], iZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+//              break;
+
+//            case PARAVIEW:
+
+//              /*--- Write a Paraview ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+//              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, true);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+//              break;
+
+//            default:
+//              break;
+//          }
+
+//        }
+
+//        /*--- Release memory needed for merging the solution data. ---*/
+
+//        DeallocateCoordinates(config[iZone], geometry[iZone][MESH_0]);
+//        DeallocateSolution(config[iZone], geometry[iZone][MESH_0]);
+
+//      }
+
+//      /*--- Final broadcast (informing other procs that the base output
+//       file was written). ---*/
+
+//#ifdef HAVE_MPI
+//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//      SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//#endif
+
+//    } else {
+//      if (rank == MASTER_NODE) cout << endl << "Restart and solution output disabled." << endl;
+//    }
+//  }
+}
+
+void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                                          unsigned long iExtIter, unsigned short val_nZone) {
+
+//  unsigned short iZone, iInst, nInst;
+
+//  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+//    nInst = config[iZone]->GetnTimeInstances();
+
+//    for (iInst = 0; iInst < nInst; iInst++) {
+
+//      config[iZone]->SetiInst(iInst);
+
+//      /*--- Flags identifying the types of files to be written. ---*/
+
+//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+
+//      /*--- Get the file output format ---*/
+
+//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+
+//      /*--- Merge the node coordinates and connectivity if necessary. This
+//       is only performed if a volume solution file is requested, and it
+//       is active by default. ---*/
+
+//      if ((Wrt_Vol || Wrt_Srf)) {
+//        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+//        MergeConnectivity_FEM(config[iZone], geometry[iZone][iInst], iZone);
+//      }
+
+//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+
+//      if ((Wrt_Vol || Wrt_Srf)) {
+//        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+//        MergeBaselineSolution_FEM(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+//      }
+
+//      /*--- Write restart, Tecplot or Paraview files using the merged data.
+//       This data lives only on the master, and these routines are currently
+//       executed by the master proc alone (as if in serial). ---*/
+
+//      if (rank == MASTER_NODE) {
+
+//        if (Wrt_Vol) {
+
+//          switch (FileFormat) {
+
+//            case TECPLOT:
+
+//              /*--- Write a Tecplot ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+//              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//              break;
+
+//            case FIELDVIEW:
+
+//              /*--- Write a FieldView ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+//              SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//              break;
+
+//            case TECPLOT_BINARY:
+
+//              /*--- Write a Tecplot binary solution file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+//              SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
+//              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
+//              break;
+
+//            case FIELDVIEW_BINARY:
+
+//              /*--- Write a binary binary file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+//              SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//              break;
+
+//            case PARAVIEW:
+
+//              /*--- Write a Paraview ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+//              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//              break;
+
+//            default:
+//              break;
+//          }
+
+//        }
+
+//        if (Wrt_Srf) {
+
+//          switch (FileFormat) {
+
+//            case TECPLOT:
+
+//              /*--- Write a Tecplot ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+//              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+//              break;
+
+//            case TECPLOT_BINARY:
+
+//              /*--- Write a Tecplot binary solution file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+//              SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
+//              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
+//              break;
+
+//            case PARAVIEW:
+
+//              /*--- Write a Paraview ASCII file ---*/
+
+//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+//              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+//              break;
+
+//            default:
+//              break;
+//          }
+//        }
+
+//        if (FileFormat == TECPLOT_BINARY) {
+//          if (!wrote_base_file)
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+//          if (!wrote_surf_file)
+//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
+//        }
+
+//        if (Wrt_Vol || Wrt_Srf)
+//          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+//      }
+    
+//      /*--- Final broadcast (informing other procs that the base output
+//       file was written). ---*/
+    
+//#ifdef HAVE_MPI
+//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+//#endif
+//    }
+//  }
+}
+
+void COutputLegacy::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+
+  unsigned short iDim;
+  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short nDim = geometry->GetnDim();
+
+  unsigned long iVar, jVar;
+  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE;
+  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
+
+  stringstream varname;
+
+  /*--- Use a switch statement to decide how many solver containers we have
+   in this zone for output. ---*/
+
+  switch (Kind_Solver) {
+    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
+    case FEM_RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
+    default: SecondIndex = NONE; break;
+  }
+
+  nVar_First = solver[FirstIndex]->GetnVar();
+  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
+  nVar_Consv_Par = nVar_First + nVar_Second;
+
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: Register the variables that will be output. To register a  ---*/
+  /*---         variable, two things are required. First, increment the    ---*/
+  /*---         counter for the number of variables (nVar_Par), which      ---*/
+  /*---         controls the size of the data structure allocation, i.e.,  ---*/
+  /*---         the number of columns in an nPoint x nVar structure.       ---*/
+  /*---         Second, add a name for the variable to the vector that     ---*/
+  /*---         holds the string names.                                    ---*/
+  /*--------------------------------------------------------------------------*/
+
+  /*--- All output files first need the grid coordinates. ---*/
+
+  nVar_Par  = 1; Variable_Names.push_back("x");
+  nVar_Par += 1; Variable_Names.push_back("y");
+  if (geometry->GetnDim() == 3) {
+    nVar_Par += 1; Variable_Names.push_back("z");
+  }
+
+  /*--- At a mininum, the restarts and visualization files need the
+   conservative variables, so these follow next. ---*/
+
+  nVar_Par += nVar_Consv_Par;
+
+  Variable_Names.push_back("Density");
+  Variable_Names.push_back("X-Momentum");
+  Variable_Names.push_back("Y-Momentum");
+  if (geometry->GetnDim() == 3) Variable_Names.push_back("Z-Momentum");
+  Variable_Names.push_back("Energy");
+
+  /*--- Eventually, turbulence model from second container goes here. ---*/
+
+  if (!config->GetLow_MemoryOutput()) {
+
+    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
+
+    nVar_Par += 1;
+    Variable_Names.push_back("Pressure");
+
+    nVar_Par += 3;
+    Variable_Names.push_back("Temperature");
+    if (config->GetOutput_FileFormat() == PARAVIEW){
+      Variable_Names.push_back("Pressure_Coefficient");
+    } else {
+      Variable_Names.push_back("C<sub>p</sub>");
+    }
+    Variable_Names.push_back("Mach");
+
+    /*--- New variables get registered here before the end of the loop. ---*/
+    
+    if (Kind_Solver == FEM_NAVIER_STOKES){
+      nVar_Par += 1;
+      Variable_Names.push_back("Laminar_Viscosity");
+    }
+    if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
+      nVar_Par += 1;
+      Variable_Names.push_back("Eddy_Viscosity");
+    }
+  }
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  /*--- Get a pointer to the fluid model class from the DG-FEM solver
+   so that we can access the states below. ---*/
+
+  CFluidModel *DGFluidModel = solver[FLOW_SOL]->GetFluidModel();
+
+  /*--- Allocate the local data structure now that we know how many
+   variables are in the output. ---*/
+
+  Local_Data = new su2double*[nLocalPoint_Sort];
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+    Local_Data[iPoint] = new su2double[nVar_Par];
+  }
+
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
+  /*---         the restart and vizualization files. Note that we need to  ---*/
+  /*---         increment the iVar variable after each variable load.      ---*/
+  /*---         The idea is that we're filling up the columns of field     ---*/
+  /*---         data for each iPoint (row) of the data structure.          ---*/
+  /*---         This data will then be sorted, communicated, and written   ---*/
+  /*---         to files automatically after this routine. Note that the   ---*/
+  /*---         ordering of the data loading MUST match the order of the   ---*/
+  /*---         variable registration above for the files to be correct.   ---*/
+  /*--------------------------------------------------------------------------*/
+
+  jPoint = 0;
+
+  /*--- Access the solution by looping over the owned volume elements. ---*/
+
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+    /* Set the pointers for the solution for this element. */
+
+    const unsigned long offset = nVar_First*volElem[l].offsetDOFsSolLocal;
+    su2double *solDOFs         = solver[FirstIndex]->GetVecSolDOFs() + offset;
+
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+
+      /*--- Restart the column index with each new point. ---*/
+
+      iVar = 0;
+
+      /*--- Get the conservative variables for this particular DOF. ---*/
+
+      const su2double *U = solDOFs + j*nVar_First;
+
+      /*--- Load the coordinate values of the solution DOFs. ---*/
+
+      const su2double *coor = volElem[l].coorSolDOFs.data() + j*nDim;
+      for(unsigned short k=0; k<nDim; ++k) {
+        Local_Data[jPoint][iVar] = coor[k];
+        iVar++;
+      }
+
+      /* Load the conservative variables. */
+
+      for(jVar=0; jVar < nVar_First; ++jVar) {
+        Local_Data[jPoint][iVar] = U[jVar];
+        iVar++;
+      }
+
+      /*--- Prepare the primitive states. ---*/
+
+      const su2double DensityInv = 1.0/U[0];
+      su2double vel[3], Velocity2 = 0.0;
+      for(iDim=0; iDim<nDim; ++iDim) {
+        vel[iDim] = U[iDim+1]*DensityInv;
+        Velocity2 += vel[iDim]*vel[iDim];
+      }
+      su2double StaticEnergy = U[nDim+1]*DensityInv - 0.5*Velocity2;
+      DGFluidModel->SetTDState_rhoe(U[0], StaticEnergy);
+
+      /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
+
+      Local_Data[jPoint][iVar] = DGFluidModel->GetPressure(); iVar++;
+      Local_Data[jPoint][iVar] = DGFluidModel->GetTemperature(); iVar++;
+      Local_Data[jPoint][iVar] = DGFluidModel->GetCp(); iVar++;
+      Local_Data[jPoint][iVar] = sqrt(Velocity2)/DGFluidModel->GetSoundSpeed(); iVar++;
+
+      /*--- New variables can be loaded to the Local_Data structure here,
+       assuming they were registered above correctly. ---*/
+
+      if (Kind_Solver == FEM_NAVIER_STOKES){
+        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
+      }
+      if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
+        // todo: Export Eddy instead of Laminar viscosity
+        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
+      }
+
+      /*--- Increment the point counter. ---*/
+
+      jPoint++;
+    }
+  }
+
+}
+
+void COutputLegacy::PrepareOffsets(CConfig *config, CGeometry *geometry) {
+
+  unsigned long iPoint;
+
+  /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
+
+  unsigned short KindSolver = config->GetKind_Solver();
+  bool fem_solver = ((KindSolver == FEM_EULER) ||
+                     (KindSolver == FEM_NAVIER_STOKES) ||
+                     (KindSolver == FEM_RANS) ||
+                     (KindSolver == FEM_LES));
+
+  /*--- Reset point sorting counters ---*/
+
+  nGlobalPoint_Sort = 0;
+  nLocalPoint_Sort  = 0;
+
+  /*--- Prepare the offsets for the FV solver ---*/
+
+  if (!fem_solver) {
+
+    /*--- Search all send/recv boundaries on this partition for any periodic
+     nodes that were part of the original domain. We want to recover these
+     for visualization purposes. ---*/
+
+    unsigned long iVertex;
+    bool isPeriodic;
+
+    Local_Halo_Sort = new int[geometry->GetnPoint()];
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      Local_Halo_Sort[iPoint] = !geometry->node[iPoint]->GetDomain();
+
+    for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+
+        /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+          if (isPeriodic) Local_Halo_Sort[iPoint] = false;
+        }
+      }
+    }
+
+    /*--- Sum total number of nodes that belong to the domain ---*/
+
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo_Sort[iPoint] == false)
+        nLocalPoint_Sort++;
+
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
+                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+    nGlobalPoint_Sort = nLocalPoint_Sort;
+#endif
+
+    /*--- Set a final variable for the number of points in the restart
+     file. We do not write the periodic points for the FV solver, even if
+     they show up in the viz. files. ---*/
+
+    nPoint_Restart = geometry->GetGlobal_nPointDomain();
+
+  } else {
+
+    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+     geometrical information for the FEM DG solver. ---*/
+
+    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+    /*--- Update the solution by looping over the owned volume elements. ---*/
+
+    for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+      /* Count up the number of local points we have for allocating storage. */
+
+      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+        nLocalPoint_Sort++;
+      }
+    }
+
+    Local_Halo_Sort = new int[nLocalPoint_Sort];
+    for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
+      Local_Halo_Sort[iPoint] = false;
+
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
+                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+    nGlobalPoint_Sort = nLocalPoint_Sort;
+#endif
+
+    /*--- Set a final variable for the number of points in the restart
+     file. We do not write the periodic points for the FV solver, even if
+     they show up in the viz. files. ---*/
+
+    nPoint_Restart = nGlobalPoint_Sort;
+
+  }
+
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+
+  beg_node = new unsigned long[size];
+  end_node = new unsigned long[size];
+
+  nPoint_Lin = new unsigned long[size];
+  nPoint_Cum = new unsigned long[size+1];
+
+  unsigned long total_points = 0;
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
+    total_points  += nPoint_Lin[ii];
+  }
+
+  /*--- Get the number of remainder points after the even division. ---*/
+
+  unsigned long remainder = nGlobalPoint_Sort - total_points;
+  for (unsigned long ii = 0; ii < remainder; ii++) {
+    nPoint_Lin[ii]++;
+  }
+
+  /*--- Store the local number of nodes on each proc in the linear
+   partitioning, the beginning/end index, and the linear partitioning
+   within an array in cumulative storage format. ---*/
+
+  beg_node[0] = 0;
+  end_node[0] = beg_node[0] + nPoint_Lin[0];
+  nPoint_Cum[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    beg_node[ii]   = end_node[ii-1];
+    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
+    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
+  }
+  nPoint_Cum[size] = nGlobalPoint_Sort;
+  
+}
+
+void COutputLegacy::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+
+  /*--- Flags identifying the types of files to be written. ---*/
+
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+
+  /*--- Sort volumetric grid connectivity. ---*/
+
+  if (Wrt_Vol) {
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting volumetric grid connectivity." << endl;
+
+    SortVolumetricConnectivity_FEM(config, geometry, TRIANGLE     );
+    SortVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL);
+    SortVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON  );
+    SortVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON   );
+    SortVolumetricConnectivity_FEM(config, geometry, PRISM        );
+    SortVolumetricConnectivity_FEM(config, geometry, PYRAMID      );
+
+  }
+
+  /*--- Sort surface grid connectivity. ---*/
+
+  if (Wrt_Srf) {
+
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting surface grid connectivity." << endl;
+
+    SortSurfaceConnectivity_FEM(config, geometry, LINE         );
+    SortSurfaceConnectivity_FEM(config, geometry, TRIANGLE     );
+    SortSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);
+
+  }
+
+  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+
+  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+  nSurf_Elem_Par   = nTotal_Surf_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+}
+
+void COutputLegacy::SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+
+}
+
+void COutputLegacy::SortSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+
+}
+
+void COutputLegacy::SortOutputData_FEM(CConfig *config, CGeometry *geometry) {
+
+  unsigned long iProcessor;
+  unsigned long iPoint, Global_Index;
+
+  /* For convenience, set the total number of variables stored at each DOF. */
+
+  int VARS_PER_POINT = nVar_Par;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+
+  //map<unsigned long, unsigned long> mapLocal2Global;
+  vector<unsigned long> globalID;
+
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+    /* Loop over the DOFs for this element and store the solution. */
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+    }
+  }
+
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Flag = new int[size];
+
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+    nPoint_Flag[ii]= -1;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
+
+    /*--- Get the global index of the current point. ---*/
+
+    Global_Index = globalID[iPoint];
+
+    /*--- Search for the processor that owns this point ---*/
+
+    iProcessor = Global_Index/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Cum[iProcessor])
+      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+
+    /*--- If we have not visted this node yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      nPoint_Send[iProcessor+1]++;
+    }
+
+  }
+
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+
+  /*--- Prepare to send coordinates. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
+
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
+
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+
+  /*--- Allocate memory to hold the connectivity that we are sending. ---*/
+
+  su2double *connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+
+  /*--- Allocate arrays for sending the global ID. ---*/
+
+  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
+    idSend[ii] = 0;
+
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
+
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
+
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+
+    /*--- Get the index of the current point. ---*/
+
+    Global_Index = globalID[iPoint];
+
+    /*--- Search for the processor that owns this point. ---*/
+
+    iProcessor = Global_Index/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Cum[iProcessor])
+      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+
+    /*--- Load data into the buffer for sending. ---*/
+
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
+
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      unsigned long nn = index[iProcessor];
+
+      /*--- Load the data values. ---*/
+
+      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+        connSend[nn] = Local_Data[iPoint][kk]; nn++;
+      }
+
+      /*--- Load the global ID (minus offset) for sorting the
+       points once they all reach the correct processor. ---*/
+
+      nn = idIndex[iProcessor];
+      idSend[nn] = Global_Index - beg_node[iProcessor];
+
+      /*--- Increment the index by the message length ---*/
+
+      index[iProcessor]  += VARS_PER_POINT;
+      idIndex[iProcessor]++;
+
+    }
+
+  }
+
+  /*--- Free memory after loading up the send buffer. ---*/
+
+  delete [] index;
+  delete [] idIndex;
+
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+
+  su2double *connRecv = NULL;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
+    connRecv[ii] = 0;
+
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
+    idRecv[ii] = 0;
+
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the global IDs. ---*/
+
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+
+  /*--- Repeat the process to communicate the global IDs. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
+
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. First, allocate the
+   appropriate amount of memory for this section. ---*/
+
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
+      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+    }
+  }
+
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
+
+  nParallel_Poin = nPoint_Recv[size];
+
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+
+  /*--- Free temporary memory from communications ---*/
+
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] nPoint_Recv;
+  delete [] nPoint_Send;
+  delete [] nPoint_Flag;
+  
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
+    delete [] Local_Data[iPoint];
+  delete [] Local_Data;
+  
+}
+
+void COutputLegacy::SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry) {
+
+}

From 2727a8cb6940c384910cf33ede62cd3b798142c9 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 17 Jan 2019 15:19:49 +0100
Subject: [PATCH 098/539] Changes to enable FEA Output.

---
 SU2_CFD/include/output_structure.hpp     |  19 ++--
 SU2_CFD/src/SU2_CFD.cpp                  |   2 +-
 SU2_CFD/src/iteration_structure.cpp      |  31 +++++-
 SU2_CFD/src/output_direct_elasticity.cpp | 127 +++++++++--------------
 4 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4295b58a97b1..155c835a46cd 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1044,7 +1044,7 @@ class COutput {
 
 /*! \class CFlowOutput
  *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
 class CFlowOutput : public COutput {
@@ -1114,7 +1114,7 @@ class CFlowOutput : public COutput {
 
 /*! \class CFlowOutput
  *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
 class CIncFlowOutput : public COutput {
@@ -1183,7 +1183,7 @@ class CIncFlowOutput : public COutput {
 
 /*! \class CFEAOutput
  *  \brief Output class for FEA problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date May 24, 2018.
  */
 class CFEAOutput : public COutput {
@@ -1192,6 +1192,9 @@ class CFEAOutput : public COutput {
 protected:
 
   unsigned short nVar_FEM;
+  bool linear_analysis,
+       nonlinear_analysis,
+       dynamic;
 
 public:
 
@@ -1241,7 +1244,7 @@ class CFEAOutput : public COutput {
 
 /*! \class CHeatOutput
  *  \brief Output class for heat problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
 class CHeatOutput : public COutput {
@@ -1301,7 +1304,7 @@ class CHeatOutput : public COutput {
 
 /*! \class CAdjFlowOutput
  *  \brief Output class for flow continuous adjoint problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
 class CAdjFlowOutput : public COutput {
@@ -1365,7 +1368,7 @@ class CAdjFlowOutput : public COutput {
 
 /*! \class CDiscAdjFlowOutput
  *  \brief Output class for flow discrete adjoint problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
 class CDiscAdjFlowOutput : public COutput {
@@ -1430,7 +1433,7 @@ class CDiscAdjFlowOutput : public COutput {
 
 /*! \class CDiscAdjFlowOutput
  *  \brief Output class for flow discrete adjoint problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
 class CDiscAdjFlowIncOutput : public COutput {
@@ -1495,7 +1498,7 @@ class CDiscAdjFlowIncOutput : public COutput {
 
 /*! \class CDiscAdjFEAOutput
  *  \brief Output class for elasticity discrete adjoint problems.
- *  \author R. Sanchez.
+ *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
 class CDiscAdjFEAOutput : public COutput {
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 3d670ef3ee1a..0aa940c1410d 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) {
 
   }
   else if ( (config->GetKind_Solver() == FEM_ELASTICITY ||
-        config->GetKind_Solver() == DISC_ADJ_FEM ) ) {
+             config->GetKind_Solver() == DISC_ADJ_FEM ) ) {
 
     /*--- Single zone problem: instantiate the single zone driver class. ---*/
     
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 61bc8bfd3332..df248a9c5a53 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1463,8 +1463,6 @@ void CFEAIteration::Iterate(COutput *output,
       /*----------------- If the solver is non-linear, we need to subiterate using a Newton-Raphson approach ----------------------*/
 
       for (IntIter = 1; IntIter < config_container[val_iZone]->GetDyn_nIntIter(); IntIter++) {
-        
-        config_container[val_iZone]->SetInnerIter(IntIter);
 
         /*--- Limits to only one structural iteration for the discrete adjoint FEM problem ---*/
         if (disc_adj_fem) break;
@@ -1474,6 +1472,7 @@ void CFEAIteration::Iterate(COutput *output,
         write_output = output->PrintOutput(IntIter-1, config_container[val_iZone]->GetWrt_Con_Freq_DualTime());
         if (write_output) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
+        config_container[val_iZone]->SetInnerIter(IntIter);
         config_container[val_iZone]->SetIntIter(IntIter);
 
         integration_container[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry_container, solver_container, numerics_container,
@@ -1784,7 +1783,28 @@ bool CFEAIteration::Monitor(COutput *output,
     CVolumetricMovement ***grid_movement,
     CFreeFormDefBox*** FFDBox,
     unsigned short val_iZone,
-    unsigned short val_iInst)     { return false; }
+    unsigned short val_iInst)     {
+
+  bool StopCalc = false;
+
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime - StartTime;
+
+  /*--- If convergence was reached --*/
+  StopCalc = integration_container[val_iZone][INST_0][FEA_SOL]->GetConvergence();
+
+  if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
+    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+  }
+
+  return StopCalc;
+
+}
+
 void CFEAIteration::Postprocess(COutput *output,
                                           CIntegration ****integration_container,
                                           CGeometry ****geometry_container,
@@ -1811,12 +1831,17 @@ void CFEAIteration::Solve(COutput *output,
                                 ) {
 
   bool multizone = config_container[val_iZone]->GetMultizone_Problem();
+  bool Convergence = false;
 
   /*------------------ Structural subiteration ----------------------*/
   Iterate(output, integration_container, geometry_container,
       solver_container, numerics_container, config_container,
       surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
+  Convergence = Monitor(output, integration_container, geometry_container,
+                        solver_container, numerics_container, config_container,
+                        surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+
   /*--- Write the convergence history for the structure (only screen output) ---*/
 //  if (multizone) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 605b272c23c7..f926dbc2c072 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -39,8 +39,9 @@
 
 CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
-  bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
+  nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
+  dynamic = (config->GetTime_Domain() || (config->GetDynamic_Analysis() == DYNAMIC));  // Dynamic analysis.
   
   /*--- Initialize number of variables ---*/
   if (linear_analysis) nVar_FEM = nDim;
@@ -48,21 +49,33 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   
   nDim = geometry->GetnDim();
 
+  /*--- Default fields for screen output ---*/
   if (nRequestedHistoryFields == 0){
     RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
+  /*--- Default fields for screen output ---*/
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("OUTER_ITER");
+    if (dynamic) RequestedScreenFields.push_back("TIME_ITER");
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_UTOL");
-    RequestedScreenFields.push_back("RMS_RTOL");
+    if(linear_analysis){
+      RequestedScreenFields.push_back("RMS_DISP_X");
+      RequestedScreenFields.push_back("RMS_DISP_Y");
+      RequestedScreenFields.push_back("RMS_DISP_Z");
+    }
+    if(nonlinear_analysis){
+      RequestedScreenFields.push_back("RMS_UTOL");
+      RequestedScreenFields.push_back("RMS_RTOL");
+      RequestedScreenFields.push_back("RMS_ETOL");
+    }
     RequestedScreenFields.push_back("VMS");
     nRequestedScreenFields = RequestedScreenFields.size();
   }
   
+  /*--- Default fields for volume output ---*/
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("DISPLACEMENT");
@@ -70,7 +83,6 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
 
-  
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Structure)";
   MultiZoneHeaderString = ss.str();
@@ -97,10 +109,6 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 
   CSolver* fea_solver = solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL];
   
-  
-  bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-  bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-
   SetHistoryOutputValue("TIME_ITER",  config[val_iZone]->GetTimeIter());    
   SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
   SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
@@ -113,11 +121,6 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
 
   
   if (linear_analysis){
-    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_RMS(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_RMS(2)));    
-    }
     SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
@@ -127,40 +130,11 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
     SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
     SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));    
-    }
-    SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_FEM(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
+      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));
     }
   }
   
-  if (linear_analysis){
-    SetHistoryOutputValue("MAX_UTOL", log10(fea_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_RTOL", log10(fea_solver->GetRes_Max(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("MAX_ETOL", log10(fea_solver->GetRes_Max(2)));    
-    }
-    SetHistoryOutputValue("MAX_DISP_X", log10(fea_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_DISP_Y", log10(fea_solver->GetRes_Max(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("MAX_DISP_Z", log10(fea_solver->GetRes_Max(2)));    
-    }
-  } else if (nonlinear_analysis){
-    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));    
-    }
-    SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_FEM(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_FEM(2)));    
-    }
-  }
-  
-  if (config[val_iZone]->GetMultizone_Problem()){
+  if (multizone){
     SetHistoryOutputValue("BGS_UTOL", log10(fea_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_RTOL", log10(fea_solver->GetRes_BGS(1)));
     if (nVar_FEM == 3){
@@ -173,7 +147,6 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
     }
   }
   
-  
   SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
   SetHistoryOutputValue("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
   SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
@@ -192,30 +165,24 @@ void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
-  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  
-  AddHistoryOutput("MAX_UTOL",   "max[U]", FORMAT_FIXED,  "MAX_RES");
-  AddHistoryOutput("MAX_RTOL",   "max[R]", FORMAT_FIXED,  "MAX_RES");
-  AddHistoryOutput("MAX_ETOL",   "max[E]", FORMAT_FIXED,  "MAX_RES");
-  AddHistoryOutput("MAX_DISP_X", "max[DispX]", FORMAT_FIXED,  "MAX_RES");
-  AddHistoryOutput("MAX_DISP_Y", "max[DispY]", FORMAT_FIXED,  "MAX_RES");
-  AddHistoryOutput("MAX_DISP_Z", "max[DispZ]", FORMAT_FIXED,  "MAX_RES");
-  
-  AddHistoryOutput("BGS_UTOL",   "bgs[U]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_RTOL",   "bgs[R]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_ETOL",   "bgs[E]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  
-  
-  
-  AddHistoryOutput("VMS",            "VonMises_Stress", FORMAT_FIXED, "VMS");
+  if (nonlinear_analysis){
+    AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_UTOL",   "bgs[U]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_RTOL",   "bgs[R]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_ETOL",   "bgs[E]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  }
+  if (linear_analysis){
+    AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  }
+
+  AddHistoryOutput("VMS",            "VonMises", FORMAT_SCIENTIFIC, "VMS");
   AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
   AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "LOAD_RAMP");
   
@@ -235,17 +202,19 @@ void CFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **
   SetVolumeOutputValue("DISPLACEMENT-Y", iPoint, Node_Struc->GetSolution(1));
   if (nDim == 3) SetVolumeOutputValue("DISPLACEMENT-Z", iPoint, Node_Struc->GetSolution(2));
   
-  SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Struc->GetSolution_Vel(0));
-  SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Struc->GetSolution_Vel(1));
-  if (nDim == 3) SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Struc->GetSolution_Vel(2));
+  if(dynamic){
+    SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Struc->GetSolution_Vel(0));
+    SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Struc->GetSolution_Vel(1));
+    if (nDim == 3) SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Struc->GetSolution_Vel(2));
   
-  SetVolumeOutputValue("ACCELERATION-X", iPoint, Node_Struc->GetSolution_Accel(0));
-  SetVolumeOutputValue("ACCELERATION-Y", iPoint, Node_Struc->GetSolution_Accel(1));
-  if (nDim == 3) SetVolumeOutputValue("ACCELERATION-Z", iPoint, Node_Struc->GetSolution_Accel(2));
+    SetVolumeOutputValue("ACCELERATION-X", iPoint, Node_Struc->GetSolution_Accel(0));
+    SetVolumeOutputValue("ACCELERATION-Y", iPoint, Node_Struc->GetSolution_Accel(1));
+    if (nDim == 3) SetVolumeOutputValue("ACCELERATION-Z", iPoint, Node_Struc->GetSolution_Accel(2));
+  }
   
   SetVolumeOutputValue("STRESS-XX", iPoint, Node_Struc->GetStress_FEM()[0]);
   SetVolumeOutputValue("STRESS-YY", iPoint, Node_Struc->GetStress_FEM()[1]);
-  SetVolumeOutputValue("STRESS-YY", iPoint, Node_Struc->GetStress_FEM()[2]);
+  SetVolumeOutputValue("STRESS-XY", iPoint, Node_Struc->GetStress_FEM()[2]);
   if (nDim == 3){
     SetVolumeOutputValue("STRESS-ZZ", iPoint, Node_Struc->GetStress_FEM()[3]);
     SetVolumeOutputValue("STRESS-XZ", iPoint, Node_Struc->GetStress_FEM()[4]);
@@ -293,8 +262,6 @@ inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dual
 
 inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {  
   
-  bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-
   bool write_header;
   if (nonlinear_analysis) write_header = (config->GetIntIter() == 0);
   else write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));

From b5464f242e81c55d766efb7a2b5f856efeb60482 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 17 Jan 2019 15:21:12 +0100
Subject: [PATCH 099/539] Comment out request for conservative variables -
 aspect to discuss.

---
 SU2_CFD/src/output_structure.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 24b3d747bc5e..89ca3bb3b23b 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -11087,10 +11087,10 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     nRequestedVolumeFields++;
   }
   
-  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "CONSERVATIVE") != RequestedVolumeFields.end())) {
-    RequestedVolumeFields.push_back("CONSERVATIVE");
-    nRequestedVolumeFields++;
-  }
+//  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "CONSERVATIVE") != RequestedVolumeFields.end())) {
+//    RequestedVolumeFields.push_back("CONSERVATIVE");
+//    nRequestedVolumeFields++;
+//  }
   
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   

From 0af40b2243bf8ffb14a46bae217596a2cbe03444 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Fri, 18 Jan 2019 16:32:53 +0100
Subject: [PATCH 100/539] Fix some errors on structural output and added option
 to test regression cases with new output.

---
 SU2_CFD/src/iteration_structure.cpp           |  2 +
 SU2_CFD/src/output_direct_elasticity.cpp      | 43 +++++++------------
 SU2_CFD/src/output_direct_mean.cpp            |  5 +--
 SU2_DEF/obj/Makefile.am                       |  1 +
 SU2_DOT/obj/Makefile.am                       |  2 +
 SU2_SOL/obj/Makefile.am                       |  1 +
 TestCases/TestCase.py                         |  9 +++-
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  2 +
 .../fea_fsi/StatBeam_3d/configBeam_3d.cfg     |  1 +
 .../fea_fsi/WallChannel_2d/configFEA.cfg      | 10 +++--
 .../fea_fsi/WallChannel_2d/configFlow.cfg     | 10 +++--
 TestCases/serial_regression.py                |  2 +
 12 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index df248a9c5a53..3ff965c337af 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1797,6 +1797,8 @@ bool CFEAIteration::Monitor(COutput *output,
   /*--- If convergence was reached --*/
   StopCalc = integration_container[val_iZone][INST_0][FEA_SOL]->GetConvergence();
 
+  solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
+
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
     output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
   }
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index f926dbc2c072..f77b2d200e3d 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -43,11 +43,11 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   dynamic = (config->GetTime_Domain() || (config->GetDynamic_Analysis() == DYNAMIC));  // Dynamic analysis.
   
+  nDim = geometry->GetnDim();
+
   /*--- Initialize number of variables ---*/
   if (linear_analysis) nVar_FEM = nDim;
   if (nonlinear_analysis) nVar_FEM = 3;
-  
-  nDim = geometry->GetnDim();
 
   /*--- Default fields for screen output ---*/
   if (nRequestedHistoryFields == 0){
@@ -124,7 +124,7 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
     SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_RMS(1)));
     if (nVar_FEM == 3){
-      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_RMS(2)));    
+      SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_RMS(2)));
     }
   } else if (nonlinear_analysis){
     SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
@@ -135,16 +135,9 @@ void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
   }
   
   if (multizone){
-    SetHistoryOutputValue("BGS_UTOL", log10(fea_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_RTOL", log10(fea_solver->GetRes_BGS(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("BGS_ETOL", log10(fea_solver->GetRes_BGS(2)));    
-    }
     SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
-    if (nVar_FEM == 3){
-      SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));    
-    }
+    if (nVar_FEM == 3) SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));
   }
   
   SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
@@ -165,22 +158,18 @@ void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
-  if (nonlinear_analysis){
-    AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_UTOL",   "bgs[U]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_RTOL",   "bgs[R]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_ETOL",   "bgs[E]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  }
-  if (linear_analysis){
-    AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-    AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  }
+
+  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+
+  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+
+  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
 
   AddHistoryOutput("VMS",            "VonMises", FORMAT_SCIENTIFIC, "VMS");
   AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 4e6f10dd56d5..73bae1c8bb80 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -77,7 +77,7 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) RequestedHistoryFields.push_back("TIME_ITER");    
+    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
     if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_DENSITY");
@@ -710,8 +710,7 @@ bool CFlowOutput::WriteScreen_Header(CConfig *config) {
 bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   bool write_output = false;
   
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime ){
+  if ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)){
     write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq_DualTime() == 0);
   }
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
diff --git a/SU2_DEF/obj/Makefile.am b/SU2_DEF/obj/Makefile.am
index e53210922e17..67fd33b26e48 100644
--- a/SU2_DEF/obj/Makefile.am
+++ b/SU2_DEF/obj/Makefile.am
@@ -55,6 +55,7 @@ ___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
   ../../SU2_CFD/src/libSU2Core_a-output_su2.o \
   ../../SU2_CFD/src/libSU2Core_a-output_paraview.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \  
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o
 
diff --git a/SU2_DOT/obj/Makefile.am b/SU2_DOT/obj/Makefile.am
index 24efce2478eb..4f61ca01c96d 100644
--- a/SU2_DOT/obj/Makefile.am
+++ b/SU2_DOT/obj/Makefile.am
@@ -65,6 +65,7 @@ su2_dot_ldadd += \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_su2.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_paraview.$(OBJEXT) \
+  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.$(OBJEXT) \
   ../../Common/lib/libSU2.a
 endif
@@ -78,6 +79,7 @@ su2_dot_ldadd += \
   ../../SU2_CFD/src/___bin_SU2_CFD_AD-output_fieldview.$(OBJEXT) \
   ../../SU2_CFD/src/___bin_SU2_CFD_AD-output_su2.$(OBJEXT) \
   ../../SU2_CFD/src/___bin_SU2_CFD_AD-output_paraview.$(OBJEXT) \
+  ../../SU2_CFD/src/___bin_SU2_CFD_AD-output_structure_legacy.$(OBJEXT) \
   ../../SU2_CFD/src/___bin_SU2_CFD_AD-variable_structure.$(OBJEXT) \
    ../../Common/lib/libSU2_AD.a
 endif
diff --git a/SU2_SOL/obj/Makefile.am b/SU2_SOL/obj/Makefile.am
index d41f1e92872e..a3dbb7e356f1 100644
--- a/SU2_SOL/obj/Makefile.am
+++ b/SU2_SOL/obj/Makefile.am
@@ -55,6 +55,7 @@ ___bin_SU2_SOL_LDADD = \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
   ../../SU2_CFD/src/libSU2Core_a-output_su2.o \
   ../../SU2_CFD/src/libSU2Core_a-output_paraview.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o \
   ../../Common/lib/libSU2.a
 
diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index ffcd4e901fd2..f690d39de90a 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -64,6 +64,9 @@ def __init__(self,tag_in):
         # Indicate whether to disable restart
         self.no_restart = False
 
+        # Indicate whether the new output is used
+        self.new_output = False        
+
         # The test condition. These must be set after initialization
         self.test_iter = 1
         self.ntest_vals = 4
@@ -138,7 +141,11 @@ def run_test(self):
                     if line.find('Begin Solver') > -1:
                         start_solver=True
                 else:   # Found the --Begin solver --- line; parse the input
-                    raw_data = line.split()
+                    if self.new_output:
+                        raw_data = line.strip() # Strip removes whitespaces head-tail
+                        raw_data = raw_data[1:-1].split('|') # Remove heat-tail bars before splitting 
+                    else:
+                        raw_data = line.split()
                     try:
                         iter_number = int(raw_data[0])
                         if self.unsteady:
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index dc07595b8cdb..faa8be94ca6d 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -12,6 +12,7 @@ MATH_PROBLEM= DIRECT
 GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
 MESH_FILENAME= meshBeam_2d.su2
+SINGLEZONE_DRIVER=YES
 RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
@@ -28,6 +29,7 @@ DYNAMIC_ANALYSIS= YES
 DYN_TIMESTEP= 0.01
 DYN_TIME= 0.1
 EXT_ITER=2
+TIME_ITER=2
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.2601
 NEWMARK_GAMMA=0.52
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index 20dce7dc92be..bf79f6b7a711 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -10,6 +10,7 @@
 PHYSICAL_PROBLEM= ELASTICITY
 MATH_PROBLEM= DIRECT
 GEOMETRIC_CONDITIONS= SMALL_DEFORMATIONS
+SINGLEZONE_DRIVER=YES
 MATERIAL_MODEL= LINEAR_ELASTIC
 MESH_FILENAME= meshBeam_3d.su2
 ELASTICITY_MODULUS=3E7
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index d690d7c6be97..ce742b1ba0b0 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -18,6 +18,8 @@ STAT_RELAX_PARAMETER= 0.5
 RESIDUAL_REDUCTION_FSI= 5
 RESIDUAL_MINVAL_FSI= -8
 
+%SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DISP_X, BGS_DISP_Y)
+
 LINEAR_SOLVER= FGMRES
 LINEAR_SOLVER_PREC= LU_SGS
 LINEAR_SOLVER_ERROR= 1E-6
@@ -52,10 +54,10 @@ MESH_FILENAME= meshFEA.su2
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 
-WRT_CON_FREQ= 100
-WRT_CON_FREQ_DUALTIME= 100
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 100
+WRT_CON_FREQ= 1
+WRT_CON_FREQ_DUALTIME= 1
+WRT_SOL_FREQ= 1
+WRT_SOL_FREQ_DUALTIME= 1
 
 VOLUME_STRUCTURE_FILENAME= results_wall
 RESTART_STRUCTURE_FILENAME= solution_wall.dat
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index 1e76daae45da..a0071dabf11e 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -13,6 +13,8 @@ GRID_MOVEMENT_KIND = FLUID_STRUCTURE
 UNST_INT_ITER= 50
 INNER_ITER=50
 
+%SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DENSITY, BGS_ENERGY)
+
 MATH_PROBLEM= DIRECT
 RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
@@ -77,10 +79,10 @@ DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
 
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
-WRT_CON_FREQ= 100
-WRT_CON_FREQ_DUALTIME= 100
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 100
+WRT_CON_FREQ= 1
+WRT_CON_FREQ_DUALTIME= 1
+WRT_SOL_FREQ= 1
+WRT_SOL_FREQ_DUALTIME= 1
 
 VOLUME_FLOW_FILENAME= results_flow
 RESTART_FLOW_FILENAME= solution_flow.dat
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index efef7d87b429..c0b89c1c4511 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -940,6 +940,7 @@ def main():
     statbeam3d           = TestCase('statbeam3d')
     statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
     statbeam3d.cfg_file  = "configBeam_3d.cfg"
+    statbeam3d.new_output= True
     statbeam3d.test_iter = 0
     statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
     statbeam3d.su2_exec  = "SU2_CFD"
@@ -951,6 +952,7 @@ def main():
     dynbeam2d           = TestCase('dynbeam2d')
     dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
     dynbeam2d.cfg_file  = "configBeam_2d.cfg"
+    dynbeam2d.new_output= True
     dynbeam2d.test_iter = 6
     dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
     dynbeam2d.su2_exec  = "SU2_CFD"

From 70a505eae104875e5774e19adc4325c8397932a2 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Fri, 18 Jan 2019 16:35:08 +0100
Subject: [PATCH 101/539] Add file to locally test regressions with new output.

---
 TestCases/new_output_regression.py | 138 +++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 TestCases/new_output_regression.py

diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
new file mode 100644
index 000000000000..59bb53c0abf8
--- /dev/null
+++ b/TestCases/new_output_regression.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+
+## \file serial_regression.py
+#  \brief Python script for automated regression testing of SU2 examples
+#  \author A. Aranake, A. Campos, T. Economon, T. Lukaczyk, S. Padron
+#  \version 6.1.0 "Falcon"
+#
+# The current SU2 release has been coordinated by the
+# SU2 International Developers Society <www.su2devsociety.org>
+# with selected contributions from the open-source community.
+#
+# The main research teams contributing to the current release are:
+#  - Prof. Juan J. Alonso's group at Stanford University.
+#  - Prof. Piero Colonna's group at Delft University of Technology.
+#  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+#  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+#  - Prof. Rafael Palacios' group at Imperial College London.
+#  - Prof. Vincent Terrapon's group at the University of Liege.
+#  - Prof. Edwin van der Weide's group at the University of Twente.
+#  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+#
+# Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+#                      Tim Albring, and the SU2 contributors.
+#
+# SU2 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, or (at your option) any later version.
+#
+# SU2 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import print_function, division, absolute_import
+import sys
+from TestCase import TestCase
+
+def main():
+    '''This program runs SU2 and ensures that the output matches specified values. 
+       This will be used to do checks when code is pushed to github 
+       to make sure nothing is broken. '''
+
+    test_list = []
+
+    ##########################
+    ### FEA - FSI          ###
+    ##########################
+
+    # Static beam, 3d
+    statbeam3d           = TestCase('statbeam3d')
+    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
+    statbeam3d.cfg_file  = "configBeam_3d.cfg"
+    statbeam3d.new_output= True
+    statbeam3d.test_iter = 0
+    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
+    statbeam3d.su2_exec  = "SU2_DEV_CFD"
+    statbeam3d.timeout   = 1600
+    statbeam3d.tol       = 0.00001
+    test_list.append(statbeam3d)
+
+    # # Dynamic beam, 2d
+    dynbeam2d           = TestCase('dynbeam2d')
+    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
+    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
+    dynbeam2d.unsteady  = True
+    dynbeam2d.new_output= True  
+    dynbeam2d.test_iter = 6 
+    dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
+    dynbeam2d.su2_exec  = "SU2_DEV_CFD"
+    dynbeam2d.timeout   = 1600
+    dynbeam2d.tol       = 0.00001
+    test_list.append(dynbeam2d)
+
+    # # FSI, 2d
+    fsi2d           = TestCase('fsi2d')
+    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
+    fsi2d.cfg_file  = "configFSI.cfg"
+    fsi2d.test_iter = 4
+    fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
+    fsi2d.su2_exec  = "SU2_DEV_CFD"
+    fsi2d.timeout   = 1600
+    fsi2d.tol       = 0.00001
+    test_list.append(fsi2d)    
+
+    # # FSI, 2D airfoil with RBF interpolation
+    # airfoilRBF           = TestCase('airfoil_fsi_rbf')
+    # airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
+    # airfoilRBF.cfg_file  = "config.cfg"
+    # airfoilRBF.test_iter = 50
+    # airfoilRBF.test_vals = [-8.000964, -2.600088, 0.276433, 0.000824] #last 4 columns
+    # airfoilRBF.su2_exec  = "SU2_CFD"
+    # airfoilRBF.timeout   = 1600
+    # airfoilRBF.tol       = 0.00001
+    # test_list.append(airfoilRBF)
+   
+    # ##########################
+    # ### Zonal multiphysics ###
+    # ##########################
+
+    # # CHT incompressible
+    # cht_incompressible           = TestCase('cht_incompressible')
+    # cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
+    # cht_incompressible.cfg_file  = "config.cfg"
+    # cht_incompressible.test_iter = 10
+    # cht_incompressible.test_vals = [0.000000, 0.000000, -7.685301, -12947.783696] #last 4 columns
+    # cht_incompressible.su2_exec  = "SU2_CFD"
+    # cht_incompressible.timeout   = 1600
+    # cht_incompressible.tol       = 0.00001
+    # test_list.append(cht_incompressible)
+
+    ######################################
+    ### RUN TESTS                      ###
+    ######################################  
+
+    pass_list = [ test.run_test() for test in test_list ]
+
+    # Tests summary
+    print('==================================================================')
+    print('Summary of the serial tests')
+    print('python version:', sys.version)
+    for i, test in enumerate(test_list):
+        if (pass_list[i]):
+            print('  passed - %s'%test.tag)
+        else:
+            print('* FAILED - %s'%test.tag)
+    
+    if all(pass_list):
+        sys.exit(0)
+    else:
+        sys.exit(1)
+    # done
+
+if __name__ == '__main__':
+    main()

From 6459674ecd98cd1a78b93642350f3df0cf126dd3 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Tue, 22 Jan 2019 10:49:46 +0100
Subject: [PATCH 102/539] Preliminary multi-zone implementation.

---
 SU2_CFD/include/driver_structure.hpp    |   2 +
 SU2_CFD/include/output_driver.hpp       | 182 +++++++++++++++++++
 SU2_CFD/include/output_structure.hpp    |  14 +-
 SU2_CFD/obj/Makefile.am                 |   1 +
 SU2_CFD/src/driver_direct_multizone.cpp |   6 +
 SU2_CFD/src/driver_structure.cpp        |   6 +
 SU2_CFD/src/output_driver.cpp           | 223 +++++++++++++++++++++++-
 7 files changed, 424 insertions(+), 10 deletions(-)
 create mode 100644 SU2_CFD/include/output_driver.hpp

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index f1c5f965c2aa..e29b9c4271f5 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -43,6 +43,7 @@
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
 #include "output_structure.hpp"
+#include "output_driver.hpp"
 #include "numerics_structure.hpp"
 #include "transfer_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
@@ -97,6 +98,7 @@ class CDriver {
   CNumerics ******numerics_container;            /*!< \brief Description of the numerical method (the way in which the equations are solved). */
   CConfig **config_container;                   /*!< \brief Definition of the particular problem. */
   CConfig *driver_config;                       /*!< \brief Definition of the driver configuration. */
+  CDriverOutput *driver_output;                 /*!< \brief Definition of the driver output. */
   CSurfaceMovement **surface_movement;          /*!< \brief Surface movement classes of the problem. */
   CVolumetricMovement ***grid_movement;          /*!< \brief Volume grid movement classes of the problem. */
   CFreeFormDefBox*** FFDBox;                    /*!< \brief FFD FFDBoxes of the problem. */
diff --git a/SU2_CFD/include/output_driver.hpp b/SU2_CFD/include/output_driver.hpp
new file mode 100644
index 000000000000..c8883321d031
--- /dev/null
+++ b/SU2_CFD/include/output_driver.hpp
@@ -0,0 +1,182 @@
+/*!
+ * \file output_driver.hpp
+ * \brief Headers of the main subroutines for screen and history output in multizone problems.
+ * \author R. Sanchez, T. Albring
+ * \version 6.1.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "../../Common/include/mpi_structure.hpp"
+
+#ifdef HAVE_CGNS
+  #include "cgnslib.h"
+#endif
+#ifdef HAVE_TECIO
+  #include "TECIO.h"
+#endif
+#include <fstream>
+#include <cmath>
+#include <time.h>
+#include <fstream>
+
+#include "output_structure.hpp"
+#include "../../Common/include/config_structure.hpp"
+
+using namespace std;
+
+/*!
+ * \class CDriverOutput
+ * \brief Class for writing the multizone output.
+ * \author R. Sanchez, T. Albring.
+ */
+class CDriverOutput {
+
+protected:
+
+  int rank, 	  /*!< \brief MPI Rank. */
+  size;       	/*!< \brief MPI Size. */
+
+  unsigned short nZone;
+
+  unsigned short field_width;         /*!< \brief Width of each column for the screen output (hardcoded for now) */
+
+
+  /** \brief Enum to identify the screen output format. */
+  enum ScreenOutputFormat {
+    FORMAT_INTEGER,         /*!< \brief Integer format. Example: 34 */
+    FORMAT_FIXED,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
+    FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */
+  };
+
+  enum HistoryFieldType {
+    TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
+    TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
+    TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */
+  };
+
+  string HistorySep;                  /*!< \brief Character which separates values in the history file */
+
+  /** \brief Structure to store information for a history output field.
+   *
+   *  The stored information is printed to the history file and to screen.
+   * Each individual instance represents a single field (i.e. column) in the history file or on screen.
+   */
+  struct HistoryOutputField {
+    string              FieldName;    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
+    su2double           Value;        /*!< \brief The value of the field. */
+    unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
+    string              OutputGroup;  /*!< \brief The group this field belongs to. */
+    unsigned short      FieldType;
+    HistoryOutputField() {}           /*!< \brief Default constructor. */
+    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype):
+      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype){}
+  };
+
+  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */
+  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */
+
+  std::vector<string> RequestedHistoryFields;
+  unsigned short nRequestedHistoryFields;
+  std::vector<string> RequestedScreenFields;
+  unsigned short nRequestedScreenFields;
+  char char_histfile[200];
+
+  ofstream HistFile;
+
+  PrintingToolbox::CTablePrinter* OuterConvergenceTable;
+
+  std::string MultiZoneHeaderString;
+
+  std::map<string, su2double> Init_Residuals;
+
+  map<string, Signal_Processing::RunningAverage> RunningAverages;
+
+public:
+
+  /*!
+   * \brief Constructor of the class.
+   */
+  CDriverOutput(CConfig **config);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDriverOutput(void);
+
+  /*!
+   * \brief Write the header of the screen and history file.
+   * \param[in] config - Definition of the particular problem.
+   */
+
+  void SetHeader(COutput **output, CSolver *****solver, CConfig **config);
+
+  /*!
+   * \brief Write the history file and the convergence on the screen for multizone computations.
+   * \param[in] output - Output information of the particular multizone problem.
+   * \param[in] config - Definition of the particular multizone problem.
+   */
+  void SetBody(COutput **output, CSolver *****solver, CConfig *driver_config, CConfig **config);
+
+  /*!
+   * \brief Load the history file fields for multizone computations.
+   * \param[in] output - Output information of the particular multizone problem.
+   * \param[in] config - Definition of the particular multizone problem.
+   */
+  void LoadHistoryData(COutput **output, CSolver *****solver, CConfig *config);
+
+  /*!
+   * \brief Write the history output fields for multizone computations.
+   * \param[in] output - Output information of the particular multizone problem.
+   * \param[in] config - Definition of the particular multizone problem.
+   */
+  void SetHistoryOutputFields(COutput **output, CSolver *****solver, CConfig **config);
+
+  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname , unsigned short field_type = TYPE_DEFAULT){
+    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
+    HistoryOutput_List.push_back(name);
+  }
+
+  inline void SetHistoryOutputValue(string name, su2double value){
+    if (HistoryOutput_Map.count(name) > 0){
+      HistoryOutput_Map[name].Value = value;
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+    }
+  }
+
+  void SetScreen_Header(CConfig *driver_config, CConfig **config);
+
+  void SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config);
+
+};
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 155c835a46cd..b0b3f6ffe6fa 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -2,7 +2,7 @@
  * \file output_structure.hpp
  * \brief Headers of the main subroutines for generating the file outputs.
  *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \author F. Palacios, T. Economon, M. Colonno, T. Albring, R. Sanchez
  * \version 6.1.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -267,12 +267,12 @@ class COutput {
     VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
       FieldName(fieldname), Offset(offset), OutputGroup(volumeoutputgroup){}
   };
-  
-  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */ 
-  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */ 
-  std::map<string, vector<HistoryOutputField> > HistoryOutputPerSurface_Map; /*!< \brief Associative map to access data stored in the history per surface output fields by a string identifier. */ 
-  std::vector<string>                           HistoryOutputPerSurface_List;  /*!< \brief Vector that contains the keys of the HistoryOutputPerSurface_Map in the order of their insertion. */ 
-  
+
+  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */
+  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */
+  std::map<string, vector<HistoryOutputField> > HistoryOutputPerSurface_Map; /*!< \brief Associative map to access data stored in the history per surface output fields by a string identifier. */
+  std::vector<string>                           HistoryOutputPerSurface_List;  /*!< \brief Vector that contains the keys of the HistoryOutputPerSurface_Map in the order of their insertion. */
+
   std::map<string, VolumeOutputField >          VolumeOutput_Map;
   std::vector<string>                           VolumeOutput_List;
   
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index e4ee49a1da30..0e46b03b1d0a 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -73,6 +73,7 @@ libSU2Core_sources = \
   ../include/numerics_structure.inl \
   ../include/output_structure.hpp \
   ../include/output_structure.inl \
+  ../include/output_driver.hpp \
   ../include/output_structure_legacy.hpp \
   ../include/output_structure_legacy.inl \
   ../include/sgs_model.hpp \
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 093cb0d3c77a..39107b2d7940 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -285,6 +285,7 @@ void CMultizoneDriver::Run_GaussSeidel() {
 
       /*--- Set the OuterIter ---*/
       config_container[iZone]->SetOuterIter(iOuter_Iter);
+      driver_config->SetOuterIter(iOuter_Iter);
 
       /*--- Transfer from all the remaining zones ---*/
       for (jZone = 0; jZone < nZone; jZone++){
@@ -338,6 +339,7 @@ void CMultizoneDriver::Run_Jacobi() {
 
       /*--- Set the OuterIter ---*/
       config_container[iZone]->SetOuterIter(iOuter_Iter);
+      driver_config->SetOuterIter(iOuter_Iter);
 
       /*--- Transfer from all the remaining zones ---*/
       for (jZone = 0; jZone < nZone; jZone++){
@@ -357,6 +359,7 @@ void CMultizoneDriver::Run_Jacobi() {
 
       /*--- Set the OuterIter ---*/
       config_container[iZone]->SetOuterIter(iOuter_Iter);
+      driver_config->SetOuterIter(iOuter_Iter);
 
       /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
       iteration_container[iZone][INST_0]->Solve(output[ZONE_0], integration_container, geometry_container, solver_container,
@@ -465,6 +468,9 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
     }
   }
 
+  /*--- Print out the convergence data to screen and history file ---*/
+  driver_output->SetBody(output, solver_container, driver_config, config_container);
+
   if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
 
   /*-----------------------------------------------------------------*/
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index d88f90fe0a03..8a75a371e46a 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -105,6 +105,7 @@ CDriver::CDriver(char* confFile,
   transfer_types                 = new unsigned short*[nZone];
   nInst                          = new unsigned short[nZone];
   driver_config                  = NULL;
+  driver_output                  = NULL;
 
 
   for (iZone = 0; iZone < nZone; iZone++) {
@@ -3721,6 +3722,11 @@ void CDriver::Output_Preprocessing(){
     output[iZone]->PreprocessVolumeOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0]);
 
   }
+
+  if (driver_config->GetKind_Solver() == MULTIZONE){
+    driver_output = new CDriverOutput(config_container);
+    driver_output->SetHistoryOutputFields(output, solver_container, config_container);
+  }
   
 }
 
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 734d90625ee4..baebec8535da 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -1,8 +1,8 @@
 /*!
  * \file output_driver.cpp
  * \brief Main subroutines for multizone output
- * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \author R. Sanchez, T. Albring
+ * \version 6.1.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
@@ -35,4 +35,221 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output_driver.hpp"
+
+CDriverOutput::CDriverOutput(CConfig **config) {
+
+  nZone = config[ZONE_0]->GetnZone();
+
+  OuterConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
+
+  nRequestedScreenFields = 0;
+  nRequestedHistoryFields = 0;
+
+  field_width = 12;
+
+}
+
+CDriverOutput::~CDriverOutput() {
+
+
+}
+
+void CDriverOutput::SetHeader(COutput **output, CSolver *****solver, CConfig **config) {
+
+
+}
+
+void CDriverOutput::SetBody(COutput **output, CSolver *****solver, CConfig *driver_config, CConfig **config) {
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    bool write_header, write_history, write_screen;
+
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+
+    LoadHistoryData(output, solver, driver_config);
+
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    //write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
+    //if (write_history) SetHistoryFile_Output(config[val_iZone]);
+
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    write_header = true;
+    if (write_header) SetScreen_Header(driver_config, config);
+
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    write_screen = true;
+    if (write_screen) SetScreen_Output(output, driver_config, config);
+
+  }
+
+
+}
+
+void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConfig *driver_config) {
+
+  unsigned short iZone, iSol, iVar;
+  unsigned short nVar, nVar_Zone;
+  string name, header;
+  su2double val, avgsol, avgzone;
+
+  SetHistoryOutputValue("TIME_ITER", driver_config->GetTimeIter());
+  SetHistoryOutputValue("OUTER_ITER", driver_config->GetOuterIter());
+
+  for (iZone = 0; iZone < nZone; iZone++){
+
+    /*--- Initialize values per zone ---*/
+    nVar_Zone = 0;
+    avgzone = 0.0;
+
+    /*--- Accounting for all the solvers ---*/
+    for (iSol = 0; iSol < MAX_SOLS; iSol++){
+      /*-- If the solver position iSol is enabled --*/
+      if (solver[iZone][INST_0][MESH_0][iSol] != NULL){
+
+        /*---Initialize values per solver ---*/
+        nVar = solver[iZone][INST_0][MESH_0][iSol]->GetnVar();
+        avgsol = 0.0;
+
+        /*-- For all the variables per solver --*/
+        for (iVar = 0; iVar < nVar; iVar++){
+
+          /*--- Get the unique name for the history data ---*/
+          name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol) + "_VAL" + to_string(iVar);
+
+          /*--- Set the value of the BGS residual for the variable iVar, solver iSol, zone iZone ---*/
+          val = log10(solver[iZone][INST_0][MESH_0][iSol]->GetRes_BGS(iVar));
+          SetHistoryOutputValue(name, val);
+
+          /*--- Add values to averages ---*/
+          avgsol += val;
+          avgzone += val;
+          nVar_Zone++;
+        }
+
+        /*--- Get the unique name for the averaged history data per solver ---*/
+        name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol);
+
+        /*--- Compute the average and set the value for the solver iSol, zone iZone---*/
+        avgsol = avgsol / nVar;
+        SetHistoryOutputValue(name, avgsol);
+
+      }
+
+    }
+
+    /*--- Get an unique name for the averaged history data per zone ---*/
+    name = "ZONE" + to_string(iZone);
+
+    /*--- Compute the average and set the value for the zone iZone---*/
+    avgzone = avgzone / nVar_Zone;
+    SetHistoryOutputValue(name, avgzone);
+
+  }
+
+
+}
+
+void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver, CConfig **config) {
+
+  unsigned short iZone, iSol, iVar;
+  unsigned short iReqField;
+  string name, header;
+
+  AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
+  RequestedScreenFields.push_back("TIME_ITER"); RequestedHistoryFields.push_back("TIME_ITER");
+  AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER");
+  RequestedScreenFields.push_back("OUTER_ITER"); RequestedHistoryFields.push_back("OUTER_ITER");
+
+  /*--- Set the fields ---*/
+  for (iZone = 0; iZone < nZone; iZone++){
+
+    /*--- Accounting for all the solvers ---*/
+    for (iSol = 0; iSol < MAX_SOLS; iSol++){
+      /*-- If the solver position iSol is enabled --*/
+      if (solver[iZone][INST_0][MESH_0][iSol] != NULL){
+        /*-- For all the variables per solver --*/
+        for (iVar = 0; iVar < solver[iZone][INST_0][MESH_0][iSol]->GetnVar(); iVar++){
+
+          /*--- Set an unique name for the history data ---*/
+          name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol) + "_VAL" + to_string(iVar);
+          /*--- Set an unique name for the history headers ---*/
+          header = "res[" + to_string(iZone) + "][" + to_string(iSol) + "][" + to_string(iVar) + "]";
+
+          AddHistoryOutput(name, header, FORMAT_FIXED,  "VAR_RES", TYPE_RESIDUAL);
+
+          /*--- Request the variable residual for history output ---*/
+          RequestedHistoryFields.push_back(name);
+        }
+
+        /*--- Set an unique name for the averaged history data per solver ---*/
+        name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol);
+        /*--- Set an unique name for the history headers of the averaged data per solver ---*/
+        header = "avgres[" + to_string(iZone) + "][" + to_string(iSol) + "]";
+
+        AddHistoryOutput(name, header, FORMAT_FIXED,  "SOL_AVGRES", TYPE_RESIDUAL);
+      }
+    }
+
+    /*--- Set an unique name for the averaged history data ---*/
+    name = "ZONE" + to_string(iZone);
+    /*--- Set an unique name for the history headers of the averaged data ---*/
+    header = "avgres[" + to_string(iZone) + "]";
+    /*--- Request the average residual for screen output ---*/
+    RequestedScreenFields.push_back(name);
+
+    AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
+  }
+
+  /*--- Retrieve number of requested fields ---*/
+  nRequestedScreenFields = RequestedScreenFields.size();
+  nRequestedHistoryFields = RequestedHistoryFields.size();
+
+  string RequestedField;
+
+  /*--- Set screen convergence output header ---*/
+  for (iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+    RequestedField = RequestedScreenFields[iReqField];
+    if (HistoryOutput_Map.count(RequestedField) > 0){
+      OuterConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
+    } else {
+      SU2_MPI::Error(string("Requested screen output field not found: ") + RequestedField, CURRENT_FUNCTION);
+    }
+  }
+
+
+}
+
+void CDriverOutput::SetScreen_Header(CConfig *driver_config, CConfig **config) {
+
+  OuterConvergenceTable->PrintHeader();
+
+}
+
+
+void CDriverOutput::SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config) {
+
+  string RequestedField;
+
+  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+    stringstream out;
+    RequestedField = RequestedScreenFields[iReqField];
+    if (HistoryOutput_Map.count(RequestedField) > 0){
+      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
+        case FORMAT_INTEGER:
+          output[ZONE_0]->PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value));
+          break;
+        case FORMAT_FIXED:
+          output[ZONE_0]->PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value);
+          break;
+        case FORMAT_SCIENTIFIC:
+          output[ZONE_0]->PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value);
+          break;
+      }
+    }
+    (*OuterConvergenceTable) << out.str();
+  }
+}

From f9c6629ddabb50fd5562a3176af8fb0c02577085 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Tue, 22 Jan 2019 11:21:53 +0100
Subject: [PATCH 103/539] Add solver naming.

---
 SU2_CFD/include/solver_structure.hpp     |  8 ++++++++
 SU2_CFD/include/solver_structure.inl     |  2 ++
 SU2_CFD/src/output_driver.cpp            | 10 +++++++---
 SU2_CFD/src/solver_direct_elasticity.cpp |  2 ++
 SU2_CFD/src/solver_direct_heat.cpp       |  3 +++
 SU2_CFD/src/solver_direct_mean.cpp       |  4 ++++
 SU2_CFD/src/solver_direct_mean_fem.cpp   |  3 +++
 SU2_CFD/src/solver_direct_mean_inc.cpp   |  6 ++++++
 SU2_CFD/src/solver_direct_transition.cpp |  3 +++
 SU2_CFD/src/solver_direct_turbulent.cpp  |  5 +++++
 10 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 9e7348308917..064bbf705799 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -140,6 +140,8 @@ class CSolver {
   unsigned long *nCol_InletFile;       /*!< \brief Auxiliary structure for holding the number of columns for a particular marker in an inlet profile file. */
   passivedouble *Inlet_Data; /*!< \brief Auxiliary structure for holding the data values from an inlet profile file. */
 
+  string SolverName;      /*!< \brief Store the name of the solver for output purposes. */
+
 public:
   
   CSysVector LinSysSol;    /*!< \brief vector to store iterative solution of implicit linear system. */
@@ -4367,6 +4369,12 @@ class CSolver {
    */
   virtual void SetDES_LengthScale(CSolver** solver, CGeometry *geometry, CConfig *config);
 
+  /*!
+   * \brief Retrieve the solver name for output purposes.
+   * \param[out] val_solvername - Name of the solver.
+   */
+  string GetSolverName(void);
+
 };
 
 /*!
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index f6ea035668c6..d7a25119a8d3 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -1181,6 +1181,8 @@ inline void CSolver::SetConjugateHeatVariable(unsigned short val_marker, unsigne
 
 inline su2double CSolver::GetConjugateHeatVariable(unsigned short val_marker, unsigned long val_vertex, unsigned short pos_var) { return 0.0; }
 
+inline string CSolver::GetSolverName(void) {return SolverName;}
+
 inline su2double CEulerSolver::GetDensity_Inf(void) { return Density_Inf; }
 
 inline su2double CEulerSolver::GetModVelocity_Inf(void) { 
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index baebec8535da..92853366161d 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -188,9 +188,15 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
         /*--- Set an unique name for the averaged history data per solver ---*/
         name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol);
         /*--- Set an unique name for the history headers of the averaged data per solver ---*/
-        header = "avgres[" + to_string(iZone) + "][" + to_string(iSol) + "]";
+        header = solver[iZone][INST_0][MESH_0][iSol]->GetSolverName();
+        header += "[" + to_string(iZone) + "]";
 
+        /*--- Add the average residual of the current solver to output ---*/
         AddHistoryOutput(name, header, FORMAT_FIXED,  "SOL_AVGRES", TYPE_RESIDUAL);
+
+        /*--- Request the average residual for screen output ---*/
+        RequestedScreenFields.push_back(name);
+
       }
     }
 
@@ -198,8 +204,6 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
     name = "ZONE" + to_string(iZone);
     /*--- Set an unique name for the history headers of the averaged data ---*/
     header = "avgres[" + to_string(iZone) + "]";
-    /*--- Request the average residual for screen output ---*/
-    RequestedScreenFields.push_back(name);
 
     AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
   }
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 155e3074bdc4..7355563477fd 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -464,6 +464,8 @@ CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
   
   if(dynamic) Set_MPI_Solution_Old(geometry, config);
   
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "FEA";
 }
 
 CFEASolver::~CFEASolver(void) {
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index d808d0965a89..79775337df45 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -242,6 +242,9 @@ CHeatSolverFVM::CHeatSolverFVM(CGeometry *geometry, CConfig *config, unsigned sh
 
   /*--- MPI solution ---*/
   Set_MPI_Solution(geometry, config);
+
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "HEAT";
 }
 
 CHeatSolverFVM::~CHeatSolverFVM(void) { }
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 0a30ac7d2b13..54e1c842d0f5 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -864,6 +864,8 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
   Set_MPI_Solution(geometry, config);
   
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "C.FLOW";
 }
 
 CEulerSolver::~CEulerSolver(void) {
@@ -15556,6 +15558,8 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
   Set_MPI_Solution(geometry, config);
   
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "C.FLOW";
 }
 
 CNSSolver::~CNSSolver(void) {
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index 319b0b34b454..08c4c640ead1 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -716,6 +716,9 @@ CFEM_DG_EulerSolver::CFEM_DG_EulerSolver(CGeometry *geometry, CConfig *config, u
      computation of the spatial residual, while for ADER this list contains
      the tasks to be done for one space time step. */
   SetUpTaskList(config);
+
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "DG FLOW";
 }
 
 CFEM_DG_EulerSolver::~CFEM_DG_EulerSolver(void) {
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 7049800a5ae2..837d38c08079 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -557,6 +557,9 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
   Set_MPI_Solution(geometry, config);
 
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "INC.FLOW";
+
 }
 
 CIncEulerSolver::~CIncEulerSolver(void) {
@@ -7355,6 +7358,9 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
   Set_MPI_Solution(geometry, config);
 
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "INC.FLOW";
+
 }
 
 CIncNSSolver::~CIncNSSolver(void) {
diff --git a/SU2_CFD/src/solver_direct_transition.cpp b/SU2_CFD/src/solver_direct_transition.cpp
index f255a302934e..708355f52c0a 100644
--- a/SU2_CFD/src/solver_direct_transition.cpp
+++ b/SU2_CFD/src/solver_direct_transition.cpp
@@ -182,6 +182,9 @@ CTransLMSolver::CTransLMSolver(CGeometry *geometry, CConfig *config, unsigned sh
     restart_file.close();
   }
 
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "TRANS";
+
 }
 
 CTransLMSolver::~CTransLMSolver(void) {
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index 8f739670a877..35e5145b6679 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -1452,6 +1452,8 @@ CTurbSASolver::CTurbSASolver(CGeometry *geometry, CConfig *config, unsigned shor
       }
   }
 
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "SA";
 }
 
 CTurbSASolver::~CTurbSASolver(void) {
@@ -3787,6 +3789,9 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh
         }
       }
 
+  /*--- Add the solver name (max 8 characters) ---*/
+  SolverName = "K-W SST";
+
 }
 
 CTurbSSTSolver::~CTurbSSTSolver(void) {

From 78c7ecf4e5db1ea08282ec6c51813388a3301b90 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 23 Jan 2019 14:09:40 +0100
Subject: [PATCH 104/539] Print only zonal residuals in multizone problems.

---
 Common/include/config_structure.hpp        | 15 ++++++++++++
 Common/include/config_structure.inl        |  4 ++++
 Common/include/grid_movement_structure.hpp |  3 ++-
 Common/src/config_structure.cpp            | 11 ++++++++-
 Common/src/grid_movement_structure.cpp     | 20 +++++++++-------
 SU2_CFD/include/output_driver.hpp          | 12 ++++++++++
 SU2_CFD/src/iteration_structure.cpp        | 11 +++++----
 SU2_CFD/src/output_direct_elasticity.cpp   | 11 ++++++++-
 SU2_CFD/src/output_direct_heat.cpp         |  9 ++++++-
 SU2_CFD/src/output_direct_mean.cpp         |  8 +++++++
 SU2_CFD/src/output_direct_mean_inc.cpp     | 10 +++++++-
 SU2_CFD/src/output_driver.cpp              | 28 ++++++++++++++++++++--
 12 files changed, 122 insertions(+), 20 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 7b77879edb5d..89f135fe3ff2 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1090,6 +1090,8 @@ class CConfig {
   su2double Max_Time;           /*!< \brief Determines the maximum time for the time-domain problems */
   bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
   bool SinglezoneDriver;        /*!< \brief Determines if the single-zone driver is used. (TEMPORARY) */
+  bool Wrt_ZoneConv;            /*!< \brief Write the convergence history of each individual zone to screen. */
+  bool Wrt_ZoneHist;            /*!< \brief Write the convergence history of each individual zone to file. */
   bool SpecialOutput,           /*!< \brief Determines if the special output is written. */
   Wrt_ForcesBreakdown;          /*!< \brief Determines if the forces breakdown file is written. */
   string *ScreenOutput,    /*!< \brief Kind of the screen output. */
@@ -9183,6 +9185,19 @@ class CConfig {
    */
   bool GetSinglezone_Driver(void);
 
+  /*!
+   * \brief Check if the convergence history of each individual zone is written to screen
+   * \return YES if the zone convergence history of each individual zone must be written to screen
+   */
+  bool GetWrt_ZoneConv(void);
+
+  /*!
+   * \brief Check if the convergence history of each individual zone is written to file
+   * \return YES if the zone convergence history of each individual zone must be written to file
+   */
+  bool GetWrt_ZoneHist(void);
+
+
   /*!
    * \brief Check if the special output is written
    * \return YES if the special output is written.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index eafa5d1f75ef..ee1f07534e4b 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2071,6 +2071,10 @@ inline bool CConfig::GetMultizone_Residual(void) { return Multizone_Residual; }
 
 inline bool CConfig::GetSinglezone_Driver(void) { return SinglezoneDriver; }
 
+inline bool CConfig::GetWrt_ZoneConv(void) { return Wrt_ZoneConv; }
+
+inline bool CConfig::GetWrt_ZoneHist(void) { return Wrt_ZoneHist; }
+
 inline bool CConfig::GetSpecial_Output(void) { return SpecialOutput; }
 
 inline bool CConfig::GetWrt_ForcesBreakdown(void) { return Wrt_ForcesBreakdown; }
diff --git a/Common/include/grid_movement_structure.hpp b/Common/include/grid_movement_structure.hpp
index 8045c200be8c..0c9658272bf2 100644
--- a/Common/include/grid_movement_structure.hpp
+++ b/Common/include/grid_movement_structure.hpp
@@ -1149,8 +1149,9 @@ class CVolumetricMovement : public CGridMovement {
   /*!
 	 * \brief Check for negative volumes (all elements) after performing grid deformation.
 	 * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Screen_Output - determines if text is written to screen
 	 */
-  void ComputeDeforming_Element_Volume(CGeometry *geometry, su2double &MinVolume, su2double &MaxVolume);
+  void ComputeDeforming_Element_Volume(CGeometry *geometry, su2double &MinVolume, su2double &MaxVolume, bool Screen_Output);
 
   /*!
 	 * \brief Compute the minimum distance to the nearest solid surface.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index fa631ca544b7..7c47dfdde4be 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1880,7 +1880,7 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   /* DESCRIPTION: Visualize the deformation (volume grid) */
   addBoolOption("VISUALIZE_VOLUME_DEF", Visualize_Volume_Def, false);
   /* DESCRIPTION: Print the residuals during mesh deformation to the console */
-  addBoolOption("DEFORM_CONSOLE_OUTPUT", Deform_Output, true);
+  addBoolOption("DEFORM_CONSOLE_OUTPUT", Deform_Output, false);
   /* DESCRIPTION: Number of nonlinear deformation iterations (surface deformation increments) */
   addUnsignedLongOption("DEFORM_NONLINEAR_ITER", GridDef_Nonlinear_Iter, 1);
   /* DESCRIPTION: Number of smoothing iterations for FEA mesh deformation */
@@ -2125,9 +2125,18 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   addBoolOption("SINGLEZONE_DRIVER", SinglezoneDriver, false);
   /* DESCRIPTION: Determines if the special output is written out */
   addBoolOption("SPECIAL_OUTPUT", SpecialOutput, false);
+
+  /* DESCRIPTION: Determines if the convergence history of each individual zone is written to screen */
+  addBoolOption("WRT_ZONE_CONV", Wrt_ZoneConv, false);
+  /* DESCRIPTION: Determines if the convergence history of each individual zone is written to file */
+  addBoolOption("WRT_ZONE_HIST", Wrt_ZoneHist, true);
+
+
   /* DESCRIPTION: Determines if the special output is written out */
   addBoolOption("WRT_FORCES_BREAKDOWN", Wrt_ForcesBreakdown, false);
 
+
+
   /*  DESCRIPTION: Use conservative approach for interpolating between meshes.
   *  Options: NO, YES \ingroup Config */
   addBoolOption("CONSERVATIVE_INTERPOLATION", ConservativeInterpolation, true);
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 51d427a17372..848427c8883f 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -328,13 +328,13 @@ void CVolumetricMovement::SetVolume_Deformation(CGeometry *geometry, CConfig *co
     
     /*--- Check for failed deformation (negative volumes). ---*/
     
-    ComputeDeforming_Element_Volume(geometry, MinVolume, MaxVolume);
+    ComputeDeforming_Element_Volume(geometry, MinVolume, MaxVolume, Screen_Output);
     
     /*--- Set number of iterations in the mesh update. ---*/
 
     Set_nIterMesh(Tot_Iter);
 
-    if (rank == MASTER_NODE) {
+    if (rank == MASTER_NODE && Screen_Output) {
       cout << "Non-linear iter.: " << iNonlinear_Iter+1 << "/" << Nonlinear_Iter  << ". Linear iter.: " << Tot_Iter << ". ";
       if (nDim == 2) cout << "Min. area: " << MinVolume << ". Error: " << Residual << "." << endl;
       else cout << "Min. volume: " << MinVolume << ". Error: " << Residual << "." << endl;
@@ -345,14 +345,14 @@ void CVolumetricMovement::SetVolume_Deformation(CGeometry *geometry, CConfig *co
 
 }
 
-void CVolumetricMovement::ComputeDeforming_Element_Volume(CGeometry *geometry, su2double &MinVolume, su2double &MaxVolume) {
+void CVolumetricMovement::ComputeDeforming_Element_Volume(CGeometry *geometry, su2double &MinVolume, su2double &MaxVolume, bool Screen_Output) {
   
   unsigned long iElem, ElemCounter = 0, PointCorners[8];
   su2double Volume = 0.0, CoordCorners[8][3];
   unsigned short nNodes = 0, iNodes, iDim;
   bool RightVol = true;
-  
-  if (rank == MASTER_NODE)
+
+  if (rank == MASTER_NODE && Screen_Output)
     cout << "Computing volumes of the grid elements." << endl;
   
   MaxVolume = -1E22; MinVolume = 1E22;
@@ -418,7 +418,7 @@ void CVolumetricMovement::ComputeDeforming_Element_Volume(CGeometry *geometry, s
     geometry->elem[iElem]->SetVolume(Volume);
   }
   
-  if ((ElemCounter != 0) && (rank == MASTER_NODE))
+  if ((ElemCounter != 0) && (rank == MASTER_NODE) && (Screen_Output))
     cout <<"There are " << ElemCounter << " elements with negative volume.\n" << endl;
   
 }
@@ -528,6 +528,8 @@ su2double CVolumetricMovement::SetFEAMethodContributions_Elem(CGeometry *geometr
   su2double **StiffMatrix_Elem = NULL, CoordCorners[8][3];
   su2double MinVolume = 0.0, MaxVolume = 0.0, MinDistance = 0.0, MaxDistance = 0.0, ElemVolume = 0.0, ElemDistance = 0.0;
   
+  bool Screen_Output  = config->GetDeform_Output();
+
   /*--- Allocate maximum size (quadrilateral and hexahedron) ---*/
   
   if (nDim == 2) StiffMatrix_nElem = 8;
@@ -539,8 +541,8 @@ su2double CVolumetricMovement::SetFEAMethodContributions_Elem(CGeometry *geometr
   
   /*--- Compute min volume in the entire mesh. ---*/
   
-  ComputeDeforming_Element_Volume(geometry, MinVolume, MaxVolume);
-  if (rank == MASTER_NODE) cout <<"Min. volume: "<< MinVolume <<", max. volume: "<< MaxVolume <<"." << endl;
+  ComputeDeforming_Element_Volume(geometry, MinVolume, MaxVolume, Screen_Output);
+  if (rank == MASTER_NODE && Screen_Output) cout <<"Min. volume: "<< MinVolume <<", max. volume: "<< MaxVolume <<"." << endl;
   
   /*--- Compute the distance to the nearest surface if needed
    as part of the stiffness calculation.. ---*/
@@ -548,7 +550,7 @@ su2double CVolumetricMovement::SetFEAMethodContributions_Elem(CGeometry *geometr
   if ((config->GetDeform_Stiffness_Type() == SOLID_WALL_DISTANCE) ||
       (config->GetDeform_Limit() < 1E6)) {
     ComputeSolid_Wall_Distance(geometry, config, MinDistance, MaxDistance);
-    if (rank == MASTER_NODE) cout <<"Min. distance: "<< MinDistance <<", max. distance: "<< MaxDistance <<"." << endl;
+    if (rank == MASTER_NODE && Screen_Output) cout <<"Min. distance: "<< MinDistance <<", max. distance: "<< MaxDistance <<"." << endl;
   }
   
 	/*--- Compute contributions from each element by forming the stiffness matrix (FEA) ---*/
diff --git a/SU2_CFD/include/output_driver.hpp b/SU2_CFD/include/output_driver.hpp
index c8883321d031..d2caffb7d5bb 100644
--- a/SU2_CFD/include/output_driver.hpp
+++ b/SU2_CFD/include/output_driver.hpp
@@ -179,4 +179,16 @@ class CDriverOutput {
 
   void SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config);
 
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *driver_config, CConfig **config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *driver_config, CConfig **config);
+
 };
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 3ff965c337af..f368afd51ebb 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -71,6 +71,9 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
   bool harmonic_balance = (config_container[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
   bool discrete_adjoint = config_container[val_iZone]->GetDiscrete_Adjoint();
 
+  /*--- Only write to screen if this option is enabled ---*/
+  bool Screen_Output = config_container[val_iZone]->GetDeform_Output();
+
   /*--- For a harmonic balance case, set "iteration number" to the zone number,
    so that the meshes are positioned correctly for each instance. ---*/
   if (harmonic_balance) {
@@ -308,12 +311,12 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
 
     case FLUID_STRUCTURE:
 
-      if (rank == MASTER_NODE)
+      if (rank == MASTER_NODE && Screen_Output)
         cout << endl << "Deforming the grid for Fluid-Structure Interaction applications." << endl;
 
       /*--- Deform the volume grid around the new boundary locations ---*/
 
-      if (rank == MASTER_NODE)
+      if (rank == MASTER_NODE && Screen_Output)
         cout << "Deforming the volume grid." << endl;
       grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
                                            config_container[val_iZone], true);
@@ -322,12 +325,12 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
       stat_mesh = (nIterMesh == 0);
 
       if (!adjoint && !stat_mesh) {
-        if (rank == MASTER_NODE)
+        if (rank == MASTER_NODE && Screen_Output)
           cout << "Computing grid velocities by finite differencing." << endl;
         geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
       }
       else if (stat_mesh) {
-          if (rank == MASTER_NODE)
+          if (rank == MASTER_NODE && Screen_Output)
             cout << "The mesh is up-to-date. Using previously stored grid velocities." << endl;
       }
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index f77b2d200e3d..1623e471fa13 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -255,11 +255,20 @@ inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {
   if (nonlinear_analysis) write_header = (config->GetIntIter() == 0);
   else write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
 
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
   return write_header;
   
 }
 inline bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  return true;
+
+  bool write_output = true;
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
+  return write_output;
 }
 
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 8201f49a5b8e..e11b759f6d30 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -59,7 +59,6 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("CONSERVATIVE");
-    RequestedVolumeFields.push_back("PRIMITIVE");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
   
@@ -93,6 +92,10 @@ bool CHeatOutput::WriteScreen_Header(CConfig *config) {
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
   return write_header;
 }
 
@@ -106,6 +109,10 @@ bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
     write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
+
+  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
   return write_output;
 }
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 73bae1c8bb80..b3d83ecd5677 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -704,6 +704,10 @@ bool CFlowOutput::WriteScreen_Header(CConfig *config) {
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
   return write_header;
 }
 
@@ -716,6 +720,10 @@ bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
     write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
+
+  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
   return write_output;
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 24eeafe3a0e5..80cfb310dbc6 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -301,6 +301,10 @@ bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
   return write_header;
 }
 
@@ -314,6 +318,10 @@ bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
     write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
   } 
+
+  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
   return write_output;
 }
 
@@ -757,4 +765,4 @@ bool CIncFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
   
   return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
-}
\ No newline at end of file
+}
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 92853366161d..f3947717ad2b 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -77,11 +77,11 @@ void CDriverOutput::SetBody(COutput **output, CSolver *****solver, CConfig *driv
     //if (write_history) SetHistoryFile_Output(config[val_iZone]);
 
     /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = true;
+    write_header = WriteScreen_Header(driver_config, config);
     if (write_header) SetScreen_Header(driver_config, config);
 
     /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = true;
+    write_screen = WriteScreen_Output(driver_config, config);
     if (write_screen) SetScreen_Output(output, driver_config, config);
 
   }
@@ -257,3 +257,27 @@ void CDriverOutput::SetScreen_Output(COutput **output, CConfig *driver_config, C
     (*OuterConvergenceTable) << out.str();
   }
 }
+
+inline bool CDriverOutput::WriteScreen_Header(CConfig *driver_config, CConfig **config) {
+
+  unsigned short iZone;
+  bool write_header = true;
+
+  /*--- If the zone output is disabled for every zone ---*/
+  for (iZone = 0; iZone < nZone; iZone++){
+    write_header = (write_header && (!config[iZone]->GetWrt_ZoneConv()));
+  }
+
+  /*--- If the outer iteration is zero ---*/
+  write_header = (write_header && (driver_config->GetOuterIter() == 0));
+
+  return write_header;
+
+}
+inline bool CDriverOutput::WriteScreen_Output(CConfig *driver_config, CConfig **config) {
+
+  bool write_output = true;
+
+  return write_output;
+}
+

From e33d22e3ccf546651e17c7ccb2de96b359af4089 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 23 Jan 2019 16:43:45 +0100
Subject: [PATCH 105/539] Preliminary fix for volume output writing in flow and
 heat iteration

---
 SU2_CFD/src/driver_direct_multizone.cpp |  3 +-
 SU2_CFD/src/iteration_structure.cpp     | 69 +++++++++++++++----------
 SU2_CFD/src/output_driver.cpp           |  4 ++
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 39107b2d7940..34838432bf44 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -541,9 +541,8 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         
         /*--- General if statements to print output statements ---*/
         
-        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter() && config_container[iZone]->GetTime_Domain()) || (StopCalc) ||
+        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter()) || (StopCalc) ||
         
-        (config_container[iZone]->GetOuterIter() % config_container[iZone]->GetWrt_Sol_Freq() == 0) ||
         /*--- Unsteady problems ---*/
         
         (((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index f368afd51ebb..fdb9090c626c 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -464,32 +464,29 @@ void CIteration::Output(COutput *output,
     unsigned short val_iZone,
     unsigned short val_iInst)      {
 
+  
   bool output_files = false;
 
   /*--- Determine whether a solution needs to be written
    after the current iteration ---*/
 
-  if (
-
-      /*--- General if statements to print output statements ---*/
-
-//      (ExtIter+1 >= nExtIter) || (StopCalc) ||
+  if ( 
 
       /*--- Fixed CL problem ---*/
 
-      ((config_container[ZONE_0]->GetFixed_CL_Mode()) &&
-       (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 == Iter)) ||
+      ((config_container[val_iZone]->GetFixed_CL_Mode()) &&
+       (config_container[val_iZone]->GetnExtIter()-config_container[val_iZone]->GetIter_dCL_dAlpha() - 1 == Iter)) ||
 
       /*--- Steady problems ---*/
 
-      ((Iter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (Iter != 0) &&
-       ((config_container[ZONE_0]->GetUnsteady_Simulation() == STEADY) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == ROTATIONAL_FRAME))) ||
+      ((Iter % config_container[val_iZone]->GetWrt_Sol_Freq() == 0) && (Iter != 0) &&
+       ((config_container[val_iZone]->GetUnsteady_Simulation() == STEADY) ||
+        (config_container[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) ||
+        (config_container[val_iZone]->GetUnsteady_Simulation() == ROTATIONAL_FRAME))) ||
 
       /*--- No inlet profile file found. Print template. ---*/
 
-      (config_container[ZONE_0]->GetWrt_InletFile())
+      (config_container[val_iZone]->GetWrt_InletFile())
 
       ) {
 
@@ -500,9 +497,9 @@ void CIteration::Output(COutput *output,
   /*--- Determine whether a solution doesn't need to be written
    after the current iteration ---*/
 
-  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
-    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < Iter) output_files = false;
-    if (config_container[ZONE_0]->GetnExtIter() - 1 == Iter) output_files = true;
+  if (config_container[val_iZone]->GetFixed_CL_Mode()) {
+    if (config_container[val_iZone]->GetnExtIter()-config_container[val_iZone]->GetIter_dCL_dAlpha() - 1 < Iter) output_files = false;
+    if (config_container[val_iZone]->GetnExtIter() - 1 == Iter) output_files = true;
   }
 
   /*--- write the solution ---*/
@@ -514,7 +511,7 @@ void CIteration::Output(COutput *output,
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
 
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, Iter, ZONE_0, nZone);
+    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, Iter, val_iZone, nZone);
 
     /*--- Execute the routine for writing special output. ---*/
     //output->SetSpecial_Output(solver_container, geometry_container, config_container, Iter, nZone);
@@ -792,7 +789,7 @@ void CFluidIteration::Solve(COutput *output,
   bool steady = (config_container[val_iZone]->GetUnsteady_Simulation() == STEADY);
   bool unsteady = ((config_container[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
 
-  unsigned short Inner_Iter, nInner_Iter = config_container[val_iZone]->GetnInner_Iter();
+  unsigned short Inner_Iter, nInner_Iter = config_container[val_iZone]->GetnInner_Iter(), Iter;
   bool StopCalc = false;
 
   /*--- Synchronization point before a single solver iteration. Compute the
@@ -846,16 +843,23 @@ void CFluidIteration::Solve(COutput *output,
       /*--- Output files at intermediate time positions if the problem is single zone ---*/
 
       if (singlezone) Output(output, geometry_container, solver_container, config_container,
-                             Inner_Iter, StopCalc, val_iZone, val_iInst);
+                             config_container[val_iZone]->GetInnerIter(), StopCalc, val_iZone, val_iInst);
+      
 
       /*--- If the iteration has converged, break the loop ---*/
       if (StopCalc) break;
 
     }
 
-    /*--- Set the fluid convergence to false (to make sure outer subiterations converge) ---*/
-    if (multizone) integration_container[val_iZone][INST_0][FLOW_SOL]->SetConvergence(false);
-
+    if (multizone){
+      
+      Output(output, geometry_container, solver_container, config_container,
+             config_container[val_iZone]->GetOuterIter(), StopCalc, val_iZone, val_iInst);
+      
+      /*--- Set the fluid convergence to false (to make sure outer subiterations converge) ---*/
+      
+      integration_container[val_iZone][INST_0][FLOW_SOL]->SetConvergence(false);
+    }
 }
 
 void CFluidIteration::SetWind_GustField(CConfig *config_container, CGeometry **geometry_container, CSolver ***solver_container) {
@@ -1369,18 +1373,31 @@ void CHeatIteration::Solve(COutput *output,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
-    /*--- Write the convergence history for the fluid (only screen output) ---*/
-    if (steady) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, INST_0);
+    if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
+      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);    
+    }
+    
+    /*--- Output files at intermediate time positions if the problem is single zone ---*/
 
+    if (singlezone) Output(output, geometry_container, solver_container, config_container,
+                           config_container[val_iZone]->GetInnerIter(), StopCalc, val_iZone, val_iInst);
+    
     /*--- If convergence was reached in every zone --*/
     StopCalc = integration_container[val_iZone][INST_0][HEAT_SOL]->GetConvergence();
     if (StopCalc) break;
 
   }
 
-  /*--- Set the heat convergence to false (to make sure outer subiterations converge) ---*/
-  integration_container[val_iZone][INST_0][HEAT_SOL]->SetConvergence(false);
-
+  if (multizone){
+    
+    Output(output, geometry_container, solver_container, config_container,
+           config_container[val_iZone]->GetOuterIter(), StopCalc, val_iZone, val_iInst);
+    
+    /*--- Set the fluid convergence to false (to make sure outer subiterations converge) ---*/
+    
+    integration_container[val_iZone][INST_0][HEAT_SOL]->SetConvergence(false);
+  }
+  
   //output->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, INST_0);
 
 }
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index f3947717ad2b..f5995eaf2602 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -39,6 +39,10 @@
 
 CDriverOutput::CDriverOutput(CConfig **config) {
 
+  
+  rank = SU2_MPI::GetRank();
+  size = SU2_MPI::GetSize();
+  
   nZone = config[ZONE_0]->GetnZone();
 
   OuterConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);

From 685fb98432ccb36e239634c68e530acbe0490aa3 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 30 Jan 2019 13:51:59 +0100
Subject: [PATCH 106/539] Small fix in incompressible flow without energy
 equation.

---
 SU2_CFD/src/output_direct_mean_inc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 80cfb310dbc6..8a0a89eeca2d 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -475,7 +475,7 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("VELOCITY-Y", "Velocity_y", "CONSERVATIVE");
   if (nDim == 3)
     AddVolumeOutput("VELOCITY-Z", "Velocity_z", "CONSERVATIVE");
-  if (config->GetEnergy_Equation())
+  if (heat)
     AddVolumeOutput("TEMPERATURE",  "Temperature","CONSERVATIVE");  
   
   switch(config->GetKind_Turb_Model()){
@@ -608,9 +608,9 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(2));
   if (nDim == 3){
     SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(3));
-    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
+    if (heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
   } else {
-    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));    
+    if (heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));
   }
   
   switch(config->GetKind_Turb_Model()){

From 537a60e9c69634b04db64f60809d6ddff92be171 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 4 Feb 2019 16:05:49 +0100
Subject: [PATCH 107/539] Updated part of the regression tests ot the new
 output structure

---
 SU2_CFD/src/output_direct_mean_fem.cpp        |   0
 TestCases/TestCase.py                         |   7 +-
 TestCases/euler/channel/inv_channel_RK.cfg    |   9 +-
 TestCases/euler/naca0012/inv_NACA0012.cfg     |  10 +-
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg |   9 +-
 TestCases/euler/oneram6/inv_ONERAM6.cfg       |   8 +-
 TestCases/euler/wedge/inv_wedge_HLLC.cfg      |   8 +-
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg  |   8 +-
 .../incomp_euler/naca0012/incomp_NACA0012.cfg |   9 +-
 TestCases/incomp_euler/nozzle/inv_nozzle.cfg  |   8 +-
 .../buoyancy_cavity/lam_buoyancy_cavity.cfg   |   8 +-
 .../cylinder/incomp_cylinder.cfg              |   9 +-
 .../cylinder/poly_cylinder.cfg                |   8 +-
 TestCases/incomp_rans/naca0012/naca0012.cfg   |   9 +-
 .../cylinder/cylinder_lowmach.cfg             |   8 +-
 .../navierstokes/cylinder/lam_cylinder.cfg    |  10 +-
 .../navierstokes/flatplate/lam_flatplate.cfg  |   8 +-
 .../poiseuille/profile_poiseuille.cfg         |   8 +-
 TestCases/new_output_regression.py            | 321 +++++++++++++++++-
 .../rans/flatplate/turb_SA_flatplate.cfg      |   8 +-
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg  |   9 +-
 .../rans/naca0012/turb_NACA0012_sa_binary.cfg |   9 +-
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg |   9 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |   8 +-
 TestCases/rans/oneram6/turb_ONERAM6.cfg       |   6 +-
 TestCases/rans/propeller/propeller.cfg        |   9 +-
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg    |   8 +-
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg   |   8 +-
 TestCases/serial_regression.py                | 195 -----------
 29 files changed, 504 insertions(+), 230 deletions(-)
 create mode 100644 SU2_CFD/src/output_direct_mean_fem.cpp

diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index f690d39de90a..0f40609f6d95 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -664,6 +664,9 @@ def run_def(self):
 
     def adjust_iter(self):
 
+        iter_string = "EXT_ITER"
+        if self.new_output:
+            iter_string = "ITER"
         # Read the cfg file
         workdir = os.getcwd()
         os.chdir(self.cfg_dir)
@@ -677,10 +680,10 @@ def adjust_iter(self):
         file_out.write('%% This file automatically generated by the regression script\n')
         file_out.write('%% Number of iterations changed to %d\n'%(self.test_iter+1))
         for line in lines:
-            if not line.startswith("EXT_ITER"):
+            if not line.strip().split("=")[0] == iter_string:
                 file_out.write(line)
             else:
-                file_out.write("EXT_ITER=%d\n"%(self.test_iter+1))
+                file_out.write(iter_string+"=%d\n"%(self.test_iter+1))
         file_out.close()
         os.chdir(workdir)
 
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index 48227ea1fa2e..bfa9d4eaf213 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -21,7 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -95,7 +97,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 110
+ITER= 110
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -225,3 +227,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index b8d77ca939e2..0971dca34062 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -21,7 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -97,7 +99,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -302,7 +304,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
 %    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index f9cdeb9a6f95..bfd57beaf5f4 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -21,6 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone output
+SINGLEZONE_DRIVER = YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -85,7 +88,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 110
+ITER= 110
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -215,4 +218,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 944369d7765e..828701c8b1ea 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -25,6 +25,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -110,7 +113,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -276,6 +279,9 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 590c9e1426ac..9d8ba61c9230 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -21,6 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -92,7 +95,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 11000
+ITER= 11000
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -223,6 +226,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 20e898b2a135..bea81d6ea7d7 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -21,6 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= NO
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -109,7 +112,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-EXT_ITER= 500
+ITER= 500
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -314,6 +317,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index 555ac578fa69..d2738b952f74 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -116,7 +119,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 9999
+ITER= 9999
 
 % -------------------------- MULTIGRID PARAMETERS -----------------------------%
 %
@@ -219,3 +222,7 @@ WRT_SOL_FREQ= 200
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
+
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index 8754c94ac948..ce84c7ddc566 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -23,6 +23,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -174,7 +177,7 @@ CONV_NUM_METHOD_FLOW= FDS
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 9999
+ITER= 9999
 %
 % Residual reduction (order of magnitude with respect to the initial value)
 RESIDUAL_REDUCTION= 8
@@ -217,4 +220,7 @@ SURFACE_FLOW_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
+% 
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
 
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 857ea441c1d2..b7a7552a9815 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -26,6 +26,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% new singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -138,7 +141,7 @@ MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -271,6 +274,9 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_HEAT, LIFT, DRAG)
 
 % ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index d864901d64cd..5d2dda3436d3 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -27,6 +27,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New Singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -108,7 +111,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5000
+ITER= 5000
 %
 % Coefficient for the Venkat's limiter. A larger values decrease the extent of limiting,
 %             values approaching zero cause lower-order approximation to the solution.
@@ -215,3 +218,7 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
+
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 28c867090eed..c48e90d23c8f 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -27,6 +27,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -151,7 +154,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 10000.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 1000
+ITER= 1000
 
 % -------------------------- MULTIGRID PARAMETERS -----------------------------%
 %
@@ -304,3 +307,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_HEAT, LIFT, DRAG)
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index eadac62aa891..dc7df9b5f9bc 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -28,6 +28,9 @@ REGIME_TYPE= INCOMPRESSIBLE
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
@@ -94,7 +97,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 2500
+ITER= 2500
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -255,3 +258,7 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
+
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index c1c8c1104615..642246c041c0 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -25,6 +25,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -89,7 +92,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -227,3 +230,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index 5439524fc7c5..56a14c5d34c4 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -24,7 +24,10 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
+%
+%  New singlezone driver
+SINGLEZONE_DRIVER= YES
+%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -88,7 +91,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -222,3 +225,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index 620b83785449..c87818ace2d9 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -103,7 +106,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 999999
+ITER= 999999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -239,3 +242,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index 92a7dae886eb..681d0dc2ceef 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -27,6 +27,9 @@ RESTART_SOL= YES
 %
 % Discard the restart metadata (iteration numbers)
 DISCARD_INFILES= YES
+%
+% New singlezone output
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -161,7 +164,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 10000.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -297,3 +300,6 @@ WRT_SOL_FREQ= 25
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index 59bb53c0abf8..ed3601ef1ee6 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -46,6 +46,321 @@ def main():
 
     test_list = []
 
+    #########################
+    ## Compressible Euler ###
+    #########################
+
+    # Channel
+    channel           = TestCase('channel')
+    channel.cfg_dir   = "euler/channel"
+    channel.cfg_file  = "inv_channel_RK.cfg"
+    channel.test_iter = 10
+    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
+    channel.su2_exec  = "SU2_CFD"
+    channel.timeout   = 1600
+    channel.new_output = True
+    channel.tol       = 0.00001
+    test_list.append(channel)
+
+    # NACA0012 
+    naca0012           = TestCase('naca0012')
+    naca0012.cfg_dir   = "euler/naca0012"
+    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
+    naca0012.test_iter = 20
+    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
+    naca0012.su2_exec  = "SU2_CFD"
+    naca0012.timeout   = 1600
+    naca0012.new_output= True
+    naca0012.tol       = 0.00001
+    test_list.append(naca0012)
+
+    # Supersonic wedge 
+    wedge           = TestCase('wedge')
+    wedge.cfg_dir   = "euler/wedge"
+    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
+    wedge.test_iter = 20
+    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
+    wedge.su2_exec  = "SU2_CFD"
+    wedge.timeout   = 1600
+    wedge.new_output= True
+    wedge.tol       = 0.00001
+    test_list.append(wedge)
+
+    # ONERA M6 Wing
+    oneram6           = TestCase('oneram6')
+    oneram6.cfg_dir   = "euler/oneram6"
+    oneram6.cfg_file  = "inv_ONERAM6.cfg"
+    oneram6.test_iter = 10
+    oneram6.test_vals = [-13.395738, -12.930653, 0.282557, 0.012706] #last 4 columns
+    oneram6.su2_exec  = "SU2_CFD"
+    oneram6.timeout   = 9600
+    oneram6.new_output = True
+    oneram6.tol       = 0.00001
+    test_list.append(oneram6)
+    
+    ##########################
+    ###  Compressible N-S  ###
+    ##########################
+
+    # Laminar flat plate
+    flatplate           = TestCase('flatplate')
+    flatplate.cfg_dir   = "navierstokes/flatplate"
+    flatplate.cfg_file  = "lam_flatplate.cfg"
+    flatplate.test_iter = 20
+    flatplate.test_vals = [-4.680896, 0.781111, -0.135957, 0.022978] #last 4 columns
+    flatplate.su2_exec  = "SU2_CFD"
+    flatplate.new_output = True
+    flatplate.timeout   = 1600
+    flatplate.tol       = 0.00001
+    test_list.append(flatplate)
+
+    # Laminar cylinder (steady)
+    cylinder           = TestCase('cylinder')
+    cylinder.cfg_dir   = "navierstokes/cylinder"
+    cylinder.cfg_file  = "lam_cylinder.cfg"
+    cylinder.test_iter = 25
+    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
+    cylinder.su2_exec  = "SU2_CFD"
+    cylinder.new_output = True
+    cylinder.timeout   = 1600
+    cylinder.tol       = 0.00001
+    test_list.append(cylinder)
+
+    # Laminar cylinder (low Mach correction)
+    cylinder_lowmach           = TestCase('cylinder_lowmach')
+    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
+    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
+    cylinder_lowmach.test_iter = 25
+    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
+    cylinder_lowmach.su2_exec  = "SU2_CFD"
+    cylinder_lowmach.new_output = True
+    cylinder_lowmach.timeout   = 1600
+    cylinder_lowmach.tol       = 0.00001
+    test_list.append(cylinder_lowmach)
+
+    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
+   # poiseuille           = TestCase('poiseuille')
+   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
+   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
+   # poiseuille.test_iter = 10
+   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
+   # poiseuille.su2_exec  = "SU2_CFD"
+   # poiseuille.new_output = True
+   # poiseuille.timeout   = 1600
+   # poiseuille.tol       = 0.00001
+   # test_list.append(poiseuille)
+
+    # 2D Poiseuille flow (inlet profile file)
+    poiseuille_profile           = TestCase('poiseuille_profile')
+    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
+    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
+    poiseuille_profile.test_iter = 10
+    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
+    poiseuille_profile.su2_exec  = "SU2_CFD"
+    poiseuille_profile.new_output = True
+    poiseuille_profile.timeout   = 1600
+    poiseuille_profile.tol       = 0.00001
+    test_list.append(poiseuille_profile)
+    
+    ##########################
+    ### Compressible RANS  ###
+    ##########################
+
+    # RAE2822 SA
+    rae2822_sa           = TestCase('rae2822_sa')
+    rae2822_sa.cfg_dir   = "rans/rae2822"
+    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
+    rae2822_sa.test_iter = 20
+    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
+    rae2822_sa.su2_exec  = "SU2_CFD"
+    rae2822_sa.timeout   = 1600
+    rae2822_sa.new_output = True
+    rae2822_sa.tol       = 0.00001
+    test_list.append(rae2822_sa)
+    
+    # RAE2822 SST
+    rae2822_sst           = TestCase('rae2822_sst')
+    rae2822_sst.cfg_dir   = "rans/rae2822"
+    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
+    rae2822_sst.test_iter = 20
+    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
+    rae2822_sst.su2_exec  = "SU2_CFD"
+    rae2822_sst.new_output = True
+    rae2822_sst.timeout   = 1600
+    rae2822_sst.tol       = 0.00001
+    test_list.append(rae2822_sst)
+
+    # Flat plate
+    turb_flatplate           = TestCase('turb_flatplate')
+    turb_flatplate.cfg_dir   = "rans/flatplate"
+    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
+    turb_flatplate.test_iter = 20
+    turb_flatplate.test_vals = [-4.158303, -6.737135, -0.176244, 0.057446] #last 4 columns
+    turb_flatplate.su2_exec  = "SU2_CFD"
+    turb_flatplate.new_output  = True
+    turb_flatplate.timeout   = 1600
+    turb_flatplate.tol       = 0.00001
+    test_list.append(turb_flatplate)
+
+    # ONERA M6 Wing
+    turb_oneram6           = TestCase('turb_oneram6')
+    turb_oneram6.cfg_dir   = "rans/oneram6"
+    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
+    turb_oneram6.test_iter = 10
+    turb_oneram6.test_vals = [-2.327523, -6.564349, 0.230471, 0.155843]#last 4 columns
+    turb_oneram6.su2_exec  = "SU2_CFD"
+    turb_oneram6.new_output = True
+    turb_oneram6.timeout   = 3200
+    turb_oneram6.tol       = 0.00001
+    test_list.append(turb_oneram6)
+
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
+    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
+    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
+    turb_naca0012_sa.test_iter = 10
+    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa.new_output = True
+    turb_naca0012_sa.timeout   = 3200
+    turb_naca0012_sa.tol       = 0.00001
+    test_list.append(turb_naca0012_sa)
+   
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
+    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
+    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
+    turb_naca0012_sa_bin.test_iter = 10
+    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa_bin.new_output  = True
+    turb_naca0012_sa_bin.timeout   = 3200
+    turb_naca0012_sa_bin.tol       = 0.00001
+    test_list.append(turb_naca0012_sa_bin)
+ 
+    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
+    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
+    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
+    turb_naca0012_sst.test_iter = 10
+    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
+    turb_naca0012_sst.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst.new_output  = True
+    turb_naca0012_sst.timeout   = 3200
+    turb_naca0012_sst.tol       = 0.00001
+    test_list.append(turb_naca0012_sst)
+
+    # PROPELLER 
+    propeller           = TestCase('propeller')
+    propeller.cfg_dir   = "rans/propeller"
+    propeller.cfg_file  = "propeller.cfg"
+    propeller.test_iter = 10
+    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
+    propeller.su2_exec  = "SU2_CFD"
+    propeller.new_output = True
+    propeller.timeout   = 3200
+    propeller.tol       = 0.00001
+    test_list.append(propeller)
+    #################################
+    ## Compressible RANS Restart  ###
+    #################################
+
+    # NACA0012 SST Multigrid restart
+    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
+    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
+    turb_naca0012_sst_restart_mg.test_iter = 50
+    turb_naca0012_sst_restart_mg.ntest_vals = 5
+    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
+    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst_restart_mg.new_output  = True
+    turb_naca0012_sst_restart_mg.timeout   = 3200
+    turb_naca0012_sst_restart_mg.tol       = 0.000001
+    test_list.append(turb_naca0012_sst_restart_mg)
+    
+    #############################
+    ### Incompressible Euler  ###
+    #############################
+
+    # NACA0012 Hydrofoil
+    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
+    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
+    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
+    inc_euler_naca0012.test_iter = 20
+    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
+    inc_euler_naca0012.su2_exec  = "SU2_CFD"
+    inc_euler_naca0012.new_output = True
+    inc_euler_naca0012.timeout   = 1600
+    inc_euler_naca0012.tol       = 0.00001
+    test_list.append(inc_euler_naca0012)
+
+    # C-D nozzle with pressure inlet and mass flow outlet
+    inc_nozzle           = TestCase('inc_nozzle')
+    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
+    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
+    inc_nozzle.test_iter = 20
+    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
+    inc_nozzle.su2_exec  = "SU2_CFD"
+    inc_nozzle.new_output = True
+    inc_nozzle.timeout   = 1600
+    inc_nozzle.tol       = 0.00001
+    test_list.append(inc_nozzle)
+
+    #############################
+    ### Incompressible N-S    ###
+    #############################
+
+    # Laminar cylinder
+    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
+    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
+    inc_lam_cylinder.test_iter = 10
+    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
+    inc_lam_cylinder.new_output  = True
+    inc_lam_cylinder.su2_exec  = "SU2_CFD"
+    inc_lam_cylinder.timeout   = 1600
+    inc_lam_cylinder.tol       = 0.00001
+    test_list.append(inc_lam_cylinder)
+
+    # Buoyancy-driven cavity
+    inc_buoyancy          = TestCase('inc_buoyancy')
+    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
+    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
+    inc_buoyancy.test_iter = 20
+    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
+    inc_buoyancy.new_output  = True
+    inc_buoyancy.su2_exec  = "SU2_CFD"
+    inc_buoyancy.timeout   = 1600
+    inc_buoyancy.tol       = 0.00001
+    test_list.append(inc_buoyancy)
+
+    # Laminar heated cylinder with polynomial fluid model
+    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
+    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
+    inc_poly_cylinder.test_iter = 20
+    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
+    inc_poly_cylinder.new_output  = True
+    inc_poly_cylinder.su2_exec  = "SU2_CFD"
+    inc_poly_cylinder.timeout   = 1600
+    inc_poly_cylinder.tol       = 0.00001
+    test_list.append(inc_poly_cylinder)
+
+    ############################
+    ### Incompressible RANS  ###
+    ############################
+
+    # NACA0012
+    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
+    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
+    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
+    inc_turb_naca0012.test_iter = 20
+    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
+    inc_turb_naca0012.new_output  = True
+    inc_turb_naca0012.su2_exec  = "SU2_CFD"
+    inc_turb_naca0012.timeout   = 1600
+    inc_turb_naca0012.tol       = 0.00001
+    test_list.append(inc_turb_naca0012)
     ##########################
     ### FEA - FSI          ###
     ##########################
@@ -57,7 +372,7 @@ def main():
     statbeam3d.new_output= True
     statbeam3d.test_iter = 0
     statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
-    statbeam3d.su2_exec  = "SU2_DEV_CFD"
+    statbeam3d.su2_exec  = "SU2_CFD"
     statbeam3d.timeout   = 1600
     statbeam3d.tol       = 0.00001
     test_list.append(statbeam3d)
@@ -70,7 +385,7 @@ def main():
     dynbeam2d.new_output= True  
     dynbeam2d.test_iter = 6 
     dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
-    dynbeam2d.su2_exec  = "SU2_DEV_CFD"
+    dynbeam2d.su2_exec  = "SU2_CFD"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001
     test_list.append(dynbeam2d)
@@ -81,7 +396,7 @@ def main():
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
     fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
-    fsi2d.su2_exec  = "SU2_DEV_CFD"
+    fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
     fsi2d.tol       = 0.00001
     test_list.append(fsi2d)    
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index 58a0819d7d38..e3d0dd13cb2e 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -101,7 +104,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -248,3 +251,6 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 3bdabc984197..7e31259fda09 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -34,6 +34,9 @@ READ_BINARY_RESTART= NO
 %
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -102,7 +105,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -259,3 +262,7 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
+
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index ed1df3d2450e..affeee8c2d2c 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -40,6 +40,9 @@ READ_BINARY_RESTART= YES
 %
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -108,7 +111,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999 
+ITER= 99999 
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -265,3 +268,7 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
+
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index b4dc82191d6e..dfd1eaa20f8b 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -34,6 +34,9 @@ READ_BINARY_RESTART= NO
 %
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -102,7 +105,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -258,3 +261,7 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 90c2ec291e9b..12daa013b0a2 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -56,6 +56,9 @@ GRAVITY_FORCE= NO
 %
 % Axisymmetric simulation, only compressible (NO, YES)
 AXISYMMETRIC= NO
+%
+% New singlezone driver 
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -351,7 +354,7 @@ LIMIT_ADJFLOW= 1E6
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 100
+ITER= 100
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -448,3 +451,6 @@ WRT_LIMITERS= NO
 %
 % Write a CSV surface flow file
 WRT_CSV_SOL= NO
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index 89a9c59cd471..668521d0ed14 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -24,6 +24,8 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -137,7 +139,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 999999
+ITER= 999999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -288,6 +290,8 @@ WRT_SOL_FREQ= 250
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
 %
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index d670824161d4..5b98ee0f499d 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -32,6 +32,9 @@ RESTART_SOL= NO
 %                                       psf = lbf/ft^2, Density = slug/ft^3, 
 %                                       Speed = ft/s, Equiv. Area = ft^2 )
 SYSTEM_MEASUREMENTS= US
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -204,7 +207,7 @@ RELAXATION_FACTOR_TURB= 0.9
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 15
+ITER= 15
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -296,3 +299,7 @@ LOW_MEMORY_OUTPUT= NO
 %
 % Verbosity of console output: NONE removes minor MPI overhead (NONE, HIGH)
 CONSOLE_OUTPUT_VERBOSITY= HIGH
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
+
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index 7ecd37255abd..a51ee002af82 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -85,7 +88,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -263,6 +266,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index e55dafb86808..89e6a5c42ba4 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -91,7 +94,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -240,3 +243,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index c0b89c1c4511..a54b2d275c60 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -50,50 +50,6 @@ def main():
     ## Compressible Euler ###
     #########################
 
-    # Channel
-    channel           = TestCase('channel')
-    channel.cfg_dir   = "euler/channel"
-    channel.cfg_file  = "inv_channel_RK.cfg"
-    channel.test_iter = 10
-    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
-    channel.su2_exec  = "SU2_CFD"
-    channel.timeout   = 1600
-    channel.tol       = 0.00001
-    test_list.append(channel)
-
-    # NACA0012 
-    naca0012           = TestCase('naca0012')
-    naca0012.cfg_dir   = "euler/naca0012"
-    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
-    naca0012.test_iter = 20
-    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
-    naca0012.su2_exec  = "SU2_CFD"
-    naca0012.timeout   = 1600
-    naca0012.tol       = 0.00001
-    test_list.append(naca0012)
-
-    # Supersonic wedge 
-    wedge           = TestCase('wedge')
-    wedge.cfg_dir   = "euler/wedge"
-    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
-    wedge.test_iter = 20
-    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
-    wedge.su2_exec  = "SU2_CFD"
-    wedge.timeout   = 1600
-    wedge.tol       = 0.00001
-    test_list.append(wedge)
-
-    # ONERA M6 Wing
-    oneram6           = TestCase('oneram6')
-    oneram6.cfg_dir   = "euler/oneram6"
-    oneram6.cfg_file  = "inv_ONERAM6.cfg"
-    oneram6.test_iter = 10
-    oneram6.test_vals = [-13.395738, -12.930653, 0.282557, 0.012706] #last 4 columns
-    oneram6.su2_exec  = "SU2_CFD"
-    oneram6.timeout   = 9600
-    oneram6.tol       = 0.00001
-    test_list.append(oneram6)
-    
     # Fixed CL NACA0012
     fixedCL_naca0012           = TestCase('fixedcl_naca0012')
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
@@ -121,38 +77,6 @@ def main():
     ###  Compressible N-S  ###
     ##########################
 
-    # Laminar flat plate
-    flatplate           = TestCase('flatplate')
-    flatplate.cfg_dir   = "navierstokes/flatplate"
-    flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 20
-    flatplate.test_vals = [-4.680896, 0.781111, -0.135957, 0.022978] #last 4 columns
-    flatplate.su2_exec  = "SU2_CFD"
-    flatplate.timeout   = 1600
-    flatplate.tol       = 0.00001
-    test_list.append(flatplate)
-
-    # Laminar cylinder (steady)
-    cylinder           = TestCase('cylinder')
-    cylinder.cfg_dir   = "navierstokes/cylinder"
-    cylinder.cfg_file  = "lam_cylinder.cfg"
-    cylinder.test_iter = 25
-    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
-    cylinder.su2_exec  = "SU2_CFD"
-    cylinder.timeout   = 1600
-    cylinder.tol       = 0.00001
-    test_list.append(cylinder)
-
-    # Laminar cylinder (low Mach correction)
-    cylinder_lowmach           = TestCase('cylinder_lowmach')
-    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
-    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
-    cylinder_lowmach.test_iter = 25
-    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
-    cylinder_lowmach.su2_exec  = "SU2_CFD"
-    cylinder_lowmach.timeout   = 1600
-    cylinder_lowmach.tol       = 0.00001
-    test_list.append(cylinder_lowmach)
 
     # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
     poiseuille           = TestCase('poiseuille')
@@ -165,125 +89,6 @@ def main():
     poiseuille.tol       = 0.00001
     test_list.append(poiseuille)
 
-    # 2D Poiseuille flow (inlet profile file)
-    poiseuille_profile           = TestCase('poiseuille_profile')
-    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
-    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
-    poiseuille_profile.test_iter = 10
-    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
-    poiseuille_profile.su2_exec  = "SU2_CFD"
-    poiseuille_profile.timeout   = 1600
-    poiseuille_profile.tol       = 0.00001
-    test_list.append(poiseuille_profile)
-
-    ##########################
-    ### Compressible RANS  ###
-    ##########################
-
-    # RAE2822 SA
-    rae2822_sa           = TestCase('rae2822_sa')
-    rae2822_sa.cfg_dir   = "rans/rae2822"
-    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
-    rae2822_sa.test_iter = 20
-    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
-    rae2822_sa.su2_exec  = "SU2_CFD"
-    rae2822_sa.timeout   = 1600
-    rae2822_sa.tol       = 0.00001
-    test_list.append(rae2822_sa)
-    
-    # RAE2822 SST
-    rae2822_sst           = TestCase('rae2822_sst')
-    rae2822_sst.cfg_dir   = "rans/rae2822"
-    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
-    rae2822_sst.test_iter = 20
-    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
-    rae2822_sst.su2_exec  = "SU2_CFD"
-    rae2822_sst.timeout   = 1600
-    rae2822_sst.tol       = 0.00001
-    test_list.append(rae2822_sst)
-
-    # Flat plate
-    turb_flatplate           = TestCase('turb_flatplate')
-    turb_flatplate.cfg_dir   = "rans/flatplate"
-    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
-    turb_flatplate.test_iter = 20
-    turb_flatplate.test_vals = [-4.158303, -6.737135, -0.176244, 0.057446] #last 4 columns
-    turb_flatplate.su2_exec  = "SU2_CFD"
-    turb_flatplate.timeout   = 1600
-    turb_flatplate.tol       = 0.00001
-    test_list.append(turb_flatplate)
-
-    # ONERA M6 Wing
-    turb_oneram6           = TestCase('turb_oneram6')
-    turb_oneram6.cfg_dir   = "rans/oneram6"
-    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
-    turb_oneram6.test_iter = 10
-    turb_oneram6.test_vals = [-2.327523, -6.564349, 0.230471, 0.155843]#last 4 columns
-    turb_oneram6.su2_exec  = "SU2_CFD"
-    turb_oneram6.timeout   = 3200
-    turb_oneram6.tol       = 0.00001
-    test_list.append(turb_oneram6)
-
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
-    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
-    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
-    turb_naca0012_sa.test_iter = 10
-    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa.timeout   = 3200
-    turb_naca0012_sa.tol       = 0.00001
-    test_list.append(turb_naca0012_sa)
-   
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
-    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
-    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
-    turb_naca0012_sa_bin.test_iter = 10
-    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa_bin.timeout   = 3200
-    turb_naca0012_sa_bin.tol       = 0.00001
-    test_list.append(turb_naca0012_sa_bin)
- 
-    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
-    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
-    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
-    turb_naca0012_sst.test_iter = 10
-    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
-    turb_naca0012_sst.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst.timeout   = 3200
-    turb_naca0012_sst.tol       = 0.00001
-    test_list.append(turb_naca0012_sst)
-
-    # PROPELLER 
-    propeller           = TestCase('propeller')
-    propeller.cfg_dir   = "rans/propeller"
-    propeller.cfg_file  = "propeller.cfg"
-    propeller.test_iter = 10
-    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
-    propeller.su2_exec  = "SU2_CFD"
-    propeller.timeout   = 3200
-    propeller.tol       = 0.00001
-    test_list.append(propeller)
-
-    #################################
-    ## Compressible RANS Restart  ###
-    #################################
-
-    # NACA0012 SST Multigrid restart
-    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
-    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
-    turb_naca0012_sst_restart_mg.test_iter = 50
-    turb_naca0012_sst_restart_mg.ntest_vals = 5
-    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
-    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst_restart_mg.timeout   = 3200
-    turb_naca0012_sst_restart_mg.tol       = 0.000001
-    test_list.append(turb_naca0012_sst_restart_mg)
-
     #############################
     ### Incompressible Euler  ###
     #############################

From e33e30f5a5b65735475c261addfcea375749224a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 4 Feb 2019 16:07:31 +0100
Subject: [PATCH 108/539] Updated CFEMFluidIteration for new driver structure

---
 SU2_CFD/include/iteration_structure.hpp | 14 +++++++-------
 SU2_CFD/src/iteration_structure.cpp     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index bf7c75ad8b58..10a7947532c3 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -372,7 +372,7 @@ class CFluidIteration : public CIteration {
    * \brief Preprocessing to prepare for an iteration of the physics.
    * \param[in] ??? - Description here.
    */
-  void Preprocess(COutput *output,
+  virtual void Preprocess(COutput *output,
                   CIntegration ****integration_container,
                   CGeometry ****geometry_container,
                   CSolver *****solver_container,
@@ -396,7 +396,7 @@ class CFluidIteration : public CIteration {
    * \param[in] grid_movement - Volume grid movement classes of the problem.
    * \param[in] FFDBox - FFD FFDBoxes of the problem.
    */
-  void Iterate(COutput *output,
+  virtual void Iterate(COutput *output,
                CIntegration ****integration_container,
                CGeometry ****geometry_container,
                CSolver *****solver_container,
@@ -420,7 +420,7 @@ class CFluidIteration : public CIteration {
    * \param[in] grid_movement - Volume grid movement classes of the problem.
    * \param[in] FFDBox - FFD FFDBoxes of the problem.
    */
-  void Solve(COutput *output,
+  virtual void Solve(COutput *output,
                CIntegration ****integration_container,
                CGeometry ****geometry_container,
                CSolver *****solver_container,
@@ -436,7 +436,7 @@ class CFluidIteration : public CIteration {
    * \brief Updates the containers for the fluid system.
    * \param[in] ??? - Description here.
    */
-  void Update(COutput *output,
+  virtual void Update(COutput *output,
               CIntegration ****integration_container,
               CGeometry ****geometry_container,
               CSolver *****solver_container,
@@ -452,7 +452,7 @@ class CFluidIteration : public CIteration {
    * \brief Monitors the convergence and other metrics for the fluid system.
    * \param[in] ??? - Description here.
    */
-  bool Monitor(COutput *output,
+ virtual bool Monitor(COutput *output,
       CIntegration ****integration_container,
       CGeometry ****geometry_container,
       CSolver *****solver_container,
@@ -470,7 +470,7 @@ class CFluidIteration : public CIteration {
    * \param[in] geometry_container - Geometrical definition of the problem.
    * \param[in] config_container - Definition of the particular problem.
    */
-  void Postprocess(COutput *output,
+  virtual void Postprocess(COutput *output,
                    CIntegration ****integration_container,
                    CGeometry ****geometry_container,
                    CSolver *****solver_container,
@@ -568,7 +568,7 @@ class CTurboIteration : public CFluidIteration {
  * \author T. Economon, E. van der Weide
  * \version 6.1.0 "Falcon"
  */
-class CFEMFluidIteration : public CIteration {
+class CFEMFluidIteration : public CFluidIteration {
 public:
   
   /*!
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index fdb9090c626c..c6e81004260b 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1128,7 +1128,7 @@ void CTurboIteration::Postprocess( COutput *output,
 
 }
 
-CFEMFluidIteration::CFEMFluidIteration(CConfig *config) : CIteration(config) { }
+CFEMFluidIteration::CFEMFluidIteration(CConfig *config) : CFluidIteration(config) { }
 CFEMFluidIteration::~CFEMFluidIteration(void) { }
 
 void CFEMFluidIteration::Preprocess(COutput *output,
@@ -1206,7 +1206,7 @@ void CFEMFluidIteration::Update(COutput *output,
                                 CVolumetricMovement **grid_movement,
                                 CFreeFormDefBox*** FFDBox,
                                 unsigned short val_iZone)      { }
-void CFEMFluidIteration::Monitor()     { }
+//void CFEMFluidIteration::Monitor()     { }
 void CFEMFluidIteration::Output()      { }
 void CFEMFluidIteration::Postprocess() { }
 

From ad4669b535ea3db4176d814d22c962a6e1e76cf5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 4 Feb 2019 16:19:48 +0100
Subject: [PATCH 109/539] Enabled DG_FEM solver output.

---
 SU2_CFD/include/output_structure.hpp   |   79 +-
 SU2_CFD/include/output_structure.inl   |    2 +
 SU2_CFD/obj/Makefile.am                |    1 +
 SU2_CFD/src/driver_structure.cpp       |    6 +
 SU2_CFD/src/output_direct_mean_fem.cpp |  522 +++++++
 SU2_CFD/src/output_structure.cpp       | 1881 +++---------------------
 6 files changed, 782 insertions(+), 1709 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index b0b3f6ffe6fa..13e35f369e9e 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -295,7 +295,7 @@ class COutput {
   
   map<string, Signal_Processing::RunningAverage> RunningAverages;
   
-  bool multizone, grid_movement;
+  bool multizone, grid_movement, fem_output;
   
 public:
 
@@ -1022,7 +1022,9 @@ class COutput {
   
   void AddVolumeOutput(string name, string field_name, string groupname);
   
-  virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);   
+  virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  virtual void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
   
   void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
   
@@ -1082,7 +1084,7 @@ class CFlowOutput : public COutput {
   
   void SetVolumeOutputFields(CConfig *config);
   
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
   
   void SetHistoryOutputFields(CConfig *config);
   
@@ -1181,6 +1183,77 @@ class CIncFlowOutput : public COutput {
   
 };
 
+
+/*! \class CFlowFEMOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 30, 2018.
+ */
+class CFlowFEMOutput : public COutput {
+private:
+  
+  unsigned short nVar;
+
+  unsigned short turb_model;
+  
+  bool grid_movement;
+  
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFlowFEMOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  void SetVolumeOutputFields(CConfig *config);
+  
+  void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
+  
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+  
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
+  bool SetInit_Residuals(CConfig *config);
+  
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+};
+
 /*! \class CFEAOutput
  *  \brief Output class for FEA problems.
  *  \author R. Sanchez, T. Albring.
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 16e9bb0e4efe..5c3f3236b37b 100644
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -59,6 +59,8 @@ inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
 inline void COutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
 
+inline void COutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){}
+
 inline void COutput::PrintScreenFixed(stringstream& stream, su2double val) {
   stream.precision(6); stream.setf(ios::fixed, ios::floatfield); stream.width(field_width);
   stream << std::right << val;
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 0e46b03b1d0a..4e22336dc626 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -123,6 +123,7 @@ libSU2Core_sources = \
   ../src/output_paraview.cpp \
   ../src/output_direct_elasticity.cpp \
   ../src/output_direct_mean.cpp \
+  ../src/output_direct_mean_fem.cpp \
   ../src/output_direct_mean_inc.cpp \
   ../src/output_direct_heat.cpp \
   ../src/output_adjoint_elasticity.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 8a75a371e46a..0b49b71deb18 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3710,6 +3710,12 @@ void CDriver::Output_Preprocessing(){
       output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
       
+    case FEM_EULER: case FEM_LES: case FEM_RANS: case FEM_NAVIER_STOKES:
+      if (rank == MASTER_NODE)
+        cout << ": FEM output structure." << endl;
+      output[iZone] = new CFlowFEMOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+      break;
+      
     default:
       if (rank == MASTER_NODE)
         cout << ": default output structure." << endl;
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index e69de29bb2d1..d947b13bb455 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -0,0 +1,522 @@
+/*!
+ * \file output_direct_mean.cpp
+ * \brief Main subroutines for compressible flow output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "../include/output_structure.hpp"
+
+CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
+
+  nDim = geometry->GetnDim();  
+  
+  nVar = solver[FLOW_SOL]->GetnVar();
+  
+  turb_model = config->GetKind_Turb_Model();
+  
+  grid_movement = config->GetGrid_Movement(); 
+  
+  su2double Gas_Constant, Mach2Vel, Mach_Motion;
+  unsigned short iDim;
+  su2double Gamma = config->GetGamma();
+      
+  /*--- Set the non-dimensionalization for coefficients. ---*/
+  
+  RefArea = config->GetRefArea();
+  
+  if (grid_movement) {
+    Gas_Constant = config->GetGas_ConstantND();
+    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
+    Mach_Motion = config->GetMach_Motion();
+    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
+  }
+  else {
+    RefVel2 = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
+  }
+  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
+  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
+  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
+  
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  if (nRequestedScreenFields == 0){
+    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
+    RequestedScreenFields.push_back("RMS_DENSITY");
+    RequestedScreenFields.push_back("RMS_MOMENTUM-X");
+    RequestedScreenFields.push_back("RMS_MOMENTUM-Y");
+    RequestedScreenFields.push_back("RMS_ENERGY");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("SOLUTION");
+    RequestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
+  MultiZoneHeaderString = ss.str();
+  
+  /*--- Use FEM merging routines --- */
+  
+  fem_output = true;
+}
+
+CFlowFEMOutput::~CFlowFEMOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+
+  }
+
+
+}
+
+
+
+void CFlowFEMOutput::SetHistoryOutputFields(CConfig *config){
+  
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The outer iteration index.
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The inner iteration index.
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Root-mean square residual of the density.
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum x-component.
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum y-component.
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the momentum z-component.
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the energy.
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  /// END_GROUP
+   
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Maximum residual of the density.
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum x-component. 
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum y-component. 
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum z-component. 
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the energy.  
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
+  /// DESCRIPTION: Drag coefficient 
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient 
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient   
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis    
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis    
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis      
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction    
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction    
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction      
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
+  vector<string> Marker_Monitoring;
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
+    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
+  }  
+  /// DESCRIPTION: Drag coefficient   
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient   
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient     
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis      
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis      
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis        
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction      
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction      
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction        
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio  
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// END_GROUP 
+  
+  /// DESCRIPTION: Angle of attack  
+  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  /// DESCRIPTION: Linear solver iterations   
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
+  vector<string> Marker_Analyze;
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
+    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
+  }  
+  /// DESCRIPTION: Average mass flow    
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Mach number      
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Temperature        
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Pressure  
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Density  
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Enthalpy  
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average velocity in normal direction of the surface
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Flow uniformity 
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary strength
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Momentum distortion  
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary over uniformity 
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total temperature  
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total pressure   
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Pressure drop    
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// END_GROUP
+
+}
+
+void CFlowFEMOutput::SetVolumeOutputFields(CConfig *config){
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  
+  // Solution variables
+  AddVolumeOutput("DENSITY",    "Density",    "SOLUTION");
+  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "SOLUTION");
+  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "SOLUTION");
+  if (nDim == 3)
+    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "SOLUTION");
+  AddVolumeOutput("ENERGY",     "Energy",     "SOLUTION");  
+  
+  // Turbulent Residuals
+  switch(config->GetKind_Turb_Model()){
+  case SST:
+    AddVolumeOutput("TKE", "TKE", "SOLUTION");
+    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
+    break;
+  case SA: case SA_COMP: case SA_E: 
+  case SA_E_COMP: case SA_NEG: 
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
+    break;
+  case NONE:
+    break;
+  }
+  
+  // Primitive variables
+  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE");
+  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE");
+  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  
+  if (config->GetKind_Solver() == FEM_NAVIER_STOKES){
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE"); 
+  }
+  
+  if (config->GetKind_Solver() == FEM_LES || config->GetKind_SGS_Model() != IMPLICIT_LES) {
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+  }
+}
+
+void CFlowFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){
+  
+  unsigned short iDim;
+  
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  /*--- Get a pointer to the fluid model class from the DG-FEM solver
+   so that we can access the states below. ---*/
+
+  CFluidModel *DGFluidModel = solver[FLOW_SOL]->GetFluidModel();
+  
+  /* Set the pointers for the solution for this element. */
+
+  const unsigned long offset = nVar*volElem[iElem].offsetDOFsSolLocal;
+  su2double *solDOFs         = solver[FLOW_SOL]->GetVecSolDOFs() + offset;
+  
+  /*--- Get the conservative variables for this particular DOF. ---*/
+
+  const su2double *U = solDOFs+dof*nVar;
+
+  /*--- Load the coordinate values of the solution DOFs. ---*/
+  
+  const su2double *coor = volElem[iElem].coorSolDOFs.data() + dof*nDim;
+  
+  /*--- Prepare the primitive states. ---*/
+
+  const su2double DensityInv = 1.0/U[0];
+  su2double vel[3], Velocity2 = 0.0;
+  for(iDim=0; iDim<nDim; ++iDim) {
+    vel[iDim] = U[iDim+1]*DensityInv;
+    Velocity2 += vel[iDim]*vel[iDim];
+  }
+  su2double StaticEnergy = U[nDim+1]*DensityInv - 0.5*Velocity2;
+  DGFluidModel->SetTDState_rhoe(U[0], StaticEnergy);
+  
+    
+  SetVolumeOutputValue("COORD-X",        index, coor[0]);
+  SetVolumeOutputValue("COORD-Y",        index, coor[1]);
+  if (nDim == 3) 
+    SetVolumeOutputValue("COORD-Z",      index, coor[2]);
+  SetVolumeOutputValue("DENSITY",        index, U[0]);
+  SetVolumeOutputValue("MOMENTUM-X",     index, U[1]);
+  SetVolumeOutputValue("MOMENTUM-Y",     index, U[2]);
+  if (nDim == 3){
+    SetVolumeOutputValue("MOMENTUM-Z",   index,  U[3]);
+    SetVolumeOutputValue("ENERGY",       index,  U[4]);
+  } else {                               
+    SetVolumeOutputValue("ENERGY",       index,  U[3]);    
+  }
+  
+  SetVolumeOutputValue("PRESSURE",       index, DGFluidModel->GetPressure());
+  SetVolumeOutputValue("TEMPERATURE",    index, DGFluidModel->GetTemperature());
+  SetVolumeOutputValue("MACH",           index, sqrt(Velocity2)/DGFluidModel->GetSoundSpeed());
+  SetVolumeOutputValue("PRESSURE_COEFF", index, DGFluidModel->GetCp());
+  
+  if (config->GetKind_Solver() == FEM_NAVIER_STOKES){
+    SetVolumeOutputValue("LAMINAR_VISCOSITY", index, DGFluidModel->GetLaminarViscosity()); 
+  }
+  if ((config->GetKind_Solver()  == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
+    // todo: Export Eddy instead of Laminar viscosity
+    SetVolumeOutputValue("EDDY_VISCOSITY", index, DGFluidModel->GetLaminarViscosity()); 
+  }
+}
+
+void CFlowFEMOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+
+}
+
+void CFlowFEMOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+  unsigned short iVar;
+  
+  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
+  CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
+  
+  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
+  SetHistoryOutputValue("PHYS_TIME", timeused);
+  
+  SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
+  if (nDim == 2)
+    SetHistoryOutputValue("RMS_ENERGY", log10(flow_solver->GetRes_RMS(3)));
+  else {
+    SetHistoryOutputValue("RMS_MOMENTUM-Z", log10(flow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ENERGY", log10(flow_solver->GetRes_RMS(4)));
+  }
+  
+  
+  SetHistoryOutputValue("MAX_DENSITY", log10(flow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_MOMENTUM-X", log10(flow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_MOMENTUM-Y", log10(flow_solver->GetRes_Max(2)));
+  if (nDim == 2)
+    SetHistoryOutputValue("MAX_ENERGY", log10(flow_solver->GetRes_Max(3)));
+  else {
+    SetHistoryOutputValue("MAX_MOMENTUM-Z", log10(flow_solver->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ENERGY", log10(flow_solver->GetRes_Max(4)));
+  }
+  
+  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
+  if (nDim == 3)
+    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
+  if (nDim == 3){
+    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
+    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
+  }
+  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
+  if (nDim == 3)
+    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
+  SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
+  
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3){
+      SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+    }
+    SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
+    
+    SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
+  }
+  
+  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  
+}
+
+bool CFlowFEMOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
+}
+
+bool CFlowFEMOutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
+  return write_header;
+}
+
+bool CFlowFEMOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  if ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)){
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq_DualTime() == 0);
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
+  } 
+
+  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
+  return write_output;
+}
+
+su2double CFlowFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+  
+  unsigned short iDim, jDim;
+  su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
+      Grad_Vel[iDim][jDim] = node_flow->GetGradient_Primitive(iDim+1, jDim);
+      Strain[iDim][jDim]   = 0.5*(Grad_Vel[iDim][jDim] + Grad_Vel[jDim][iDim]);
+      Omega[iDim][jDim]    = 0.5*(Grad_Vel[iDim][jDim] - Grad_Vel[jDim][iDim]);
+    }
+  }
+  
+  su2double OmegaMag = 0.0, StrainMag = 0.0;
+  for (iDim = 0; iDim < nDim; iDim++) {
+    for (jDim = 0 ; jDim < nDim; jDim++) {
+      StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
+      OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
+    }
+  }
+  StrainMag = sqrt(StrainMag); OmegaMag = sqrt(OmegaMag);
+  
+  su2double Q = 0.5*(OmegaMag - StrainMag);
+  
+  return Q;
+}
+
+
+bool CFlowFEMOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  
+}
+
+bool CFlowFEMOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+  
+  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+      
+}
+
+
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 89ca3bb3b23b..22fbe5238972 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -349,6 +349,10 @@ COutput::COutput(CConfig *config) {
   
   multizone     = config->GetMultizone_Problem();
   
+  /*--- Default is not to use the FEM output merging --- */
+  
+  fem_output = false;
+  
 }
 
 COutput::~COutput(void) {
@@ -472,6 +476,26 @@ COutput::~COutput(void) {
     delete [] NuFactorIn;
     delete [] NuFactorOut;
   }
+  
+  if (Local_Data != NULL){
+    for (unsigned long iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
+      if (Local_Data[iPoint] != NULL) delete [] Local_Data[iPoint];
+    delete [] Local_Data;
+  }
+  
+  /*--- Deallocate the structures holding the linear partitioning ---*/
+
+  if (Local_Halo_Sort != NULL) delete [] Local_Halo_Sort;
+
+  if (beg_node != NULL) delete [] beg_node;
+  if (end_node != NULL) delete [] end_node;
+
+  if (nPoint_Lin != NULL) delete [] nPoint_Lin;
+  if (nPoint_Cum != NULL) delete [] nPoint_Cum;
+  
+  delete ConvergenceTable;
+  delete MultiZoneHeaderTable;
+  
 }
 
 
@@ -1475,1608 +1499,87 @@ void COutput::MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, uns
     
     /*--- Remove the rind layer from the solution only if requested ---*/
     
-    if (!Wrt_Halo) {
-      
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
-      
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-          
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
-          
-        }
-        kElem = (iProcessor+1)*MaxLocalElem;
-      }
-    }
-    
-    /*--- Store the unique connectivity list for this element type. ---*/
-    
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-        
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
-          
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
-          
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
-          
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
-          }
-        }
-      }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] Local_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
-  }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case LINE:
-        nGlobal_Line = nElem_Total;
-        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
-        break;
-      case TRIANGLE:
-        nGlobal_BoundTria = nElem_Total;
-        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_BoundQuad = nElem_Total;
-        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-        break;
-    }
-  }
-  
-}
-
-void COutput::MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar = 0, jVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
-  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
-  unsigned short iVar_GridVel = 0, iVar_PressCp = 0, iVar_Lam = 0, iVar_MachMean = 0,
-  iVar_ViscCoeffs = 0, iVar_HeatCoeffs = 0, iVar_Sens = 0, iVar_Extra = 0, iVar_Eddy = 0, iVar_Sharp = 0,
-  iVar_FEA_Vel = 0, iVar_FEA_Accel = 0, iVar_FEA_Stress = 0, iVar_FEA_Stress_3D = 0,
-  iVar_FEA_Extra = 0, iVar_SensDim = 0;
-  unsigned long iPoint = 0, jPoint = 0, iVertex = 0, iMarker = 0;
-  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
-  
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Sens = NULL;
-  
-  unsigned short CurrentIndex;
-  int *Local_Halo;
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  int iProcessor;
-  
-  bool grid_movement  = (config->GetGrid_Movement());
-  bool compressible   = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool transition     = (config->GetKind_Trans_Model() == LM);
-  bool flow           = (( config->GetKind_Solver() == EULER             ) ||
-                         ( config->GetKind_Solver() == NAVIER_STOKES     ) ||
-                         ( config->GetKind_Solver() == RANS              ) ||
-                         ( config->GetKind_Solver() == FEM_EULER         ) ||
-                         ( config->GetKind_Solver() == FEM_NAVIER_STOKES ) ||
-                         ( config->GetKind_Solver() == FEM_RANS          ) ||
-                         ( config->GetKind_Solver() == FEM_LES           ) ||
-                         ( config->GetKind_Solver() == ADJ_EULER         ) ||
-                         ( config->GetKind_Solver() == ADJ_NAVIER_STOKES ) ||
-                         ( config->GetKind_Solver() == ADJ_RANS          )   );
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  
-  unsigned short iDim;
-  unsigned short nDim = geometry->GetnDim();
-  su2double RefArea = config->GetRefArea();
-  su2double Gamma = config->GetGamma();
-  su2double RefVel2, *Normal, Area;
-  
-  /*--- Set the non-dimensionalization ---*/
-  if (flow) {
-    if (grid_movement) {
-      Gas_Constant = config->GetGas_ConstantND();
-      Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-      Mach_Motion = config->GetMach_Motion();
-      RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-    }
-    else {
-      RefVel2 = 0.0;
-      for (iDim = 0; iDim < nDim; iDim++)
-        RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-    }
-    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-    RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-    factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  }
-  
-  /*--- Prepare send buffers for the conservative variables. Need to
-   find the total number of conservative variables and also the
-   index for their particular solution container. ---*/
-  
-  switch (Kind_Solver) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; if(config->GetWeakly_Coupled_Heat()) SecondIndex = HEAT_SOL; else SecondIndex = NONE; ThirdIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; if (transition) ThirdIndex=TRANS_SOL; else ThirdIndex = NONE;  if(config->GetWeakly_Coupled_Heat()) ThirdIndex = HEAT_SOL; else ThirdIndex = NONE; break;
-    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case FEM_RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    case FEM_ELASTICITY: FirstIndex = FEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; ThirdIndex = NONE; break;
-    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    default: SecondIndex = NONE; ThirdIndex = NONE; break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
-  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
-  nVar_Total = nVar_Consv;
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
-    
-    if (grid_movement && !fem) {
-      iVar_GridVel = nVar_Total;
-      if (geometry->GetnDim() == 2) nVar_Total += 2;
-      else if (geometry->GetnDim() == 3) nVar_Total += 3;
-    }
-    
-    /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
-    
-    if (Kind_Solver == EULER     || Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS ||
-        Kind_Solver == FEM_EULER || Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS ||
-        Kind_Solver == FEM_LES) {
-      iVar_PressCp = nVar_Total; nVar_Total += 3;
-      iVar_MachMean = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-    
-    if (Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS     ||
-        Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
-      iVar_Lam = nVar_Total;
-      nVar_Total += 1;
-      iVar_ViscCoeffs = nVar_Total;
-      if (geometry->GetnDim() == 2) nVar_Total += 2;
-      else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      iVar_HeatCoeffs = nVar_Total;
-      nVar_Total += 2;
-    }
-    
-    /*--- Add Eddy Viscosity to the restart file ---*/
-    
-    if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
-      iVar_Eddy = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Sharp edges to the restart file ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-        iVar_Sharp = nVar_Total; nVar_Total += 1;
-      }
-    }
-    
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      iVar_Sens   = nVar_Total; nVar_Total += 2;
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY)  {
-      /*--- If the analysis is dynamic... ---*/
-      if (config->GetDynamic_Analysis() == DYNAMIC) {
-        /*--- Velocities ---*/
-        iVar_FEA_Vel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-        /*--- Accelerations ---*/
-        iVar_FEA_Accel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      }
-      iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
-      if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_EULER)         ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      iVar_Sens    = nVar_Total; nVar_Total += 1;
-      iVar_SensDim = nVar_Total; nVar_Total += nDim;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
-    }
-
-    if (config->GetExtraOutput()) {
-      if (Kind_Solver == RANS) {
-        iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
-      }
-    }
-    
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-    
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-    
-  }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-  
-  /*--- Each processor sends its local number of nodes to the master. ---*/
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalPoint = nLocalPoint;
-  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
-#endif
-  
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
-  
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
-  
-  su2double *Buffer_Send_Res = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Res = NULL;
-  
-  su2double *Buffer_Send_Vol = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Vol = NULL;
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Auxiliary vectors for surface coefficients ---*/
-  
-  if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS))  ||
-      ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat  = new su2double[geometry->GetnPoint()];
-    Aux_yPlus = new su2double[geometry->GetnPoint()];
-  }
-  
-  if ((Kind_Solver == ADJ_EULER) ||
-      (Kind_Solver == ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == ADJ_RANS)  ||
-      (Kind_Solver == DISC_ADJ_EULER) ||
-      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == DISC_ADJ_RANS)) {
-    Aux_Sens = new su2double[geometry->GetnPoint()];
-  }
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_Res = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_Vol = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
-  }
-  
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-    
-    /*--- Logic for which solution class to draw from. ---*/
-    
-    jVar = iVar;
-    CurrentIndex = FirstIndex;
-    if ((SecondIndex != NONE) && (iVar > nVar_First-1)) {
-      jVar = iVar - nVar_First;
-      CurrentIndex = SecondIndex;
-    }
-    if ((SecondIndex != NONE) && (ThirdIndex != NONE) && (iVar > (nVar_First + nVar_Second-1))) {
-      jVar = iVar - nVar_First - nVar_Second;
-      CurrentIndex = ThirdIndex;
-    }
-    
-    /*--- Loop over this partition to collect the current variable ---*/
-    
-    jPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      
-      /*--- Check for halos & write only if requested ---*/
-      
-      if (!Local_Halo[iPoint] || Wrt_Halo) {
-        
-        /*--- Get this variable into the temporary send buffer. ---*/
-        
-        Buffer_Send_Var[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar);
-        
-        if (!config->GetLow_MemoryOutput()) {
-          
-          if (config->GetWrt_Limiters()) {
-            Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-          }
-          
-          if (config->GetWrt_Residuals()) {
-            if (!config->GetDiscrete_Adjoint()) {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            } else {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
-              solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
-            }
-          }
-          
-        }
-        
-        /*--- Only send/recv the volumes & global indices during the first loop ---*/
-        
-        if (iVar == 0) {
-          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-        }
-        
-        jPoint++;
-        
-      }
-    }
-    
-    /*--- Gather the data on the master node. ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-    if (!config->GetLow_MemoryOutput()) {
-      
-      if (config->GetWrt_Limiters()) {
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      }
-      
-      if (config->GetWrt_Residuals()) {
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      }
-      
-    }
-    
-    if (iVar == 0) {
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
-#endif
-    }
-    
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-    
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-          
-          /*--- Get global index, then loop over each variable and store ---*/
-          
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-          
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-          
-          if (!config->GetLow_MemoryOutput()) {
-            
-            if (config->GetWrt_Limiters()) {
-              Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            }
-            
-            if (config->GetWrt_Residuals()) {
-              unsigned short ExtraIndex;
-              ExtraIndex = nVar_Consv;
-              if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
-              Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            }
-            
-          }
-          
-          jPoint++;
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-    
-  }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Additional communication routine for the grid velocity. Note that
-     we are reusing the same temporary buffers from above for efficiency.
-     Also, in the future more routines like this could be used to write
-     an arbitrary number of additional variables to the file. ---*/
-    
-    if (grid_movement && !fem) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Grid_Vel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Buffer_Send_Var[jPoint] = Grid_Vel[0];
-          Buffer_Send_Res[jPoint] = Grid_Vel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Grid_Vel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_GridVel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate Pressure, Cp, and Mach ---*/
-    
-    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-      ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the coefficient of pressure at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the pressure, Cp, and mach variables. ---*/
-
-          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetPressure();
-          if (compressible){
-            Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetTemperature();
-          } else{
-            Buffer_Send_Res[jPoint] =  0.0;
-          }
-          Buffer_Send_Vol[jPoint] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea;
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_PressCp;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate Mach---*/
-    
-    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-      ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          if (compressible) {
-            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/
-            solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed();
-          }
-          if (incompressible) {
-            Buffer_Send_Var[jPoint] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())*config->GetVelocity_Ref()/
-            sqrt(config->GetBulk_Modulus()/(solver[FLOW_SOL]->node[iPoint]->GetDensity()*config->GetDensity_Ref()));
-          }
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_MachMean;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Laminar Viscosity ---*/
-    
-    if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-      ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          Buffer_Send_Res[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity();
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Lam;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-      
-      /*--- Communicate skin friction ---*/
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the viscous coefficients at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        Aux_Frict_x[iPoint] = 0.0;
-        Aux_Frict_y[iPoint] = 0.0;
-        Aux_Frict_z[iPoint] = 0.0;
-      }
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-            Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-            if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Buffer_Send_Var[jPoint] = Aux_Frict_x[iPoint];
-          Buffer_Send_Res[jPoint] = Aux_Frict_y[iPoint];
-          if (geometry->GetnDim() == 3)
-            Buffer_Send_Vol[jPoint] = Aux_Frict_z[iPoint];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-          Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0;
-        iVar = iVar_ViscCoeffs;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar + 2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor + 1) * nBuffer_Scalar;
-        }
-      }
-      
-      /*--- Communicate heat transfer, y+ ---*/
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the viscous coefficients at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        Aux_Heat[iPoint] = 0.0;
-        Aux_yPlus[iPoint] = 0.0;
-      }
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-            Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          if (compressible) {
-            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
-            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
-          }
-          if (incompressible) {
-            Buffer_Send_Res[jPoint] = Aux_Heat[iPoint];
-            Buffer_Send_Vol[jPoint] = Aux_yPlus[iPoint];
-          }
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++)
-        Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0;
-        iVar = iVar_HeatCoeffs;
-
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar + 0][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar + 1][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor + 1) * nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Eddy Viscosity ---*/
-    
-    if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the pressure and mach variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity();
-
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Eddy;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-      
-    }
-    
-    /*--- Communicate the Sharp Edges ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      
-      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-        
-        /*--- Loop over this partition to collect the current variable ---*/
-        jPoint = 0;
-        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-          
-          /*--- Check for halos & write only if requested ---*/
-          
-          if (!Local_Halo[iPoint] || Wrt_Halo) {
-            
-            /*--- Load buffers with the pressure and mach variables. ---*/
-            
-            Buffer_Send_Var[jPoint] = geometry->node[iPoint]->GetSharpEdge_Distance();
-            jPoint++;
-          }
-        }
-        
-        /*--- Gather the data on the master node. ---*/
-        
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-        
-        /*--- The master node unpacks and sorts this variable by global index ---*/
-        
-        if (rank == MASTER_NODE) {
-          jPoint = 0; iVar = iVar_Sharp;
-          for (iProcessor = 0; iProcessor < size; iProcessor++) {
-            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-              
-              /*--- Get global index, then loop over each variable and store ---*/
-              
-              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-              Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-              jPoint++;
-            }
-            
-            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-            
-            jPoint = (iProcessor+1)*nBuffer_Scalar;
-          }
-        }
-      }
-    }
-    
-    /*--- Communicate the surface sensitivity ---*/
-    
-    if ((Kind_Solver == ADJ_EULER)         ||
-        (Kind_Solver == ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == ADJ_RANS)          ||
-        (Kind_Solver == DISC_ADJ_EULER)    ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      
-      /*--- First, loop through the mesh in order to find and store the
-       value of the surface sensitivity at any surface nodes. They
-       will be placed in an auxiliary vector and then communicated like
-       all other volumetric variables. ---*/
-      
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) Aux_Sens[iPoint] = 0.0;
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-            iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-            Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-            Area = 0.0;
-            for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
-            Area = sqrt (Area);
-            Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
-          }
-        }
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = Aux_Sens[iPoint];
-          if ((config->GetKind_ConvNumScheme() == SPACE_CENTERED) && (!config->GetDiscrete_Adjoint()))
-            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint);
-          if ((config->GetKind_ConvNumScheme() == SPACE_UPWIND) && (!config->GetDiscrete_Adjoint()))
-            Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0);
-          
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (!config->GetDiscrete_Adjoint())
-        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      if (!config->GetDiscrete_Adjoint())
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_Sens;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            if (!config->GetDiscrete_Adjoint())
-              Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_EULER)    ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS)) {
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0);
-          Buffer_Send_Res[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1);
-          if (nDim == 3)
-            Buffer_Send_Vol[jPoint] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (nDim == 3)
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (nDim == 3)
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_SensDim;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (nDim == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Velocities for dynamic FEM problem ---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Node_Vel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
-          Buffer_Send_Var[jPoint] = Node_Vel[0];
-          Buffer_Send_Res[jPoint] = Node_Vel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Vel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Vel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate the Accelerations for dynamic FEM problem ---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Node_Accel;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
-          Buffer_Send_Var[jPoint] = Node_Accel[0];
-          Buffer_Send_Res[jPoint] = Node_Accel[1];
-          if (geometry->GetnDim() == 3) Buffer_Send_Vol[jPoint] = Node_Accel[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (geometry->GetnDim() == 3) {
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      }
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (geometry->GetnDim() == 3) {
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      }
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Accel;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (geometry->GetnDim() == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-
-    /*--- Communicate the FEM elasticity stresses (2D) - New elasticity solver---*/
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Stress;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-          /*--- Sigma xx ---*/
-          Buffer_Send_Var[jPoint] = Stress[0];
-          /*--- Sigma yy ---*/
-          Buffer_Send_Res[jPoint] = Stress[1];
-          /*--- Sigma xy ---*/
-          Buffer_Send_Vol[jPoint] = Stress[2];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Stress;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    /*--- Communicate the FEM elasticity stresses (3D) - New elasticity solver---*/
-    
-    if ((Kind_Solver == FEM_ELASTICITY) && (geometry->GetnDim() == 3)) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      
-      jPoint = 0; su2double *Stress;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the three grid velocity components. ---*/
-          
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-          /*--- Sigma zz ---*/
-          Buffer_Send_Var[jPoint] = Stress[3];
-          /*--- Sigma xz ---*/
-          Buffer_Send_Res[jPoint] = Stress[4];
-          /*--- Sigma yz ---*/
-          Buffer_Send_Vol[jPoint] = Stress[5];
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-      
-#endif
-      
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-      
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Stress_3D;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index]   = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-          
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-          
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-    
-    
-    /*--- Communicate the Linear elasticity ---*/
-    
-    if ( Kind_Solver == FEM_ELASTICITY ) {
-      
-      /*--- Loop over this partition to collect the current variable ---*/
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-        
-        /*--- Check for halos & write only if requested ---*/
-        
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-          
-          /*--- Load buffers with the temperature and laminar viscosity variables. ---*/
-          
-          Buffer_Send_Var[jPoint] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress();
-          jPoint++;
-        }
-      }
-      
-      /*--- Gather the data on the master node. ---*/
-      
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
+    if (!Wrt_Halo) {
       
-      /*--- The master node unpacks and sorts this variable by global index ---*/
+      /*--- Loop for flagging duplicate elements so that they are not
+       included in the final connectivity list. ---*/
       
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Extra;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-            
-            /*--- Get global index, then loop over each variable and store ---*/
-            
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            jPoint++;
-          }
+      kElem = 0;
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
           
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
+          /*--- Check if this element was marked as a halo. ---*/
+          if (Buffer_Recv_Halo[kElem+iElem])
+            Write_Elem[kElem+iElem] = false;
           
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
         }
+        kElem = (iProcessor+1)*MaxLocalElem;
       }
     }
     
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())) {
-      /*--- Loop over this partition to collect the current variable ---*/
-
-      jPoint = 0;
-      for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-
-        /*--- Check for halos & write only if requested ---*/
-
-        if (!Local_Halo[iPoint] || Wrt_Halo) {
-
-          /*--- Load buffers with the skin friction, heat transfer, y+ variables. ---*/
-
-          Buffer_Send_Var[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(0);
-          Buffer_Send_Res[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(1);
-          if (geometry->GetnDim() == 3)
-            Buffer_Send_Vol[jPoint] = solver[ADJFEA_SOL]->node[iPoint]->GetGeometry_CrossTerm_Derivative(2);
-          jPoint++;
-        }
-      }
-
-      /*--- Gather the data on the master node. ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-      if (nDim == 3)
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
-      if (nDim == 3)
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
-#endif
-
-      /*--- The master node unpacks and sorts this variable by global index ---*/
-
-      if (rank == MASTER_NODE) {
-        jPoint = 0; iVar = iVar_FEA_Extra;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-
-            /*--- Get global index, then loop over each variable and store ---*/
-
-            iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-            Data[iVar+0][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-            Data[iVar+1][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            if (nDim == 3)
-              Data[iVar+2][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            jPoint++;
-          }
-
-          /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-
-          jPoint = (iProcessor+1)*nBuffer_Scalar;
-        }
-      }
-    }
-
-    if (config->GetExtraOutput()) {
-      
-      for (jVar = 0; jVar < nVar_Extra; jVar++) {
-        
-        /*--- Loop over this partition to collect the current variable ---*/
+    /*--- Store the unique connectivity list for this element type. ---*/
+    
+    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
+    for (iProcessor = 0; iProcessor < size; iProcessor++) {
+      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
         
-        jPoint = 0;
-        for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+        /*--- Only write the elements that were flagged for it. ---*/
+        if (Write_Elem[jElem+iElem]) {
           
-          /*--- Check for halos & write only if requested ---*/
+          /*--- Increment total count for this element type ---*/
+          nElem_Total++;
           
-          if (!Local_Halo[iPoint] || Wrt_Halo) {
-            
-            /*--- Get this variable into the temporary send buffer. ---*/
-            
-            if (Kind_Solver == RANS) {
-              Buffer_Send_Var[jPoint] = solver[TURB_SOL]->OutputVariables[iPoint*nVar_Extra+jVar];
-            }
-            jPoint++;
-            
-          }
-        }
-        
-        /*--- Gather the data on the master node. ---*/
-        
-#ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
-        
-        /*--- The master node unpacks and sorts this variable by global index ---*/
-        
-        if (rank == MASTER_NODE) {
-          jPoint = 0; iVar = iVar_Extra;
-          for (iProcessor = 0; iProcessor < size; iProcessor++) {
-            for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-              
-              /*--- Get global index, then loop over each variable and store ---*/
-              
-              iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-              Data[iVar+jVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-              jPoint++;
-            }
-            
-            /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-            
-            jPoint = (iProcessor+1)*nBuffer_Scalar;
+          /*--- Get global index, then loop over each variable and store.
+           Note that we are adding one to the index value because CGNS/Tecplot
+           use 1-based indexing.---*/
+          
+          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
+            kNode++;
           }
         }
       }
+      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+      jElem = (iProcessor+1)*MaxLocalElem;
+      jNode = (iProcessor+1)*nBuffer_Scalar;
     }
-    
   }
   
   /*--- Immediately release the temporary buffers. ---*/
-  
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_Res;
-  delete [] Buffer_Send_Vol;
-  delete [] Buffer_Send_GlobalIndex;
+  delete [] Buffer_Send_Elem;
+  delete [] Buffer_Send_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] Local_Halo;
   if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nPoint;
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_Res;
-    delete [] Buffer_Recv_Vol;
-    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nElem;
+    delete [] Buffer_Recv_Elem;
+    delete [] Buffer_Recv_Halo;
+    delete [] Write_Elem;
   }
   
-  /*--- Release memory needed for surface coefficients ---*/
-  
-  delete [] Local_Halo;
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
   
-  if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-    ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-    delete[] Aux_Frict_x; delete[] Aux_Frict_y; delete[] Aux_Frict_z;
-    delete [] Aux_Heat; delete [] Aux_yPlus;
-  }
-  if (( Kind_Solver == ADJ_EULER              ) ||
-      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-      ( Kind_Solver == ADJ_RANS               ) ||
-      ( Kind_Solver == DISC_ADJ_EULER         ) ||
-      ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
-      ( Kind_Solver == DISC_ADJ_RANS          )) {
-    delete [] Aux_Sens;
+  if (rank == MASTER_NODE) {
+    switch (Elem_Type) {
+      case LINE:
+        nGlobal_Line = nElem_Total;
+        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
+        break;
+      case TRIANGLE:
+        nGlobal_BoundTria = nElem_Total;
+        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
+        break;
+      case QUADRILATERAL:
+        nGlobal_BoundQuad = nElem_Total;
+        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
+    }
   }
   
 }
@@ -4166,9 +2669,6 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
     compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
     
-    /*--- First, prepare the offsets needed throughout below. ---*/    
-    
-    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
 
 //    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
     
@@ -4254,7 +2754,12 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
      i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
     
     if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-    SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
+    if (fem_output){
+      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+    }
+    else {
+      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
+    }
     
     /*--- Write either a binary or ASCII restart file in parallel. ---*/
 
@@ -4280,17 +2785,29 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
      have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
      can allow the write of the viz. files as well. ---*/
 
-    if ((Wrt_Vol || Wrt_Srf)) {
+    if ((Wrt_Vol || Wrt_Srf) && !fem_output) {
       
       /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
 
       if (rank == MASTER_NODE)
         cout << "Preparing element connectivity across all ranks." << endl;
-      SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-
-      /*--- Sort the surface data and renumber if for writing. ---*/
+     if (fem_output){
+       
+       SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+       
+       /*--- Sort the surface data and renumber if for writing. ---*/
+ 
+       SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+       
+     } else {
+       SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+       
+       /*--- Sort the surface data and renumber if for writing. ---*/
+ 
+       SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
+       
+     }
 
-      SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
 
       /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
 
@@ -5662,14 +4179,10 @@ void COutput::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsi
 
 void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   
-  unsigned short iMarker;
   unsigned long iProcessor;
-  unsigned long iPoint, Global_Index, nLocalPoint, nTotalPoint, iVertex;
+  unsigned long iPoint, Global_Index, nTotalPoint;
   
   int VARS_PER_POINT = GlobalField_Counter;
-  int *Local_Halo = NULL;
-
-  bool isPeriodic;
   
 #ifdef HAVE_MPI
   SU2_MPI::Request *send_req, *recv_req;
@@ -5677,41 +4190,11 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   int ind;
 #endif
   
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-  
-  /*--- Sum total number of nodes that belong to the domain ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
                      MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #else
-  nTotalPoint = nLocalPoint;
+  nTotalPoint = nLocalPoint_Sort;
 #endif
   
   /*--- Now that we know the actual number of points we need to output,
@@ -5771,7 +4254,7 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
     
     /*--- We only write interior points and recovered periodic points. ---*/
     
-    if (!Local_Halo[iPoint]) {
+    if (!Local_Halo_Sort[iPoint]) {
       
       /*--- Get the global index of the current point. ---*/
       
@@ -5855,7 +4338,7 @@ void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
     
     /*--- We only write interior points and recovered periodic points. ---*/
     
-    if (!Local_Halo[iPoint]) {
+    if (!Local_Halo_Sort[iPoint]) {
       
       /*--- Get the index of the current point. ---*/
       
@@ -8165,26 +6648,18 @@ void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
   }
   if (Parallel_Data != NULL) delete [] Parallel_Data;
 
-  /*--- Deallocate the structures holding the linear partitioning ---*/
-
-  if (Local_Halo_Sort != NULL) delete [] Local_Halo_Sort;
-
-  if (beg_node != NULL) delete [] beg_node;
-  if (end_node != NULL) delete [] end_node;
-
-  if (nPoint_Lin != NULL) delete [] nPoint_Lin;
-  if (nPoint_Cum != NULL) delete [] nPoint_Cum;
-
 }
 
 void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
   
-  /*--- Deallocate memory for surface solution data ---*/
-
-  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
+  if (Parallel_Surf_Data != NULL) {
+    /*--- Deallocate memory for surface solution data ---*/
+    
+    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
+    }
+    delete [] Parallel_Surf_Data;
   }
-  if (Parallel_Surf_Data != NULL) delete [] Parallel_Surf_Data;
   
 }
 
@@ -10304,13 +8779,6 @@ void COutput::PrepareOffsets(CConfig *config, CGeometry *geometry) {
 
   unsigned long iPoint;
 
-  /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
-
-  unsigned short KindSolver = config->GetKind_Solver();
-  bool fem_solver = ((KindSolver == FEM_EULER) ||
-                     (KindSolver == FEM_NAVIER_STOKES) ||
-                     (KindSolver == FEM_RANS) ||
-                     (KindSolver == FEM_LES));
 
   /*--- Reset point sorting counters ---*/
 
@@ -10319,7 +8787,7 @@ void COutput::PrepareOffsets(CConfig *config, CGeometry *geometry) {
 
   /*--- Prepare the offsets for the FV solver ---*/
 
-  if (!fem_solver) {
+  if (!fem_output) {
 
     /*--- Search all send/recv boundaries on this partition for any periodic
      nodes that were part of the original domain. We want to recover these
@@ -10840,10 +9308,6 @@ void COutput::SortOutputData_FEM(CConfig *config, CGeometry *geometry) {
   delete [] nPoint_Send;
   delete [] nPoint_Flag;
   
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
-    delete [] Local_Data[iPoint];
-  delete [] Local_Data;
-  
 }
 
 void COutput::SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry) {
@@ -11061,7 +9525,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
       if (HistoryOutput_Map.count(RequestedField) > 0){ 
         ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
       } else {
-  //      SU2_MPI::Error(string("Requested screen output field not found: ") + currentField, CURRENT_FUNCTION);
+        SU2_MPI::Error(string("Requested screen output field ") + RequestedField + string(" not defined in current solver.") , CURRENT_FUNCTION);
       }
       if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
         ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
@@ -11079,7 +9543,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 }
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
-  
+
   /*--- Make sure that coordinates and conservative variables are always in the volume output --- */
   
   if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
@@ -11087,17 +9551,15 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     nRequestedVolumeFields++;
   }
   
-//  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "CONSERVATIVE") != RequestedVolumeFields.end())) {
-//    RequestedVolumeFields.push_back("CONSERVATIVE");
-//    nRequestedVolumeFields++;
-//  }
+  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "SOLUTION") != RequestedVolumeFields.end())) {
+    RequestedVolumeFields.push_back("SOLUTION");
+    nRequestedVolumeFields++;
+  }
   
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);
- 
-  // TODO: Add check for coordinates in solver output 
-  
+   
   GlobalField_Counter = 0;
   
   string RequestedField;
@@ -11137,6 +9599,11 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     }
   }
   
+  
+  /*--- First, prepare the offsets needed throughout below. ---*/    
+  
+  PrepareOffsets(config, geometry);    
+  
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
     
@@ -11147,38 +9614,13 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
   Wrt_Halo = config->GetWrt_Halo();
   
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+  Local_Data = new su2double*[nLocalPoint_Sort];
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
     Local_Data[iPoint] = new su2double[GlobalField_Counter];
     for (iField = 0; iField < GlobalField_Counter; iField++){
       Local_Data[iPoint][iField] = 0.0;
     }
   }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
 }
 
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
@@ -11188,28 +9630,55 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   unsigned long iPoint = 0, jPoint = 0;
   long iVertex = 0;
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+  if (fem_output){
+    
+    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+     geometrical information for the FEM DG solver. ---*/
+  
+    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  
+    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
     
-    /*--- Check for halos & write only if requested ---*/
+    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
     
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Load the volume data into the Local_Data() array. --- */
+    /*--- Access the solution by looping over the owned volume elements. ---*/
+  
+    for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+        
+        LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
+        
+        jPoint++;
+        
+      }
+    }
+    
+  } else {
+    
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
       
-      LoadVolumeData(config, geometry, solver, jPoint);
+      /*--- Check for halos & write only if requested ---*/
       
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          iVertex = geometry->node[iPoint]->GetVertex(iMarker);
-          if (iVertex != -1){ 
-            
-            /*--- Load the surface data into the Local_Data() array. --- */
-            
-            LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
+      if (!Local_Halo_Sort[iPoint] || Wrt_Halo) {
+        
+        /*--- Load the volume data into the Local_Data() array. --- */
+        
+        LoadVolumeData(config, geometry, solver, jPoint);
+        
+        for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+          if (config->GetMarker_All_Plotting(iMarker) == YES) {
+            iVertex = geometry->node[iPoint]->GetVertex(iMarker);
+            if (iVertex != -1){ 
+              
+              /*--- Load the surface data into the Local_Data() array. --- */
+              
+              LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
+            }
           }
         }
+        jPoint++;
       }
-      jPoint++;
     }
   }
 }

From 0dcae93d8dd984dd223b0836dee0b698220b6226 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 4 Feb 2019 16:22:28 +0100
Subject: [PATCH 110/539] Removed MergeSolution routine (was not used anymore)

---
 SU2_CFD/include/output_structure.hpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 13e35f369e9e..d31de7bb8365 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -421,15 +421,6 @@ class COutput {
    * \param[in] Elem_Type - VTK index of the element type being merged.
    */
   void MergeSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-  
-  /*!
-   * \brief Merge the solution into a data structure used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeSolution(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
 
   /*!
    * \brief Merge the FEM solution into a data structure used for output file writing.

From 7c087af2ed254d1ce2e7c6f3b4e9babc18944a07 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 4 Feb 2019 16:23:17 +0100
Subject: [PATCH 111/539] Changed name of CONSERVATIVE to SOLUTION in output

---
 SU2_CFD/src/output_adjoint_discrete.cpp     |  26 ++--
 SU2_CFD/src/output_adjoint_discrete_inc.cpp |  26 ++--
 SU2_CFD/src/output_adjoint_mean.cpp         |  24 +--
 SU2_CFD/src/output_direct_elasticity.cpp    |   8 +-
 SU2_CFD/src/output_direct_heat.cpp          |   8 +-
 SU2_CFD/src/output_direct_mean.cpp          | 148 ++++++++----------
 SU2_CFD/src/output_direct_mean_inc.cpp      | 160 +++++++++-----------
 7 files changed, 179 insertions(+), 221 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index e361cc5860e9..9500701d36fc 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -63,7 +63,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");    
+    RequestedVolumeFields.push_back("SOLUTION");    
     RequestedVolumeFields.push_back("SENSITIVITIES");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
@@ -93,7 +93,7 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
   /// END_GROUP
   
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
   AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
@@ -119,7 +119,7 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint density.
   AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
@@ -231,28 +231,28 @@ void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   /// END_GROUP
   
-  /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
+  /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
   /// DESCRIPTION: Adjoint density.
-  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "SOLUTION"); 
   /// DESCRIPTION: Adjoint momentum x-component.
-  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION"); 
   /// DESCRIPTION: Adjoint momentum y-component.
-  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION"); 
   if (nDim == 3)
     /// DESCRIPTION: Adjoint momentum z-component.
-    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
   /// DESCRIPTION: Adjoint energy.
-  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "CONSERVATIVE");           
+  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");           
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Adjoint nu tilde.
-    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
     break;  
   case SST:
     /// DESCRIPTION: Adjoint kinetic energy.
-    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
     /// DESCRIPTION: Adjoint dissipation.
-    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");  
+    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
     break;
   default: break;
   }
@@ -270,7 +270,7 @@ void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
   /// DESCRIPTION: Residual of the adjoint density.
   AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
   /// DESCRIPTION: Residual of the adjoint momentum x-component.
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index b93fce591d4c..dd2a21c533d4 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -68,7 +68,7 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");    
+    RequestedVolumeFields.push_back("SOLUTION");    
     RequestedVolumeFields.push_back("SENSITIVITIES");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
@@ -98,7 +98,7 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
   /// END_GROUP
   
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
   AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity x-component.
@@ -124,7 +124,7 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
   AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
@@ -248,28 +248,28 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   /// END_GROUP
   
-  /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
+  /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
   /// DESCRIPTION: Adjoint Pressure.
-  AddVolumeOutput("ADJ_PRESSURE",    "Adjoint_Pressure",    "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_PRESSURE",    "Adjoint_Pressure",    "SOLUTION"); 
   /// DESCRIPTION: Adjoint Velocity x-component.
-  AddVolumeOutput("ADJ_VELOCITY-X", "Adjoint_Velocity_x", "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_VELOCITY-X", "Adjoint_Velocity_x", "SOLUTION"); 
   /// DESCRIPTION: Adjoint Velocity y-component.
-  AddVolumeOutput("ADJ_VELOCITY-Y", "Adjoint_Velocity_y", "CONSERVATIVE"); 
+  AddVolumeOutput("ADJ_VELOCITY-Y", "Adjoint_Velocity_y", "SOLUTION"); 
   if (nDim == 3)
     /// DESCRIPTION: Adjoint Velocity z-component.
-    AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "SOLUTION"); 
  
-  AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "CONSERVATIVE");
+  AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION");
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Adjoint nu tilde.
-    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
     break;  
   case SST:
     /// DESCRIPTION: Adjoint kinetic energy.
-    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE"); 
+    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
     /// DESCRIPTION: Adjoint dissipation.
-    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");  
+    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
     break;
   default: break;
   }
@@ -287,7 +287,7 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
   /// DESCRIPTION: Residual of the adjoint Pressure.
   AddVolumeOutput("RES_ADJ_PRESSURE",    "Residual_Adjoint_Pressure",    "RESIDUAL");  
   /// DESCRIPTION: Residual of the adjoint Velocity x-component.
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 97d440f334f9..af8a7eaea2c0 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -140,21 +140,21 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
   if (nDim == 3)
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
-  // Conservative
-  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "CONSERVATIVE");
+  // SOLUTION
+  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "SOLUTION");
+  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION");
+  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION");
   if (nDim == 3)
-    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "CONSERVATIVE");
-  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "CONSERVATIVE");
+    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION");
+  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "SOLUTION");
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION");
     break;  
   case SST:
-    AddVolumeOutput("ADJOINT_KINETIC_ENERGY", "Adjoint_TKE", "CONSERVATIVE");
-    AddVolumeOutput("ADJOINT_DISSIPATION", "Adjoint_Omega", "CONSERVATIVE");
+    AddVolumeOutput("ADJOINT_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION");
+    AddVolumeOutput("ADJOINT_DISSIPATION", "Adjoint_Omega", "SOLUTION");
     break;
   default: break;
   }
@@ -176,11 +176,11 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("LIMITER_ADJOINT_NU_TILDE", "Limiter_Adjoint_Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("LIMITER_ADJOINT_NU_TILDE", "Limiter_Adjoint_Nu_Tilde", "SOLUTION");
     break;  
   case SST:
-    AddVolumeOutput("LIMITER_ADJOINT_KINETIC_ENERGY", "Limiter_Adjoint_TKE", "CONSERVATIVE");
-    AddVolumeOutput("LIMITER_ADJOINT_DISSIPATION",    "Limiter_Adjoint_Omega", "CONSERVATIVE");
+    AddVolumeOutput("LIMITER_ADJOINT_KINETIC_ENERGY", "Limiter_Adjoint_TKE", "SOLUTION");
+    AddVolumeOutput("LIMITER_ADJOINT_DISSIPATION",    "Limiter_Adjoint_Omega", "SOLUTION");
     break;
   default: break;
   }
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 1623e471fa13..0a68b0b5b382 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -78,7 +78,7 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   /*--- Default fields for volume output ---*/
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("DISPLACEMENT");
+    RequestedVolumeFields.push_back("SOLUTION");
     RequestedVolumeFields.push_back("STRESS");    
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
@@ -221,9 +221,9 @@ void CFEAOutput::SetVolumeOutputFields(CConfig *config){
   if (nDim == 3)
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
 
-  AddVolumeOutput("DISPLACEMENT-X",    "Displacement_x", "DISPLACEMENT");
-  AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "DISPLACEMENT");
-  if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "DISPLACEMENT");
+  AddVolumeOutput("DISPLACEMENT-X",    "Displacement_x", "SOLUTION");
+  AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "SOLUTION");
+  if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "SOLUTION");
   
   AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY");
   AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY");
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index e11b759f6d30..a9b221e4d093 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -58,7 +58,7 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
   }
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("SOLUTION");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
   
@@ -164,8 +164,8 @@ void CHeatOutput::SetVolumeOutputFields(CConfig *config){
   if (nDim == 3)
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
-  // Conservative
-  AddVolumeOutput("TEMPERATURE", "Temperature", "CONSERVATIVE");
+  // SOLUTION
+  AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION");
 
   // Residuals  
   AddVolumeOutput("RESIDUAL_TEMPERATURE", "Residual_Temperature", "RESIDUAL");
@@ -185,7 +185,7 @@ void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
   if (nDim == 3)
     SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
  
-  // Conservative
+  // SOLUTION
   SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(0));
   
   // Residuals    
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index b3d83ecd5677..1a9f7f612854 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -88,7 +88,7 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   }
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("SOLUTION");
     RequestedVolumeFields.push_back("PRIMITIVE");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
@@ -125,7 +125,7 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Currently used wall-clock time.
   AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
 
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
   AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum x-component.
@@ -133,18 +133,26 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Root-mean square residual of the momentum y-component.
   AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the energy.
   AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-  AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-  AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-  AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
+    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
+    AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
+    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    break;
+  default: break;
+  }
   /// END_GROUP
    
-  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
   AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
@@ -152,57 +160,46 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
   AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
   AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-  AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-  AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-  AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);  
-  /// END_GROUP
   
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
-  /// DESCRIPTION: Root-mean square residual of the density.
-  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the momentum x-component.
-  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the momentum y-component.
-  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the energy.
-  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-  AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-  AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-  AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Maximum residual of nu tilde (SA model).
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
+    AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+    break;
+  default: break;
+  }
   /// END_GROUP
   
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// END_GROUP
   
   /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
@@ -211,25 +208,25 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
   /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// END_GROUP 
   
   /// DESCRIPTION: Angle of attack  
@@ -309,23 +306,23 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   if (nDim == 3)
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
-  // Conservative variables
-  AddVolumeOutput("DENSITY",    "Density",    "CONSERVATIVE");
-  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "CONSERVATIVE");
-  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "CONSERVATIVE");
+  // Solution variables
+  AddVolumeOutput("DENSITY",    "Density",    "SOLUTION");
+  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "SOLUTION");
+  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "SOLUTION");
   if (nDim == 3)
-    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "CONSERVATIVE");
-  AddVolumeOutput("ENERGY",     "Energy",     "CONSERVATIVE");  
+    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "SOLUTION");
+  AddVolumeOutput("ENERGY",     "Energy",     "SOLUTION");  
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "TKE", "CONSERVATIVE");
-    AddVolumeOutput("OMEGA", "Omega", "CONSERVATIVE");
+    AddVolumeOutput("TKE", "TKE", "SOLUTION");
+    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
     break;
   case NONE:
     break;
@@ -611,29 +608,6 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   default: break;
   }
   
-  if (config[val_iZone]->GetMultizone_Problem()){    
-    SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
-    SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
-    if (nDim == 2)
-      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(3)));
-    else {
-      SetHistoryOutputValue("BGS_MOMENTUM-Z", log10(flow_solver->GetRes_BGS(3)));
-      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(4)));
-    }
-    
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
-      break;  
-    case SST:
-      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
-      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
-      break;
-    default: break;
-    }
-  }
-  
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 80cfb310dbc6..b850281a5ac3 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -90,7 +90,7 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("CONSERVATIVE");
+    RequestedVolumeFields.push_back("SOLUTION");
     RequestedVolumeFields.push_back("PRIMITIVE");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
@@ -125,7 +125,7 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Currently used wall-clock time.
   AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
   
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the pressure.
   AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity x-component.  
@@ -133,18 +133,26 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Root-mean square residual of the velocity y-component.  
   AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity z-component.  
-  AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-  AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-  AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-  AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
+    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
+    AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
+    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    break;
+  default: break;
+  }
   /// END_GROUP
   
-  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
   AddHistoryOutput("MAX_PRESSURE",   "max[P]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   
@@ -152,57 +160,46 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Maximum residual of the velocity y-component.   
   AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity z-component.   
-  AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-  AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-  AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-  AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);  
-  /// END_GROUP
+  if (heat || weakly_coupled_heat) AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
-  /// DESCRIPTION: BGS residual of the pressure.
-  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of the momentum x-component.  
-  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of the momentum x-component.  
-  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of the momentum x-component.  
-  AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of nu tilde (SA model).  
-  AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of kinetic energy (SST model).    
-  AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGS residual of the dissipation (SST model).    
-  AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Maximum residual of nu tilde (SA model).
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
+    AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+    break;
+  default: break;
+  }
   /// END_GROUP
 
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
   /// END_GROUP
  
   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
@@ -222,25 +219,25 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   }  
   
   /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_SCIENTIFIC, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// END_GROUP 
   
   /// DESCRIPTION: Angle of attack  
@@ -368,30 +365,12 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     break;
   }
   
-  if (config[val_iZone]->GetMultizone_Problem()){
-    SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
-    SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
-    if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
-    
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
-      break;  
-    case SST:
-      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
-      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
-      break;
-    }
-  }
-  
   if (weakly_coupled_heat){
     SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
-    if (config[val_iZone]->GetMultizone_Problem()) {SetHistoryOutputValue("BGS_HEAT", log10(heat_solver->GetRes_BGS(0)));}
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
@@ -469,23 +448,23 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   if (nDim == 3)
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
   
-  // Conservative variables
-  AddVolumeOutput("PRESSURE",   "Pressure",   "CONSERVATIVE");
-  AddVolumeOutput("VELOCITY-X", "Velocity_x", "CONSERVATIVE");
-  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "CONSERVATIVE");
-  if (nDim == 3)
-    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "CONSERVATIVE");
-  if (config->GetEnergy_Equation())
-    AddVolumeOutput("TEMPERATURE",  "Temperature","CONSERVATIVE");  
+  // SOLUTION variables
+  AddVolumeOutput("PRESSURE",   "Pressure",   "SOLUTION");
+  AddVolumeOutput("VELOCITY-X", "Velocity_x", "SOLUTION");
+  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "SOLUTION");
+  if (nDim == 3) 
+    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "SOLUTION");
+  if (heat || weakly_coupled_heat) 
+    AddVolumeOutput("TEMPERATURE",  "Temperature","SOLUTION");  
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "TKE", "CONSERVATIVE");
-    AddVolumeOutput("OMEGA", "Omega", "CONSERVATIVE");
+    AddVolumeOutput("TKE", "TKE", "SOLUTION");
+    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "CONSERVATIVE");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
     break;
   case NONE:
     break;
@@ -590,11 +569,15 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
 void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
 
   CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
+  CVariable* Node_Heat = NULL; 
   CVariable* Node_Turb = NULL;
   
   if (config->GetKind_Turb_Model() != NONE){
     Node_Turb = solver[TURB_SOL]->node[iPoint]; 
   }
+  if (weakly_coupled_heat){
+    Node_Heat = solver[HEAT_SOL]->node[iPoint];
+  }
   
   CPoint*    Node_Geo  = geometry->node[iPoint];
           
@@ -608,10 +591,11 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(2));
   if (nDim == 3){
     SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(3));
-    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
+    if (heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(4));
   } else {
-    SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));    
+    if (heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Flow->GetSolution(3));
   }
+  if (weakly_coupled_heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Heat->GetSolution(0));
   
   switch(config->GetKind_Turb_Model()){
   case SST:

From 54d04dd300cff379783e27dbb7bab3771402e42b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 11:05:45 +0100
Subject: [PATCH 112/539] Moved DG FEM reression tests to new output structure

---
 .../NACA0012_5thOrder/fem_NACA0012.cfg        |   8 +-
 .../NACA0012_5thOrder/fem_NACA0012_reg.cfg    |   8 +-
 .../nPoly3/fem_Cylinder_reg.cfg               |   8 +-
 .../FlatPlate/nPoly4/lam_flatplate_reg.cfg    |   9 +-
 TestCases/new_output_regression.py            | 697 ++++++++++--------
 TestCases/serial_regression.py                |  78 --
 6 files changed, 422 insertions(+), 386 deletions(-)

diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index 5e596fb35247..a5e5d0790a36 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -23,6 +23,9 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %RESTART_SOL= YES
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -89,7 +92,7 @@ MARKER_DESIGNING = ( airfoil )
 CFL_NUMBER= 0.1
 %
 % Number of total iterations
-EXT_ITER= 40000
+ITER= 40000
 %
 % Runge-Kutta alpha coefficients
 %RK_ALPHA_COEFF= ( 0.25, 0.166667, 0.375, 0.5 , 1.0 )
@@ -190,3 +193,6 @@ WRT_SOL_FREQ= 50000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT = (RMS_DENSITY, RMS_MOMENTUM-X, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index dde48473d402..d4e27a88f010 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -25,6 +25,9 @@ MATH_PROBLEM= DIRECT
 RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -91,7 +94,7 @@ MARKER_DESIGNING = ( airfoil )
 CFL_NUMBER= 0.1
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 %
 % Runge-Kutta alpha coefficients
 %RK_ALPHA_COEFF= ( 0.25, 0.166667, 0.375, 0.5 , 1.0 )
@@ -194,3 +197,6 @@ WRT_SOL_FREQ= 50000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index e41a91f067aa..1b0d0532a21e 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -22,6 +22,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -90,7 +93,7 @@ MARKER_DESIGNING = ( Cylinder )
 CFL_NUMBER= 0.05
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 %
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
@@ -187,3 +190,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 07326e906a2f..968516dea0c6 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -93,7 +96,7 @@ MARKER_MONITORING= ( wall )
 CFL_NUMBER= 1.0
 %
 % Number of total iterations
-EXT_ITER= 26
+ITER= 26
 %
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
@@ -196,3 +199,7 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
+
diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index ed3601ef1ee6..1637b1a9b114 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -51,316 +51,405 @@ def main():
     #########################
 
     # Channel
-    channel           = TestCase('channel')
-    channel.cfg_dir   = "euler/channel"
-    channel.cfg_file  = "inv_channel_RK.cfg"
-    channel.test_iter = 10
-    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
-    channel.su2_exec  = "SU2_CFD"
-    channel.timeout   = 1600
-    channel.new_output = True
-    channel.tol       = 0.00001
-    test_list.append(channel)
-
-    # NACA0012 
-    naca0012           = TestCase('naca0012')
-    naca0012.cfg_dir   = "euler/naca0012"
-    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
-    naca0012.test_iter = 20
-    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
-    naca0012.su2_exec  = "SU2_CFD"
-    naca0012.timeout   = 1600
-    naca0012.new_output= True
-    naca0012.tol       = 0.00001
-    test_list.append(naca0012)
-
-    # Supersonic wedge 
-    wedge           = TestCase('wedge')
-    wedge.cfg_dir   = "euler/wedge"
-    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
-    wedge.test_iter = 20
-    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
-    wedge.su2_exec  = "SU2_CFD"
-    wedge.timeout   = 1600
-    wedge.new_output= True
-    wedge.tol       = 0.00001
-    test_list.append(wedge)
-
-    # ONERA M6 Wing
-    oneram6           = TestCase('oneram6')
-    oneram6.cfg_dir   = "euler/oneram6"
-    oneram6.cfg_file  = "inv_ONERAM6.cfg"
-    oneram6.test_iter = 10
-    oneram6.test_vals = [-13.395738, -12.930653, 0.282557, 0.012706] #last 4 columns
-    oneram6.su2_exec  = "SU2_CFD"
-    oneram6.timeout   = 9600
-    oneram6.new_output = True
-    oneram6.tol       = 0.00001
-    test_list.append(oneram6)
-    
-    ##########################
-    ###  Compressible N-S  ###
-    ##########################
-
-    # Laminar flat plate
-    flatplate           = TestCase('flatplate')
-    flatplate.cfg_dir   = "navierstokes/flatplate"
-    flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 20
-    flatplate.test_vals = [-4.680896, 0.781111, -0.135957, 0.022978] #last 4 columns
-    flatplate.su2_exec  = "SU2_CFD"
-    flatplate.new_output = True
-    flatplate.timeout   = 1600
-    flatplate.tol       = 0.00001
-    test_list.append(flatplate)
-
-    # Laminar cylinder (steady)
-    cylinder           = TestCase('cylinder')
-    cylinder.cfg_dir   = "navierstokes/cylinder"
-    cylinder.cfg_file  = "lam_cylinder.cfg"
-    cylinder.test_iter = 25
-    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
-    cylinder.su2_exec  = "SU2_CFD"
-    cylinder.new_output = True
-    cylinder.timeout   = 1600
-    cylinder.tol       = 0.00001
-    test_list.append(cylinder)
-
-    # Laminar cylinder (low Mach correction)
-    cylinder_lowmach           = TestCase('cylinder_lowmach')
-    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
-    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
-    cylinder_lowmach.test_iter = 25
-    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
-    cylinder_lowmach.su2_exec  = "SU2_CFD"
-    cylinder_lowmach.new_output = True
-    cylinder_lowmach.timeout   = 1600
-    cylinder_lowmach.tol       = 0.00001
-    test_list.append(cylinder_lowmach)
-
-    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
-   # poiseuille           = TestCase('poiseuille')
-   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
-   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
-   # poiseuille.test_iter = 10
-   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
-   # poiseuille.su2_exec  = "SU2_CFD"
-   # poiseuille.new_output = True
-   # poiseuille.timeout   = 1600
-   # poiseuille.tol       = 0.00001
-   # test_list.append(poiseuille)
-
-    # 2D Poiseuille flow (inlet profile file)
-    poiseuille_profile           = TestCase('poiseuille_profile')
-    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
-    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
-    poiseuille_profile.test_iter = 10
-    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
-    poiseuille_profile.su2_exec  = "SU2_CFD"
-    poiseuille_profile.new_output = True
-    poiseuille_profile.timeout   = 1600
-    poiseuille_profile.tol       = 0.00001
-    test_list.append(poiseuille_profile)
+#    channel           = TestCase('channel')
+#    channel.cfg_dir   = "euler/channel"
+#    channel.cfg_file  = "inv_channel_RK.cfg"
+#    channel.test_iter = 10
+#    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
+#    channel.su2_exec  = "SU2_CFD"
+#    channel.timeout   = 1600
+#    channel.new_output = True
+#    channel.tol       = 0.00001
+#    test_list.append(channel)
+#
+#    # NACA0012 
+#    naca0012           = TestCase('naca0012')
+#    naca0012.cfg_dir   = "euler/naca0012"
+#    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
+#    naca0012.test_iter = 20
+#    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
+#    naca0012.su2_exec  = "SU2_CFD"
+#    naca0012.timeout   = 1600
+#    naca0012.new_output= True
+#    naca0012.tol       = 0.00001
+#    test_list.append(naca0012)
+#
+#    # Supersonic wedge 
+#    wedge           = TestCase('wedge')
+#    wedge.cfg_dir   = "euler/wedge"
+#    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
+#    wedge.test_iter = 20
+#    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
+#    wedge.su2_exec  = "SU2_CFD"
+#    wedge.timeout   = 1600
+#    wedge.new_output= True
+#    wedge.tol       = 0.00001
+#    test_list.append(wedge)
+#
+#    # ONERA M6 Wing
+#    oneram6           = TestCase('oneram6')
+#    oneram6.cfg_dir   = "euler/oneram6"
+#    oneram6.cfg_file  = "inv_ONERAM6.cfg"
+#    oneram6.test_iter = 10
+#    oneram6.test_vals = [-13.395738, -12.930653, 0.282557, 0.012706] #last 4 columns
+#    oneram6.su2_exec  = "SU2_CFD"
+#    oneram6.timeout   = 9600
+#    oneram6.new_output = True
+#    oneram6.tol       = 0.00001
+#    test_list.append(oneram6)
+#    
+#    ##########################
+#    ###  Compressible N-S  ###
+#    ##########################
+#
+#    # Laminar flat plate
+#    flatplate           = TestCase('flatplate')
+#    flatplate.cfg_dir   = "navierstokes/flatplate"
+#    flatplate.cfg_file  = "lam_flatplate.cfg"
+#    flatplate.test_iter = 20
+#    flatplate.test_vals = [-4.680896, 0.781111, -0.135957, 0.022978] #last 4 columns
+#    flatplate.su2_exec  = "SU2_CFD"
+#    flatplate.new_output = True
+#    flatplate.timeout   = 1600
+#    flatplate.tol       = 0.00001
+#    test_list.append(flatplate)
+#
+#    # Laminar cylinder (steady)
+#    cylinder           = TestCase('cylinder')
+#    cylinder.cfg_dir   = "navierstokes/cylinder"
+#    cylinder.cfg_file  = "lam_cylinder.cfg"
+#    cylinder.test_iter = 25
+#    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
+#    cylinder.su2_exec  = "SU2_CFD"
+#    cylinder.new_output = True
+#    cylinder.timeout   = 1600
+#    cylinder.tol       = 0.00001
+#    test_list.append(cylinder)
+#
+#    # Laminar cylinder (low Mach correction)
+#    cylinder_lowmach           = TestCase('cylinder_lowmach')
+#    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
+#    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
+#    cylinder_lowmach.test_iter = 25
+#    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
+#    cylinder_lowmach.su2_exec  = "SU2_CFD"
+#    cylinder_lowmach.new_output = True
+#    cylinder_lowmach.timeout   = 1600
+#    cylinder_lowmach.tol       = 0.00001
+#    test_list.append(cylinder_lowmach)
+#
+#    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
+#   # poiseuille           = TestCase('poiseuille')
+#   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
+#   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
+#   # poiseuille.test_iter = 10
+#   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
+#   # poiseuille.su2_exec  = "SU2_CFD"
+#   # poiseuille.new_output = True
+#   # poiseuille.timeout   = 1600
+#   # poiseuille.tol       = 0.00001
+#   # test_list.append(poiseuille)
+#
+#    # 2D Poiseuille flow (inlet profile file)
+#    poiseuille_profile           = TestCase('poiseuille_profile')
+#    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
+#    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
+#    poiseuille_profile.test_iter = 10
+#    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
+#    poiseuille_profile.su2_exec  = "SU2_CFD"
+#    poiseuille_profile.new_output = True
+#    poiseuille_profile.timeout   = 1600
+#    poiseuille_profile.tol       = 0.00001
+#    test_list.append(poiseuille_profile)
+#    
+#    ##########################
+#    ### Compressible RANS  ###
+#    ##########################
+#
+#    # RAE2822 SA
+#    rae2822_sa           = TestCase('rae2822_sa')
+#    rae2822_sa.cfg_dir   = "rans/rae2822"
+#    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
+#    rae2822_sa.test_iter = 20
+#    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
+#    rae2822_sa.su2_exec  = "SU2_CFD"
+#    rae2822_sa.timeout   = 1600
+#    rae2822_sa.new_output = True
+#    rae2822_sa.tol       = 0.00001
+#    test_list.append(rae2822_sa)
+#    
+#    # RAE2822 SST
+#    rae2822_sst           = TestCase('rae2822_sst')
+#    rae2822_sst.cfg_dir   = "rans/rae2822"
+#    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
+#    rae2822_sst.test_iter = 20
+#    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
+#    rae2822_sst.su2_exec  = "SU2_CFD"
+#    rae2822_sst.new_output = True
+#    rae2822_sst.timeout   = 1600
+#    rae2822_sst.tol       = 0.00001
+#    test_list.append(rae2822_sst)
+#
+#    # Flat plate
+#    turb_flatplate           = TestCase('turb_flatplate')
+#    turb_flatplate.cfg_dir   = "rans/flatplate"
+#    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
+#    turb_flatplate.test_iter = 20
+#    turb_flatplate.test_vals = [-4.158303, -6.737135, -0.176244, 0.057446] #last 4 columns
+#    turb_flatplate.su2_exec  = "SU2_CFD"
+#    turb_flatplate.new_output  = True
+#    turb_flatplate.timeout   = 1600
+#    turb_flatplate.tol       = 0.00001
+#    test_list.append(turb_flatplate)
+#
+#    # ONERA M6 Wing
+#    turb_oneram6           = TestCase('turb_oneram6')
+#    turb_oneram6.cfg_dir   = "rans/oneram6"
+#    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
+#    turb_oneram6.test_iter = 10
+#    turb_oneram6.test_vals = [-2.327523, -6.564349, 0.230471, 0.155843]#last 4 columns
+#    turb_oneram6.su2_exec  = "SU2_CFD"
+#    turb_oneram6.new_output = True
+#    turb_oneram6.timeout   = 3200
+#    turb_oneram6.tol       = 0.00001
+#    test_list.append(turb_oneram6)
+#
+#    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
+#    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
+#    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
+#    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
+#    turb_naca0012_sa.test_iter = 10
+#    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
+#    turb_naca0012_sa.su2_exec  = "SU2_CFD"
+#    turb_naca0012_sa.new_output = True
+#    turb_naca0012_sa.timeout   = 3200
+#    turb_naca0012_sa.tol       = 0.00001
+#    test_list.append(turb_naca0012_sa)
+#   
+#    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
+#    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
+#    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
+#    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
+#    turb_naca0012_sa_bin.test_iter = 10
+#    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
+#    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
+#    turb_naca0012_sa_bin.new_output  = True
+#    turb_naca0012_sa_bin.timeout   = 3200
+#    turb_naca0012_sa_bin.tol       = 0.00001
+#    test_list.append(turb_naca0012_sa_bin)
+# 
+#    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
+#    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
+#    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
+#    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
+#    turb_naca0012_sst.test_iter = 10
+#    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
+#    turb_naca0012_sst.su2_exec  = "SU2_CFD"
+#    turb_naca0012_sst.new_output  = True
+#    turb_naca0012_sst.timeout   = 3200
+#    turb_naca0012_sst.tol       = 0.00001
+#    test_list.append(turb_naca0012_sst)
+#
+#    # PROPELLER 
+#    propeller           = TestCase('propeller')
+#    propeller.cfg_dir   = "rans/propeller"
+#    propeller.cfg_file  = "propeller.cfg"
+#    propeller.test_iter = 10
+#    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
+#    propeller.su2_exec  = "SU2_CFD"
+#    propeller.new_output = True
+#    propeller.timeout   = 3200
+#    propeller.tol       = 0.00001
+#    test_list.append(propeller)
+#    #################################
+#    ## Compressible RANS Restart  ###
+#    #################################
+#
+#    # NACA0012 SST Multigrid restart
+#    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
+#    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
+#    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
+#    turb_naca0012_sst_restart_mg.test_iter = 50
+#    turb_naca0012_sst_restart_mg.ntest_vals = 5
+#    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
+#    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
+#    turb_naca0012_sst_restart_mg.new_output  = True
+#    turb_naca0012_sst_restart_mg.timeout   = 3200
+#    turb_naca0012_sst_restart_mg.tol       = 0.000001
+#    test_list.append(turb_naca0012_sst_restart_mg)
+#    
+#    #############################
+#    ### Incompressible Euler  ###
+#    #############################
+#
+#    # NACA0012 Hydrofoil
+#    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
+#    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
+#    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
+#    inc_euler_naca0012.test_iter = 20
+#    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
+#    inc_euler_naca0012.su2_exec  = "SU2_CFD"
+#    inc_euler_naca0012.new_output = True
+#    inc_euler_naca0012.timeout   = 1600
+#    inc_euler_naca0012.tol       = 0.00001
+#    test_list.append(inc_euler_naca0012)
+#
+#    # C-D nozzle with pressure inlet and mass flow outlet
+#    inc_nozzle           = TestCase('inc_nozzle')
+#    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
+#    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
+#    inc_nozzle.test_iter = 20
+#    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
+#    inc_nozzle.su2_exec  = "SU2_CFD"
+#    inc_nozzle.new_output = True
+#    inc_nozzle.timeout   = 1600
+#    inc_nozzle.tol       = 0.00001
+#    test_list.append(inc_nozzle)
+#
+#    #############################
+#    ### Incompressible N-S    ###
+#    #############################
+#
+#    # Laminar cylinder
+#    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
+#    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+#    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
+#    inc_lam_cylinder.test_iter = 10
+#    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
+#    inc_lam_cylinder.new_output  = True
+#    inc_lam_cylinder.su2_exec  = "SU2_CFD"
+#    inc_lam_cylinder.timeout   = 1600
+#    inc_lam_cylinder.tol       = 0.00001
+#    test_list.append(inc_lam_cylinder)
+#
+#    # Buoyancy-driven cavity
+#    inc_buoyancy          = TestCase('inc_buoyancy')
+#    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
+#    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
+#    inc_buoyancy.test_iter = 20
+#    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
+#    inc_buoyancy.new_output  = True
+#    inc_buoyancy.su2_exec  = "SU2_CFD"
+#    inc_buoyancy.timeout   = 1600
+#    inc_buoyancy.tol       = 0.00001
+#    test_list.append(inc_buoyancy)
+#
+#    # Laminar heated cylinder with polynomial fluid model
+#    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
+#    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+#    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
+#    inc_poly_cylinder.test_iter = 20
+#    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
+#    inc_poly_cylinder.new_output  = True
+#    inc_poly_cylinder.su2_exec  = "SU2_CFD"
+#    inc_poly_cylinder.timeout   = 1600
+#    inc_poly_cylinder.tol       = 0.00001
+#    test_list.append(inc_poly_cylinder)
+#
+#    ############################
+#    ### Incompressible RANS  ###
+#    ############################
+#
+#    # NACA0012
+#    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
+#    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
+#    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
+#    inc_turb_naca0012.test_iter = 20
+#    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
+#    inc_turb_naca0012.new_output  = True
+#    inc_turb_naca0012.su2_exec  = "SU2_CFD"
+#    inc_turb_naca0012.timeout   = 1600
+#    inc_turb_naca0012.tol       = 0.00001
+#    test_list.append(inc_turb_naca0012)
     
-    ##########################
-    ### Compressible RANS  ###
-    ##########################
-
-    # RAE2822 SA
-    rae2822_sa           = TestCase('rae2822_sa')
-    rae2822_sa.cfg_dir   = "rans/rae2822"
-    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
-    rae2822_sa.test_iter = 20
-    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
-    rae2822_sa.su2_exec  = "SU2_CFD"
-    rae2822_sa.timeout   = 1600
-    rae2822_sa.new_output = True
-    rae2822_sa.tol       = 0.00001
-    test_list.append(rae2822_sa)
+    ####################
+    ### DG-FEM Euler ###
+    ####################
     
-    # RAE2822 SST
-    rae2822_sst           = TestCase('rae2822_sst')
-    rae2822_sst.cfg_dir   = "rans/rae2822"
-    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
-    rae2822_sst.test_iter = 20
-    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
-    rae2822_sst.su2_exec  = "SU2_CFD"
-    rae2822_sst.new_output = True
-    rae2822_sst.timeout   = 1600
-    rae2822_sst.tol       = 0.00001
-    test_list.append(rae2822_sst)
-
-    # Flat plate
-    turb_flatplate           = TestCase('turb_flatplate')
-    turb_flatplate.cfg_dir   = "rans/flatplate"
-    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
-    turb_flatplate.test_iter = 20
-    turb_flatplate.test_vals = [-4.158303, -6.737135, -0.176244, 0.057446] #last 4 columns
-    turb_flatplate.su2_exec  = "SU2_CFD"
-    turb_flatplate.new_output  = True
-    turb_flatplate.timeout   = 1600
-    turb_flatplate.tol       = 0.00001
-    test_list.append(turb_flatplate)
-
-    # ONERA M6 Wing
-    turb_oneram6           = TestCase('turb_oneram6')
-    turb_oneram6.cfg_dir   = "rans/oneram6"
-    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
-    turb_oneram6.test_iter = 10
-    turb_oneram6.test_vals = [-2.327523, -6.564349, 0.230471, 0.155843]#last 4 columns
-    turb_oneram6.su2_exec  = "SU2_CFD"
-    turb_oneram6.new_output = True
-    turb_oneram6.timeout   = 3200
-    turb_oneram6.tol       = 0.00001
-    test_list.append(turb_oneram6)
-
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
-    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
-    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
-    turb_naca0012_sa.test_iter = 10
-    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa.new_output = True
-    turb_naca0012_sa.timeout   = 3200
-    turb_naca0012_sa.tol       = 0.00001
-    test_list.append(turb_naca0012_sa)
-   
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
-    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
-    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
-    turb_naca0012_sa_bin.test_iter = 10
-    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa_bin.new_output  = True
-    turb_naca0012_sa_bin.timeout   = 3200
-    turb_naca0012_sa_bin.tol       = 0.00001
-    test_list.append(turb_naca0012_sa_bin)
- 
-    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
-    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
-    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
-    turb_naca0012_sst.test_iter = 10
-    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
-    turb_naca0012_sst.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst.new_output  = True
-    turb_naca0012_sst.timeout   = 3200
-    turb_naca0012_sst.tol       = 0.00001
-    test_list.append(turb_naca0012_sst)
-
-    # PROPELLER 
-    propeller           = TestCase('propeller')
-    propeller.cfg_dir   = "rans/propeller"
-    propeller.cfg_file  = "propeller.cfg"
-    propeller.test_iter = 10
-    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
-    propeller.su2_exec  = "SU2_CFD"
-    propeller.new_output = True
-    propeller.timeout   = 3200
-    propeller.tol       = 0.00001
-    test_list.append(propeller)
-    #################################
-    ## Compressible RANS Restart  ###
-    #################################
-
-    # NACA0012 SST Multigrid restart
-    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
-    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
-    turb_naca0012_sst_restart_mg.test_iter = 50
-    turb_naca0012_sst_restart_mg.ntest_vals = 5
-    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
-    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst_restart_mg.new_output  = True
-    turb_naca0012_sst_restart_mg.timeout   = 3200
-    turb_naca0012_sst_restart_mg.tol       = 0.000001
-    test_list.append(turb_naca0012_sst_restart_mg)
+    # NACA0012
+    fem_euler_naca0012           = TestCase('fem_euler_naca0012')
+    fem_euler_naca0012.cfg_dir   = "hom_euler/NACA0012_5thOrder"
+    fem_euler_naca0012.cfg_file  = "fem_NACA0012_reg.cfg"
+    fem_euler_naca0012.test_iter = 10
+    fem_euler_naca0012.test_vals = [-6.519946,-5.976944,0.255551,0.000028] #last 4 columns
+    fem_euler_naca0012.su2_exec  = "SU2_CFD"
+    fem_euler_naca0012.new_output = True
+    fem_euler_naca0012.timeout   = 1600
+    fem_euler_naca0012.tol       = 0.00001
+    test_list.append(fem_euler_naca0012)
     
-    #############################
-    ### Incompressible Euler  ###
-    #############################
-
-    # NACA0012 Hydrofoil
-    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
-    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
-    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
-    inc_euler_naca0012.test_iter = 20
-    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
-    inc_euler_naca0012.su2_exec  = "SU2_CFD"
-    inc_euler_naca0012.new_output = True
-    inc_euler_naca0012.timeout   = 1600
-    inc_euler_naca0012.tol       = 0.00001
-    test_list.append(inc_euler_naca0012)
-
-    # C-D nozzle with pressure inlet and mass flow outlet
-    inc_nozzle           = TestCase('inc_nozzle')
-    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
-    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
-    inc_nozzle.test_iter = 20
-    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
-    inc_nozzle.su2_exec  = "SU2_CFD"
-    inc_nozzle.new_output = True
-    inc_nozzle.timeout   = 1600
-    inc_nozzle.tol       = 0.00001
-    test_list.append(inc_nozzle)
-
-    #############################
-    ### Incompressible N-S    ###
-    #############################
-
-    # Laminar cylinder
-    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
-    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
-    inc_lam_cylinder.test_iter = 10
-    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
-    inc_lam_cylinder.new_output  = True
-    inc_lam_cylinder.su2_exec  = "SU2_CFD"
-    inc_lam_cylinder.timeout   = 1600
-    inc_lam_cylinder.tol       = 0.00001
-    test_list.append(inc_lam_cylinder)
-
-    # Buoyancy-driven cavity
-    inc_buoyancy          = TestCase('inc_buoyancy')
-    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
-    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
-    inc_buoyancy.test_iter = 20
-    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
-    inc_buoyancy.new_output  = True
-    inc_buoyancy.su2_exec  = "SU2_CFD"
-    inc_buoyancy.timeout   = 1600
-    inc_buoyancy.tol       = 0.00001
-    test_list.append(inc_buoyancy)
-
-    # Laminar heated cylinder with polynomial fluid model
-    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
-    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
-    inc_poly_cylinder.test_iter = 20
-    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
-    inc_poly_cylinder.new_output  = True
-    inc_poly_cylinder.su2_exec  = "SU2_CFD"
-    inc_poly_cylinder.timeout   = 1600
-    inc_poly_cylinder.tol       = 0.00001
-    test_list.append(inc_poly_cylinder)
-
     ############################
-    ### Incompressible RANS  ###
+    ### DG-FEM Navier-Stokes ###
     ############################
+    
+    # Flat plate
+    fem_ns_flatplate           = TestCase('fem_ns_flatplate')
+    fem_ns_flatplate.cfg_dir   = "hom_navierstokes/FlatPlate/nPoly4"
+    fem_ns_flatplate.cfg_file  = "lam_flatplate_reg.cfg"
+    fem_ns_flatplate.test_iter = 25
+    fem_ns_flatplate.test_vals = [1.383727,3.175247,0.058387,0.257951] #last 4 columns
+    fem_ns_flatplate.su2_exec  = "SU2_CFD"
+    fem_ns_flatplate.new_output = True
+    fem_ns_flatplate.timeout   = 1600
+    fem_ns_flatplate.tol       = 0.00001
+    test_list.append(fem_ns_flatplate)
+    
+    # Steady cylinder
+    fem_ns_cylinder           = TestCase('fem_ns_cylinder')
+    fem_ns_cylinder.cfg_dir   = "hom_navierstokes/CylinderViscous/nPoly3"
+    fem_ns_cylinder.cfg_file  = "fem_Cylinder_reg.cfg"
+    fem_ns_cylinder.test_iter = 10
+    fem_ns_cylinder.test_vals = [0.454960,0.979123,-0.000028,79.984799] #last 4 columns
+    fem_ns_cylinder.su2_exec  = "SU2_CFD"
+    fem_ns_cylinder.new_output  = True
+    fem_ns_cylinder.timeout   = 1600
+    fem_ns_cylinder.tol       = 0.00001
+    test_list.append(fem_ns_cylinder)
+
+    # Steady sphere
+    fem_ns_sphere           = TestCase('fem_ns_sphere')
+    fem_ns_sphere.cfg_dir   = "hom_navierstokes/SphereViscous/nPoly3_QuadDominant"
+    fem_ns_sphere.cfg_file  = "fem_Sphere_reg.cfg"
+    fem_ns_sphere.test_iter = 10
+    fem_ns_sphere.test_vals = [-0.288121,0.240324,0.000258,21.797363] #last 4 columns
+    fem_ns_sphere.su2_exec  = "SU2_CFD"
+    fem_ns_sphere.timeout   = 1600
+    fem_ns_sphere.tol       = 0.00001
+    test_list.append(fem_ns_sphere)
+
+    # Unsteady sphere ADER
+    fem_ns_sphere_ader           = TestCase('fem_ns_sphere_ader')
+    fem_ns_sphere_ader.cfg_dir   = "hom_navierstokes/SphereViscous/nPoly3_QuadDominant"
+    fem_ns_sphere_ader.cfg_file  = "fem_Sphere_reg_ADER.cfg"
+    fem_ns_sphere_ader.test_iter = 10
+    fem_ns_sphere_ader.test_vals = [-35.000000,-35.000000,0.000047,31.110911] #last 4 columns
+    fem_ns_sphere_ader.su2_exec  = "SU2_CFD"
+    fem_ns_sphere_ader.timeout   = 1600
+    fem_ns_sphere_ader.tol       = 0.00001
+    test_list.append(fem_ns_sphere_ader)
+
+    # Unsteady cylinder
+    fem_ns_unsteady_cylinder           = TestCase('fem_ns_unsteady_cylinder')
+    fem_ns_unsteady_cylinder.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
+    fem_ns_unsteady_cylinder.cfg_file  = "fem_unst_cylinder.cfg"
+    fem_ns_unsteady_cylinder.test_iter = 10
+    fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
+    fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder.timeout   = 1600
+    fem_ns_unsteady_cylinder.tol       = 0.00001
+    test_list.append(fem_ns_unsteady_cylinder)
+
+    # Unsteady cylinder ADER
+    fem_ns_unsteady_cylinder_ader           = TestCase('fem_ns_unsteady_cylinder_ader')
+    fem_ns_unsteady_cylinder_ader.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
+    fem_ns_unsteady_cylinder_ader.cfg_file  = "fem_unst_cylinder_ADER.cfg"
+    fem_ns_unsteady_cylinder_ader.test_iter = 10
+    fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
+    fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder_ader.timeout   = 1600
+    fem_ns_unsteady_cylinder_ader.tol       = 0.00001
+    test_list.append(fem_ns_unsteady_cylinder_ader)
 
-    # NACA0012
-    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
-    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
-    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
-    inc_turb_naca0012.test_iter = 20
-    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
-    inc_turb_naca0012.new_output  = True
-    inc_turb_naca0012.su2_exec  = "SU2_CFD"
-    inc_turb_naca0012.timeout   = 1600
-    inc_turb_naca0012.tol       = 0.00001
-    test_list.append(inc_turb_naca0012)
     ##########################
     ### FEA - FSI          ###
     ##########################
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index a54b2d275c60..105874cf9047 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -88,84 +88,6 @@ def main():
     poiseuille.timeout   = 1600
     poiseuille.tol       = 0.00001
     test_list.append(poiseuille)
-
-    #############################
-    ### Incompressible Euler  ###
-    #############################
-
-    # NACA0012 Hydrofoil
-    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
-    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
-    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
-    inc_euler_naca0012.test_iter = 20
-    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
-    inc_euler_naca0012.su2_exec  = "SU2_CFD"
-    inc_euler_naca0012.timeout   = 1600
-    inc_euler_naca0012.tol       = 0.00001
-    test_list.append(inc_euler_naca0012)
-
-    # C-D nozzle with pressure inlet and mass flow outlet
-    inc_nozzle           = TestCase('inc_nozzle')
-    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
-    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
-    inc_nozzle.test_iter = 20
-    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
-    inc_nozzle.su2_exec  = "SU2_CFD"
-    inc_nozzle.timeout   = 1600
-    inc_nozzle.tol       = 0.00001
-    test_list.append(inc_nozzle)
-
-    #############################
-    ### Incompressible N-S    ###
-    #############################
-
-    # Laminar cylinder
-    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
-    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
-    inc_lam_cylinder.test_iter = 10
-    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
-    inc_lam_cylinder.su2_exec  = "SU2_CFD"
-    inc_lam_cylinder.timeout   = 1600
-    inc_lam_cylinder.tol       = 0.00001
-    test_list.append(inc_lam_cylinder)
-
-    # Buoyancy-driven cavity
-    inc_buoyancy          = TestCase('inc_buoyancy')
-    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
-    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
-    inc_buoyancy.test_iter = 20
-    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
-    inc_buoyancy.su2_exec  = "SU2_CFD"
-    inc_buoyancy.timeout   = 1600
-    inc_buoyancy.tol       = 0.00001
-    test_list.append(inc_buoyancy)
-
-    # Laminar heated cylinder with polynomial fluid model
-    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
-    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
-    inc_poly_cylinder.test_iter = 20
-    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
-    inc_poly_cylinder.su2_exec  = "SU2_CFD"
-    inc_poly_cylinder.timeout   = 1600
-    inc_poly_cylinder.tol       = 0.00001
-    test_list.append(inc_poly_cylinder)
-
-    ############################
-    ### Incompressible RANS  ###
-    ############################
-
-    # NACA0012
-    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
-    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
-    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
-    inc_turb_naca0012.test_iter = 20
-    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
-    inc_turb_naca0012.su2_exec  = "SU2_CFD"
-    inc_turb_naca0012.timeout   = 1600
-    inc_turb_naca0012.tol       = 0.00001
-    test_list.append(inc_turb_naca0012)
     
     ####################
     ### DG-FEM Euler ###

From e8a3a20304c2618fe6895f0933e9135fc5efa7f2 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 12:08:23 +0100
Subject: [PATCH 113/539] Maintain previous behaviour and uncomment some lines
 of output_legacy for easier merges in the future.

---
 SU2_CFD/src/output_structure.cpp        |    4 +
 SU2_CFD/src/output_structure_legacy.cpp | 1504 +++++++++++------------
 2 files changed, 756 insertions(+), 752 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 22fbe5238972..ef5d42b31409 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -2351,6 +2351,10 @@ void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry,
           }
         }
 
+        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
+          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+        }
+
         if (FileFormat == TECPLOT_BINARY) {
           if (!wrote_base_file)
             DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index ba46791a9c81..2612016ac10e 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -8261,507 +8261,507 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 void COutputLegacy::SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
                               unsigned long iExtIter, unsigned short val_nZone) {
   
-//  unsigned short iZone;
+  unsigned short iZone;
   
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
     
-//    /*--- Flags identifying the types of files to be written. ---*/
+    /*--- Flags identifying the types of files to be written. ---*/
     
-//    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-//    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-//    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
 
-//#ifdef HAVE_MPI
-//    /*--- Do not merge the volume solutions if we are running in parallel.
-//     Force the use of SU2_SOL to merge the volume sols in this case. ---*/
+#ifdef HAVE_MPI
+    /*--- Do not merge the volume solutions if we are running in parallel.
+     Force the use of SU2_SOL to merge the volume sols in this case. ---*/
     
-//    SU2_MPI::Comm_size(MPI_COMM_WORLD, &size);
-//    if (size > SINGLE_NODE) {
-//      Wrt_Vol = false;
-//      Wrt_Srf = false;
-//    }
-//#endif
+    SU2_MPI::Comm_size(MPI_COMM_WORLD, &size);
+    if (size > SINGLE_NODE) {
+      Wrt_Vol = false;
+      Wrt_Srf = false;
+    }
+#endif
     
-//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
     
-//    switch (config[iZone]->GetKind_Solver()) {
+    switch (config[iZone]->GetKind_Solver()) {
         
-//      case EULER : case NAVIER_STOKES : case RANS :
-//      case FEM_EULER : case FEM_NAVIER_STOKES : case FEM_RANS : case FEM_LES :
+      case EULER : case NAVIER_STOKES : case RANS :
+      case FEM_EULER : case FEM_NAVIER_STOKES : case FEM_RANS : case FEM_LES :
         
-//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-//        break;
+        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
+        break;
         
 
-//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS : case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-//        break;
+      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS : case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
+        break;
         
-//    }
+    }
     
-//    /*--- Get the file output format ---*/
+    /*--- Get the file output format ---*/
     
-//    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
     
-//    /*--- Merge the node coordinates and connectivity, if necessary. This
-//     is only performed if a volume solution file is requested, and it
-//     is active by default. ---*/
+    /*--- Merge the node coordinates and connectivity, if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
     
-//    if (Wrt_Vol || Wrt_Srf) {
-//      if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-//      MergeConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-//    }
+    if (Wrt_Vol || Wrt_Srf) {
+      if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+      MergeConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
+    }
     
-//    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-//     The grid coordinates are always merged and included first in the
-//     restart files. ---*/
+    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+     The grid coordinates are always merged and included first in the
+     restart files. ---*/
     
-//    if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
-//    MergeCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
+    if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
+    MergeCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
     
-//    if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-//      if (FileFormat == TECPLOT_BINARY) {
-//        if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
+    if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+      if (FileFormat == TECPLOT_BINARY) {
+        if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
 //        SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
 //        SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-//        if (!wrote_base_file)
-//          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//        if (!wrote_surf_file)
-//          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], wrote_surf_file);
-//      }
-//    }
+        if (!wrote_base_file)
+          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+        if (!wrote_surf_file)
+          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], wrote_surf_file);
+      }
+    }
     
-//    /*--- Merge the solution data needed for volume solutions and restarts ---*/
+    /*--- Merge the solution data needed for volume solutions and restarts ---*/
     
-//    if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-//    MergeSolution(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+    if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+    MergeSolution(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
     
-//    /*--- Write restart, or Tecplot files using the merged data.
-//     This data lives only on the master, and these routines are currently
-//     executed by the master proc alone (as if in serial). ---*/
+    /*--- Write restart, or Tecplot files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
     
-//    if (rank == MASTER_NODE) {
+    if (rank == MASTER_NODE) {
       
-//      /*--- Write a native restart file ---*/
+      /*--- Write a native restart file ---*/
       
-//      if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
-//      SetRestart(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone);
+      if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
+      SetRestart(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone);
       
-//      if (Wrt_Vol) {
+      if (Wrt_Vol) {
         
-//        switch (FileFormat) {
+        switch (FileFormat) {
             
-//          case TECPLOT:
+          case TECPLOT:
             
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
 //            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+            break;
             
-//          case FIELDVIEW:
+          case FIELDVIEW:
             
-//            /*--- Write a FieldView ASCII file ---*/
+            /*--- Write a FieldView ASCII file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
 //            SetFieldViewASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+            break;
             
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
             
-//            /*--- Write a Tecplot binary solution file ---*/
+            /*--- Write a Tecplot binary solution file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
 //            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-//            break;
+            break;
             
-//          case FIELDVIEW_BINARY:
+          case FIELDVIEW_BINARY:
             
-//            /*--- Write a FieldView binary file ---*/
+            /*--- Write a FieldView binary file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
 //            SetFieldViewBinary(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+            break;
             
-//          case PARAVIEW:
+          case PARAVIEW:
             
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+            break;
             
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
             
-//            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
-//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
+            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
+            break;
             
-//          default:
-//            break;
-//        }
+          default:
+            break;
+        }
         
-//      }
+      }
       
-//      if (Wrt_Srf) {
+      if (Wrt_Srf) {
         
-//        switch (FileFormat) {
+        switch (FileFormat) {
             
-//          case TECPLOT:
+          case TECPLOT:
             
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
 //            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+            break;
             
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
             
-//            /*--- Write a Tecplot binary solution file ---*/
+            /*--- Write a Tecplot binary solution file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
 //            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-//            break;
+            break;
             
-//          case PARAVIEW:
+          case PARAVIEW:
             
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+            break;
             
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
             
-//            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
-//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
+            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
+            break;
             
-//          default:
-//            break;
-//        }
+          default:
+            break;
+        }
         
-//      }
+      }
       
-//      /*--- Release memory needed for merging the solution data. ---*/
+      /*--- Release memory needed for merging the solution data. ---*/
       
-//      DeallocateCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
-//      DeallocateSolution(config[iZone], geometry[iZone][INST_0][MESH_0]);
+      DeallocateCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
+      DeallocateSolution(config[iZone], geometry[iZone][INST_0][MESH_0]);
       
-//    }
+    }
     
-//    /*--- Final broadcast (informing other procs that the base output
-//     file was written). ---*/
+    /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
     
-//#ifdef HAVE_MPI
-//    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//    SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//#endif
+#ifdef HAVE_MPI
+    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+    SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
     
-//  }
+  }
 }
 
 void COutputLegacy::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
                                       unsigned long iExtIter, unsigned short val_nZone) {
   
-//  unsigned short iZone, iInst, nInst;
+  unsigned short iZone, iInst, nInst;
   
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
     
-//    nInst = config[iZone]->GetnTimeInstances();
+    nInst = config[iZone]->GetnTimeInstances();
 
-//    for (iInst = 0; iInst < nInst; iInst++) {
+    for (iInst = 0; iInst < nInst; iInst++) {
 
-//      config[iZone]->SetiInst(iInst);
+      config[iZone]->SetiInst(iInst);
 
-//      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- Flags identifying the types of files to be written. ---*/
 
-//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-//      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
-//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
 
-//      /*--- Get the file output format ---*/
+      /*--- Get the file output format ---*/
 
-//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
 
-//      /*--- Merge the node coordinates and connectivity if necessary. This
-//     is only performed if a volume solution file is requested, and it
-//     is active by default. ---*/
+      /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
 
-//      if ((Wrt_Vol || Wrt_Srf)) {
-//        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-//        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
-//      }
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
+      }
 
-//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+      /*--- Merge the solution data needed for volume solutions and restarts ---*/
 
-//      if ((Wrt_Vol || Wrt_Srf)) {
-//        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-//        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-//      }
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+      }
 
-//      /*--- Write restart, Tecplot or Paraview files using the merged data.
-//     This data lives only on the master, and these routines are currently
-//     executed by the master proc alone (as if in serial). ---*/
+      /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
 
 
-//      if (rank == MASTER_NODE) {
+      if (rank == MASTER_NODE) {
 
-//        if (Wrt_Vol) {
+        if (Wrt_Vol) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//          case TECPLOT:
+          case TECPLOT:
 
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
 //            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-//          case FIELDVIEW:
+          case FIELDVIEW:
 
-//            /*--- Write a FieldView ASCII file ---*/
+            /*--- Write a FieldView ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
 //            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
 
-//            /*--- Write a Tecplot binary solution file ---*/
+            /*--- Write a Tecplot binary solution file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
 //            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
 //            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-//            break;
+            break;
 
-//          case FIELDVIEW_BINARY:
+          case FIELDVIEW_BINARY:
 
-//            /*--- Write a binary binary file ---*/
+            /*--- Write a binary binary file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
 //            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-//          case PARAVIEW:
+          case PARAVIEW:
 
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
               
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
             
-//            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
-//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
+            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
 
-//          default:
-//            break;
-//          }
+          default:
+            break;
+          }
 
-//        }
+        }
 
-//        if (Wrt_Srf) {
+        if (Wrt_Srf) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//          case TECPLOT:
+          case TECPLOT:
 
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
 //            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
 
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
 
-//            /*--- Write a Tecplot binary solution file ---*/
+            /*--- Write a Tecplot binary solution file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
 //            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
 //            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-//            break;
+            break;
 
-//          case PARAVIEW:
+          case PARAVIEW:
 
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
 
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
+            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
             
-//            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
-//            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
+            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
 //            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-//            break;
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
               
-//          default:
-//            break;
-//          }
-//        }
-
-//        if (FileFormat == TECPLOT_BINARY) {
-//          if (!wrote_base_file)
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//          if (!wrote_surf_file)
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-//        }
-
-//        if (Wrt_Vol || Wrt_Srf)
-//          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-//      }
+          default:
+            break;
+          }
+        }
 
+        if (FileFormat == TECPLOT_BINARY) {
+          if (!wrote_base_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+          if (!wrote_surf_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
+        }
 
+        if (Wrt_Vol || Wrt_Srf)
+          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+      }
 
-//      /*--- Final broadcast (informing other procs that the base output
-//     file was written). ---*/
 
-//#ifdef HAVE_MPI
-//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//#endif
 
-//    }
+      /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
 
-//  }
+#ifdef HAVE_MPI
+      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
+
+    }
+
+  }
 }
 
 void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
 
-//  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-//  unsigned short iZone;
-//  ofstream output_file;
-//  string str;
-
-//  /*--- Read the name of the output and input file ---*/
-
-//  if (su2_file) {
-//    if (rank == MASTER_NODE) {
-//      str = config[ZONE_0]->GetMesh_Out_FileName();
-//      strcpy (out_file, str.c_str());
-//      strcpy (cstr, out_file);
-//      output_file.precision(15);
-//      output_file.open(cstr, ios::out);
-//      if (val_nZone > 1) {
-//        output_file << "NZONE= " << val_nZone << endl;
-//      }
-//    }
-//  }
+  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
+  unsigned short iZone;
+  ofstream output_file;
+  string str;
 
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  /*--- Read the name of the output and input file ---*/
+
+  if (su2_file) {
+    if (rank == MASTER_NODE) {
+      str = config[ZONE_0]->GetMesh_Out_FileName();
+      strcpy (out_file, str.c_str());
+      strcpy (cstr, out_file);
+      output_file.precision(15);
+      output_file.open(cstr, ios::out);
+      if (val_nZone > 1) {
+        output_file << "NZONE= " << val_nZone << endl;
+      }
+    }
+  }
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
     
-//    /*--- Flags identifying the types of files to be written. ---*/
+    /*--- Flags identifying the types of files to be written. ---*/
     
-//    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
-//    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
-//    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
+    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
+    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
+    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
     
-//    /*--- Merge the node coordinates and connectivity if necessary. This
-//     is only performed if a volume solution file is requested, and it
-//     is active by default. ---*/
+    /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
     
-//    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
-//    MergeConnectivity(config[iZone], geometry[iZone], iZone);
+    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
+    MergeConnectivity(config[iZone], geometry[iZone], iZone);
     
-//    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-//     The grid coordinates are always merged and included first in the
-//     restart files. ---*/
+    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+     The grid coordinates are always merged and included first in the
+     restart files. ---*/
     
-//    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
-//    MergeCoordinates(config[iZone], geometry[iZone]);
+    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
+    MergeCoordinates(config[iZone], geometry[iZone]);
     
-//    /*--- Write restart, Tecplot or Paraview files using the merged data.
-//     This data lives only on the master, and these routines are currently
-//     executed by the master proc alone (as if in serial). ---*/
+    /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
     
-//    if (rank == MASTER_NODE) {
+    if (rank == MASTER_NODE) {
       
-//      if (Wrt_Vol) {
+      if (Wrt_Vol) {
         
-//        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
+        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
 
-//        /*--- Write a Tecplot ASCII file ---*/
+        /*--- Write a Tecplot ASCII file ---*/
 
-//        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-//        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
+        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
 //          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-//        }
-//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
+        }
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
 //          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-//        }
+        }
         
-//      }
+      }
       
-//      if (Wrt_Srf) {
+      if (Wrt_Srf) {
         
-//        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
+        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
         
-//        /*--- Write a Tecplot ASCII file ---*/
+        /*--- Write a Tecplot ASCII file ---*/
         
 //        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
 //        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
 //          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-//        }
+        }
 //        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
 //        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
 //          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-//        }
+        }
         
-//      }
+      }
       
-//      /*--- Write a .su2 ASCII file ---*/
+      /*--- Write a .su2 ASCII file ---*/
 
-//      if (su2_file) {
+      if (su2_file) {
         
-//        if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
+        if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
         
-//        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
+        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
         
-//        /*--- Write an stl surface file ---*/
+        /*--- Write an stl surface file ---*/
         
-//        if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
+        if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
         
 //        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
         
-//      }
+      }
       
-//      /*--- Write a binary file with the grid coordinates alone. ---*/
+      /*--- Write a binary file with the grid coordinates alone. ---*/
       
 //      if (Wrt_Crd) {
 //        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
@@ -8769,34 +8769,34 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
 //      }
 
       
-//      /*--- Deallocate connectivity ---*/
+      /*--- Deallocate connectivity ---*/
       
-//      DeallocateConnectivity(config[iZone], geometry[iZone], true);
-//      DeallocateConnectivity(config[iZone], geometry[iZone], false);
-//      DeallocateCoordinates(config[iZone], geometry[iZone]);
+      DeallocateConnectivity(config[iZone], geometry[iZone], true);
+      DeallocateConnectivity(config[iZone], geometry[iZone], false);
+      DeallocateCoordinates(config[iZone], geometry[iZone]);
       
-//    }
+    }
 
-//    /*--- Final broadcast (informing other procs that the base output
-//     file was written). ---*/
+    /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
     
-//#ifdef HAVE_MPI
-//    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//#endif
+#ifdef HAVE_MPI
+    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
     
-//    /*--- Write an csv surface file, done in parallel ---*/
+    /*--- Write an csv surface file, done in parallel ---*/
 
-//    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
+    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
 
 //    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
 
-//  }
+  }
 
-//  if (rank == MASTER_NODE) {
-//    if (su2_file){
-//      output_file.close();
-//    }
-//  }
+  if (rank == MASTER_NODE) {
+    if (su2_file){
+      output_file.close();
+    }
+  }
 }
 
 void COutputLegacy::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
@@ -12276,350 +12276,350 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
                                        unsigned long iExtIter,
                                        unsigned short val_nZone) {
   
-//  unsigned short iZone, iVar, iInst;
-//  unsigned long iPoint;
-//  unsigned short nInst = 1;
-//  bool compressible = true;
+  unsigned short iZone, iVar, iInst;
+  unsigned long iPoint;
+  unsigned short nInst = 1;
+  bool compressible = true;
 
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
 
-//    /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
-//    unsigned short KindSolver = config[iZone]->GetKind_Solver();
-//    bool fem_solver = ((KindSolver == FEM_EULER) ||
-//                       (KindSolver == FEM_NAVIER_STOKES) ||
-//                       (KindSolver == FEM_RANS) ||
-//                       (KindSolver == FEM_LES));
+    /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
+    unsigned short KindSolver = config[iZone]->GetKind_Solver();
+    bool fem_solver = ((KindSolver == FEM_EULER) ||
+                       (KindSolver == FEM_NAVIER_STOKES) ||
+                       (KindSolver == FEM_RANS) ||
+                       (KindSolver == FEM_LES));
     
-//    /*--- Get the file output format ---*/
+    /*--- Get the file output format ---*/
     
-//    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-//    nInst = config[iZone]->GetnTimeInstances();
+    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    nInst = config[iZone]->GetnTimeInstances();
     
-//    for (iInst = 0; iInst < nInst; iInst++){
+    for (iInst = 0; iInst < nInst; iInst++){
 
-//      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-//      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
+      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
+      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
 
-//      /*--- Flags identifying the types of files to be written. ---*/
-//      /*--- For now, we are disabling the parallel writers for Tecplot
-//          ASCII until we have parallel versions of all file formats
-//          available. SU2_SOL will remain intact for writing files
-//          until this capability is completed. ---*/
+      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- For now, we are disabling the parallel writers for Tecplot
+          ASCII until we have parallel versions of all file formats
+          available. SU2_SOL will remain intact for writing files
+          until this capability is completed. ---*/
 
-//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-//      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
 
-//#ifdef HAVE_MPI
-//      /*--- Do not merge the connectivity or write the visualization files
-//     if we are running in parallel, unless we are using ParaView binary.
-//       Force the use of SU2_SOL to merge and write the viz. files in this
-//       case to save overhead. ---*/
+#ifdef HAVE_MPI
+      /*--- Do not merge the connectivity or write the visualization files
+     if we are running in parallel, unless we are using ParaView binary.
+       Force the use of SU2_SOL to merge and write the viz. files in this
+       case to save overhead. ---*/
 
-//      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
-//        Wrt_Vol = false;
-//        Wrt_Srf = false;
-//      }
-//#endif
+      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
+        Wrt_Vol = false;
+        Wrt_Srf = false;
+      }
+#endif
 
-//    /*--- Check for compressible/incompressible flow problems. ---*/
+    /*--- Check for compressible/incompressible flow problems. ---*/
 
-//    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
+    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
 
-//    /*--- First, prepare the offsets needed throughout below. ---*/
+    /*--- First, prepare the offsets needed throughout below. ---*/
 
-//    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
+    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-//    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
     
-//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
     
-//    switch (config[iZone]->GetKind_Solver()) {
-//      case EULER : case NAVIER_STOKES : case RANS :
-//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
-//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-//        break;
-//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
-//            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
-//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-//        break;
-//      default: break;
-//    }
+    switch (config[iZone]->GetKind_Solver()) {
+      case EULER : case NAVIER_STOKES : case RANS :
+        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
+            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+        break;
+      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
+            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
+            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
+        break;
+      default: break;
+    }
 
-//    /*--- Write a template inlet profile file if requested. ---*/
+    /*--- Write a template inlet profile file if requested. ---*/
 
-//    if (config[iZone]->GetWrt_InletFile()) {
-//      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+    if (config[iZone]->GetWrt_InletFile()) {
+      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-//      if (rank == MASTER_NODE) {
-//        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-//        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-//      }
-//      config[iZone]->SetWrt_InletFile(false);
-//    }
+      if (rank == MASTER_NODE) {
+        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+      }
+      config[iZone]->SetWrt_InletFile(false);
+    }
 
-//    /*--- This switch statement will become a call to a virtual function
-//     defined within each of the "physics" output child classes that loads
-//     the local data for that particular problem alone. ---*/
-
-//      if (rank == MASTER_NODE)
-//        cout << "Loading solution output data locally on each rank." << endl;
-
-//      switch (config[iZone]->GetKind_Solver()) {
-//      case EULER : case NAVIER_STOKES: case RANS :
-//        if (compressible)
-//          LoadLocalData_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//        else
-//          LoadLocalData_IncFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//        break;
-//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-//        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//        break;
-//      case FEM_ELASTICITY: case DISC_ADJ_FEM:
-//        LoadLocalData_Elasticity(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//        break;
-//      case HEAT_EQUATION_FVM:
-//        LoadLocalData_Base(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//        break;
-//      case FEM_EULER: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
-//        LoadLocalData_FEM(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-//      default: break;
-//    }
+    /*--- This switch statement will become a call to a virtual function
+     defined within each of the "physics" output child classes that loads
+     the local data for that particular problem alone. ---*/
+
+      if (rank == MASTER_NODE)
+        cout << "Loading solution output data locally on each rank." << endl;
+
+      switch (config[iZone]->GetKind_Solver()) {
+      case EULER : case NAVIER_STOKES: case RANS :
+        if (compressible)
+          LoadLocalData_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+        else
+          LoadLocalData_IncFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+        break;
+      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+        break;
+      case FEM_ELASTICITY: case DISC_ADJ_FEM:
+        LoadLocalData_Elasticity(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+        break;
+      case HEAT_EQUATION_FVM:
+        LoadLocalData_Base(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+        break;
+      case FEM_EULER: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
+        LoadLocalData_FEM(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
+      default: break;
+    }
     
-//    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
 
-//    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-//        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
 
-//      if (rank == MASTER_NODE)
-//        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
+      if (rank == MASTER_NODE)
+        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
       
-//      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
-//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-//        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
-//      }
+      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
+      }
       
-//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-//        for (iVar = 0; iVar < nVar_Par; iVar++) {
-//          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
-//        }
-//      }
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < nVar_Par; iVar++) {
+          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
+        }
+      }
       
-//    }
+    }
     
-//    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
+    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
 
-//    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-//        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
 
-//      if (rank == MASTER_NODE)
-//        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+      if (rank == MASTER_NODE)
+        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
       
-//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-//        for (iVar = 0; iVar < nVar_Par; iVar++) {
-//          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
-//        }
-//      }
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < nVar_Par; iVar++) {
+          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
+        }
+      }
       
-//      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
-//        delete [] Local_Data_Copy[iPoint];
-//      delete [] Local_Data_Copy;
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
+        delete [] Local_Data_Copy[iPoint];
+      delete [] Local_Data_Copy;
       
-//    }
+    }
     
-//    /*--- After loading the data local to a processor, we perform a sorting,
-//     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
+    /*--- After loading the data local to a processor, we perform a sorting,
+     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
     
-//    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
+    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
 
-//    if (fem_solver)
-//      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-//    else
-//      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
+    if (fem_solver)
+      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+    else
+      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
     
-//    /*--- Write either a binary or ASCII restart file in parallel. ---*/
+    /*--- Write either a binary or ASCII restart file in parallel. ---*/
 
-//    if (config[iZone]->GetWrt_Binary_Restart()) {
-//      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-//      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-//    } else {
-//      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-//      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-//    }
+    if (config[iZone]->GetWrt_Binary_Restart()) {
+      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
+      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+    } else {
+      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
+      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+    }
 
-//    /*--- Write a slice on a structured mesh if requested. ---*/
+    /*--- Write a slice on a structured mesh if requested. ---*/
 
-//    if (config[iZone]->GetWrt_Slice()) {
-//      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-//                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-//      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-//                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-//    }
+    if (config[iZone]->GetWrt_Slice()) {
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
+    }
     
-//    /*--- Write the solution files if they are requested and we are executing
-//     with a single rank (all data on one proc and no comm. overhead). Once we
-//     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
-//     can allow the write of the viz. files as well. ---*/
+    /*--- Write the solution files if they are requested and we are executing
+     with a single rank (all data on one proc and no comm. overhead). Once we
+     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
+     can allow the write of the viz. files as well. ---*/
 
-//    if ((Wrt_Vol || Wrt_Srf) && !fem_solver) {
+    if ((Wrt_Vol || Wrt_Srf) && !fem_solver) {
       
-//      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
+      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
 
-//      if (rank == MASTER_NODE)
-//        cout << "Preparing element connectivity across all ranks." << endl;
+      if (rank == MASTER_NODE)
+        cout << "Preparing element connectivity across all ranks." << endl;
 
-//      if (fem_solver)
-//        SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-//      else
-//        SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+      if (fem_solver)
+        SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+      else
+        SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
 
-//      /*--- Sort the surface data and renumber if for writing. ---*/
-//      if (Wrt_Srf){
-//        if (fem_solver)
-//          SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-//        else
-//          SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
-//      }
-//      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
+      /*--- Sort the surface data and renumber if for writing. ---*/
+      if (Wrt_Srf){
+        if (fem_solver)
+          SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+        else
+          SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
+      }
+      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
 
-//      if (Wrt_Vol) {
+      if (Wrt_Vol) {
 
-//        switch (FileFormat) {
+        switch (FileFormat) {
 
-//          case TECPLOT:
+          case TECPLOT:
 
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
 //            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-//            break;
+            break;
 
-//          case FIELDVIEW:
+          case FIELDVIEW:
 
-//            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
+            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
 
-//            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
 
-//            break;
+            break;
 
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
 
-//            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
 
-//            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
-//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
 //            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-//            break;
+            break;
 
-//          case FIELDVIEW_BINARY:
+          case FIELDVIEW_BINARY:
 
-//            /*--- FieldView binary files not yet available for parallel output. ---*/
+            /*--- FieldView binary files not yet available for parallel output. ---*/
 
-//            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-//            break;
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
+            break;
 
-//          case PARAVIEW:
+          case PARAVIEW:
 
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
 //            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-//            break;
+            break;
             
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a Paraview binary file ---*/
+            /*--- Write a Paraview binary file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
 //            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, false);
-//            break;
+            break;
 
-//          default:
-//            break;
-//          }
+          default:
+            break;
+          }
 
-//        }
+        }
 
-//        if (Wrt_Srf) {
+        if (Wrt_Srf) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//          case TECPLOT:
+          case TECPLOT:
 
-//            /*--- Write a Tecplot ASCII file ---*/
+            /*--- Write a Tecplot ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
 //            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-//            break;
+            break;
 
-//          case TECPLOT_BINARY:
+          case TECPLOT_BINARY:
 
-//            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
+            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
 
-//            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
-//            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-//            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
+            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
 //            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-//            break;
+            break;
 
-//          case PARAVIEW:
+          case PARAVIEW:
 
-//            /*--- Write a Paraview ASCII file ---*/
+            /*--- Write a Paraview ASCII file ---*/
 
-//            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
 //            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-//            break;
+            break;
             
-//          case PARAVIEW_BINARY:
+          case PARAVIEW_BINARY:
             
-//            /*--- Write a Paraview binary file ---*/
+            /*--- Write a Paraview binary file ---*/
             
-//            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
 //            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
 //                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, true);
-//            break;
+            break;
             
 
-//          default:
-//            break;
-//          }
+          default:
+            break;
+          }
 
-//        }
+        }
 
-//        /*--- Clean up the connectivity data that was allocated for output. ---*/
+        /*--- Clean up the connectivity data that was allocated for output. ---*/
 
-//        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
-//        if (Wrt_Srf) DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
+        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
+        if (Wrt_Srf) DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
 
-//        /*--- Clean up the surface data that was only needed for output. ---*/
+        /*--- Clean up the surface data that was only needed for output. ---*/
 
-//        if (Wrt_Srf) DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
+        if (Wrt_Srf) DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-//      }
+      }
 
-//      /*--- Deallocate the nodal data needed for writing restarts. ---*/
+      /*--- Deallocate the nodal data needed for writing restarts. ---*/
 
-//      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
+      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
-//      /*--- Clear the variable names list. ---*/
+      /*--- Clear the variable names list. ---*/
 
-//      Variable_Names.clear();
+      Variable_Names.clear();
 
-//    }
-//  }
+    }
+  }
 }
 
 void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
@@ -20383,330 +20383,330 @@ void COutputLegacy::MergeBaselineSolution_FEM(CConfig *config, CGeometry *geomet
 void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
                                   unsigned long iExtIter, unsigned short val_nZone) {
 
-//  unsigned short iZone;
+  unsigned short iZone;
 
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
 
-//    /*--- Check whether we are writing any output at all. We can
-//     disable all output to avoid serial bottleneck at scale. ---*/
-//    if (config[iZone]->GetWrt_Output()) {
+    /*--- Check whether we are writing any output at all. We can
+     disable all output to avoid serial bottleneck at scale. ---*/
+    if (config[iZone]->GetWrt_Output()) {
 
-//      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- Flags identifying the types of files to be written. ---*/
 
-//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
 
-//      /*--- Get the file output format ---*/
+      /*--- Get the file output format ---*/
 
-//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
 
-//      /*--- Merge the node coordinates and connectivity, if necessary. This
-//       is only performed if a volume solution file is requested, and it
-//       is active by default. ---*/
+      /*--- Merge the node coordinates and connectivity, if necessary. This
+       is only performed if a volume solution file is requested, and it
+       is active by default. ---*/
 
-//      if (Wrt_Vol || Wrt_Srf) {
-//        if (rank == MASTER_NODE) cout << endl << "Merging connectivities in the Master node." << endl;
-//        MergeConnectivity_FEM(config[iZone], geometry[iZone][MESH_0], iZone);
-//      }
+      if (Wrt_Vol || Wrt_Srf) {
+        if (rank == MASTER_NODE) cout << endl << "Merging connectivities in the Master node." << endl;
+        MergeConnectivity_FEM(config[iZone], geometry[iZone][MESH_0], iZone);
+      }
 
-//      /*--- Merge coordinates of all grid nodes (excluding ghost points).
-//       The grid coordinates are always merged and included first in the
-//       restart files. ---*/
+      /*--- Merge coordinates of all grid nodes (excluding ghost points).
+       The grid coordinates are always merged and included first in the
+       restart files. ---*/
 
-//      if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
-//      MergeCoordinates_FEM(config[iZone], geometry[iZone][MESH_0]);
+      if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
+      MergeCoordinates_FEM(config[iZone], geometry[iZone][MESH_0]);
 
-//      if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-//        if (FileFormat == TECPLOT_BINARY) {
-//          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
+      if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
+        if (FileFormat == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
 //          SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][MESH_0], iZone);
 //          SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][MESH_0], iZone);
-//        }
-//      }
+        }
+      }
 
-//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+      /*--- Merge the solution data needed for volume solutions and restarts ---*/
 
-//      if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-//      MergeSolution_FEM(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+      if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+      MergeSolution_FEM(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
 
-//      /*--- Write restart, or Tecplot files using the merged data.
-//       This data lives only on the master, and these routines are currently
-//       executed by the master proc alone (as if in serial). ---*/
+      /*--- Write restart, or Tecplot files using the merged data.
+       This data lives only on the master, and these routines are currently
+       executed by the master proc alone (as if in serial). ---*/
 
-//      if (rank == MASTER_NODE) {
+      if (rank == MASTER_NODE) {
 
-//        /*--- Write a native restart file ---*/
+        /*--- Write a native restart file ---*/
 
-//        if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
-//        SetRestart(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone);
+        if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
+        SetRestart(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone);
 
-//        if (Wrt_Vol) {
+        if (Wrt_Vol) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//            case TECPLOT:
+            case TECPLOT:
 
-//              /*--- Write a Tecplot ASCII file ---*/
+              /*--- Write a Tecplot ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
 //              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone, val_nZone, false);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+              break;
 
-//            case FIELDVIEW:
+            case FIELDVIEW:
 
-//              /*--- Write a FieldView ASCII file ---*/
+              /*--- Write a FieldView ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
 //              SetFieldViewASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+              break;
 
-//            case TECPLOT_BINARY:
+            case TECPLOT_BINARY:
 
-//              /*--- Write a Tecplot binary solution file ---*/
+              /*--- Write a Tecplot binary solution file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
 //              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][MESH_0], iZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+              break;
 
-//            case FIELDVIEW_BINARY:
+            case FIELDVIEW_BINARY:
 
-//              /*--- Write a FieldView binary file ---*/
+              /*--- Write a FieldView binary file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
 //              SetFieldViewBinary(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+              break;
 
-//            case PARAVIEW:
+            case PARAVIEW:
 
-//              /*--- Write a Paraview ASCII file ---*/
+              /*--- Write a Paraview ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
 //              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, false);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
+              break;
 
-//            default:
-//              break;
-//          }
+            default:
+              break;
+          }
 
-//        }
+        }
 
-//        if (Wrt_Srf) {
+        if (Wrt_Srf) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//            case TECPLOT:
+            case TECPLOT:
 
-//              /*--- Write a Tecplot ASCII file ---*/
+              /*--- Write a Tecplot ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
 //              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone, val_nZone, true);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+              break;
 
-//            case TECPLOT_BINARY:
+            case TECPLOT_BINARY:
 
-//              /*--- Write a Tecplot binary solution file ---*/
+              /*--- Write a Tecplot binary solution file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
 //              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][MESH_0], iZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+              break;
 
-//            case PARAVIEW:
+            case PARAVIEW:
 
-//              /*--- Write a Paraview ASCII file ---*/
+              /*--- Write a Paraview ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
 //              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, true);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
+              break;
 
-//            default:
-//              break;
-//          }
+            default:
+              break;
+          }
 
-//        }
+        }
 
-//        /*--- Release memory needed for merging the solution data. ---*/
+        /*--- Release memory needed for merging the solution data. ---*/
 
-//        DeallocateCoordinates(config[iZone], geometry[iZone][MESH_0]);
-//        DeallocateSolution(config[iZone], geometry[iZone][MESH_0]);
+        DeallocateCoordinates(config[iZone], geometry[iZone][MESH_0]);
+        DeallocateSolution(config[iZone], geometry[iZone][MESH_0]);
 
-//      }
+      }
 
-//      /*--- Final broadcast (informing other procs that the base output
-//       file was written). ---*/
+      /*--- Final broadcast (informing other procs that the base output
+       file was written). ---*/
 
-//#ifdef HAVE_MPI
-//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//      SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//#endif
+#ifdef HAVE_MPI
+      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
 
-//    } else {
-//      if (rank == MASTER_NODE) cout << endl << "Restart and solution output disabled." << endl;
-//    }
-//  }
+    } else {
+      if (rank == MASTER_NODE) cout << endl << "Restart and solution output disabled." << endl;
+    }
+  }
 }
 
 void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***geometry, CConfig **config,
                                           unsigned long iExtIter, unsigned short val_nZone) {
 
-//  unsigned short iZone, iInst, nInst;
+  unsigned short iZone, iInst, nInst;
 
-//  for (iZone = 0; iZone < val_nZone; iZone++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
 
-//    nInst = config[iZone]->GetnTimeInstances();
+    nInst = config[iZone]->GetnTimeInstances();
 
-//    for (iInst = 0; iInst < nInst; iInst++) {
+    for (iInst = 0; iInst < nInst; iInst++) {
 
-//      config[iZone]->SetiInst(iInst);
+      config[iZone]->SetiInst(iInst);
 
-//      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- Flags identifying the types of files to be written. ---*/
 
-//      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-//      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
 
-//      /*--- Get the file output format ---*/
+      /*--- Get the file output format ---*/
 
-//      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
 
-//      /*--- Merge the node coordinates and connectivity if necessary. This
-//       is only performed if a volume solution file is requested, and it
-//       is active by default. ---*/
+      /*--- Merge the node coordinates and connectivity if necessary. This
+       is only performed if a volume solution file is requested, and it
+       is active by default. ---*/
 
-//      if ((Wrt_Vol || Wrt_Srf)) {
-//        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-//        MergeConnectivity_FEM(config[iZone], geometry[iZone][iInst], iZone);
-//      }
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+        MergeConnectivity_FEM(config[iZone], geometry[iZone][iInst], iZone);
+      }
 
-//      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+      /*--- Merge the solution data needed for volume solutions and restarts ---*/
 
-//      if ((Wrt_Vol || Wrt_Srf)) {
-//        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-//        MergeBaselineSolution_FEM(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-//      }
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+        MergeBaselineSolution_FEM(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+      }
 
-//      /*--- Write restart, Tecplot or Paraview files using the merged data.
-//       This data lives only on the master, and these routines are currently
-//       executed by the master proc alone (as if in serial). ---*/
+      /*--- Write restart, Tecplot or Paraview files using the merged data.
+       This data lives only on the master, and these routines are currently
+       executed by the master proc alone (as if in serial). ---*/
 
-//      if (rank == MASTER_NODE) {
+      if (rank == MASTER_NODE) {
 
-//        if (Wrt_Vol) {
+        if (Wrt_Vol) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//            case TECPLOT:
+            case TECPLOT:
 
-//              /*--- Write a Tecplot ASCII file ---*/
+              /*--- Write a Tecplot ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
 //              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+              break;
 
-//            case FIELDVIEW:
+            case FIELDVIEW:
 
-//              /*--- Write a FieldView ASCII file ---*/
+              /*--- Write a FieldView ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
 //              SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+              break;
 
-//            case TECPLOT_BINARY:
+            case TECPLOT_BINARY:
 
-//              /*--- Write a Tecplot binary solution file ---*/
+              /*--- Write a Tecplot binary solution file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
 //              SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
 //              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-//              break;
+              break;
 
-//            case FIELDVIEW_BINARY:
+            case FIELDVIEW_BINARY:
 
-//              /*--- Write a binary binary file ---*/
+              /*--- Write a binary binary file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
 //              SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+              break;
 
-//            case PARAVIEW:
+            case PARAVIEW:
 
-//              /*--- Write a Paraview ASCII file ---*/
+              /*--- Write a Paraview ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
 //              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+              break;
 
-//            default:
-//              break;
-//          }
+            default:
+              break;
+          }
 
-//        }
+        }
 
-//        if (Wrt_Srf) {
+        if (Wrt_Srf) {
 
-//          switch (FileFormat) {
+          switch (FileFormat) {
 
-//            case TECPLOT:
+            case TECPLOT:
 
-//              /*--- Write a Tecplot ASCII file ---*/
+              /*--- Write a Tecplot ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
 //              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-//              break;
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+              break;
 
-//            case TECPLOT_BINARY:
+            case TECPLOT_BINARY:
 
-//              /*--- Write a Tecplot binary solution file ---*/
+              /*--- Write a Tecplot binary solution file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
 //              SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
 //              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-//              break;
+              break;
 
-//            case PARAVIEW:
+            case PARAVIEW:
 
-//              /*--- Write a Paraview ASCII file ---*/
+              /*--- Write a Paraview ASCII file ---*/
 
-//              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
 //              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-//              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-//              break;
-
-//            default:
-//              break;
-//          }
-//        }
-
-//        if (FileFormat == TECPLOT_BINARY) {
-//          if (!wrote_base_file)
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-//          if (!wrote_surf_file)
-//            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-//        }
-
-//        if (Wrt_Vol || Wrt_Srf)
-//          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-//      }
+              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+              break;
+
+            default:
+              break;
+          }
+        }
+
+        if (FileFormat == TECPLOT_BINARY) {
+          if (!wrote_base_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+          if (!wrote_surf_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
+        }
+
+        if (Wrt_Vol || Wrt_Srf)
+          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+      }
     
-//      /*--- Final broadcast (informing other procs that the base output
-//       file was written). ---*/
+      /*--- Final broadcast (informing other procs that the base output
+       file was written). ---*/
     
-//#ifdef HAVE_MPI
-//      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-//#endif
-//    }
-//  }
+#ifdef HAVE_MPI
+      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
+    }
+  }
 }
 
 void COutputLegacy::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {

From 8aa9bc7f964ae5616664b06c04d9f7fff7f78e73 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 12:12:46 +0100
Subject: [PATCH 114/539] Fix bug in adjoint output.

---
 SU2_CFD/src/output_adjoint_discrete.cpp     | 2 +-
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 9500701d36fc..8e5fb5c7e7cb 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -64,7 +64,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("SOLUTION");    
-    RequestedVolumeFields.push_back("SENSITIVITIES");
+    RequestedVolumeFields.push_back("SENSITIVITY");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index dd2a21c533d4..eeae1d33b1f7 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -69,7 +69,7 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("SOLUTION");    
-    RequestedVolumeFields.push_back("SENSITIVITIES");
+    RequestedVolumeFields.push_back("SENSITIVITY");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
   

From d7e2652c976162f7ace1d492cdfb6a83922318ff Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 14:10:24 +0100
Subject: [PATCH 115/539] Fix a small bug.

---
 SU2_CFD/src/output_structure_legacy.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index 2612016ac10e..7ea174ba1217 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -8713,12 +8713,12 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
 
         /*--- Write a Tecplot ASCII file ---*/
 
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+//        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
         else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
           if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
 //          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
         }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
         else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
           if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
 //          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
@@ -8734,14 +8734,14 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
         
 //        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
 //        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
 //          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-        }
+//        }
 //        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
 //        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
 //          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        }
+//        }
         
       }
       

From 54cf699034a9826ea6bdc030b5106e698438d1ea Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 14:14:41 +0100
Subject: [PATCH 116/539] Fix yet another small bug.

---
 SU2_CFD/src/output_structure_legacy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index 7ea174ba1217..6586d1faed56 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -8751,7 +8751,7 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
         
         if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
         
-        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
+//        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
         
         /*--- Write an stl surface file ---*/
         

From 1ff34fec2451eada19496e97c5a843a372432377 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 16:21:51 +0100
Subject: [PATCH 117/539] Fix bug on SU2 DOT.

---
 SU2_DOT/src/SU2_DOT.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 5f901954efea..d1884a6516ab 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {
   }
   
   /*--- Initialize the configuration of the driver ---*/
-  driver_config = new CConfig(config_file_name, SU2_CFD, ZONE_0, nZone, 0, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_DOT, ZONE_0, nZone, 0, VERB_NONE);
 
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
@@ -129,10 +129,10 @@ int main(int argc, char *argv[]) {
 
     if (multizone){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(zone_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(zone_file_name, SU2_DOT, iZone, nZone, 0, VERB_HIGH);
     }
     else{
-      config_container[iZone] = new CConfig(config_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(config_file_name, SU2_DOT, iZone, nZone, 0, VERB_HIGH);
     }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
 

From d0cb0778f74dd31f0c2ac62185a5866731698a02 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 16:46:47 +0100
Subject: [PATCH 118/539] Add Adjoint of Heat equation to volume file.

---
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index eeae1d33b1f7..b9dca513b6cd 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -331,12 +331,16 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
 void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
+  CVariable* Node_AdjHeat = NULL;
   CVariable* Node_AdjTurb = NULL;
   CPoint*    Node_Geo     = geometry->node[iPoint];
   
   if (config->GetKind_Turb_Model() != NONE){
     Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
   }
+  if (weakly_coupled_heat){
+    Node_AdjHeat = solver[ADJHEAT_SOL]->node[iPoint];
+  }
   
   SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
   SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
@@ -348,7 +352,14 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
   SetVolumeOutputValue("ADJ_VELOCITY-Y", iPoint, Node_AdjFlow->GetSolution(2));
   if (nDim == 3){
     SetVolumeOutputValue("ADJ_VELOCITY-Z", iPoint, Node_AdjFlow->GetSolution(3));
-    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+  }
+
+  if (weakly_coupled_heat){
+    SetHistoryOutputValue("ADJ_HEAT", Node_AdjHeat->GetSolution(0));
+  }
+  if (heat){
+    if (nDim == 3) SetHistoryOutputValue("ADJ_HEAT", Node_AdjFlow->GetSolution(4));
+    else           SetHistoryOutputValue("ADJ_HEAT", Node_AdjFlow->GetSolution(3));
   }
   // Turbulent 
   switch(turb_model){

From 58d65cc5fc7c33174f26c918b5b31fca725d5188 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 16:55:42 +0100
Subject: [PATCH 119/539] Conditionally add the heat field to the adjoint.

---
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index b9dca513b6cd..9aaacde80c68 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -259,7 +259,10 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     /// DESCRIPTION: Adjoint Velocity z-component.
     AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "SOLUTION"); 
  
-  AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION");
+  if (weakly_coupled_heat || heat){
+    AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION");
+  }
+
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Adjoint nu tilde.

From dff85b066200f6fdd45e23cd381158d4561d620c Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Wed, 6 Feb 2019 16:58:25 +0100
Subject: [PATCH 120/539] And fix the output volume.

---
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index 9aaacde80c68..5e31ea34ca6e 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -358,11 +358,11 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
   }
 
   if (weakly_coupled_heat){
-    SetHistoryOutputValue("ADJ_HEAT", Node_AdjHeat->GetSolution(0));
+    SetVolumeOutputValue("ADJ_HEAT", iPoint, Node_AdjHeat->GetSolution(0));
   }
   if (heat){
-    if (nDim == 3) SetHistoryOutputValue("ADJ_HEAT", Node_AdjFlow->GetSolution(4));
-    else           SetHistoryOutputValue("ADJ_HEAT", Node_AdjFlow->GetSolution(3));
+    if (nDim == 3) SetVolumeOutputValue("ADJ_HEAT", iPoint, Node_AdjFlow->GetSolution(4));
+    else           SetVolumeOutputValue("ADJ_HEAT", iPoint, Node_AdjFlow->GetSolution(3));
   }
   // Turbulent 
   switch(turb_model){

From 2e4d69da552d0a97d2b9d30fcceafdf17a38fc24 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 14 Feb 2019 15:23:56 +0100
Subject: [PATCH 121/539] Fix bug in compressible adjoint.

---
 SU2_CFD/src/output_adjoint_discrete.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 8e5fb5c7e7cb..1182506cbf75 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -46,14 +46,15 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("EXT_ITER");
+    RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
     RequestedHistoryFields.push_back("SENSITIVITIES");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
-  
+
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("EXT_ITER");
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
     RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
     RequestedScreenFields.push_back("SENS_GEO");

From c49199978f9f372c9461739c90d5bfaee3ac08df Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 14 Feb 2019 15:34:46 +0100
Subject: [PATCH 122/539] Fix bugs in elasticity adjoint output.

---
 SU2_CFD/src/output_adjoint_elasticity.cpp | 35 +++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 7a47c75155fb..c7ac349e77f1 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -48,6 +48,37 @@ CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsig
   
   nDim = geometry->GetnDim();
 
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RESIDUALS");
+    RequestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+
+  if (nRequestedScreenFields == 0){
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
+    RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
+    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
+    RequestedScreenFields.push_back("SENS_GEO");
+    RequestedScreenFields.push_back("SENS_AOA");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("SOLUTION");
+    RequestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
+  MultiZoneHeaderString = ss.str();
+
+
 }
 
 CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
@@ -68,8 +99,8 @@ inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_du
 void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
+  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER");
+  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER");
   
   // Residuals
   AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");

From d13391a8d1203a1d4210adc04aa3250206389570 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Fri, 15 Feb 2019 08:39:51 +0100
Subject: [PATCH 123/539] Partially fix output for elasticity adjoint (avoids
 code breakage).

---
 SU2_CFD/include/output_structure.hpp      |  4 ++
 SU2_CFD/src/output_adjoint_elasticity.cpp | 60 ++++++++++++++++++-----
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index bd728921a650..638dd1c8d730 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1621,6 +1621,10 @@ class CDiscAdjFEAOutput : public COutput {
    */
   bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
+  void SetVolumeOutputFields(CConfig *config);
+
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
 };
 
 #include "output_structure.inl"
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index c7ac349e77f1..0ce1cb8f8db3 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -60,17 +60,16 @@ CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsig
   if (nRequestedScreenFields == 0){
     if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
-    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
-    RequestedScreenFields.push_back("SENS_GEO");
-    RequestedScreenFields.push_back("SENS_AOA");
+    RequestedScreenFields.push_back("ADJOINT_DISP_X");
+    RequestedScreenFields.push_back("ADJOINT_DISP_Y");
+    RequestedScreenFields.push_back("SENS_E");
+    RequestedScreenFields.push_back("SENS_NU");
     nRequestedScreenFields = RequestedScreenFields.size();
   }
 
   if (nRequestedVolumeFields == 0){
     RequestedVolumeFields.push_back("COORDINATES");
     RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("SENSITIVITY");
     nRequestedVolumeFields = RequestedVolumeFields.size();
   }
 
@@ -101,6 +100,10 @@ void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   // Iteration numbers
   AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER");
   AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER");
+  // Temporarily add both
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER");
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
   
   // Residuals
   AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
@@ -119,6 +122,10 @@ inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *
   
   SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+
+  SetHistoryOutputValue("TIME_ITER",  config[val_iZone]->GetTimeIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
   
   SetHistoryOutputValue("PHYS_TIME", timeused);
   
@@ -133,18 +140,47 @@ inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *
     Total_SensNu = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
   }
   else{
+    // TODO: Update this and change tests
     for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-        Total_SensE += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-            *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-        Total_SensNu += solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-            *solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+      Total_SensE += solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
+      Total_SensNu += solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                     *solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
     }
-    Total_SensE = sqrt(Total_SensE);
-    Total_SensNu = sqrt(Total_SensNu);
-
+  Total_SensE = sqrt(Total_SensE);
+  Total_SensNu = sqrt(Total_SensNu);
   }
   SetHistoryOutputValue("SENS_E", Total_SensE);
   SetHistoryOutputValue("SENS_NU", Total_SensNu);
   
 }
 
+void CDiscAdjFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+
+  CVariable* Node_Struc = solver[FEA_SOL]->node[iPoint];
+  CPoint*    Node_Geo  = geometry->node[iPoint];
+
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+
+  SetVolumeOutputValue("SENSITIVITY-X", iPoint, Node_Struc->GetSolution(0));
+  SetVolumeOutputValue("SENSITIVITY-Y", iPoint, Node_Struc->GetSolution(1));
+  if (nDim == 3) SetVolumeOutputValue("SENSITIVITY-Z", iPoint, Node_Struc->GetSolution(2));
+
+}
+
+void CDiscAdjFEAOutput::SetVolumeOutputFields(CConfig *config){
+
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+
+  AddVolumeOutput("SENSITIVITY-X",    "Sensitivity_x", "SOLUTION");
+  AddVolumeOutput("SENSITIVITY-Y",    "Sensitivity_y", "SOLUTION");
+  if (nDim == 3) AddVolumeOutput("SENSITIVITY-Z", "Sensitivity_z", "SOLUTION");
+
+}

From 9582f7446a86e88da688452441c1c90bf6364029 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Fri, 15 Feb 2019 08:44:45 +0100
Subject: [PATCH 124/539] Solution_BGS_k initialized only on the constructor of
 the parent variable class.

---
 SU2_CFD/include/variable_structure.hpp     | 1 -
 SU2_CFD/src/variable_direct_elasticity.cpp | 5 -----
 SU2_CFD/src/variable_direct_mean.cpp       | 8 --------
 SU2_CFD/src/variable_direct_mean_inc.cpp   | 8 --------
 SU2_CFD/src/variable_structure.cpp         | 4 ++++
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/SU2_CFD/include/variable_structure.hpp b/SU2_CFD/include/variable_structure.hpp
index bf9787978750..2d8a8e7f0ac1 100644
--- a/SU2_CFD/include/variable_structure.hpp
+++ b/SU2_CFD/include/variable_structure.hpp
@@ -2513,7 +2513,6 @@ class CWaveVariable : public CVariable {
 class CHeatFVMVariable : public CVariable {
 protected:
   su2double *Solution_Direct;  /*!< \brief Direct solution container for use in the adjoint Heat solver. */
-  su2double* Solution_BGS_k;    /*!< \brief Old solution container for BGS iterations ---*/
   
 public:
   
diff --git a/SU2_CFD/src/variable_direct_elasticity.cpp b/SU2_CFD/src/variable_direct_elasticity.cpp
index dbe1334b90a6..bb47e5e31977 100644
--- a/SU2_CFD/src/variable_direct_elasticity.cpp
+++ b/SU2_CFD/src/variable_direct_elasticity.cpp
@@ -68,8 +68,6 @@ CFEAVariable::CFEAVariable(void) : CVariable() {
   
   Reference_Geometry    = NULL;   // Reference geometry for optimization purposes
   
-  Solution_BGS_k    = NULL;       // Old solution stored to check convergence in the BGS loop
-
 }
 
 CFEAVariable::CFEAVariable(su2double *val_fea, unsigned short val_nDim, unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
@@ -123,17 +121,14 @@ CFEAVariable::CFEAVariable(su2double *val_fea, unsigned short val_nDim, unsigned
   Solution_Pred_Old     =  NULL;
   Solution_Pred_Old   = NULL;
   FlowTraction_n = NULL;
-  Solution_BGS_k = NULL;
   if (fsi_analysis) {
     FlowTraction       =  new su2double [nVar];
     Solution_Pred       =  new su2double [nVar];
     Solution_Pred_Old     =  new su2double [nVar];
-    Solution_BGS_k       = new su2double [nVar];
     for (iVar = 0; iVar < nVar; iVar++) {
       FlowTraction[iVar] = 0.0;
       Solution_Pred[iVar] = val_fea[iVar];
       Solution_Pred_Old[iVar] = val_fea[iVar];
-      Solution_BGS_k[iVar] = 0.0;
     }
   }
   
diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp
index 585caf76e0b3..8ad4393bc60d 100644
--- a/SU2_CFD/src/variable_direct_mean.cpp
+++ b/SU2_CFD/src/variable_direct_mean.cpp
@@ -387,14 +387,6 @@ CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim,
     for (iDim = 0; iDim < nDim; iDim++)
       Gradient_Secondary[iVar][iDim] = 0.0;
   }
-  
-  Solution_BGS_k = NULL;
-  if (fsi || multizone){
-      Solution_BGS_k  = new su2double [nVar];
-      for (iVar = 0; iVar < nVar; iVar++) {
-        Solution_BGS_k[iVar] = val_solution[iVar];
-      }
-  }
 
 }
 
diff --git a/SU2_CFD/src/variable_direct_mean_inc.cpp b/SU2_CFD/src/variable_direct_mean_inc.cpp
index 97feb0357a35..0d9a280c9f93 100644
--- a/SU2_CFD/src/variable_direct_mean_inc.cpp
+++ b/SU2_CFD/src/variable_direct_mean_inc.cpp
@@ -284,14 +284,6 @@ CIncEulerVariable::CIncEulerVariable(su2double *val_solution, unsigned short val
 
   if (axisymmetric && viscous)
     Grad_AuxVar = new su2double[nDim];
-  
-  Solution_BGS_k = NULL;
-  if (fsi || multizone){
-      Solution_BGS_k  = new su2double [nVar];
-      for (iVar = 0; iVar < nVar; iVar++) {
-        Solution_BGS_k[iVar] = val_solution[iVar];
-      }
-  }
 
 }
 
diff --git a/SU2_CFD/src/variable_structure.cpp b/SU2_CFD/src/variable_structure.cpp
index c7c2dc4f7c83..90253ff52ebf 100644
--- a/SU2_CFD/src/variable_structure.cpp
+++ b/SU2_CFD/src/variable_structure.cpp
@@ -143,6 +143,10 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
   
 	if (config->GetFSI_Simulation() && config->GetDiscrete_Adjoint()){
 	  Solution_Adj_Old = new su2double [nVar];
+    Solution_BGS_k = new su2double [nVar];
+    for (iVar = 0; iVar < nVar; iVar++) {
+      Solution_BGS_k[iVar] = 0.0;
+    }
 	}
   
   if (config->GetMultizone_Problem()) {

From 0ddd560c708f7adede794c337dffc3620c2b898b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 20 Mar 2019 17:14:40 +0100
Subject: [PATCH 125/539] Fixing merge conflicts

---
 SU2_CFD/src/iteration_structure.cpp |    30 +-
 SU2_CFD/src/output_structure.cpp    | 10696 --------------------------
 SU2_DOT/src/SU2_DOT.cpp             |     1 -
 3 files changed, 26 insertions(+), 10701 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 4093e6209ffc..7ef3ffee181e 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1206,10 +1206,32 @@ void CFEMFluidIteration::Update(COutput *output,
                                 CSurfaceMovement **surface_movement,
                                 CVolumetricMovement ***grid_movement,
                                 CFreeFormDefBox*** FFDBox,
-                                unsigned short val_iZone)      { }
-//void CFEMFluidIteration::Monitor()     { }
-void CFEMFluidIteration::Output()      { }
-void CFEMFluidIteration::Postprocess() { }
+                                unsigned short val_iZone,
+                                unsigned short val_iInst)      { }
+
+bool CFEMFluidIteration::Monitor(COutput *output,
+             CIntegration ****integration_container,
+             CGeometry ****geometry_container,
+             CSolver *****solver_container,
+             CNumerics ******numerics_container,
+             CConfig **config_container,
+             CSurfaceMovement **surface_movement,
+             CVolumetricMovement ***grid_movement,
+             CFreeFormDefBox*** FFDBox,
+             unsigned short val_iZone,
+             unsigned short val_iInst) {return false;}
+
+void CFEMFluidIteration::Postprocess(COutput *output,
+                 CIntegration ****integration_container,
+                 CGeometry ****geometry_container,
+                 CSolver *****solver_container,
+                 CNumerics ******numerics_container,
+                 CConfig **config_container,
+                 CSurfaceMovement **surface_movement,
+                 CVolumetricMovement ***grid_movement,
+                 CFreeFormDefBox*** FFDBox,
+                 unsigned short val_iZone,
+                 unsigned short val_iInst){}
 
 CHeatIteration::CHeatIteration(CConfig *config) : CIteration(config) { }
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index cbd8c93e757b..2f9ac80f92aa 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -2923,10704 +2923,8 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             break;
             
 
-<<<<<<< HEAD
           default:
             break;
-=======
-void COutput::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
-  
-  /*--- Local variables needed on all processors ---*/
-  unsigned short iVar;
-  unsigned long iPoint = 0, jPoint = 0;
-  
-  nVar_Total = config->fields.size() - 1;
-  
-  /*--- Merge the solution either in serial or parallel. ---*/
-  
-#ifndef HAVE_MPI
-  
-  /*--- In serial, the single process has access to all solution data,
-   so it is simple to retrieve and store inside Solution_Data. ---*/
-  
-  unsigned short iMarker;
-  unsigned long iVertex, nTotalPoints = 0;
-  int SendRecv;
-  
-  /*--- First, create a structure to locate any periodic halo nodes ---*/
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
-            (SendRecv < 0)) {
-          Local_Halo[iPoint] = false;
-        }
-      }
-      
-    }
-  }
-  
-  /*--- Total number of points in the mesh (this might include periodic points). ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (!Local_Halo[iPoint]) nTotalPoints++;
-  
-  nGlobal_Poin = nTotalPoints;
-  Data = new su2double*[nVar_Total];
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    Data[iVar] = new su2double[nGlobal_Poin];
-  }
-  
-  /*--- Loop over all points in the mesh, but only write data
-   for nodes in the domain (ignore periodic halo nodes). ---*/
-  
-  jPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    if (!Local_Halo[iPoint]) {
-      
-      /*--- Solution (first, and second system of equations) ---*/
-      
-      unsigned short jVar = 0;
-      for (iVar = 0; iVar < nVar_Total; iVar++) {
-        Data[jVar][jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        jVar++;
-      }
-    }
-    
-    /*--- Increment jPoint as the counter. We need this because iPoint
-     may include halo nodes that we skip over during this loop. ---*/
-    
-    jPoint++;
-    
-  }
-  
-#else
-  
-  /*--- MPI preprocessing ---*/
-  
-  int nProcessor = size, iProcessor;
-  
-  /*--- Local variables needed for merging with MPI ---*/
-  
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-    
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-    
-  }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[nProcessor];
-  
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
-  
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_Var = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
-    
-  }
-  
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    
-    /*--- Loop over this partition to collect the current variable ---*/
-    jPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      
-      /*--- Check for halos and write only if requested ---*/
-      if (!Local_Halo[iPoint] || Wrt_Halo) {
-        
-        /*--- Get this variable into the temporary send buffer. ---*/
-        Buffer_Send_Var[jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        
-        /*--- Only send/recv the volumes & global indices during the first loop ---*/
-        if (iVar == 0) {
-          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-        }
-        jPoint++;
-      }
-    }
-    
-    /*--- Gather the data on the master node. ---*/
-    
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (iVar == 0) {
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-    }
-    
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-          
-          /*--- Get global index, then loop over each variable and store ---*/
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-          jPoint++;
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
-  
-#endif
-  
-  delete [] Local_Halo;
-  
-}
-
-void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  /*--- Local variables ---*/
-  
-  unsigned short nZone = geometry->GetnZone();
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar, iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool grid_movement = config->GetGrid_Movement();
-  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  ofstream restart_file;
-  ofstream meta_file;
-  string filename, meta_filename;
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  
-  /*--- Retrieve filename from config ---*/
-  
-  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
-  
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
-  
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  }
-  
-  /*--- Open the restart file and write the solution. ---*/
-  
-  restart_file.open(filename.c_str(), ios::out);
-  restart_file.precision(15);
-  
-  /*--- Write the header line based on the particular solver ----*/
-  
-  restart_file << "\"PointID\"";
-  
-  /*--- Mesh coordinates are always written to the restart first ---*/
-  
-  if (nDim == 2) {
-    restart_file << "\t\"x\"\t\"y\"";
-  } else {
-    restart_file << "\t\"x\"\t\"y\"\t\"z\"";
-  }
-  
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-  if (( Kind_Solver == FEM_ELASTICITY ) || ( Kind_Solver == DISC_ADJ_FEM))
-      restart_file << "\t\"Displacement_" << iVar+1<<"\"";
-    else
-      restart_file << "\t\"Conservative_" << iVar+1<<"\"";
-  }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
-      }
-    }
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Residual_" << iVar+1<<"\"";
-      }
-    }
-    
-    /*--- Mesh velocities for dynamic mesh cases ---*/
-    
-    if (grid_movement && !fem) {
-      if (nDim == 2) {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
-      } else {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
-      }
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
-      } else
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-      } else {
-        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
-        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
-      }
-    }
-    
-    if (Kind_Solver == RANS) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Eddy_Viscosity\"";
-      } else
-        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
-    }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)))  {
-        restart_file << "\t\"Sharp_Edge_Dist\"";
-      }
-    }
-    
-    if ((Kind_Solver == ADJ_EULER              ) ||
-        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        (Kind_Solver == ADJ_RANS               )   ) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
-    }
-    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_RANS               )) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
-      if (geometry->GetnDim() == 3) {
-        restart_file << "\t\"Sensitivity_z\"";
-      }
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      if (!dynamic_fem) {
-        if (geometry->GetnDim() == 2)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        if (geometry->GetnDim() == 3)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-      }
-      else if (dynamic_fem) {
-        if (geometry->GetnDim() == 2) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        }
-        if (geometry->GetnDim() == 3) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      if (geometry->GetnDim() == 2)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
-      if (geometry->GetnDim() == 3)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
-    }
-
-    
-    if (config->GetExtraOutput()) {
-      string *headings = NULL;
-      //if (Kind_Solver == RANS) {
-      headings = solver[TURB_SOL]->OutputHeadingNames;
-      //}
-      
-      for (iVar = 0; iVar < nVar_Extra; iVar++) {
-        if (headings == NULL) {
-          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
-        } else {
-          restart_file << "\t\""<< headings[iVar] <<"\"";
-        }
-      }
-    }
-  }
-  
-  restart_file << "\n";
-  
-  /*--- Write the restart file ---*/
-  
-  /*--- Determine whether or not the FEM solver is used, which decides the
-   type of geometry classes that are instantiated. ---*/
-  bool fem_solver = ((config->GetKind_Solver() == FEM_EULER)         ||
-                (config->GetKind_Solver() == FEM_NAVIER_STOKES) ||
-                (config->GetKind_Solver() == FEM_RANS)          ||
-                (config->GetKind_Solver() == FEM_LES));
-  
-  unsigned long nPointTotal = 0;
-  if ( fem_solver ) {
-    nPointTotal = solver[FLOW_SOL]->GetnDOFsGlobal();
-  } else {
-    nPointTotal = geometry->GetGlobal_nPointDomain();
-  }
-  
-  for (iPoint = 0; iPoint < nPointTotal; iPoint++) {
-    
-    /*--- Index of the point ---*/
-    restart_file << iPoint << "\t";
-    
-    /*--- Write the grid coordinates first ---*/
-    for (iDim = 0; iDim < nDim; iDim++) {
-      restart_file << scientific << Coords[iDim][iPoint] << "\t";
-    }
-    
-    /*--- Loop over the variables and write the values to file ---*/
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      restart_file << scientific << Data[iVar][iPoint] << "\t";
-    }
-    restart_file << "\n";
-  }
-
-  /*--- Write the general header and flow conditions ----*/
-
-  if (dual_time)
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-  else
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-  restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-  restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-  restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-  restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-  restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-  restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-  restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-  if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-
-  /*--- Close the data portion of the restart file. ---*/
-
-  restart_file.close();
-
-}
-
-void COutput::DeallocateCoordinates(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  
-  /*--- The master node alone owns all data found in this routine. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for coordinate data ---*/
-    
-    for (iDim = 0; iDim < nDim; iDim++) {
-      delete [] Coords[iDim];
-    }
-    delete [] Coords;
-  }
-}
-
-void COutput::DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol) {
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for connectivity data ---*/
-    if (surf_sol) {
-      if (nGlobal_Line > 0      && Conn_Line      != NULL) delete [] Conn_Line;
-      if (nGlobal_BoundTria > 0 && Conn_BoundTria != NULL) delete [] Conn_BoundTria;
-      if (nGlobal_BoundQuad > 0 && Conn_BoundQuad != NULL) delete [] Conn_BoundQuad;
-    }
-    else {
-      if (nGlobal_Tria > 0 && Conn_Tria != NULL) delete [] Conn_Tria;
-      if (nGlobal_Quad > 0 && Conn_Quad != NULL) delete [] Conn_Quad;
-      if (nGlobal_Tetr > 0 && Conn_Tetr != NULL) delete [] Conn_Tetr;
-      if (nGlobal_Hexa > 0 && Conn_Hexa != NULL) delete [] Conn_Hexa;
-      if (nGlobal_Pris > 0 && Conn_Pris != NULL) delete [] Conn_Pris;
-      if (nGlobal_Pyra > 0 && Conn_Pyra != NULL) delete [] Conn_Pyra;
-      
-    }
-    
-  }
-}
-
-void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for solution data ---*/
-    for (unsigned short iVar = 0; iVar < nVar_Total; iVar++) {
-      delete [] Data[iVar];
-    }
-    delete [] Data;
-    
-  }
-}
-
-void COutput::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *config, unsigned short val_iZone, unsigned short val_iInst) {
-  char cstr[200], buffer[50], turb_resid[1000], adj_turb_resid[1000];
-  unsigned short iMarker_Monitoring;
-  string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-  
-  bool rotating_frame = config->GetRotating_Frame();
-  bool aeroelastic = config->GetAeroelastic_Simulation();
-  bool equiv_area = config->GetEquivArea();
-  bool buffet = (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR);
-  bool engine        = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
-  bool actuator_disk = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == ADJ_RANS) ||
-                    (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool cont_adj = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool frozen_visc = (cont_adj && config->GetFrozen_Visc_Cont()) ||( disc_adj && config->GetFrozen_Visc_Disc());
-  bool inv_design = (config->GetInvDesign_Cp() || config->GetInvDesign_HeatFlux());
-  
-  bool output_surface = (config->GetnMarker_Analyze() != 0);
-  bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
-  bool turbo = config->GetBoolTurbomachinery();
-  unsigned short direct_diff = config->GetDirectDiff();
-
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool incload = config->GetIncrementalLoad();
-
-  bool thermal = false; /* Flag for whether to print heat flux values */
-  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver()  == NAVIER_STOKES) {
-    thermal = true;
-  }
-  
-  /*--- Write file name with extension ---*/
-  string filename = config->GetConv_FileName();
-  if(config->GetnZone() > 1){
-    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
-  }
-  if(config->GetnTimeInstances() > 1){
-    filename = config->GetMultiInstance_HistoryFileName(filename, val_iInst);
-  }
-  strcpy (cstr, filename.data());
-  
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetUnst_RestartIter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-    strcat(cstr, buffer);
-  }
-  
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-  else if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".csv");
-  strcat(cstr, buffer);
-  
-  ConvHist_file->open(cstr, ios::out);
-  ConvHist_file->precision(15);
-  
-  /*--- Begin of the header ---*/
-  
-  char begin[]= "\"Iteration\"";
-  
-  /*--- Header for the coefficients ---*/
-  
-  char flow_coeff[]= ",\"CL\",\"CD\",\"CSF\",\"CMx\",\"CMy\",\"CMz\",\"CFx\",\"CFy\",\"CFz\",\"CL/CD\",\"AoA\",\"Custom_ObjFunc\"";
-  char heat_coeff[]= ",\"HeatFlux_Total\",\"HeatFlux_Maximum\",\"Temperature_Total\"";
-  char equivalent_area_coeff[]= ",\"CEquivArea\",\"CNearFieldOF\"";
-  char buffet_coeff[]= ",\"Buffet_Metric\"";
-  char engine_coeff[]= ",\"NetThrust\",\"Power\",\"AeroCDrag\",\"SolidCDrag\",\"Radial_Distortion\",\"Circumferential_Distortion\"";
-  char rotating_frame_coeff[]= ",\"CMerit\",\"CT\",\"CQ\"";
-  char fem_coeff[]= ",\"VM_Stress\",\"Force_Coeff\"";
-  char fem_incload[]= ",\"IncLoad\"";
-  char adj_coeff[]= ",\"Sens_Geo\",\"Sens_Mach\",\"Sens_AoA\",\"Sens_Press\",\"Sens_Temp\",\"Sens_AoS\"";
-  char adj_inc_coeff[]=",\"Sens_Geo\",\"Sens_Vin\",\"Sens_Pout\",\"Sens_Temp\"";
-  char adj_turbo_coeff[]=",\"Sens_Geo\",\"Sens_PressOut\",\"Sens_TotTempIn\"";
-  char surface_outputs[]= ",\"Avg_MassFlow\",\"Avg_Mach\",\"Avg_Temp\",\"Avg_Press\",\"Avg_Density\",\"Avg_Enthalpy\",\"Avg_NormalVel\",\"Uniformity\",\"Secondary_Strength\",\"Momentum_Distortion\",\"Secondary_Over_Uniformity\",\"Avg_TotalTemp\",\"Avg_TotalPress\",\"Pressure_Drop\"";
-  char Cp_inverse_design[]= ",\"Cp_Diff\"";
-  char Heat_inverse_design[]= ",\"HeatFlux_Diff\"";
-  char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-  char d_thermal_coeff[] = ",\"D(HeatFlux_Total)\",\"D(HeatFlux_Maximum)\"";
-  char d_engine[] = ",\"D(NetThrust)\",\"D(Power)\",\"D(AeroCDrag)\",\"D(SolidCDrag)\",\"D(Radial_Distortion)\",\"D(Circumferential_Distortion)\"";
-  char d_turbo_coeff[] = ",\"D(TotalPressureLoss_0)\",\"D(FlowAngleOut_0)\",\"D(TotalEfficency)\",\"D(TotalStaticEfficiency)\", \"D(EntropyGen)\"";
-  char d_surface_outputs[]= ",\"D(Uniformity)\",\"D(Secondary_Strength)\",\"D(Momentum_Distortion)\",\"D(Secondary_Over_Uniformity)\",\"D(Pressure_Drop)\"";
-
-  /*--- Find the markers being monitored and create a header for them ---*/
-  
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
-    monitoring_coeff += ",\"CL_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CD_"  + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CSF_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CL/CD_" + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CFz_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMx_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMy_"    + Monitoring_Tag + "\"";
-    monitoring_coeff += ",\"CMz_"    + Monitoring_Tag + "\"";
-    if(buffet) monitoring_coeff += ",\"Buffet_Metric_"    + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"plunge_" + Monitoring_Tag + "\"";
-    aeroelastic_coeff += ",\"pitch_"  + Monitoring_Tag + "\"";
-  }
-
-  if (turbo){
-    for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_TurboPerformance(); iMarker_Monitoring++) {
-
-      stringstream tag;
-      tag << iMarker_Monitoring + 1;
-
-      turbo_coeff += ",\"TotalPressureLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"KineticEnergyLoss_" + tag.str() + "\"";
-      turbo_coeff += ",\"EntropyGen_" + tag.str() + "\"";
-      turbo_coeff += ",\"EulerianWork_" + tag.str() + "\"";
-      turbo_coeff += ",\"PressureRatio_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"FlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"AbsFlowAngleOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MassFlowOut_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachIn_" + tag.str() + "\"";
-      turbo_coeff += ",\"MachOut_" + tag.str() + "\"";
-      // different from zero only in multi-zone computation
-      turbo_coeff += ",\"TotalEfficiency_" + tag.str() + "\"";
-      turbo_coeff += ",\"TotalStaticEfficiency_" + tag.str() + "\"";
-
-    }
-  }
-
-  char combo_obj[] = ",\"ComboObj\"";
-  
-  /*--- Header for the residuals ---*/
-  
-  char flow_resid[]= ",\"Res_Flow[0]\",\"Res_Flow[1]\",\"Res_Flow[2]\",\"Res_Flow[3]\",\"Res_Flow[4]\"";
-  char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP: 
-      SPRINTF (turb_resid, ",\"Res_Turb[0]\"");
-      break;
-    case SST:   	SPRINTF (turb_resid, ",\"Res_Turb[0]\",\"Res_Turb[1]\""); break;
-  }
-  switch (config->GetKind_Turb_Model()) {
-    case SA:case SA_NEG:case SA_E: case SA_COMP: case SA_E_COMP:
-      SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\"");
-      break;
-    case SST:   	SPRINTF (adj_turb_resid, ",\"Res_AdjTurb[0]\",\"Res_AdjTurb[1]\""); break;
-  }
-  char fem_resid[]= ",\"Res_FEM[0]\",\"Res_FEM[1]\",\"Res_FEM[2]\"";
-  char heat_resid[]= ",\"Res_Heat\"";
-  
-  /*--- End of the header ---*/
-  
-  char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
-  char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
-  
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
-    ConvHist_file[0] << "VARIABLES = ";
-  }
-  
-  /*--- Write the header, case depending ---*/
-  
-  switch (config->GetKind_Solver()) {
-      
-    case EULER : case NAVIER_STOKES: case RANS :
-    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS : case FEM_LES:
-      ConvHist_file[0] << begin;
-      if (!turbo) ConvHist_file[0] << flow_coeff;
-      if (buffet) ConvHist_file[0] << buffet_coeff;
-      if (turbo) ConvHist_file[0] << turbo_coeff;
-      if (thermal && !turbo) ConvHist_file[0] << heat_coeff;
-      if (equiv_area) ConvHist_file[0] << equivalent_area_coeff;
-      if (engine || actuator_disk) ConvHist_file[0] << engine_coeff;
-      if (inv_design) {
-        ConvHist_file[0] << Cp_inverse_design;
-        if (thermal && !turbo) ConvHist_file[0] << Heat_inverse_design;
-      }
-      if (rotating_frame && !turbo) ConvHist_file[0] << rotating_frame_coeff;
-
-      ConvHist_file[0] << flow_resid;
-      if (turbulent) ConvHist_file[0] << turb_resid;
-      if (weakly_coupled_heat) ConvHist_file[0] << heat_resid;
-      if (aeroelastic) ConvHist_file[0] << aeroelastic_coeff;
-      if (output_per_surface) ConvHist_file[0] << monitoring_coeff;
-      if (output_surface) ConvHist_file[0] << surface_outputs;
-      if (direct_diff != NO_DERIVATIVE) {
-        if (!turbo) ConvHist_file[0] << d_flow_coeff;
-        else        ConvHist_file[0] << d_turbo_coeff;
-        if (engine || actuator_disk) ConvHist_file[0] << d_engine;
-        if (thermal) ConvHist_file[0] << d_thermal_coeff;
-        if (output_surface) ConvHist_file[0] << d_surface_outputs;
-      }
-      if (output_comboObj) ConvHist_file[0] << combo_obj;
-      ConvHist_file[0] << end;
-      
-      break;
-      
-    case ADJ_EULER      : case ADJ_NAVIER_STOKES      : case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-      if (!turbo) {
-        if (compressible) {
-          ConvHist_file[0] << begin << adj_coeff << adj_flow_resid;
-        }
-        if (incompressible) {
-          ConvHist_file[0] << begin << adj_inc_coeff << adj_flow_resid;
-        }
-      }
-      else ConvHist_file[0] << begin << adj_turbo_coeff << adj_flow_resid;
-      if ((turbulent) && (!frozen_visc)) ConvHist_file[0] << adj_turb_resid;
-      ConvHist_file[0] << end;
-      break;
-      
-    case HEAT_EQUATION_FVM:
-      ConvHist_file[0] << begin << heat_coeff;
-      ConvHist_file[0] << heat_resid << end;
-      break;
-      
-    case FEM_ELASTICITY:
-      ConvHist_file[0] << begin << fem_coeff;
-      if (incload) ConvHist_file[0] << fem_incload;
-      ConvHist_file[0] << fem_resid << endfea;
-      break;
-      
-    case DISC_ADJ_FEM:
-      ConvHist_file[0] << begin << fem_coeff;
-      ConvHist_file[0] << fem_resid << endfea;
-      break;
-
-  }
-
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
-  }
-  
-}
-
-
-void COutput::SetConvHistory_Body(ofstream *ConvHist_file,
-                                  CGeometry ****geometry,
-                                  CSolver *****solver_container,
-                                  CConfig **config,
-                                  CIntegration ****integration,
-                                  bool DualTime_Iteration,
-                                  su2double timeused,
-                                  unsigned short val_iZone,
-                                  unsigned short val_iInst) {
-  
-  bool output_surface       = (config[val_iZone]->GetnMarker_Analyze() != 0);
-  bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
-  bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
-  bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nZone      = config[val_iZone]->GetnZone();
-  unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
-  bool cont_adj             = config[val_iZone]->GetContinuous_Adjoint();
-  bool disc_adj             = config[val_iZone]->GetDiscrete_Adjoint();
-  bool energy               = config[val_iZone]->GetEnergy_Equation();
-  bool incload              = config[val_iZone]->GetIncrementalLoad();
-  bool output_files         = true;
-
-  bool compressible = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-
-  if (!disc_adj && !cont_adj && !DualTime_Iteration) {
-    
-    if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
-      output_files = false;
-    }
-    
-    if (fea || fluid_structure) output_files = false;
-    if (config[val_iZone]->GetMultizone_Problem()) output_files = false;
-
-    /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
-    
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
-        /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
-
-      
-      if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
-      
-      switch (config[val_iZone]->GetKind_Solver()) {
-
-        case EULER: case NAVIER_STOKES: case RANS:
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if (config[val_iZone]->GetnMarker_Analyze() != 0) {
-            SpecialOutput_AnalyzeSurface(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                         geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the surface. ---*/
-
-          if ((config[val_iZone]->GetnMarker_Analyze() != 0) && compressible) {
-            SpecialOutput_Distortion(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                     geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
-          }
-
-          /*--- For specific applications, evaluate and plot the equivalent area. ---*/
-
-          if (config[val_iZone]->GetnMarker_NearFieldBound() != 0) {
-            SpecialOutput_SonicBoom(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                    geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
-          }
-          
-          /*--- For specific applications, evaluate and plot the cp coefficent at different stations. ---*/
-          
-          if (config[val_iZone]->GetPlot_Section_Forces()) {
-            SpecialOutput_SpanLoad(solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL],
-                                   geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], output_files);
-          }
-          
-          break;
-      }
-      
-      /*--- Output a file with the forces breakdown. ---*/
-      
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-        SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
-      }
-      
-      /*--- Compute span-wise values file for turbomachinery. ---*/
-      
-      if (config[val_iZone]->GetBoolTurbomachinery()) {
-        SpecialOutput_Turbo(solver_container, geometry, config, val_iZone, output_files);
-      }
-      
-      /*--- Output a file with the forces breakdown. ---*/
-      
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, val_iZone, output_files);
-      
-      if ((rank == MASTER_NODE) && output_files) cout << "-------------------------------------------------------------------------" << endl << endl;
-      
-    }
-    
-  }
-  
-  /*--- Output using only the master node ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*-- Compute the total objective if a "combo" objective is used ---*/
-    
-    if (output_comboObj) {
-      solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->SetTotal_ComboObj(0.0);
-      switch (config[val_iZone]->GetKind_Solver()) {
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-        solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->Evaluate_ObjFunc(config[val_iZone]);
-        break;
-      }
-    }
-    
-    unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
-      ExtIter_OffSet = 0;
-
-    /*--- WARNING: These buffers have hard-coded lengths. Note that you
-     may have to adjust them to be larger if adding more entries. ---*/
-    
-    char begin[1000], direct_coeff[1000], heat_coeff[1000], equivalent_area_coeff[1000], engine_coeff[1000], rotating_frame_coeff[1000], Cp_inverse_design[1000], Heat_inverse_design[1000], surface_coeff[1000], aeroelastic_coeff[1000], monitoring_coeff[10000], buffet_coeff[1000],
-    adjoint_coeff[1000], flow_resid[1000], adj_flow_resid[1000], turb_resid[1000], trans_resid[1000],
-    adj_turb_resid[1000],
-    begin_fem[1000], fem_coeff[1000], heat_resid[1000], combo_obj[1000],
-    fem_resid[1000], end[1000], end_fem[1000], surface_outputs[1000], d_surface_outputs[1000], d_direct_coeff[1000], turbo_coeff[10000];
-
-
-    su2double dummy = 0.0, *Coord;
-    unsigned short iVar, iMarker_Monitoring;
-    
-    unsigned long LinSolvIter = 0, iPointMaxResid;
-    su2double timeiter = timeused/su2double(iExtIter+1);
-    
-    unsigned short nDim = geometry[val_iZone][val_iInst][FinestMesh]->GetnDim();
-
-    
-    bool rotating_frame = config[val_iZone]->GetRotating_Frame();
-    bool aeroelastic = config[val_iZone]->GetAeroelastic_Simulation();
-    bool equiv_area = config[val_iZone]->GetEquivArea();
-    bool engine        = ((config[val_iZone]->GetnMarker_EngineInflow() != 0) || (config[val_iZone]->GetnMarker_EngineExhaust() != 0));
-    bool actuator_disk = ((config[val_iZone]->GetnMarker_ActDiskInlet() != 0) || (config[val_iZone]->GetnMarker_ActDiskOutlet() != 0));
-    bool inv_design = (config[val_iZone]->GetInvDesign_Cp() || config[val_iZone]->GetInvDesign_HeatFlux());
-    bool transition = (config[val_iZone]->GetKind_Trans_Model() == LM);
-    bool thermal = (config[val_iZone]->GetKind_Solver() == RANS || config[val_iZone]->GetKind_Solver()  == NAVIER_STOKES);
-    bool turbulent = ((config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS) ||
-                      (config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS));
-    bool adjoint =  cont_adj || disc_adj;
-    bool frozen_visc = (cont_adj && config[val_iZone]->GetFrozen_Visc_Cont()) ||( disc_adj && config[val_iZone]->GetFrozen_Visc_Disc());
-    bool heat =  ((config[val_iZone]->GetKind_Solver() == HEAT_EQUATION_FVM) || (config[val_iZone]->GetWeakly_Coupled_Heat()));
-    bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-    bool flow = (config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-    (config[val_iZone]->GetKind_Solver() == RANS) || (config[val_iZone]->GetKind_Solver() == FEM_EULER) || (config[val_iZone]->GetKind_Solver() == FEM_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == FEM_RANS) || (config[val_iZone]->GetKind_Solver() == FEM_LES) || (config[val_iZone]->GetKind_Solver() == ADJ_EULER) ||
-    (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES) || (config[val_iZone]->GetKind_Solver() == ADJ_RANS);
-    bool buffet = (config[val_iZone]->GetBuffet_Monitoring() || config[val_iZone]->GetKind_ObjFunc() == BUFFET_SENSOR);
-    
-    bool fem = ((config[val_iZone]->GetKind_Solver() == FEM_ELASTICITY) ||          // FEM structural solver.
-                (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM));
-    bool linear_analysis = (config[val_iZone]->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool nonlinear_analysis = (config[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-    bool fsi = (config[val_iZone]->GetFSI_Simulation());          // FEM structural solver.
-    bool discadj_fem = (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM);
-    
-    bool turbo = config[val_iZone]->GetBoolTurbomachinery();
-
-    unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
-
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();    
-
-    unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
-
-    long ExtraHeatOutputZone = config[val_iZone]->GetExtraHeatOutputZone() - 1;
-    bool extra_heat_output = false;
-    su2double Extra_Total_Heat = 0.0;
-    //su2double Extra_Total_Temperature = 0.0;
-    su2double Extra_Heat_Residual = 0.0;
-
-    if (ExtraHeatOutputZone > -1) {
-      if (ExtraHeatOutputZone > nZone) {
-        SU2_MPI::Error("Error in output routine: Extra output zone number exceeds total number of zones.", CURRENT_FUNCTION);
-      }
-      else if ((config[ExtraHeatOutputZone]->GetKind_Solver() != HEAT_EQUATION_FVM)) {
-        SU2_MPI::Error("Error in output routine: No heat solver in extra output zone.", CURRENT_FUNCTION);
-      }
-      else {
-        extra_heat_output = true;
-      }
-    }
-
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-    
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CEquivArea = 0.0, Total_CNearFieldOF = 0.0, Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Total_CMerit = 0.0,
-    Total_CT = 0.0, Total_CQ = 0.0,
-    Total_Heat = 0.0, Total_MaxHeat = 0.0, Total_Temperature = 0.0, Total_Custom_ObjFunc = 0.0,
-    Total_ComboObj = 0.0, Total_NetThrust = 0.0, Total_Power = 0.0, Total_AeroCD = 0.0, Total_SolidCD = 0.0, Total_IDR = 0.0, Total_IDC = 0.0,
-    Total_AoA = 0.0, Total_Buffet_Metric = 0.0;
-    su2double Surface_MassFlow = 0.0, Surface_Mach = 0.0, Surface_Temperature = 0.0, Surface_Pressure = 0.0, Surface_Density = 0.0, Surface_Enthalpy = 0.0, Surface_NormalVelocity = 0.0, Surface_TotalTemperature = 0.0, Surface_TotalPressure = 0.0, Surface_Uniformity = 0.0, Surface_SecondaryStrength = 0.0,Surface_MomentumDistortion = 0.0, Surface_SecondOverUniform = 0.0, Surface_PressureDrop = 0.0;
-
-    su2double Total_ForceCoeff = 0.0, Total_VMStress = 0.0, Total_IncLoad = 0.0;
-    su2double Total_SensE = 0.0, Total_SensNu = 0.0;
-
-    unsigned short iSpan;
-
-    /*--- Initialize variables to store information from all domains (adjoint solution) ---*/
-    su2double Total_Sens_Geo = 0.0, Total_Sens_Mach = 0.0, Total_Sens_AoA = 0.0;
-    su2double Total_Sens_Press = 0.0, Total_Sens_Temp = 0.0;
-
-    su2double Total_Sens_BPressure = 0.0;
-    su2double Total_Sens_ModVel = 0.0;
-
-    /*--- Initialize variables to store information from all domains (direct differentiation) ---*/
-    su2double D_Total_CL = 0.0, D_Total_CD = 0.0, D_Total_CSF = 0.0, D_Total_CMx = 0.0, D_Total_CMy = 0.0, D_Total_CMz = 0.0, D_Total_CEff = 0.0, D_Total_CFx = 0.0,
-        D_Total_CFy = 0.0, D_Total_CFz = 0.0, D_Total_NetThrust = 0.0, D_Total_Power = 0.0, D_Total_AeroCD = 0.0, D_Total_SolidCD = 0.0, D_Total_IDR = 0.0, D_Total_IDC = 0.0, D_Total_Custom_ObjFunc = 0.0, D_Total_Heat = 0.0, D_Total_MaxHeat = 0.0,
-        D_TotalPressure_Loss = 0.0, D_FlowAngle_Out = 0.0, D_TotalStaticEfficiency = 0.0,
-        D_TotalTotalEfficiency = 0.0, D_EntropyGen = 0.0, 
-        D_Surface_Uniformity = 0.0, D_Surface_SecondaryStrength = 0.0, D_Surface_MomentumDistortion = 0.0, D_Surface_SecondOverUniform = 0.0, D_Surface_PressureDrop = 0.0;
-    
-    /*--- Residual arrays ---*/
-    su2double *residual_flow         = NULL,
-    *residual_turbulent    = NULL,
-    *residual_transition   = NULL;
-    su2double *residual_adjflow      = NULL,
-    *residual_adjturbulent = NULL,
-    *residual_adjheat = NULL;
-    su2double *residual_fea          = NULL;
-    su2double *residual_fem          = NULL;
-    su2double *residual_heat         = NULL;
-    
-    /*--- Coefficients Monitored arrays ---*/
-    su2double *aeroelastic_plunge = NULL,
-    *aeroelastic_pitch     = NULL,
-    *Surface_CL            = NULL,
-    *Surface_CD            = NULL,
-    *Surface_CSF           = NULL,
-    *Surface_CEff          = NULL,
-    *Surface_CFx           = NULL,
-    *Surface_CFy           = NULL,
-    *Surface_CFz           = NULL,
-    *Surface_CMx           = NULL,
-    *Surface_CMy           = NULL,
-    *Surface_CMz           = NULL,
-    *Surface_Buffet_Metric = NULL;
-    
-    /*--- Initialize number of variables ---*/
-    unsigned short nVar_Flow = 0, nVar_Turb = 0,
-    nVar_Trans = 0, nVar_Heat = 0,
-    nVar_AdjFlow = 0, nVar_AdjTurb = 0, nVar_AdjHeat = 0,
-    nVar_FEM = 0;
-    
-    /*--- Direct problem variables ---*/
-    if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_Turb = 1; break;
-        case SST:    nVar_Turb = 2; break;
-      }
-    }
-    if (transition) nVar_Trans = 2;
-    if (heat) nVar_Heat = 1;
-
-    if (fem) {
-      if (linear_analysis) nVar_FEM = nDim;
-      if (nonlinear_analysis) nVar_FEM = 3;
-
-      if (config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) nVar_FEM = nDim;
-
-    }
-    
-    /*--- Adjoint problem variables ---*/
-    if (compressible) nVar_AdjFlow = nDim+2; else nVar_AdjFlow = nDim+2;
-    if (turbulent) {
-      switch (config[val_iZone]->GetKind_Turb_Model()) {
-        case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP: nVar_AdjTurb = 1; break;
-        case SST:    nVar_AdjTurb = 2; break;
-      }
-    }
-    if (weakly_coupled_heat) nVar_AdjHeat = 1;
-    
-    /*--- Allocate memory for the residual ---*/
-    residual_flow       = new su2double[nVar_Flow];
-    residual_turbulent  = new su2double[nVar_Turb];
-    residual_transition = new su2double[nVar_Trans];
-    residual_heat       = new su2double[nVar_Heat];
-    residual_fem        = new su2double[nVar_FEM];
-    
-    residual_adjflow      = new su2double[nVar_AdjFlow];
-    residual_adjturbulent = new su2double[nVar_AdjTurb];
-    residual_adjheat      = new su2double[nVar_AdjHeat];
-    
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    aeroelastic_plunge = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    aeroelastic_pitch  = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    if(buffet) Surface_Buffet_Metric = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    /*--- Write information from nodes ---*/
-    
-    switch (config[val_iZone]->GetKind_Solver()) {
-        
-      case EULER:                   case NAVIER_STOKES:                   case RANS:
-      case FEM_EULER:               case FEM_NAVIER_STOKES:               case FEM_RANS:      case FEM_LES:
-      case ADJ_EULER:               case ADJ_NAVIER_STOKES:               case ADJ_RANS:
-      case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:          case DISC_ADJ_RANS:
-        
-        /*--- Flow solution coefficients ---*/
-        
-        Total_CL             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CL();
-        Total_CD             = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CD();
-        Total_CSF            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-        Total_CEff           = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-        Total_CMx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-        Total_CMy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-        Total_CMz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-        Total_CFx            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-        Total_CFy            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-        Total_CFz            = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-        Total_ComboObj       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_ComboObj();
-        Total_AoA            = config[val_iZone]->GetAoA() - config[val_iZone]->GetAoA_Offset();
-        Total_Custom_ObjFunc = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Custom_ObjFunc();
-
-        if (thermal) {
-          Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFlux();
-          Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_MaxHeatFlux();
-          Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AvgTemperature();
-
-          if(weakly_coupled_heat) {
-            Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-            Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-            Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-          }
-        }
-            
-        if(buffet){
-          Total_Buffet_Metric = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Buffet_Metric();
-        }
-
-        if (direct_diff != NO_DERIVATIVE) {
-          D_Total_CL             = SU2_TYPE::GetDerivative(Total_CL);
-          D_Total_CD             = SU2_TYPE::GetDerivative(Total_CD);
-          D_Total_CSF            = SU2_TYPE::GetDerivative(Total_CSF);
-          D_Total_CEff           = SU2_TYPE::GetDerivative(Total_CEff);
-          D_Total_CMx            = SU2_TYPE::GetDerivative(Total_CMx);
-          D_Total_CMy            = SU2_TYPE::GetDerivative(Total_CMy);
-          D_Total_CMz            = SU2_TYPE::GetDerivative(Total_CMz);
-          D_Total_CFx            = SU2_TYPE::GetDerivative(Total_CFx);
-          D_Total_CFy            = SU2_TYPE::GetDerivative(Total_CFy);
-          D_Total_CFz            = SU2_TYPE::GetDerivative(Total_CFz);
-          D_Total_Custom_ObjFunc = SU2_TYPE::GetDerivative(Total_Custom_ObjFunc);
-
-          if (thermal) {
-            D_Total_Heat    = SU2_TYPE::GetDerivative(Total_Heat);
-            D_Total_MaxHeat = SU2_TYPE::GetDerivative(Total_MaxHeat);
-            //Davg Temp
-          }
-
-          if (engine || actuator_disk) {
-            D_Total_NetThrust = SU2_TYPE::GetDerivative(Total_NetThrust);
-            D_Total_Power     = SU2_TYPE::GetDerivative(Total_Power);
-            D_Total_AeroCD    = SU2_TYPE::GetDerivative(Total_AeroCD);
-            D_Total_SolidCD   = SU2_TYPE::GetDerivative(Total_SolidCD);
-            D_Total_IDR       = SU2_TYPE::GetDerivative(Total_IDR);
-            D_Total_IDC       = SU2_TYPE::GetDerivative(Total_IDC);
-          }
-          
-        }
-        
-        if (equiv_area) {
-          Total_CEquivArea    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CEquivArea();
-          Total_CNearFieldOF  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-          
-          Total_CEquivArea    = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CEquivArea;
-          Total_CNearFieldOF  = config[val_iZone]->GetWeightCd()*Total_CD + (1.0-config[val_iZone]->GetWeightCd())*Total_CNearFieldOF;
-        }
-        
-        if (engine || actuator_disk) {
-          Total_NetThrust = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_NetThrust();
-          Total_Power     = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_Power();
-          Total_AeroCD    = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_AeroCD();
-          Total_SolidCD   = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_SolidCD();
-          Total_IDR       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDR();
-          Total_IDC       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_IDC();
-        }
-        
-        if (rotating_frame) {
-          Total_CT      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CT();
-          Total_CQ      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CQ();
-          Total_CMerit  = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CMerit();
-        }
-        
-        if (aeroelastic) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            aeroelastic_plunge[iMarker_Monitoring] = config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring);
-            aeroelastic_pitch[iMarker_Monitoring]  = config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring);
-          }
-        }
-        
-        if (output_per_surface) {
-          /*--- Look over the markers being monitored and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-            Surface_CL[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CL(iMarker_Monitoring);
-            Surface_CD[iMarker_Monitoring]      = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CD(iMarker_Monitoring);
-            Surface_CSF[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CSF(iMarker_Monitoring);
-            Surface_CEff[iMarker_Monitoring]       = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CEff(iMarker_Monitoring);
-            Surface_CFx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFx(iMarker_Monitoring);
-            Surface_CFy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFy(iMarker_Monitoring);
-            Surface_CFz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CFz(iMarker_Monitoring);
-            Surface_CMx[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMx(iMarker_Monitoring);
-            Surface_CMy[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMy(iMarker_Monitoring);
-            Surface_CMz[iMarker_Monitoring]        = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_CMz(iMarker_Monitoring);
-              
-            if(buffet) Surface_Buffet_Metric[iMarker_Monitoring] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetSurface_Buffet_Metric(iMarker_Monitoring);
-          }
-        }
-        
-        if (turbo) {
-          /*--- Loop over the nMarker of turboperformance and get the desired values ---*/
-          for (iMarker_Monitoring = 0; iMarker_Monitoring < nTurboPerf; iMarker_Monitoring++) {
-            for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-              if ((iMarker_Monitoring == 0) && (direct_diff != NO_DERIVATIVE)){
-                D_TotalPressure_Loss = SU2_TYPE::GetDerivative(TotalPressureLoss[iMarker_Monitoring][iSpan]);
-                D_FlowAngle_Out      = 180.0/PI_NUMBER*SU2_TYPE::GetDerivative(FlowAngleOut[iMarker_Monitoring][iSpan]);
-              }
-            }
-          }
-          if (direct_diff != NO_DERIVATIVE){
-            D_TotalStaticEfficiency = SU2_TYPE::GetDerivative(TotalStaticEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_TotalTotalEfficiency  = SU2_TYPE::GetDerivative(TotalTotalEfficiency[nTurboPerf-1][nSpanWiseSections]);
-            D_EntropyGen            = SU2_TYPE::GetDerivative(EntropyGen[nTurboPerf-1][nSpanWiseSections]);
-          }
-        }
-        
-        /*--- Get flux-averaged values at the specified surface ---*/
-
-        if (output_surface) {
-
-          unsigned short iMarker_Analyze = 0;
-          Surface_MassFlow = config[ZONE_0]->GetSurface_MassFlow(iMarker_Analyze);
-          Surface_Mach = config[ZONE_0]->GetSurface_Mach(iMarker_Analyze);
-          Surface_Temperature = config[ZONE_0]->GetSurface_Temperature(iMarker_Analyze);
-          Surface_Pressure = config[ZONE_0]->GetSurface_Pressure(iMarker_Analyze);
-          Surface_Density = config[ZONE_0]->GetSurface_Density(iMarker_Analyze);
-          Surface_Enthalpy = config[ZONE_0]->GetSurface_Enthalpy(iMarker_Analyze);
-          Surface_NormalVelocity = config[ZONE_0]->GetSurface_NormalVelocity(iMarker_Analyze);
-          Surface_Uniformity = config[ZONE_0]->GetSurface_Uniformity(iMarker_Analyze);
-          Surface_SecondaryStrength = config[ZONE_0]->GetSurface_SecondaryStrength(iMarker_Analyze);
-          Surface_MomentumDistortion = config[ZONE_0]->GetSurface_MomentumDistortion(iMarker_Analyze);
-          Surface_SecondOverUniform = config[ZONE_0]->GetSurface_SecondOverUniform(iMarker_Analyze);
-          Surface_TotalTemperature = config[ZONE_0]->GetSurface_TotalTemperature(iMarker_Analyze);
-          Surface_TotalPressure = config[ZONE_0]->GetSurface_TotalPressure(iMarker_Analyze);
-          Surface_PressureDrop = config[ZONE_0]->GetSurface_PressureDrop(iMarker_Analyze);
-
-          if (direct_diff != NO_DERIVATIVE){
-            D_Surface_Uniformity = SU2_TYPE::GetDerivative(Surface_Uniformity);
-            D_Surface_SecondaryStrength = SU2_TYPE::GetDerivative(Surface_SecondaryStrength);
-            D_Surface_MomentumDistortion = SU2_TYPE::GetDerivative(Surface_MomentumDistortion);
-            D_Surface_SecondOverUniform = SU2_TYPE::GetDerivative(Surface_SecondOverUniform);
-            D_Surface_PressureDrop = SU2_TYPE::GetDerivative(Surface_PressureDrop);
-          }
-        }
-        
-        /*--- Flow Residuals ---*/
-        
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_RMS(iVar);
-        
-        /*--- Turbulent residual ---*/
-        
-        if (turbulent) {
-          for (iVar = 0; iVar < nVar_Turb; iVar++)
-            residual_turbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TURB_SOL]->GetRes_RMS(iVar);
-        }
-
-        if (weakly_coupled_heat) {
-          for (iVar = 0; iVar < nVar_Heat; iVar++) {
-            residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-          }
-
-        }
-        
-        /*--- Transition residual ---*/
-        
-        if (transition) {
-          for (iVar = 0; iVar < nVar_Trans; iVar++)
-            residual_transition[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][TRANS_SOL]->GetRes_RMS(iVar);
-        }
-        
-        
-        /*--- FEA residual ---*/
-        //        if (fluid_structure) {
-        //          for (iVar = 0; iVar < nVar_FEA; iVar++)
-        //            residual_fea[iVar] = solver_container[ZONE_0][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-        //        }
-        
-        /*--- Iterations of the linear solver ---*/
-        
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetIterLinSolver();
-        
-        /*--- Adjoint solver ---*/
-        
-        if (adjoint) {
-          
-          /*--- Adjoint solution coefficients ---*/
-          
-          Total_Sens_Geo       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-          Total_Sens_Mach      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-          Total_Sens_AoA       = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0;
-          Total_Sens_Press     = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Press();
-          Total_Sens_Temp      = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Temp();
-          Total_Sens_BPressure = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_BPress();
-          Total_Sens_ModVel    = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_ModVel();
-
-          /*--- Adjoint flow residuals ---*/
-          
-          for (iVar = 0; iVar < nVar_AdjFlow; iVar++) {
-            residual_adjflow[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(iVar);
-          }
-          
-          /*--- Adjoint turbulent residuals ---*/
-          
-          if (turbulent) {
-            if (!frozen_visc) {
-              for (iVar = 0; iVar < nVar_AdjTurb; iVar++)
-                residual_adjturbulent[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJTURB_SOL]->GetRes_RMS(iVar);
-            }
-          }
-
-          if (weakly_coupled_heat) {
-            for (iVar = 0; iVar < nVar_Heat; iVar++) {
-              residual_adjheat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJHEAT_SOL]->GetRes_RMS(iVar);
-            }
-          }
-          
-        }
-        
-        break;
-        
-
-      case HEAT_EQUATION_FVM:
-
-        /*--- Heat coefficients  ---*/
-
-        Total_Heat         = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-        Total_MaxHeat      = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_MaxHeatFlux();
-        Total_Temperature  = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_AvgTemperature();
-
-        /*--- Heat Residuals ---*/
-
-        for (iVar = 0; iVar < nVar_Heat; iVar++) {
-          residual_heat[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(iVar);
-        }
-
-        break;
-        
-      case FEM_ELASTICITY:
-        
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-        
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-        
-        Total_ForceCoeff = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetForceCoeff();
-
-        Total_IncLoad = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetLoad_Increment();
-
-        LinSolvIter = (unsigned long) solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetIterLinSolver();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-        
-        if (linear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_RMS(iVar);
-          }
-        }
-        else if (nonlinear_analysis) {
-          for (iVar = 0; iVar < nVar_FEM; iVar++) {
-            residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetRes_FEM(iVar);
-          }
-        }
-        
-        break;
-
-      case DISC_ADJ_FEM:
-
-        /*--- FEM coefficients -- As of now, this is the Von Mises Stress ---*/
-
-        Total_VMStress = solver_container[val_iZone][val_iInst][FinestMesh][FEA_SOL]->GetTotal_CFEA();
-
-        /*--- Residuals: ---*/
-        /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
-        /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
-         for (iVar = 0; iVar < nVar_FEM; iVar++) {
-           residual_fem[iVar] = solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetRes_RMS(iVar);
-         }
-
-        break;
-
-
-    }
-
-    if (extra_heat_output) {
-      Extra_Total_Heat      = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_HeatFlux();
-      //Extra_Total_Temperature   = solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetTotal_Temperature();
-      Extra_Heat_Residual   = log10(solver_container[ExtraHeatOutputZone][val_iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));
-    }
-    
-    /*--- Header frequency ---*/
-    
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    
-    /*--- Header frequency: analogy for dynamic structural analysis ---*/
-    /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
-    /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
-    /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
-    bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    
-    bool write_heads;
-    if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-    
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
-    
-    /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
-    bool write_heads_FEM;
-    if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
-
-    if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
-        (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
-        ) {
-      
-      
-      /*--- Prepare the history file output, note that the dual
-       time output don't write to the history file ---*/
-      if (!DualTime_Iteration) {
-        
-        /*--- Write the begining of the history file ---*/
-        SPRINTF(begin, "%12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet));
-        
-        /*--- Write the end of the history file ---*/
-        SPRINTF (end, ", %12.10f, %12.10f, %12.10f\n", su2double(LinSolvIter), config[val_iZone]->GetCFL(MESH_0), timeused/60.0);
-        
-        /*--- Write the solution and residual of the history file ---*/
-        switch (config[val_iZone]->GetKind_Solver()) {
-            
-          case EULER : case NAVIER_STOKES: case RANS:
-          case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
-          case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS: case DISC_ADJ_EULER:
-          case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-            
-            /*--- Direct coefficients ---*/
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                     Total_CL, Total_CD, Total_CSF, Total_CMx, Total_CMy, Total_CMz, Total_CFx, Total_CFy,
-                     Total_CFz, Total_CEff, Total_AoA, Total_Custom_ObjFunc);
-            if (buffet) SPRINTF (buffet_coeff, ", %14.8e",  Total_Buffet_Metric);
-            if (thermal || heat) SPRINTF (heat_coeff, ", %14.8e, %14.8e, %14.8e",  Total_Heat, Total_MaxHeat, Total_Temperature);
-            if (equiv_area) SPRINTF (equivalent_area_coeff, ", %14.8e, %14.8e", Total_CEquivArea, Total_CNearFieldOF);
-            if (engine || actuator_disk) SPRINTF (engine_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Total_NetThrust, Total_Power, Total_AeroCD, Total_SolidCD, Total_IDR, Total_IDC);
-            if (rotating_frame) SPRINTF (rotating_frame_coeff, ", %14.8e, %14.8e, %14.8e", Total_CMerit, Total_CT, Total_CQ);
-            if (inv_design) {
-              SPRINTF (Cp_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_CpDiff());
-              if (thermal && !turbo) SPRINTF (Heat_inverse_design, ", %14.8e", solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetTotal_HeatFluxDiff());
-            }
-            
-            if (direct_diff != NO_DERIVATIVE) {
-              if (!turbo)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc);
-              else
-                SPRINTF (d_direct_coeff, ", %12.10f, %12.10f, %12.10f, %12.10f, %12.10f", D_TotalPressure_Loss, D_FlowAngle_Out,
-                         D_TotalTotalEfficiency, D_TotalStaticEfficiency, D_EntropyGen);
-              if (engine || actuator_disk)
-              SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                       D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                       D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_NetThrust, D_Total_Power, D_Total_AeroCD, D_Total_SolidCD, D_Total_IDR, D_Total_IDC);
-              if (thermal)
-                SPRINTF (d_direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",
-                         D_Total_CL, D_Total_CD, D_Total_CSF, D_Total_CMx, D_Total_CMy, D_Total_CMz, D_Total_CFx, D_Total_CFy,
-                         D_Total_CFz, D_Total_CEff, D_Total_Custom_ObjFunc, D_Total_Heat, D_Total_MaxHeat);
-            }
-
-            if (aeroelastic) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to aeroelastic coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(aeroelastic_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", aeroelastic_plunge[iMarker_Monitoring]);
-                  strcat(aeroelastic_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", aeroelastic_pitch[iMarker_Monitoring]);
-                strcat(aeroelastic_coeff, surface_coeff);
-              }
-            }
-            
-            if (output_per_surface) {
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-                //Append one by one the surface coeff to monitoring coeff. (Think better way do this, maybe use string)
-                if (iMarker_Monitoring == 0) {
-                  SPRINTF(monitoring_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                }
-                else {
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_CL[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CD[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CSF[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CEff[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CFz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMx[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMy[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", Surface_CMz[iMarker_Monitoring]);
-                strcat(monitoring_coeff, surface_coeff);
-                  
-                if(buffet){
-                  SPRINTF(surface_coeff, ", %12.10f", Surface_Buffet_Metric[iMarker_Monitoring]);
-                  strcat(monitoring_coeff, surface_coeff);
-                }
-              }
-            }
-
-            if (turbo){
-              for (iMarker_Monitoring = 0; iMarker_Monitoring < config[ZONE_0]->GetnMarker_TurboPerformance(); iMarker_Monitoring++){
-                if (iMarker_Monitoring == 0){
-                  SPRINTF(turbo_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                }else{
-                  SPRINTF(surface_coeff, ", %12.10f", TotalPressureLoss[iMarker_Monitoring][nSpanWiseSections]);
-                  strcat(turbo_coeff, surface_coeff);
-                }
-                SPRINTF(surface_coeff, ", %12.10f", KineticEnergyLoss[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EntropyGen[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", EulerianWork[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", PressureRatio[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowIn[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", MassFlowOut[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachIn[iMarker_Monitoring][nSpanWiseSections][1]*MachIn[iMarker_Monitoring][nSpanWiseSections][1] + MachIn[iMarker_Monitoring][nSpanWiseSections][0]*MachIn[iMarker_Monitoring][nSpanWiseSections][0]));
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", sqrt(MachOut[iMarker_Monitoring][nSpanWiseSections][1]*MachOut[iMarker_Monitoring][nSpanWiseSections][1] + MachOut[iMarker_Monitoring][nSpanWiseSections][0]*MachOut[iMarker_Monitoring][nSpanWiseSections][0]));
-								strcat(turbo_coeff, surface_coeff);
-								//
-                SPRINTF(surface_coeff, ", %12.10f", TotalTotalEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-                SPRINTF(surface_coeff, ", %12.10f", TotalStaticEfficiency[iMarker_Monitoring][nSpanWiseSections]);
-								strcat(turbo_coeff, surface_coeff);
-
-              }
-            }
-            
-            
-            /*--- Flow residual ---*/
-            if (nDim == 2) {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-            }
-            else {
-              if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-              if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]));
-            }
-            
-            /*--- Turbulent residual ---*/
-            if (turbulent) {
-              switch(nVar_Turb) {
-                case 1: SPRINTF (turb_resid, ", %12.10f", log10 (residual_turbulent[0])); break;
-                case 2: SPRINTF (turb_resid, ", %12.10f, %12.10f", log10(residual_turbulent[0]), log10(residual_turbulent[1])); break;
-              }
-            }
-            
-            /*---- Averaged stagnation pressure at an exit ----*/
-            
-            if (output_surface) {
-              SPRINTF( surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", Surface_MassFlow, Surface_Mach, Surface_Temperature, Surface_Pressure, Surface_Density, Surface_Enthalpy, Surface_NormalVelocity, Surface_Uniformity, Surface_SecondaryStrength, Surface_MomentumDistortion, Surface_SecondOverUniform, Surface_TotalTemperature, Surface_TotalPressure, Surface_PressureDrop);
-
-              if (direct_diff != NO_DERIVATIVE) {
-                SPRINTF( d_surface_outputs, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", 
-                        D_Surface_Uniformity, D_Surface_SecondaryStrength, D_Surface_MomentumDistortion, D_Surface_SecondOverUniform, D_Surface_PressureDrop);
-              }
-            }
-            
-            /*--- Transition residual ---*/
-            if (transition) {
-              SPRINTF (trans_resid, ", %12.10f, %12.10f", log10(residual_transition[0]), log10(residual_transition[1]));
-            }
-
-            /*--- Combo objective ---*/
-            if (output_comboObj) {
-              SPRINTF(combo_obj,", %12.10f", Total_ComboObj);
-            }
-
-            /*--- Fluid structure residual ---*/
-            //            if (fluid_structure) {
-            //              if (nDim == 2) SPRINTF (levelset_resid, ", %12.10f, %12.10f, 0.0", log10 (residual_fea[0]), log10 (residual_fea[1]));
-            //              else SPRINTF (levelset_resid, ", %12.10f, %12.10f, %12.10f", log10 (residual_fea[0]), log10 (residual_fea[1]), log10 (residual_fea[2]));
-            //            }
-
-            if (adjoint) {
-              
-              /*--- Adjoint coefficients ---*/
-              if (!turbo) {
-                if (compressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, 0.0", Total_Sens_Geo, Total_Sens_Mach, Total_Sens_AoA, Total_Sens_Press, Total_Sens_Temp);
-                }
-                if (incompressible) {
-                  SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_ModVel, Total_Sens_BPressure, Total_Sens_Temp);
-                }
-              } else
-                SPRINTF (adjoint_coeff, ", %14.8e, %14.8e, %14.8e", Total_Sens_Geo, Total_Sens_BPressure, Total_Sens_Temp);
-
-              /*--- Adjoint flow residuals ---*/
-              if (nDim == 2) {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, 0.0", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]) );
-              }
-              else {
-                if (compressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]) );
-                if (incompressible) SPRINTF (adj_flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_adjflow[0]), log10 (residual_adjflow[1]), log10 (residual_adjflow[2]), log10 (residual_adjflow[3]), log10 (residual_adjflow[4]));
-              }
-              
-              /*--- Adjoint turbulent residuals ---*/
-              if (turbulent)
-                if (!frozen_visc) {
-                  if (nVar_AdjTurb == 1) {
-                  SPRINTF (adj_turb_resid, ", %14.8e", log10 (residual_adjturbulent[0]));
-                  } else if (nVar_AdjTurb > 1) {
-                    SPRINTF (adj_turb_resid, ", %14.8e, %14.8e", log10 (residual_adjturbulent[0]), log10 (residual_adjturbulent[1]));
-                  }
-                }
-
-            }
-
-            if (weakly_coupled_heat) {
-              SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-            }
-            
-            break;
-
-          case HEAT_EQUATION_FVM:
-
-            SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e", Total_Heat, Total_MaxHeat, Total_Temperature);
-            SPRINTF (heat_resid, ", %14.8e", log10 (residual_heat[0]));
-
-            break;
-            
-          case FEM_ELASTICITY:
-            
-            SPRINTF (begin_fem, ", %14.8e", 0.0);
-
-            if (incload) SPRINTF (fem_coeff, ", %14.8e, %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff, Total_IncLoad);
-            else SPRINTF (fem_coeff, ", %14.8e, %14.8e", Total_VMStress, Total_ForceCoeff);
-            /*--- FEM residual ---*/
-            if (nDim == 2) {
-              if (linear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-              if (nonlinear_analysis) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]));
-            }
-            SPRINTF (end_fem, ", %lu, %12.10f\n", LinSolvIter, timeused/60.0);
-
-            break;
-
-          case DISC_ADJ_FEM:
-
-            SPRINTF (direct_coeff, ", %12.10f", Total_VMStress);
-            if (nDim == 2) {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy, dummy, dummy);
-            }
-            else {
-              SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[2]), dummy, dummy);
-            }
-
-            break;
-
-        }
-      }
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        /*--- Write the screen header---*/
-        if (  (!fem && ((write_heads) && !(!DualTime_Iteration && Unsteady))) ||
-            (fem && ((write_heads_FEM) && !(!DualTime_Iteration && nonlinear_analysis)))
-        ) {
-
-          if (!fem) {
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
-              switch (config[val_iZone]->GetKind_Solver()) {
-              case EULER : case NAVIER_STOKES: case RANS:
-              case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
-              case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-
-                cout << endl << "---------------------- Local Time Stepping Summary ----------------------" << endl;
-
-                for (unsigned short iMesh = FinestMesh; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-                  cout << "MG level: "<< iMesh << " -> Min. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMin_Delta_Time()<<
-                  ". Max. DT: " << solver_container[val_iZone][val_iInst][iMesh][FLOW_SOL]->GetMax_Delta_Time() <<
-                  ". CFL: " << config[val_iZone]->GetCFL(iMesh)  << "." << endl;
-
-                if (nZone > 1)
-                  cout << "CFL in zone 2: " << config[1]->GetCFL(MESH_0) << endl;
-
-                cout << "-------------------------------------------------------------------------" << endl;
-
-                if (direct_diff != NO_DERIVATIVE) {
-                  cout << endl << "---------------------- Direct Differentiation Summary -------------------" << endl;
-                  cout << "Coefficients are differentiated with respect to ";
-                  switch (direct_diff) {
-                  case D_MACH:
-                    cout << "Mach number." << endl;
-                    break;
-                  case D_AOA:
-                    cout << "AoA." << endl;
-                    break;
-                  case D_SIDESLIP:
-                    cout << "AoS." << endl;
-                    break;
-                  case D_REYNOLDS:
-                    cout << "Reynolds number." << endl;
-                    break;
-                  case D_TURB2LAM:
-                    cout << "Turb/Lam ratio." << endl;
-                    break;
-                  case D_PRESSURE:
-                    cout << "Freestream Pressure." << endl;
-                    break;
-                  case D_TEMPERATURE:
-                    cout << "Freestream Temperature." << endl;
-                    break;
-                  case D_DENSITY:
-                    cout << "Freestream Density." << endl;
-                    break;
-                  case D_VISCOSITY:
-                    cout << "Freestream Viscosity." << endl;
-                    break;
-                  case D_DESIGN:
-                    cout << "Design Variables." << endl;
-                    break;
-                  default:
-                    break;
-                  }
-
-                  cout << "    D_CLift(Total)" << "    D_CDrag(Total)" << "      D_CMz(Total)" <<"     D_CEff(Total)" << endl;
-                  cout.width(18); cout << D_Total_CL;
-                  cout.width(18); cout << D_Total_CD;
-                  cout.width(18); cout << D_Total_CMz;
-                  cout.width(18); cout << D_Total_CEff;
-                  cout << endl << "-------------------------------------------------------------------------" << endl;
-                  cout << endl;
-                }
-                if (turbo && write_turbo && val_iZone== 0){
-                  WriteTurboPerfConvHistory(config[val_iZone]);
-                }
-                break;
-
-              case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-                cout << endl;
-                cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout << Total_Sens_Geo;
-                cout << endl << "-------------------------------------------------------------------------" << endl;
-                break;
-
-              }
-            }
-            else {
-              if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
-                {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
-                } else {
-                  cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                }
-              } else {
-                cout << endl << "Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-              }
-            }
-          }
-          else if (fem && !fsi) {
-            if (dynamic) {
-              cout << endl << "Simulation time: " << config[val_iZone]->GetCurrent_DynTime() << ". Time step: " << config[val_iZone]->GetDelta_DynTime() << ".";
-            }
-          }
-
-          switch (config[val_iZone]->GetKind_Solver()) {
-          case EULER :                  case NAVIER_STOKES:
-          case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES:
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-
-            //            if (!fluid_structure) {
-              if (incompressible && !weakly_coupled_heat) {
-              if (energy) {cout << "   Res[Press]" << "     Res[Temp]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              else {cout << "   Res[Press]" << "     Res[Velx]" << "   CLift(Total)" << "   CDrag(Total)" << endl;}
-              }
-              else if (incompressible && weakly_coupled_heat) cout << "   Res[Press]" << "     Res[Heat]" << "   HFlux(Total)";
-            else if (rotating_frame && nDim == 3 && !turbo) cout << "     Res[Rho]" << "     Res[RhoE]" << " CThrust(Total)" << " CTorque(Total)" << endl;
-            else if (aeroelastic) cout << "     Res[Rho]" << "     Res[RhoE]" << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch" << endl;
-            else if (equiv_area) cout << "     Res[Rho]" << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)" << endl;
-              
-            else if (turbo){
-
-              if(nZone  < 2){
-                /*--- single zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /* --- multi-zone output ---*/
-                cout << "     Res[Rho]" << "     Res[RhoE]"  << " TTEfficiency(%)" << " Entropy Gen.(%)";
-              }
-            }
-              
-            else if (actuator_disk) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else if (engine) cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "   CD-CT(Total)";
-            else cout << "     Res[Rho]" << "     Res[RhoE]" << "      CL(Total)" << "      CD(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "     Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-          case RANS :
-
-            /*--- Visualize the maximum residual ---*/
-            iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max(0);
-            Coord = solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetPoint_Max_Coord(0);
-
-            cout << endl << "----------------------- Residual Evolution Summary ----------------------" << endl;
-
-            cout << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetRes_Max(0)) << "." << endl;
-            if (config[val_iZone]->GetSystemMeasurements() == SI) {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-              if (nDim == 3) cout << ", " << Coord[2];
-              cout <<   ")." << endl;
-            }
-            else {
-              cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-              if (nDim == 3) cout << ", " << Coord[2]*12.0;
-              cout <<   ")." << endl;
-            }
-            cout <<"Maximum Omega " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetOmega_Max() << ", maximum Strain Rate " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetStrainMag_Max() << "." << endl;
-
-            /*--- Print out the number of non-physical points and reconstructions ---*/
-            if (config[val_iZone]->GetNonphysical_Points() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-            if (config[val_iZone]->GetNonphysical_Reconstr() > 0)
-              cout << "There are " << config[val_iZone]->GetNonphysical_Reconstr() << " non-physical states in the upwind reconstruction." << endl;
-
-            cout << "-------------------------------------------------------------------------" << endl;
-
-            if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-            else cout << endl << " IntIter" << " ExtIter";
-            if (incompressible) cout << "   Res[Press]";
-            else cout << "      Res[Rho]";//, cout << "     Res[RhoE]";
-
-            switch (config[val_iZone]->GetKind_Turb_Model()) {
-              case SA: case SA_NEG: case SA_E: case SA_E_COMP: case SA_COMP:        cout << "       Res[nu]"; break;
-              case SST:	      cout << "     Res[kine]" << "     Res[omega]"; break;
-            }
-
-            if (weakly_coupled_heat) {
-              cout <<  "     Res[Heat]";
-            }
-
-            if (transition) { cout << "      Res[Int]" << "       Res[Re]"; }
-            else if (rotating_frame && nDim == 3 && !turbo ) cout << "   CThrust(Total)" << "   CTorque(Total)";
-            else if (aeroelastic) cout << "   CLift(Total)" << "   CDrag(Total)" << "         plunge" << "          pitch";
-            else if (equiv_area) cout << "   CLift(Total)" << "   CDrag(Total)" << "    CPress(N-F)";
-            else if (turbo){
-              if (nZone < 2){
-                /*--- single zone output ---*/
-                cout << "  TotPresLoss(%)" << "  Entropy Gen.(%)";
-              }
-              else{
-                /*--- multi zone output ---*/
-                cout << " TTEfficiency(%)" << " Entropy Gen.(%)";
-
-              }
-            }
-            else if (weakly_coupled_heat) {
-              cout << "   HFlux(Total)";
-            }
-            else cout << "   CLift(Total)"   << "   CDrag(Total)";
-
-            if(extra_heat_output) {
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-            }
-
-            cout << endl;
-
-            break;
-
-            case HEAT_EQUATION_FVM :
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              cout <<  "      Res[Heat]" << "   HFlux(Total)";
-              break;
-
-            case FEM_ELASTICITY :
-              if (!nonlinear_analysis) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << " ExtIter";
-
-              if (linear_analysis) {
-                if (nDim == 2) cout << "    Res[Displx]" << "    Res[Disply]" << "      VMS(Max)"<<  endl;
-                if (nDim == 3) cout << "    Res[Displx]" << "    Res[Disply]" << "    Res[Displz]" << "      VMS(Max)"<<  endl;
-              }
-              else if (nonlinear_analysis) {
-                switch (config[val_iZone]->GetResidual_Criteria_FEM()) {
-                  case RESFEM_RELATIVE:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  case RESFEM_ABSOLUTE:
-                    cout << "   Res[UTOL-A]" << "   Res[RTOL-A]" << "   Res[ETOL-A]"  << "      VMS(Max)"<<  endl;
-                    break;
-                  default:
-                    cout << "     Res[UTOL]" << "     Res[RTOL]" << "     Res[ETOL]"  << "      VMS(Max)"<<  endl;
-                    break;
-                }
-            }
-           break;
-
-            case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-            case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) {
-                if (energy) {cout << "   Res[Psi_Press]" << "   Res[Psi_Temp]";}
-                else {cout << "   Res[Psi_Press]" << "   Res[Psi_Velx]";}
-              }
-              else cout << "   Res[Psi_Rho]" << "     Res[Psi_E]";
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                    cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    if (energy) {
-                      cout << "      Sens_Vin" << "     Sens_Temp" << endl;
-                    } else {
-                      cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                    }
-                  }                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;
-                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case ADJ_RANS : case DISC_ADJ_RANS:
-
-              /*--- Visualize the maximum residual ---*/
-              iPointMaxResid = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max(0);
-              Coord = solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetPoint_Max_Coord(0);
-              cout << endl << "log10[Maximum residual]: " << log10(solver_container[val_iZone][val_iInst][FinestMesh][ADJFLOW_SOL]->GetRes_Max(0)) << "." << endl;
-              if (config[val_iZone]->GetSystemMeasurements() == SI) {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0] << ", " << Coord[1];
-                if (nDim == 3) cout << ", " << Coord[2];
-                cout <<   ")." << endl;
-              }
-              else {
-                cout <<"Maximum residual point " << iPointMaxResid << ", located at (" << Coord[0]*12.0 << ", " << Coord[1]*12.0;
-                if (nDim == 3) cout << ", " << Coord[2]*12.0;
-                cout <<   ")." << endl;
-              }
-
-              /*--- Print out the number of non-physical points and reconstructions ---*/
-              if (config[val_iZone]->GetNonphysical_Points() > 0)
-                cout << "There are " << config[val_iZone]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
-
-              if (!Unsteady) cout << endl << " Iter" << "    Time(s)";
-              else cout << endl << " IntIter" << "  ExtIter";
-
-              if (incompressible) cout << "     Res[Psi_Press]";
-              else cout << "     Res[Psi_Rho]";
-
-              if (!frozen_visc) {
-                cout << " Res[Psi_Turb[0]]";
-              }
-              else {
-                if (incompressible) {if (energy) {cout << "   Res[Psi_Temp]";}
-                  else {cout << "   Res[Psi_Velx]";}}
-                else cout << "     Res[Psi_E]";
-              }
-              if (weakly_coupled_heat) {
-                cout << "     Res[Psi_E]";
-              }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout << "    Sens_Press" << "      Sens_AoA" << endl;
-                  }
-                  if (incompressible) {
-                    cout << "      Sens_Vin" << "     Sens_Pout" << endl;
-                  }
-                } else {
-                  cout << " Sens_PressOut" << " Sens_TotTempIn" << endl;                }
-              } else {
-                cout << "      Sens_Geo" << "      Sens_AoA" << endl;
-              }
-              break;
-
-            case DISC_ADJ_FEM :
-              cout << endl << " IntIter" << " ExtIter";
-
-              if (nDim == 2) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-              if (nDim == 3) cout << "    Res[Ux_adj]" << "    Res[Uy_adj]" << "    Res[Uz_adj]" << "       Sens[E]" << "      Sens[Nu]"<<  endl;
-
-           break;
-
-          }
-
-        }
-      }
-
-      /*--- Write the solution on the screen ---*/
-      
-      if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-        cout.precision(6);
-        cout.setf(ios::fixed, ios::floatfield);
-        if (!fem) {
-          if (!Unsteady) {
-            cout.width(5); cout << iExtIter + ExtIter_OffSet;
-            cout.width(11); cout << timeiter;
-
-          } else if (Unsteady && DualTime_Iteration) {
-            cout.width(8); cout << iIntIter;
-            cout.width(8); cout << iExtIter;
-          }
-        }
-        else if (fem) {
-          if (!DualTime_Iteration) {
-            if (!nonlinear_analysis) {
-              cout.width(5); cout << iExtIter;
-              cout.width(11); cout << timeiter;
-
-            } else {
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-            }
-          }
-          else if (discadj_fem){
-              cout.width(8); cout << iIntIter;
-              cout.width(8); cout << iExtIter;
-          }
-        }
-      }
-      
-      switch (config[val_iZone]->GetKind_Solver()) {
-        case EULER : case NAVIER_STOKES:
-        case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES:
-          
-          /*--- Write history file ---*/
-          
-          if ((!DualTime_Iteration) && (output_files)) {
-            if (!turbo) {
-              config[val_iZone]->GetHistFile()[0] << begin << direct_coeff;
-              if (buffet) config[val_iZone]->GetHistFile()[0] << buffet_coeff;
-              if (thermal) config[val_iZone]->GetHistFile()[0] << heat_coeff;
-              if (equiv_area) config[val_iZone]->GetHistFile()[0] << equivalent_area_coeff;
-              if (engine || actuator_disk) config[val_iZone]->GetHistFile()[0] << engine_coeff;
-              if (inv_design) {
-                config[val_iZone]->GetHistFile()[0] << Cp_inverse_design;
-                if (thermal) config[val_iZone]->GetHistFile()[0] << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) config[val_iZone]->GetHistFile()[0] << rotating_frame_coeff;
-              config[val_iZone]->GetHistFile()[0] << flow_resid;
-              if (weakly_coupled_heat) config[val_iZone]->GetHistFile()[0] << heat_resid;
-            }
-            else {
-              config[val_iZone]->GetHistFile()[0] << begin << turbo_coeff << flow_resid;
-            }
-            
-            if (aeroelastic) config[val_iZone]->GetHistFile()[0] << aeroelastic_coeff;
-            if (output_per_surface) config[val_iZone]->GetHistFile()[0] << monitoring_coeff;
-            if (output_surface) config[val_iZone]->GetHistFile()[0] << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) {
-              config[val_iZone]->GetHistFile()[0] << d_direct_coeff;
-              if (output_surface) config[val_iZone]->GetHistFile()[0] << d_surface_outputs;
-            }
-            if (output_comboObj) config[val_iZone]->GetHistFile()[0] << combo_obj;
-            config[val_iZone]->GetHistFile()[0] << end;
-            config[val_iZone]->GetHistFile()[0].flush();
-          }
-
-          /*--- Write screen output ---*/
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(13); cout << log10(residual_flow[0]);
-              if (!equiv_area) {
-                if (compressible) {
-                  if (nDim == 2 ) { cout.width(14); cout << log10(residual_flow[3]); }
-                  else { cout.width(14); cout << log10(residual_flow[4]); }
-                }
-                if (incompressible && !weakly_coupled_heat) {
-                  if (energy) {cout.width(14); cout << log10(residual_flow[nDim+1]);}
-                  else {cout.width(14); cout << log10(residual_flow[1]);}
-                }
-                if (incompressible && weakly_coupled_heat)  { cout.width(14); cout << log10(residual_heat[0]);}
-
-              }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT;
-                cout.width(15); cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                
-                if (nZone < 2) {
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else {
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                }
-                
-                cout.unsetf(ios_base::floatfield);
-                
-              }
-              else if (weakly_coupled_heat) { cout.width(14); cout << log10(Total_Heat); }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-            }
-            cout << endl;
-          }
-          break;
-          
-        case RANS :
-          
-          /*--- Write history file ---*/
-          
-          if ((!DualTime_Iteration) && (output_files)) {
-
-            if (!turbo) {
-              config[val_iZone]->GetHistFile()[0] << begin << direct_coeff;
-              if (buffet) config[val_iZone]->GetHistFile()[0] << buffet_coeff;
-              if (thermal) config[val_iZone]->GetHistFile()[0] << heat_coeff;
-              if (equiv_area) config[val_iZone]->GetHistFile()[0] << equivalent_area_coeff;
-              if (engine || actuator_disk) config[val_iZone]->GetHistFile()[0] << engine_coeff;
-              if (inv_design) {
-                config[val_iZone]->GetHistFile()[0] << Cp_inverse_design;
-                if (thermal) config[val_iZone]->GetHistFile()[0] << Heat_inverse_design;
-              }
-              if (rotating_frame && !turbo) config[val_iZone]->GetHistFile()[0] << rotating_frame_coeff;
-              config[val_iZone]->GetHistFile()[0] << flow_resid << turb_resid;
-              if (weakly_coupled_heat) config[val_iZone]->GetHistFile()[0] << heat_resid;
-            }
-            else {
-              config[val_iZone]->GetHistFile()[0] << begin << turbo_coeff << flow_resid << turb_resid;
-            }
-            
-            if (aeroelastic) config[val_iZone]->GetHistFile()[0] << aeroelastic_coeff;
-            if (output_per_surface) config[val_iZone]->GetHistFile()[0] << monitoring_coeff;
-            if (output_surface) config[val_iZone]->GetHistFile()[0] << surface_outputs;
-            if (direct_diff != NO_DERIVATIVE) {
-              config[val_iZone]->GetHistFile()[0] << d_direct_coeff;
-              if (output_surface) config[val_iZone]->GetHistFile()[0] << d_surface_outputs;
-            }
-            if (output_comboObj) config[val_iZone]->GetHistFile()[0] << combo_obj;
-            config[val_iZone]->GetHistFile()[0] << end;
-            config[val_iZone]->GetHistFile()[0].flush();
-          }
-          
-          /*--- Write screen output ---*/
-
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if(DualTime_Iteration || !Unsteady) {
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-
-              if (incompressible) cout.width(13);
-              else  cout.width(14);
-              cout << log10(residual_flow[0]);
-              switch(nVar_Turb) {
-              case 1: cout.width(14); cout << log10(residual_turbulent[0]); break;
-              case 2: cout.width(14); cout << log10(residual_turbulent[0]);
-              cout.width(15); cout << log10(residual_turbulent[1]); break;
-              }
-
-              if (weakly_coupled_heat) {
-                cout.width(14); cout << log10(residual_heat[0]);
-              }
-
-              if (transition) { cout.width(14); cout << log10(residual_transition[0]); cout.width(14); cout << log10(residual_transition[1]); }
-
-              if (rotating_frame && nDim == 3 && !turbo ) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << Total_CT; cout.width(15);
-                cout << Total_CQ;
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (equiv_area) { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); cout.width(15);
-              cout.precision(4);
-              cout.setf(ios::scientific, ios::floatfield);
-              cout << Total_CNearFieldOF; }
-              else if (turbo) {
-                cout.setf(ios::scientific, ios::floatfield);
-                if (nZone < 2){
-                  /*--- single zone output ---*/
-                  cout.width(15); cout << TotalPressureLoss[0][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[0][nSpanWiseSections]*100.0;
-                }
-                else{
-                  /*--- multi zone output ---*/
-                  cout.width(15); cout << TotalTotalEfficiency[nTurboPerf - 1][nSpanWiseSections]*100.0;
-                  cout.width(15); cout << EntropyGen[nTurboPerf -1][nSpanWiseSections]*100.0;
-                  if (direct_diff){
-                    cout.width(15); cout << D_EntropyGen;
-                  }
-                }
-                cout.unsetf(ios_base::floatfield);
-              }
-              else if (weakly_coupled_heat) { cout.width(15); cout << Total_Heat; }
-              else { cout.width(15); cout << min(10000.0, max(-10000.0, Total_CL)); cout.width(15); cout << min(10000.0, max(-10000.0, Total_CD)); }
-
-              if (aeroelastic) {
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(15); cout << aeroelastic_plunge[0]; //Only output the first marker being monitored to the console.
-                cout.width(15); cout << aeroelastic_pitch[0];
-                cout.unsetf(ios_base::floatfield);
-              }
-
-              if (extra_heat_output) { cout.width(15); cout << Extra_Heat_Residual; cout.width(15); cout << Extra_Total_Heat; }
-              cout << endl;              
-            }
-          }
-          break;
-          
-
-        case HEAT_EQUATION_FVM:
-
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << direct_coeff << heat_resid << end;
-            config[val_iZone]->GetHistFile()[0].flush();
-          }
-          break;
-
-        case FEM_ELASTICITY:
-          
-          if (!DualTime_Iteration) {
-            config[val_iZone]->GetHistFile()[0] << begin << fem_coeff << fem_resid << end_fem;
-            config[val_iZone]->GetHistFile()[0].flush();
-          
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-          if (linear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            if (nDim == 3) { cout.width(14); cout << log10(residual_fem[2]); }
-          }
-          else if (nonlinear_analysis) {
-            cout.width(14); cout << log10(residual_fem[0]);
-            cout.width(14); cout << log10(residual_fem[1]);
-            cout.width(14); cout << log10(residual_fem[2]);
-          }
-          
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-          cout.width(14); cout << Total_VMStress;
-          cout << endl;
-          }
-          break;
-          
-        case DISC_ADJ_FEM:
-
-          cout.precision(6);
-          cout.setf(ios::fixed, ios::floatfield);
-
-          cout.width(15); cout << log10(residual_fem[0]);
-          cout.width(15); cout << log10(residual_fem[1]);
-          if (nDim == 3) { cout.width(15); cout << log10(residual_fem[2]); }
-
-          cout.precision(4);
-          cout.setf(ios::scientific, ios::floatfield);
-
-
-          if (config[val_iZone]->GetnElasticityMod() == 1){
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-            cout.width(14); cout << solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-          }
-          else{
-            Total_SensE = 0.0; Total_SensNu = 0.0;
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-                Total_SensE += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-                Total_SensNu += solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                    *solver_container[val_iZone][val_iInst][FinestMesh][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
-            }
-            Total_SensE = sqrt(Total_SensE);
-            Total_SensNu = sqrt(Total_SensNu);
-            cout.width(14); cout << Total_SensE;
-            cout.width(14); cout << Total_SensNu;
-          }
-
-          cout << endl;
-          break;
-
-        case ADJ_EULER :              case ADJ_NAVIER_STOKES :
-        case DISC_ADJ_EULER:          case DISC_ADJ_NAVIER_STOKES:
-          
-          if (!DualTime_Iteration) {
-            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid << end;
-            ConvHist_file[0].flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              if (compressible) {
-                cout.width(15); cout << log10(residual_adjflow[0]);
-                cout.width(15); cout << log10(residual_adjflow[nDim+1]);
-              }
-              if (incompressible) {
-                cout.width(17); cout << log10(residual_adjflow[0]);
-                if (energy) {cout.width(16); cout << log10(residual_adjflow[nDim+1]);}
-                else {cout.width(16); cout << log10(residual_adjflow[1]);}
-              }
-
-              if (disc_adj) {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }
-                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-          
-        case ADJ_RANS : case DISC_ADJ_RANS:
-          
-          if (!DualTime_Iteration) {
-            ConvHist_file[0] << begin << adjoint_coeff << adj_flow_resid;
-            if (!frozen_visc)
-              ConvHist_file[0] << adj_turb_resid;
-            ConvHist_file[0] << end;
-            ConvHist_file[0].flush();
-          }
-          if ((val_iZone == 0 && val_iInst == 0)|| fluid_structure){
-            if (DualTime_Iteration || !Unsteady){
-              cout.precision(6);
-              cout.setf(ios::fixed, ios::floatfield);
-              cout.width(17); cout << log10(residual_adjflow[0]);
-            if (!frozen_visc) {
-                cout.width(17); cout << log10(residual_adjturbulent[0]);
-              }
-              else {
-                if (compressible) {
-                  if (geometry[val_iZone][val_iInst][FinestMesh]->GetnDim() == 2 ) { cout.width(15); cout << log10(residual_adjflow[3]); }
-                  else { cout.width(15); cout << log10(residual_adjflow[4]); }
-                }
-                if (incompressible) {
-                  if (energy) {cout.width(15); cout << log10(residual_adjflow[nDim+1]);}
-                  else {cout.width(15); cout << log10(residual_adjflow[1]);}
-                }
-              }
-            if (weakly_coupled_heat) {
-              cout.width(17); cout << log10(residual_adjheat[0]);
-            }
-              if (disc_adj) {
-                if (!turbo){
-                  if (compressible) {
-                  cout.width(14); cout << Total_Sens_Press;
-                  cout.width(14); cout << Total_Sens_AoA;
-                  }
-                  if (incompressible) {
-                    cout.width(14); cout << Total_Sens_ModVel;
-                    if (energy) {
-                      cout.width(14); cout << Total_Sens_Temp;
-                    } else {
-                      cout.width(14); cout << Total_Sens_BPressure;
-                    }                  }
-                } else {
-                  cout.width(14); cout << Total_Sens_BPressure;
-                  cout.width(15); cout << Total_Sens_Temp;
-                }
-              }else {
-                cout.precision(4);
-                cout.setf(ios::scientific, ios::floatfield);
-                cout.width(14); cout << Total_Sens_Geo;
-                cout.width(14); cout << Total_Sens_AoA;
-              }
-              cout << endl;
-              cout.unsetf(ios_base::floatfield);
-            }
-          }
-          break;
-          
-      }
-      cout.unsetf(ios::fixed);
-
-    }
-    
-
-    delete [] residual_flow;
-    delete [] residual_turbulent;
-    delete [] residual_transition;
-    delete [] residual_fea;
-    delete [] residual_fem;
-    delete [] residual_heat;
-
-    delete [] residual_adjflow;
-    delete [] residual_adjturbulent;
-    delete [] residual_adjheat;
-    
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    delete [] aeroelastic_pitch;
-    delete [] aeroelastic_plunge;
-    
-  }
-}
-
-void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
-  
-  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
-  unsigned short iMesh;
-  
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
-  unsigned short nVar = 1;
-
-  bool energy = config[val_iZone]->GetEnergy_Equation();
-  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES : case RANS:
-      if (energy) {
-        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-      }
-      else if (weakly_coupled_heat) {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      }
-      else {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-      }
-      break;
-    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-      break;
-    case HEAT_EQUATION_FVM:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      break;
-  }
-  
-  if (RhoRes_New < EPS) RhoRes_New = EPS;
-  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
-
-  Div = RhoRes_Old[val_iZone]/RhoRes_New;
-  Diff = RhoRes_New-RhoRes_Old[val_iZone];
-
-  /*--- Compute MG factor ---*/
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
-    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
-  }
-
-  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
-  else power = config[val_iZone]->GetCFL_AdaptParam(1);
-
-  /*--- Detect a stall in the residual ---*/
-
-  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
-
-  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
-  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
-
-  CFLFactor = pow(Div, power);
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    CFL = config[val_iZone]->GetCFL(iMesh);
-    CFL *= CFLFactor;
-
-    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
-      }
-      break;
-    }
-    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
-      break;
-    }
-
-    config[val_iZone]->SetCFL(iMesh, CFL);
-  }
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-  case EULER : case NAVIER_STOKES : case RANS:
-    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-    break;
-  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-    break;
-  case HEAT_EQUATION_FVM:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    break;
-  }
-  
-}
-
-void COutput::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short val_iZone, bool output) {
-  
-  char cstr[200];
-  unsigned short iDim, iMarker_Monitoring;
-  ofstream Breakdown_file;
-  
-  bool compressible       = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
-  bool incompressible     = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-  bool unsteady           = (config[val_iZone]->GetUnsteady_Simulation() != NO);
-  bool viscous            = config[val_iZone]->GetViscous();
-  bool grid_movement      = config[val_iZone]->GetGrid_Movement();
-  bool gravity            = config[val_iZone]->GetGravityForce();
-  bool turbulent          = config[val_iZone]->GetKind_Solver() == RANS;
-  bool fixed_cl           = config[val_iZone]->GetFixed_CL_Mode();
-  unsigned short Kind_Solver = config[val_iZone]->GetKind_Solver();
-  unsigned short Kind_Regime = config[val_iZone]->GetKind_Regime();
-  unsigned short Kind_Turb_Model = config[val_iZone]->GetKind_Turb_Model();
-  unsigned short Ref_NonDim = config[val_iZone]->GetRef_NonDim();
-
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned short nDim = geometry[val_iZone][INST_0][FinestMesh]->GetnDim();
-  bool flow = ((config[val_iZone]->GetKind_Solver() == EULER) || (config[val_iZone]->GetKind_Solver() == NAVIER_STOKES) ||
-               (config[val_iZone]->GetKind_Solver() == RANS));
-  
-  /*--- Output the mean flow solution using only the master node ---*/
-  
-  if ((rank == MASTER_NODE) && (flow) && (output)) {
-    
-    cout << endl << "Writing the forces breakdown file ("<< config[val_iZone]->GetBreakdown_FileName() << ")." << endl;
-    
-    /*--- Initialize variables to store information from all domains (direct solution) ---*/
-    
-    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0,
-    Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-    Total_CoPx = 0.0, Total_CoPy = 0.0, Total_CoPz = 0.0,
-    Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Inv_CL = 0.0,
-    Inv_CD = 0.0, Inv_CSF = 0.0, Inv_CMx = 0.0, Inv_CMy = 0.0,
-    Inv_CMz = 0.0, Inv_CEff = 0.0, Inv_CFx = 0.0, Inv_CFy = 0.0, Inv_CFz =
-    0.0,      Mnt_CL = 0.0,
-    Mnt_CD = 0.0, Mnt_CSF = 0.0, Mnt_CMx = 0.0, Mnt_CMy = 0.0,
-    Mnt_CMz = 0.0, Mnt_CEff = 0.0, Mnt_CFx = 0.0, Mnt_CFy = 0.0, Mnt_CFz =
-    0.0, Visc_CL = 0.0,
-    Visc_CD = 0.0, Visc_CSF = 0.0, Visc_CMx = 0.0, Visc_CMy = 0.0,
-    Visc_CMz = 0.0, Visc_CEff = 0.0, Visc_CFx = 0.0, Visc_CFy = 0.0, Visc_CFz =
-    0.0, *Surface_CL = NULL, *Surface_CD = NULL,
-    *Surface_CSF = NULL, *Surface_CEff = NULL, *Surface_CFx = NULL,
-    *Surface_CFy = NULL, *Surface_CFz = NULL,
-    *Surface_CMx = NULL, *Surface_CMy = NULL, *Surface_CMz = NULL,
-    *Surface_CL_Inv = NULL,
-    *Surface_CD_Inv = NULL, *Surface_CSF_Inv = NULL,
-    *Surface_CEff_Inv = NULL, *Surface_CFx_Inv = NULL, *Surface_CFy_Inv =
-    NULL, *Surface_CFz_Inv = NULL, *Surface_CMx_Inv = NULL,
-    *Surface_CMy_Inv = NULL, *Surface_CMz_Inv = NULL,
-    *Surface_CL_Visc = NULL,
-    *Surface_CD_Visc = NULL, *Surface_CSF_Visc = NULL,
-    *Surface_CEff_Visc = NULL, *Surface_CFx_Visc = NULL, *Surface_CFy_Visc =
-    NULL, *Surface_CFz_Visc = NULL, *Surface_CMx_Visc = NULL,
-    *Surface_CMy_Visc = NULL, *Surface_CMz_Visc = NULL,
-    *Surface_CL_Mnt = NULL,
-    *Surface_CD_Mnt = NULL, *Surface_CSF_Mnt = NULL,
-    *Surface_CEff_Mnt = NULL, *Surface_CFx_Mnt = NULL, *Surface_CFy_Mnt =
-    NULL, *Surface_CFz_Mnt = NULL, *Surface_CMx_Mnt = NULL,
-    *Surface_CMy_Mnt = NULL, *Surface_CMz_Mnt = NULL;
-    
-    /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
-     the two lines below that use the dt variable. ---*/
-    //time_t now = time(0);
-    //string dt = ctime(&now); dt[24] = '.';
-    
-    /*--- Allocate memory for the coefficients being monitored ---*/
-    
-    Surface_CL      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    Surface_CL_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Inv      = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Inv = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Inv       = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Inv        = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    Surface_CL_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Visc =
-    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Visc = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    
-    
-    Surface_CL_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CD_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CSF_Mnt =
-    new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CEff_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CFz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMx_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMy_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-    Surface_CMz_Mnt = new su2double[config[ZONE_0]->GetnMarker_Monitoring()];
-
-    /*--- Flow solution coefficients ---*/
-    
-    Total_CL       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CL();
-    Total_CD       = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CD();
-    Total_CSF      = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CSF();
-    Total_CEff        = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CEff();
-    Total_CMx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMx();
-    Total_CMy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMy();
-    Total_CMz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CMz();
-    Total_CFx         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    Total_CFy         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-    Total_CFz         = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-    
-    if (nDim == 2) {
-      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy();
-      Total_CoPy = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPy() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      Total_CoPz = 0.0;
-    }
-    if (nDim == 3) {
-      Total_CoPx = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPx() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz();
-      Total_CoPy = 0.0;
-      Total_CoPz = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CoPz() / solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-    }
-    
-    if (config[ZONE_0]->GetSystemMeasurements() == US) { Total_CoPx *= 12.0; Total_CoPy *= 12.0; Total_CoPz *= 12.0; }
-    
-    /*--- Flow inviscid solution coefficients ---*/
-    
-    Inv_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Inv();
-    Inv_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Inv();
-    Inv_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Inv();
-    Inv_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Inv();
-    Inv_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Inv();
-    Inv_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Inv();
-    Inv_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Inv();
-    Inv_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Inv();
-    Inv_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Inv();
-    Inv_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Inv();
-    
-    /*--- Flow viscous solution coefficients ---*/
-    
-    Visc_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Visc();
-    Visc_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Visc();
-    Visc_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Visc();
-    Visc_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Visc();
-    Visc_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Visc();
-    Visc_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Visc();
-    Visc_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Visc();
-    Visc_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Visc();
-    Visc_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Visc();
-    Visc_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Visc();
-    
-    /*--- Flow momentum solution coefficients ---*/
-    
-    Mnt_CL =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CL_Mnt();
-    Mnt_CD =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CD_Mnt();
-    Mnt_CSF =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CSF_Mnt();
-    Mnt_CEff =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CEff_Mnt();
-    Mnt_CMx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMx_Mnt();
-    Mnt_CMy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMy_Mnt();
-    Mnt_CMz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CMz_Mnt();
-    Mnt_CFx =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFx_Mnt();
-    Mnt_CFy =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFy_Mnt();
-    Mnt_CFz =
-    solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetAllBound_CFz_Mnt();
-    
-    
-    /*--- Look over the markers being monitored and get the desired values ---*/
-    
-    for (iMarker_Monitoring = 0;
-         iMarker_Monitoring < config[ZONE_0]->GetnMarker_Monitoring();
-         iMarker_Monitoring++) {
-      Surface_CL[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL(
-                                                             iMarker_Monitoring);
-      Surface_CD[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD(
-                                                             iMarker_Monitoring);
-      Surface_CSF[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF(
-                                                              iMarker_Monitoring);
-      Surface_CEff[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff(
-                                                               iMarker_Monitoring);
-      Surface_CMx[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx(
-                                                              iMarker_Monitoring);
-      Surface_CMy[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy(
-                                                              iMarker_Monitoring);
-      Surface_CMz[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz(
-                                                              iMarker_Monitoring);
-      Surface_CFx[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx(
-                                                              iMarker_Monitoring);
-      Surface_CFy[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy(
-                                                              iMarker_Monitoring);
-      Surface_CFz[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz(
-                                                              iMarker_Monitoring);
-      
-      Surface_CL_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Inv(
-                                                                 iMarker_Monitoring);
-      Surface_CD_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Inv(
-                                                                 iMarker_Monitoring);
-      Surface_CSF_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CEff_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Inv(
-                                                                   iMarker_Monitoring);
-      Surface_CMx_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CMy_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CMz_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFx_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFy_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CFz_Inv[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Inv(
-                                                                  iMarker_Monitoring);
-      Surface_CL_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Visc(
-                                                                  iMarker_Monitoring);
-      Surface_CD_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Visc(
-                                                                  iMarker_Monitoring);
-      Surface_CSF_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CEff_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Visc(
-                                                                    iMarker_Monitoring);
-      Surface_CMx_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CMy_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CMz_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFx_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFy_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Visc(
-                                                                   iMarker_Monitoring);
-      Surface_CFz_Visc[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Visc(
-                                                                   iMarker_Monitoring);
-      
-      Surface_CL_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CL_Mnt(
-                                                                 iMarker_Monitoring);
-      Surface_CD_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CD_Mnt(
-                                                                 iMarker_Monitoring);
-      Surface_CSF_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CSF_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CEff_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CEff_Mnt(
-                                                                   iMarker_Monitoring);
-      Surface_CMx_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMx_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CMy_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMy_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CMz_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CMz_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFx_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFx_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFy_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFy_Mnt(
-                                                                  iMarker_Monitoring);
-      Surface_CFz_Mnt[iMarker_Monitoring] =
-      solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetSurface_CFz_Mnt(
-                                                                  iMarker_Monitoring);
-      
-    }
-    
-    
-    /*--- Write file name with extension ---*/
-    
-    string filename = config[val_iZone]->GetBreakdown_FileName();
-    strcpy (cstr, filename.data());
-    
-    Breakdown_file.open(cstr, ios::out);
-    
-    Breakdown_file << "\n" <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file <<"|    ___ _   _ ___                                                      |" << "\n";
-    Breakdown_file <<"|   / __| | | |_  )   Release 6.2.0  \"Falcon\"                           |" << "\n";
-    Breakdown_file <<"|   \\__ \\ |_| |/ /                                                      |" << "\n";
-    Breakdown_file <<"|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    //Breakdown_file << "|   Local date and time: " << dt << "                      |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| The current SU2 release has been coordinated by the                   |" << "\n";
-    Breakdown_file << "| SU2 International Developers Society <www.su2devsociety.org>          |" << "\n";
-    Breakdown_file << "| with selected contributions from the open-source community            |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| The main research teams contributing to the current release are:      |" << "\n";
-    Breakdown_file << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << "\n";
-    Breakdown_file << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << "\n";
-    Breakdown_file << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << "\n";
-    Breakdown_file << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << "\n";
-    Breakdown_file << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << "\n";
-    Breakdown_file << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << "\n";
-    Breakdown_file << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << "\n";
-    Breakdown_file << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    Breakdown_file << "| Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,       |" << "\n";
-    Breakdown_file << "|                      Tim Albring, and the SU2 contributors.           |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| SU2 is free software; you can redistribute it and/or                  |" << "\n";
-    Breakdown_file << "| modify it under the terms of the GNU Lesser General Public            |" << "\n";
-    Breakdown_file << "| License as published by the Free Software Foundation; either          |" << "\n";
-    Breakdown_file << "| version 2.1 of the License, or (at your option) any later version.    |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| SU2 is distributed in the hope that it will be useful,                |" << "\n";
-    Breakdown_file << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << "\n";
-    Breakdown_file << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << "\n";
-    Breakdown_file << "| Lesser General Public License for more details.                       |" << "\n";
-    Breakdown_file << "|                                                                       |" << "\n";
-    Breakdown_file << "| You should have received a copy of the GNU Lesser General Public      |" << "\n";
-    Breakdown_file << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << "\n";
-    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
-    
-    Breakdown_file.precision(6);
-
-    Breakdown_file << "\n" << "\n" << "Problem definition:" << "\n" << "\n";
-    
-    switch (Kind_Solver) {
-      case EULER:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Euler equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Euler equations." << "\n";
-        break;
-      case NAVIER_STOKES:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible Laminar Navier-Stokes' equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible Laminar Navier-Stokes' equations." << "\n";
-        break;
-      case RANS:
-        if (Kind_Regime == COMPRESSIBLE) Breakdown_file << "Compressible RANS equations." << "\n";
-        if (Kind_Regime == INCOMPRESSIBLE) Breakdown_file << "Incompressible RANS equations." << "\n";
-        Breakdown_file << "Turbulence model: ";
-        switch (Kind_Turb_Model) {
-          case SA:        Breakdown_file << "Spalart Allmaras" << "\n"; break;
-          case SA_NEG:    Breakdown_file << "Negative Spalart Allmaras" << "\n"; break;
-          case SST:       Breakdown_file << "Menter's SST"     << "\n"; break;
-        }
-        break;
-    }
-
-
-    /*--- Compressible version of console output ---*/
-
-    if (compressible) {
-
-
-    if ((Kind_Regime == COMPRESSIBLE) && (Kind_Solver != FEM_ELASTICITY)) {
-      Breakdown_file << "Mach number: " << config[val_iZone]->GetMach() <<"."<< "\n";
-      Breakdown_file << "Angle of attack (AoA): " << config[val_iZone]->GetAoA() <<" deg, and angle of sideslip (AoS): " << config[val_iZone]->GetAoS() <<" deg."<< "\n";
-      if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == ADJ_NAVIER_STOKES) ||
-          (Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS))
-        Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() <<"."<< "\n";
-    }
-    
-    if (fixed_cl) {
-      Breakdown_file << "Simulation at a cte. CL: " << config[val_iZone]->GetTarget_CL() << ".\n";
-      Breakdown_file << "Approx. Delta CL / Delta AoA: " << config[val_iZone]->GetdCL_dAlpha() << " (1/deg).\n";
-      Breakdown_file << "Approx. Delta CD / Delta CL: " << config[val_iZone]->GetdCD_dCL() << ".\n";
-      if (nDim == 3 ) {
-        Breakdown_file << "Approx. Delta CMx / Delta CL: " << config[val_iZone]->GetdCMx_dCL() << ".\n";
-        Breakdown_file << "Approx. Delta CMy / Delta CL: " << config[val_iZone]->GetdCMy_dCL() << ".\n";
-      }
-      Breakdown_file << "Approx. Delta CMz / Delta CL: " << config[val_iZone]->GetdCMz_dCL() << ".\n";
-    }
-    
-    if (Ref_NonDim == DIMENSIONAL) { Breakdown_file << "Dimensional simulation." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_PRESS_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (P=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_VEL_EQ_MACH) { Breakdown_file << "Non-Dimensional simulation (V=Mach, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    else if (Ref_NonDim == FREESTREAM_VEL_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (V=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
-    
-    if (config[val_iZone]->GetSystemMeasurements() == SI) {
-      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
-      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength() << " m." << "\n";
-    }
-    
-    if (config[val_iZone]->GetSystemMeasurements() == US) {
-      Breakdown_file << "The reference area is " << config[val_iZone]->GetRefArea()*12.0*12.0 << " in^2." << "\n";
-      Breakdown_file << "The reference length is " << config[val_iZone]->GetRefLength()*12.0 << " in." << "\n";
-    }
-    Breakdown_file << "\n" << "\n" <<"Problem definition:" << "\n" << "\n";
-    if (compressible) {
-      if (viscous) {
-        Breakdown_file << "Viscous flow: Computing pressure using the ideal gas law" << "\n";
-        Breakdown_file << "based on the free-stream temperature and a density computed" << "\n";
-        Breakdown_file << "from the Reynolds number." << "\n";
-      } else {
-        Breakdown_file << "Inviscid flow: Computing density based on free-stream" << "\n";
-        Breakdown_file << "temperature and pressure using the ideal gas law." << "\n";
-      }
-    }
-    
-    if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-    else Breakdown_file << "Force coefficients computed using free-stream values." << "\n";
-    
-    if (incompressible) {
-      Breakdown_file << "Viscous and Inviscid flow: rho_ref, and vel_ref" << "\n";
-      Breakdown_file << "are based on the free-stream values, p_ref = rho_ref*vel_ref^2." << "\n";
-      Breakdown_file << "The free-stream value of the pressure is 0." << "\n";
-      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach() << ", computed using the Bulk modulus." << "\n";
-      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the the free-stream velocity." << "\n";
-      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the the free-stream velocity." << "\n";
-      if (viscous) Breakdown_file << "Reynolds number: " << config[val_iZone]->GetReynolds() << ", computed using free-stream values."<< "\n";
-      Breakdown_file << "Only dimensional computation, the grid should be dimensional." << "\n";
-    }
-    
-    Breakdown_file <<"-- Input conditions:"<< "\n";
-    
-    if (compressible) {
-      switch (config[val_iZone]->GetKind_FluidModel()) {
-          
-        case STANDARD_AIR:
-          Breakdown_file << "Fluid Model: STANDARD_AIR "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: 1.4000 "<< "\n";
-          break;
-          
-        case IDEAL_GAS:
-          Breakdown_file << "Fluid Model: IDEAL_GAS "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          break;
-          
-        case VW_GAS:
-          Breakdown_file << "Fluid Model: Van der Waals "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
-          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
-          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
-          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
-          break;
-          
-        case PR_GAS:
-          Breakdown_file << "Fluid Model: Peng-Robinson "<< "\n";
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << "\n";
-          Breakdown_file << "Specific gas constant(non-dim): " << config[val_iZone]->GetGas_ConstantND()<< "\n";
-          Breakdown_file << "Specific Heat Ratio: "<< config[val_iZone]->GetGamma() << "\n";
-          Breakdown_file << "Critical Pressure:   " << config[val_iZone]->GetPressure_Critical()  << " Pa." << "\n";
-          Breakdown_file << "Critical Temperature:  " << config[val_iZone]->GetTemperature_Critical() << " K." << "\n";
-          Breakdown_file << "Critical Pressure (non-dim):   " << config[val_iZone]->GetPressure_Critical() /config[val_iZone]->GetPressure_Ref() << "\n";
-          Breakdown_file << "Critical Temperature (non-dim) :  " << config[val_iZone]->GetTemperature_Critical() /config[val_iZone]->GetTemperature_Ref() << "\n";
-          break;
-      }
-      
-      if (viscous) {
-        
-        switch (config[val_iZone]->GetKind_ViscosityModel()) {
-            
-          case CONSTANT_VISCOSITY:
-            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
-            Breakdown_file << "Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            break;
-            
-          case SUTHERLAND:
-            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
-            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
-            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
-            break;
-            
-        }
-        switch (config[val_iZone]->GetKind_ConductivityModel()) {
-            
-          case CONSTANT_PRANDTL:
-            Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
-            Breakdown_file << "Prandtl: " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
-            break;
-            
-          case CONSTANT_CONDUCTIVITY:
-            Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
-            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
-            break;
-            
-        }
-        
-        if ((Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS) || (Kind_Solver == DISC_ADJ_RANS)) {
-          switch (config[val_iZone]->GetKind_ConductivityModel_Turb()) {
-            case CONSTANT_PRANDTL_TURB:
-              Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
-              Breakdown_file << "Turbulent Prandtl: " << config[val_iZone]->GetPrandtl_Turb()<< "\n";
-              break;
-            case NO_CONDUCTIVITY_TURB:
-              Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
-              Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
-              break;
-          }
-        }
-        
-      }
-    }
-    
-    if (incompressible) {
-      Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-      Breakdown_file << "Epsilon^2 multiplier of Beta for incompressible preconditioner: " << config[val_iZone]->GetBeta_Factor();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    }
-    
-    Breakdown_file << "Free-stream static pressure: " << config[val_iZone]->GetPressure_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    Breakdown_file << "Free-stream total pressure: " << config[val_iZone]->GetPressure_FreeStream() * pow( 1.0+config[val_iZone]->GetMach()*config[val_iZone]->GetMach()*0.5*(config[val_iZone]->GetGamma()-1.0), config[val_iZone]->GetGamma()/(config[val_iZone]->GetGamma()-1.0) );
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Free-stream temperature: " << config[val_iZone]->GetTemperature_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      
-      Breakdown_file << "Free-stream total temperature: " << config[val_iZone]->GetTemperature_FreeStream() * (1.0 + config[val_iZone]->GetMach() * config[val_iZone]->GetMach() * 0.5 * (config[val_iZone]->GetGamma() - 1.0));
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-    }
-    
-    Breakdown_file << "Free-stream density: " << config[val_iZone]->GetDensity_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-    
-    if (nDim == 2) {
-      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
-    }
-    if (nDim == 3) {
-      Breakdown_file << "Free-stream velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
-    }
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
-    
-    Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Free-stream total energy per unit mass: " << config[val_iZone]->GetEnergy_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-    }
-    
-    if (viscous) {
-      Breakdown_file << "Free-stream viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      if (turbulent) {
-        Breakdown_file << "Free-stream turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-        Breakdown_file << "Free-stream specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
-      }
-    }
-    
-    if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
-    
-    /*--- Print out reference values. ---*/
-    
-    Breakdown_file <<"-- Reference values:"<< "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-    }
-    
-    Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-    }
-    
-    Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-    
-    Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
-    if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-    else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-    
-    if (compressible) {
-      Breakdown_file << "Reference energy per unit mass: " << config[val_iZone]->GetEnergy_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-    }
-    
-    if (incompressible) {
-      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
-    }
-    
-    if (viscous) {
-      Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      if (compressible){
-        Breakdown_file << "Reference conductivity: " << config[val_iZone]->GetConductivity_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " W/m^2.K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf/ft.s.R." << "\n";
-      }
-    }
-    
-    
-    if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
-    
-    /*--- Print out resulting non-dim values here. ---*/
-    
-    Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
-    Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
-    if (viscous) {
-      Breakdown_file << "Reynolds number (non-dim): " << config[val_iZone]->GetReynolds() <<". Re length: " << config[val_iZone]->GetLength_Reynolds();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft." << "\n";
-    }
-    if (gravity) {
-      Breakdown_file << "Froude number (non-dim): " << config[val_iZone]->GetFroude() << "\n";
-      Breakdown_file << "Lenght of the baseline wave (non-dim): " << 2.0*PI_NUMBER*config[val_iZone]->GetFroude()*config[val_iZone]->GetFroude() << "\n";
-    }
-    
-    if (compressible) {
-      Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
-      Breakdown_file << "Free-stream temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
-    }
-    
-    Breakdown_file << "Free-stream pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
-    
-    Breakdown_file << "Free-stream density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
-    
-    if (nDim == 2) {
-      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
-    } else {
-      Breakdown_file << "Free-stream velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-      Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
-    }
-    Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
-    
-    if (compressible)
-      Breakdown_file << "Free-stream total energy per unit mass (non-dim): " << config[val_iZone]->GetEnergy_FreeStreamND() << "\n";
-    
-    if (viscous) {
-      Breakdown_file << "Free-stream viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
-      if (turbulent) {
-        Breakdown_file << "Free-stream turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
-        Breakdown_file << "Free-stream specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
-      }
-    }
-    
-    if (unsteady) {
-      Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
-      Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
-    }
-
-    } else {
-
-    /*--- Incompressible version of the console output ---*/
-
-      bool energy     = config[val_iZone]->GetEnergy_Equation();
-      bool boussinesq = (config[val_iZone]->GetKind_DensityModel() == BOUSSINESQ);
-
-      if (config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, temp_ref, p_ref" << "\n";
-        Breakdown_file << "are set to 1.0 in order to perform a dimensional calculation." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
-      }
-      else if (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
-        Breakdown_file << "are based on the initial values, p_ref = rho_ref*vel_ref^2." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
-      }
-      else if (config[val_iZone]->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
-        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
-        Breakdown_file << "are user-provided reference values, p_ref = rho_ref*vel_ref^2." << "\n";
-        if (grid_movement) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
-        else Breakdown_file << "Force coefficients computed using reference values." << "\n";
-      }
-      Breakdown_file << "The reference area for force coeffs. is " << config[val_iZone]->GetRefArea() << " m^2." << "\n";
-      Breakdown_file << "The reference length for force coeffs. is " << config[val_iZone]->GetRefLength() << " m." << "\n";
-
-      Breakdown_file << "The pressure is decomposed into thermodynamic and dynamic components." << "\n";
-      Breakdown_file << "The initial value of the dynamic pressure is 0." << "\n";
-
-      Breakdown_file << "Mach number: "<< config[val_iZone]->GetMach();
-      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
-        Breakdown_file << ", computed using the Bulk modulus." << "\n";
-      } else {
-        Breakdown_file << ", computed using fluid speed of sound." << "\n";
-      }
-
-      Breakdown_file << "For external flows, the initial state is imposed at the far-field." << "\n";
-      Breakdown_file << "Angle of attack (deg): "<< config[val_iZone]->GetAoA() << ", computed using the initial velocity." << "\n";
-      Breakdown_file << "Side slip angle (deg): "<< config[val_iZone]->GetAoS() << ", computed using the initial velocity." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Reynolds number per meter: " << config[val_iZone]->GetReynolds() << ", computed using initial values."<< "\n";
-        Breakdown_file << "Reynolds number is a byproduct of inputs only (not used internally)." << "\n";
-      }
-      Breakdown_file << "SI units only. The grid should be dimensional (meters)." << "\n";
-
-      switch (config[val_iZone]->GetKind_DensityModel()) {
-
-        case CONSTANT:
-          if (energy) Breakdown_file << "Energy equation is active and decoupled." << "\n";
-          else Breakdown_file << "No energy equation." << "\n";
-          break;
-
-        case BOUSSINESQ:
-          if (energy) Breakdown_file << "Energy equation is active and coupled through Boussinesq approx." << "\n";
-          break;
-
-        case VARIABLE:
-          if (energy) Breakdown_file << "Energy equation is active and coupled for variable density." << "\n";
-          break;
-
-      }
-
-      Breakdown_file <<"-- Input conditions:"<< "\n";
-
-      switch (config[val_iZone]->GetKind_FluidModel()) {
-
-        case CONSTANT_DENSITY:
-          Breakdown_file << "Fluid Model: CONSTANT_DENSITY "<< "\n";
-          if (energy) {
-            Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << "\n";
-          }
-          if (boussinesq) Breakdown_file << "Thermal expansion coefficient: " << config[val_iZone]->GetThermal_Expansion_Coeff() << " K^-1." << "\n";
-          Breakdown_file << "Thermodynamic pressure not required." << "\n";
-          break;
-
-        case INC_IDEAL_GAS:
-          Breakdown_file << "Fluid Model: INC_IDEAL_GAS "<< endl;
-          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
-          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
-          Breakdown_file << "Specific heat at constant pressure (Cp): " << config[val_iZone]->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
-          Breakdown_file << "Molecular weight : "<< config[val_iZone]->GetMolecular_Weight() << " g/mol" << endl;
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << endl;
-          Breakdown_file << "Thermodynamic pressure: " << config[val_iZone]->GetPressure_Thermodynamic();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
-          break;
-          
-        case INC_IDEAL_GAS_POLY:
-          Breakdown_file << "Fluid Model: INC_IDEAL_GAS_POLY "<< endl;
-          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
-          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
-          Breakdown_file << "Molecular weight: " << config[val_iZone]->GetMolecular_Weight() << " g/mol." << endl;
-          Breakdown_file << "Specific gas constant: " << config[val_iZone]->GetGas_Constant() << " N.m/kg.K." << endl;
-          Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << endl;
-          Breakdown_file << "Thermodynamic pressure: " << config[val_iZone]->GetPressure_Thermodynamic();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
-          Breakdown_file << "Cp(T) polynomial coefficients: \n  (";
-          for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-            Breakdown_file << config[val_iZone]->GetCp_PolyCoeff(iVar);
-            if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-          }
-          Breakdown_file << ")." << endl;
-          Breakdown_file << "Cp(T) polynomial coefficients (non-dim.): \n  (";
-          for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-            Breakdown_file << config[val_iZone]->GetCp_PolyCoeffND(iVar);
-            if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-          }
-          Breakdown_file << ")." << endl;
-          break;
-
-      }
-      if (viscous) {
-        switch (config[val_iZone]->GetKind_ViscosityModel()) {
-
-          case CONSTANT_VISCOSITY:
-            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
-            Breakdown_file << "Constant Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            break;
-
-          case SUTHERLAND:
-            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
-            Breakdown_file << "Ref. Laminar Viscosity: " << config[val_iZone]->GetMu_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Ref. Temperature: " << config[val_iZone]->GetMu_Temperature_Ref();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Sutherland Constant: "<< config[val_iZone]->GetMu_S();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
-            Breakdown_file << "Ref. Temperature (non-dim): " << config[val_iZone]->GetMu_Temperature_RefND()<< "\n";
-            Breakdown_file << "Sutherland constant (non-dim): "<< config[val_iZone]->GetMu_SND()<< "\n";
-            break;
-            
-          case POLYNOMIAL_VISCOSITY:
-            Breakdown_file << "Viscosity Model: POLYNOMIAL_VISCOSITY  "<< endl;
-            Breakdown_file << "Mu(T) polynomial coefficients: \n  (";
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-              Breakdown_file << config[val_iZone]->GetMu_PolyCoeff(iVar);
-              if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-            }
-            Breakdown_file << ")." << endl;
-            Breakdown_file << "Mu(T) polynomial coefficients (non-dim.): \n  (";
-            for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-              Breakdown_file << config[val_iZone]->GetMu_PolyCoeffND(iVar);
-              if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-            }
-            Breakdown_file << ")." << endl;
-            break;
-
-        }
-
-        if (energy) {
-          switch (config[val_iZone]->GetKind_ConductivityModel()) {
-
-            case CONSTANT_PRANDTL:
-              Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
-              Breakdown_file << "Prandtl (Laminar): " << config[val_iZone]->GetPrandtl_Lam()<< "\n";
-              break;
-
-            case CONSTANT_CONDUCTIVITY:
-              Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
-              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
-              break;
-
-            case POLYNOMIAL_CONDUCTIVITY:
-              Breakdown_file << "Viscosity Model: POLYNOMIAL_CONDUCTIVITY "<< endl;
-              Breakdown_file << "Kt(T) polynomial coefficients: \n  (";
-              for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-                Breakdown_file << config[val_iZone]->GetKt_PolyCoeff(iVar);
-                if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-              }
-              Breakdown_file << ")." << endl;
-              Breakdown_file << "Kt(T) polynomial coefficients (non-dim.): \n  (";
-              for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnPolyCoeffs(); iVar++) {
-                Breakdown_file << config[val_iZone]->GetKt_PolyCoeffND(iVar);
-                if (iVar < config[val_iZone]->GetnPolyCoeffs()-1) Breakdown_file << ", ";
-              }
-              Breakdown_file << ")." << endl;
-              break;
-              
-          }
-          
-          if ((Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS) || (Kind_Solver == DISC_ADJ_RANS)) {
-            switch (config[val_iZone]->GetKind_ConductivityModel_Turb()) {
-              case CONSTANT_PRANDTL_TURB:
-                Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
-                Breakdown_file << "Turbulent Prandtl: " << config[val_iZone]->GetPrandtl_Turb()<< "\n";
-                break;
-              case NO_CONDUCTIVITY_TURB:
-                Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
-                Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
-                break;
-            }
-          }
-          
-        }
-
-      }
-
-      if (config[val_iZone]->GetKind_FluidModel() == CONSTANT_DENSITY) {
-        Breakdown_file << "Bulk modulus: " << config[val_iZone]->GetBulk_Modulus();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-      }
-
-      Breakdown_file << "Initial dynamic pressure: " << config[val_iZone]->GetPressure_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      Breakdown_file << "Initial total pressure: " << config[val_iZone]->GetPressure_FreeStream() + 0.5*config[val_iZone]->GetDensity_FreeStream()*config[val_iZone]->GetModVel_FreeStream()*config[val_iZone]->GetModVel_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      if (energy) {
-        Breakdown_file << "Initial temperature: " << config[val_iZone]->GetTemperature_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      }
-
-      Breakdown_file << "Initial density: " << config[val_iZone]->GetDensity_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-
-      if (nDim == 2) {
-        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ")";
-      }
-      if (nDim == 3) {
-        Breakdown_file << "Initial velocity: (" << config[val_iZone]->GetVelocity_FreeStream()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStream()[1] << ", " << config[val_iZone]->GetVelocity_FreeStream()[2] << ")";
-      }
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
-
-      Breakdown_file << "Magnitude: "  << config[val_iZone]->GetModVel_FreeStream();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Initial laminar viscosity: " << config[val_iZone]->GetViscosity_FreeStream();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-        if (turbulent) {
-          Breakdown_file << "Initial turb. kinetic energy per unit mass: " << config[val_iZone]->GetTke_FreeStream();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
-          Breakdown_file << "Initial specific dissipation: " << config[val_iZone]->GetOmega_FreeStream();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
-        }
-      }
-
-      if (unsteady) { Breakdown_file << "Total time: " << config[val_iZone]->GetTotal_UnstTime() << " s. Time step: " << config[val_iZone]->GetDelta_UnstTime() << " s." << "\n"; }
-
-      /*--- Print out reference values. ---*/
-
-      Breakdown_file <<"-- Reference values:"<< "\n";
-
-      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
-        Breakdown_file << "Reference specific gas constant: " << config[val_iZone]->GetGas_Constant_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-      } else {
-        if (energy) {
-          Breakdown_file << "Reference specific heat: " << config[val_iZone]->GetGas_Constant_Ref();
-          if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
-          else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
-        }
-      }
-
-      Breakdown_file << "Reference pressure: " << config[val_iZone]->GetPressure_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
-
-      if (energy) {
-        Breakdown_file << "Reference temperature: " << config[val_iZone]->GetTemperature_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
-      }
-
-      Breakdown_file << "Reference density: " << config[val_iZone]->GetDensity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
-
-      Breakdown_file << "Reference velocity: " << config[val_iZone]->GetVelocity_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
-
-      Breakdown_file << "Reference length: " << config[val_iZone]->GetLength_Ref();
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
-      else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
-
-      if (viscous) {
-        Breakdown_file << "Reference viscosity: " << config[val_iZone]->GetViscosity_Ref();
-        if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-        else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-      }
-
-      if (unsteady) Breakdown_file << "Reference time: " << config[val_iZone]->GetTime_Ref() <<" s." << "\n";
-
-      /*--- Print out resulting non-dim values here. ---*/
-
-      Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
-      Breakdown_file << "Mach number (non-dim): " << config[val_iZone]->GetMach() << "\n";
-      if (viscous) {
-        Breakdown_file << "Reynolds number (per m): " << config[val_iZone]->GetReynolds() << "\n";
-      }
-
-      if (config[val_iZone]->GetKind_FluidModel() != CONSTANT_DENSITY) {
-        Breakdown_file << "Specific gas constant (non-dim): " << config[val_iZone]->GetGas_ConstantND() << "\n";
-        Breakdown_file << "Initial thermodynamic pressure (non-dim): " << config[val_iZone]->GetPressure_ThermodynamicND() << "\n";
-      } else {
-        if (energy) {
-          Breakdown_file << "Specific heat at constant pressure (non-dim): " << config[val_iZone]->GetSpecific_Heat_CpND() << "\n";
-          if (boussinesq) Breakdown_file << "Thermal expansion coefficient (non-dim.): " << config[val_iZone]->GetThermal_Expansion_CoeffND() << " K^-1." << "\n";
-        }
-      }
-
-      if (energy) Breakdown_file << "Initial temperature (non-dim): " << config[val_iZone]->GetTemperature_FreeStreamND() << "\n";
-      Breakdown_file << "Initial pressure (non-dim): " << config[val_iZone]->GetPressure_FreeStreamND() << "\n";
-      Breakdown_file << "Initial density (non-dim): " << config[val_iZone]->GetDensity_FreeStreamND() << "\n";
-
-      if (nDim == 2) {
-        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << "). ";
-      } else {
-        Breakdown_file << "Initial velocity (non-dim): (" << config[val_iZone]->GetVelocity_FreeStreamND()[0] << ", ";
-        Breakdown_file << config[val_iZone]->GetVelocity_FreeStreamND()[1] << ", " << config[val_iZone]->GetVelocity_FreeStreamND()[2] << "). ";
-      }
-      Breakdown_file << "Magnitude: "   << config[val_iZone]->GetModVel_FreeStreamND() << "\n";
-      
-      if (viscous) {
-        Breakdown_file << "Initial viscosity (non-dim): " << config[val_iZone]->GetViscosity_FreeStreamND() << "\n";
-        if (turbulent) {
-          Breakdown_file << "Initial turb. kinetic energy (non-dim): " << config[val_iZone]->GetTke_FreeStreamND() << "\n";
-          Breakdown_file << "Initial specific dissipation (non-dim): " << config[val_iZone]->GetOmega_FreeStreamND() << "\n";
-        }
-      }
-      
-      if (unsteady) {
-        Breakdown_file << "Total time (non-dim): " << config[val_iZone]->GetTotal_UnstTimeND() << "\n";
-        Breakdown_file << "Time step (non-dim): " << config[val_iZone]->GetDelta_UnstTimeND() << "\n";
-      }
-
-    }
-
-    /*--- Begin forces breakdown info. ---*/
-    
-    Breakdown_file << fixed;
-    Breakdown_file << "\n" << "\n" <<"Forces breakdown:" << "\n" << "\n";
-
-    if (nDim == 3) {
-      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFz()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      su2double term = (Total_CoPz/m)-Total_CoPx;
-      
-      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z-"<< term << "." << "\n\n";
-      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z+"<< fabs(term);
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
-      else Breakdown_file << " in." << "\n\n";
-    }
-    else {
-      su2double m = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFy()/solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetTotal_CFx();
-      su2double term = (Total_CoPy/m)-Total_CoPx;
-      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y-"<< term << "." << "\n\n";
-      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y+"<< fabs(term);
-      if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
-      else Breakdown_file << " in." << "\n\n";
-    }
-
-    /*--- Reference area and force factors. ---*/
-
-    su2double RefDensity, RefArea, RefVel, Factor, Ref;
-    RefArea     = config[val_iZone]->GetRefArea();
-    if (compressible) {
-      RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
-      RefVel = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetModVelocity_Inf();
-    } else {
-      if ((config[val_iZone]->GetRef_Inc_NonDim() == DIMENSIONAL) ||
-          (config[val_iZone]->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
-        RefDensity  = solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetDensity_Inf();
-        RefVel = 0.0;
-        for (iDim = 0; iDim < nDim; iDim++)
-          RefVel  += solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim)*solver[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetVelocity_Inf(iDim);
-        RefVel = sqrt(RefVel);
-      } else {
-        RefDensity = config[val_iZone]->GetInc_Density_Ref();
-        RefVel    = config[val_iZone]->GetInc_Velocity_Ref();
-      }
-    }
-    Factor = (0.5*RefDensity*RefArea*RefVel*RefVel);
-    Ref = config[val_iZone]->GetDensity_Ref() * config[val_iZone]->GetVelocity_Ref() * config[val_iZone]->GetVelocity_Ref() * 1.0 * 1.0;
-
-    Breakdown_file << "NOTE: Multiply forces by the non-dimensional factor: " << Factor << ", and the reference factor: " << Ref  << "\n";
-    Breakdown_file << "to obtain the dimensional force."  << "\n" << "\n";
-
-    Breakdown_file << "Total CL:    ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CL;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CL;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CL;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CL * 100.0) / (Total_CL + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CL << "\n";
-    
-    Breakdown_file << "Total CD:    ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CD;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CD;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CD;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CD * 100.0) / (Total_CD + EPS)) << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CD << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CSF:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CSF;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CSF;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file <<  SU2_TYPE::Int((Visc_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CSF;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CSF * 100.0) / (Total_CSF + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CSF << "\n";
-    }
-    
-    Breakdown_file << "Total CL/CD: ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CEff;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CEff;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file <<  SU2_TYPE::Int((Visc_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CEff;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CEff * 100.0) / (Total_CEff + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CEff << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CMx:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CMx;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CMx;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CMx;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CMx * 100.0) / (Total_CMx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CMx << "\n";
-      
-      Breakdown_file << "Total CMy:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CMy;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CMy * 100.0) / (Total_CMy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CMy;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CMy * 100.0) / (Total_CMy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CMy;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CMy << "\n";
-    }
-    
-    Breakdown_file << "Total CMz:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CMz;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CMz;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CMz;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CMz << "\n";
-    
-    Breakdown_file << "Total CFx:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CFx;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CFx;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CFx;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CFx * 100.0) / (Total_CFx + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CFx << "\n";
-    
-    Breakdown_file << "Total CFy:   ";
-    Breakdown_file.width(11);
-    Breakdown_file << Total_CFy;
-    Breakdown_file << " | Pressure (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Inv_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Inv_CFy;
-    Breakdown_file << " | Friction (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Visc_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Visc_CFy;
-    Breakdown_file << " | Momentum (";
-    Breakdown_file.width(5);
-    Breakdown_file << SU2_TYPE::Int((Mnt_CFy * 100.0) / (Total_CFy + EPS));
-    Breakdown_file << "%): ";
-    Breakdown_file.width(11);
-    Breakdown_file << Mnt_CFy << "\n";
-    
-    if (nDim == 3) {
-      Breakdown_file << "Total CFz:   ";
-      Breakdown_file.width(11);
-      Breakdown_file << Total_CFz;
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Inv_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Inv_CFz;
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Visc_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Visc_CFz;
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file << SU2_TYPE::Int((Mnt_CFz * 100.0) / (Total_CFz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Mnt_CFz << "\n";
-    }
-    
-    Breakdown_file << "\n" << "\n";
-    
-    for (iMarker_Monitoring = 0;
-         iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring();
-         iMarker_Monitoring++) {
-      
-      Breakdown_file << "Surface name: "
-      << config[val_iZone]->GetMarker_Monitoring_TagBound(
-                                                          iMarker_Monitoring) << "\n" << "\n";
-      
-      Breakdown_file << "Total CL    (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL[iMarker_Monitoring] * 100.0)
-                       / (Total_CL + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CL_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CL[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CL_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CD    (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD[iMarker_Monitoring] * 100.0)
-                       / (Total_CD + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CD_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CD[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CD_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        Breakdown_file << "Total CSF   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF[iMarker_Monitoring] * 100.0)
-                         / (Total_CSF + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CSF[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CSF_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CSF_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CSF_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CSF[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CSF_Mnt[iMarker_Monitoring] << "\n";
-      }
-      
-      Breakdown_file << "Total CL/CD (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff[iMarker_Monitoring] * 100.0) / (Total_CEff + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CEff[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CEff_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CEff_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CEff_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CEff[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CEff_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        
-        Breakdown_file << "Total CMx   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx[iMarker_Monitoring] * 100.0) / (Total_CMx + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMx[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMx_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMx_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMx_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMx[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMx_Mnt[iMarker_Monitoring] << "\n";
-        
-        Breakdown_file << "Total CMy   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy[iMarker_Monitoring] * 100.0) / (Total_CMy + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMy[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CMy_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMy_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CMy_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CMy[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CMy_Mnt[iMarker_Monitoring] << "\n";
-      }
-      
-      Breakdown_file << "Total CMz   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CMz[iMarker_Monitoring] * 100.0) / (Total_CMz + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CMz[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CMz_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CMz_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CMz_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CMz[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CMz_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CFx   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CFx[iMarker_Monitoring] * 100.0) / (Total_CFx + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFx[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFx_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFx_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFx_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFx[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFx_Mnt[iMarker_Monitoring] << "\n";
-      
-      Breakdown_file << "Total CFy   (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int((Surface_CFy[iMarker_Monitoring] * 100.0) / (Total_CFy + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFy[iMarker_Monitoring];
-      Breakdown_file << " | Pressure (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Inv[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file << Surface_CFy_Inv[iMarker_Monitoring];
-      Breakdown_file << " | Friction (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Visc[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFy_Visc[iMarker_Monitoring];
-      Breakdown_file << " | Momentum (";
-      Breakdown_file.width(5);
-      Breakdown_file
-      << SU2_TYPE::Int(
-                       (Surface_CFy_Mnt[iMarker_Monitoring] * 100.0)
-                       / (Surface_CFy[iMarker_Monitoring] + EPS));
-      Breakdown_file << "%): ";
-      Breakdown_file.width(11);
-      Breakdown_file
-      << Surface_CFy_Mnt[iMarker_Monitoring] << "\n";
-      
-      if (nDim == 3) {
-        Breakdown_file << "Total CFz   (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz[iMarker_Monitoring] * 100.0) / (Total_CFz + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CFz[iMarker_Monitoring];
-        Breakdown_file << " | Pressure (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Inv[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file << Surface_CFz_Inv[iMarker_Monitoring];
-        Breakdown_file << " | Friction (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Visc[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CFz_Visc[iMarker_Monitoring];
-        Breakdown_file << " | Momentum (";
-        Breakdown_file.width(5);
-        Breakdown_file
-        << SU2_TYPE::Int(
-                         (Surface_CFz_Mnt[iMarker_Monitoring] * 100.0)
-                         / (Surface_CFz[iMarker_Monitoring] + EPS));
-        Breakdown_file << "%): ";
-        Breakdown_file.width(11);
-        Breakdown_file
-        << Surface_CFz_Mnt[iMarker_Monitoring] << "\n";
-        
-      }
-      
-      Breakdown_file << "\n";
-      
-      
-    }
-    
-    delete [] Surface_CL;
-    delete [] Surface_CD;
-    delete [] Surface_CSF;
-    delete [] Surface_CEff;
-    delete [] Surface_CFx;
-    delete [] Surface_CFy;
-    delete [] Surface_CFz;
-    delete [] Surface_CMx;
-    delete [] Surface_CMy;
-    delete [] Surface_CMz;
-    
-    delete [] Surface_CL_Inv;
-    delete [] Surface_CD_Inv;
-    delete [] Surface_CSF_Inv;
-    delete [] Surface_CEff_Inv;
-    delete [] Surface_CFx_Inv;
-    delete [] Surface_CFy_Inv;
-    delete [] Surface_CFz_Inv;
-    delete [] Surface_CMx_Inv;
-    delete [] Surface_CMy_Inv;
-    delete [] Surface_CMz_Inv;
-    
-    delete [] Surface_CL_Visc;
-    delete [] Surface_CD_Visc;
-    delete [] Surface_CSF_Visc;
-    delete [] Surface_CEff_Visc;
-    delete [] Surface_CFx_Visc;
-    delete [] Surface_CFy_Visc;
-    delete [] Surface_CFz_Visc;
-    delete [] Surface_CMx_Visc;
-    delete [] Surface_CMy_Visc;
-    delete [] Surface_CMz_Visc;
-
-    delete [] Surface_CL_Mnt;
-    delete [] Surface_CD_Mnt;
-    delete [] Surface_CSF_Mnt;
-    delete [] Surface_CEff_Mnt;
-    delete [] Surface_CFx_Mnt;
-    delete [] Surface_CFy_Mnt;
-    delete [] Surface_CFz_Mnt;
-    delete [] Surface_CMx_Mnt;
-    delete [] Surface_CMy_Mnt;
-    delete [] Surface_CMz_Mnt;
-
-    Breakdown_file.close();
-    
-  }
-  
-}
-
-void COutput::SetResult_Files(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                              unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-    bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-    bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
-
-#ifdef HAVE_MPI
-    /*--- Do not merge the volume solutions if we are running in parallel.
-     Force the use of SU2_SOL to merge the volume sols in this case. ---*/
-    
-    SU2_MPI::Comm_size(MPI_COMM_WORLD, &size);
-    if (size > SINGLE_NODE) {
-      Wrt_Vol = false;
-      Wrt_Srf = false;
-    }
-#endif
-    
-    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-        
-      case EULER : case NAVIER_STOKES : case RANS :
-      case FEM_EULER : case FEM_NAVIER_STOKES : case FEM_RANS : case FEM_LES :
-        
-        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-        break;
-        
-
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS : case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL], solver_container[iZone][INST_0][MESH_0][FLOW_SOL], iExtIter, iZone, INST_0);
-        break;
-        
-    }
-    
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
-    /*--- Merge the node coordinates and connectivity, if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (Wrt_Vol || Wrt_Srf) {
-      if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-      MergeConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-    }
-    
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
-    
-    if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-      if (FileFormat == TECPLOT_BINARY) {
-        if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
-        SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-        SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-        if (!wrote_base_file)
-          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-        if (!wrote_surf_file)
-          DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], wrote_surf_file);
-      }
-    }
-    
-    /*--- Merge the solution data needed for volume solutions and restarts ---*/
-    
-    if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-    MergeSolution(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
-    
-    /*--- Write restart, or Tecplot files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-    
-    if (rank == MASTER_NODE) {
-      
-      /*--- Write a native restart file ---*/
-      
-      if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
-      SetRestart(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone);
-      
-      if (Wrt_Vol) {
-        
-        switch (FileFormat) {
-            
-          case TECPLOT:
-            
-            /*--- Write a Tecplot ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case FIELDVIEW:
-            
-            /*--- Write a FieldView ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case TECPLOT_BINARY:
-            
-            /*--- Write a Tecplot binary solution file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-            break;
-            
-          case FIELDVIEW_BINARY:
-            
-            /*--- Write a FieldView binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case PARAVIEW:
-            
-            /*--- Write a Paraview ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
-            
-            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
-            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
-          default:
-            break;
-        }
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        switch (FileFormat) {
-            
-          case TECPLOT:
-            
-            /*--- Write a Tecplot ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0] , iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-            break;
-            
-          case TECPLOT_BINARY:
-            
-            /*--- Write a Tecplot binary solution file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
-            break;
-            
-          case PARAVIEW:
-            
-            /*--- Write a Paraview ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
-            
-            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
-            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], true);
-            break;
-            
-          default:
-            break;
-        }
-        
-      }
-      
-      /*--- Release memory needed for merging the solution data. ---*/
-      
-      DeallocateCoordinates(config[iZone], geometry[iZone][INST_0][MESH_0]);
-      DeallocateSolution(config[iZone], geometry[iZone][INST_0][MESH_0]);
-      
-    }
-    
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-  }
-}
-
-void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                      unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone, iInst, nInst;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    nInst = config[iZone]->GetnTimeInstances();
-
-    for (iInst = 0; iInst < nInst; iInst++) {
-
-      config[iZone]->SetiInst(iInst);
-
-      /*--- Flags identifying the types of files to be written. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-
-      /*--- Get the file output format ---*/
-
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-
-      /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
-      }
-
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-      }
-
-      /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-
-
-      if (rank == MASTER_NODE) {
-
-        if (Wrt_Vol) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- Write a FieldView ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
-            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- Write a binary binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-              
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
-            
-            if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
-            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
-            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a ParaView ASCII file instead for now in serial. ---*/
-            
-            if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
-            if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-              
-          default:
-            break;
-          }
-          
-        }
-        
-        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
-          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-        }
-        
-        if (FileFormat == TECPLOT_BINARY) {
-          if (!wrote_base_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-          if (!wrote_surf_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-        }
-
-        if (Wrt_Vol || Wrt_Srf)
-          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-      }
-
-
-
-      /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-
-    }
-
-  }
-}
-
-void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
-
-  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-  unsigned short iZone;
-  ofstream output_file;
-  string str;
-
-  /*--- Read the name of the output and input file ---*/
-
-  if (su2_file) {
-    if (rank == MASTER_NODE) {
-      str = config[ZONE_0]->GetMesh_Out_FileName();
-      strcpy (out_file, str.c_str());
-      strcpy (cstr, out_file);
-      output_file.precision(15);
-      output_file.open(cstr, ios::out);
-      if (val_nZone > 1) {
-        output_file << "NZONE= " << val_nZone << endl;
-      }
-    }
-  }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
-    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
-    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
-    
-    /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
-    MergeConnectivity(config[iZone], geometry[iZone], iZone);
-    
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone]);
-    
-    /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-    
-    if (rank == MASTER_NODE) {
-      
-      if (Wrt_Vol) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
-
-        /*--- Write a Tecplot ASCII file ---*/
-
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        }
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-        
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        }
-        
-      }
-      
-      /*--- Write a .su2 ASCII file ---*/
-
-      if (su2_file) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
-        
-        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
-        
-        /*--- Write an stl surface file ---*/
-        
-        if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
-        
-        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
-        
-      }
-      
-      /*--- Write a binary file with the grid coordinates alone. ---*/
-      
-      if (Wrt_Crd) {
-        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
-        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
-      }
-
-      
-      /*--- Deallocate connectivity ---*/
-      
-      DeallocateConnectivity(config[iZone], geometry[iZone], true);
-      DeallocateConnectivity(config[iZone], geometry[iZone], false);
-      DeallocateCoordinates(config[iZone], geometry[iZone]);
-      
-    }
-
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-    /*--- Write an csv surface file, done in parallel ---*/
-
-    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
-
-    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
-
-  }
-
-  if (rank == MASTER_NODE) {
-    if (su2_file){
-      output_file.close();
-    }
-  }
-}
-
-void COutput::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  short iSection, nSection;
-  unsigned long iVertex, iPoint, Trailing_Point;
-  su2double *Plane_P0, *Plane_P0_, *Plane_Normal, *Plane_Normal_, *CPressure,
-  Force[3], ForceInviscid[3], MomentInviscid[3] =
-  { 0.0, 0.0, 0.0 }, MomentDist[3] = { 0.0, 0.0, 0.0 }, RefDensity,
-  RefPressure, RefArea, *Velocity_Inf, Gas_Constant, Mach2Vel,
-  Mach_Motion, Gamma, RefVel2 = 0.0, factor, NDPressure, *Origin,
-  RefLength, Alpha, CL_Inv,
-  Xcoord_LeadingEdge = 0.0, Ycoord_LeadingEdge = 0.0, Zcoord_LeadingEdge = 0.0,
-  Xcoord_TrailingEdge = 0.0, Ycoord_TrailingEdge = 0.0, Zcoord_TrailingEdge = 0.0,
-  Xcoord_LeadingEdge_ = 0.0, 
-  Xcoord_TrailingEdge_ = 0.0, Ycoord_TrailingEdge_ = 0.0, Zcoord_TrailingEdge_ = 0.0,
-  MaxDistance, Distance, Chord, Aux, Dihedral_Trailing;
-  
-  su2double B, Y, C_L, C_L0, Elliptic_Spanload;
-  
-  vector<su2double> Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
-  CPressure_Airfoil;
-  vector<su2double> Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
-  CPressure_Airfoil_;
-  string Marker_Tag, Slice_Filename, Slice_Ext;
-  ofstream Cp_File;
-  unsigned short iDim;
-  
-  bool grid_movement = config->GetGrid_Movement();
-  
-  Plane_P0 = new su2double[3];
-  Plane_P0_ = new su2double[3];
-  Plane_Normal = new su2double[3];
-  Plane_Normal_ = new su2double[3];
-  CPressure = new su2double[geometry->GetnPoint()];
-  
-  if ((rank == MASTER_NODE) && (output)) {
-    cout << endl << "Writing the spanload file (load_distribution.dat).";
-  }
-  
-  /*--- Compute some reference quantities and necessary values ---*/
-  
-  RefDensity = solver->GetDensity_Inf();
-  RefPressure = solver->GetPressure_Inf();
-  RefArea = config->GetRefArea();
-  Velocity_Inf = solver->GetVelocity_Inf();
-  Gamma = config->GetGamma();
-  Origin = config->GetRefOriginMoment(0);
-  RefLength = config->GetRefLength();
-  Alpha = config->GetAoA() * PI_NUMBER / 180.0;
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(
-                    Gamma * Gas_Constant * config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion * Mach2Vel) * (Mach_Motion * Mach2Vel);
-  } else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-      RefVel2 += Velocity_Inf[iDim] * Velocity_Inf[iDim];
-  }
-  factor = 1.0 / (0.5 * RefDensity * RefArea * RefVel2);
-  
-  if (geometry->GetnDim() == 3) {
-    
-    /*--- Copy the pressure to an auxiliar structure ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      CPressure[iPoint] = (solver->node[iPoint]->GetPressure()
-                           - RefPressure) * factor * RefArea;
-    }
-    
-    nSection = config->GetnLocationStations();
-    
-    for (iSection = 0; iSection < nSection; iSection++) {
-      
-      /*--- Read the values from the config file ---*/
-      
-      Plane_Normal[0] = 0.0; Plane_P0[0] = 0.0;
-      Plane_Normal[1] = 0.0; Plane_P0[1] = 0.0;
-      Plane_Normal[2] = 0.0; Plane_P0[2] = 0.0;
-      
-      if (config->GetGeo_Description() == FUSELAGE) {
-        Plane_Normal[0] = 1.0;
-        Plane_P0[0] = config->GetLocationStations(iSection);
-      }
-      else if (config->GetGeo_Description() == NACELLE) {
-        Plane_Normal[0] = 0.0;
-        Plane_Normal[1] = -sin(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
-        Plane_Normal[2] = cos(config->GetLocationStations(iSection)*PI_NUMBER/180.0);
-        
-        /*--- Apply tilt angle to the plane ---*/
-        
-        su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-        su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-        su2double Plane_NormalY_Tilt = Plane_Normal[1];
-        su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-        
-        /*--- Apply toe angle to the plane ---*/
-        
-        su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-        su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-        su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-        su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-        
-        /*--- Update normal vector ---*/
-        
-        Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-        Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-        Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-        
-      }
-      else {
-        Plane_Normal[1] = 1.0;
-        Plane_P0[1] = config->GetLocationStations(iSection);
-      }
-
-      /*--- Compute the airfoil sections (note that we feed in the Cp) ---*/
-      
-      geometry->ComputeAirfoil_Section(Plane_P0, Plane_Normal, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
-                                       CPressure, Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
-                                       CPressure_Airfoil, true, config);
-      
-      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() == 0)) {
-        if ((config->GetGeo_Description() == FUSELAGE) || (config->GetGeo_Description() == WING))
-          cout << endl << "Please check the config file, the section (" << Plane_P0[0] <<", " << Plane_P0[1] <<", " << Plane_P0[2] << ") has not been detected." << endl;
-        if (config->GetGeo_Description() == NACELLE)
-          cout << endl << "Please check the config file, the section (" << Plane_Normal[0] <<", " << Plane_Normal[1] <<", " << Plane_Normal[2] << ") has not been detected." << endl;
-      }
-      
-      
-      /*--- Compute dihedral using a step in the station value ---*/
-      
-      Plane_P0_[0] = 0.0; Plane_Normal_[0] = 0.0;
-      Plane_P0_[1] = 0.0; Plane_Normal_[1] = 0.0;
-      Plane_P0_[2] = 0.0; Plane_Normal_[2] = 0.0;
-
-      if (config->GetGeo_Description() == FUSELAGE) {
-        Plane_Normal_[0] = 1.0;
-        if (iSection == 0) Plane_P0_[0] = config->GetLocationStations(iSection) + 0.01;
-        else Plane_P0_[0] = config->GetLocationStations(iSection) - 0.01;
-      }
-      else if (config->GetGeo_Description() == NACELLE) {
-        if (iSection == 0) {
-          Plane_Normal_[0] = 0.0;
-          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
-          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) + 0.01)*PI_NUMBER/180.0);
-          
-          /*--- Apply tilt angle to the plane ---*/
-          
-          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-          su2double Plane_NormalY_Tilt = Plane_Normal[1];
-          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-          
-          /*--- Apply toe angle to the plane ---*/
-          
-          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-          
-          /*--- Update normal vector ---*/
-          
-          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-          
-        }
-        else {
-          Plane_Normal_[0] = 0.0;
-          Plane_Normal_[1] = -sin((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
-          Plane_Normal_[2] = cos((config->GetLocationStations(iSection) - 0.01)*PI_NUMBER/180.0);
-          
-          /*--- Apply tilt angle to the plane ---*/
-          
-          su2double Tilt_Angle = config->GetNacelleLocation(3)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt = Plane_Normal[0]*cos(Tilt_Angle) + Plane_Normal[2]*sin(Tilt_Angle);
-          su2double Plane_NormalY_Tilt = Plane_Normal[1];
-          su2double Plane_NormalZ_Tilt = Plane_Normal[2]*cos(Tilt_Angle) - Plane_Normal[0]*sin(Tilt_Angle);
-          
-          /*--- Apply toe angle to the plane ---*/
-          
-          su2double Toe_Angle = config->GetNacelleLocation(4)*PI_NUMBER/180;
-          su2double Plane_NormalX_Tilt_Toe = Plane_NormalX_Tilt*cos(Toe_Angle) - Plane_NormalY_Tilt*sin(Toe_Angle);
-          su2double Plane_NormalY_Tilt_Toe = Plane_NormalX_Tilt*sin(Toe_Angle) + Plane_NormalY_Tilt*cos(Toe_Angle);
-          su2double Plane_NormalZ_Tilt_Toe = Plane_NormalZ_Tilt;
-          
-          /*--- Update normal vector ---*/
-          
-          Plane_Normal[0] = Plane_NormalX_Tilt_Toe;
-          Plane_Normal[1] = Plane_NormalY_Tilt_Toe;
-          Plane_Normal[2] = Plane_NormalZ_Tilt_Toe;
-          
-        }
-      }
-      else {
-        Plane_Normal_[1] = 1.0;
-        if (iSection == 0) Plane_P0_[1] = config->GetLocationStations(iSection) + 0.01;
-        else Plane_P0_[1] = config->GetLocationStations(iSection) - 0.01;
-      }
-   
-      geometry->ComputeAirfoil_Section(Plane_P0_, Plane_Normal_, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
-                                       CPressure, Xcoord_Airfoil_, Ycoord_Airfoil_, Zcoord_Airfoil_,
-                                       CPressure_Airfoil_, true, config);
-      
-      /*--- Output the pressure on each section (tecplot format) ---*/
-      
-      if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() != 0)) {
-        
-        /*--- Find leading and trailing edge ---*/
-        
-        Xcoord_LeadingEdge = 1E6; Xcoord_TrailingEdge = -1E6;
-        for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-          if (Xcoord_Airfoil[iVertex] < Xcoord_LeadingEdge) {
-            Xcoord_LeadingEdge = Xcoord_Airfoil[iVertex];
-            Ycoord_LeadingEdge = Ycoord_Airfoil[iVertex];
-            Zcoord_LeadingEdge = Zcoord_Airfoil[iVertex];
-          }
-          if (Xcoord_Airfoil[iVertex] > Xcoord_TrailingEdge) {
-            Xcoord_TrailingEdge = Xcoord_Airfoil[iVertex];
-            Ycoord_TrailingEdge = Ycoord_Airfoil[iVertex];
-            Zcoord_TrailingEdge = Zcoord_Airfoil[iVertex];
-          }
-        }
-        
-        Chord = (Xcoord_TrailingEdge-Xcoord_LeadingEdge);
-        
-        /*--- Compute dihedral ---*/
-        
-        Xcoord_LeadingEdge_ = 1E6; Xcoord_TrailingEdge_ = -1E6;
-        for (iVertex = 0; iVertex < Xcoord_Airfoil_.size(); iVertex++) {
-          if (Xcoord_Airfoil_[iVertex] < Xcoord_LeadingEdge_) {
-            Xcoord_LeadingEdge_ = Xcoord_Airfoil_[iVertex];
-          }
-          if (Xcoord_Airfoil_[iVertex] > Xcoord_TrailingEdge_) {
-            Xcoord_TrailingEdge_ = Xcoord_Airfoil_[iVertex];
-            Ycoord_TrailingEdge_ = Ycoord_Airfoil_[iVertex];
-            Zcoord_TrailingEdge_ = Zcoord_Airfoil_[iVertex];
-          }
-        }
-        
-        if (iSection == 0) {
-          Dihedral_Trailing = atan((Zcoord_TrailingEdge_ - Zcoord_TrailingEdge) / (Ycoord_TrailingEdge_ - Ycoord_TrailingEdge))*180/PI_NUMBER;
-        }
-        else {
-          Dihedral_Trailing = atan((Zcoord_TrailingEdge - Zcoord_TrailingEdge_) / (Ycoord_TrailingEdge - Ycoord_TrailingEdge_))*180/PI_NUMBER;
-        }
-        
-        /*--- Write Cp at each section (tecplot format) ---*/
-        
-        if (output) {
-          
-          ofstream Cp_File;
-          
-          if (iSection == 0) {
-            Cp_File.open("cp_sections.dat", ios::out);
-            Cp_File << "TITLE = \"Airfoil sections\"" << endl;
-            Cp_File << "VARIABLES = \"x/c\",\"C<sub>p</sub>\",\"x\",\"y\",\"z\",\"y/c\",\"z/c\"" << endl;
-          } else
-            Cp_File.open("cp_sections.dat", ios::app);
-          
-          if (config->GetGeo_Description() == NACELLE) {
-            su2double theta_deg = atan2(Plane_Normal[1], -Plane_Normal[2])/PI_NUMBER*180 + 180;
-            Cp_File << "ZONE T=\"Theta = " << theta_deg << " deg\", I= " << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-          }
-          else {
-            if (config->GetSystemMeasurements() == SI) Cp_File << "ZONE T=\"y = " << Plane_P0[1] << " m\", I= "
-              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-            
-            if (config->GetSystemMeasurements() == US) Cp_File << "ZONE T=\"y = " << Plane_P0[1]*12.0 << " in\", I= "
-              << Xcoord_Airfoil.size() << ", F=POINT" << "\n";
-          }
-          
-
-          
-          /*--- Coordinates and pressure value ---*/
-          
-          for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-            
-            su2double XCoord = Xcoord_Airfoil[iVertex];
-            su2double YCoord = Ycoord_Airfoil[iVertex];
-            su2double ZCoord = Zcoord_Airfoil[iVertex];
-            
-            /*--- Undo the transformation based on the Theta angle ---*/
-            
-            if (config->GetGeo_Description() == NACELLE) {
-              su2double theta_deg = atan2(Plane_Normal[1],-Plane_Normal[2])/PI_NUMBER*180 + 180;
-              su2double Angle = theta_deg*PI_NUMBER/180 - 0.5*PI_NUMBER;
-              
-              XCoord = Xcoord_Airfoil[iVertex] + config->GetNacelleLocation(0);
-              YCoord = (Ycoord_Airfoil[iVertex]*cos(Angle) - Zcoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(1);
-              ZCoord = (Zcoord_Airfoil[iVertex]*cos(Angle) + Ycoord_Airfoil[iVertex]*sin(Angle)) + config->GetNacelleLocation(2);
-              
-            }
-            
-            if (config->GetSystemMeasurements() == US) {
-              Cp_File <<  (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord  << " " << CPressure_Airfoil[iVertex]
-              << " " << XCoord * 12.0 << " " << YCoord * 12.0 << " " << ZCoord * 12.0
-              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
-            }
-            else {
-              Cp_File << (Xcoord_Airfoil[iVertex] - Xcoord_LeadingEdge) / Chord << " " << CPressure_Airfoil[iVertex]
-              << " " << XCoord << " " << YCoord << " " << ZCoord
-              << " " << (Ycoord_Airfoil[iVertex] - Ycoord_LeadingEdge) / Chord << " " << (Zcoord_Airfoil[iVertex] - Zcoord_LeadingEdge)  / Chord << "\n";
-            }
-            
-          }
-          
-          Cp_File.close();
-          
-        }
-        
-        /*--- Compute load distribution ---*/
-        
-        ForceInviscid[0] = 0.0; ForceInviscid[1] = 0.0; ForceInviscid[2] = 0.0; MomentInviscid[1] = 0.0;
-        
-        for (iVertex = 0; iVertex < Xcoord_Airfoil.size() - 1; iVertex++) {
-          
-          NDPressure = 0.5 * (CPressure_Airfoil[iVertex] + CPressure_Airfoil[iVertex + 1]);
-          
-          Force[0] = -(Zcoord_Airfoil[iVertex + 1] - Zcoord_Airfoil[iVertex]) * NDPressure;
-          Force[1] = 0.0;
-          Force[2] = (Xcoord_Airfoil[iVertex + 1] - Xcoord_Airfoil[iVertex]) * NDPressure;
-          
-          ForceInviscid[0] += Force[0];
-          ForceInviscid[1] += Force[1];
-          ForceInviscid[2] += Force[2];
-          
-          MomentDist[0] = 0.5 	* (Xcoord_Airfoil[iVertex] + Xcoord_Airfoil[iVertex + 1]) - Origin[0];
-          MomentDist[1] = 0.5 * (Ycoord_Airfoil[iVertex] + Ycoord_Airfoil[iVertex + 1]) - Origin[1];
-          MomentDist[2] = 0.5 	* (Zcoord_Airfoil[iVertex] + Zcoord_Airfoil[iVertex + 1]) - Origin[3];
-          
-          MomentInviscid[1] += (Force[0] * MomentDist[2] - Force[2] * MomentDist[0]) / RefLength;
-          
-        }
-        
-        /*--- Compute local chord, for the nondimensionalization  ---*/
-        
-        MaxDistance = 0.0; Trailing_Point = 0;
-        
-        for (iVertex = 1; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-          
-          Distance = sqrt(pow(Xcoord_Airfoil[iVertex] - Xcoord_Airfoil[Trailing_Point], 2.0) +
-                          pow(Ycoord_Airfoil[iVertex] - Ycoord_Airfoil[Trailing_Point], 2.0) +
-                          pow(Zcoord_Airfoil[iVertex] - Zcoord_Airfoil[Trailing_Point], 2.0));
-          
-          if (MaxDistance < Distance) { MaxDistance = Distance; }
-          
-        }
-        
-        Chord = MaxDistance;
-        
-        CL_Inv = cos(Dihedral_Trailing * PI_NUMBER / 180.0) * fabs( -ForceInviscid[0] * sin(Alpha) + ForceInviscid[2] * cos(Alpha) )/ Chord;
-        
-        /*--- Compute sectional lift at the root ---*/
-        
-        B                  = 2.0*config->GetSemiSpan();
-        RefArea            = config->GetRefArea();
-        C_L                = solver->GetTotal_CL();
-        C_L0               = 8.0*C_L*RefArea/(B*PI_NUMBER);
-        Y                  = Ycoord_Airfoil[0];
-        Aux                = Y/(0.5*B);
-        Elliptic_Spanload  = (C_L0 / RefLength) * sqrt(fabs(1.0-Aux*Aux));
-        
-        
-        /*--- Write load distribution ---*/
-        
-        if (output) {
-          
-          ofstream Load_File;
-          if (iSection == 0) {
-            
-            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-              Load_File.open("load_distribution.csv", ios::out);
-              Load_File << "\"Percent Semispan\",\"Sectional C_L\",\"Spanload (c C_L / c_ref) \",\"Elliptic Spanload\"" << endl;
-            }
-            else {
-              Load_File.open("load_distribution.dat", ios::out);
-              Load_File << "TITLE = \"Load distribution\"" << endl;
-              Load_File << "VARIABLES = \"Percent Semispan\",\"Sectional C<sub>L</sub>\",\"Spanload (c C<sub>L</sub> / c<sub>ref</sub>) \",\"Elliptic Spanload\"" << endl;
-              Load_File << "ZONE T=\"Wing load distribution\"" << endl;
-            }
-          } else {
-            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) Load_File.open("load_distribution.csv", ios::app);
-            else Load_File.open("load_distribution.dat", ios::app);
-          }
-          
-          
-          /*--- CL and spanload ---*/
-          
-          if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))
-            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << ", " << CL_Inv  << ", " << Chord*CL_Inv / RefLength <<", " << Elliptic_Spanload   << endl;
-          else
-            Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << " " << CL_Inv  << " " << Chord*CL_Inv / RefLength <<" " << Elliptic_Spanload   << endl;
-          
-          Load_File.close();
-          
-        }
-        
-      }
-      
-    }
-    
-  }
-  
-  /*--- Delete dynamically allocated memory ---*/
-  
-  delete[] Plane_P0;
-  delete[] Plane_P0_;
-  delete[] Plane_Normal;
-  delete[] Plane_Normal_;
-  delete[] CPressure;
-  
-}
-
-
-void COutput::SetCp_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
-  
-  unsigned short iMarker, icommas, Boundary, iDim;
-  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
-  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff;
-  bool *PointInDomain;
-  string text_line, surfCp_filename;
-  ifstream Surface_file;
-  char buffer[50], cstr[200];
-  
-  
-  nPointLocal = geometry->GetnPoint();
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nPointGlobal = nPointLocal;
-#endif
-  
-  Point2Vertex = new unsigned long[nPointGlobal][2];
-  PointInDomain = new bool[nPointGlobal];
-  
-  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
-    PointInDomain[iPoint] = false;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        /*--- The Pressure file uses the global numbering ---*/
-        
-#ifndef HAVE_MPI
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
-        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
-        
-        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
-          Point2Vertex[iPoint][0] = iMarker;
-          Point2Vertex[iPoint][1] = iVertex;
-          PointInDomain[iPoint] = true;
-          solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Prepare to read the surface pressure files (CSV) ---*/
-  
-  surfCp_filename = "TargetCp";
-  strcpy (cstr, surfCp_filename.c_str());
-  
-  /*--- Write file name with extension if unsteady or steady ---*/
-  
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".dat");
-  
-  strcat (cstr, buffer);
-  
-  /*--- Read the surface pressure file ---*/
-  
-  string::size_type position;
-  
-  Surface_file.open(cstr, ios::in);
-  
-  if (!(Surface_file.fail())) {
-    
-    getline(Surface_file, text_line);
-    
-    while (getline(Surface_file, text_line)) {
-      for (icommas = 0; icommas < 50; icommas++) {
-        position = text_line.find( ",", 0 );
-        if (position!=string::npos) text_line.erase (position,1);
-      }
-      stringstream  point_line(text_line);
-      
-      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff;
-      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff;
-      
-      if (PointInDomain[iPoint]) {
-        
-        /*--- Find the vertex for the Point and Marker ---*/
-        
-        iMarker = Point2Vertex[iPoint][0];
-        iVertex = Point2Vertex[iPoint][1];
-        
-        solver_container->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
-        
-      }
-      
-    }
-    
-    Surface_file.close();
-    
-  }
-  
-  /*--- Compute the pressure difference ---*/
-  
-  PressDiff = 0.0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        
-        Cp = solver_container->GetCPressure(iMarker, iVertex);
-        CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
-        
-        Area = 0.0;
-        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-          Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt(Area);
-        
-        PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
-      }
-      
-    }
-  }
-  
-#ifdef HAVE_MPI
-  su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
-  SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Update the total Cp difference coeffient ---*/
-  
-  solver_container->SetTotal_CpDiff(PressDiff);
-  
-  delete [] Point2Vertex;
-  delete [] PointInDomain;
-  
-}
-
-void COutput::SetHeatFlux_InverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config, unsigned long iExtIter) {
-  
-  unsigned short iMarker, icommas, Boundary, iDim;
-  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
-  su2double XCoord, YCoord, ZCoord, PressureCoeff, HeatFlux = 0.0, HeatFluxDiff, HeatFluxTarget, *Normal = NULL, Area,
-  Pressure, Cf;
-  bool *PointInDomain;
-  string text_line, surfHeatFlux_filename;
-  ifstream Surface_file;
-  char buffer[50], cstr[200];
-  
-  
-  nPointLocal = geometry->GetnPoint();
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nPointGlobal = nPointLocal;
-#endif
-  
-  Point2Vertex = new unsigned long[nPointGlobal][2];
-  PointInDomain = new bool[nPointGlobal];
-  
-  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
-    PointInDomain[iPoint] = false;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        /*--- The Pressure file uses the global numbering ---*/
-        
-#ifndef HAVE_MPI
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
-        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
-        
-        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
-          Point2Vertex[iPoint][0] = iMarker;
-          Point2Vertex[iPoint][1] = iVertex;
-          PointInDomain[iPoint] = true;
-          solver_container->SetHeatFluxTarget(iMarker, iVertex, 0.0);
-        }
-      }
-    }
-  }
-  
-  /*--- Prepare to read the surface pressure files (CSV) ---*/
-  
-  surfHeatFlux_filename = "TargetHeatFlux";
-  strcpy (cstr, surfHeatFlux_filename.c_str());
-  
-  /*--- Write file name with extension if unsteady or steady ---*/
-  
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".dat");
-  
-  strcat (cstr, buffer);
-  
-  /*--- Read the surface pressure file ---*/
-  
-  string::size_type position;
-  
-  Surface_file.open(cstr, ios::in);
-  
-  if (!(Surface_file.fail())) {
-    
-    getline(Surface_file, text_line);
-    
-    while (getline(Surface_file, text_line)) {
-      for (icommas = 0; icommas < 50; icommas++) {
-        position = text_line.find( ",", 0 );
-        if (position!=string::npos) text_line.erase (position,1);
-      }
-      stringstream  point_line(text_line);
-      
-      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
-      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff >> Cf >> HeatFlux;
-      
-      if (PointInDomain[iPoint]) {
-        
-        /*--- Find the vertex for the Point and Marker ---*/
-        
-        iMarker = Point2Vertex[iPoint][0];
-        iVertex = Point2Vertex[iPoint][1];
-        
-        solver_container->SetHeatFluxTarget(iMarker, iVertex, HeatFlux);
-        
-      }
-      
-    }
-    
-    Surface_file.close();
-  }
-  
-  /*--- Compute the pressure difference ---*/
-  
-  HeatFluxDiff = 0.0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        
-        HeatFlux = solver_container->GetHeatFlux(iMarker, iVertex);
-        HeatFluxTarget = solver_container->GetHeatFluxTarget(iMarker, iVertex);
-        
-        Area = 0.0;
-        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-          Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt(Area);
-        
-        HeatFluxDiff += Area * (HeatFluxTarget - HeatFlux) * (HeatFluxTarget - HeatFlux);
-        
-      }
-      
-    }
-  }
-  
-#ifdef HAVE_MPI
-  su2double MyHeatFluxDiff = HeatFluxDiff;   HeatFluxDiff = 0.0;
-  SU2_MPI::Allreduce(&MyHeatFluxDiff, &HeatFluxDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Update the total HeatFlux difference coeffient ---*/
-  
-  solver_container->SetTotal_HeatFluxDiff(HeatFluxDiff);
-  
-  delete [] Point2Vertex;
-  delete [] PointInDomain;
-  
-}
-
-void COutput::SpecialOutput_SonicBoom(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  ofstream EquivArea_file, FuncGrad_file;
-  unsigned short iMarker = 0, iDim;
-  short *AzimuthalAngle = NULL;
-  su2double Gamma, auxXCoord, auxYCoord, auxZCoord, InverseDesign = 0.0, DeltaX, Coord_i, Coord_j, jp1Coord, *Coord = NULL, MeanFuntion,
-  *Face_Normal = NULL, auxArea, auxPress, Mach, Beta, R_Plane, Pressure_Inf,
-  ModVelocity_Inf, Velocity_Inf[3], factor, *Xcoord = NULL, *Ycoord = NULL, *Zcoord = NULL,
-  *Pressure = NULL, *FaceArea = NULL, *EquivArea = NULL, *TargetArea = NULL, *NearFieldWeight = NULL,
-  *Weight = NULL, jFunction, jp1Function;
-  unsigned long jVertex, iVertex, iPoint, nVertex_NearField = 0, auxPoint,
-  *IdPoint = NULL, *IdDomain = NULL, auxDomain;
-  unsigned short iPhiAngle;
-  ofstream NearFieldEA_file; ifstream TargetEA_file;
-  
-  su2double XCoordBegin_OF = config->GetEA_IntLimit(0);
-  su2double XCoordEnd_OF = config->GetEA_IntLimit(1);
-  
-  unsigned short nDim = geometry->GetnDim();
-  su2double AoA = -(config->GetAoA()*PI_NUMBER/180.0);
-  su2double EAScaleFactor = config->GetEA_ScaleFactor(); // The EA Obj. Func. should be ~ force based Obj. Func.
-  
-  Mach  = config->GetMach();
-  Gamma = config->GetGamma();
-  Beta = sqrt(Mach*Mach-1.0);
-  R_Plane = fabs(config->GetEA_IntLimit(2));
-  Pressure_Inf = config->GetPressure_FreeStreamND();
-  Velocity_Inf[0] = config->GetVelocity_FreeStreamND()[0];
-  Velocity_Inf[1] = config->GetVelocity_FreeStreamND()[1];
-  Velocity_Inf[2] = config->GetVelocity_FreeStreamND()[2];
-  ModVelocity_Inf = 0;
-  for (iDim = 0; iDim < 3; iDim++)
-    ModVelocity_Inf += Velocity_Inf[iDim] * Velocity_Inf[iDim];
-  
-  factor = 4.0*sqrt(2.0*Beta*R_Plane) / (Gamma*Pressure_Inf*Mach*Mach);
-  
-  if (rank == MASTER_NODE) cout << endl << "Writing Equivalent Area files.";
-
-#ifndef HAVE_MPI
-  
-  /*--- Compute the total number of points on the near-field ---*/
-  
-  nVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        /*--- Using Face_Normal(z), and Coord(z) we identify only a surface,
-         note that there are 2 NEARFIELD_BOUNDARY surfaces ---*/
-        
-        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) nVertex_NearField ++;
-      }
-  
-  /*--- Create an array with all the coordinates, points, pressures, face area,
-   equivalent area, and nearfield weight ---*/
-  
-  Xcoord = new su2double[nVertex_NearField];
-  Ycoord = new su2double[nVertex_NearField];
-  Zcoord = new su2double[nVertex_NearField];
-  AzimuthalAngle = new short[nVertex_NearField];
-  IdPoint = new unsigned long[nVertex_NearField];
-  IdDomain = new unsigned long[nVertex_NearField];
-  Pressure = new su2double[nVertex_NearField];
-  FaceArea = new su2double[nVertex_NearField];
-  EquivArea = new su2double[nVertex_NearField];
-  TargetArea = new su2double[nVertex_NearField];
-  NearFieldWeight = new su2double[nVertex_NearField];
-  Weight = new su2double[nVertex_NearField];
-  
-  /*--- Copy the boundary information to an array ---*/
-  
-  nVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
-          
-          IdPoint[nVertex_NearField] = iPoint;
-          Xcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
-          Ycoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
-          
-          if (nDim ==2) {
-            AzimuthalAngle[nVertex_NearField] = 0;
-          }
-          
-          if (nDim == 3) {
-            Zcoord[nVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
-            
-            /*--- Rotate the nearfield cylinder (AoA) only 3D ---*/
-            
-            su2double YcoordRot = Ycoord[nVertex_NearField];
-            su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
-            
-            /*--- Compute the Azimuthal angle (resolution of degress in the Azimuthal angle)---*/
-            
-            su2double AngleDouble; short AngleInt;
-            AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
-            
-            /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
-            
-            su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
-            
-            if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1)) AngleDouble = FixAzimuthalLine - 0.1;
-            
-            AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
-            if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
-            else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
-          }
-          
-          if (AzimuthalAngle[nVertex_NearField] <= 60) {
-            Pressure[nVertex_NearField] = solver->node[iPoint]->GetPressure();
-            FaceArea[nVertex_NearField] = fabs(Face_Normal[nDim-1]);
-            nVertex_NearField ++;
-          }
-          
-        }
-      }
-  
-#else
-  
-  int nProcessor;
-  SU2_MPI::Comm_size(MPI_COMM_WORLD, &nProcessor);
-  
-  unsigned long nLocalVertex_NearField = 0, MaxLocalVertex_NearField = 0;
-  int iProcessor;
-  
-  unsigned long *Buffer_Receive_nVertex = NULL;
-  if (rank == MASTER_NODE) {
-    Buffer_Receive_nVertex = new unsigned long [nProcessor];
-  }
-  
-  /*--- Compute the total number of points of the near-field ghost nodes ---*/
-  
-  nLocalVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if (geometry->node[iPoint]->GetDomain())
-          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0))
-            nLocalVertex_NearField ++;
-      }
-  
-  unsigned long *Buffer_Send_nVertex = new unsigned long [1];
-  Buffer_Send_nVertex[0] = nLocalVertex_NearField;
-  
-  /*--- Send Near-Field vertex information --*/
-  
-  SU2_MPI::Allreduce(&nLocalVertex_NearField, &nVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalVertex_NearField, &MaxLocalVertex_NearField, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  delete [] Buffer_Send_nVertex;
-  
-  su2double *Buffer_Send_Xcoord = new su2double[MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Ycoord = new su2double[MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Zcoord = new su2double[MaxLocalVertex_NearField];
-  unsigned long *Buffer_Send_IdPoint = new unsigned long [MaxLocalVertex_NearField];
-  su2double *Buffer_Send_Pressure = new su2double [MaxLocalVertex_NearField];
-  su2double *Buffer_Send_FaceArea = new su2double[MaxLocalVertex_NearField];
-  
-  su2double *Buffer_Receive_Xcoord = NULL;
-  su2double *Buffer_Receive_Ycoord = NULL;
-  su2double *Buffer_Receive_Zcoord = NULL;
-  unsigned long *Buffer_Receive_IdPoint = NULL;
-  su2double *Buffer_Receive_Pressure = NULL;
-  su2double *Buffer_Receive_FaceArea = NULL;
-  
-  if (rank == MASTER_NODE) {
-    Buffer_Receive_Xcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Ycoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Zcoord = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_IdPoint = new unsigned long[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_Pressure = new su2double[nProcessor*MaxLocalVertex_NearField];
-    Buffer_Receive_FaceArea = new su2double[nProcessor*MaxLocalVertex_NearField];
-  }
-  
-  unsigned long nBuffer_Xcoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Ycoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Zcoord = MaxLocalVertex_NearField;
-  unsigned long nBuffer_IdPoint = MaxLocalVertex_NearField;
-  unsigned long nBuffer_Pressure = MaxLocalVertex_NearField;
-  unsigned long nBuffer_FaceArea = MaxLocalVertex_NearField;
-  
-  for (iVertex = 0; iVertex < MaxLocalVertex_NearField; iVertex++) {
-    Buffer_Send_IdPoint[iVertex] = 0; Buffer_Send_Pressure[iVertex] = 0.0;
-    Buffer_Send_FaceArea[iVertex] = 0.0; Buffer_Send_Xcoord[iVertex] = 0.0;
-    Buffer_Send_Ycoord[iVertex] = 0.0; Buffer_Send_Zcoord[iVertex] = 0.0;
-  }
-  
-  /*--- Copy coordinates, index points, and pressures to the auxiliar vector --*/
-  
-  nLocalVertex_NearField = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_KindBC(iMarker) == NEARFIELD_BOUNDARY)
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Face_Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Coord = geometry->node[iPoint]->GetCoord();
-        
-        if (geometry->node[iPoint]->GetDomain())
-          if ((Face_Normal[nDim-1] > 0.0) && (Coord[nDim-1] < 0.0)) {
-            Buffer_Send_IdPoint[nLocalVertex_NearField] = iPoint;
-            Buffer_Send_Xcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(0);
-            Buffer_Send_Ycoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(1);
-            Buffer_Send_Zcoord[nLocalVertex_NearField] = geometry->node[iPoint]->GetCoord(2);
-            Buffer_Send_Pressure[nLocalVertex_NearField] = solver->node[iPoint]->GetPressure();
-            Buffer_Send_FaceArea[nLocalVertex_NearField] = fabs(Face_Normal[nDim-1]);
-            nLocalVertex_NearField++;
-          }
-      }
-  
-  /*--- Send all the information --*/
-  
-  SU2_MPI::Gather(Buffer_Send_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, Buffer_Receive_Xcoord, nBuffer_Xcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, Buffer_Receive_Ycoord, nBuffer_Ycoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, Buffer_Receive_Zcoord, nBuffer_Zcoord, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, Buffer_Receive_IdPoint, nBuffer_IdPoint, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Pressure, nBuffer_Pressure, MPI_DOUBLE, Buffer_Receive_Pressure, nBuffer_Pressure, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, Buffer_Receive_FaceArea, nBuffer_FaceArea, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  delete [] Buffer_Send_Xcoord;
-  delete [] Buffer_Send_Ycoord;
-  delete [] Buffer_Send_Zcoord;
-  delete [] Buffer_Send_IdPoint;
-  delete [] Buffer_Send_Pressure;
-  delete [] Buffer_Send_FaceArea;
-  
-  if (rank == MASTER_NODE) {
-    
-    Xcoord = new su2double[nVertex_NearField];
-    Ycoord = new su2double[nVertex_NearField];
-    Zcoord = new su2double[nVertex_NearField];
-    AzimuthalAngle = new short[nVertex_NearField];
-    IdPoint = new unsigned long[nVertex_NearField];
-    IdDomain = new unsigned long[nVertex_NearField];
-    Pressure = new su2double[nVertex_NearField];
-    FaceArea = new su2double[nVertex_NearField];
-    EquivArea = new su2double[nVertex_NearField];
-    TargetArea = new su2double[nVertex_NearField];
-    NearFieldWeight = new su2double[nVertex_NearField];
-    Weight = new su2double[nVertex_NearField];
-    
-    nVertex_NearField = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
-      for (iVertex = 0; iVertex < Buffer_Receive_nVertex[iProcessor]; iVertex++) {
-        Xcoord[nVertex_NearField] = Buffer_Receive_Xcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-        Ycoord[nVertex_NearField] = Buffer_Receive_Ycoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-        
-        if (nDim == 2) {
-          AzimuthalAngle[nVertex_NearField] = 0;
-        }
-        
-        if (nDim == 3) {
-          Zcoord[nVertex_NearField] = Buffer_Receive_Zcoord[iProcessor*MaxLocalVertex_NearField+iVertex];
-          
-          /*--- Rotate the nearfield cylinder  ---*/
-          
-          su2double YcoordRot = Ycoord[nVertex_NearField];
-          su2double ZcoordRot = Xcoord[nVertex_NearField]*sin(AoA) + Zcoord[nVertex_NearField]*cos(AoA);
-          
-          /*--- Compute the Azimuthal angle ---*/
-          
-          su2double AngleDouble; short AngleInt;
-          AngleDouble = fabs(atan(-YcoordRot/ZcoordRot)*180.0/PI_NUMBER);
-          
-          /*--- Fix an azimuthal line due to misalignments of the near-field ---*/
-          
-          su2double FixAzimuthalLine = config->GetFixAzimuthalLine();
-          
-          if ((AngleDouble >= FixAzimuthalLine - 0.1) && (AngleDouble <= FixAzimuthalLine + 0.1))
-            AngleDouble = FixAzimuthalLine - 0.1;
-          
-          AngleInt = SU2_TYPE::Short(floor(AngleDouble + 0.5));
-          
-          if (AngleInt >= 0) AzimuthalAngle[nVertex_NearField] = AngleInt;
-          else AzimuthalAngle[nVertex_NearField] = 180 + AngleInt;
-        }
-        
-        if (AzimuthalAngle[nVertex_NearField] <= 60) {
-          IdPoint[nVertex_NearField] = Buffer_Receive_IdPoint[iProcessor*MaxLocalVertex_NearField+iVertex];
-          Pressure[nVertex_NearField] = Buffer_Receive_Pressure[iProcessor*MaxLocalVertex_NearField+iVertex];
-          FaceArea[nVertex_NearField] = Buffer_Receive_FaceArea[iProcessor*MaxLocalVertex_NearField+iVertex];
-          IdDomain[nVertex_NearField] = iProcessor;
-          nVertex_NearField++;
-        }
-        
-      }
-    
-    delete [] Buffer_Receive_nVertex;
-    
-    delete [] Buffer_Receive_Xcoord;
-    delete [] Buffer_Receive_Ycoord;
-    delete [] Buffer_Receive_Zcoord;
-    delete [] Buffer_Receive_IdPoint;
-    delete [] Buffer_Receive_Pressure;
-    delete [] Buffer_Receive_FaceArea;
-    
-  }
-  
-#endif
-  
-  if (rank == MASTER_NODE) {
-    
-    vector<short> PhiAngleList;
-    vector<short>::iterator IterPhiAngleList;
-    
-    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
-      PhiAngleList.push_back(AzimuthalAngle[iVertex]);
-    
-    sort( PhiAngleList.begin(), PhiAngleList.end());
-    IterPhiAngleList = unique( PhiAngleList.begin(), PhiAngleList.end());
-    PhiAngleList.resize( IterPhiAngleList - PhiAngleList.begin() );
-    
-    /*--- Create vectors and distribute the values among the different PhiAngle queues ---*/
-    
-    vector<vector<su2double> > Xcoord_PhiAngle; Xcoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Ycoord_PhiAngle; Ycoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Zcoord_PhiAngle; Zcoord_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<unsigned long> > IdPoint_PhiAngle; IdPoint_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<unsigned long> > IdDomain_PhiAngle; IdDomain_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Pressure_PhiAngle; Pressure_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > FaceArea_PhiAngle; FaceArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > EquivArea_PhiAngle; EquivArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > TargetArea_PhiAngle; TargetArea_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > NearFieldWeight_PhiAngle; NearFieldWeight_PhiAngle.resize(PhiAngleList.size());
-    vector<vector<su2double> > Weight_PhiAngle; Weight_PhiAngle.resize(PhiAngleList.size());
-    
-    /*--- Distribute the values among the different PhiAngles ---*/
-    
-    for (iVertex = 0; iVertex < nVertex_NearField; iVertex++)
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        if (AzimuthalAngle[iVertex] == PhiAngleList[iPhiAngle]) {
-          Xcoord_PhiAngle[iPhiAngle].push_back(Xcoord[iVertex]);
-          Ycoord_PhiAngle[iPhiAngle].push_back(Ycoord[iVertex]);
-          Zcoord_PhiAngle[iPhiAngle].push_back(Zcoord[iVertex]);
-          IdPoint_PhiAngle[iPhiAngle].push_back(IdPoint[iVertex]);
-          IdDomain_PhiAngle[iPhiAngle].push_back(IdDomain[iVertex]);
-          Pressure_PhiAngle[iPhiAngle].push_back(Pressure[iVertex]);
-          FaceArea_PhiAngle[iPhiAngle].push_back(FaceArea[iVertex]);
-          EquivArea_PhiAngle[iPhiAngle].push_back(EquivArea[iVertex]);
-          TargetArea_PhiAngle[iPhiAngle].push_back(TargetArea[iVertex]);
-          NearFieldWeight_PhiAngle[iPhiAngle].push_back(NearFieldWeight[iVertex]);
-          Weight_PhiAngle[iPhiAngle].push_back(Weight[iVertex]);
-        }
-    
-    /*--- Order the arrays (x Coordinate, Pressure, Point, and Domain) ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++)
-        for (jVertex = 0; jVertex < Xcoord_PhiAngle[iPhiAngle].size() - 1 - iVertex; jVertex++)
-          if (Xcoord_PhiAngle[iPhiAngle][jVertex] > Xcoord_PhiAngle[iPhiAngle][jVertex+1]) {
-            auxXCoord = Xcoord_PhiAngle[iPhiAngle][jVertex]; Xcoord_PhiAngle[iPhiAngle][jVertex] = Xcoord_PhiAngle[iPhiAngle][jVertex+1]; Xcoord_PhiAngle[iPhiAngle][jVertex+1] = auxXCoord;
-            auxYCoord = Ycoord_PhiAngle[iPhiAngle][jVertex]; Ycoord_PhiAngle[iPhiAngle][jVertex] = Ycoord_PhiAngle[iPhiAngle][jVertex+1]; Ycoord_PhiAngle[iPhiAngle][jVertex+1] = auxYCoord;
-            auxZCoord = Zcoord_PhiAngle[iPhiAngle][jVertex]; Zcoord_PhiAngle[iPhiAngle][jVertex] = Zcoord_PhiAngle[iPhiAngle][jVertex+1]; Zcoord_PhiAngle[iPhiAngle][jVertex+1] = auxZCoord;
-            auxPress = Pressure_PhiAngle[iPhiAngle][jVertex]; Pressure_PhiAngle[iPhiAngle][jVertex] = Pressure_PhiAngle[iPhiAngle][jVertex+1]; Pressure_PhiAngle[iPhiAngle][jVertex+1] = auxPress;
-            auxArea = FaceArea_PhiAngle[iPhiAngle][jVertex]; FaceArea_PhiAngle[iPhiAngle][jVertex] = FaceArea_PhiAngle[iPhiAngle][jVertex+1]; FaceArea_PhiAngle[iPhiAngle][jVertex+1] = auxArea;
-            auxPoint = IdPoint_PhiAngle[iPhiAngle][jVertex]; IdPoint_PhiAngle[iPhiAngle][jVertex] = IdPoint_PhiAngle[iPhiAngle][jVertex+1]; IdPoint_PhiAngle[iPhiAngle][jVertex+1] = auxPoint;
-            auxDomain = IdDomain_PhiAngle[iPhiAngle][jVertex]; IdDomain_PhiAngle[iPhiAngle][jVertex] = IdDomain_PhiAngle[iPhiAngle][jVertex+1]; IdDomain_PhiAngle[iPhiAngle][jVertex+1] = auxDomain;
-          }
-    
-    
-    /*--- Check that all the azimuth lists have the same size ---*/
-    
-    unsigned short nVertex = Xcoord_PhiAngle[0].size();
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-      unsigned short nVertex_aux = Xcoord_PhiAngle[iPhiAngle].size();
-      if (nVertex_aux != nVertex) cout <<"Be careful!!! one azimuth list is shorter than the other"<< endl;
-      nVertex = min(nVertex, nVertex_aux);
-    }
-    
-    /*--- Compute equivalent area distribution at each azimuth angle ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-      EquivArea_PhiAngle[iPhiAngle][0] = 0.0;
-      for (iVertex = 1; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        EquivArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
-        
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][iVertex]*sin(AoA);
-        
-        for (jVertex = 0; jVertex < iVertex-1; jVertex++) {
-          
-          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex]*sin(AoA);
-          jp1Coord = Xcoord_PhiAngle[iPhiAngle][jVertex+1]*cos(AoA) - Zcoord_PhiAngle[iPhiAngle][jVertex+1]*sin(AoA);
-          
-          jFunction = factor*(Pressure_PhiAngle[iPhiAngle][jVertex] - Pressure_Inf)*sqrt(Coord_i-Coord_j);
-          jp1Function = factor*(Pressure_PhiAngle[iPhiAngle][jVertex+1] - Pressure_Inf)*sqrt(Coord_i-jp1Coord);
-          
-          DeltaX = (jp1Coord-Coord_j);
-          MeanFuntion = 0.5*(jp1Function + jFunction);
-          EquivArea_PhiAngle[iPhiAngle][iVertex] += DeltaX * MeanFuntion;
-        }
-      }
-    }
-    
-    /*--- Create a file with the equivalent area distribution at each azimuthal angle ---*/
-    
-    NearFieldEA_file.precision(15);
-    
-    if (output) {
-      
-      NearFieldEA_file.open("Equivalent_Area.dat", ios::out);
-      NearFieldEA_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
-      
-      if (config->GetSystemMeasurements() == US)
-        NearFieldEA_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\"";
-      else
-        NearFieldEA_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\"";
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-        if (config->GetSystemMeasurements() == US)
-          NearFieldEA_file << ", \"Equivalent Area (ft<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
-        else
-          NearFieldEA_file << ", \"Equivalent Area (m<sup>2</sup>), <greek>F</greek>= " << PhiAngleList[iPhiAngle] << " deg.\"";
-      }
-      
-      NearFieldEA_file << "\n";
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[0].size(); iVertex++) {
-        
-        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-        su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
-        
-        if (config->GetSystemMeasurements() == US)
-          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
-        else
-          NearFieldEA_file << scientific << (XcoordRot - XcoordRot_init);
-        
-        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-          NearFieldEA_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex];
-        }
-        
-        NearFieldEA_file << "\n";
-        
-      }
-      NearFieldEA_file.close();
-      
-    }
-    
-    /*--- Read target equivalent area from the configuration file,
-     this first implementation requires a complete table (same as the original
-     EA table). so... no interpolation. ---*/
-    
-    vector<vector<su2double> > TargetArea_PhiAngle_Trans;
-    TargetEA_file.open("TargetEA.dat", ios::in);
-    
-    if (TargetEA_file.fail()) {
-      /*--- Set the table to 0 ---*/
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        for (iVertex = 0; iVertex < TargetArea_PhiAngle[iPhiAngle].size(); iVertex++)
-          TargetArea_PhiAngle[iPhiAngle][iVertex] = 0.0;
-    }
-    else {
-      
-      /*--- skip header lines ---*/
-      
-      string line;
-      getline(TargetEA_file, line);
-      getline(TargetEA_file, line);
-      
-      while (TargetEA_file) {
-        
-        string line;
-        getline(TargetEA_file, line);
-        istringstream is(line);
-        vector<su2double> row;
-        unsigned short iter = 0;
-        
-        while (is.good()) {
-          string token;
-          getline(is, token,',');
-          
-          istringstream js(token);
-          
-          su2double data;
-          js >> data;
-          
-          /*--- The first element in the table is the coordinate (in or m)---*/
-          
-          if (iter != 0) row.push_back(data);
-          iter++;
-          
-        }
-        TargetArea_PhiAngle_Trans.push_back(row);
-      }
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++)
-          TargetArea_PhiAngle[iPhiAngle][iVertex] = TargetArea_PhiAngle_Trans[iVertex][iPhiAngle];
-      
-    }
-    
-    /*--- Divide by the number of Phi angles in the nearfield ---*/
-    
-    su2double PhiFactor = 1.0/su2double(PhiAngleList.size());
-    
-    /*--- Evaluate the objective function ---*/
-    
-    InverseDesign = 0;
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
-        
-        su2double Difference = EquivArea_PhiAngle[iPhiAngle][iVertex]-TargetArea_PhiAngle[iPhiAngle][iVertex];
-        su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][iVertex]);
-        
-        if ((percentage < 0.1) || (Coord_i < XCoordBegin_OF) || (Coord_i > XCoordEnd_OF)) Difference = 0.0;
-        
-        InverseDesign += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*Difference*Difference;
-        
-      }
-    
-    /*--- Evaluate the weight of the nearfield pressure (adjoint input) ---*/
-    
-    for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-      for (iVertex = 0; iVertex < EquivArea_PhiAngle[iPhiAngle].size(); iVertex++) {
-        Coord_i = Xcoord_PhiAngle[iPhiAngle][iVertex];
-        NearFieldWeight_PhiAngle[iPhiAngle][iVertex] = 0.0;
-        for (jVertex = iVertex; jVertex < EquivArea_PhiAngle[iPhiAngle].size(); jVertex++) {
-          Coord_j = Xcoord_PhiAngle[iPhiAngle][jVertex];
-          Weight_PhiAngle[iPhiAngle][iVertex] = 1.0;
-          
-          su2double Difference = EquivArea_PhiAngle[iPhiAngle][jVertex]-TargetArea_PhiAngle[iPhiAngle][jVertex];
-          su2double percentage = fabs(Difference)*100/fabs(TargetArea_PhiAngle[iPhiAngle][jVertex]);
-          
-          if ((percentage < 0.1) || (Coord_j < XCoordBegin_OF) || (Coord_j > XCoordEnd_OF)) Difference = 0.0;
-          
-          NearFieldWeight_PhiAngle[iPhiAngle][iVertex] += EAScaleFactor*PhiFactor*Weight_PhiAngle[iPhiAngle][iVertex]*2.0*Difference*factor*sqrt(Coord_j-Coord_i);
-        }
-      }
-    
-    /*--- Write the Nearfield pressure at each Azimuthal PhiAngle ---*/
-    
-    EquivArea_file.precision(15);
-    
-    if (output) {
-      
-      EquivArea_file.open("nearfield_flow.dat", ios::out);
-      EquivArea_file << "TITLE = \"Equivalent Area evaluation at each azimuthal angle\"" << "\n";
-      
-      if (config->GetSystemMeasurements() == US)
-        EquivArea_file << "VARIABLES = \"Height (in) at r="<< R_Plane*12.0 << " in. (cyl. coord. system)\",\"Equivalent Area (ft<sup>2</sup>)\",\"Target Equivalent Area (ft<sup>2</sup>)\",\"Cp\"" << "\n";
-      else
-        EquivArea_file << "VARIABLES = \"Height (m) at r="<< R_Plane << " m. (cylindrical coordinate system)\",\"Equivalent Area (m<sup>2</sup>)\",\"Target Equivalent Area (m<sup>2</sup>)\",\"Cp\"" << "\n";
-      
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++) {
-        EquivArea_file << fixed << "ZONE T= \"<greek>F</greek>=" << PhiAngleList[iPhiAngle] << " deg.\"" << "\n";
-        for (iVertex = 0; iVertex < Xcoord_PhiAngle[iPhiAngle].size(); iVertex++) {
-          
-          su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-          su2double XcoordRot_init = Xcoord_PhiAngle[0][0]*cos(AoA) - Zcoord_PhiAngle[0][0]*sin(AoA);
-          
-          if (config->GetSystemMeasurements() == US)
-            EquivArea_file << scientific << (XcoordRot - XcoordRot_init) * 12.0;
-          else
-            EquivArea_file << scientific << (XcoordRot - XcoordRot_init);
-          
-          EquivArea_file << scientific << ", " << EquivArea_PhiAngle[iPhiAngle][iVertex]
-          << ", " << TargetArea_PhiAngle[iPhiAngle][iVertex] << ", " << (Pressure_PhiAngle[iPhiAngle][iVertex]-Pressure_Inf)/Pressure_Inf << "\n";
-        }
-      }
-      
-      EquivArea_file.close();
-      
-    }
-    
-    /*--- Write Weight file for adjoint computation ---*/
-    
-    FuncGrad_file.precision(15);
-    
-    if (output) {
-      
-      FuncGrad_file.open("WeightNF.dat", ios::out);
-      
-      FuncGrad_file << scientific << "-1.0";
-      for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-        FuncGrad_file << scientific << "\t" << PhiAngleList[iPhiAngle];
-      FuncGrad_file << "\n";
-      
-      for (iVertex = 0; iVertex < NearFieldWeight_PhiAngle[0].size(); iVertex++) {
-        su2double XcoordRot = Xcoord_PhiAngle[0][iVertex]*cos(AoA) - Zcoord_PhiAngle[0][iVertex]*sin(AoA);
-        FuncGrad_file << scientific << XcoordRot;
-        for (iPhiAngle = 0; iPhiAngle < PhiAngleList.size(); iPhiAngle++)
-          FuncGrad_file << scientific << "\t" << NearFieldWeight_PhiAngle[iPhiAngle][iVertex];
-        FuncGrad_file << "\n";
-      }
-      FuncGrad_file.close();
-      
-    }
-    
-    /*--- Delete structures ---*/
-    
-    delete [] Xcoord; delete [] Ycoord; delete [] Zcoord;
-    delete [] AzimuthalAngle; delete [] IdPoint; delete [] IdDomain;
-    delete [] Pressure; delete [] FaceArea;
-    delete [] EquivArea; delete [] TargetArea;
-    delete [] NearFieldWeight; delete [] Weight;
-    
-  }
-  
-#ifndef HAVE_MPI
-  
-  /*--- Store the value of the NearField coefficient ---*/
-  
-  solver->SetTotal_CEquivArea(InverseDesign);
-  
-#else
-  
-  /*--- Send the value of the NearField coefficient to all the processors ---*/
-  
-  SU2_MPI::Bcast(&InverseDesign, 1, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- Store the value of the NearField coefficient ---*/
-  
-  solver->SetTotal_CEquivArea(InverseDesign);
-  
-#endif
-  
-}
-
-void COutput::SpecialOutput_Distortion(CSolver *solver, CGeometry *geometry, CConfig *config, bool output) {
-  
-  unsigned short iMarker, iDim, iMarker_Analyze;
-  unsigned long iPoint, iVertex;
-  su2double xCoord = 0.0, yCoord = 0.0, zCoord = 0.0, Area = 0.0, *Vector, TotalArea = 0.0;
-  su2double xCoord_CG = 0.0, yCoord_CG = 0.0, zCoord_CG = 0.0, TipRadius, HubRadius, Distance = 0.0, Distance_Mirror = 0.0;
-  su2double *r, MinDistance, xCoord_ = 0.0, yCoord_ = 0.0, zCoord_ = 0;
-  unsigned short iStation, iAngle, nAngle;
-  char cstr[200];
-  su2double *** ProbeArray, dx = 0.0, dy = 0.0, dz = 0.0, dx_ = 0.0, dy_ = 0.0, dz_ = 0.0, UpVector[3], radians, RotatedVector[3];
-  su2double Pressure, SoundSpeed, Velocity2, Mach,  Gamma, TotalPressure, Mach_Inf, TotalPressure_Inf,
-  Temperature, TotalTemperature, Pressure_Inf, Temperature_Inf, TotalTemperature_Inf, Velocity_Inf, Density;
-  unsigned short nDim = geometry->GetnDim();
-  unsigned short Theta, nStation;
-  unsigned long nVertex_Surface, nLocalVertex_Surface, MaxLocalVertex_Surface;
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long Total_Index;
-  unsigned short Theta_DC60 = 60, nStation_DC60 = 5;
-  su2double PT_Mean, Mach_Mean, q_Mean, PT, q, *PT_Sector, PT_Sector_Min, DC60, *PT_Station, *PT_Station_Min, *Mach_Station, *Mach_Station_Min, IDR, IDC, IDC_Mach;
-  
-  
-  bool Engine_HalfModel = config->GetEngine_HalfModel();
-  su2double SignFlip = 1.0;
-  su2double Beta, Alpha;
-  su2double Mach_ij, Mach_ip1j, Mach_im1j, Mach_ijp1, Mach_ijm1, Filtered_Mach;
-  su2double Alpha_ij, Alpha_ip1j, Alpha_im1j, Alpha_ijp1, Alpha_ijm1, Filtered_Alpha;
-  su2double Beta_ij, Beta_ip1j, Beta_im1j, Beta_ijp1, Beta_ijm1, Filtered_Beta;
-  su2double a, b, c, d;
-
-  int iProcessor, nProcessor;
-  nProcessor = size;
-
-
-  if (rank == MASTER_NODE && !config->GetDiscrete_Adjoint()) cout << endl << "Writing Surface Analysis file (surface_analysis.dat).";
-
-  /*--- Open and rrite file name with extension if unsteady ---*/
-
-  ofstream SurfFlow_file;
-
-  if (output && (rank == MASTER_NODE)) {
-
-    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) strcpy (cstr, "surface_analysis.vtk");
-    else strcpy (cstr, "surface_analysis.dat");
-    
-    SurfFlow_file.precision(15);
-
-    SurfFlow_file.open(cstr, ios::out);
-    
-    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-      SurfFlow_file << "# vtk DataFile Version 3.0" << endl;
-      SurfFlow_file << "vtk output" << endl;
-      SurfFlow_file << "ASCII" << endl;
-    }
-    else {
-      SurfFlow_file <<"TITLE = \"Surface Analysis\"" <<endl;
-      SurfFlow_file <<"VARIABLES = \"y(in)\", \"z(in)\", \"PT/PT<sub>inf</sub>\", \"TT/TT<sub>inf</sub>\", \"P/P<sub>inf</sub>\", \"T/T<sub>inf</sub>\", \"v<sub>x</sub>/v<sub>inf</sub>\", \"v<sub>y</sub>/v<sub>inf</sub>\", \"v<sub>z</sub>/v<sub>inf</sub>\", \"<greek>a</greek> (deg)\", \"<greek>b</greek> (deg)\", \"Mach\", \"Filtered <greek>a</greek> (deg)\", \"Filtered <greek>b</greek> (deg)\", \"Filtered Mach\"" << endl;
-    }
-    
-  }
-  
-  /*--- Loop over all the markers to analyze ---*/
-
-  for (iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++) {
-
-    string Analyze_TagBound = config->GetMarker_Analyze_TagBound(iMarker_Analyze);
-
-    nVertex_Surface = 0; nLocalVertex_Surface = 0; MaxLocalVertex_Surface = 0;
-
-    /*--- Find the max number of surface vertices among all
-     partitions and set up buffers. The master node will handle the
-     writing of the CSV file after gathering all of the data. ---*/
-
-    nLocalVertex_Surface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
-      if (Marker_TagBound == Analyze_TagBound) {
-        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          if (geometry->node[iPoint]->GetDomain()) nLocalVertex_Surface++;
-        }
-      }
-    }
-
-    /*--- Communicate the number of local vertices on each partition
-     to the master node ---*/
-    
-    Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-    if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
-
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-    SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    MaxLocalVertex_Surface = nLocalVertex_Surface;
-    Buffer_Recv_nVertex[MASTER_NODE] = Buffer_Send_nVertex[MASTER_NODE];
-#endif
-
-    /*--- Send and Recv buffers ---*/
-
-    su2double *Buffer_Send_Coord_x = NULL, *Buffer_Recv_Coord_x = NULL;
-    Buffer_Send_Coord_x = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_Coord_y = NULL, *Buffer_Recv_Coord_y = NULL;
-    Buffer_Send_Coord_y = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_Coord_z = NULL, *Buffer_Recv_Coord_z = NULL;
-    if (nDim == 3)  Buffer_Send_Coord_z = new su2double [MaxLocalVertex_Surface];
-
-    su2double *Buffer_Send_PT = NULL, *Buffer_Recv_PT = NULL;
-    Buffer_Send_PT = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_TT = NULL, *Buffer_Recv_TT = NULL;
-    Buffer_Send_TT = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_P = NULL, *Buffer_Recv_P = NULL;
-    Buffer_Send_P = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_T = NULL, *Buffer_Recv_T = NULL;
-    Buffer_Send_T = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Mach = NULL, *Buffer_Recv_Mach = NULL;
-    Buffer_Send_Mach = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_x = NULL, *Buffer_Recv_Vel_x = NULL;
-    Buffer_Send_Vel_x = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_y = NULL, *Buffer_Recv_Vel_y = NULL;
-    Buffer_Send_Vel_y = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Vel_z = NULL, *Buffer_Recv_Vel_z = NULL;
-    if (nDim == 3) Buffer_Send_Vel_z = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_q = NULL, *Buffer_Recv_q = NULL;
-    Buffer_Send_q = new su2double [MaxLocalVertex_Surface];
-    
-    su2double *Buffer_Send_Area = NULL, *Buffer_Recv_Area = NULL;
-    Buffer_Send_Area = new su2double [MaxLocalVertex_Surface];
-    
-    /*--- Prepare the receive buffers on the master node only. ---*/
-    
-    if (rank == MASTER_NODE) {
-      Buffer_Recv_Coord_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Coord_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-      if (nDim == 3) Buffer_Recv_Coord_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_PT = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_TT = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_P = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_T = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Mach = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Vel_x = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Vel_y = new su2double [nProcessor*MaxLocalVertex_Surface];
-      if (nDim == 3) {
-        Buffer_Recv_Vel_z = new su2double [nProcessor*MaxLocalVertex_Surface];
-      }
-      Buffer_Recv_q = new su2double [nProcessor*MaxLocalVertex_Surface];
-      Buffer_Recv_Area = new su2double [nProcessor*MaxLocalVertex_Surface];
-    }
-    
-    /*--- Loop over all vertices in this partition and load the
-     data of the specified type into the buffer to be sent to
-     the master node. ---*/
-    
-    nVertex_Surface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      string Marker_TagBound = config->GetMarker_All_TagBound(iMarker);
-      if (Marker_TagBound == Analyze_TagBound) {
-        
-        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if (geometry->node[iPoint]->GetDomain()) {
-            
-            Buffer_Send_Coord_x[nVertex_Surface] = geometry->node[iPoint]->GetCoord(0);
-            Buffer_Send_Coord_y[nVertex_Surface] = geometry->node[iPoint]->GetCoord(1);
-            if (nDim == 3) { Buffer_Send_Coord_z[nVertex_Surface] = geometry->node[iPoint]->GetCoord(2); }
-            
-            Pressure         = solver->node[iPoint]->GetPressure();
-            Density          = solver->node[iPoint]->GetDensity();
-            Temperature      = solver->node[iPoint]->GetTemperature();
-            SoundSpeed       = solver->node[iPoint]->GetSoundSpeed();
-            Velocity2        = solver->node[iPoint]->GetVelocity2();
-            Mach             = sqrt(Velocity2)/SoundSpeed;
-            Gamma            = config->GetGamma();
-            
-            Mach_Inf         = config->GetMach();
-            Pressure_Inf     = config->GetPressure_FreeStreamND();
-            Temperature_Inf  = config->GetTemperature_FreeStreamND();
-            Velocity_Inf     = sqrt(config->GetVelocity_FreeStreamND()[0]*config->GetVelocity_FreeStreamND()[0]
-                                    + config->GetVelocity_FreeStreamND()[1]*config->GetVelocity_FreeStreamND()[1]
-                                    + config->GetVelocity_FreeStreamND()[2]*config->GetVelocity_FreeStreamND()[2]);
-            
-            Buffer_Send_P[nVertex_Surface] = Pressure / Pressure_Inf;
-            Buffer_Send_T[nVertex_Surface]     = Temperature / Temperature_Inf;
-            Buffer_Send_Mach[nVertex_Surface] = Mach;
-            
-            TotalPressure    = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
-            TotalPressure_Inf  = Pressure_Inf * pow( 1.0 + Mach_Inf * Mach_Inf * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
-            Buffer_Send_PT[nVertex_Surface] = TotalPressure / TotalPressure_Inf;
-            
-            TotalTemperature = Temperature * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
-            TotalTemperature_Inf  = Temperature_Inf * (1.0 + Mach * Mach  * 0.5 * (Gamma - 1.0));
-            Buffer_Send_TT[nVertex_Surface] = TotalTemperature / TotalTemperature_Inf;
-            
-            Buffer_Send_Vel_x[nVertex_Surface] = solver->node[iPoint]->GetVelocity(0) / Velocity_Inf;
-            Buffer_Send_Vel_y[nVertex_Surface] = solver->node[iPoint]->GetVelocity(1) / Velocity_Inf;
-            if (nDim == 3) {
-              Buffer_Send_Vel_z[nVertex_Surface] = solver->node[iPoint]->GetVelocity(2) / Velocity_Inf;
-            }
-            
-            Buffer_Send_q[nVertex_Surface] = 0.5*Density*Velocity2;
-            
-            Vector = geometry->vertex[iMarker][iVertex]->GetNormal();
-            Area = 0.0; for (iDim = 0; iDim < nDim; iDim++) { Area += Vector[iDim]*Vector[iDim]; } Area = sqrt(Area);
-            Buffer_Send_Area[nVertex_Surface] = Area;
-            
-            /*--- If US system, the output should be in inches ---*/
-            
-            if (config->GetSystemMeasurements() == US) {
-              
-              Buffer_Send_Coord_x[nVertex_Surface] *= 12.0;
-              Buffer_Send_Coord_y[nVertex_Surface] *= 12.0;
-              if (nDim == 3) Buffer_Send_Coord_z[nVertex_Surface] *= 12.0;
-              Buffer_Send_Area[nVertex_Surface] *= 144.0;
-              
-            }
-            
-            nVertex_Surface++;
-            
-          }
-        }
-        break;
-      }
-    }
-    
-    /*--- Send the information to the master node ---*/
-    
-#ifdef HAVE_MPI
-    
-    SU2_MPI::Gather(Buffer_Send_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Coord_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_PT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_PT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_TT, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_TT, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_P, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_P, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_T, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_T, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Mach, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_x, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_y, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (nDim == 3) SU2_MPI::Gather(Buffer_Send_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Vel_z, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_q, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_q, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    SU2_MPI::Gather(Buffer_Send_Area, MaxLocalVertex_Surface, MPI_DOUBLE, Buffer_Recv_Area, MaxLocalVertex_Surface, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    
-#else
-    
-    for (iVertex = 0; iVertex < MaxLocalVertex_Surface; iVertex++) {
-      Buffer_Recv_Coord_x[iVertex] = Buffer_Send_Coord_x[iVertex];
-      Buffer_Recv_Coord_y[iVertex] = Buffer_Send_Coord_y[iVertex];
-      if (nDim == 3) Buffer_Recv_Coord_z[iVertex] = Buffer_Send_Coord_z[iVertex];
-      Buffer_Recv_PT[iVertex] = Buffer_Send_PT[iVertex];
-      Buffer_Recv_TT[iVertex] = Buffer_Send_TT[iVertex];
-      Buffer_Recv_P[iVertex] = Buffer_Send_P[iVertex];
-      Buffer_Recv_T[iVertex] = Buffer_Send_T[iVertex];
-      Buffer_Recv_Mach[iVertex] = Buffer_Send_Mach[iVertex];
-      Buffer_Recv_Vel_x[iVertex] = Buffer_Send_Vel_x[iVertex];
-      Buffer_Recv_Vel_y[iVertex] = Buffer_Send_Vel_y[iVertex];
-      if (nDim == 3) Buffer_Recv_Vel_z[iVertex] = Buffer_Send_Vel_z[iVertex];
-      Buffer_Recv_q[iVertex] = Buffer_Send_q[iVertex];
-      Buffer_Recv_Area[iVertex] = Buffer_Send_Area[iVertex];
-    }
-    
-#endif
-    
-    if (rank == MASTER_NODE) {
-      
-      /*--- Compute the location of the critical points of the distortion measure, and center of gravity ---*/
-      
-      TotalArea = 0.0; xCoord_CG = 0.0; yCoord_CG = 0.0; zCoord_CG = 0.0; PT_Mean = 0.0; Mach_Mean = 0.0;  q_Mean = 0.0;
-      
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-          
-          /*--- Current index position and global index ---*/
-          
-          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-          
-          /*--- Retrieve the merged data for this node ---*/
-          
-          xCoord = Buffer_Recv_Coord_x[Total_Index];
-          yCoord = Buffer_Recv_Coord_y[Total_Index];
-          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-          PT   = Buffer_Recv_PT[Total_Index];
-          Mach = Buffer_Recv_Mach[Total_Index];
-          q    = Buffer_Recv_q[Total_Index];
-          
-          Area       = Buffer_Recv_Area[Total_Index];
-          TotalArea += Area;
-          xCoord_CG += xCoord*Area;
-          yCoord_CG += yCoord*Area;
-          zCoord_CG += zCoord*Area;
-          PT_Mean   += PT*Area;
-          Mach_Mean += PT*Area;
-          q_Mean    += q*Area;
-          
-        }
-      }
-      
-      /*--- Evaluate the area averaged pressure and CG ---*/
-      
-      xCoord_CG = xCoord_CG / TotalArea;
-      yCoord_CG = yCoord_CG / TotalArea;
-      zCoord_CG = zCoord_CG / TotalArea;
-      PT_Mean   /= TotalArea;
-      Mach_Mean /= TotalArea;
-      q_Mean    /=  TotalArea;
-      
-      /*--- If it is a half model, CGy = 0 ---*/
-      
-      if (Engine_HalfModel) { yCoord_CG = 0.0; }
-      
-      /*--- Compute hub and tip radius ---*/
-      
-      TipRadius = 1E-6; HubRadius = 1E6;
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-          
-          /*--- Current index position and global index ---*/
-          
-          Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-          
-          /*--- Retrieve the merged data for this node ---*/
-          
-          xCoord = Buffer_Recv_Coord_x[Total_Index];
-          yCoord = Buffer_Recv_Coord_y[Total_Index];
-          if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-          
-          if (nDim == 2)
-            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
-                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord));
-          
-          if (nDim == 3)
-            Distance = sqrt((xCoord_CG-xCoord)*(xCoord_CG-xCoord) +
-                            (yCoord_CG-yCoord)*(yCoord_CG-yCoord) +
-                            (zCoord_CG-zCoord)*(zCoord_CG-zCoord));
-          
-          if (Distance > TipRadius) TipRadius = Distance;
-          if (Distance < HubRadius) HubRadius = Distance;
-          
-        }
-      }
-      
-      if (HubRadius/TipRadius < 0.05) HubRadius = 0.0;
-      
-      /*--- Evaluate the DC60 parameter ---*/
-      
-      Theta = Theta_DC60;
-      nStation = nStation_DC60;
-      
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      r = new su2double [nStation+1];
-      
-      /*--- Allocate memory ---*/
-      
-      PT_Sector = new su2double [nAngle];
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [5];
-        }
-      }
-      
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius; r[nStation] = TipRadius;
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
-      
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
-        
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
-        
-      }
-      
-      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-                ProbeArray[iAngle][iStation][4] = Buffer_Recv_q[Total_Index];
-              }
-              
-            }
-          }
-          
-        }
-        
-      }
-      
-      /*--- Evaluate the average pressure at each sector, fan face and dynamic pressure ---*/
-      
-      PT_Mean = 0.0; q_Mean = 0.0;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        PT_Sector[iAngle] = 0.0;
-        for (iStation = 0; iStation < nStation; iStation++) {
-          PT_Sector[iAngle] += ProbeArray[iAngle][iStation][3]/float(nStation);
-          PT_Mean           += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-          q_Mean            += ProbeArray[iAngle][iStation][4]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Compute the min value of the averaged pressure at each sector ---*/
-      
-      PT_Sector_Min = PT_Sector[0];
-      for (iAngle = 1; iAngle < nAngle; iAngle++) {
-        if (PT_Sector[iAngle] <= PT_Sector_Min) PT_Sector_Min = PT_Sector[iAngle];
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      Mach_Inf           = config->GetMach();
-      Gamma              = config->GetGamma();
-      TotalPressure_Inf  = config->GetPressure_FreeStreamND() * pow( 1.0 + Mach_Inf * Mach_Inf *
-                                                                    0.5 * (Gamma - 1.0), Gamma    / (Gamma - 1.0));
-      
-      if (q_Mean != 0.0) DC60 = ((PT_Mean - PT_Sector_Min)*TotalPressure_Inf)/q_Mean;
-      else DC60 = 0.0;
-      
-      config->SetSurface_DC60(iMarker_Analyze, DC60);
-      
-      solver->SetTotal_DC60(DC60);
-      
-      /*--- Deallocate the memory ---*/
-      
-      delete[] r;
-      
-      delete [] PT_Sector;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
-      }
-      delete[] ProbeArray;
-      
-      
-      /*--- Evaluate the IDC, and IDR parameters ---*/
-      
-      nStation = SU2_TYPE::Int(config->GetDistortionRack()[0]);
-      Theta = SU2_TYPE::Int(config->GetDistortionRack()[1]);
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      
-      /*--- Allocate memory ---*/
-      
-      r = new su2double [nStation+1];
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [4];
-        }
-      }
-      
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius; r[nStation] = TipRadius;
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
-      
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
-        
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
-        
-      }
-      
-      /*--- Compute the Total pressure at each probe, closes grid point to the location ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-              }
-              
-            }
-          }
-          
-        }
-        
-      }
-      
-      /*--- Evaluate the average and min. pressure at each station/radius and fan  ---*/
-      
-      PT_Station = new su2double [nStation];
-      PT_Station_Min = new su2double [nStation];
-      
-      PT_Mean = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        PT_Station[iStation] = 0.0;
-        PT_Station_Min[iStation] = ProbeArray[0][iStation][3];
-        for (iAngle = 0; iAngle < nAngle; iAngle++) {
-          PT = ProbeArray[iAngle][iStation][3];
-          PT_Station[iStation] += PT / float(nAngle);
-          if (PT <= PT_Station_Min[iStation] ) PT_Station_Min[iStation] = PT;
-          PT_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      IDC = 0.0;
-      for (iStation = 0; iStation < nStation-1; iStation++) {
-        IDC = max (IDC, 0.5*((PT_Station[iStation] - PT_Station_Min[iStation])/PT_Mean
-                             + (PT_Station[iStation+1] - PT_Station_Min[iStation+1])/PT_Mean) );
-        
-      }
-      
-      config->SetSurface_IDC(iMarker_Analyze, IDC);
-      solver->SetTotal_IDC(IDC);
-      
-      IDR = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        IDR = max (IDR, (PT_Mean-PT_Station[iStation])/PT_Mean);
-      }
-      
-      config->SetSurface_IDR(iMarker_Analyze, IDR);
-      
-      solver->SetTotal_IDR(IDR);
-      
-      /*--- Release IDX parameters ---*/
-      
-      delete [] PT_Station_Min;
-      delete [] PT_Station;
-      
-      /*--- Evaluate the IDC Mach parameter ---*/
-      
-      /*--- Compute the Mach number at each probe, closes grid point to the location ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy;
-              if (nDim == 3) Distance += dz*dz;
-              Distance = sqrt(Distance);
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord); dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_Mach[Total_Index];
-              }
-              
-            }
-          }
-          
-        }
-        
-      }
-      
-      /*--- Evaluate the average and min. pressure at each station/radius and fan face ---*/
-      
-      Mach_Station = new su2double [nStation];
-      Mach_Station_Min = new su2double [nStation];
-      
-      Mach_Mean = 0.0;
-      for (iStation = 0; iStation < nStation; iStation++) {
-        Mach_Station[iStation] = 0.0;
-        Mach_Station_Min[iStation] = ProbeArray[0][iStation][3];
-        for (iAngle = 0; iAngle < nAngle; iAngle++) {
-          Mach = ProbeArray[iAngle][iStation][3];
-          Mach_Station[iStation] += Mach / float(nAngle);
-          if (Mach <= Mach_Station_Min[iStation] ) Mach_Station_Min[iStation] = Mach;
-          Mach_Mean += ProbeArray[iAngle][iStation][3]/float(nStation*nAngle);
-        }
-      }
-      
-      /*--- Set the value of the distortion, it only works for one surface ---*/
-      
-      IDC_Mach = 0.0;
-      for (iStation = 0; iStation < nStation-1; iStation++) {
-        if (Mach_Mean != 0)
-          IDC_Mach = max (IDC_Mach, 0.5*((Mach_Station[iStation] - Mach_Station_Min[iStation])/Mach_Mean
-                                         + (Mach_Station[iStation+1] - Mach_Station_Min[iStation+1])/Mach_Mean)   );
-        
-      }
-      
-      config->SetSurface_IDC_Mach(iMarker_Analyze, IDC_Mach);
-      
-      solver->SetTotal_IDC_Mach(IDC_Mach);
-      
-      delete [] Mach_Station_Min;
-      delete [] Mach_Station;
-      
-      /*--- Release distortion parameters ---*/
-      
-      delete[] r;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
-      }
-      delete[] ProbeArray;
-      
-      /*--- Create the distortion plot ---*/
-      
-      Theta = 10; nStation = 20;
-      
-      nAngle = SU2_TYPE::Int(360/float(Theta));
-      r = new su2double [nStation+1];
-      
-      /*--- Allocate memory ---*/
-      
-      ProbeArray = new su2double ** [nAngle];
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        ProbeArray[iAngle] = new su2double * [nStation];
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation] = new su2double [11];
-        }
-      }
-      
-      /*--- Define the radius for each probe ---*/
-      
-      r[0] = HubRadius;
-      r[nStation] = TipRadius;
-      
-      for (iStation = 1; iStation < nStation; iStation++) {
-        r[iStation] = sqrt(  r[iStation-1]*r[iStation-1] + (r[nStation]*r[nStation] - r[0]*r[0])/float(nStation) );
-      }
-      
-      /*--- Define the probe rack ---*/
-      
-      UpVector[0] = 0.0; UpVector[1] = 0.0; UpVector[2] = 1.0;
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        
-        radians = -iAngle*Theta*2.0*PI_NUMBER/360;
-        RotatedVector[0] =  UpVector[0];
-        RotatedVector[1] =  UpVector[1] * cos(radians) - UpVector[2] * sin(radians);
-        RotatedVector[2] =  UpVector[1] * sin(radians) + UpVector[2] * cos(radians);
-        
-        for (iStation = 1; iStation <= nStation; iStation++) {
-          ProbeArray[iAngle][iStation-1][0] = xCoord_CG+RotatedVector[0]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][1] = yCoord_CG+RotatedVector[1]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-          ProbeArray[iAngle][iStation-1][2] = zCoord_CG+RotatedVector[2]*sqrt(0.5*(r[iStation]*r[iStation]+r[iStation-1]*r[iStation-1]));
-        }
-        
-      }
-      
-      /*--- Compute the primitieve variables, closest grid point to the location + gradient ---*/
-      
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          xCoord_ = ProbeArray[iAngle][iStation][0];
-          yCoord_ = ProbeArray[iAngle][iStation][1];
-          zCoord_ = ProbeArray[iAngle][iStation][2];
-          
-          MinDistance = 1E6;
-          
-          for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-            for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-              
-              Total_Index = iProcessor*MaxLocalVertex_Surface+iVertex;
-              xCoord = Buffer_Recv_Coord_x[Total_Index];
-              yCoord = Buffer_Recv_Coord_y[Total_Index];
-              if (nDim == 3) zCoord = Buffer_Recv_Coord_z[Total_Index];
-              
-              dx = (xCoord_ - xCoord); dy = (yCoord_ - yCoord);
-              if (nDim == 3) dz = (zCoord_ - zCoord);
-              
-              Distance = dx*dx + dy*dy; if (nDim == 3) Distance += dz*dz; Distance = sqrt(Distance);
-              
-              SignFlip = 1.0;
-              
-              if (Engine_HalfModel) {
-                
-                yCoord = -yCoord;
-                
-                dx_ = (xCoord_ - xCoord);
-                dy_ = (yCoord_ - yCoord);
-                if (nDim == 3) dz_ = (zCoord_ - zCoord);
-                
-                Distance_Mirror = dx_*dx_ + dy_*dy_;
-                if (nDim == 3) Distance_Mirror += dz_*dz_;
-                Distance_Mirror = sqrt(Distance_Mirror);
-                
-                if (Distance_Mirror < Distance) {
-                  SignFlip = -1.0;
-                  Distance = Distance_Mirror;
-                  dx = dx_; dy = dy_;
-                  if (nDim == 3) dz = dz_;
-                }
-                
-              }
-              
-              
-              if (Distance <= MinDistance) {
-                MinDistance = Distance;
-                ProbeArray[iAngle][iStation][3] = Buffer_Recv_PT[Total_Index];
-                ProbeArray[iAngle][iStation][4] = Buffer_Recv_TT[Total_Index];
-                ProbeArray[iAngle][iStation][5] = Buffer_Recv_P[Total_Index];
-                ProbeArray[iAngle][iStation][6] = Buffer_Recv_T[Total_Index];
-                ProbeArray[iAngle][iStation][7] = Buffer_Recv_Mach[Total_Index];
-                ProbeArray[iAngle][iStation][8] = Buffer_Recv_Vel_x[Total_Index];
-                ProbeArray[iAngle][iStation][9] =  SignFlip * Buffer_Recv_Vel_y[Total_Index];
-                if (nDim == 3) ProbeArray[iAngle][iStation][10] = Buffer_Recv_Vel_z[Total_Index];
-              }
-              
-            }
-          }
-          
-        }
-        
-      }
-      
-      /*--- Reverse in the Y direction to move the solution from 3D to 2D ---*/
-      
-      yCoord_CG = -yCoord_CG;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          ProbeArray[iAngle][iStation][9] = -ProbeArray[iAngle][iStation][9];
-          ProbeArray[iAngle][iStation][1] = -ProbeArray[iAngle][iStation][1];
-        }
-      }
-      
-      if (output) {
-        
-        if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-          
-          SurfFlow_file << "\nDATASET UNSTRUCTURED_GRID" << endl;
-          SurfFlow_file <<"POINTS " << nAngle*nStation << " float" << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][1]-yCoord_CG << " " << ProbeArray[iAngle][iStation][2]-zCoord_CG << " 0.0 " <<" ";
-            }
-          }
-          
-          SurfFlow_file <<"\nCELLS " << nAngle*(nStation-1) <<" "<< nAngle*(nStation-1)*5 << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
-              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
-              SurfFlow_file << "4 " << a  <<" "<< b <<" "<< c <<" "<< d <<" ";
-            }
-          }
-          
-          SurfFlow_file <<"\nCELL_TYPES " << nAngle*(nStation-1) << endl;
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              SurfFlow_file << "9 " ;
-            }
-          }
-          
-          SurfFlow_file <<"\nPOINT_DATA " << nAngle*nStation << endl;
-          SurfFlow_file <<"SCALARS PT/PT_inf float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][3] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS TT/TT_inf float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][4] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Alpha float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              SurfFlow_file << Alpha << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Beta float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              SurfFlow_file << Beta << " ";
-            }
-          }
-          
-          SurfFlow_file <<"SCALARS Mach float" << endl;
-          SurfFlow_file <<"LOOKUP_TABLE default" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][7] << " ";
-            }
-          }
-          
-          SurfFlow_file <<"VECTORS Velocity float" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              SurfFlow_file << ProbeArray[iAngle][iStation][8] << " " << ProbeArray[iAngle][iStation][9] << " " << ProbeArray[iAngle][iStation][10] << " ";
-            }
-          }
-          
-        }
-        else {
-          
-          SurfFlow_file <<"ZONE T= \"" << Analyze_TagBound <<"\", NODES=" << nAngle*nStation << " , ELEMENTS= " << nAngle*(nStation-1) <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL" << endl;
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation; iStation++) {
-              
-              Alpha = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              Beta = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              
-              Mach_ij = ProbeArray[iAngle][iStation][7];
-              if (iAngle+1 != nAngle) Mach_ip1j = ProbeArray[iAngle+1][iStation][7];
-              else Mach_ip1j = ProbeArray[0][iStation][7];
-              if (iAngle-1 != -1) Mach_im1j = ProbeArray[iAngle-1][iStation][7];
-              else Mach_im1j = ProbeArray[nAngle-1][iStation][7];
-              if (iStation+1 != nStation) Mach_ijp1 = ProbeArray[iAngle][iStation+1][7];
-              else Mach_ijp1 = ProbeArray[iAngle][0][7];
-              if (iStation-1 != -1) Mach_ijm1 = ProbeArray[iAngle][iStation-1][7];
-              else Mach_ijm1 = ProbeArray[iAngle][nStation-1][7];
-              Filtered_Mach = (4.0*Mach_ij+Mach_ip1j+Mach_im1j+Mach_ijp1+Mach_ijm1)/8.0;
-              
-              Alpha_ij = atan(ProbeArray[iAngle][iStation][10]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle+1 != nAngle) Alpha_ip1j = atan(ProbeArray[iAngle+1][iStation][10]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ip1j = atan(ProbeArray[0][iStation][10]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle-1 != -1) Alpha_im1j = atan(ProbeArray[iAngle-1][iStation][10]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_im1j = atan(ProbeArray[nAngle-1][iStation][10]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation+1 != nStation) Alpha_ijp1 = atan(ProbeArray[iAngle][iStation+1][10]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ijp1 = atan(ProbeArray[iAngle][0][10]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation-1 != -1) Alpha_ijm1 = atan(ProbeArray[iAngle][iStation-1][10]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
-              else Alpha_ijm1 = atan(ProbeArray[iAngle][nStation-1][10]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
-              Filtered_Alpha = (4.0*Alpha_ij+Alpha_ip1j+Alpha_im1j+Alpha_ijp1+Alpha_ijm1)/8.0;
-              
-              Beta_ij = atan(ProbeArray[iAngle][iStation][9]/ProbeArray[iAngle][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle+1 != nAngle) Beta_ip1j = atan(ProbeArray[iAngle+1][iStation][9]/ProbeArray[iAngle+1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ip1j = atan(ProbeArray[0][iStation][9]/ProbeArray[0][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iAngle-1 != -1) Beta_im1j = atan(ProbeArray[iAngle-1][iStation][9]/ProbeArray[iAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_im1j = atan(ProbeArray[nAngle-1][iStation][9]/ProbeArray[nAngle-1][iStation][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation+1 != nStation) Beta_ijp1 = atan(ProbeArray[iAngle][iStation+1][9]/ProbeArray[iAngle][iStation+1][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ijp1 = atan(ProbeArray[iAngle][0][9]/ProbeArray[iAngle][0][8])*360.0/(2.0*PI_NUMBER);
-              if (iStation-1 != -1) Beta_ijm1 = atan(ProbeArray[iAngle][iStation-1][9]/ProbeArray[iAngle][iStation-1][8])*360.0/(2.0*PI_NUMBER);
-              else Beta_ijm1 = atan(ProbeArray[iAngle][nStation-1][9]/ProbeArray[iAngle][nStation-1][8])*360.0/(2.0*PI_NUMBER);
-              Filtered_Beta = (4.0*Beta_ij+Beta_ip1j+Beta_im1j+Beta_ijp1+Beta_ijm1)/8.0;
-              
-              
-              SurfFlow_file
-              << " "  << ProbeArray[iAngle][iStation][1]-yCoord_CG
-              <<" " << ProbeArray[iAngle][iStation][2]-zCoord_CG
-              <<" " << ProbeArray[iAngle][iStation][3] <<" " << ProbeArray[iAngle][iStation][4]
-              <<" " << ProbeArray[iAngle][iStation][5] <<" " << ProbeArray[iAngle][iStation][6]
-              <<" " << ProbeArray[iAngle][iStation][8] <<" " << ProbeArray[iAngle][iStation][9]
-              <<" " << ProbeArray[iAngle][iStation][10]
-              <<" " << Alpha <<" " << Beta << " " << ProbeArray[iAngle][iStation][7]
-              <<" " << Filtered_Alpha <<" " << Filtered_Beta << " " << Filtered_Mach << endl;
-              
-            }
-          }
-          
-          for (iAngle = 0; iAngle < nAngle; iAngle++) {
-            for (iStation = 0; iStation < nStation-1; iStation++) {
-              a = iAngle*nStation+iStation; b = a + nStation; c = b+1; d = a +1;
-              if (iAngle == nAngle-1) { b = iStation; c = b+1;   }
-              SurfFlow_file << a+1  <<" "<< b+1  <<" "<< c+1 <<" "<< d+1 << endl;
-            }
-          }
-          
-          /*--- Add extra info ---*/
-          
-          SurfFlow_file << "TEXT X=14, Y=86, F=HELV-BOLD, C=BLUE, H=2.0, ";
-          unsigned short RackProbes = SU2_TYPE::Int(config->GetDistortionRack()[0]);
-          unsigned short RackAngle = SU2_TYPE::Int(config->GetDistortionRack()[1]);
-          SurfFlow_file << "T=\"Rack Size: " << RackProbes << " probes at "<< RackAngle << "deg." << "\\" << "\\n";
-          SurfFlow_file << "Mach " << config->GetMach() << ", Reynolds " << config->GetReynolds() << ", <greek>a</greek> "
-          << config->GetAoA() << "deg, <greek>b</greek> " << config->GetAoS() << "deg." << "\\" << "\\n";
-          SurfFlow_file.precision(1);
-          SurfFlow_file << fixed << "Net Thrust " << solver->GetTotal_NetThrust() << "lbs, Power " << solver->GetTotal_Power() <<  "HP";
-          SurfFlow_file.precision(4);
-          SurfFlow_file << ", MassFlow " << config->GetSurface_MassFlow(iMarker_Analyze) << ",\\" << "\\n";
-          SurfFlow_file << "IDC " << config->GetSurface_IDC(iMarker_Analyze)*100 << "%, IDCM " << config->GetSurface_IDC_Mach(iMarker_Analyze)*100 << "%, IDR " << config->GetSurface_IDR(iMarker_Analyze)*100 << "%,\\" << "\\n";
-          SurfFlow_file << "DC60 " << config->GetSurface_DC60(iMarker_Analyze) << ".\"" << endl;
-          
-        }
-        
-      }
-
-      /*--- Release the recv buffers on the master node ---*/
-      
-      delete [] Buffer_Recv_Coord_x;
-      delete [] Buffer_Recv_Coord_y;
-      if (nDim == 3) delete [] Buffer_Recv_Coord_z;
-      
-      delete [] Buffer_Recv_PT;
-      delete [] Buffer_Recv_TT;
-      delete [] Buffer_Recv_P;
-      delete [] Buffer_Recv_T;
-      delete [] Buffer_Recv_Mach;
-      delete [] Buffer_Recv_Vel_x;
-      delete [] Buffer_Recv_Vel_y;
-      if (nDim == 3) delete [] Buffer_Recv_Vel_z;
-      delete [] Buffer_Recv_q;
-      
-      delete [] Buffer_Recv_Area;
-      
-      delete [] Buffer_Recv_nVertex;
-      
-      delete[] r;
-      for (iAngle = 0; iAngle < nAngle; iAngle++) {
-        for (iStation = 0; iStation < nStation; iStation++) {
-          delete[] ProbeArray[iAngle][iStation];
-        }
-      }
-      delete[] ProbeArray;
-      
-    }
-    
-//    if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint()) {
-//
-//      cout << "Surface ("<< Analyze_TagBound << "): ";
-//      cout.precision(4);
-//      cout.setf(ios::fixed, ios::floatfield);
-//      cout << setprecision(1) << "IDC " << 100*config->GetSurface_IDC(iMarker_Analyze)
-//      << "%. IDC Mach " << 100*config->GetSurface_IDC_Mach(iMarker_Analyze)
-//      << "%. IDR " << 100*config->GetSurface_IDR(iMarker_Analyze)
-//      << "%. DC60 " << config->GetSurface_DC60(iMarker_Analyze) << "." << endl;
-//
-//    }
-    
-    /*--- Release the memory for the remaining buffers and exit ---*/
-    
-    delete [] Buffer_Send_Coord_x;
-    delete [] Buffer_Send_Coord_y;
-    if (nDim == 3) delete [] Buffer_Send_Coord_z;
-    
-    delete [] Buffer_Send_PT;
-    delete [] Buffer_Send_TT;
-    delete [] Buffer_Send_P;
-    delete [] Buffer_Send_T;
-    delete [] Buffer_Send_Mach;
-    delete [] Buffer_Send_Vel_x;
-    delete [] Buffer_Send_Vel_y;
-    if (nDim == 3) delete [] Buffer_Send_Vel_z;
-    delete [] Buffer_Send_q;
-    
-    delete [] Buffer_Send_Area;
-    
-  }
-  
-  /*--- Close the tecplot  file ---*/
-  
-  if (output) {
-    SurfFlow_file.close();
-  }
-
-}
-
-void COutput::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geometry, CSolver *****solver_container,
-                                CConfig **config, CIntegration ****integration, unsigned long iExtIter,
-                                unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT, bool header) {
-
-  int rank = MASTER_NODE;
-#ifdef HAVE_MPI
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-#endif
-
-  /*--- Output only using the Master Node ---*/
-
-  if ((rank == MASTER_NODE) && (header)){
-
-    char cstr[200], buffer[50], turb_resid[1000];
-    string Monitoring_Tag, monitoring_coeff, aeroelastic_coeff, turbo_coeff;
-
-    bool turbulent = ((config[ZONE_FLOW]->GetKind_Solver() == RANS) || (config[ZONE_FLOW]->GetKind_Solver() == ADJ_RANS) ||
-                       (config[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS));
-
-    unsigned short direct_diff = config[ZONE_FLOW]->GetDirectDiff();
-
-    /*--- Write file name with extension ---*/
-    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
-    strcpy (cstr, filename.data());
-
-    if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
-      long iExtIter = config[ZONE_FLOW]->GetUnst_RestartIter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(cstr, buffer);
-    }
-
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW) || (config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".vtk");
-    strcat(cstr, buffer);
-
-    FSIHist_file->open(cstr, ios::out);
-    FSIHist_file->precision(15);
-
-    /*--- Begin of the header ---*/
-
-    char begin[]= "\"ExtIter\",\"BGSIter\"";
-
-    /*--- Header for the coefficients ---*/
-
-    char flow_coeff[]= ",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CL/CD\"";
-    char fem_coeff[]= ",\"VM_Stress\"";
-    char of_1[] = ",\"TgtGeom\"";
-    char of_2[] = ",\"TgtNode\"";
-
-    char d_flow_coeff[] = ",\"D(CL)\",\"D(CD)\",\"D(CSF)\",\"D(CMx)\",\"D(CMy)\",\"D(CMz)\",\"D(CFx)\",\"D(CFy)\",\"D(CFz)\",\"D(CL/CD)\",\"D(Custom_ObjFunc)\"";
-
-     /*--- Header for the residuals ---*/
-
-    char fsi_resid[]= ",\"Res_FSI\",\"RelaxCoeff\",\"ForceCoeff\"";
-
-    char flow_resid[]= ",\"Res_BGS[F0]\",\"Res_BGS[F1]\",\"Res_BGS[F2]\",\"Res_BGS[F3]\",\"Res_BGS[F4]\"";
-    char adj_flow_resid[]= ",\"Res_AdjFlow[0]\",\"Res_AdjFlow[1]\",\"Res_AdjFlow[2]\",\"Res_AdjFlow[3]\",\"Res_AdjFlow[4]\"";
-    char fem_resid[]= ",\"Res_BGS[S0]\",\"Res_BGS[S1]\",\"Res_BGS[S2]\"";
-
-    /*--- End of the header ---*/
-
-    char end[]= ",\"Time(min)\"\n";
-
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-        FSIHist_file[0] << "TITLE = \"SU2 FSI Simulation\"" << endl;
-        FSIHist_file[0] << "VARIABLES = ";
-    }
-
-    /*--- Write the header, case depending ---*/
-
-    FSIHist_file[0] << begin;
-
-    FSIHist_file[0] << fsi_resid;
-
-    switch (config[ZONE_FLOW]->GetKind_Solver()) {
-
-      /*--- Flow residual output ---*/
-
-      case EULER : case NAVIER_STOKES: case RANS :
-        FSIHist_file[0] << flow_resid;
-        if (turbulent) FSIHist_file[0] << turb_resid;
-      break;
-
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        FSIHist_file[0] << adj_flow_resid;
-        break;
-
-     }
-
-    /*--- FEA residual output ---*/
-
-     switch (config[ZONE_STRUCT]->GetKind_Solver()) {
-
-       case FEM_ELASTICITY:
-         FSIHist_file[0] << fem_resid;
-         break;
-
-       case DISC_ADJ_FEM:
-         FSIHist_file[0] << fem_resid ;
-         break;
-
-     }
-
-     /*--- Flow coefficients output ---*/
-     switch (config[ZONE_FLOW]->GetKind_Solver()) {
-
-     case EULER : case NAVIER_STOKES: case RANS :
-       FSIHist_file[0] << flow_coeff;
-       if (turbulent) FSIHist_file[0] << turb_resid;
-       if (direct_diff != NO_DERIVATIVE) {
-         FSIHist_file[0] << d_flow_coeff;
-       }
-       break;
-
-       case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-         FSIHist_file[0] << adj_flow_resid;
-         break;
-
-      }
-
-      switch (config[ZONE_STRUCT]->GetKind_Solver()) {
-
-        case FEM_ELASTICITY:
-          FSIHist_file[0] << fem_coeff;
-          break;
-
-        case DISC_ADJ_FEM:
-          FSIHist_file[0] << fem_coeff;
-          break;
-
-      }
-
-      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
-        case REFERENCE_GEOMETRY:
-          FSIHist_file[0] << of_1;
-          break;
-        case REFERENCE_NODE:
-          FSIHist_file[0] << of_2;
-          break;
-        default:
-          break;
-      }
-
-     FSIHist_file[0] << end;
-
-
-  }
-
-  if ((rank == MASTER_NODE) && (!header)){
-
-      unsigned short nDim = geometry[ZONE_STRUCT][INST_0][MESH_0]->GetnDim();
-
-      unsigned long iExtIter = config[ZONE_STRUCT]->GetExtIter();
-      unsigned long ExtIter_OffSet = config[ZONE_STRUCT]->GetExtIter_OffSet();
-      unsigned long iOuterIter = config[ZONE_STRUCT]->GetOuterIter();
-      su2double dummy = 0.0;
-
-      bool first_iter = ((iExtIter==0) && (iOuterIter == 0));
-
-
-      bool compressible = (config[ZONE_FLOW]->GetKind_Regime() == COMPRESSIBLE);
-      bool incompressible = (config[ZONE_FLOW]->GetKind_Regime() == INCOMPRESSIBLE);
-
-
-      bool fem = ((config[ZONE_STRUCT]->GetKind_Solver() == FEM_ELASTICITY) ||
-              (config[ZONE_STRUCT]->GetKind_Solver() == DISC_ADJ_FEM));
-      bool linear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == SMALL_DEFORMATIONS);
-      bool nonlinear_analysis = (config[ZONE_STRUCT]->GetGeometricConditions() == LARGE_DEFORMATIONS);
-
-      bool disc_adj_flow = config[ZONE_FLOW]->GetDiscrete_Adjoint();
-      bool disc_adj_fem = config[ZONE_STRUCT]->GetDiscrete_Adjoint();
-
-
-      /*--- WARNING: These buffers have hard-coded lengths. Note that you
-       may have to adjust them to be larger if adding more entries. ---*/
-
-      char begin[1000], direct_coeff[1000],
-      fsi_resid[1000], fsi_coeffs[1000],
-      flow_resid[1000], fem_resid[1000],
-      objective_function[1000], end[1000];
-
-      su2double *residual_flow         = NULL;
-      su2double *residual_fem          = NULL;
-      su2double *residual_fsi          = NULL;
-      su2double *coeffs_fsi            = NULL;
-
-      /*--- Initialize number of variables ---*/
-      unsigned short nVar_FSI = 1, nCoeff_FSI = 2, nVar_Flow = 0, nVar_FEM = 0;
-
-      unsigned short iVar;
-
-      /*--- Direct problem variables ---*/
-      if (compressible) nVar_Flow = nDim+2; else nVar_Flow = nDim+1;
-
-      if (fem) {
-        if (linear_analysis) nVar_FEM = nDim;
-        if (nonlinear_analysis) nVar_FEM = 3;
-        if (disc_adj_fem) nVar_FEM = nDim;
-      }
-
-      residual_flow       = new su2double[nVar_Flow];
-      residual_fem        = new su2double[nVar_FEM];
-      residual_fsi        = new su2double[nVar_FSI];
-      coeffs_fsi          = new su2double[nCoeff_FSI];
-
-      /*--- Initialize variables to store information from all domains (direct solution) ---*/
-
-      su2double Total_CL = 0.0, Total_CD = 0.0, Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
-                Total_OF = 0.0;
-
-      Total_CL       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CL();
-      Total_CD       = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CD();
-      Total_CEff     = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CEff();
-      Total_CMx      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMx();
-      Total_CMy      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMy();
-      Total_CMz      = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CMz();
-
-      bool print_of = false;
-
-      switch (config[ZONE_STRUCT]->GetKind_ObjFunc()){
-        case REFERENCE_GEOMETRY:
-          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefGeom();
-          print_of = true;
-          break;
-        case REFERENCE_NODE:
-          Total_OF = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetTotal_OFRefNode();
-          print_of = true;
-          break;
-        default:
-          break;
-      }
-
-      if ((!disc_adj_flow) && (!disc_adj_fem)){
-        /*--- Flow Residuals ---*/
-        for (iVar = 0; iVar < nVar_Flow; iVar++)
-          residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetRes_BGS(iVar);
-
-        /*--- FEA Residuals ---*/
-        for (iVar = 0; iVar < nVar_FEM; iVar++)
-          residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRes_BGS(iVar);
-
-        residual_fsi[0] = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetFSI_Residual();
-        coeffs_fsi[0]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRelaxCoeff();
-        coeffs_fsi[1]  = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetForceCoeff();
-
-      }
-      else{
-          /*--- Flow Residuals ---*/
-          for (iVar = 0; iVar < nVar_Flow; iVar++)
-            residual_flow[iVar] = solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_BGS(iVar);
-          /*--- FEA Residuals ---*/
-          for (iVar = 0; iVar < nVar_FEM; iVar++)
-            residual_fem[iVar] = solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_BGS(iVar);
-      }
-
-      /*--- Write the begining of the history file ---*/
-      SPRINTF(begin, "%12d, %12d", SU2_TYPE::Int(iExtIter+ExtIter_OffSet), SU2_TYPE::Int(iOuterIter));
-      /*--- Write the end of the history file ---*/
-      SPRINTF (end, "\n");
-
-      SPRINTF (fsi_resid, ", %14.8e", log10 (residual_fsi[0]));
-      SPRINTF (fsi_coeffs, ", %14.8e,  %14.8e", coeffs_fsi[0], coeffs_fsi[1]);
-
-      /*--- Flow residual ---*/
-      if (nDim == 2) {
-        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), dummy, dummy);
-      }
-      else {
-        if (compressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), log10 (residual_flow[4]) );
-        if (incompressible) SPRINTF (flow_resid, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e", log10 (residual_flow[0]), log10 (residual_flow[1]), log10 (residual_flow[2]), log10 (residual_flow[3]), dummy);
-      }
-
-      /*--- FEM residual ---*/
-      if (nDim == 2) SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), dummy);
-      else SPRINTF (fem_resid, ", %14.8e, %14.8e, %14.8e", log10 (residual_fem[0]), log10 (residual_fem[1]), log10 (residual_fem[1]));
-
-      /*--- Direct coefficients ---*/
-      SPRINTF (direct_coeff, ", %14.8e, %14.8e, %14.8e, %14.8e, %14.8e, %14.8e",Total_CL, Total_CD, Total_CMx, Total_CMy, Total_CMz, Total_CEff);
-
-      if (print_of) SPRINTF (objective_function, ", %14.8e", Total_OF);
-
-      if (!first_iter){
-          if (!print_of) FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << end;
-          else FSIHist_file[0] << begin << fsi_resid << fsi_coeffs << flow_resid << fem_resid << direct_coeff << objective_function << end;
-            FSIHist_file[0].flush();
-      }
-
-      delete [] residual_flow;
-      delete [] residual_fem;
-      delete [] residual_fsi;
-      delete [] coeffs_fsi;
-
-
-  }
-
-}
-
-void COutput::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
-
-  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
-  unsigned long iVertex, iPoint, nPoint, nVertex;
-  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
-
-  unsigned short iZone;
-
-  CSolver ***solver = new CSolver**[val_nZone];
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    solver[iZone] = new CSolver*[1];
-  }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-    nPoint = geometry[iZone][INST_0]->GetnPoint();
-    nDim   = geometry[iZone][INST_0]->GetnDim();
-    nMarker = config[iZone]->GetnMarker_All();
-    nVar = nDim + 1;
-
-    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
-
-    vector<string> fieldnames;
-    fieldnames.push_back("\"Point\"");
-    fieldnames.push_back("\"x\"");
-    fieldnames.push_back("\"y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"z\"");
-    }
-    fieldnames.push_back("\"Sensitivity_x\"");
-    fieldnames.push_back("\"Sensitivity_y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"Sensitivity_z\"");
-    }
-    fieldnames.push_back("\"Surface_Sensitivity\"");
-
-    solver[iZone][INST_0] = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
-
-    for (iPoint = 0; iPoint < nPoint; iPoint++) {
-      for (iDim = 0; iDim < nDim; iDim++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
-      }
-      for (iVar = 0; iVar < nDim; iVar++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
-      }
-    }
-
-    /*--- Compute the sensitivity in normal direction ---*/
-
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX ) ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL ) ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL ) ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
-
-        
-        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
-
-        for (iVertex = 0; iVertex < nVertex; iVertex++) {
-          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
-          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
-          Prod = 0.0;
-          Area = 0.0;
-          for (iDim = 0; iDim < nDim; iDim++) {
-
-            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
-
-            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
-
-            /*--- Calculate scalar product for projection onto the normal vector ---*/
-
-            Prod += Normal[iDim]*SensDim;
-
-            Area += Normal[iDim]*Normal[iDim];
-          }
-
-          Area = sqrt(Area);
-
-          /*--- Projection of the gradient onto the normal vector of the surface ---*/
-
-          Sens = Prod/Area;
-
-          solver[iZone][INST_0]->node[iPoint]->SetSolution(2*nDim, Sens);
-
-        }
-      }
-    }
-  }
-
-  /*--- Merge the information and write the output files ---*/
-
-  SetBaselineResult_Files(solver, geometry, config, 0, val_nZone);
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    delete solver[iZone][0];
-    delete solver[iZone];
-  }
-  delete [] solver;
-}
-
-void COutput::WriteTurboPerfConvHistory(CConfig *config){
-
-  unsigned short iMarker_Monitoring;
-  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
-  unsigned short nZone       = config->GetnZone();
-  bool turbulent = ((config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == DISC_ADJ_RANS));
-  bool menter_sst       = (config->GetKind_Turb_Model() == SST);
-
-  unsigned short nBladesRow, nStages;
-  unsigned short iStage;
-  nBladesRow = config->GetnMarker_Turbomachinery();
-  nStages    = SU2_TYPE::Int(nBladesRow/2);
-
-  cout << endl << "------------------------- Turbomachinery Summary ------------------------" << endl;
-  cout << endl;
-  for (iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Turbomachinery(); iMarker_Monitoring++){
-    cout << endl << "----------------------------- Blade " << iMarker_Monitoring + 1 << " -----------------------------------" << endl;
-    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring);
-    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iMarker_Monitoring);
-    if(iMarker_Monitoring == 0){
-      cout << "BC Inlet convergence monitoring marker " << inMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Inlet Total Enthalpy" << "     Inlet Total Enthalpy BC" << "     err(%)" <<  endl;
-      cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-      cout.width(25); cout << TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-      cout.width(25); cout << abs((TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TotalEnthalpyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Inlet Entropy" << "            Inlet Entropy BC" << "            err(%)" <<  endl;
-      cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Inlet Absolute Angle" << "     Inlet Absolute Angle BC" << "     err(%)" <<  endl;
-      cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-      cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-      cout.width(25); cout << abs((AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/FlowAngleIn_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-      if(turbulent){
-        if(menter_sst){
-          cout << "     Inlet TurbIntensity" << "      Inlet TurbIntensity BC" << "      err(%)" <<  endl;
-          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetTurbulenceIntensity_FreeStream();
-          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurbulenceIntensity_FreeStream())/config->GetTurbulenceIntensity_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
-          cout << "     Inlet Turb2LamRatio" << "      Inlet Turb2LamRatio BC" << "      err(%)" <<  endl;
-          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetTurb2LamViscRatio_FreeStream();
-          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetTurb2LamViscRatio_FreeStream())/config->GetTurb2LamViscRatio_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
-        }
-        else{
-          cout << "     Inlet Nu Factor" << "          Inlet Nu Factor BC" << "          err(%)" <<  endl;
-          cout.width(25); cout << NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << config->GetNuFactor_FreeStream();
-          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - config->GetNuFactor_FreeStream())/config->GetNuFactor_FreeStream())*100.0;
-          cout << endl;
-          cout << endl;
-        }
-      }
-    }
-    if(iMarker_Monitoring == config->GetnMarker_Turbomachinery() -1 ){
-      // if BC outlet
-      cout << "BC outlet convergence monitoring  marker " << outMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Outlet Pressure" << "          Outlet Pressure BC" << "          err(%)" <<  endl;
-      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << abs((PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureOut_BC[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-      cout << endl;
-      cout << endl;
-    }
-
-    cout << "Convergence monitoring for integral quantities between markers " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Inlet Mass Flow " << "         Outlet Mass Flow" << "            err(%)" <<  endl;
-    cout.width(25); cout << MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
-    cout.width(25); cout << MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetVelocity_Ref()*config->GetDensity_Ref();
-    cout.width(25); cout << abs((MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - MassFlowOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/MassFlowIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-    cout << endl;
-    cout << endl;
-    //if(stator)
-    //cout << "     Inlet Total Enthalpy " << "    Outlet Total Enthalpy" << "     err(%)" <<  endl;
-    //else
-    cout << "     Inlet Total Rothalpy " << "    Outlet Total Rothalpy" << "       err(%)" <<  endl;
-    cout.width(25); cout << RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << abs((RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)] - RothalpyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/RothalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "Blade performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Total Pressure Loss(%)" << "   Kinetic Energy Loss(%)" << "      Entropy Generation(%)" << endl;
-    cout.width(25); cout << TotalPressureLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout.width(25); cout << KineticEnergyLoss[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout.width(25); cout << EntropyGen[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "     Total Inlet Enthalpy" << "     Eulerian Work" << "               Pressure Ratio" <<  endl;
-    cout.width(25); cout << TotalEnthalpyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << EulerianWork[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout.width(25); cout << PressureRatio[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl;
-    cout << "     Inlet Entropy" << "            Outlet Entropy" << "             Outlet Is. Enthalpy" <<  endl;
-    cout.width(25); cout << EntropyIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-    cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-    cout.width(25); cout << EnthalpyOutIs[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref();
-    cout << endl;
-    cout << endl;
-    cout << "Cinematic quantities between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Inlet Mach"<< "               Inlet Normal Mach" << "            Inlet Tang. Mach" << endl;
-    cout.width(25); cout << sqrt(MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
-    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
-    cout.width(25); cout << MachIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];
-    cout << endl;
-    cout << endl;
-    cout << "     Outlet Mach"<< "              Outlet Normal Mach" << "           Outlet Tang. Mach" << endl;
-    cout.width(25); cout << sqrt(MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0] +MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]);
-    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0];
-    cout.width(25); cout << MachOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1];cout << endl;
-    cout << endl;
-    cout << "     Inlet Flow Angle" << "         Outlet flow Angle  " << endl;
-    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout.width(25); cout << 180.0/PI_NUMBER*FlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl;
-    // if gridmov
-    cout << "     Inlet Abs Flow Angle" << "     Outlet Abs Flow Angle  " << endl;
-    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleIn[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout.width(25); cout << 180.0/PI_NUMBER*AbsFlowAngleOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-    if(nZone > 0 && iMarker_Monitoring < config->GetnMarker_Turbomachinery() -1){
-      cout << endl << "---------- Mixing-Plane Interface between Blade " << iMarker_Monitoring + 1 << " and Blade " << iMarker_Monitoring + 2 << " -----------" << endl;
-      cout << endl;
-      inMarkerTag_Mix = config->GetMarker_TurboPerf_BoundIn(iMarker_Monitoring + 1);
-      cout << "Convergence monitoring for the outlet  " << outMarker_Tag << " and the inlet  "<< inMarkerTag_Mix << " : "<<endl;
-      cout << endl;
-      cout << "     Outlet Density " << "          Inlet Density" << "               err(%)" <<  endl;
-      cout.width(25); cout << DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetDensity_Ref();
-      cout.width(25); cout << DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring + 1)]*config->GetDensity_Ref();
-      cout.width(25); cout << abs((DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - DensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/DensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Pressure " << "         Inlet Pressure" << "              err(%)" <<  endl;
-      cout.width(25); cout << PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetPressure_Ref();
-      cout.width(25); cout << PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetPressure_Ref();
-      cout.width(25); cout << abs((PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)] - PressureOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/PressureIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Normal Velocity " << "  Inlet Normal Velocity" << "       err(%)" <<  endl;
-      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0]*config->GetVelocity_Ref();
-      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0]*config->GetVelocity_Ref();
-      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][0])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][0])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Tang. Velocity " << "   Inlet Tang. Velocity" << "        err(%)" <<  endl;
-      cout.width(25); cout << TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1]*config->GetVelocity_Ref();
-      cout.width(25); cout << TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1]*config->GetVelocity_Ref();
-      cout.width(25); cout << abs((TurboVelocityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1] - TurboVelocityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)][1])/TurboVelocityIn[iMarker_Monitoring+1][config->GetnSpan_iZones(iMarker_Monitoring +1)][1])*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Outlet Entropy " << "          Inlet Entropy" << "               err(%)" <<  endl;
-      cout.width(25); cout << EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)]*config->GetEnergy_Ref()/config->GetTemperature_Ref();
-      cout.width(25); cout << abs((EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - EntropyOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/EntropyIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-      if(turbulent){
-        cout << endl;
-        cout << endl;
-        if(menter_sst){
-          cout << "     Outlet TurbIntensity " << "    Inlet TurbIntensity" << "         err(%)" <<  endl;
-          cout.width(25); cout << TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - TurbIntensityOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/TurbIntensityIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-          cout << endl;
-          cout << endl;
-          cout << "     Outlet Turb2LamRatio " << "    Inlet Turb2LamRatio" << "         err(%)" <<  endl;
-          cout.width(25); cout << Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - Turb2LamViscRatioOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/Turb2LamViscRatioIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-        }
-        else{
-          cout << "     Outlet Nu Factor " << "        Inlet Nu Factor" << "             err(%)" <<  endl;
-          cout.width(25); cout << NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)];
-          cout.width(25); cout << NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring +1)];
-          cout.width(25); cout << abs((NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)] - NuFactorOut[iMarker_Monitoring][config->GetnSpan_iZones(iMarker_Monitoring)])/NuFactorIn[iMarker_Monitoring + 1][config->GetnSpan_iZones(iMarker_Monitoring+1)])*100.0;
-        }
-      }
-      cout << endl;
-      cout << endl << "-------------------------------------------------------------------------" << endl;
-      cout << endl;
-    }
-
-  }
-  if(nZone > 1){
-    /*--- Stage Performance ---*/
-    for(iStage = 0; iStage < nStages; iStage++ ){
-      cout << endl << "----------------------------- Stage " << iStage + 1 << " -----------------------------------" << endl;
-      inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(iStage*2);
-      outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(iStage*2+1);
-      cout << "Stage performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-      cout << endl;
-      cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
-      cout.width(25); cout << TotalTotalEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout.width(25); cout << TotalStaticEfficiency[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout.width(25); cout << EntropyGen[nBladesRow + iStage][nSpanWiseSections]*100.0;
-      cout << endl;
-      cout << endl;
-      cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
-      cout.width(25); cout << PressureRatio[nBladesRow + iStage][nSpanWiseSections];
-      cout.width(25); cout << EnthalpyOutIs[nBladesRow + iStage][nSpanWiseSections]*config->GetEnergy_Ref();
-      cout.width(25); cout << abs((MassFlowIn[nBladesRow + iStage][nSpanWiseSections] - MassFlowOut[nBladesRow + iStage][nSpanWiseSections])/MassFlowIn[nBladesRow + iStage][nSpanWiseSections])*100.0;
-    }
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-
-    /*--- Full Machine Performance ---*/
-    // if(turbine)
-    cout << endl << "---------------------------- Turbine ------------------------------------" << endl;
-    inMarker_Tag = config->GetMarker_TurboPerf_BoundIn(0);
-    outMarker_Tag = config->GetMarker_TurboPerf_BoundOut(nBladesRow-1);
-    cout << "Turbine performance between boundaries " << inMarker_Tag << " and "<< outMarker_Tag << " : "<<endl;
-    cout << endl;
-    cout << "     Total-Total Eff.(%)" << "      Total-Static Eff.(%)" << "      Entropy Generation(%)" << endl;
-    cout.width(25); cout << TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout.width(25); cout << TotalStaticEfficiency[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout.width(25); cout << EntropyGen[nBladesRow + nStages][nSpanWiseSections]*100.0;
-    cout << endl;
-    cout << endl;
-    cout << "     Pressure Ratio " << "          Outlet Is. Enthalpy" << "       In-Out MassFlow Diff (%)" <<  endl;
-    cout.width(25); cout << PressureRatio[nBladesRow + nStages][nSpanWiseSections];
-    cout.width(25); cout << EnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]*config->GetEnergy_Ref();;
-    cout.width(25); cout << abs((MassFlowIn[nBladesRow + nStages][nSpanWiseSections] - MassFlowOut[nBladesRow + nStages][nSpanWiseSections])/MassFlowIn[nBladesRow + nStages][nSpanWiseSections])*100.0;
-    cout << endl;
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-  }
-  
-}
-
-void COutput::SpecialOutput_Turbo(CSolver *****solver, CGeometry ****geometry, CConfig **config,
-                                       unsigned short val_iZone, bool output) {
-  
-  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
-  unsigned short nZone       = config[val_iZone]->GetnZone();
-
-  unsigned short iDim, iSpan;
-
-  unsigned long iExtIter = config[val_iZone]->GetExtIter();
-  su2double* SpanWiseValuesIn, *SpanWiseValuesOut;
-  ofstream myfile;
-  string spanwise_performance_filename;
-
-
-  /*--- Start of write file turboperformance spanwise ---*/
-  if (rank == MASTER_NODE){
-    SpanWiseValuesIn = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(1);
-    SpanWiseValuesOut = geometry[val_iZone][INST_0][MESH_0]->GetSpanWiseValue(2);
-
-
-
-    /*--- Writing Span wise inflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_thermodynamic_values.dat";
-    char buffer[50];
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
-    }
-
-
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-
-    myfile << "TITLE = \"Inflow Spanwise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Pressure[Pa]\"";
-    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
-    myfile.width(30); myfile << "\"Temperature[K]\"";
-    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
-    myfile.width(30); myfile << "\"Enthalpy[J]\"";
-    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
-    myfile.width(30); myfile << "\"Density[kg/m3]\"";
-    myfile.width(30); myfile << "\"Entropy[J/K]\"";
-    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
-    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
-    myfile.width(30); myfile << "\"NuFactor[-]\"";
-    myfile << endl;
-
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-
-      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
-      myfile.width(15); myfile << iSpan;
-      myfile.width(30); myfile << PressureIn           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TotalPressureIn      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TemperatureIn        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << TotalTemperatureIn   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << EnthalpyIn           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << TotalEnthalpyIn      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << DensityIn            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
-      myfile.width(30); myfile << EntropyIn            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
-      if(TurbIntensityIn[val_iZone][iSpan] > 1.0){
-        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
-      }else{
-        myfile.width(30); myfile << TurbIntensityIn      [val_iZone][iSpan];
-      }
-      myfile.width(30); myfile << Turb2LamViscRatioIn  [val_iZone][iSpan];
-      myfile.width(30); myfile << NuFactorIn           [val_iZone][iSpan];
-      myfile << endl;
-    }
-
-    myfile.close();
-
-    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_thermodynamic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
-    }
-
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-
-    myfile << "TITLE = \"Outflow Span-wise Thermodynamic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Pressure[Pa]\"";
-    myfile.width(30); myfile << "\"TotalPressure[Pa]\"";
-    myfile.width(30); myfile << "\"Temperature[K]\"";
-    myfile.width(30); myfile << "\"TotalTemperature[K]\"";
-    myfile.width(30); myfile << "\"Enthalpy[J]\"";
-    myfile.width(30); myfile << "\"TotalEnthalpy[J]\"";
-    myfile.width(30); myfile << "\"Density[kg/m3]\"";
-    myfile.width(30); myfile << "\"Entropy[J/K]\"";
-    myfile.width(30); myfile << "\"TurbIntensity[-]\"";
-    myfile.width(30); myfile << "\"Turb2LamViscRatio[-]\"";
-    myfile.width(30); myfile << "\"NuFactor[-]\"";
-    myfile << endl;
-
-
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-
-      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
-      myfile.width(15); myfile << iSpan;
-      myfile.width(30); myfile << PressureOut           [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TotalPressureOut      [val_iZone][iSpan]*config[ZONE_0]->GetPressure_Ref();
-      myfile.width(30); myfile << TemperatureOut        [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << TotalTemperatureOut   [val_iZone][iSpan]*config[ZONE_0]->GetTemperature_Ref();
-      myfile.width(30); myfile << EnthalpyOut           [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << TotalEnthalpyOut      [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref();
-      myfile.width(30); myfile << DensityOut            [val_iZone][iSpan]*config[ZONE_0]->GetDensity_Ref();
-      myfile.width(30); myfile << EntropyOut            [val_iZone][iSpan]*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
-      if(TurbIntensityOut[val_iZone][iSpan] > 1.0){
-        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][config[ZONE_0]->GetnSpan_iZones(val_iZone)/2];
-      }else{
-        myfile.width(30); myfile << TurbIntensityOut      [val_iZone][iSpan];
-      }
-      myfile.width(30); myfile << Turb2LamViscRatioOut  [val_iZone][iSpan];
-      myfile.width(30); myfile << NuFactorOut           [val_iZone][iSpan];
-      myfile << endl;
-    }
-
-    myfile.close();
-
-    /*--- Writing Span wise inflow kinematic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_kinematic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
-    }
-    
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-    
-    myfile << "TITLE = \"Inflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-    
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Normal Mach[-]\"";
-    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
-    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
-    myfile.width(30); myfile << "\"Mach Module[-]\"";
-    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
-    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
-    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
-    myfile << endl;
-    
-    
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-      
-      myfile.width(30); myfile << SpanWiseValuesIn[iSpan];
-      myfile.width(15); myfile << iSpan;
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << MachIn              [val_iZone][iSpan][iDim];
-      }
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << TurboVelocityIn     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
-      }
-      if(AbsFlowAngleIn[val_iZone][iSpan] != AbsFlowAngleIn[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
-      }
-      else{
-        myfile.width(30); myfile << AbsFlowAngleIn     [val_iZone][iSpan]*180.0/PI_NUMBER;
-      }
-      if(FlowAngleIn[val_iZone][iSpan] != FlowAngleIn[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
-      }
-      else{
-        myfile.width(30); myfile << FlowAngleIn      [val_iZone][iSpan]*180.0/PI_NUMBER;
-      }
-      myfile << endl;
-    }
-    
-    myfile.close();
-    
-    /*--- Writing Span wise outflow thermodynamic quantities. ---*/
-    spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_kinematic_values.dat";
-    if (nZone > 1){
-      unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
-      spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
-      SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-      spanwise_performance_filename.append(string(buffer));
-    }
-    
-    myfile.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
-    myfile.setf(ios::scientific);
-    myfile.precision(12);
-    
-    myfile << "TITLE = \"Outflow Span-wise Kinematic Values. iExtIter = " << iExtIter << " \"" << endl;
-    myfile << "VARIABLES =" << endl;
-    
-    myfile.width(30); myfile << "\"SpanWise Value[m]\"";
-    myfile.width(15); myfile << "\"iSpan\"";
-    myfile.width(30); myfile << "\"Normal Mach[-]\"";
-    myfile.width(30); myfile << "\"Tangential Mach[-]\"";
-    myfile.width(30); myfile << "\"3rd Component Mach[-]\"";
-    myfile.width(30); myfile << "\"Mach Module[-]\"";
-    myfile.width(30); myfile << "\"Normal Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Tangential Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"3rd Component Velocity[m/s]\"";
-    myfile.width(30); myfile << "\"Velocity Module[m/s]\"";
-    myfile.width(30); myfile << "\"Absolute Flow Angle[deg]\"";
-    myfile.width(30); myfile << "\"Relative Flow Angle[deg]\"";
-    myfile << endl;
-    
-    
-    for(iSpan = 0; iSpan < config[ZONE_0]->GetnSpan_iZones(val_iZone); iSpan++){
-      
-      myfile.width(30); myfile << SpanWiseValuesOut[iSpan];
-      myfile.width(15); myfile << iSpan;
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << MachOut              [val_iZone][iSpan][iDim];
-      }
-      for (iDim = 0; iDim < 4; iDim++){
-        myfile.width(30); myfile << TurboVelocityOut     [val_iZone][iSpan][iDim]*config[ZONE_0]->GetVelocity_Ref();
-      }
-      if(AbsFlowAngleOut[val_iZone][iSpan] != AbsFlowAngleOut[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
-      }
-      else{
-        myfile.width(30); myfile << AbsFlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
-      }
-      if(FlowAngleOut[val_iZone][iSpan] != FlowAngleOut[val_iZone][iSpan]){
-        myfile.width(30); myfile << "0.0000";
-      }
-      else{
-        myfile.width(30); myfile << FlowAngleOut      [val_iZone][iSpan]*180.0/PI_NUMBER;
-      }
-      myfile << endl;
-    }
-    
-    myfile.close();
-    
-  }
-}
-
-void COutput::SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry ****geometry, CConfig **config, unsigned short iInst, unsigned short val_nInst, bool output) {
-  
-  /*--- Write file with flow quantities for harmonic balance HB ---*/
-  ofstream HB_output_file;
-  ofstream mean_HB_file;
-
-  /*--- MPI Send/Recv buffers ---*/
-  su2double *sbuf_var = NULL,  *rbuf_var = NULL;
-
-  /*--- Other variables ---*/
-  unsigned short iVar, kInst;
-  unsigned short nVar_output = 5;
-  unsigned long current_iter = config[ZONE_0]->GetExtIter();
-
-  /*--- Allocate memory for send buffer ---*/
-  sbuf_var = new su2double[nVar_output];
-
-  su2double *averages = new su2double[nVar_output];
-  for (iVar = 0; iVar < nVar_output; iVar++)
-    averages[iVar] = 0;
-
-  /*--- Allocate memory for receive buffer ---*/
-  if (rank == MASTER_NODE) {
-    rbuf_var = new su2double[nVar_output];
-
-    HB_output_file.precision(15);
-    HB_output_file.open("HB_output.csv", ios::out);
-    HB_output_file <<  "\"time_instance\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\"" << endl;
-
-    mean_HB_file.precision(15);
-    if (current_iter == 0 && iInst == 1) {
-      mean_HB_file.open("history_HB.plt", ios::trunc);
-      mean_HB_file << "TITLE = \"SU2 HARMONIC BALANCE SIMULATION\"" << endl;
-      mean_HB_file <<  "VARIABLES = \"Iteration\",\"CL\",\"CD\",\"CMx\",\"CMy\",\"CMz\",\"CT\",\"CQ\",\"CMerit\"" << endl;
-      mean_HB_file << "ZONE T= \"Average Convergence History\"" << endl;
-    }
-    else
-      mean_HB_file.open("history_HB.plt", ios::out | ios::app);
-  }
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Run through the zones, collecting the output variables
-       N.B. Summing across processors within a given zone is being done
-       elsewhere. ---*/
-    for (kInst = 0; kInst < val_nInst; kInst++) {
-      
-      /*--- Flow solution coefficients (parallel) ---*/
-      sbuf_var[0] = solver[ZONE_0][kInst][MESH_0][FLOW_SOL]->GetTotal_CL();
-      sbuf_var[1] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CD();
-      sbuf_var[2] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMx();
-      sbuf_var[3] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMy();
-      sbuf_var[4] = solver[ZONE_0][kInst][INST_0][FLOW_SOL]->GetTotal_CMz();
-      
-      for (iVar = 0; iVar < nVar_output; iVar++) {
-        rbuf_var[iVar] = sbuf_var[iVar];
-      }
-
-      HB_output_file << kInst << ", ";
-      for (iVar = 0; iVar < nVar_output; iVar++)
-        HB_output_file << rbuf_var[iVar] << ", ";
-      HB_output_file << endl;
-
-      /*--- Increment the total contributions from each zone, dividing by nZone as you go ---*/
-      for (iVar = 0; iVar < nVar_output; iVar++) {
-        averages[iVar] += (1.0/su2double(val_nInst))*rbuf_var[iVar];
-      }
-    }
-  }
-
-  if (rank == MASTER_NODE && iInst == INST_0) {
-
-    mean_HB_file << current_iter << ", ";
-    for (iVar = 0; iVar < nVar_output; iVar++) {
-      mean_HB_file << averages[iVar];
-      if (iVar < nVar_output-1)
-        mean_HB_file << ", ";
-    }
-    mean_HB_file << endl;
-  }
-
-  if (rank == MASTER_NODE) {
-    HB_output_file.close();
-    mean_HB_file.close();
-    delete [] rbuf_var;
-  }
-
-  delete [] sbuf_var;
-  delete [] averages;
-}
-
-void COutput::SetSpecial_Output(CSolver *****solver_container,
-                                       CGeometry ****geometry,
-                                       CConfig **config,
-                                       unsigned long iExtIter,
-                                       unsigned short val_nZone) {
-
-  bool special_output = false;
-  unsigned short iZone;
-
-  for (iZone = 0; iZone < val_nZone; iZone++){
-
-    special_output = config[iZone]->GetSpecial_Output();
-
-    /*--- Output a file with the forces breakdown. ---*/
-    if (config[iZone]->GetWrt_ForcesBreakdown())
-      SpecialOutput_ForcesBreakdown(solver_container, geometry, config, iZone, special_output);
-
-  }
-
-}
-
-void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
-                                       CGeometry ****geometry,
-                                       CConfig **config,
-                                       unsigned long iExtIter,
-                                       unsigned short val_nZone) {
-  
-  unsigned short iZone, iVar, iInst;
-  unsigned long iPoint;
-  unsigned short nInst = 1;
-  bool compressible = true;
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-    /*--- Bool to distinguish between the FVM and FEM solvers. ---*/
-    unsigned short KindSolver = config[iZone]->GetKind_Solver();
-    bool fem_solver = ((KindSolver == FEM_EULER) ||
-                       (KindSolver == FEM_NAVIER_STOKES) ||
-                       (KindSolver == FEM_RANS) ||
-                       (KindSolver == FEM_LES));
-    
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    nInst = config[iZone]->GetnTimeInstances();
-    
-    for (iInst = 0; iInst < nInst; iInst++){
-
-      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
-
-      /*--- Flags identifying the types of files to be written. ---*/
-      /*--- For now, we are disabling the parallel writers for Tecplot
-          ASCII until we have parallel versions of all file formats
-          available. SU2_SOL will remain intact for writing files
-          until this capability is completed. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-      bool Wrt_Csv = config[iZone]->GetWrt_Csv_Sol();
-
-#ifdef HAVE_MPI
-      /*--- Do not merge the connectivity or write the visualization files
-     if we are running in parallel, unless we are using ParaView binary.
-       Force the use of SU2_SOL to merge and write the viz. files in this
-       case to save overhead. ---*/
-
-      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
-        Wrt_Vol = false;
-        Wrt_Srf = false;
-      }
-#endif
-
-    /*--- Check for compressible/incompressible flow problems. ---*/
-
-    compressible = (config[iZone]->GetKind_Regime() == COMPRESSIBLE);
-
-    /*--- First, prepare the offsets needed throughout below. ---*/
-
-    PrepareOffsets(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-    
-    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
-    switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES : case RANS :
-        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
-            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
-            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
-            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-        break;
-      default: break;
-    }
-
-    /*--- Write a template inlet profile file if requested. ---*/
-
-    if (config[iZone]->GetWrt_InletFile()) {
-      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      if (rank == MASTER_NODE) {
-        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-      }
-      config[iZone]->SetWrt_InletFile(false);
-    }
-
-    /*--- This switch statement will become a call to a virtual function
-     defined within each of the "physics" output child classes that loads
-     the local data for that particular problem alone. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Loading solution output data locally on each rank." << endl;
-
-      switch (config[iZone]->GetKind_Solver()) {
-      case EULER : case NAVIER_STOKES: case RANS :
-        if (compressible)
-          LoadLocalData_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        else
-          LoadLocalData_IncFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-        LoadLocalData_AdjFlow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case FEM_ELASTICITY: case DISC_ADJ_FEM:
-        LoadLocalData_Elasticity(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case HEAT_EQUATION_FVM:
-        LoadLocalData_Base(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-        break;
-      case FEM_EULER: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
-        LoadLocalData_FEM(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone);
-      default: break;
-    }
-    
-    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[nVar_Par];
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
-          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
-        }
-      }
-      
-    }
-    
-    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < nVar_Par; iVar++) {
-          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
-        }
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
-        delete [] Local_Data_Copy[iPoint];
-      delete [] Local_Data_Copy;
-      
-    }
-    
-    /*--- After loading the data local to a processor, we perform a sorting,
-     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-
-    if (fem_solver)
-      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-    else
-      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
-    
-    /*--- Write either a binary or ASCII restart file in parallel. ---*/
-
-    if (config[iZone]->GetWrt_Binary_Restart()) {
-      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    } else {
-      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    }
-
-    /*--- Write a slice on a structured mesh if requested. ---*/
-
-    if (config[iZone]->GetWrt_Slice()) {
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-    }
-    
-    /*--- Write the solution files if they are requested and we are executing
-     with a single rank (all data on one proc and no comm. overhead). Once we
-     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
-     can allow the write of the viz. files as well. ---*/
-
-    if ((Wrt_Vol || Wrt_Srf) && !fem_solver) {
-      
-      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Preparing element connectivity across all ranks." << endl;
-
-      if (fem_solver)
-        SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-      else
-        SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-
-      /*--- Sort the surface data and renumber if for writing. ---*/
-      if (Wrt_Srf){
-        if (fem_solver)
-          SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-        else
-          SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
-      }
-      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
-
-      if (Wrt_Vol) {
-
-        switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
-
-            if (rank == MASTER_NODE) cout << "Tecplot binary volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-            break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- FieldView binary files not yet available for parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
-
-            if (rank == MASTER_NODE) cout << "Tecplot binary surface files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate Tecplot binary." << endl;
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file instead." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, true);
-            break;
-            
-
-          default:
-            break;
-          }
-
-        }
-
-        /*--- Clean up the connectivity data that was allocated for output. ---*/
-
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
-        if (Wrt_Srf) DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
-
-        /*--- Clean up the surface data that was only needed for output. ---*/
-
-        if (Wrt_Srf) DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      }
-
-      /*--- Deallocate the nodal data needed for writing restarts. ---*/
-
-      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      /*--- Clear the variable names list. ---*/
-
-      Variable_Names.clear();
-
-    }
-  }
-}
-
-void COutput::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
-  
-  su2double RefArea = config->GetRefArea();
-  su2double Gamma = config->GetGamma();
-  su2double RefVel2;
-  su2double Gas_Constant, Mach2Vel, Mach_Motion, RefDensity, RefPressure = 0.0, factor = 0.0;
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL, *Aux_Buffet = NULL;
-  su2double *Grid_Vel = NULL;
-  
-  bool transition           = (config->GetKind_Trans_Model() == BC);
-  bool grid_movement        = (config->GetGrid_Movement());
-  bool Wrt_Halo             = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo = NULL;
-  
-  stringstream varname;
-  
-  /*--- Set the non-dimensionalization for coefficients. ---*/
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-  }
-  else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    default: SecondIndex = NONE; break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  nVar_Par += nVar_Consv_Par;
-  
-  Variable_Names.push_back("Density");
-  Variable_Names.push_back("Momentum_x");
-  Variable_Names.push_back("Momentum_y");
-  if (geometry->GetnDim() == 3) Variable_Names.push_back("Momentum_z");
-  Variable_Names.push_back("Energy");
-  
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("TKE");
-      Variable_Names.push_back("Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Nu_Tilde");
-    }
-  }
-  
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Limiter_Density");
-      Variable_Names.push_back("Limiter_Momentum_x");
-      Variable_Names.push_back("Limiter_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Momentum_z");
-      Variable_Names.push_back("Limiter_Energy");
-      
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
-      }
-    }
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Residual_Density");
-      Variable_Names.push_back("Residual_Momentum_x");
-      Variable_Names.push_back("Residual_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Momentum_z");
-      Variable_Names.push_back("Residual_Energy");
-      
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
-      }
-    }
-    
-    /*--- Add the grid velocity. ---*/
-    
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-      
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-    
-    
-    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
-    
-    nVar_Par += 1;
-    Variable_Names.push_back("Pressure");
-    
-    nVar_Par += 2;
-    Variable_Names.push_back("Temperature");
-    Variable_Names.push_back("Mach");
-    
-    nVar_Par += 1;
-    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-    
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        nVar_Par += 1;
-        Variable_Names.push_back("Heat_Flux");
-      } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR){
-          Variable_Names.push_back("Buffet_Sensor");
-          nVar_Par += 1;
-        }
-        nVar_Par += 1;
-        Variable_Names.push_back("h");
-      }
-    }
-    
-    /*--- Add Eddy Viscosity. ---*/
-    
-    if (Kind_Solver == RANS) {
-      nVar_Par += 2;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("Y_Plus");
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("y<sup>+</sup>");
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
-      }
-    }
-    
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
-    }
-    
-    /*--- Add the intermittency for the BC trans. model. ---*/
-    
-    if (transition) {
-      nVar_Par += 1;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("gamma_BC");
-      } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
-      }
-    }
-    
-    if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-      nVar_Par +=1;
-      Variable_Names.push_back("DES_LengthScale");
-      nVar_Par +=1;
-      Variable_Names.push_back("Wall_Distance");
-    }
-    
-    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      nVar_Par +=1;
-      Variable_Names.push_back("Roe_Dissipation");
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat    = new su2double[geometry->GetnPoint()];
-    Aux_yPlus   = new su2double[geometry->GetnPoint()];
-    Aux_Buffet  = new su2double[geometry->GetnPoint()];
-    
-    /*--- First, loop through the mesh in order to find and store the
-     value of the viscous coefficients at any surface nodes. They
-     will be placed in an auxiliary vector and then communicated like
-     all other volumetric variables. ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      Aux_Frict_x[iPoint] = 0.0;
-      Aux_Frict_y[iPoint] = 0.0;
-      Aux_Frict_z[iPoint] = 0.0;
-      Aux_Heat[iPoint]    = 0.0;
-      Aux_yPlus[iPoint]   = 0.0;
-      Aux_Buffet[iPoint]  = 0.0;
-    }
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
-          if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR) Aux_Buffet[iPoint] = solver[FLOW_SOL]->GetBuffetSensor(iMarker, iVertex);
-        }
-      }
-    }
-  }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure.          ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos & write only if requested ---*/
-    
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-          Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      /*--- If this is RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables. ---*/
-      
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
-          iVar++;
-        }
-      }
-      
-      /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Limiters ---*/
-        if (config->GetWrt_Limiters()) {
-          /*--- Mean Flow Limiters ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-            iVar++;
-          }
-          /*--- RANS Limiters ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-              iVar++;
-            }
-          }
-        }
-        
-        /*--- Residuals ---*/
-        if (config->GetWrt_Residuals()) {
-          /*--- Mean Flow Residuals ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-          /*--- RANS Residuals ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              iVar++;
-            }
-          }
-        }
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Load buffers with the three grid velocity components. ---*/
-        
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
-        }
-        
-        /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
-        
-        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetPressure(); iVar++;
-        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetTemperature(); iVar++;
-        Local_Data[jPoint][iVar] = sqrt(solver[FLOW_SOL]->node[iPoint]->GetVelocity2())/solver[FLOW_SOL]->node[iPoint]->GetSoundSpeed(); iVar++;
-        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
-        
-        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-          
-          /*--- Load data for the laminar viscosity. ---*/
-          
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
-          
-          /*--- Load data for the skin friction, heat flux, buffet, and y-plus. ---*/
-          
-          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
-            iVar++;
-          }
-          if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR) {
-            Local_Data[jPoint][iVar] = Aux_Buffet[iPoint]; 
-            iVar++;
-          }
-          Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
-          
-        }
-        
-        /*--- Load data for the Eddy viscosity for RANS. ---*/
-        
-        if (Kind_Solver == RANS) {
-          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
-        }
-        
-        /*--- Load data for the distance to the nearest sharp edge. ---*/
-        
-        if (config->GetWrt_SharpEdges()) {
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
-        }
-        
-        /*--- Load data for the intermittency of the BC trans. model. ---*/
-        
-        if (transition) {
-          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
-        }
-        
-        if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDES_LengthScale(); iVar++;
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetWall_Distance(); iVar++;
-        }
-        
-        if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetRoe_Dissipation(); iVar++;
-        }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
-      }
-      
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-      
-      jPoint++;
-      
-    }
-  }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    delete [] Aux_Frict_x;
-    delete [] Aux_Frict_y;
-    delete [] Aux_Frict_z;
-    delete [] Aux_Heat;
-    delete [] Aux_yPlus;
-    delete [] Aux_Buffet;
-  }
-  
-  delete [] Local_Halo;
-  
-}
-
-void COutput::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
-
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
-
-  su2double RefArea = config->GetRefArea();
-  su2double RefVel2 = 0.0;
-  su2double factor = 0.0;
-  su2double RefDensity = 0.0, RefPressure = 0.0;
-  su2double *Aux_Frict_x = NULL, *Aux_Frict_y = NULL, *Aux_Frict_z = NULL, *Aux_Heat = NULL, *Aux_yPlus = NULL;
-  su2double *Grid_Vel = NULL;
-
-  bool transition           = (config->GetKind_Trans_Model() == BC);
-  bool grid_movement        = (config->GetGrid_Movement());
-  bool Wrt_Halo             = config->GetWrt_Halo(), isPeriodic;
-  bool variable_density     = (config->GetKind_DensityModel() == VARIABLE);
-  bool energy               = config->GetEnergy_Equation();
-  bool weakly_coupled_heat  = config->GetWeakly_Coupled_Heat();
-  bool wrt_cp           = (variable_density &&
-                           (config->GetKind_FluidModel() == INC_IDEAL_GAS_POLY));
-  bool wrt_kt           = ((config->GetKind_ConductivityModel() != CONSTANT_CONDUCTIVITY) &&
-                           (config->GetViscous()));
-  int *Local_Halo = NULL;
-
-  stringstream varname;
-
-  /*--- Evaluate reference values for non-dimensionalization.
-   For dimensional or non-dim based on initial values, use
-   the far-field state (inf). For a custom non-dim based
-   on user-provided reference values, use the ref values
-   to compute the forces. ---*/
-
-  if ((config->GetRef_Inc_NonDim() == DIMENSIONAL) ||
-      (config->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
-    RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  else if (config->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
-    RefDensity = config->GetInc_Density_Ref();
-    RefVel2    = config->GetInc_Velocity_Ref()*config->GetInc_Velocity_Ref();
-  }
-
-  /*--- Reference pressure is always the far-field value (0.0). ---*/
-
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-
-  /*--- Compute factor for force coefficients. ---*/
-
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-
-  switch (config->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
-    case RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    default: SecondIndex = NONE; break;
-  }
-
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if ((!energy) && (!weakly_coupled_heat)) nVar_First--;
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
-
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-
-  /*--- All output files first need the grid coordinates. ---*/
-
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
-  }
-
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-
-  nVar_Par += nVar_Consv_Par;
-
-  /*--- The incompressible solver uses primitives as the working variables. ---*/
-
-  Variable_Names.push_back("Pressure");
-  Variable_Names.push_back("Velocity_x");
-  Variable_Names.push_back("Velocity_y");
-  if (geometry->GetnDim() == 3) Variable_Names.push_back("Velocity_z");
-  if (energy || weakly_coupled_heat) Variable_Names.push_back("Temperature");
-
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("TKE");
-      Variable_Names.push_back("Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Nu_Tilde");
-    }
-  }
-
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-
-  if (!config->GetLow_MemoryOutput()) {
-
-    /*--- Add the limiters ---*/
-
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-
-      Variable_Names.push_back("Limiter_Pressure");
-      Variable_Names.push_back("Limiter_Velocity_x");
-      Variable_Names.push_back("Limiter_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Velocity_z");
-      if (energy || weakly_coupled_heat)
-        Variable_Names.push_back("Limiter_Temperature");
-
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the residuals ---*/
-
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-
-      Variable_Names.push_back("Residual_Pressure");
-      Variable_Names.push_back("Residual_Velocity_x");
-      Variable_Names.push_back("Residual_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Velocity_z");
-      if (energy || weakly_coupled_heat)
-        Variable_Names.push_back("Residual_Temperature");
-
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the grid velocity. ---*/
-
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-
-    /*--- Add Cp. ---*/
-
-    nVar_Par += 1;
-    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-
-    /*--- Add Laminar Viscosity, Skin Friction, and Heat Flux to the restart file ---*/
-
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        if (energy || weakly_coupled_heat) {
-          nVar_Par += 1;
-          Variable_Names.push_back("Heat_Flux");
-        }
-      } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        if (energy || weakly_coupled_heat) {
-          nVar_Par += 1;
-          Variable_Names.push_back("h");
-        }
-      }
-    }
-
-    /*--- Add Y+ and Eddy Viscosity. ---*/
-
-    if (Kind_Solver == RANS) {
-      nVar_Par += 2;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("Y_Plus");
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("y<sup>+</sup>");
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
-      }
-    }
-
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
-
-    if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
-    }
-
-    /*--- Add the intermittency for the BC trans. model. ---*/
-
-    if (transition) {
-      nVar_Par += 1;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("gamma_BC");
-      } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
-      }
-    }
-
-    if (variable_density) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Density");
-    }
-    
-    if (wrt_cp) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Specific_Heat");
-    }
-    
-    if (wrt_kt) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Thermal_Conductivity");
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-
-  }
-
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
-    Aux_Heat    = new su2double[geometry->GetnPoint()];
-    Aux_yPlus   = new su2double[geometry->GetnPoint()];
-
-    /*--- First, loop through the mesh in order to find and store the
-     value of the viscous coefficients at any surface nodes. They
-     will be placed in an auxiliary vector and then communicated like
-     all other volumetric variables. ---*/
-
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      Aux_Frict_x[iPoint] = 0.0;
-      Aux_Frict_y[iPoint] = 0.0;
-      Aux_Frict_z[iPoint] = 0.0;
-      Aux_Heat[iPoint]    = 0.0;
-      Aux_yPlus[iPoint]   = 0.0;
-    }
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_Plotting(iMarker) == YES) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          Aux_Frict_x[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0);
-          Aux_Frict_y[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1);
-          if (geometry->GetnDim() == 3) Aux_Frict_z[iPoint] = solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2);
-          Aux_Heat[iPoint] = solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex);
-          Aux_yPlus[iPoint] = solver[FLOW_SOL]->GetYPlus(iMarker, iVertex);
-        }
-      }
-    }
-  }
-
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
-  }
-
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure.          ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-
-  jPoint = 0;
-
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-
-    /*--- Check for halos & write only if requested ---*/
-
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-
-      /*--- Restart the column index with each new point. ---*/
-
-      iVar = 0;
-
-      /*--- Load the grid node coordinate values. ---*/
-
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim); iVar++;
-      }
-
-      /*--- Load the conservative variable states for the mean flow variables. ---*/
-
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(0); iVar++;
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(1); iVar++;
-      Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(2); iVar++;
-      if (nDim == 3) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(3); iVar++;
-      }
-      if (weakly_coupled_heat) {
-        Local_Data[jPoint][iVar] = solver[HEAT_SOL]->node[iPoint]->GetSolution(0);
-        iVar++;
-      } else if (energy) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(nDim+1);
-        iVar++;
-      }
-
-      /*--- If this is RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables. ---*/
-
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar); iVar++;
-        }
-      }
-
-      /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
-
-        /*--- Limiters ---*/
-        if (config->GetWrt_Limiters()) {
-          /*--- Mean Flow Limiters ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-            iVar++;
-          }
-          /*--- RANS Limiters ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-              iVar++;
-            }
-          }
-        }
-
-        /*--- Residuals ---*/
-        if (config->GetWrt_Residuals()) {
-          /*--- Mean Flow Residuals ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-          /*--- RANS Residuals ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              iVar++;
-            }
-          }
-        }
-      }
-
-      if (!config->GetLow_MemoryOutput()) {
-
-        /*--- Load buffers with the three grid velocity components. ---*/
-
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
-        }
-
-        /*--- Load data for Cp and Mach variables. ---*/
-
-        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
-
-        if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-
-          /*--- Load data for the laminar viscosity. ---*/
-
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
-
-          /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
-
-          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
-            iVar++;
-          }
-          
-          if (energy || weakly_coupled_heat) {
-            Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
-          }
-
-        }
-
-        /*--- Load data for the Eddy viscosity for RANS. ---*/
-
-        if (Kind_Solver == RANS) {
-          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
-        }
-
-        /*--- Load data for the distance to the nearest sharp edge. ---*/
-
-        if (config->GetWrt_SharpEdges()) {
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
-        }
-
-        /*--- Load data for the intermittency of the BC trans. model. ---*/
-
-        if (transition) {
-          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
-        }
-
-        /*--- Load density if we are solving a variable density problem. ---*/
-        
-        if (variable_density) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDensity(); iVar++;
-        }
-        
-        /*--- Load Cp and conductivity if they are temperature-dependent. ---*/
-        if (wrt_cp) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCp(); iVar++;
-        }
-        
-        if (wrt_kt) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetThermalConductivity(); iVar++;
-        }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-
-      }
-
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-
-      jPoint++;
-
-    }
-  }
-
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-    delete [] Aux_Frict_x;
-    delete [] Aux_Frict_y;
-    delete [] Aux_Frict_z;
-    delete [] Aux_Heat;
-    delete [] Aux_yPlus;
-  }
-
-  delete [] Local_Halo;
-  
-}
-
-void COutput::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
-  
-  su2double *Aux_Sens = NULL;
-  su2double *Grid_Vel = NULL;
-  su2double *Normal, Area;
-  
-  bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
-  bool grid_movement  = (config->GetGrid_Movement());
-  bool Wrt_Halo       = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case ADJ_EULER : case ADJ_NAVIER_STOKES : FirstIndex = ADJFLOW_SOL; SecondIndex = NONE; break;
-    case ADJ_RANS : FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Cont()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL; break;
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: FirstIndex = ADJFLOW_SOL; SecondIndex = NONE;  break;
-    case DISC_ADJ_RANS: FirstIndex = ADJFLOW_SOL; if (config->GetFrozen_Visc_Disc()) SecondIndex = NONE; else SecondIndex = ADJTURB_SOL;  break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  nVar_Par += nVar_Consv_Par;
-  
-  /*--- For now, leave the names as "Conservative_", etc., in order
-   to avoid confusion with the serial version, which still prints these
-   names. Names can be set alternatively by using the commented code
-   below. ---*/
-
-  if (incompressible) {
-    Variable_Names.push_back("Adjoint_Pressure");
-    Variable_Names.push_back("Adjoint_Velocity_x");
-    Variable_Names.push_back("Adjoint_Velocity_y");
-    if (geometry->GetnDim() == 3) Variable_Names.push_back("Adjoint_Velocity_z");
-    Variable_Names.push_back("Adjoint_Temperature");
-  } else {
-    Variable_Names.push_back("Adjoint_Density");
-    Variable_Names.push_back("Adjoint_Momentum_x");
-    Variable_Names.push_back("Adjoint_Momentum_y");
-    if (geometry->GetnDim() == 3)
-      Variable_Names.push_back("Adjoint_Momentum_z");
-    Variable_Names.push_back("Adjoint_Energy");
-  }
-  if (SecondIndex != NONE) {
-    if (config->GetKind_Turb_Model() == SST) {
-      Variable_Names.push_back("Adjoint_TKE");
-      Variable_Names.push_back("Adjoint_Omega");
-    } else {
-      /*--- S-A variants ---*/
-      Variable_Names.push_back("Adjoint_Nu_Tilde");
-    }
-  }
-
-  /*--- For the discrete adjoint, we have the full field of sensitivity
-   in each coordinate direction. ---*/
-
-  if ((Kind_Solver == DISC_ADJ_EULER)         ||
-      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-      (Kind_Solver == DISC_ADJ_RANS)) {
-    nVar_Par += nDim;
-    Variable_Names.push_back("Sensitivity_x");
-    Variable_Names.push_back("Sensitivity_y");
-    if (geometry->GetnDim()== 3)
-      Variable_Names.push_back("Sensitivity_z");
-  }
-
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Limiter_Adjoint_Pressure");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_x");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Adjoint_Velocity_z");
-        Variable_Names.push_back("Limiter_Adjoint_Temperature");
-      } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_x");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Limiter_Adjoint_Momentum_z");
-        Variable_Names.push_back("Limiter_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Limiter_Adjoint_TKE");
-          Variable_Names.push_back("Limiter_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Adjoint_Nu_Tilde");
-        }
-      }
-    }
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Residual_Adjoint_Pressure");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_x");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Adjoint_Velocity_z");
-        Variable_Names.push_back("Residual_Adjoint_Temperature");
-      } else {
-        Variable_Names.push_back("Residual_Adjoint_Density");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_x");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Residual_Adjoint_Momentum_z");
-        Variable_Names.push_back("Residual_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if (config->GetKind_Turb_Model() == SST) {
-          Variable_Names.push_back("Residual_Adjoint_TKE");
-          Variable_Names.push_back("Residual_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Adjoint_Nu_Tilde");
-        }
-      }
-    }
-    
-    /*--- Add the grid velocity. ---*/
-    
-    if (grid_movement) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-    
-    /*--- All adjoint solvers write the surface sensitivity. ---*/
-    
-    nVar_Par += 1; Variable_Names.push_back("Surface_Sensitivity");
-    
-    /*--- For the continouus adjoint, we write either convective scheme's
-     dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      nVar_Par += 1;
-      if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-        Variable_Names.push_back("Dissipation_Sensor");
-      } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
-      }
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-  
-  Aux_Sens = new su2double[geometry->GetnPoint()];
-  
-  /*--- First, loop through the mesh in order to find and store the
-   value of the viscous coefficients at any surface nodes. They
-   will be placed in an auxiliary vector and then communicated like
-   all other volumetric variables. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Aux_Sens[iPoint] = 0.0;
-  }
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        Area = 0.0;
-        for (iDim = 0; iDim < nDim; iDim++) Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt (Area);
-        Aux_Sens[iPoint] = solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex)/Area;
-      }
-    }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos & write only if requested ---*/
-    
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      
-      /*--- If this is Adj. RANS, i.e., the second solver container is not empty,
-       then load data for the conservative turbulence variables and the
-       limiters / residuals (if requested). ----*/
-      
-      if (SecondIndex != NONE) {
-        for (jVar = 0; jVar < nVar_Second; jVar++) {
-          Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar);
-          iVar++;
-        }
-      }
-
-      /*--- Load data for the discrete sensitivities. ---*/
-
-      if ((Kind_Solver == DISC_ADJ_EULER)         ||
-          (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-          (Kind_Solver == DISC_ADJ_RANS)) {
-        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(0); iVar++;
-        Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(1); iVar++;
-        if (geometry->GetnDim()== 3) {
-          Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensitivity(2);
-          iVar++;
-        }
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-
-          if (config->GetWrt_Limiters()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter(jVar);
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter(jVar);
-                iVar++;
-              }
-            }
-          }
-
-          if (config->GetWrt_Residuals()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              if (!config->GetDiscrete_Adjoint()) {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              } else {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar) -
-                solver[FirstIndex]->node[iPoint]->GetSolution_Old(jVar);
-              }
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                if (!config->GetDiscrete_Adjoint()) {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-                } else {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar) -
-                                             solver[SecondIndex]->node[iPoint]->GetSolution_Old(jVar);
-                }
-                iVar++;
-              }
-            }
-          }
-        
-        /*--- Load buffers with the three grid velocity components. ---*/
-        
-        if (grid_movement) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
-        }
-        
-        /*--- Load data for the surface sensitivity. ---*/
-        
-        Local_Data[iPoint][iVar] = Aux_Sens[iPoint]; iVar++;
-        
-        /*--- Load data for the convective scheme sensor. ---*/
-        
-        if (( Kind_Solver == ADJ_EULER              ) ||
-            ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-            ( Kind_Solver == ADJ_RANS               )) {
-          if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint); iVar++;
-          } else {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0); iVar++;
-          }
-        }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
-      }
-
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-
-      jPoint++;
-    }
-  }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  delete [] Aux_Sens;
-  delete [] Local_Halo;
-  
-}
-
-void COutput::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
-  
-  su2double *Node_Vel = NULL, *Node_Accel = NULL, *Stress = NULL;
-
-  bool Wrt_Halo   = config->GetWrt_Halo(), isPeriodic;
-  int *Local_Halo = NULL;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case FEM_ELASTICITY: FirstIndex = FEA_SOL; break;
-    case DISC_ADJ_FEM: FirstIndex = ADJFEA_SOL; break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  nVar_Par += nVar_Consv_Par;
-  
-  /*--- For now, leave the names as "Conservative_", etc., in order
-   to avoid confusion with the serial version, which still prints these
-   names. Names can be set alternatively by using the commented code
-   below. ---*/
-  
-  Variable_Names.push_back("Displacement_x");
-  Variable_Names.push_back("Displacement_y");
-  if (geometry->GetnDim() == 3)
-    Variable_Names.push_back("Displacement_z");
-
-  /*--- If requested, register the limiter and residuals for all of the
-   equations in the current flow problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      Variable_Names.push_back("Residual_Displacement_x");
-      Variable_Names.push_back("Residual_Displacement_y");
-      if (geometry->GetnDim() == 3)
-        Variable_Names.push_back("Residual_Displacement_z");
-    }
-    
-    /*--- If the analysis is dynamic... ---*/
-    if (config->GetDynamic_Analysis() == DYNAMIC) {
-      
-      /*--- Velocities ---*/
-      nVar_Par += 2;
-      Variable_Names.push_back("Velocity_x");
-      Variable_Names.push_back("Velocity_y");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
-        Variable_Names.push_back("Velocity_z");
-      }
-      
-      /*--- Accelerations ---*/
-      nVar_Par += 2;
-      Variable_Names.push_back("Acceleration_x");
-      Variable_Names.push_back("Acceleration_y");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
-        Variable_Names.push_back("Acceleration_z");
-      }
-    }
-    
-    if (!(config->GetDiscrete_Adjoint())) {
-
-      /*--- Add the stresses. ---*/
-    
-      nVar_Par += 3;
-      Variable_Names.push_back("Sxx");
-      Variable_Names.push_back("Syy");
-      Variable_Names.push_back("Sxy");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 3;
-        Variable_Names.push_back("Szz");
-        Variable_Names.push_back("Sxz");
-        Variable_Names.push_back("Syz");
-      }
-
-      /*--- Add the Von Mises Stress. ---*/
-    
-      nVar_Par += 1;
-      Variable_Names.push_back("Von_Mises_Stress");
-    
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos & write only if requested ---*/
-    
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
-        }
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        
-        /*--- Load the velocities and accelerations (dynamic calculations). ---*/
-        
-        if (config->GetDynamic_Analysis() == DYNAMIC) {
-          
-          /*--- Velocities ---*/
-          
-          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
-          Local_Data[jPoint][iVar] = Node_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Vel[2];
-            iVar++;
-          }
-          
-          /*--- Accelerations ---*/
-          
-          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
-          Local_Data[jPoint][iVar] = Node_Accel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Accel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Accel[2];
-            iVar++;
-          }
-        }
-        
-        if (!(config->GetDiscrete_Adjoint())) {
-
-          /*--- Add the stresses. ---*/
-        
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
-        
-          /*--- Sigma xx ---*/
-          Local_Data[jPoint][iVar] = Stress[0]; iVar++;
-          /*--- Sigma yy ---*/
-          Local_Data[jPoint][iVar] = Stress[1]; iVar++;
-          /*--- Sigma xy ---*/
-          Local_Data[jPoint][iVar] = Stress[2]; iVar++;
-        
-          if (geometry->GetnDim() == 3) {
-            /*--- Sigma zz ---*/
-            Local_Data[jPoint][iVar] = Stress[3]; iVar++;
-            /*--- Sigma xz ---*/
-            Local_Data[jPoint][iVar] = Stress[4]; iVar++;
-            /*--- Sigma yz ---*/
-            Local_Data[jPoint][iVar] = Stress[5]; iVar++;
-          }
-        
-          /*--- Add the Von Mises Stress. ---*/
-        
-          Local_Data[iPoint][iVar] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress(); iVar++;
-        
-        
-          /*--- New variables can be loaded to the Local_Data structure here,
-           assuming they were registered above correctly. ---*/
-
-        }
-
-      }
-
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-        
-      jPoint++;
-    }
-  }
-  
-  /*--- Free memory for auxiliary vectors. ---*/
-  
-  delete [] Local_Halo;
-  
-}
-
-void COutput::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  unsigned short iDim;
-  
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, iMarker, iVertex;
-  unsigned long nVar_First = 0, nVar_Consv_Par = 0;
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  int *Local_Halo;
-  
-  stringstream varname;
-  
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
-  
-  switch (config->GetKind_Solver()) {
-    case HEAT_EQUATION_FVM: FirstIndex = HEAT_SOL;     break;
-  }
-  
-  nVar_First = solver[FirstIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First;
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- All output files first need the grid coordinates. ---*/
-  
-  nVar_Par  = 1; Variable_Names.push_back("x");
-  nVar_Par += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    nVar_Par += 1; Variable_Names.push_back("z");
-  }
-  
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
-  
-  nVar_Par += nVar_Consv_Par;
-  for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
-    varname << "Conservative_" << iVar+1;
-    Variable_Names.push_back(varname.str());
-    varname.str("");
-  }
-  
-  /*--- If requested, register the residuals for all of the
-   equations in the current problem. ---*/
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
-        varname << "Residual_" << iVar+1;
-        Variable_Names.push_back(varname.str());
-        varname.str("");
-      }
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-  }
-  
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
-  
-  Local_Data = new su2double*[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    Local_Data[iPoint] = new su2double[nVar_Par];
-  }
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (!Wrt_Halo) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure. This     ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  jPoint = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check for halos & write only if requested ---*/
-    
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Restart the column index with each new point. ---*/
-      
-      iVar = 0;
-      
-      /*--- Load the grid node coordinate values. ---*/
-      
-      for (iDim = 0; iDim < geometry->GetnDim(); iDim++) {
-        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetCoord(iDim);
-        if (config->GetSystemMeasurements() == US)
-        	Local_Data[jPoint][iVar] *= 12.0;
-        iVar++;
-      }
-      
-      /*--- Load the conservative variable states for the mean flow variables.
-       If requested, load the limiters and residuals as well. ---*/
-      
-      for (jVar = 0; jVar < nVar_First; jVar++) {
-        Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar);
-        iVar++;
-      }
-      
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
->>>>>>> 284b2a5b8f74fcf2f6ff16d97f24e5b36c4bbb4d
           }
 
         }
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 415c75c6917c..feee952032d6 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -73,7 +73,6 @@ int main(int argc, char *argv[]) {
   CSurfaceMovement **surface_movement   = NULL;
   CVolumetricMovement **grid_movement   = NULL;
   COutput *output                       = NULL;
-  CConfig *driver_config                = NULL;  
   unsigned short *nInst                 = NULL;
 
   /*--- Load in the number of zones and spatial dimensions in the mesh file (if no config

From a38d0bd42db82ba0c443d99b31146794cb999df5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 22 Mar 2019 15:36:09 +0100
Subject: [PATCH 126/539] Removed implementation of Monitor in
 CFEMFluidIteration.

---
 SU2_CFD/include/iteration_structure.hpp | 16 ----------------
 SU2_CFD/src/iteration_structure.cpp     | 12 ------------
 2 files changed, 28 deletions(-)

diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index 9f4b896ff963..4a1b94bf94cc 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -645,22 +645,6 @@ class CFEMFluidIteration : public CFluidIteration {
               unsigned short val_iZone,
               unsigned short val_iInst);
   
-  /*!
-   * \brief Monitors the convergence and other metrics for the finite element flow system.
-   * \param[in] ??? - Description here.
-   */
-  bool Monitor(COutput *output,
-               CIntegration ****integration_container,
-               CGeometry ****geometry_container,
-               CSolver *****solver_container,
-               CNumerics ******numerics_container,
-               CConfig **config_container,
-               CSurfaceMovement **surface_movement,
-               CVolumetricMovement ***grid_movement,
-               CFreeFormDefBox*** FFDBox,
-               unsigned short val_iZone,
-               unsigned short val_iInst);
-  
   /*!
    * \brief Postprocess routine for the finite element flow system.
    * \param[in] solver_container - Container vector with all the solutions.
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 7ef3ffee181e..8f429a69967a 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1209,18 +1209,6 @@ void CFEMFluidIteration::Update(COutput *output,
                                 unsigned short val_iZone,
                                 unsigned short val_iInst)      { }
 
-bool CFEMFluidIteration::Monitor(COutput *output,
-             CIntegration ****integration_container,
-             CGeometry ****geometry_container,
-             CSolver *****solver_container,
-             CNumerics ******numerics_container,
-             CConfig **config_container,
-             CSurfaceMovement **surface_movement,
-             CVolumetricMovement ***grid_movement,
-             CFreeFormDefBox*** FFDBox,
-             unsigned short val_iZone,
-             unsigned short val_iInst) {return false;}
-
 void CFEMFluidIteration::Postprocess(COutput *output,
                  CIntegration ****integration_container,
                  CGeometry ****geometry_container,

From 2c1d8f40cdbbd6a9c7e4928cd01dd75480df7b8d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 22 Mar 2019 15:36:52 +0100
Subject: [PATCH 127/539] Updated reg. test values

---
 TestCases/new_output_regression.py | 620 ++++++++++++++---------------
 1 file changed, 310 insertions(+), 310 deletions(-)

diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index 1637b1a9b114..140a0a86924c 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -51,316 +51,316 @@ def main():
     #########################
 
     # Channel
-#    channel           = TestCase('channel')
-#    channel.cfg_dir   = "euler/channel"
-#    channel.cfg_file  = "inv_channel_RK.cfg"
-#    channel.test_iter = 10
-#    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
-#    channel.su2_exec  = "SU2_CFD"
-#    channel.timeout   = 1600
-#    channel.new_output = True
-#    channel.tol       = 0.00001
-#    test_list.append(channel)
-#
-#    # NACA0012 
-#    naca0012           = TestCase('naca0012')
-#    naca0012.cfg_dir   = "euler/naca0012"
-#    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
-#    naca0012.test_iter = 20
-#    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
-#    naca0012.su2_exec  = "SU2_CFD"
-#    naca0012.timeout   = 1600
-#    naca0012.new_output= True
-#    naca0012.tol       = 0.00001
-#    test_list.append(naca0012)
-#
-#    # Supersonic wedge 
-#    wedge           = TestCase('wedge')
-#    wedge.cfg_dir   = "euler/wedge"
-#    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
-#    wedge.test_iter = 20
-#    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
-#    wedge.su2_exec  = "SU2_CFD"
-#    wedge.timeout   = 1600
-#    wedge.new_output= True
-#    wedge.tol       = 0.00001
-#    test_list.append(wedge)
-#
-#    # ONERA M6 Wing
-#    oneram6           = TestCase('oneram6')
-#    oneram6.cfg_dir   = "euler/oneram6"
-#    oneram6.cfg_file  = "inv_ONERAM6.cfg"
-#    oneram6.test_iter = 10
-#    oneram6.test_vals = [-13.395738, -12.930653, 0.282557, 0.012706] #last 4 columns
-#    oneram6.su2_exec  = "SU2_CFD"
-#    oneram6.timeout   = 9600
-#    oneram6.new_output = True
-#    oneram6.tol       = 0.00001
-#    test_list.append(oneram6)
-#    
-#    ##########################
-#    ###  Compressible N-S  ###
-#    ##########################
-#
-#    # Laminar flat plate
-#    flatplate           = TestCase('flatplate')
-#    flatplate.cfg_dir   = "navierstokes/flatplate"
-#    flatplate.cfg_file  = "lam_flatplate.cfg"
-#    flatplate.test_iter = 20
-#    flatplate.test_vals = [-4.680896, 0.781111, -0.135957, 0.022978] #last 4 columns
-#    flatplate.su2_exec  = "SU2_CFD"
-#    flatplate.new_output = True
-#    flatplate.timeout   = 1600
-#    flatplate.tol       = 0.00001
-#    test_list.append(flatplate)
-#
-#    # Laminar cylinder (steady)
-#    cylinder           = TestCase('cylinder')
-#    cylinder.cfg_dir   = "navierstokes/cylinder"
-#    cylinder.cfg_file  = "lam_cylinder.cfg"
-#    cylinder.test_iter = 25
-#    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
-#    cylinder.su2_exec  = "SU2_CFD"
-#    cylinder.new_output = True
-#    cylinder.timeout   = 1600
-#    cylinder.tol       = 0.00001
-#    test_list.append(cylinder)
-#
-#    # Laminar cylinder (low Mach correction)
-#    cylinder_lowmach           = TestCase('cylinder_lowmach')
-#    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
-#    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
-#    cylinder_lowmach.test_iter = 25
-#    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
-#    cylinder_lowmach.su2_exec  = "SU2_CFD"
-#    cylinder_lowmach.new_output = True
-#    cylinder_lowmach.timeout   = 1600
-#    cylinder_lowmach.tol       = 0.00001
-#    test_list.append(cylinder_lowmach)
-#
-#    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
-#   # poiseuille           = TestCase('poiseuille')
-#   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
-#   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
-#   # poiseuille.test_iter = 10
-#   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
-#   # poiseuille.su2_exec  = "SU2_CFD"
-#   # poiseuille.new_output = True
-#   # poiseuille.timeout   = 1600
-#   # poiseuille.tol       = 0.00001
-#   # test_list.append(poiseuille)
-#
-#    # 2D Poiseuille flow (inlet profile file)
-#    poiseuille_profile           = TestCase('poiseuille_profile')
-#    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
-#    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
-#    poiseuille_profile.test_iter = 10
-#    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
-#    poiseuille_profile.su2_exec  = "SU2_CFD"
-#    poiseuille_profile.new_output = True
-#    poiseuille_profile.timeout   = 1600
-#    poiseuille_profile.tol       = 0.00001
-#    test_list.append(poiseuille_profile)
-#    
-#    ##########################
-#    ### Compressible RANS  ###
-#    ##########################
-#
-#    # RAE2822 SA
-#    rae2822_sa           = TestCase('rae2822_sa')
-#    rae2822_sa.cfg_dir   = "rans/rae2822"
-#    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
-#    rae2822_sa.test_iter = 20
-#    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
-#    rae2822_sa.su2_exec  = "SU2_CFD"
-#    rae2822_sa.timeout   = 1600
-#    rae2822_sa.new_output = True
-#    rae2822_sa.tol       = 0.00001
-#    test_list.append(rae2822_sa)
-#    
-#    # RAE2822 SST
-#    rae2822_sst           = TestCase('rae2822_sst')
-#    rae2822_sst.cfg_dir   = "rans/rae2822"
-#    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
-#    rae2822_sst.test_iter = 20
-#    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
-#    rae2822_sst.su2_exec  = "SU2_CFD"
-#    rae2822_sst.new_output = True
-#    rae2822_sst.timeout   = 1600
-#    rae2822_sst.tol       = 0.00001
-#    test_list.append(rae2822_sst)
-#
-#    # Flat plate
-#    turb_flatplate           = TestCase('turb_flatplate')
-#    turb_flatplate.cfg_dir   = "rans/flatplate"
-#    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
-#    turb_flatplate.test_iter = 20
-#    turb_flatplate.test_vals = [-4.158303, -6.737135, -0.176244, 0.057446] #last 4 columns
-#    turb_flatplate.su2_exec  = "SU2_CFD"
-#    turb_flatplate.new_output  = True
-#    turb_flatplate.timeout   = 1600
-#    turb_flatplate.tol       = 0.00001
-#    test_list.append(turb_flatplate)
-#
-#    # ONERA M6 Wing
-#    turb_oneram6           = TestCase('turb_oneram6')
-#    turb_oneram6.cfg_dir   = "rans/oneram6"
-#    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
-#    turb_oneram6.test_iter = 10
-#    turb_oneram6.test_vals = [-2.327523, -6.564349, 0.230471, 0.155843]#last 4 columns
-#    turb_oneram6.su2_exec  = "SU2_CFD"
-#    turb_oneram6.new_output = True
-#    turb_oneram6.timeout   = 3200
-#    turb_oneram6.tol       = 0.00001
-#    test_list.append(turb_oneram6)
-#
-#    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
-#    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
-#    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
-#    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
-#    turb_naca0012_sa.test_iter = 10
-#    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
-#    turb_naca0012_sa.su2_exec  = "SU2_CFD"
-#    turb_naca0012_sa.new_output = True
-#    turb_naca0012_sa.timeout   = 3200
-#    turb_naca0012_sa.tol       = 0.00001
-#    test_list.append(turb_naca0012_sa)
-#   
-#    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
-#    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
-#    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
-#    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
-#    turb_naca0012_sa_bin.test_iter = 10
-#    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
-#    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
-#    turb_naca0012_sa_bin.new_output  = True
-#    turb_naca0012_sa_bin.timeout   = 3200
-#    turb_naca0012_sa_bin.tol       = 0.00001
-#    test_list.append(turb_naca0012_sa_bin)
-# 
-#    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
-#    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
-#    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
-#    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
-#    turb_naca0012_sst.test_iter = 10
-#    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
-#    turb_naca0012_sst.su2_exec  = "SU2_CFD"
-#    turb_naca0012_sst.new_output  = True
-#    turb_naca0012_sst.timeout   = 3200
-#    turb_naca0012_sst.tol       = 0.00001
-#    test_list.append(turb_naca0012_sst)
-#
-#    # PROPELLER 
-#    propeller           = TestCase('propeller')
-#    propeller.cfg_dir   = "rans/propeller"
-#    propeller.cfg_file  = "propeller.cfg"
-#    propeller.test_iter = 10
-#    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
-#    propeller.su2_exec  = "SU2_CFD"
-#    propeller.new_output = True
-#    propeller.timeout   = 3200
-#    propeller.tol       = 0.00001
-#    test_list.append(propeller)
-#    #################################
-#    ## Compressible RANS Restart  ###
-#    #################################
-#
-#    # NACA0012 SST Multigrid restart
-#    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
-#    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
-#    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
-#    turb_naca0012_sst_restart_mg.test_iter = 50
-#    turb_naca0012_sst_restart_mg.ntest_vals = 5
-#    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
-#    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
-#    turb_naca0012_sst_restart_mg.new_output  = True
-#    turb_naca0012_sst_restart_mg.timeout   = 3200
-#    turb_naca0012_sst_restart_mg.tol       = 0.000001
-#    test_list.append(turb_naca0012_sst_restart_mg)
-#    
-#    #############################
-#    ### Incompressible Euler  ###
-#    #############################
-#
-#    # NACA0012 Hydrofoil
-#    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
-#    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
-#    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
-#    inc_euler_naca0012.test_iter = 20
-#    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
-#    inc_euler_naca0012.su2_exec  = "SU2_CFD"
-#    inc_euler_naca0012.new_output = True
-#    inc_euler_naca0012.timeout   = 1600
-#    inc_euler_naca0012.tol       = 0.00001
-#    test_list.append(inc_euler_naca0012)
-#
-#    # C-D nozzle with pressure inlet and mass flow outlet
-#    inc_nozzle           = TestCase('inc_nozzle')
-#    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
-#    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
-#    inc_nozzle.test_iter = 20
-#    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
-#    inc_nozzle.su2_exec  = "SU2_CFD"
-#    inc_nozzle.new_output = True
-#    inc_nozzle.timeout   = 1600
-#    inc_nozzle.tol       = 0.00001
-#    test_list.append(inc_nozzle)
-#
-#    #############################
-#    ### Incompressible N-S    ###
-#    #############################
-#
-#    # Laminar cylinder
-#    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
-#    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-#    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
-#    inc_lam_cylinder.test_iter = 10
-#    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
-#    inc_lam_cylinder.new_output  = True
-#    inc_lam_cylinder.su2_exec  = "SU2_CFD"
-#    inc_lam_cylinder.timeout   = 1600
-#    inc_lam_cylinder.tol       = 0.00001
-#    test_list.append(inc_lam_cylinder)
-#
-#    # Buoyancy-driven cavity
-#    inc_buoyancy          = TestCase('inc_buoyancy')
-#    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
-#    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
-#    inc_buoyancy.test_iter = 20
-#    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
-#    inc_buoyancy.new_output  = True
-#    inc_buoyancy.su2_exec  = "SU2_CFD"
-#    inc_buoyancy.timeout   = 1600
-#    inc_buoyancy.tol       = 0.00001
-#    test_list.append(inc_buoyancy)
-#
-#    # Laminar heated cylinder with polynomial fluid model
-#    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
-#    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-#    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
-#    inc_poly_cylinder.test_iter = 20
-#    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
-#    inc_poly_cylinder.new_output  = True
-#    inc_poly_cylinder.su2_exec  = "SU2_CFD"
-#    inc_poly_cylinder.timeout   = 1600
-#    inc_poly_cylinder.tol       = 0.00001
-#    test_list.append(inc_poly_cylinder)
-#
-#    ############################
-#    ### Incompressible RANS  ###
-#    ############################
-#
-#    # NACA0012
-#    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
-#    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
-#    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
-#    inc_turb_naca0012.test_iter = 20
-#    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
-#    inc_turb_naca0012.new_output  = True
-#    inc_turb_naca0012.su2_exec  = "SU2_CFD"
-#    inc_turb_naca0012.timeout   = 1600
-#    inc_turb_naca0012.tol       = 0.00001
-#    test_list.append(inc_turb_naca0012)
+    channel           = TestCase('channel')
+    channel.cfg_dir   = "euler/channel"
+    channel.cfg_file  = "inv_channel_RK.cfg"
+    channel.test_iter = 10
+    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
+    channel.su2_exec  = "SU2_CFD"
+    channel.timeout   = 1600
+    channel.new_output = True
+    channel.tol       = 0.00001
+    test_list.append(channel)
+
+    # NACA0012 
+    naca0012           = TestCase('naca0012')
+    naca0012.cfg_dir   = "euler/naca0012"
+    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
+    naca0012.test_iter = 20
+    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
+    naca0012.su2_exec  = "SU2_CFD"
+    naca0012.timeout   = 1600
+    naca0012.new_output= True
+    naca0012.tol       = 0.00001
+    test_list.append(naca0012)
+
+    # Supersonic wedge 
+    wedge           = TestCase('wedge')
+    wedge.cfg_dir   = "euler/wedge"
+    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
+    wedge.test_iter = 20
+    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
+    wedge.su2_exec  = "SU2_CFD"
+    wedge.timeout   = 1600
+    wedge.new_output= True
+    wedge.tol       = 0.00001
+    test_list.append(wedge)
+
+    # ONERA M6 Wing
+    oneram6           = TestCase('oneram6')
+    oneram6.cfg_dir   = "euler/oneram6"
+    oneram6.cfg_file  = "inv_ONERAM6.cfg"
+    oneram6.test_iter = 10
+    oneram6.test_vals = [-10.384532, -9.835738, 0.282580, 0.012694] #last 4 columns
+    oneram6.su2_exec  = "SU2_CFD"
+    oneram6.timeout   = 9600
+    oneram6.new_output = True
+    oneram6.tol       = 0.00001
+    test_list.append(oneram6)
+    
+    ##########################
+    ###  Compressible N-S  ###
+    ##########################
+
+    # Laminar flat plate
+    flatplate           = TestCase('flatplate')
+    flatplate.cfg_dir   = "navierstokes/flatplate"
+    flatplate.cfg_file  = "lam_flatplate.cfg"
+    flatplate.test_iter = 20
+    flatplate.test_vals = [-4.680777, 0.781234, -0.135957, 0.022977] #last 4 columns
+    flatplate.su2_exec  = "SU2_CFD"
+    flatplate.new_output = True
+    flatplate.timeout   = 1600
+    flatplate.tol       = 0.00001
+    test_list.append(flatplate)
+
+    # Laminar cylinder (steady)
+    cylinder           = TestCase('cylinder')
+    cylinder.cfg_dir   = "navierstokes/cylinder"
+    cylinder.cfg_file  = "lam_cylinder.cfg"
+    cylinder.test_iter = 25
+    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
+    cylinder.su2_exec  = "SU2_CFD"
+    cylinder.new_output = True
+    cylinder.timeout   = 1600
+    cylinder.tol       = 0.00001
+    test_list.append(cylinder)
+
+    # Laminar cylinder (low Mach correction)
+    cylinder_lowmach           = TestCase('cylinder_lowmach')
+    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
+    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
+    cylinder_lowmach.test_iter = 25
+    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
+    cylinder_lowmach.su2_exec  = "SU2_CFD"
+    cylinder_lowmach.new_output = True
+    cylinder_lowmach.timeout   = 1600
+    cylinder_lowmach.tol       = 0.00001
+    test_list.append(cylinder_lowmach)
+
+    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
+   # poiseuille           = TestCase('poiseuille')
+   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
+   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
+   # poiseuille.test_iter = 10
+   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
+   # poiseuille.su2_exec  = "SU2_CFD"
+   # poiseuille.new_output = True
+   # poiseuille.timeout   = 1600
+   # poiseuille.tol       = 0.00001
+   # test_list.append(poiseuille)
+
+    # 2D Poiseuille flow (inlet profile file)
+    poiseuille_profile           = TestCase('poiseuille_profile')
+    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
+    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
+    poiseuille_profile.test_iter = 10
+    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
+    poiseuille_profile.su2_exec  = "SU2_CFD"
+    poiseuille_profile.new_output = True
+    poiseuille_profile.timeout   = 1600
+    poiseuille_profile.tol       = 0.00001
+    test_list.append(poiseuille_profile)
+    
+    ##########################
+    ### Compressible RANS  ###
+    ##########################
+
+    # RAE2822 SA
+    rae2822_sa           = TestCase('rae2822_sa')
+    rae2822_sa.cfg_dir   = "rans/rae2822"
+    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
+    rae2822_sa.test_iter = 20
+    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
+    rae2822_sa.su2_exec  = "SU2_CFD"
+    rae2822_sa.timeout   = 1600
+    rae2822_sa.new_output = True
+    rae2822_sa.tol       = 0.00001
+    test_list.append(rae2822_sa)
+    
+    # RAE2822 SST
+    rae2822_sst           = TestCase('rae2822_sst')
+    rae2822_sst.cfg_dir   = "rans/rae2822"
+    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
+    rae2822_sst.test_iter = 20
+    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
+    rae2822_sst.su2_exec  = "SU2_CFD"
+    rae2822_sst.new_output = True
+    rae2822_sst.timeout   = 1600
+    rae2822_sst.tol       = 0.00001
+    test_list.append(rae2822_sst)
+
+    # Flat plate
+    turb_flatplate           = TestCase('turb_flatplate')
+    turb_flatplate.cfg_dir   = "rans/flatplate"
+    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
+    turb_flatplate.test_iter = 20
+    turb_flatplate.test_vals = [-4.157169, -6.737133, -0.176253, 0.057446] #last 4 columns
+    turb_flatplate.su2_exec  = "SU2_CFD"
+    turb_flatplate.new_output  = True
+    turb_flatplate.timeout   = 1600
+    turb_flatplate.tol       = 0.00001
+    test_list.append(turb_flatplate)
+
+    # ONERA M6 Wing
+    turb_oneram6           = TestCase('turb_oneram6')
+    turb_oneram6.cfg_dir   = "rans/oneram6"
+    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
+    turb_oneram6.test_iter = 10
+    turb_oneram6.test_vals = [-2.327431, -6.564331, 0.230257, 0.155839]#last 4 columns
+    turb_oneram6.su2_exec  = "SU2_CFD"
+    turb_oneram6.new_output = True
+    turb_oneram6.timeout   = 3200
+    turb_oneram6.tol       = 0.00001
+    test_list.append(turb_oneram6)
+
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
+    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
+    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
+    turb_naca0012_sa.test_iter = 10
+    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa.new_output = True
+    turb_naca0012_sa.timeout   = 3200
+    turb_naca0012_sa.tol       = 0.00001
+    test_list.append(turb_naca0012_sa)
+   
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
+    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
+    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
+    turb_naca0012_sa_bin.test_iter = 10
+    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa_bin.new_output  = True
+    turb_naca0012_sa_bin.timeout   = 3200
+    turb_naca0012_sa_bin.tol       = 0.00001
+    test_list.append(turb_naca0012_sa_bin)
+ 
+    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
+    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
+    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
+    turb_naca0012_sst.test_iter = 10
+    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
+    turb_naca0012_sst.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst.new_output  = True
+    turb_naca0012_sst.timeout   = 3200
+    turb_naca0012_sst.tol       = 0.00001
+    test_list.append(turb_naca0012_sst)
+
+    # PROPELLER 
+    propeller           = TestCase('propeller')
+    propeller.cfg_dir   = "rans/propeller"
+    propeller.cfg_file  = "propeller.cfg"
+    propeller.test_iter = 10
+    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
+    propeller.su2_exec  = "SU2_CFD"
+    propeller.new_output = True
+    propeller.timeout   = 3200
+    propeller.tol       = 0.00001
+    test_list.append(propeller)
+    #################################
+    ## Compressible RANS Restart  ###
+    #################################
+
+    # NACA0012 SST Multigrid restart
+    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
+    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
+    turb_naca0012_sst_restart_mg.test_iter = 50
+    turb_naca0012_sst_restart_mg.ntest_vals = 5
+    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
+    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst_restart_mg.new_output  = True
+    turb_naca0012_sst_restart_mg.timeout   = 3200
+    turb_naca0012_sst_restart_mg.tol       = 0.000001
+    test_list.append(turb_naca0012_sst_restart_mg)
+    
+    #############################
+    ### Incompressible Euler  ###
+    #############################
+
+    # NACA0012 Hydrofoil
+    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
+    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
+    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
+    inc_euler_naca0012.test_iter = 20
+    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
+    inc_euler_naca0012.su2_exec  = "SU2_CFD"
+    inc_euler_naca0012.new_output = True
+    inc_euler_naca0012.timeout   = 1600
+    inc_euler_naca0012.tol       = 0.00001
+    test_list.append(inc_euler_naca0012)
+
+    # C-D nozzle with pressure inlet and mass flow outlet
+    inc_nozzle           = TestCase('inc_nozzle')
+    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
+    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
+    inc_nozzle.test_iter = 20
+    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
+    inc_nozzle.su2_exec  = "SU2_CFD"
+    inc_nozzle.new_output = True
+    inc_nozzle.timeout   = 1600
+    inc_nozzle.tol       = 0.00001
+    test_list.append(inc_nozzle)
+
+    #############################
+    ### Incompressible N-S    ###
+    #############################
+
+    # Laminar cylinder
+    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
+    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
+    inc_lam_cylinder.test_iter = 10
+    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
+    inc_lam_cylinder.new_output  = True
+    inc_lam_cylinder.su2_exec  = "SU2_CFD"
+    inc_lam_cylinder.timeout   = 1600
+    inc_lam_cylinder.tol       = 0.00001
+    test_list.append(inc_lam_cylinder)
+
+    # Buoyancy-driven cavity
+    inc_buoyancy          = TestCase('inc_buoyancy')
+    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
+    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
+    inc_buoyancy.test_iter = 20
+    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
+    inc_buoyancy.new_output  = True
+    inc_buoyancy.su2_exec  = "SU2_CFD"
+    inc_buoyancy.timeout   = 1600
+    inc_buoyancy.tol       = 0.00001
+    test_list.append(inc_buoyancy)
+
+    # Laminar heated cylinder with polynomial fluid model
+    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
+    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
+    inc_poly_cylinder.test_iter = 20
+    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
+    inc_poly_cylinder.new_output  = True
+    inc_poly_cylinder.su2_exec  = "SU2_CFD"
+    inc_poly_cylinder.timeout   = 1600
+    inc_poly_cylinder.tol       = 0.00001
+    test_list.append(inc_poly_cylinder)
+
+    ############################
+    ### Incompressible RANS  ###
+    ############################
+
+    # NACA0012
+    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
+    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
+    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
+    inc_turb_naca0012.test_iter = 20
+    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
+    inc_turb_naca0012.new_output  = True
+    inc_turb_naca0012.su2_exec  = "SU2_CFD"
+    inc_turb_naca0012.timeout   = 1600
+    inc_turb_naca0012.tol       = 0.00001
+    test_list.append(inc_turb_naca0012)
     
     ####################
     ### DG-FEM Euler ###

From ef944fa6415d2fefb868f113781dd10fcfebcb4e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 29 Mar 2019 16:06:40 +0100
Subject: [PATCH 128/539] Added inheritance of config options from main config.

Along with that the way grid movement is specified has been changed. It is split in GRID_MOVEMENT and SURFACE_MOVEMENT now.
---
 Common/include/config_structure.hpp | 342 +++++-----
 Common/include/config_structure.inl |  75 +--
 Common/include/option_structure.hpp |  82 ++-
 Common/src/config_structure.cpp     | 951 +++++++++++++---------------
 4 files changed, 680 insertions(+), 770 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index f33d0e72bed1..1202a5dbd25e 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -125,7 +125,6 @@ class CConfig {
   Engine,				/*!< \brief Flag to know if the code is going to compute a problem with engine. */
   InvDesign_Cp,				/*!< \brief Flag to know if the code is going to compute and plot the inverse design. */
   InvDesign_HeatFlux,				/*!< \brief Flag to know if the code is going to compute and plot the inverse design. */
-  Grid_Movement,			/*!< \brief Flag to know if there is grid movement. */
   Wind_Gust,              /*!< \brief Flag to know if there is a wind gust. */
   Aeroelastic_Simulation, /*!< \brief Flag to know if there is an aeroelastic simulation. */
   Weakly_Coupled_Heat, /*!< \brief Flag to know if a heat equation should be weakly coupled to the incompressible solver. */
@@ -429,7 +428,6 @@ class CConfig {
   nObj, nObjW;              /*! \brief Number of objective functions. */
   unsigned short* nDV_Value;		/*!< \brief Number of values for each design variable (might be different than 1 if we allow arbitrary movement). */
   unsigned short nFFDBox;		/*!< \brief Number of ffd boxes. */
-  unsigned short nGridMovement;		/*!< \brief Number of grid movement types specified. */
   unsigned short nTurboMachineryKind; 	/*!< \brief Number turbomachinery types specified. */
   unsigned short nParamDV;		/*!< \brief Number of parameters of the design variable. */
   string DV_Filename;      /*!< \brief Filename for providing surface positions from an external parameterization. */
@@ -465,7 +463,9 @@ class CConfig {
   Kind_InitOption,			/*!< \brief Kind of Init option to choose if initializing with Reynolds number or with thermodynamic conditions   */
   Kind_GasModel,				/*!< \brief Kind of the Gas Model. */
   Kind_DensityModel,				/*!< \brief Kind of the density model for incompressible flows. */
-  *Kind_GridMovement,    /*!< \brief Kind of the unsteady mesh movement. */
+  Kind_GridMovement,    /*!< \brief Kind of the static mesh movement. */
+  *Kind_SurfaceMovement,    /*!< \brief Kind of the static mesh movement. */
+  nKind_SurfaceMovement,    /*!< \brief Kind of the dynamic mesh movement. */  
   Kind_Gradient_Method,		/*!< \brief Numerical method for computation of spatial gradients. */
   Kind_Deform_Linear_Solver, /*!< Numerical method to deform the grid */
   Kind_Deform_Linear_Solver_Prec,		/*!< \brief Preconditioner of the linear solver. */
@@ -882,55 +882,42 @@ class CConfig {
   su2double Cyclic_Pitch,     /*!< \brief Cyclic pitch for rotorcraft simulations. */
   Collective_Pitch;           /*!< \brief Collective pitch for rotorcraft simulations. */
   su2double Mach_Motion;			/*!< \brief Mach number based on mesh velocity and freestream quantities. */
-  su2double *Motion_Origin_X, /*!< \brief X-coordinate of the mesh motion origin. */
-  *Motion_Origin_Y,           /*!< \brief Y-coordinate of the mesh motion origin. */
-  *Motion_Origin_Z,           /*!< \brief Z-coordinate of the mesh motion origin. */
-  *Translation_Rate_X,        /*!< \brief Translational velocity of the mesh in the x-direction. */
-  *Translation_Rate_Y,        /*!< \brief Translational velocity of the mesh in the y-direction. */
-  *Translation_Rate_Z,        /*!< \brief Translational velocity of the mesh in the z-direction. */
-  *Rotation_Rate_X,           /*!< \brief Angular velocity of the mesh about the x-axis. */
-  *Rotation_Rate_Y,           /*!< \brief Angular velocity of the mesh about the y-axis. */
-  *Rotation_Rate_Z,           /*!< \brief Angular velocity of the mesh about the z-axis. */
-  *Pitching_Omega_X,          /*!< \brief Angular frequency of the mesh pitching about the x-axis. */
-  *Pitching_Omega_Y,          /*!< \brief Angular frequency of the mesh pitching about the y-axis. */
-  *Pitching_Omega_Z,          /*!< \brief Angular frequency of the mesh pitching about the z-axis. */
-  *Pitching_Ampl_X,           /*!< \brief Pitching amplitude about the x-axis. */
-  *Pitching_Ampl_Y,           /*!< \brief Pitching amplitude about the y-axis. */
-  *Pitching_Ampl_Z,           /*!< \brief Pitching amplitude about the z-axis. */
-  *Pitching_Phase_X,          /*!< \brief Pitching phase offset about the x-axis. */
-  *Pitching_Phase_Y,          /*!< \brief Pitching phase offset about the y-axis. */
-  *Pitching_Phase_Z,          /*!< \brief Pitching phase offset about the z-axis. */
-  *Plunging_Omega_X,          /*!< \brief Angular frequency of the mesh plunging in the x-direction. */
-  *Plunging_Omega_Y,          /*!< \brief Angular frequency of the mesh plunging in the y-direction. */
-  *Plunging_Omega_Z,          /*!< \brief Angular frequency of the mesh plunging in the z-direction. */
-  *Plunging_Ampl_X,           /*!< \brief Plunging amplitude in the x-direction. */
-  *Plunging_Ampl_Y,           /*!< \brief Plunging amplitude in the y-direction. */
-  *Plunging_Ampl_Z,           /*!< \brief Plunging amplitude in the z-direction. */
-  *Omega_HB;                  /*!< \brief Frequency for Harmonic Balance Operator (in rad/s). */
-  unsigned short nMotion_Origin_X,    /*!< \brief Number of X-coordinate mesh motion origins. */
-  nMotion_Origin_Y,           /*!< \brief Number of Y-coordinate mesh motion origins. */
-  nMotion_Origin_Z,           /*!< \brief Number of Z-coordinate mesh motion origins. */
-  nTranslation_Rate_X,        /*!< \brief Number of Translational x-velocities for mesh motion. */
-  nTranslation_Rate_Y,        /*!< \brief Number of Translational y-velocities for mesh motion. */
-  nTranslation_Rate_Z,        /*!< \brief Number of Translational z-velocities for mesh motion. */
-  nRotation_Rate_X,           /*!< \brief Number of Angular velocities about the x-axis for mesh motion. */
-  nRotation_Rate_Y,           /*!< \brief Number of Angular velocities about the y-axis for mesh motion. */
-  nRotation_Rate_Z,           /*!< \brief Number of Angular velocities about the z-axis for mesh motion. */
-  nPitching_Omega_X,          /*!< \brief Number of Angular frequencies about the x-axis for pitching. */
-  nPitching_Omega_Y,          /*!< \brief Number of Angular frequencies about the y-axis for pitching. */
-  nPitching_Omega_Z,          /*!< \brief Number of Angular frequencies about the z-axis for pitching. */
-  nPitching_Ampl_X,           /*!< \brief Number of Pitching amplitudes about the x-axis. */
-  nPitching_Ampl_Y,           /*!< \brief Number of Pitching amplitudes about the y-axis. */
-  nPitching_Ampl_Z,           /*!< \brief Number of Pitching amplitudes about the z-axis. */
-  nPitching_Phase_X,          /*!< \brief Number of Pitching phase offsets about the x-axis. */
-  nPitching_Phase_Y,          /*!< \brief Number of Pitching phase offsets about the y-axis. */
-  nPitching_Phase_Z,          /*!< \brief Number of Pitching phase offsets about the z-axis. */
-  nPlunging_Omega_X,          /*!< \brief Number of Angular frequencies in the x-direction for plunging. */
-  nPlunging_Omega_Y,          /*!< \brief Number of Angular frequencies in the y-direction for plunging. */
-  nPlunging_Omega_Z,          /*!< \brief Number of Angular frequencies in the z-direction for plunging. */
-  nPlunging_Ampl_X,           /*!< \brief Number of Plunging amplitudes in the x-direction. */
-  nPlunging_Ampl_Y,           /*!< \brief Number of Plunging amplitudes in the y-direction. */
-  nPlunging_Ampl_Z,           /*!< \brief Number of Plunging amplitudes in the z-direction. */
+  
+  su2double *Motion_Origin, /*!< \brief X-coordinate of the mesh motion origin. */
+  *Translation_Rate,        /*!< \brief Translational velocity of the mesh in the x-direction. */
+  *Rotation_Rate,           /*!< \brief Angular velocity of the mesh about the x-axis. */
+  *Pitching_Omega,          /*!< \brief Angular frequency of the mesh pitching about the x-axis. */
+  *Pitching_Ampl,           /*!< \brief Pitching amplitude about the x-axis. */ 
+  *Pitching_Phase,          /*!< \brief Pitching phase offset about the x-axis. */ 
+  *Plunging_Omega,          /*!< \brief Angular frequency of the mesh plunging in the x-direction. */ 
+  *Plunging_Ampl;           /*!< \brief Plunging amplitude in the x-direction. */
+  su2double *MarkerMotion_Origin, /*!< \brief X-coordinate of the mesh motion origin. */
+  *MarkerTranslation_Rate,        /*!< \brief Translational velocity of the mesh in the x-direction. */
+  *MarkerRotation_Rate,           /*!< \brief Angular velocity of the mesh about the x-axis. */
+  *MarkerPitching_Omega,          /*!< \brief Angular frequency of the mesh pitching about the x-axis. */
+  *MarkerPitching_Ampl,           /*!< \brief Pitching amplitude about the x-axis. */ 
+  *MarkerPitching_Phase,          /*!< \brief Pitching phase offset about the x-axis. */ 
+  *MarkerPlunging_Omega,          /*!< \brief Angular frequency of the mesh plunging in the x-direction. */ 
+  *MarkerPlunging_Ampl;           /*!< \brief Plunging amplitude in the x-direction. */
+  
+  unsigned short nMotion_Origin, /*!< \brief X-coordinate of the mesh motion origin. */
+  nTranslation,        /*!< \brief Translational velocity of the mesh in the x-direction. */
+  nRotation_Rate,           /*!< \brief Angular velocity of the mesh about the x-axis. */
+  nPitching_Omega,          /*!< \brief Angular frequency of the mesh pitching about the x-axis. */
+  nPitching_Ampl,           /*!< \brief Pitching amplitude about the x-axis. */ 
+  nPitching_Phase,          /*!< \brief Pitching phase offset about the x-axis. */ 
+  nPlunging_Omega,          /*!< \brief Angular frequency of the mesh plunging in the x-direction. */ 
+  nPlunging_Ampl;           /*!< \brief Plunging amplitude in the x-direction. */
+  unsigned short nMarkerMotion_Origin, /*!< \brief X-coordinate of the mesh motion origin. */
+  nMarkerTranslation,        /*!< \brief Translational velocity of the mesh in the x-direction. */
+  nMarkerRotation_Rate,           /*!< \brief Angular velocity of the mesh about the x-axis. */
+  nMarkerPitching_Omega,          /*!< \brief Angular frequency of the mesh pitching about the x-axis. */
+  nMarkerPitching_Ampl,           /*!< \brief Pitching amplitude about the x-axis. */ 
+  nMarkerPitching_Phase,          /*!< \brief Pitching phase offset about the x-axis. */ 
+  nMarkerPlunging_Omega,          /*!< \brief Angular frequency of the mesh plunging in the x-direction. */ 
+  nMarkerPlunging_Ampl;           /*!< \brief Plunging amplitude in the x-direction. */
+  su2double  *Omega_HB;                  /*!< \brief Frequency for Harmonic Balance Operator (in rad/s). */
+  unsigned short
   nOmega_HB,                /*!< \brief Number of frequencies in Harmonic Balance Operator. */
   nMoveMotion_Origin,         /*!< \brief Number of motion origins. */
   *MoveMotion_Origin;         /*!< \brief Keeps track if we should move moment origin. */
@@ -1039,7 +1026,7 @@ class CConfig {
   su2double *RampRotatingFrame_Coeff; /*!< \brief coefficient for Rotating frame ramp */
   su2double *RampOutletPressure_Coeff; /*!< \brief coefficient for outlet pressure ramp */
   su2double AverageMachLimit;       /*!< \brief option for turbulent mixingplane */
-  su2double *FinalRotation_Rate_Z; /*!< \brief Final rotation rate Z if Ramp rotating frame is activated. */
+  su2double FinalRotation_Rate_Z; /*!< \brief Final rotation rate Z if Ramp rotating frame is activated. */
   su2double FinalOutletPressure; /*!< \brief Final outlet pressure if Ramp outlet pressure is activated. */
   su2double MonitorOutletPressure; /*!< \brief Monitor outlet pressure if Ramp outlet pressure is activated. */
   su2double *default_body_force;        /*!< \brief Default body force vector for the COption class. */
@@ -1100,6 +1087,11 @@ class CConfig {
   su2double uq_urlx;            /*!< \brief Under-relaxation factor */
   bool uq_permute;              /*!< \brief Permutation of eigenvectors */
 
+  
+  void SetDefaultFromConfig(CConfig *config);
+  
+  void SetDefault();
+  
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
    there would be no list of all the config file options. ---*/
@@ -1401,6 +1393,11 @@ class CConfig {
    */
   CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level);
   
+  /*!
+   * \brief Constructor of the class which reads the input file and uses default options from another config.
+   */
+  CConfig(CConfig * config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level);
+  
   /*!
    * \brief Constructor of the class which reads the input file.
    */
@@ -1416,6 +1413,11 @@ class CConfig {
    */
   ~CConfig(void);
   
+ void SetnZone();
+ 
+ void SetnDim();
+ 
+ void SetHeader(unsigned short val_software);
   /*!
    * \brief Get the MPI communicator of SU2.
    * \return MPI communicator of SU2.
@@ -1432,10 +1434,9 @@ class CConfig {
    * \brief Gets the number of zones in the mesh file.
    * \param[in] val_mesh_filename - Name of the file with the grid information.
    * \param[in] val_format - Format of the file with the grid information.
-   * \param[in] config - Definition of the particular problem.
    * \return Total number of zones in the grid file.
    */
-  static unsigned short GetnZone(string val_mesh_filename, unsigned short val_format, CConfig *config);
+  static unsigned short GetnZone(string val_mesh_filename, unsigned short val_format);
   
   /*!
    * \brief Gets the number of dimensions in the mesh file
@@ -5667,11 +5668,17 @@ class CConfig {
   bool GetGrid_Movement(void);
   
   /*!
-   * \brief Get the type of dynamic mesh motion.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Type of dynamic mesh motion.
+   * \brief Get information about the volumetric movement.
+   * \return <code>TRUE</code> if there is a volumetric movement is required; otherwise <code>FALSE</code>.
    */
-  unsigned short GetKind_GridMovement(unsigned short val_iZone);
+  bool GetVolumetric_Movement(void);
+  
+  /*!
+   * \brief Get information about deforming markers.
+   * \param[in] kind_movement - Kind of surface movement.
+   * \return <code>TRUE</code> at least one surface of kind_movement moving; otherwise <code>FALSE</code>.
+   */
+  bool GetSurface_Movement(unsigned short kind_movement);
   
   /*!
    * \brief Get the type of dynamic mesh motion. Each zone gets a config file.
@@ -5684,216 +5691,151 @@ class CConfig {
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
    * \param[in] motion_Type - Specify motion type.
    */
-  void SetKind_GridMovement(unsigned short val_iZone, unsigned short motion_Type);
-  
-  /*!
-   * \brief Get the mach number based on the mesh velocity and freestream quantities.
-   * \return Mach number based on the mesh velocity and freestream quantities.
-   */
-  su2double GetMach_Motion(void);
-  
-  /*!
-   * \brief Get x-coordinate of the mesh motion origin.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return X-coordinate of the mesh motion origin.
-   */
-  su2double GetMotion_Origin_X(unsigned short val_iZone);
-  
-  /*!
-   * \brief Get y-coordinate of the mesh motion origin
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Y-coordinate of the mesh motion origin.
-   */
-  su2double GetMotion_Origin_Y(unsigned short val_iZone);
-  
-  /*!
-   * \brief Get z-coordinate of the mesh motion origin
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Z-coordinate of the mesh motion origin.
-   */
-  su2double GetMotion_Origin_Z(unsigned short val_iZone);
-  
-  /*!
-   * \brief Set x-coordinate of the mesh motion origin.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \param[in] val_origin - New x-coordinate of the mesh motion origin.
-   */
-  void SetMotion_Origin_X(unsigned short val_iZone, su2double val_origin);
-  
-  /*!
-   * \brief Set y-coordinate of the mesh motion origin
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \param[in] val_origin - New y-coordinate of the mesh motion origin.
-   */
-  void SetMotion_Origin_Y(unsigned short val_iZone, su2double val_origin);
+  void SetKind_GridMovement(unsigned short motion_Type);
   
   /*!
-   * \brief Set z-coordinate of the mesh motion origin
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \param[in] val_origin - New y-coordinate of the mesh motion origin.
+   * \brief Get the type of surface motion.
+   * \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving).
+   * \return Type of surface motion.
    */
-  void SetMotion_Origin_Z(unsigned short val_iZone, su2double val_origin);
+  unsigned short GetKind_SurfaceMovement(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the translational velocity of the mesh in the x-direction.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Translational velocity of the mesh in the x-direction.
+   * \brief Get the mach number based on the mesh velocity and freestream quantities.
+   * \return Mach number based on the mesh velocity and freestream quantities.
    */
-  su2double GetTranslation_Rate_X(unsigned short val_iZone);
+  su2double GetMach_Motion(void);
   
   /*!
-   * \brief Get the translational velocity of the mesh in the y-direction.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Translational velocity of the mesh in the y-direction.
+   * \brief Get the mesh motion origin.
+   * \return The mesh motion origin.
    */
-  su2double GetTranslation_Rate_Y(unsigned short val_iZone);
+  su2double* GetMotion_Origin();
   
   /*!
-   * \brief Get the translational velocity of the mesh in the z-direction.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Translational velocity of the mesh in the z-direction.
+   * \brief Get the mesh motion origin.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return The motion origin of the marker.
    */
-  su2double GetTranslation_Rate_Z(unsigned short val_iZone);
+  su2double* GetMarkerMotion_Origin(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the angular velocity of the mesh about the x-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular velocity of the mesh about the x-axis.
+   * \brief Set the mesh motion origin.
+   * \param[in] val - new value of the origin
+   * \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
    */
-  su2double GetRotation_Rate_X(unsigned short val_iZone);
+  void SetMarkerMotion_Origin (su2double* val, unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the angular velocity of the mesh about the y-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular velocity of the mesh about the y-axis.
+   * \brief Get the translational velocity of the mesh.
+   * \return Translational velocity of the mesh.
    */
-  su2double GetRotation_Rate_Y(unsigned short val_iZone);
+  su2double* GetTranslation_Rate();
   
   /*!
-   * \brief Get the angular velocity of the mesh about the z-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular velocity of the mesh about the z-axis.
-   */
-  su2double GetRotation_Rate_Z(unsigned short val_iZone);
-  
-  /*!
-   * \brief Get the angular velocity of the mesh about the z-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular velocity of the mesh about the z-axis.
-   */
-  su2double GetFinalRotation_Rate_Z(unsigned short val_iZone);
-
-  /*!
-   * \brief Set the angular velocity of the mesh about the z-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \param[in] newRotation_Rate_Z - new rotation rate after computing the ramp value.
+   * \brief Get the translational velocity of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return Translational velocity of the marker.
    */
-  void SetRotation_Rate_Z(su2double newRotation_Rate_Z, unsigned short val_iZone);
-
-  /*!
-   * \brief Get the angular frequency of a mesh pitching about the x-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh pitching about the x-axis.
-   */
-  su2double GetPitching_Omega_X(unsigned short val_iZone);
+  su2double* GetMarkerTranslationRate(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the angular frequency of a mesh pitching about the y-axis.
+   * \brief Get the translational velocity of the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh pitching about the y-axis.
+   * \return Translational velocity of the mesh.
    */
-  su2double GetPitching_Omega_Y(unsigned short val_iZone);
+  su2double* GetRotation_Rate();
   
   /*!
-   * \brief Get the angular frequency of a mesh pitching about the z-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh pitching about the z-axis.
+   * \brief Get the rotation velocity of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return Rotation velocity of the marker.
    */
-  su2double GetPitching_Omega_Z(unsigned short val_iZone);
+  su2double* GetMarkerRotationRate(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the pitching amplitude about the x-axis.
+   * \brief Get the  pitching amplitudeof the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching amplitude about the x-axis.
+   * \return Angular frequency of the mesh pitching.
    */
-  su2double GetPitching_Ampl_X(unsigned short val_iZone);
+  su2double* GetPitching_Omega();
   
   /*!
-   * \brief Get the pitching amplitude about the y-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching amplitude about the y-axis.
+   * \brief Get  pitching amplitude of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return  Angular frequency of the marker pitching.
    */
-  su2double GetPitching_Ampl_Y(unsigned short val_iZone);
+  su2double* GetMarkerPitching_Omega(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the pitching amplitude about the z-axis.
+   * \brief Get the  pitching amplitudeof the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching amplitude about the z-axis.
+   * \return pitching amplitude of the mesh.
    */
-  su2double GetPitching_Ampl_Z(unsigned short val_iZone);
+  su2double* GetPitching_Ampl();
   
   /*!
-   * \brief Get the pitching phase offset about the x-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching phase offset about the x-axis.
+   * \brief Get  pitching amplitude of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return  pitching amplitude of the marker.
    */
-  su2double GetPitching_Phase_X(unsigned short val_iZone);
+  su2double* GetMarkerPitching_Ampl(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the pitching phase offset about the y-axis.
+   * \brief Get the  pitching amplitudeof the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching phase offset about the y-axis.
+   * \return pitching phase of the mesh.
    */
-  su2double GetPitching_Phase_Y(unsigned short val_iZone);
+  su2double* GetPitching_Phase();
   
   /*!
-   * \brief Get the pitching phase offset about the z-axis.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Pitching phase offset about the z-axis.
+   * \brief Get  pitching amplitude of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return pitching phase of the marker.
    */
-  su2double GetPitching_Phase_Z(unsigned short val_iZone);
+  su2double* GetMarkerPitching_Phase(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the angular frequency of a mesh plunging in the x-direction.
+   * \brief Get the  pitching amplitudeof the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh plunging in the x-direction.
+   * \return Angular frequency of the mesh plunging.
    */
-  su2double GetPlunging_Omega_X(unsigned short val_iZone);
+  su2double* GetPlunging_Omega();
   
   /*!
-   * \brief Get the angular frequency of a mesh plunging in the y-direction.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh plunging in the y-direction.
+   * \brief Get  pitching amplitude of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return Angular frequency of the marker plunging.
    */
-  su2double GetPlunging_Omega_Y(unsigned short val_iZone);
+  su2double* GetMarkerPlunging_Omega(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the angular frequency of a mesh plunging in the z-direction.
+   * \brief Get the  pitching amplitudeof the mesh.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Angular frequency of a mesh plunging in the z-direction.
+   * \return Plunging amplitude of the mesh.
    */
-  su2double GetPlunging_Omega_Z(unsigned short val_iZone);
+  su2double* GetPlunging_Ampl();
   
   /*!
-   * \brief Get the plunging amplitude in the x-direction.
-   * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Plunging amplitude in the x-direction.
+   * \brief Get  pitching amplitude of the marker.
+   *  \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving) 
+   * \return Plunging amplitude of the marker.
    */
-  su2double GetPlunging_Ampl_X(unsigned short val_iZone);
+  su2double* GetMarkerPlunging_Ampl(unsigned short iMarkerMoving);
   
   /*!
-   * \brief Get the plunging amplitude in the y-direction.
+   * \brief Get the angular velocity of the mesh about the z-axis.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Plunging amplitude in the y-direction.
+   * \return Angular velocity of the mesh about the z-axis.
    */
-  su2double GetPlunging_Ampl_Y(unsigned short val_iZone);
-  
+  su2double GetFinalRotation_Rate_Z();
+
   /*!
-   * \brief Get the plunging amplitude in the z-direction.
+   * \brief Set the angular velocity of the mesh about the z-axis.
    * \param[in] val_iZone - Number for the current zone in the mesh (each zone has independent motion).
-   * \return Plunging amplitude in the z-direction.
+   * \param[in] newRotation_Rate_Z - new rotation rate after computing the ramp value.
    */
-  su2double GetPlunging_Ampl_Z(unsigned short val_iZone);
+  void SetRotation_Rate_Z(su2double newRotation_Rate_Z);
   
   /*!
    * \brief Get the Harmonic Balance frequency pointer.
@@ -8081,7 +8023,7 @@ class CConfig {
   /*!
    * \brief Set the config options.
    */
-  void SetConfig_Options(unsigned short val_iZone, unsigned short val_nZone);
+  void SetConfig_Options();
   
   /*!
    * \brief Set the config options.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index c34f86d3b321..3fb2eca5164d 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -36,6 +36,7 @@
  */
 
 #pragma once
+#include "config_structure.hpp"
 
 inline su2double CConfig::GetHTP_Axis(unsigned short val_index) { return HTP_Axis[val_index]; }
 
@@ -933,71 +934,51 @@ inline void CConfig::SetMu_PolyCoeffND(su2double val_coeff, unsigned short val_i
 
 inline void CConfig::SetKt_PolyCoeffND(su2double val_coeff, unsigned short val_index) { KtPolyCoefficientsND[val_index] = val_coeff; }
 
-inline unsigned short CConfig::GetKind_GridMovement(unsigned short val_iZone) { return Kind_GridMovement[val_iZone]; }
+inline unsigned short CConfig::GetKind_GridMovement() { return Kind_GridMovement; }
 
-inline unsigned short CConfig::GetKind_GridMovement(void) { return Kind_GridMovement[0]; }
+inline void CConfig::SetKind_GridMovement(unsigned short motion_Type) { Kind_GridMovement = motion_Type; }
 
-inline void CConfig::SetKind_GridMovement(unsigned short val_iZone, unsigned short motion_Type) { Kind_GridMovement[val_iZone] = motion_Type; }
+inline su2double* CConfig::GetMotion_Origin(){return Motion_Origin;}
 
-inline su2double CConfig::GetMach_Motion(void) { return Mach_Motion; }
-
-inline su2double CConfig::GetMotion_Origin_X(unsigned short val_iZone) { return Motion_Origin_X[val_iZone]; }
-
-inline su2double CConfig::GetMotion_Origin_Y(unsigned short val_iZone) { return Motion_Origin_Y[val_iZone]; }
-
-inline su2double CConfig::GetMotion_Origin_Z(unsigned short val_iZone) { return Motion_Origin_Z[val_iZone]; }
-
-inline void CConfig::SetMotion_Origin_X(unsigned short val_iZone, su2double val_origin) { Motion_Origin_X[val_iZone] = val_origin; }
-
-inline void CConfig::SetMotion_Origin_Y(unsigned short val_iZone, su2double val_origin) { Motion_Origin_Y[val_iZone] = val_origin; }
-
-inline void CConfig::SetMotion_Origin_Z(unsigned short val_iZone, su2double val_origin) { Motion_Origin_Z[val_iZone] = val_origin; }
-
-inline su2double CConfig::GetTranslation_Rate_X(unsigned short val_iZone) { return  Translation_Rate_X[val_iZone]; }
+inline su2double* CConfig::GetMarkerMotion_Origin(unsigned short iMarkerMoving){return &MarkerMotion_Origin[3*iMarkerMoving];}
 
-inline su2double CConfig::GetTranslation_Rate_Y(unsigned short val_iZone) { return  Translation_Rate_Y[val_iZone]; }
-
-inline su2double CConfig::GetTranslation_Rate_Z(unsigned short val_iZone) { return  Translation_Rate_Z[val_iZone]; }
-
-inline su2double CConfig::GetRotation_Rate_X(unsigned short val_iZone) { return  Rotation_Rate_X[val_iZone]; }
-
-inline su2double CConfig::GetRotation_Rate_Y(unsigned short val_iZone) { return  Rotation_Rate_Y[val_iZone]; }
-
-inline su2double CConfig::GetRotation_Rate_Z(unsigned short val_iZone) { return  Rotation_Rate_Z[val_iZone]; }
-
-inline su2double CConfig::GetFinalRotation_Rate_Z(unsigned short val_iZone) { return  FinalRotation_Rate_Z[val_iZone]; }
+inline void CConfig::SetMarkerMotion_Origin(su2double* val, unsigned short iMarkerMoving){
+  for (unsigned short iDim = 0; iDim < 3; iDim++){
+    MarkerMotion_Origin[iDim*iMarkerMoving] = val[iDim];
+  }
+}
 
-inline void CConfig::SetRotation_Rate_Z(su2double newRotation_Rate_Z, unsigned short val_iZone) { Rotation_Rate_Z[val_iZone] = newRotation_Rate_Z; }
+inline su2double* CConfig::GetTranslation_Rate(){return Translation_Rate;}
 
-inline su2double CConfig::GetPitching_Omega_X(unsigned short val_iZone) { return  Pitching_Omega_X[val_iZone]; }
+inline su2double* CConfig::GetMarkerTranslationRate(unsigned short iMarkerMoving){return &MarkerTranslation_Rate[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPitching_Omega_Y(unsigned short val_iZone) { return  Pitching_Omega_Y[val_iZone]; }
+inline su2double* CConfig::GetRotation_Rate(){return Rotation_Rate;}
 
-inline su2double CConfig::GetPitching_Omega_Z(unsigned short val_iZone) { return  Pitching_Omega_Z[val_iZone]; }
+inline su2double CConfig::GetFinalRotation_Rate_Z(){return FinalRotation_Rate_Z;}
 
-inline su2double CConfig::GetPitching_Ampl_X(unsigned short val_iZone) { return  Pitching_Ampl_X[val_iZone]; }
+inline su2double* CConfig::GetMarkerRotationRate(unsigned short iMarkerMoving){return &MarkerRotation_Rate[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPitching_Ampl_Y(unsigned short val_iZone) { return  Pitching_Ampl_Y[val_iZone]; }
+inline su2double* CConfig::GetPitching_Omega(){return Pitching_Omega;}
 
-inline su2double CConfig::GetPitching_Ampl_Z(unsigned short val_iZone) { return  Pitching_Ampl_Z[val_iZone]; }
+inline su2double* CConfig::GetMarkerPitching_Omega(unsigned short iMarkerMoving){return &MarkerPitching_Omega[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPitching_Phase_X(unsigned short val_iZone) { return  Pitching_Phase_X[val_iZone]; }
+inline su2double* CConfig::GetPitching_Ampl(){return Pitching_Ampl;}
 
-inline su2double CConfig::GetPitching_Phase_Y(unsigned short val_iZone) { return  Pitching_Phase_Y[val_iZone]; }
+inline su2double* CConfig::GetMarkerPitching_Ampl(unsigned short iMarkerMoving){return &MarkerPitching_Ampl[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPitching_Phase_Z(unsigned short val_iZone) { return  Pitching_Phase_Z[val_iZone]; }
+inline su2double* CConfig::GetPitching_Phase(){return Pitching_Phase;}
 
-inline su2double CConfig::GetPlunging_Omega_X(unsigned short val_iZone) { return  Plunging_Omega_X[val_iZone]; }
+inline su2double* CConfig::GetMarkerPitching_Phase(unsigned short iMarkerMoving){return &MarkerPitching_Phase[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPlunging_Omega_Y(unsigned short val_iZone) { return  Plunging_Omega_Y[val_iZone]; }
+inline su2double* CConfig::GetPlunging_Omega(){return Plunging_Omega;}
 
-inline su2double CConfig::GetPlunging_Omega_Z(unsigned short val_iZone) { return  Plunging_Omega_Z[val_iZone]; }
+inline su2double* CConfig::GetMarkerPlunging_Omega(unsigned short iMarkerMoving){return &MarkerPlunging_Omega[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPlunging_Ampl_X(unsigned short val_iZone) { return  Plunging_Ampl_X[val_iZone]; }
+inline su2double* CConfig::GetPlunging_Ampl(){return Plunging_Ampl;}
 
-inline su2double CConfig::GetPlunging_Ampl_Y(unsigned short val_iZone) { return  Plunging_Ampl_Y[val_iZone]; }
+inline su2double* CConfig::GetMarkerPlunging_Ampl(unsigned short iMarkerMoving){return &MarkerPlunging_Ampl[3*iMarkerMoving];}
 
-inline su2double CConfig::GetPlunging_Ampl_Z(unsigned short val_iZone) { return  Plunging_Ampl_Z[val_iZone]; }
+inline su2double CConfig::GetMach_Motion(void) { return Mach_Motion; }
 
 inline su2double* CConfig::GetOmega_HB(void) { return  Omega_HB; }
 
@@ -1608,7 +1589,9 @@ inline su2double CConfig::GetFixAzimuthalLine(void) { return FixAzimuthalLine; }
 
 inline su2double CConfig::GetCFLRedCoeff_Turb(void) { return CFLRedCoeff_Turb; }
 
-inline bool CConfig::GetGrid_Movement(void) { return Grid_Movement; }
+inline bool CConfig::GetGrid_Movement(void) { return (Kind_GridMovement != NO_MOVEMENT) || (nMarker_Moving > 0); }
+
+inline unsigned short CConfig::GetKind_SurfaceMovement(unsigned short iMarkerMoving){return Kind_SurfaceMovement[iMarkerMoving];}
 
 inline bool CConfig::GetRotating_Frame(void) { return Rotating_Frame; }
 
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index aa6b761eb129..82018bf23413 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -226,7 +226,7 @@ enum ENUM_SOLVER {
   FEM_NAVIER_STOKES = 51,               /*!< \brief Definition of the finite element Navier-Stokes' solver. */
   FEM_RANS = 52,                        /*!< \brief Definition of the finite element Reynolds-averaged Navier-Stokes' (RANS) solver. */
   FEM_LES = 53,                         /*!< \brief Definition of the finite element Large Eddy Simulation Navier-Stokes' (LES) solver. */
-  MULTIZONE = 99
+  MULTIPHYSICS = 99
 };
 /* BEGIN_CONFIG_ENUMS */
 static const map<string, ENUM_SOLVER> Solver_Map = CCreateMap<string, ENUM_SOLVER>
@@ -254,7 +254,7 @@ static const map<string, ENUM_SOLVER> Solver_Map = CCreateMap<string, ENUM_SOLVE
 ("FLUID_STRUCTURE_INTERACTION", FLUID_STRUCTURE_INTERACTION)
 ("TEMPLATE_SOLVER", TEMPLATE_SOLVER)
 ("ZONE_SPECIFIC", ZONE_SPECIFIC)
-("MULTIZONE", MULTIZONE);
+("MULTIPHYSICS", MULTIPHYSICS);
 
 /*!
  * \brief different solver types for the multizone environment component
@@ -648,38 +648,46 @@ static const map<string, ENUM_CONDUCTIVITYMODEL_TURB> TurbConductivityModel_Map
  */
 enum ENUM_GRIDMOVEMENT {
   NO_MOVEMENT = 0, /*!< \brief Simulation on a static mesh. */
-  DEFORMING = 1,		/*!< \brief Simulation with dynamically deforming meshes (plunging/pitching/rotation). */
   RIGID_MOTION = 2,		/*!< \brief Simulation with rigid mesh motion (plunging/pitching/rotation). */
   FLUID_STRUCTURE = 3,		/*!< \brief Fluid structure deformation. */
-  EXTERNAL = 4,  /*!< \brief Arbitrary grid motion specified by external files at each time step. */
-  EXTERNAL_ROTATION = 5,  /*!< \brief Arbitrary grid motion specified by external files at each time step with rigid rotation. */
-  AEROELASTIC = 6,    /*!< \brief Simulation with aeroelastic motion. */
-  MOVING_WALL = 7,    /*!< \brief Simulation with moving walls (translation/rotation). */
+  EXTERNAL = 4,
+  EXTERNAL_ROTATION = 5,
   ROTATING_FRAME = 8,    /*!< \brief Simulation in a rotating frame. */
   ELASTICITY = 9,    /*!< \brief Linear Elasticity. */
-  AEROELASTIC_RIGID_MOTION = 10, /*!< \brief Simulation with rotation and aeroelastic motion. */
   STEADY_TRANSLATION = 11,    /*!< \brief Simulation in a steadily translating frame. */
   GUST = 12, /*!< \brief Simulation on a static mesh with a gust. */
   MOVING_HTP = 13,    /*!< \brief Simulation with moving HTP (rotation). */
   FLUID_STRUCTURE_STATIC = 14 /*!< \brief Fluid structure deformation with no grid velocity. */
+
 };
 
 static const map<string, ENUM_GRIDMOVEMENT> GridMovement_Map = CCreateMap<string, ENUM_GRIDMOVEMENT>
 ("NONE", NO_MOVEMENT)
-("DEFORMING", DEFORMING)
 ("RIGID_MOTION", RIGID_MOTION)
 ("FLUID_STRUCTURE", FLUID_STRUCTURE)
-("EXTERNAL", EXTERNAL)
-("EXTERNAL_ROTATION", EXTERNAL_ROTATION)
-("AEROELASTIC", AEROELASTIC)
 ("ROTATING_FRAME", ROTATING_FRAME)
 ("ELASTICITY", ELASTICITY)
-("MOVING_WALL", MOVING_WALL)
 ("MOVING_HTP", MOVING_HTP)
-("AEROELASTIC_RIGID_MOTION", AEROELASTIC_RIGID_MOTION)
 ("STEADY_TRANSLATION", STEADY_TRANSLATION)
 ("GUST", GUST)
-("FLUID_STRUCTURE_STATIC", FLUID_STRUCTURE_STATIC);
+("FLUID_STRUCTURE_STATIC", FLUID_STRUCTURE_STATIC)
+("EXTERNAL", EXTERNAL)
+("EXTERNAL_ROTATION", EXTERNAL_ROTATION);
+
+
+enum ENUM_SURFACEMOVEMENT {
+  DEFORMING = 1,
+  MOVING_WALL = 2,
+  AEROELASTIC = 3,    /*!< \brief Simulation with aeroelastic motion. */
+  AEROELASTIC_RIGID_MOTION = 4 /*!< \brief Simulation with rotation and aeroelastic motion. */
+};
+
+static const map<string, ENUM_SURFACEMOVEMENT> SurfaceMovement_Map = CCreateMap<string, ENUM_SURFACEMOVEMENT>
+("DEFORMING", DEFORMING)
+("MOVING_WALL", MOVING_WALL)
+("AEROELASTIC_RIGID_MOTION", AEROELASTIC_RIGID_MOTION)
+("AEROELASTIC", AEROELASTIC);
+
 
 /*!
  * \brief type of wind gusts
@@ -1983,11 +1991,13 @@ static const map<string, ENUM_PROJECTION_FUNCTION> Projection_Function_Map = CCr
 
 class COptionBase {
 private:
+  vector<string> value;
 public:
   COptionBase() {};
   virtual  ~COptionBase() = 0;
   //  virtual string SetValue(string) {SU2MPI::PrintAndFinalize("shouldn't be here"); return "";};
-  virtual string SetValue(vector<string>) = 0;
+  virtual string SetValue(vector<string> value){this->value = value; return "";}
+  vector<string> GetValue() {return value;}
   virtual void SetDefault() = 0;
 
   string optionCheckMultipleValues(vector<string> & option_value, string type_id, string option_name) {
@@ -2030,6 +2040,7 @@ class COptionEnum : public COptionBase {
 
   ~COptionEnum() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // Check if there is more than one string
     string out = optionCheckMultipleValues(option_value, "enum", this->name);
     if (out.compare("") != 0) {
@@ -2069,6 +2080,7 @@ class COptionDouble : public COptionBase {
 
   ~COptionDouble() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // check if there is more than one value
     string out = optionCheckMultipleValues(option_value, "su2double", this->name);
     if (out.compare("") != 0) {
@@ -2100,6 +2112,7 @@ class COptionString : public COptionBase {
 
   ~COptionString() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // check if there is more than one value
     string out = optionCheckMultipleValues(option_value, "su2double", this->name);
     if (out.compare("") != 0) {
@@ -2126,6 +2139,7 @@ class COptionInt : public COptionBase {
 
   ~COptionInt() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     string out = optionCheckMultipleValues(option_value, "int", this->name);
     if (out.compare("") != 0) {
       return out;
@@ -2156,6 +2170,7 @@ class COptionULong : public COptionBase {
 
   ~COptionULong() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     string out = optionCheckMultipleValues(option_value, "unsigned long", this->name);
     if (out.compare("") != 0) {
       return out;
@@ -2186,6 +2201,7 @@ class COptionUShort : public COptionBase {
 
   ~COptionUShort() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     string out = optionCheckMultipleValues(option_value, "unsigned short", this->name);
     if (out.compare("") != 0) {
       return out;
@@ -2216,6 +2232,7 @@ class COptionLong : public COptionBase {
 
   ~COptionLong() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     string out = optionCheckMultipleValues(option_value, "long", this->name);
     if (out.compare("") != 0) {
       return out;
@@ -2247,6 +2264,7 @@ class COptionBool : public COptionBase {
 
   ~COptionBool() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // check if there is more than one value
     string out = optionCheckMultipleValues(option_value, "bool", this->name);
     if (out.compare("") != 0) {
@@ -2283,6 +2301,7 @@ class COptionEnumList : public COptionBase {
 
   ~COptionEnumList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     if (option_value.size() == 1 && option_value[0].compare("NONE") == 0) {
       this->size = 0;
       return "";
@@ -2334,6 +2353,7 @@ class COptionDoubleArray : public COptionBase {
      if(vals != NULL) delete [] vals; 
   };
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // Check that the size is correct
     if (option_value.size() != (unsigned long)this->size) {
       string newstring;
@@ -2384,6 +2404,7 @@ class COptionDoubleList : public COptionBase {
 
   ~COptionDoubleList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // The size is the length of option_value
     unsigned short option_size = option_value.size();
     if (option_size == 1 && option_value[0].compare("NONE") == 0) {
@@ -2426,6 +2447,7 @@ class COptionShortList : public COptionBase {
   
   ~COptionShortList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // The size is the length of option_value
     unsigned short option_size = option_value.size();
     if (option_size == 1 && option_value[0].compare("NONE") == 0) {
@@ -2467,6 +2489,7 @@ class COptionUShortList : public COptionBase {
 
   ~COptionUShortList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // The size is the length of option_value
     unsigned short option_size = option_value.size();
     if (option_size == 1 && option_value[0].compare("NONE") == 0) {
@@ -2508,6 +2531,7 @@ class COptionStringList : public COptionBase {
 
   ~COptionStringList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // The size is the length of option_value
     unsigned short option_size = option_value.size();
     if (option_size == 1 && option_value[0].compare("NONE") == 0) {
@@ -2543,6 +2567,7 @@ class COptionConvect : public COptionBase {
 
   ~COptionConvect() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
 
     string out = optionCheckMultipleValues(option_value, "unsigned short", this->name);
     if (out.compare("") != 0) {
@@ -2588,6 +2613,7 @@ class COptionFEMConvect : public COptionBase{
 
   ~COptionFEMConvect() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
 
     string out = optionCheckMultipleValues(option_value, "unsigned short", this->name);
     if (out.compare("") != 0) {
@@ -2630,6 +2656,7 @@ class COptionMathProblem : public COptionBase {
 
   ~COptionMathProblem() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     string out = optionCheckMultipleValues(option_value, "unsigned short", this->name);
     if (out.compare("") != 0) {
       return out;
@@ -2684,6 +2711,7 @@ class COptionDVParam : public COptionBase {
   ~COptionDVParam() {};
   
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     if ((option_value.size() == 1) && (option_value[0].compare("NONE") == 0)) {
       this->nDV = 0;
       return "";
@@ -2846,6 +2874,7 @@ class COptionDVValue : public COptionBase {
   ~COptionDVValue() {};
 
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     if ((option_value.size() == 1) && (option_value[0].compare("NONE") == 0)) {
       this->nDV_Value = NULL;
       return "";
@@ -2951,6 +2980,7 @@ class COptionFFDDef : public COptionBase {
   ~COptionFFDDef() {};
   
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     if ((option_value.size() == 1) && (option_value[0].compare("NONE") == 0)) {
       this->nFFD = 0;
       return "";
@@ -3045,6 +3075,7 @@ class COptionFFDDegree : public COptionBase {
   ~COptionFFDDegree() {};
   
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     if ((option_value.size() == 1) && (option_value[0].compare("NONE") == 0)) {
       this->nFFD = 0;
       return "";
@@ -3134,6 +3165,7 @@ class COptionStringDoubleList : public COptionBase {
 
   ~COptionStringDoubleList() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     // There must be an even number of entries (same number of strings and doubles
     unsigned short totalVals = option_value.size();
     if ((totalVals % 2) != 0) {
@@ -3185,7 +3217,7 @@ class COptionInlet : public COptionBase {
 
   ~COptionInlet() {};
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     unsigned short totalVals = option_value.size();
     if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
       this->size = 0;
@@ -3276,7 +3308,7 @@ class COptionRiemann : public COptionBase {
   ~COptionRiemann() {};
 
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     unsigned short totalVals = option_value.size();
     if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
       this->size = 0;
@@ -3384,7 +3416,7 @@ class COptionGiles : public COptionBase{
   ~COptionGiles() {};
 
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     unsigned long totalVals = option_value.size();
     if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
       this->size = 0;
@@ -3506,7 +3538,7 @@ class COptionExhaust : public COptionBase {
   ~COptionExhaust() {};
   
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     unsigned short totalVals = option_value.size();
     if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
       this->size = 0;
@@ -3573,7 +3605,7 @@ class COptionPeriodic : public COptionBase {
 
   ~COptionPeriodic() {};
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     const int mod_num = 11;
 
     unsigned short totalVals = option_value.size();
@@ -3738,7 +3770,7 @@ class COptionTurboPerformance : public COptionBase {
 
   ~COptionTurboPerformance() {};
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     const int mod_num = 2;
 
     unsigned long totalVals = option_value.size();
@@ -3788,7 +3820,8 @@ class COptionPython : public COptionBase {
   }
   ~COptionPython() {};
   // No checking happens with python options
-  string SetValue(vector<string>) {
+  string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     return "";
   }
   // No defaults with python options
@@ -3820,6 +3853,7 @@ class COptionActDisk : public COptionBase {
   
   ~COptionActDisk() {};
   string SetValue(vector<string> option_value) {
+    COptionBase::SetValue(option_value);
     const int mod_num = 8;
     unsigned short totalVals = option_value.size();
     if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
@@ -3914,7 +3948,7 @@ class COptionWallFunction : public COptionBase {
   ~COptionWallFunction(){}
 
   string SetValue(vector<string> option_value) {
-
+    COptionBase::SetValue(option_value);
     /*--- First check if NONE is specified. ---*/
     unsigned short totalSize = option_value.size();
     if ((totalSize == 1) && (option_value[0].compare("NONE") == 0)) {
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index beda2f73edfa..6d4a619a8906 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -61,20 +61,72 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
   
   /*--- Store MPI rank and size ---*/ 
   
+  rank = SU2_MPI::GetRank();
+  size = SU2_MPI::GetSize();
+  
+  iZone = val_iZone;
+  nZone = val_nZone;
+
+  /*--- Initialize pointers to Null---*/
+
+  SetPointersNull();
+
+  /*--- Reading config options  ---*/
+
+  SetConfig_Options();
+
+  /*--- Parsing the config file  ---*/
+
+  SetConfig_Parsing(case_filename);
+  
+  /*--- Set the default values for all of the options that weren't set ---*/
+      
+  SetDefault();
+
+  /*--- Configuration file postprocessing ---*/
+
+  SetPostprocessing(val_software, val_iZone, val_nDim);
+
+  /*--- Configuration file boundaries/markers setting ---*/
+
+  SetMarkers(val_software);
+
+  /*--- Configuration file output ---*/
+
+  if ((rank == MASTER_NODE) && (verb_level == VERB_HIGH))
+    SetOutput(val_software, val_iZone);
+
+}
+
+CConfig::CConfig(CConfig* base_config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level) {
+  
+  /*--- Store MPI rank and size ---*/ 
+  
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
 
+  iZone = val_iZone;
+  nZone = val_nZone;
+  
   /*--- Initialize pointers to Null---*/
 
   SetPointersNull();
 
   /*--- Reading config options  ---*/
 
-  SetConfig_Options(val_iZone, val_nZone);
+  SetConfig_Options();
 
   /*--- Parsing the config file  ---*/
 
   SetConfig_Parsing(case_filename);
+  
+  /*--- Set default options from base config ---*/
+  
+  SetDefaultFromConfig(base_config);
+  
+  /*--- Set the default values for all of the options that weren't set ---*/
+      
+  SetDefault();
 
   /*--- Configuration file postprocessing ---*/
 
@@ -86,7 +138,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
   /*--- Configuration file output ---*/
 
-  if ((rank == MASTER_NODE) && (verb_level == VERB_HIGH) && (val_iZone == 0))
+  if ((rank == MASTER_NODE) && (verb_level == VERB_HIGH))
     SetOutput(val_software, val_iZone);
 
 }
@@ -104,11 +156,19 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
   /*--- Reading config options  ---*/
 
-  SetConfig_Options(0, 1);
+  SetConfig_Options();
 
   /*--- Parsing the config file  ---*/
 
   SetConfig_Parsing(case_filename);
+  
+  /*--- Set the default values for all of the options that weren't set ---*/
+      
+  SetDefault();
+  
+  /*--- Set number of zones --- */
+  
+  SetnZone();
 
   /*--- Configuration file postprocessing ---*/
 
@@ -117,6 +177,10 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
   /*--- Configuration file boundaries/markers setting ---*/
 
   SetMarkers(val_software);
+  
+  /*--- Print the header --- */
+  
+  SetHeader(val_software);
 
 }
 
@@ -140,6 +204,10 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
   /*--- Parsing the config file  ---*/
 
   runtime_file = SetRunTime_Parsing(case_filename);
+  
+  /*--- Set the default values for all of the options that weren't set ---*/
+      
+  SetDefault();
 
   /*--- Update original config file ---*/
 
@@ -161,7 +229,7 @@ void CConfig::SetMPICommunicator(SU2_MPI::Comm Communicator) {
 
 }
 
-unsigned short CConfig::GetnZone(string val_mesh_filename, unsigned short val_format, CConfig *config) {
+unsigned short CConfig::GetnZone(string val_mesh_filename, unsigned short val_format) {
 
   int nZone = 1; /* Default value if nothing is specified. */
 
@@ -528,15 +596,23 @@ void CConfig::SetPointersNull(void) {
 
   /*--- Moving mesh pointers ---*/
 
-  Kind_GridMovement   = NULL;    LocationStations   = NULL;
-  Motion_Origin_X     = NULL;    Motion_Origin_Y     = NULL;    Motion_Origin_Z     = NULL;
-  Translation_Rate_X  = NULL;    Translation_Rate_Y  = NULL;    Translation_Rate_Z  = NULL;
-  Rotation_Rate_X     = NULL;    Rotation_Rate_Y     = NULL;    Rotation_Rate_Z     = NULL;
-  Pitching_Omega_X    = NULL;    Pitching_Omega_Y    = NULL;    Pitching_Omega_Z    = NULL;
-  Pitching_Ampl_X     = NULL;    Pitching_Ampl_Y     = NULL;    Pitching_Ampl_Z     = NULL;
-  Pitching_Phase_X    = NULL;    Pitching_Phase_Y    = NULL;    Pitching_Phase_Z    = NULL;
-  Plunging_Omega_X    = NULL;    Plunging_Omega_Y    = NULL;    Plunging_Omega_Z    = NULL;
-  Plunging_Ampl_X     = NULL;    Plunging_Ampl_Y     = NULL;    Plunging_Ampl_Z     = NULL;
+  LocationStations   = NULL;
+  Motion_Origin     = NULL;   
+  Translation_Rate       = NULL;  
+  Rotation_Rate     = NULL;   
+  Pitching_Omega    = NULL;   
+  Pitching_Ampl     = NULL;    
+  Pitching_Phase    = NULL;    
+  Plunging_Omega    = NULL;   
+  Plunging_Ampl     = NULL; 
+  MarkerMotion_Origin     = NULL;   
+  MarkerTranslation_Rate       = NULL;  
+  MarkerRotation_Rate     = NULL;   
+  MarkerPitching_Omega    = NULL;   
+  MarkerPitching_Ampl     = NULL;    
+  MarkerPitching_Phase    = NULL;    
+  MarkerPlunging_Omega    = NULL;   
+  MarkerPlunging_Ampl     = NULL;    
   RefOriginMoment_X   = NULL;    RefOriginMoment_Y   = NULL;    RefOriginMoment_Z   = NULL;
   MoveMotion_Origin   = NULL;
   Periodic_Translate  = NULL;    Periodic_Rotation   = NULL;    Periodic_Center     = NULL;
@@ -596,7 +672,6 @@ void CConfig::SetPointersNull(void) {
   RelaxFactorAverage       = NULL;
   RelaxFactorFourier       = NULL;
   nSpan_iZones             = NULL;
-  FinalRotation_Rate_Z     = NULL;
   ExtraRelFacGiles         = NULL;
   Mixedout_Coeff           = NULL;
   RampRotatingFrame_Coeff  = NULL;
@@ -632,7 +707,6 @@ void CConfig::SetPointersNull(void) {
   nMarker_PerBound = 0;
   nPeriodic_Index  = 0;
 
-  Grid_Movement = false;
   Aeroelastic_Simulation = false;
   ZoneSpecific_Problem = false;
 
@@ -650,10 +724,8 @@ void CConfig::SetRunTime_Options(void) {
 
 }
 
-void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZone) {
+void CConfig::SetConfig_Options() {
   
-  nZone = val_nZone;
-  iZone = val_iZone;
 
   /*--- Allocate some default arrays needed for lists of doubles. ---*/
   
@@ -715,9 +787,10 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
 
   /*!\brief REGIME_TYPE \n  DESCRIPTION: Regime type \n OPTIONS: see \link Regime_Map \endlink \ingroup Config*/
   addEnumOption("REGIME_TYPE", Kind_Regime, Regime_Map, COMPRESSIBLE);
-  
   /*!\brief PHYSICAL_PROBLEM \n DESCRIPTION: Physical governing equations \n Options: see \link Solver_Map \endlink \n DEFAULT: NO_SOLVER \ingroup Config*/
   addEnumOption("PHYSICAL_PROBLEM", Kind_Solver, Solver_Map, NO_SOLVER);
+  /*!\brief MULTIZONE \n DESCRIPTION: Enable multizone mode \ingroup Config*/  
+  addBoolOption("MULTIZONE", Multizone_Problem, NO);
   /*!\brief PHYSICAL_PROBLEM_ZONEWISE \n DESCRIPTION: Physical governing equations for each zone \n Options: see \link Solver_Map \endlink \n DEFAULT: NO_SOLVER \ingroup Config*/
   addEnumListOption("PHYSICAL_PROBLEM_ZONEWISE", nZoneSpecified, Kind_Solver_PerZone, Solver_Map);
   /*!\brief PHYSICAL_PROBLEM \n DESCRIPTION: Physical governing equations \n Options: see \link Solver_Map \endlink \n DEFAULT: NO_SOLVER \ingroup Config*/
@@ -1701,62 +1774,47 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   /*!\par CONFIG_CATEGORY: Dynamic mesh definition \ingroup Config*/
   /*--- Options related to dynamic meshes ---*/
 
-  /* DESCRIPTION: Mesh motion for unsteady simulations */
-  addBoolOption("GRID_MOVEMENT", Grid_Movement, false);
   /* DESCRIPTION: Type of mesh motion */
-  addEnumListOption("GRID_MOVEMENT_KIND", nGridMovement, Kind_GridMovement, GridMovement_Map);
+  addEnumOption("GRID_MOVEMENT", Kind_GridMovement, GridMovement_Map, NO_MOVEMENT);
+  /* DESCRIPTION: Type of surface motion */
+  addEnumListOption("SURFACE_MOVEMENT",nKind_SurfaceMovement, Kind_SurfaceMovement, SurfaceMovement_Map);
   /* DESCRIPTION: Marker(s) of moving surfaces (MOVING_WALL or DEFORMING grid motion). */
   addStringListOption("MARKER_MOVING", nMarker_Moving, Marker_Moving);
   /* DESCRIPTION: Mach number (non-dimensional, based on the mesh velocity and freestream vals.) */
   addDoubleOption("MACH_MOTION", Mach_Motion, 0.0);
+  default_vel_inf[0] = 0.0; default_vel_inf[1] = 0.0; default_vel_inf[2] = 0.0;  
   /* DESCRIPTION: Coordinates of the rigid motion origin */
-  addDoubleListOption("MOTION_ORIGIN_X", nMotion_Origin_X, Motion_Origin_X);
-  /* DESCRIPTION: Coordinates of the rigid motion origin */
-  addDoubleListOption("MOTION_ORIGIN_Y", nMotion_Origin_Y, Motion_Origin_Y);
-  /* DESCRIPTION: Coordinates of the rigid motion origin */
-  addDoubleListOption("MOTION_ORIGIN_Z", nMotion_Origin_Z, Motion_Origin_Z);
-  /* DESCRIPTION: Translational velocity vector (m/s) in the x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("TRANSLATION_RATE_X", nTranslation_Rate_X, Translation_Rate_X);
+  addDoubleArrayOption("MOTION_ORIGIN", 3, Motion_Origin, default_vel_inf);
   /* DESCRIPTION: Translational velocity vector (m/s) in the x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("TRANSLATION_RATE_Y", nTranslation_Rate_Y, Translation_Rate_Y);
-  /* DESCRIPTION: Translational velocity vector (m/s) in the x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("TRANSLATION_RATE_Z", nTranslation_Rate_Z, Translation_Rate_Z);
-  /* DESCRIPTION: Angular velocity vector (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("ROTATION_RATE_X", nRotation_Rate_X, Rotation_Rate_X);
+  addDoubleArrayOption("TRANSLATION_RATE", 3, Translation_Rate, default_vel_inf); 
   /* DESCRIPTION: Angular velocity vector (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("ROTATION_RATE_Y", nRotation_Rate_Y, Rotation_Rate_Y);
-  /* DESCRIPTION: Angular velocity vector (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("ROTATION_RATE_Z", nRotation_Rate_Z, Rotation_Rate_Z);
-  /* DESCRIPTION: Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_OMEGA_X", nPitching_Omega_X, Pitching_Omega_X);
-  /* DESCRIPTION: Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_OMEGA_Y", nPitching_Omega_Y, Pitching_Omega_Y);
+  addDoubleArrayOption("ROTATION_RATE", 3, Rotation_Rate, default_vel_inf);
   /* DESCRIPTION: Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_OMEGA_Z", nPitching_Omega_Z, Pitching_Omega_Z);
-  /* DESCRIPTION: Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_AMPL_X", nPitching_Ampl_X, Pitching_Ampl_X);
-  /* DESCRIPTION: Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_AMPL_Y", nPitching_Ampl_Y, Pitching_Ampl_Y);
+  addDoubleArrayOption("PITCHING_OMEGA", 3, Pitching_Omega, default_vel_inf);
   /* DESCRIPTION: Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_AMPL_Z", nPitching_Ampl_Z, Pitching_Ampl_Z);
+  addDoubleArrayOption("PITCHING_AMPL", 3, Pitching_Ampl, default_vel_inf); 
   /* DESCRIPTION: Pitching phase offset (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_PHASE_X", nPitching_Phase_X, Pitching_Phase_X);
-  /* DESCRIPTION: Pitching phase offset (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_PHASE_Y", nPitching_Phase_Y, Pitching_Phase_Y);
-  /* DESCRIPTION: Pitching phase offset (degrees) about x, y, & z axes (RIGID_MOTION only) */
-  addDoubleListOption("PITCHING_PHASE_Z", nPitching_Phase_Z, Pitching_Phase_Z);
-  /* DESCRIPTION: Plunging angular freq. (rad/s) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_OMEGA_X", nPlunging_Omega_X, Plunging_Omega_X);
-  /* DESCRIPTION: Plunging angular freq. (rad/s) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_OMEGA_Y", nPlunging_Omega_Y, Plunging_Omega_Y);
+  addDoubleArrayOption("PITCHING_PHASE", 3, Pitching_Phase, default_vel_inf);
   /* DESCRIPTION: Plunging angular freq. (rad/s) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_OMEGA_Z", nPlunging_Omega_Z, Plunging_Omega_Z);
+  addDoubleArrayOption("PLUNGING_OMEGA", 3, Plunging_Omega, default_vel_inf);
   /* DESCRIPTION: Plunging amplitude (m) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_AMPL_X", nPlunging_Ampl_X, Plunging_Ampl_X);
-  /* DESCRIPTION: Plunging amplitude (m) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_AMPL_Y", nPlunging_Ampl_Y, Plunging_Ampl_Y);
-  /* DESCRIPTION: Plunging amplitude (m) in x, y, & z directions (RIGID_MOTION only) */
-  addDoubleListOption("PLUNGING_AMPL_Z", nPlunging_Ampl_Z, Plunging_Ampl_Z);
+  addDoubleArrayOption("PLUNGING_AMPL", 3, Plunging_Ampl, default_vel_inf);
+  /* DESCRIPTION: Coordinates of the rigid motion origin */
+  addDoubleListOption("SURFACE_MOTION_ORIGIN", nMarkerMotion_Origin, MarkerMotion_Origin);
+  /* DESCRIPTION: Translational velocity vector (m/s) in the x, y, & z directions (DEFORMING only) */
+  addDoubleListOption("SURFACE_TRANSLATION_RATE", nMarkerTranslation, MarkerTranslation_Rate); 
+  /* DESCRIPTION: Angular velocity vector (rad/s) about x, y, & z axes (DEFORMING only) */
+  addDoubleListOption("SURFACE_ROTATION_RATE", nMarkerRotation_Rate, MarkerRotation_Rate);
+  /* DESCRIPTION: Pitching angular freq. (rad/s) about x, y, & z axes (DEFORMING only) */
+  addDoubleListOption("SURFACE_PITCHING_OMEGA", nMarkerPitching_Omega, MarkerPitching_Omega);
+  /* DESCRIPTION: Pitching amplitude (degrees) about x, y, & z axes (DEFORMING only) */
+  addDoubleListOption("SURFACE_PITCHING_AMPL", nMarkerPitching_Ampl, MarkerPitching_Ampl); 
+  /* DESCRIPTION: Pitching phase offset (degrees) about x, y, & z axes (DEFORMING only) */
+  addDoubleListOption("SURFACE_PITCHING_PHASE", nMarkerPitching_Phase, MarkerPitching_Phase);
+  /* DESCRIPTION: Plunging angular freq. (rad/s) in x, y, & z directions (DEFORMING only) */
+  addDoubleListOption("SURFACE_PLUNGING_OMEGA", nMarkerPlunging_Omega, MarkerPlunging_Omega);
+  /* DESCRIPTION: Plunging amplitude (m) in x, y, & z directions (DEFORMING only) */
+  addDoubleListOption("SURFACE_PLUNGING_AMPL", nMarkerPlunging_Ampl, MarkerPlunging_Ampl);
   /* DESCRIPTION: Value to move motion origins (1 or 0) */
   addUShortListOption("MOVE_MOTION_ORIGIN", nMoveMotion_Origin, MoveMotion_Origin);
 
@@ -2476,14 +2534,30 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
     SU2_MPI::Error(errorString, CURRENT_FUNCTION);
   }
 
+  case_file.close();
+  
+}
+
+void CConfig::SetDefaultFromConfig(CConfig *config){
+  
+  map<string, bool>::iterator iter = all_options.begin(), curr_iter;
+  
+  while (iter != all_options.end()){
+    curr_iter = iter++;   
+    if (config->option_map[curr_iter->first]->GetValue().size() > 0){
+      option_map[curr_iter->first]->SetValue(config->option_map[curr_iter->first]->GetValue());
+    }
+  }
+}
+
+void CConfig::SetDefault(){
+  
   /*--- Set the default values for all of the options that weren't set ---*/
       
   for (map<string, bool>::iterator iter = all_options.begin(); iter != all_options.end(); ++iter) {
-    option_map[iter->first]->SetDefault();
+    if (option_map[iter->first]->GetValue().size() == 0)
+      option_map[iter->first]->SetDefault();
   }
-
-  case_file.close();
-  
 }
 
 bool CConfig::SetRunTime_Parsing(char case_filename[MAX_STRING_SIZE]) {
@@ -2559,6 +2633,12 @@ bool CConfig::SetRunTime_Parsing(char case_filename[MAX_STRING_SIZE]) {
     }
   }
   
+  /*--- Set the default values for all of the options that weren't set ---*/
+      
+  for (map<string, bool>::iterator iter = all_options.begin(); iter != all_options.end(); ++iter) {
+    option_map[iter->first]->SetDefault();
+  }
+  
   /*--- See if there were any errors parsing the runtime file ---*/
   
   if (errorString.size() != 0) {
@@ -2571,6 +2651,116 @@ bool CConfig::SetRunTime_Parsing(char case_filename[MAX_STRING_SIZE]) {
   
 }
 
+void CConfig::SetHeader(unsigned short val_software){
+  /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
+   the two lines below that use the dt variable. ---*/
+  //time_t now = time(0);
+  //string dt = ctime(&now); dt[24] = '.';
+  if (iZone == 0){
+    cout << endl << "-------------------------------------------------------------------------" << endl;
+    cout << "|    ___ _   _ ___                                                      |" << endl;
+    cout << "|   / __| | | |_  )   Release 6.2.0  \"Falcon\"                           |" << endl;
+    cout << "|   \\__ \\ |_| |/ /                                                      |" << endl;
+    switch (val_software) {
+    case SU2_CFD: cout << "|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << endl; break;
+    case SU2_DEF: cout << "|   |___/\\___//___|   Suite (Mesh Deformation Code)                     |" << endl; break;
+    case SU2_DOT: cout << "|   |___/\\___//___|   Suite (Gradient Projection Code)                  |" << endl; break;
+    case SU2_MSH: cout << "|   |___/\\___//___|   Suite (Mesh Adaptation Code)                      |" << endl; break;
+    case SU2_GEO: cout << "|   |___/\\___//___|   Suite (Geometry Definition Code)                  |" << endl; break;
+    case SU2_SOL: cout << "|   |___/\\___//___|   Suite (Solution Exporting Code)                   |" << endl; break;
+    }
+    
+    cout << "|                                                                       |" << endl;
+    //cout << "|   Local date and time: " << dt << "                      |" << endl;
+    cout <<"-------------------------------------------------------------------------" << endl;
+    cout << "| The current SU2 release has been coordinated by the                   |" << endl;
+    cout << "| SU2 International Developers Society <www.su2devsociety.org>          |" << endl;
+    cout << "| with selected contributions from the open-source community.           |" << endl;
+    cout <<"-------------------------------------------------------------------------" << endl;
+    cout << "| The main research teams contributing to the current release are:      |" << endl;
+    cout << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << endl;
+    cout << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << endl;
+    cout << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << endl;
+    cout << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << endl;
+    cout << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << endl;
+    cout << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << endl;
+    cout << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << endl;
+    cout << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << endl;
+    cout <<"-------------------------------------------------------------------------" << endl;
+    cout << "| Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,       |" << endl;
+    cout << "|                      Tim Albring, and the SU2 contributors.           |" << endl;
+    cout << "|                                                                       |" << endl;
+    cout << "| SU2 is free software; you can redistribute it and/or                  |" << endl;
+    cout << "| modify it under the terms of the GNU Lesser General Public            |" << endl;
+    cout << "| License as published by the Free Software Foundation; either          |" << endl;
+    cout << "| version 2.1 of the License, or (at your option) any later version.    |" << endl;
+    cout << "|                                                                       |" << endl;
+    cout << "| SU2 is distributed in the hope that it will be useful,                |" << endl;
+    cout << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << endl;
+    cout << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << endl;
+    cout << "| Lesser General Public License for more details.                       |" << endl;
+    cout << "|                                                                       |" << endl;
+    cout << "| You should have received a copy of the GNU Lesser General Public      |" << endl;
+    cout << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << endl;
+    cout <<"-------------------------------------------------------------------------" << endl;
+  }
+  
+}
+
+void CConfig::SetnZone(){
+  
+  /*--- Just as a clarification --- */
+  
+  if (Multizone_Problem == NO && Kind_Solver != MULTIPHYSICS){
+    nZone = 1;
+  }
+  
+  if (Kind_Solver == MULTIPHYSICS){
+    Multizone_Problem = YES;
+    if (nConfig_Files == 0){
+      SU2_MPI::Error("CONFIG_LIST must be provided if PHYSICAL_PROBLEM=MULTIPHYSICS", CURRENT_FUNCTION);
+    }
+  }
+  
+  if (Multizone_Problem == YES){
+    
+    if (Multizone_Mesh){
+      
+      /*--- Get the number of zones from the mesh file --- */
+      
+      nZone = GetnZone(Mesh_FileName, Mesh_FileFormat);
+      
+      /*--- If config list is set, make sure number matches number of zones in mesh file --- */
+      
+      if (nConfig_Files != 0 && (nZone != nConfig_Files)){
+        SU2_MPI::Error("Number of CONFIG_LIST must match number of zones in mesh file.", CURRENT_FUNCTION);
+      }
+    } else {
+      
+      /*--- Number of zones is determined from the number of config files provided --- */
+      
+      if (nConfig_Files == 0){
+        SU2_MPI::Error("If MULTIZONE_MESH is set to YES, you must provide a list of config files using CONFIG_LIST option", CURRENT_FUNCTION);
+      }
+      nZone = nConfig_Files;
+      
+    }
+    
+    /*--- Check if subconfig files exist --- */
+    
+    if (nConfig_Files != 0){
+      for (unsigned short iConfig = 0; iConfig < nConfig_Files; iConfig++){
+        ifstream f(Config_Filenames[iConfig].c_str());
+        if (!f.good()){
+          SU2_MPI::Error("Config file " + Config_Filenames[iConfig] + " defined in CONFIG_FILES does not exist", CURRENT_FUNCTION);
+        }
+      }
+    }
+    
+  }
+  
+}
+
 void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_izone, unsigned short val_nDim) {
   
   unsigned short iZone, iCFL, iMarker;
@@ -2581,6 +2771,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
                     (Kind_FluidModel == CONSTANT_DENSITY));
   bool standard_air = ((Kind_FluidModel == STANDARD_AIR));
   
+  if (nZone > 1){
+    Multizone_Problem = YES;
+  }
+  
 #ifndef HAVE_TECIO
   if (Output_FileFormat == TECPLOT_BINARY) {
     cout << "Tecplot binary file requested but SU2 was built without TecIO support." << "\n";
@@ -2608,10 +2802,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   /*--- Fixed CM mode requires a static movement of the grid ---*/
   
   if (Fixed_CM_Mode) {
-    Grid_Movement= true;
-  	 nGridMovement = 1;
-  	 Kind_GridMovement = new unsigned short[nGridMovement];
-  	 Kind_GridMovement[0] = MOVING_HTP;
+    Kind_GridMovement = MOVING_HTP;
   }
 
   /*--- Initialize the AoA and Sideslip variables for the incompressible
@@ -2803,13 +2994,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
   else { FSI_Problem = false; }
 
-  if (Kind_Solver == MULTIZONE) {
-    Multizone_Problem = true;
-  }
-  else{
-    Multizone_Problem = false;
-  }
-
 
   if ((Kind_Solver == HEAT_EQUATION_FVM) || (Kind_Solver == DISC_ADJ_HEAT)) {
     Linear_Solver_Iter = Linear_Solver_Iter_Heat;
@@ -2972,13 +3156,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
   /*--- Set number of TurboPerformance markers ---*/
   if(RampRotatingFrame && !DiscreteAdjoint){
-    FinalRotation_Rate_Z = new su2double[nZone];
-    for(iZone=0; iZone <nZone; iZone ++){
-      FinalRotation_Rate_Z[iZone] = Rotation_Rate_Z[iZone];
-      if(abs(FinalRotation_Rate_Z[iZone]) > 0.0){
-        Rotation_Rate_Z[iZone] = RampRotatingFrame_Coeff[0];
+      FinalRotation_Rate_Z = Rotation_Rate[3];
+      if(abs(FinalRotation_Rate_Z) > 0.0){
+        Rotation_Rate[3] = RampRotatingFrame_Coeff[0];
       }
-    }
+    
   }
 
   if(RampOutletPressure && !DiscreteAdjoint){
@@ -3001,44 +3183,40 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     ExtraRelFacGiles[1] = 0.5;
   }
 
+  if (nKind_SurfaceMovement != nMarker_Moving){
+    SU2_MPI::Error("Number of KIND_SURFACE_MOVEMENT must match number of MARKER_MOVING", CURRENT_FUNCTION);
+  }
 
-  /*--- Set grid movement kind to NO_MOVEMENT if not specified, which means
-   that we also set the Grid_Movement flag to false. We initialize to the
-   number of zones here, because we are guaranteed to at least have one. ---*/
-  
-  if (Kind_GridMovement == NULL) {
-    Kind_GridMovement = new unsigned short[nZone];
-    for (unsigned short iZone = 0; iZone < nZone; iZone++ )
-      Kind_GridMovement[iZone] = NO_MOVEMENT;
-    if (Grid_Movement == true) {
-      SU2_MPI::Error("GRID_MOVEMENT = YES but no type provided in GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
+  if (Time_Domain && Time_Step <= 0.0){
+    SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
-  /*--- If only one Grid_Movement kind is specified, it is assumed it's the same for all zones. ---*/
-  /*--- TODO: Kind_Grid_Movement should not be an array but rather only one short. ---*/
-  /*--- The distinction comes as each zone has one config container. ---*/
-  if (nGridMovement != nZone){
-    for (unsigned short iZone = 0; iZone < nZone; iZone++ )
-      Kind_GridMovement[iZone] = Kind_GridMovement[ZONE_0];
+  if (Time_Domain && Unsteady_Simulation == STEADY){
+    SU2_MPI::Error("UNSTEADY_SIMULATION must be different from STEADY (default) if TIME_DOMAIN=YES", CURRENT_FUNCTION);
   }
 
   /*--- If we're solving a purely steady problem with no prescribed grid
    movement (both rotating frame and moving walls can be steady), make sure that
    there is no grid motion ---*/
   
-  if ((Kind_SU2 == SU2_CFD || Kind_SU2 == SU2_SOL) &&
-      (Unsteady_Simulation == STEADY) &&
-      ((Kind_GridMovement[ZONE_0] != MOVING_WALL) &&
-       (Kind_GridMovement[ZONE_0] != ROTATING_FRAME) &&
-       (Kind_GridMovement[ZONE_0] != STEADY_TRANSLATION) &&
-       (Kind_GridMovement[ZONE_0] != FLUID_STRUCTURE)))
-    Grid_Movement = false;
-  
-  if ((Kind_SU2 == SU2_CFD || Kind_SU2 == SU2_SOL) &&
-      (Unsteady_Simulation == STEADY) &&
-      ((Kind_GridMovement[ZONE_0] == MOVING_HTP)))
-    Grid_Movement = true;
+  if (GetGrid_Movement()){
+    if ((Kind_SU2 == SU2_CFD || Kind_SU2 == SU2_SOL) &&
+        (Unsteady_Simulation == STEADY && !Time_Domain)){
+      
+      if((Kind_GridMovement != ROTATING_FRAME) &&
+         (Kind_GridMovement != STEADY_TRANSLATION) &&
+         (Kind_GridMovement != FLUID_STRUCTURE) && 
+         (Kind_GridMovement != FLUID_STRUCTURE_STATIC) &&
+         (Kind_GridMovement != NONE)){
+        SU2_MPI::Error("Unsupported kind of grid movement for steady state problems.", CURRENT_FUNCTION);      
+      }
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        if (Kind_SurfaceMovement[iMarker] != MOVING_WALL){
+          SU2_MPI::Error("Unsupported kind of surface movement for steady state problems.", CURRENT_FUNCTION);                
+        }
+      }  
+    } 
+  }
 
   /*--- The Line Search should be applied only in the deformation stage. ---*/
 
@@ -3049,302 +3227,128 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   /*--- If it is not specified, set the mesh motion mach number
    equal to the freestream value. ---*/
   
-  if (Grid_Movement && Mach_Motion == 0.0)
+  if (GetGrid_Movement() && Mach_Motion == 0.0)
     Mach_Motion = Mach;
   
   /*--- Set the boolean flag if we are in a rotating frame (source term). ---*/
   
-  if (Grid_Movement && Kind_GridMovement[ZONE_0] == ROTATING_FRAME)
+  if (Kind_GridMovement == ROTATING_FRAME)
     Rotating_Frame = true;
   else
     Rotating_Frame = false;
   
-  /*--- Check the number of moving markers against the number of grid movement
-   types provided (should be equal, except that rigid motion and rotating frame
-   do not depend on surface specification). ---*/
-  
-  if (Grid_Movement &&
-      (Kind_GridMovement[ZONE_0] != RIGID_MOTION) &&
-      (Kind_GridMovement[ZONE_0] != ROTATING_FRAME) &&
-      (Kind_GridMovement[ZONE_0] != MOVING_HTP) &&
-      (Kind_GridMovement[ZONE_0] != STEADY_TRANSLATION) &&
-      (Kind_GridMovement[ZONE_0] != FLUID_STRUCTURE) &&
-      (Kind_GridMovement[ZONE_0] != GUST) &&
-      (nGridMovement != nMarker_Moving)) {
-    SU2_MPI::Error("Number of GRID_MOVEMENT_KIND must match number of MARKER_MOVING!!", CURRENT_FUNCTION);
-  }
-  
   /*--- In case the grid movement parameters have not been declared in the
    config file, set them equal to zero for safety. Also check to make sure
    that for each option, a value has been declared for each moving marker. ---*/
   
-  unsigned short nMoving;
-  if (nGridMovement > nZone) nMoving = nGridMovement;
-  else nMoving = nZone;
-
-  /*--- Motion Origin: ---*/
-  
-  if (Motion_Origin_X == NULL) {
-    Motion_Origin_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Motion_Origin_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nMotion_Origin_X != nGridMovement)) {
-      SU2_MPI::Error("Length of MOTION_ORIGIN_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  if (Motion_Origin_Y == NULL) {
-    Motion_Origin_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Motion_Origin_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nMotion_Origin_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of MOTION_ORIGIN_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  if (Motion_Origin_Z == NULL) {
-    Motion_Origin_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Motion_Origin_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nMotion_Origin_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of MOTION_ORIGIN_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  if (MoveMotion_Origin == NULL) {
-    MoveMotion_Origin = new unsigned short[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      MoveMotion_Origin[iZone] = 0;
-  } else {
-    if (Grid_Movement && (nMoveMotion_Origin != nGridMovement)) {
-      SU2_MPI::Error("Length of MOVE_MOTION_ORIGIN must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  /*--- Translation: ---*/
-  
-  if (Translation_Rate_X == NULL) {
-    Translation_Rate_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Translation_Rate_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nTranslation_Rate_X != nGridMovement)) {
-      SU2_MPI::Error("Length of TRANSLATION_RATE_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  if (Translation_Rate_Y == NULL) {
-    Translation_Rate_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Translation_Rate_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nTranslation_Rate_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of TRANSLATION_RATE_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  if (Translation_Rate_Z == NULL) {
-    Translation_Rate_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Translation_Rate_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nTranslation_Rate_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of TRANSLATION_RATE_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
-    }
-  }
-  
-  /*--- Rotation: ---*/
-  
-  if (Rotation_Rate_X == NULL) {
-    Rotation_Rate_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Rotation_Rate_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nRotation_Rate_X != nGridMovement)) {
-      SU2_MPI::Error("Length of ROTATION_RATE_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+  if (nMarker_Moving > 0){
+    unsigned short iDim;
+    if (nMarkerMotion_Origin == 0){
+      nMarkerMotion_Origin = 3*nMarker_Moving;
+      MarkerMotion_Origin = new su2double[nMarkerMotion_Origin];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerMotion_Origin[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  if (Rotation_Rate_Y == NULL) {
-    Rotation_Rate_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Rotation_Rate_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nRotation_Rate_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of ROTATION_RATE_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerMotion_Origin/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_MOTION_ORIGIN must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Rotation_Rate_Z == NULL) {
-    Rotation_Rate_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Rotation_Rate_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nRotation_Rate_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of ROTATION_RATE_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerTranslation == 0){
+      nMarkerTranslation = 3*nMarker_Moving;
+      MarkerTranslation_Rate = new su2double[nMarkerTranslation];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerTranslation_Rate[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  /*--- Pitching: ---*/
-  
-  if (Pitching_Omega_X == NULL) {
-    Pitching_Omega_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Omega_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Omega_X != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_OMEGA_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerTranslation/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_TRANSLATION_RATE must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Pitching_Omega_Y == NULL) {
-    Pitching_Omega_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Omega_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Omega_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_OMEGA_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerRotation_Rate == 0){
+      nMarkerRotation_Rate = 3*nMarker_Moving;
+      MarkerRotation_Rate = new su2double[nMarkerRotation_Rate];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerRotation_Rate[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  if (Pitching_Omega_Z == NULL) {
-    Pitching_Omega_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Omega_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Omega_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_OMEGA_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerRotation_Rate/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_ROTATION_RATE must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  /*--- Pitching Amplitude: ---*/
-  
-  if (Pitching_Ampl_X == NULL) {
-    Pitching_Ampl_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Ampl_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Ampl_X != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_AMPL_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPlunging_Ampl == 0){
+      nMarkerPlunging_Ampl = 3*nMarker_Moving;
+      MarkerPlunging_Ampl = new su2double[nMarkerPlunging_Ampl];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerPlunging_Ampl[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  if (Pitching_Ampl_Y == NULL) {
-    Pitching_Ampl_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Ampl_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Ampl_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_AMPL_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPlunging_Ampl/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_PLUNGING_AMPL must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Pitching_Ampl_Z == NULL) {
-    Pitching_Ampl_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Ampl_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Ampl_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_AMPL_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPlunging_Omega == 0){
+      nMarkerPlunging_Omega = 3*nMarker_Moving;
+      MarkerPlunging_Omega = new su2double[nMarkerPlunging_Omega];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerPlunging_Omega[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  /*--- Pitching Phase: ---*/
-  
-  if (Pitching_Phase_X == NULL) {
-    Pitching_Phase_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Phase_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Phase_X != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_PHASE_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPlunging_Omega/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_PLUNGING_OMEGA must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Pitching_Phase_Y == NULL) {
-    Pitching_Phase_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Phase_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Phase_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_PHASE_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Ampl == 0){
+      nMarkerPitching_Ampl = 3*nMarker_Moving;
+      MarkerPitching_Ampl = new su2double[nMarkerPitching_Ampl];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerPitching_Ampl[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  if (Pitching_Phase_Z == NULL) {
-    Pitching_Phase_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Pitching_Phase_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPitching_Phase_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of PITCHING_PHASE_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Ampl/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_PITCHING_AMPL must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  /*--- Plunging: ---*/
-  
-  if (Plunging_Omega_X == NULL) {
-    Plunging_Omega_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Omega_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Omega_X != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_PHASE_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Omega == 0){
+      nMarkerPitching_Omega = 3*nMarker_Moving;
+      MarkerPitching_Omega = new su2double[nMarkerPitching_Omega];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerPitching_Omega[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  if (Plunging_Omega_Y == NULL) {
-    Plunging_Omega_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Omega_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Omega_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_PHASE_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Omega/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_PITCHING_OMEGA must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Plunging_Omega_Z == NULL) {
-    Plunging_Omega_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Omega_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Omega_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_PHASE_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Phase == 0){
+      nMarkerPitching_Phase = 3*nMarker_Moving;
+      MarkerPitching_Phase = new su2double[nMarkerPitching_Phase];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+        for (iDim = 0; iDim < 3; iDim++){
+          MarkerPitching_Phase[3*iMarker+iDim] = 0.0;
+        }
+      }
     }
-  }
-  
-  /*--- Plunging Amplitude: ---*/
-  
-  if (Plunging_Ampl_X == NULL) {
-    Plunging_Ampl_X = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Ampl_X[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Ampl_X != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_AMPL_X must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMarkerPitching_Phase/3 != nMarker_Moving){
+      SU2_MPI::Error("Number of SURFACE_PITCHING_PHASE must be three times the number of MARKER_MOVING, (x,y,z) per marker.", CURRENT_FUNCTION);
     }
-  }
-  
-  if (Plunging_Ampl_Y == NULL) {
-    Plunging_Ampl_Y = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Ampl_Y[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Ampl_Y != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_AMPL_Y must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    
+    if (nMoveMotion_Origin == 0){
+      nMoveMotion_Origin = nMarker_Moving;
+      MoveMotion_Origin = new unsigned short[nMoveMotion_Origin];
+      for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+          MoveMotion_Origin[iMarker] = NO;
+      }
     }
-  }
-  
-  if (Plunging_Ampl_Z == NULL) {
-    Plunging_Ampl_Z = new su2double[nMoving];
-    for (iZone = 0; iZone < nMoving; iZone++ )
-      Plunging_Ampl_Z[iZone] = 0.0;
-  } else {
-    if (Grid_Movement && (nPlunging_Ampl_Z != nGridMovement)) {
-      SU2_MPI::Error("Length of PLUNGING_AMPL_Z must match GRID_MOVEMENT_KIND!!", CURRENT_FUNCTION);
+    if (nMoveMotion_Origin != nMarker_Moving){
+      SU2_MPI::Error("Number of MOVE_MOTION_ORIGIN must match number of MARKER_MOVING.", CURRENT_FUNCTION);
     }
   }
   
@@ -3502,13 +3506,13 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   /*--- Set the boolean flag if we are carrying out an aeroelastic simulation. ---*/
   
-  if (Grid_Movement && (Kind_GridMovement[ZONE_0] == AEROELASTIC || Kind_GridMovement[ZONE_0] == AEROELASTIC_RIGID_MOTION)) Aeroelastic_Simulation = true;
+  if (GetGrid_Movement() && (GetSurface_Movement(AEROELASTIC) || GetSurface_Movement(AEROELASTIC_RIGID_MOTION))) Aeroelastic_Simulation = true;
   else Aeroelastic_Simulation = false;
   
   /*--- Initializing the size for the solutions of the Aeroelastic problem. ---*/
   
   
-  if (Grid_Movement && Aeroelastic_Simulation) {
+  if (GetGrid_Movement() && Aeroelastic_Simulation) {
     Aeroelastic_np1.resize(nMarker_Monitoring);
     Aeroelastic_n.resize(nMarker_Monitoring);
     Aeroelastic_n1.resize(nMarker_Monitoring);
@@ -3531,7 +3535,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   /*--- Allocate memory for the plunge and pitch and initialized them to zero ---*/
   
-  if (Grid_Movement && Aeroelastic_Simulation) {
+  if (GetGrid_Movement() && Aeroelastic_Simulation) {
     Aeroelastic_pitch = new su2double[nMarker_Monitoring];
     Aeroelastic_plunge = new su2double[nMarker_Monitoring];
     for (iMarker = 0; iMarker < nMarker_Monitoring; iMarker++ ) {
@@ -3544,12 +3548,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
   if (FSI_Problem) {
     if ((Dynamic_Analysis == STATIC) && (Unsteady_Simulation == STEADY)) {
-      Kind_GridMovement[val_izone] = FLUID_STRUCTURE_STATIC;
-      Grid_Movement = false;
+      Kind_GridMovement = FLUID_STRUCTURE_STATIC;
     }
     else{
-      Kind_GridMovement[val_izone] = FLUID_STRUCTURE;
-      Grid_Movement = true;
+      Kind_GridMovement = FLUID_STRUCTURE;
     }
   }
   
@@ -3895,11 +3897,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       RefOriginMoment_Y[iMarker] = RefOriginMoment_Y[iMarker]/12.0;
       RefOriginMoment_Z[iMarker] = RefOriginMoment_Z[iMarker]/12.0;
     }
-    
-    for (iMarker = 0; iMarker < nGridMovement; iMarker++) {
-      Motion_Origin_X[iMarker] = Motion_Origin_X[iMarker]/12.0;
-      Motion_Origin_Y[iMarker] = Motion_Origin_Y[iMarker]/12.0;
-      Motion_Origin_Z[iMarker] = Motion_Origin_Z[iMarker]/12.0;
+   
+    for (iMarker = 0; iMarker < nMarker_Moving; iMarker++){
+      for (unsigned short iDim = 0; iDim < 3; iDim++){
+        MarkerMotion_Origin[3*iMarker+iDim] /= 12.0;
+      }
     }
     
     RefLength = RefLength/12.0;
@@ -4002,7 +4004,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
       Restart_Flow = false;
 
-      if (Grid_Movement) {
+      if (GetGrid_Movement()) {
         SU2_MPI::Error("Dynamic mesh movement currently not supported for the discrete adjoint solver.", CURRENT_FUNCTION);
       }
 
@@ -4224,7 +4226,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
   /*--- Grid motion is not yet supported with the incompressible solver. ---*/
 
-  if ((Kind_Regime == INCOMPRESSIBLE) && (Grid_Movement)) {
+  if ((Kind_Regime == INCOMPRESSIBLE) && (GetGrid_Movement())) {
     SU2_MPI::Error("Support for grid movement not yet implemented for incompressible flows.", CURRENT_FUNCTION);
   }
 
@@ -4335,7 +4337,7 @@ void CConfig::SetMarkers(unsigned short val_software) {
   nMarker_Supersonic_Inlet + nMarker_Supersonic_Outlet + nMarker_Displacement + nMarker_Load +
   nMarker_FlowLoad + nMarker_Custom + nMarker_Damper +
   nMarker_Clamped + nMarker_Load_Sine + nMarker_Load_Dir + nMarker_Disp_Dir +
-  nMarker_ActDiskInlet + nMarker_ActDiskOutlet;
+  nMarker_ActDiskInlet + nMarker_ActDiskOutlet + nMarker_ZoneInterface;
   
   /*--- Add the possible send/receive domains ---*/
 
@@ -4921,59 +4923,8 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
   
   bool fea = ((Kind_Solver == FEM_ELASTICITY) || (Kind_Solver == DISC_ADJ_FEM));
   
-  /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
-   the two lines below that use the dt variable. ---*/
-  //time_t now = time(0);
-  //string dt = ctime(&now); dt[24] = '.';
-
-  cout << endl << "-------------------------------------------------------------------------" << endl;
-  cout << "|    ___ _   _ ___                                                      |" << endl;
-  cout << "|   / __| | | |_  )   Release 6.2.0  \"Falcon\"                           |" << endl;
-  cout << "|   \\__ \\ |_| |/ /                                                      |" << endl;
-  switch (val_software) {
-    case SU2_CFD: cout << "|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << endl; break;
-    case SU2_DEF: cout << "|   |___/\\___//___|   Suite (Mesh Deformation Code)                     |" << endl; break;
-    case SU2_DOT: cout << "|   |___/\\___//___|   Suite (Gradient Projection Code)                  |" << endl; break;
-    case SU2_MSH: cout << "|   |___/\\___//___|   Suite (Mesh Adaptation Code)                      |" << endl; break;
-    case SU2_GEO: cout << "|   |___/\\___//___|   Suite (Geometry Definition Code)                  |" << endl; break;
-    case SU2_SOL: cout << "|   |___/\\___//___|   Suite (Solution Exporting Code)                   |" << endl; break;
-  }
-
-  cout << "|                                                                       |" << endl;
-  //cout << "|   Local date and time: " << dt << "                      |" << endl;
-  cout <<"-------------------------------------------------------------------------" << endl;
-  cout << "| The current SU2 release has been coordinated by the                   |" << endl;
-  cout << "| SU2 International Developers Society <www.su2devsociety.org>          |" << endl;
-  cout << "| with selected contributions from the open-source community.           |" << endl;
-  cout <<"-------------------------------------------------------------------------" << endl;
-  cout << "| The main research teams contributing to the current release are:      |" << endl;
-  cout << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << endl;
-  cout << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << endl;
-  cout << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << endl;
-  cout << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << endl;
-  cout << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << endl;
-  cout << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << endl;
-  cout << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << endl;
-  cout << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << endl;
-  cout <<"-------------------------------------------------------------------------" << endl;
-  cout << "| Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,       |" << endl;
-  cout << "|                      Tim Albring, and the SU2 contributors.           |" << endl;
-  cout << "|                                                                       |" << endl;
-  cout << "| SU2 is free software; you can redistribute it and/or                  |" << endl;
-  cout << "| modify it under the terms of the GNU Lesser General Public            |" << endl;
-  cout << "| License as published by the Free Software Foundation; either          |" << endl;
-  cout << "| version 2.1 of the License, or (at your option) any later version.    |" << endl;
-  cout << "|                                                                       |" << endl;
-  cout << "| SU2 is distributed in the hope that it will be useful,                |" << endl;
-  cout << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << endl;
-  cout << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << endl;
-  cout << "| Lesser General Public License for more details.                       |" << endl;
-  cout << "|                                                                       |" << endl;
-  cout << "| You should have received a copy of the GNU Lesser General Public      |" << endl;
-  cout << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << endl;
-  cout <<"-------------------------------------------------------------------------" << endl;
-
-  cout << endl <<"------------------------ Physical Case Definition -----------------------" << endl;
+ 
+  cout << endl <<"----------------- Physical Case Definition ( Zone "  << iZone << " ) -------------------" << endl;
   if (val_software == SU2_CFD) {
 	if (FSI_Problem) {
 	   cout << "Fluid-Structure Interaction." << endl;
@@ -5089,19 +5040,15 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       cout <<"The near-field is situated at "<<EA_IntLimit[2]<<"."<< endl;
     }
 
-    if (Grid_Movement) {
+    if (GetGrid_Movement()) {
       cout << "Performing a dynamic mesh simulation: ";
-      switch (Kind_GridMovement[ZONE_0]) {
-        case NO_MOVEMENT:     cout << "no movement." << endl; break;
-        case DEFORMING:       cout << "deforming mesh motion." << endl; break;
+      switch (Kind_GridMovement) {
+        case NO_MOVEMENT:     cout << "no direct movement." << endl; break;
         case RIGID_MOTION:    cout << "rigid mesh motion." << endl; break;
-        case MOVING_WALL:     cout << "moving walls." << endl; break;
         case MOVING_HTP:      cout << "HTP moving." << endl; break;
         case ROTATING_FRAME:  cout << "rotating reference frame." << endl; break;
-        case AEROELASTIC:     cout << "aeroelastic motion." << endl; break;
         case FLUID_STRUCTURE: cout << "fluid-structure motion." << endl; break;
         case EXTERNAL:        cout << "externally prescribed motion." << endl; break;
-        case AEROELASTIC_RIGID_MOTION:  cout << "rigid mesh motion plus aeroelastic motion." << endl; break;
       }
     }
 
@@ -5234,7 +5181,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       cout<< endl;
     }
 
-    if ((Kind_GridMovement[ZONE_0] == DEFORMING) || (Kind_GridMovement[ZONE_0] == MOVING_WALL) || (Kind_GridMovement[ZONE_0] == FLUID_STRUCTURE)) {
+    if (nMarker_Moving != 0) {
       cout << "Surface(s) in motion: ";
       for (iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++) {
         cout << Marker_Moving[iMarker_Moving];
@@ -5286,14 +5233,14 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 	}
 
 	if (val_software == SU2_DEF) {
-		cout << endl <<"---------------------- Grid deformation parameters ----------------------" << endl;
+		cout << endl <<"---------------- Grid deformation parameters ( Zone "  << iZone << " )  ----------------" << endl;
 		cout << "Grid deformation using a linear elasticity method." << endl;
 
     if (Hold_GridFixed == YES) cout << "Hold some regions of the mesh fixed (hardcode implementation)." << endl;
   }
 
   if (val_software == SU2_DOT) {
-  cout << endl <<"-------------------- Surface deformation parameters ---------------------" << endl;
+  cout << endl <<"-------------- Surface deformation parameters ( Zone "  << iZone << " ) ----------------" << endl;
   }
 
   if (((val_software == SU2_DEF) || (val_software == SU2_DOT)) && (Design_Variable[0] != NO_DEFORMATION)) {
@@ -5458,7 +5405,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
 	if (((val_software == SU2_CFD) && ( ContinuousAdjoint || DiscreteAdjoint)) || (val_software == SU2_DOT)) {
 
-		cout << endl <<"----------------------- Design problem definition -----------------------" << endl;
+		cout << endl <<"---------------- Design problem definition  ( Zone "  << iZone << " ) ------------------" << endl;
 		if (nObj==1) {
       switch (Kind_ObjFunc[0]) {
         case DRAG_COEFFICIENT:           cout << "CD objective function";
@@ -5511,7 +5458,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 	}
 
 	if (val_software == SU2_CFD) {
-		cout << endl <<"---------------------- Space Numerical Integration ----------------------" << endl;
+		cout << endl <<"--------------- Space Numerical Integration ( Zone "  << iZone << " ) ------------------" << endl;
 
 		if (SmoothNumGrid) cout << "There are some smoothing iterations on the grid coordinates." << endl;
 
@@ -5778,7 +5725,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       cout << "Padded matrix size for optimal performance: " << sizeMatMulPadding << endl;
     }
 
-    cout << endl <<"---------------------- Time Numerical Integration -----------------------" << endl;
+    cout << endl <<"--------------- Time Numerical Integration  ( Zone "  << iZone << " ) ------------------" << endl;
 
     if (!fea) {
 		switch (Unsteady_Simulation) {
@@ -6031,7 +5978,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
   if (val_software == SU2_CFD) {
 
-    cout << endl <<"------------------------- Convergence Criteria --------------------------" << endl;
+    cout << endl <<"------------------ Convergence Criteria  ( Zone "  << iZone << " ) ---------------------" << endl;
 
     if (SinglezoneDriver){
       cout << "Maximum number of solver subiterations: " << Iter <<"."<< endl;
@@ -6105,7 +6052,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
   }
 
   if (val_software == SU2_MSH) {
-    cout << endl <<"----------------------- Grid adaptation strategy ------------------------" << endl;
+    cout << endl <<"----------------- Grid adaptation strategy ( Zone "  << iZone << " ) -------------------" << endl;
 
     switch (Kind_Adaptation) {
       case NONE: break;
@@ -6135,7 +6082,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
   }
 
-  cout << endl <<"-------------------------- Output Information ---------------------------" << endl;
+  cout << endl <<"-------------------- Output Information ( Zone "  << iZone << " ) ----------------------" << endl;
 
   if (val_software == SU2_CFD) {
 
@@ -6251,11 +6198,11 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     }
   }
 
-  cout << endl <<"------------------- Config File Boundary Information --------------------" << endl;
+  cout << endl <<"------------- Config File Boundary Information ( Zone "  << iZone << " ) ---------------" << endl;
 
   PrintingToolbox::CTablePrinter BoundaryTable(&std::cout);
-  BoundaryTable.AddColumn("Marker Type", 20);
-  BoundaryTable.AddColumn("Marker Name", 20);
+  BoundaryTable.AddColumn("Marker Type", 35);
+  BoundaryTable.AddColumn("Marker Name", 35);
   
   BoundaryTable.PrintHeader();
   
@@ -6846,67 +6793,48 @@ CConfig::~CConfig(void) {
 
   /*--- Free memory for Aeroelastic problems. ---*/
 
-  if (Grid_Movement && Aeroelastic_Simulation) {
+  if (GetGrid_Movement() && Aeroelastic_Simulation) {
     if (Aeroelastic_pitch  != NULL) delete[] Aeroelastic_pitch;
     if (Aeroelastic_plunge != NULL) delete[] Aeroelastic_plunge;
   }
 
-  /*--- Free memory for unspecified grid motion parameters ---*/
-
- if (Kind_GridMovement != NULL) delete [] Kind_GridMovement;
-
  /*--- Free memory for airfoil sections ---*/
 
  if (LocationStations   != NULL) delete [] LocationStations;
 
   /*--- motion origin: ---*/
   
-  if (Motion_Origin_X   != NULL) delete [] Motion_Origin_X;
-  if (Motion_Origin_Y   != NULL) delete [] Motion_Origin_Y;
-  if (Motion_Origin_Z   != NULL) delete [] Motion_Origin_Z;
+  if (MarkerMotion_Origin   != NULL) delete [] MarkerMotion_Origin;
+  
   if (MoveMotion_Origin != NULL) delete [] MoveMotion_Origin;
 
   /*--- translation: ---*/
   
-  if (Translation_Rate_X != NULL) delete [] Translation_Rate_X;
-  if (Translation_Rate_Y != NULL) delete [] Translation_Rate_Y;
-  if (Translation_Rate_Z != NULL) delete [] Translation_Rate_Z;
+  if (MarkerTranslation_Rate != NULL) delete [] MarkerTranslation_Rate;
 
   /*--- rotation: ---*/
   
-  if (Rotation_Rate_X != NULL) delete [] Rotation_Rate_X;
-  if (Rotation_Rate_Y != NULL) delete [] Rotation_Rate_Y;
-  if (Rotation_Rate_Z != NULL) delete [] Rotation_Rate_Z;
+  if (MarkerRotation_Rate != NULL) delete [] MarkerRotation_Rate;
 
   /*--- pitching: ---*/
   
-  if (Pitching_Omega_X != NULL) delete [] Pitching_Omega_X;
-  if (Pitching_Omega_Y != NULL) delete [] Pitching_Omega_Y;
-  if (Pitching_Omega_Z != NULL) delete [] Pitching_Omega_Z;
+  if (MarkerPitching_Omega != NULL) delete [] MarkerPitching_Omega;
 
   /*--- pitching amplitude: ---*/
   
-  if (Pitching_Ampl_X != NULL) delete [] Pitching_Ampl_X;
-  if (Pitching_Ampl_Y != NULL) delete [] Pitching_Ampl_Y;
-  if (Pitching_Ampl_Z != NULL) delete [] Pitching_Ampl_Z;
+  if (MarkerPitching_Ampl != NULL) delete [] MarkerPitching_Ampl;
 
   /*--- pitching phase: ---*/
   
-  if (Pitching_Phase_X != NULL) delete [] Pitching_Phase_X;
-  if (Pitching_Phase_Y != NULL) delete [] Pitching_Phase_Y;
-  if (Pitching_Phase_Z != NULL) delete [] Pitching_Phase_Z;
+  if (MarkerPitching_Phase != NULL) delete [] MarkerPitching_Phase;
 
   /*--- plunging: ---*/
   
-  if (Plunging_Omega_X != NULL) delete [] Plunging_Omega_X;
-  if (Plunging_Omega_Y != NULL) delete [] Plunging_Omega_Y;
-  if (Plunging_Omega_Z != NULL) delete [] Plunging_Omega_Z;
+  if (MarkerPlunging_Omega != NULL) delete [] MarkerPlunging_Omega;
 
   /*--- plunging amplitude: ---*/
-  
-  if (Plunging_Ampl_X != NULL) delete [] Plunging_Ampl_X;
-  if (Plunging_Ampl_Y != NULL) delete [] Plunging_Ampl_Y;
-  if (Plunging_Ampl_Z != NULL) delete [] Plunging_Ampl_Z;
+
+  if (MarkerPlunging_Ampl != NULL) delete [] MarkerPlunging_Ampl;
 
   /*--- reference origin for moments ---*/
   
@@ -7280,7 +7208,6 @@ CConfig::~CConfig(void) {
   if (RelaxFactorAverage != NULL) delete [] RelaxFactorAverage;
   if (RelaxFactorFourier != NULL) delete [] RelaxFactorFourier;
   if (nSpan_iZones != NULL) delete [] nSpan_iZones;
-  if (FinalRotation_Rate_Z != NULL) delete [] FinalRotation_Rate_Z;
   if (Kind_TurboMachinery != NULL) delete [] Kind_TurboMachinery;
 
   if (Marker_MixingPlaneInterface !=NULL) delete [] Marker_MixingPlaneInterface;
@@ -7859,6 +7786,33 @@ void CConfig::SetnPeriodicIndex(unsigned short val_index) {
   
 }
 
+bool CConfig::GetVolumetric_Movement(){
+  bool volumetric_movement = false;
+  if (GetGrid_Movement()){
+    switch(Kind_GridMovement){
+    case FLUID_STRUCTURE: case EXTERNAL: case EXTERNAL_ROTATION:
+    case FLUID_STRUCTURE_STATIC:
+      volumetric_movement = true;
+      break;
+    }
+    if (GetSurface_Movement(AEROELASTIC) || 
+        GetSurface_Movement(DEFORMING) ||
+        GetSurface_Movement(AEROELASTIC_RIGID_MOTION)){
+      volumetric_movement = true;
+    }
+  }
+  return volumetric_movement;
+}
+
+bool CConfig::GetSurface_Movement(unsigned short kind_movement){
+  for (unsigned short iMarkerMoving = 0; iMarkerMoving < nMarker_Moving; iMarkerMoving++){
+    if (Kind_SurfaceMovement[iMarkerMoving] == kind_movement){
+      return true;
+    }
+  }
+  return false;
+}
+
 unsigned short CConfig::GetMarker_Moving(string val_marker) {
   unsigned short iMarker_Moving;
 
@@ -9166,9 +9120,6 @@ void CConfig::SetMultizone(CConfig *driver_config, CConfig **config_container){
     if (rank == MASTER_NODE) cout << endl;
   }
 
-  /*--- Set the Multizone Boolean to true ---*/
-  Multizone_Problem = true;
-
   /*--- Set the Restart iter for time dependent problems ---*/
   if (driver_config->GetRestart()){
     Unst_RestartIter = driver_config->GetRestart_Iter();

From d56edf3fcb4da54ce1871233d08fa6f715d5f643 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 1 Apr 2019 11:34:00 +0200
Subject: [PATCH 129/539] Adapted geometry structure for changed grid movement
 options

---
 Common/src/fem_geometry_structure.cpp | 147 +++++++++++++-------------
 Common/src/geometry_structure.cpp     |  41 ++++---
 2 files changed, 91 insertions(+), 97 deletions(-)

diff --git a/Common/src/fem_geometry_structure.cpp b/Common/src/fem_geometry_structure.cpp
index 777cd2761891..eb0789919631 100644
--- a/Common/src/fem_geometry_structure.cpp
+++ b/Common/src/fem_geometry_structure.cpp
@@ -6662,83 +6662,17 @@ void CMeshFEM_DG::InitStaticMeshMovement(CConfig              *config,
   /*--- Make a distinction between the possibilities. ---*/
   switch( Kind_Grid_Movement ) {
 
-    case MOVING_WALL: {
-
-      /*--- Loop over the physical boundaries. Skip the periodic boundaries. ---*/
-      for(unsigned short i=0; i<boundaries.size(); ++i) {
-        if( !boundaries[i].periodicBoundary ) {
-
-          /* Check if for this boundary a motion has been specified. */
-          if (config->GetMarker_All_Moving(i) == YES) {
-
-            /* Determine the prescribed translation velocity, rotation rate
-               and rotation center. */
-            const unsigned short jMarker = config->GetMarker_Moving(boundaries[i].markerTag);
-            const su2double Center[] = {config->GetMotion_Origin_X(jMarker),
-                                        config->GetMotion_Origin_Y(jMarker),
-                                        config->GetMotion_Origin_Z(jMarker)};
-            const su2double Omega[]  = {config->GetRotation_Rate_X(jMarker)/Omega_Ref,
-                                        config->GetRotation_Rate_Y(jMarker)/Omega_Ref,
-                                        config->GetRotation_Rate_Z(jMarker)/Omega_Ref};
-            const su2double vTrans[] = {config->GetTranslation_Rate_X(jMarker)/Vel_Ref,
-                                        config->GetTranslation_Rate_Y(jMarker)/Vel_Ref,
-                                        config->GetTranslation_Rate_Z(jMarker)/Vel_Ref};
-
-            /* Easier storage of the surface elements and loop over them. */
-            vector<CSurfaceElementFEM> &surfElem = boundaries[i].surfElem;
-
-            for(unsigned long l=0; l<surfElem.size(); ++l) {
-
-              /* Determine the corresponding standard face element and get the
-                 relevant information from it. Note that the standard element
-                 of the solution must be taken and not of the grid. */
-              const unsigned short ind  = surfElem[l].indStandardElement;
-              const unsigned short nInt = standardBoundaryFacesSol[ind].GetNIntegration();
-
-              /* Loop over the number of integration points. */
-              for(unsigned short j=0; j<nInt; ++j) {
-
-                /* Set the pointers for the coordinates and grid velocities
-                   for this integration points. */
-                const su2double *Coord = surfElem[l].coorIntegrationPoints.data() + j*nDim;
-                su2double *gridVel     = surfElem[l].gridVelocities.data() + j*nDim;
-
-                /* Calculate non-dim. position from rotation center. */
-                su2double r[] = {0.0, 0.0, 0.0};
-                for(unsigned short iDim=0; iDim<nDim; ++iDim)
-                  r[iDim] = (Coord[iDim]-Center[iDim])/L_Ref;
-
-                /* Cross Product of angular velocity and distance from center to
-                   get the rotational velocity. Note that we are adding on the
-                   velocity due to pure translation as well. Note that for the
-                   2D case only Omega[2] can be non-zero. */
-                su2double velGrid[] = {vTrans[0] + Omega[1]*r[2] - Omega[2]*r[1],
-                                       vTrans[1] + Omega[2]*r[0] - Omega[0]*r[2],
-                                       vTrans[2] + Omega[0]*r[1] - Omega[1]*r[0]};
-
-                /* Store the grid velocities. */
-                for(unsigned short iDim=0; iDim<nDim; ++iDim)
-                  gridVel[iDim] = velGrid[iDim];
-              }
-            }
-          }
-        }
-      }
-
-      break;
-    }
-
     /*-------------------------------------------------------------------------------------*/
 
     case ROTATING_FRAME: {
 
       /* Get the rotation rate and rotation center from config. */
-      const su2double Center[] = {config->GetMotion_Origin_X(iZone),
-                                  config->GetMotion_Origin_Y(iZone),
-                                  config->GetMotion_Origin_Z(iZone)};
-      const su2double Omega[]  = {config->GetRotation_Rate_X(iZone)/Omega_Ref,
-                                  config->GetRotation_Rate_Y(iZone)/Omega_Ref,
-                                  config->GetRotation_Rate_Z(iZone)/Omega_Ref};
+    const su2double Center[] = {config->GetMotion_Origin()[0],
+                                config->GetMotion_Origin()[1],
+                                config->GetMotion_Origin()[2]};
+    const su2double Omega[]  = {config->GetRotation_Rate()[0]/Omega_Ref,
+                                config->GetRotation_Rate()[1]/Omega_Ref,
+                                config->GetRotation_Rate()[2]/Omega_Ref};
 
       /* Array used to store the distance to the rotation center. */ 
       su2double dist[] = {0.0, 0.0, 0.0};
@@ -6854,9 +6788,9 @@ void CMeshFEM_DG::InitStaticMeshMovement(CConfig              *config,
     case STEADY_TRANSLATION: {
 
       /* Get the translation velocity from config. */
-      su2double vTrans[] = {config->GetTranslation_Rate_X(iZone)/Vel_Ref,
-                            config->GetTranslation_Rate_Y(iZone)/Vel_Ref,
-                            config->GetTranslation_Rate_Z(iZone)/Vel_Ref};
+    const su2double vTrans[] = {config->GetTranslation_Rate()[0]/Vel_Ref,
+                                config->GetTranslation_Rate()[1]/Vel_Ref,
+                                config->GetTranslation_Rate()[2]/Vel_Ref};
 
       /* Loop over the owned volume elements. */
       for(unsigned long l=0; l<nVolElemOwned; ++l) {
@@ -6928,4 +6862,67 @@ void CMeshFEM_DG::InitStaticMeshMovement(CConfig              *config,
     default:  /* Just to avoid a compiler warning. */
       break;
   }
+  
+  if (config->GetSurface_Movement(MOVING_WALL)){
+    /*--- Loop over the physical boundaries. Skip the periodic boundaries. ---*/
+    for(unsigned short i=0; i<boundaries.size(); ++i) {
+      if( !boundaries[i].periodicBoundary ) {
+        
+        /* Check if for this boundary a motion has been specified. */
+        if (config->GetMarker_All_Moving(i) == YES) {
+          
+          /* Determine the prescribed translation velocity, rotation rate
+               and rotation center. */
+          const unsigned short jMarker = config->GetMarker_Moving(boundaries[i].markerTag);
+          const su2double Center[] = {config->GetMotion_Origin()[0],
+                                      config->GetMotion_Origin()[1],
+                                      config->GetMotion_Origin()[2]};
+          const su2double Omega[]  = {config->GetRotation_Rate()[0]/Omega_Ref,
+                                      config->GetRotation_Rate()[1]/Omega_Ref,
+                                      config->GetRotation_Rate()[2]/Omega_Ref};
+          const su2double vTrans[] = {config->GetTranslation_Rate()[0]/Vel_Ref,
+                                      config->GetTranslation_Rate()[1]/Vel_Ref,
+                                      config->GetTranslation_Rate()[2]/Vel_Ref};
+          
+          /* Easier storage of the surface elements and loop over them. */
+          vector<CSurfaceElementFEM> &surfElem = boundaries[i].surfElem;
+          
+          for(unsigned long l=0; l<surfElem.size(); ++l) {
+            
+            /* Determine the corresponding standard face element and get the
+                 relevant information from it. Note that the standard element
+                 of the solution must be taken and not of the grid. */
+            const unsigned short ind  = surfElem[l].indStandardElement;
+            const unsigned short nInt = standardBoundaryFacesSol[ind].GetNIntegration();
+            
+            /* Loop over the number of integration points. */
+            for(unsigned short j=0; j<nInt; ++j) {
+              
+              /* Set the pointers for the coordinates and grid velocities
+                   for this integration points. */
+              const su2double *Coord = surfElem[l].coorIntegrationPoints.data() + j*nDim;
+              su2double *gridVel     = surfElem[l].gridVelocities.data() + j*nDim;
+              
+              /* Calculate non-dim. position from rotation center. */
+              su2double r[] = {0.0, 0.0, 0.0};
+              for(unsigned short iDim=0; iDim<nDim; ++iDim)
+                r[iDim] = (Coord[iDim]-Center[iDim])/L_Ref;
+              
+              /* Cross Product of angular velocity and distance from center to
+                   get the rotational velocity. Note that we are adding on the
+                   velocity due to pure translation as well. Note that for the
+                   2D case only Omega[2] can be non-zero. */
+              su2double velGrid[] = {vTrans[0] + Omega[1]*r[2] - Omega[2]*r[1],
+                                     vTrans[1] + Omega[2]*r[0] - Omega[0]*r[2],
+                                     vTrans[2] + Omega[0]*r[1] - Omega[1]*r[0]};
+              
+              /* Store the grid velocities. */
+              for(unsigned short iDim=0; iDim<nDim; ++iDim)
+                gridVel[iDim] = velGrid[iDim];
+            }
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index f7a34f24f9e8..0a205112f942 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -2311,7 +2311,7 @@ CPhysicalGeometry::CPhysicalGeometry(CConfig *config, unsigned short val_iZone,
   /*--- Initialize counters for local/global points & elements ---*/
   
   if (rank == MASTER_NODE)
-    cout << endl <<"---------------------- Read Grid File Information -----------------------" << endl;
+    cout << endl <<"---------------- Read Grid File Information ( ZONE "  << config->GetiZone() << " ) ------------------" << endl;
 
   if( fem_solver ) {
     switch (val_format) {
@@ -10637,7 +10637,7 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
         iMarker=0;
         PrintingToolbox::CTablePrinter BoundaryTable(&std::cout);
         BoundaryTable.AddColumn("Index", 6);
-        BoundaryTable.AddColumn("Marker", 14);
+        BoundaryTable.AddColumn("Marker", 35);
         BoundaryTable.AddColumn("Elements", 14);
         if (rank == MASTER_NODE){
           BoundaryTable.PrintHeader();
@@ -17111,15 +17111,15 @@ void CPhysicalGeometry::SetRotationalVelocity(CConfig *config, unsigned short va
   
   unsigned long iPoint;
   su2double RotVel[3], Distance[3], *Coord, Center[3], Omega[3], L_Ref;
+  unsigned short iDim;
   
   /*--- Center of rotation & angular velocity vector from config ---*/
   
-  Center[0] = config->GetMotion_Origin_X(val_iZone);
-  Center[1] = config->GetMotion_Origin_Y(val_iZone);
-  Center[2] = config->GetMotion_Origin_Z(val_iZone);
-  Omega[0]  = config->GetRotation_Rate_X(val_iZone)/config->GetOmega_Ref();
-  Omega[1]  = config->GetRotation_Rate_Y(val_iZone)/config->GetOmega_Ref();
-  Omega[2]  = config->GetRotation_Rate_Z(val_iZone)/config->GetOmega_Ref();
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    Omega[iDim]  = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+  }
+  
   L_Ref     = config->GetLength_Ref();
   
   /*--- Print some information to the console ---*/
@@ -17193,11 +17193,9 @@ void CPhysicalGeometry::SetTranslationalVelocity(CConfig *config, unsigned short
   su2double xDot[3] = {0.0,0.0,0.0};
   
   /*--- Get the translational velocity vector from config ---*/
-  
-  xDot[0] = config->GetTranslation_Rate_X(val_iZone)/config->GetVelocity_Ref();
-  xDot[1] = config->GetTranslation_Rate_Y(val_iZone)/config->GetVelocity_Ref();
-  xDot[2] = config->GetTranslation_Rate_Z(val_iZone)/config->GetVelocity_Ref();
-  
+  for (iDim = 0; iDim < 3; iDim++){
+    xDot[iDim] = config->GetTranslation_Rate()[iDim]/config->GetVelocity_Ref();
+  }
   /*--- Print some information to the console ---*/
   
   if (rank == MASTER_NODE && print) {
@@ -21897,15 +21895,14 @@ void CMultiGridGeometry::SetRotationalVelocity(CConfig *config, unsigned short v
   su2double *RotVel, Distance[3] = {0.0,0.0,0.0}, *Coord;
   su2double Center[3] = {0.0,0.0,0.0}, Omega[3] = {0.0,0.0,0.0}, L_Ref;
   RotVel = new su2double [3];
+  unsigned short iDim;
   
   /*--- Center of rotation & angular velocity vector from config. ---*/
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    Omega[iDim]  = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+  }
   
-  Center[0] = config->GetMotion_Origin_X(val_iZone);
-  Center[1] = config->GetMotion_Origin_Y(val_iZone);
-  Center[2] = config->GetMotion_Origin_Z(val_iZone);
-  Omega[0]  = config->GetRotation_Rate_X(val_iZone)/config->GetOmega_Ref();
-  Omega[1]  = config->GetRotation_Rate_Y(val_iZone)/config->GetOmega_Ref();
-  Omega[2]  = config->GetRotation_Rate_Z(val_iZone)/config->GetOmega_Ref();
   L_Ref     = config->GetLength_Ref();
   
   /*--- Loop over all nodes and set the rotational velocity. ---*/
@@ -21969,9 +21966,9 @@ void CMultiGridGeometry::SetTranslationalVelocity(CConfig *config, unsigned shor
   
   /*--- Get the translational velocity vector from config ---*/
   
-  xDot[0]   = config->GetTranslation_Rate_X(val_iZone)/config->GetVelocity_Ref();
-  xDot[1]   = config->GetTranslation_Rate_Y(val_iZone)/config->GetVelocity_Ref();
-  xDot[2]   = config->GetTranslation_Rate_Z(val_iZone)/config->GetVelocity_Ref();
+  for (iDim = 0; iDim < 3; iDim++){
+    xDot[iDim] = config->GetTranslation_Rate()[iDim]/config->GetVelocity_Ref();
+  }
   
   /*--- Loop over all nodes and set the translational velocity ---*/
   

From 3af55ec016214158e2b31b33d731e575a1b54c0a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 1 Apr 2019 11:42:53 +0200
Subject: [PATCH 130/539] Adapted grid_movement_structure.cpp

---
 Common/src/grid_movement_structure.cpp | 227 +++++++++++--------------
 1 file changed, 99 insertions(+), 128 deletions(-)

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index f0e481359ba5..200c3c424bc7 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -1923,13 +1923,11 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
   
   /*--- Center of rotation & angular velocity vector from config ---*/
   
-  Center[0] = config->GetMotion_Origin_X(iZone);
-  Center[1] = config->GetMotion_Origin_Y(iZone);
-  Center[2] = config->GetMotion_Origin_Z(iZone);
-  Omega[0]  = (config->GetRotation_Rate_X(iZone)/config->GetOmega_Ref());
-  Omega[1]  = (config->GetRotation_Rate_Y(iZone)/config->GetOmega_Ref());
-  Omega[2]  = (config->GetRotation_Rate_Z(iZone)/config->GetOmega_Ref());
-
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    Omega[iDim]  = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+  }
+  
   /*-- Set dt for harmonic balance cases ---*/
   if (harmonic_balance) {
 	  /*--- period of oscillation & compute time interval using nTimeInstances ---*/
@@ -2000,7 +1998,7 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
     
     newGridVel[0] = GridVel[0] + Omega[1]*rotCoord[2] - Omega[2]*rotCoord[1];
     newGridVel[1] = GridVel[1] + Omega[2]*rotCoord[0] - Omega[0]*rotCoord[2];
-    newGridVel[2] = GridVel[2] + Omega[0]*rotCoord[1] - Omega[1]*rotCoord[0];
+    if (nDim == 3) newGridVel[2] = GridVel[2] + Omega[0]*rotCoord[1] - Omega[1]*rotCoord[0];
     
     /*--- Store new node location & grid velocity. Add center. 
      Do not store the grid velocity if this is an adjoint calculation.---*/
@@ -2078,20 +2076,16 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
   if (harmonic_balance) {
 	  iZone = ZONE_0;
   }
-
+  
   /*--- Pitching origin, frequency, and amplitude from config. ---*/	
-  Center[0] = config->GetMotion_Origin_X(iZone);
-  Center[1] = config->GetMotion_Origin_Y(iZone);
-  Center[2] = config->GetMotion_Origin_Z(iZone);
-  Omega[0]  = (config->GetPitching_Omega_X(iZone)/config->GetOmega_Ref());
-  Omega[1]  = (config->GetPitching_Omega_Y(iZone)/config->GetOmega_Ref());
-  Omega[2]  = (config->GetPitching_Omega_Z(iZone)/config->GetOmega_Ref());
-  Ampl[0]   = config->GetPitching_Ampl_X(iZone)*DEG2RAD;
-  Ampl[1]   = config->GetPitching_Ampl_Y(iZone)*DEG2RAD;
-  Ampl[2]   = config->GetPitching_Ampl_Z(iZone)*DEG2RAD;
-  Phase[0]   = config->GetPitching_Phase_X(iZone)*DEG2RAD;
-  Phase[1]   = config->GetPitching_Phase_Y(iZone)*DEG2RAD;
-  Phase[2]   = config->GetPitching_Phase_Z(iZone)*DEG2RAD;
+  
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    Omega[iDim]  = config->GetPitching_Omega()[iDim]/config->GetOmega_Ref();
+    Ampl[iDim]   = config->GetPitching_Ampl()[iDim]*DEG2RAD;
+    Phase[iDim]  = config->GetPitching_Phase()[iDim]*DEG2RAD;
+  }
+
 
   if (harmonic_balance) {    
 	  /*--- period of oscillation & compute time interval using nTimeInstances ---*/
@@ -2195,7 +2189,7 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
     
     newGridVel[0] = GridVel[0] + alphaDot[1]*rotCoord[2] - alphaDot[2]*rotCoord[1];
     newGridVel[1] = GridVel[1] + alphaDot[2]*rotCoord[0] - alphaDot[0]*rotCoord[2];
-    newGridVel[2] = GridVel[2] + alphaDot[0]*rotCoord[1] - alphaDot[1]*rotCoord[0];
+    if (nDim == 3) newGridVel[2] = GridVel[2] + alphaDot[0]*rotCoord[1] - alphaDot[1]*rotCoord[0];
     
     /*--- Store new node location & grid velocity. Add center location.
      Do not store the grid velocity if this is an adjoint calculation.---*/
@@ -2235,17 +2229,15 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
 	  iZone = ZONE_0;
   }
   
-  /*--- Plunging frequency and amplitude from config. ---*/
-  Center[0] = config->GetMotion_Origin_X(iZone);
-  Center[1] = config->GetMotion_Origin_Y(iZone);
-  Center[2] = config->GetMotion_Origin_Z(iZone);
-  Omega[0]  = (config->GetPlunging_Omega_X(iZone)/config->GetOmega_Ref());
-  Omega[1]  = (config->GetPlunging_Omega_Y(iZone)/config->GetOmega_Ref());
-  Omega[2]  = (config->GetPlunging_Omega_Z(iZone)/config->GetOmega_Ref());
-  Ampl[0]   = config->GetPlunging_Ampl_X(iZone)/Lref;
-  Ampl[1]   = config->GetPlunging_Ampl_Y(iZone)/Lref;
-  Ampl[2]   = config->GetPlunging_Ampl_Z(iZone)/Lref;
   
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    Omega[iDim]  = config->GetPlunging_Omega()[iDim]/config->GetOmega_Ref();
+    Ampl[iDim]   = config->GetPlunging_Ampl()[iDim];
+  }
+  
+  /*--- Plunging frequency and amplitude from config. ---*/
+
   if (harmonic_balance) {
 	  /*--- period of oscillation & time interval using nTimeInstances ---*/
 	  su2double period = config->GetHarmonicBalance_Period();
@@ -2308,7 +2300,7 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
     
     newGridVel[0] = GridVel[0] + xDot[0];
     newGridVel[1] = GridVel[1] + xDot[1];
-    newGridVel[2] = GridVel[2] + xDot[2];
+   if (nDim == 3) newGridVel[2] = GridVel[2] + xDot[2];
     
     /*--- Store new node location & grid velocity. Do not store the grid
      velocity if this is an adjoint calculation. ---*/
@@ -2323,9 +2315,9 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
    incrementing the position with the rigid translation. This
    new location will be used for subsequent pitching/rotation.---*/
   
-  config->SetMotion_Origin_X(iZone, Center[0]+deltaX[0]);
-  config->SetMotion_Origin_Y(iZone, Center[1]+deltaX[1]);
-  config->SetMotion_Origin_Z(iZone, Center[2]+deltaX[2]);
+  for (iDim = 0; iDim < 3; iDim++){
+    config->GetMotion_Origin()[iDim] += deltaX[iDim];
+  } 
   
   /*--- As the body origin may have moved, print it to the console ---*/
   
@@ -2372,14 +2364,12 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
   if (harmonic_balance) {
 	  iZone = ZONE_0;
   }
-
   /*--- Get motion center and translation rates from config ---*/
-  Center[0] = config->GetMotion_Origin_X(iZone);
-  Center[1] = config->GetMotion_Origin_Y(iZone);
-  Center[2] = config->GetMotion_Origin_Z(iZone);
-  xDot[0]   = config->GetTranslation_Rate_X(iZone);
-  xDot[1]   = config->GetTranslation_Rate_Y(iZone);
-  xDot[2]   = config->GetTranslation_Rate_Z(iZone);
+  
+  for (iDim = 0; iDim < 3; iDim++){
+    Center[iDim] = config->GetMotion_Origin()[iDim];
+    xDot[iDim]   = config->GetTranslation_Rate()[iDim];
+  }
   
   if (harmonic_balance) {
 	  /*--- period of oscillation & time interval using nTimeInstances ---*/
@@ -2447,9 +2437,9 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
    incrementing the position with the rigid translation. This
    new location will be used for subsequent pitching/rotation.---*/
   
-  config->SetMotion_Origin_X(iZone, Center[0]+deltaX[0]);
-  config->SetMotion_Origin_Y(iZone, Center[1]+deltaX[1]);
-  config->SetMotion_Origin_Z(iZone, Center[2]+deltaX[2]);
+  for (iDim = 0; iDim < 3; iDim++){
+    config->GetMotion_Origin()[iDim] += deltaX[iDim];
+  }
   
   /*--- Set the moment computation center to the new location after
    incrementing the position with the translation. ---*/
@@ -5636,15 +5626,12 @@ void CSurfaceMovement::Moving_Walls(CGeometry *geometry, CConfig *config,
       
       /*--- Get prescribed wall speed from config for this marker ---*/
       
-      Center[0] = config->GetMotion_Origin_X(jMarker);
-      Center[1] = config->GetMotion_Origin_Y(jMarker);
-      Center[2] = config->GetMotion_Origin_Z(jMarker);
-      Omega[0]  = config->GetRotation_Rate_X(jMarker)/Omega_Ref;
-      Omega[1]  = config->GetRotation_Rate_Y(jMarker)/Omega_Ref;
-      Omega[2]  = config->GetRotation_Rate_Z(jMarker)/Omega_Ref;
-      xDot[0]   = config->GetTranslation_Rate_X(jMarker)/Vel_Ref;
-      xDot[1]   = config->GetTranslation_Rate_Y(jMarker)/Vel_Ref;
-      xDot[2]   = config->GetTranslation_Rate_Z(jMarker)/Vel_Ref;
+      for (iDim = 0; iDim < 3; iDim++){
+        Center[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+        Omega[iDim]  = config->GetMarkerRotationRate(jMarker)[iDim]/Omega_Ref;
+        xDot[iDim]   = config->GetMarkerTranslationRate(jMarker)[iDim]/Vel_Ref;
+      }
+      
       
       if (rank == MASTER_NODE && iter == 0) {
         cout << " Storing grid velocity for marker: ";
@@ -5697,6 +5684,7 @@ void CSurfaceMovement::Surface_Translating(CGeometry *geometry, CConfig *config,
   unsigned short iMarker, jMarker, Moving;
   unsigned long iVertex;
   string Marker_Tag, Moving_Tag;
+  unsigned short nDim = geometry->GetnDim(), iDim;
 	
   /*--- Initialize the delta variation in coordinates ---*/
   VarCoord[0] = 0.0; VarCoord[1] = 0.0; VarCoord[2] = 0.0;
@@ -5724,13 +5712,12 @@ void CSurfaceMovement::Surface_Translating(CGeometry *geometry, CConfig *config,
         Moving_Tag = config->GetMarker_Moving_TagBound(jMarker);
         Marker_Tag = config->GetMarker_All_TagBound(iMarker);
         
-        if (Marker_Tag == Moving_Tag) {
+        if (Marker_Tag == Moving_Tag && (config->GetKind_SurfaceMovement(jMarker) == DEFORMING)) {
 
-          /*--- Translation velocity from config. ---*/
-          
-          xDot[0]   = config->GetTranslation_Rate_X(jMarker);
-          xDot[1]   = config->GetTranslation_Rate_Y(jMarker);
-          xDot[2]   = config->GetTranslation_Rate_Z(jMarker);
+          for (iDim = 0; iDim < 3; iDim++){
+            xDot[iDim]   = config->GetMarkerTranslationRate(jMarker)[iDim];
+            Center[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+          }
           
           /*--- Print some information to the console. Be verbose at the first
            iteration only (mostly for debugging purposes). ---*/
@@ -5776,12 +5763,10 @@ void CSurfaceMovement::Surface_Translating(CGeometry *geometry, CConfig *config,
     /*-- Check if we want to update the motion origin for the given marker ---*/
     
     if (config->GetMoveMotion_Origin(jMarker) == YES) {
-      Center[0] = config->GetMotion_Origin_X(jMarker) + VarCoord[0];
-      Center[1] = config->GetMotion_Origin_Y(jMarker) + VarCoord[1];
-      Center[2] = config->GetMotion_Origin_Z(jMarker) + VarCoord[2];
-      config->SetMotion_Origin_X(jMarker, Center[0]);
-      config->SetMotion_Origin_Y(jMarker, Center[1]);
-      config->SetMotion_Origin_Z(jMarker, Center[2]);
+      for (iDim = 0; iDim < 3; iDim++){
+        Center[iDim] += VarCoord[iDim];
+        config->SetMarkerMotion_Origin(Center, jMarker);
+      }
     }
   }
   
@@ -5807,6 +5792,7 @@ void CSurfaceMovement::Surface_Plunging(CGeometry *geometry, CConfig *config,
   unsigned short iMarker, jMarker, Moving;
   unsigned long iVertex;
   string Marker_Tag, Moving_Tag;
+  unsigned short iDim;
 	
   /*--- Initialize the delta variation in coordinates ---*/
   VarCoord[0] = 0.0; VarCoord[1] = 0.0; VarCoord[2] = 0.0;
@@ -5835,17 +5821,15 @@ void CSurfaceMovement::Surface_Plunging(CGeometry *geometry, CConfig *config,
         Moving_Tag = config->GetMarker_Moving_TagBound(jMarker);
         Marker_Tag = config->GetMarker_All_TagBound(iMarker);
         
-        if (Marker_Tag == Moving_Tag) {
+        if (Marker_Tag == Moving_Tag && (config->GetKind_SurfaceMovement(jMarker) == DEFORMING)) {
           
           /*--- Plunging frequency and amplitude from config. ---*/
           
-          Omega[0]  = config->GetPlunging_Omega_X(jMarker)/config->GetOmega_Ref();
-          Omega[1]  = config->GetPlunging_Omega_Y(jMarker)/config->GetOmega_Ref();
-          Omega[2]  = config->GetPlunging_Omega_Z(jMarker)/config->GetOmega_Ref();
-          Ampl[0]   = config->GetPlunging_Ampl_X(jMarker)/Lref;
-          Ampl[1]   = config->GetPlunging_Ampl_Y(jMarker)/Lref;
-          Ampl[2]   = config->GetPlunging_Ampl_Z(jMarker)/Lref;
-          
+          for (iDim = 0; iDim < 3; iDim++){
+            Ampl[iDim]   = config->GetMarkerPlunging_Ampl(jMarker)[iDim]/Lref;
+            Omega[iDim]  = config->GetMarkerPlunging_Omega(jMarker)[iDim]/config->GetOmega_Ref();
+            Center[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+          }
           /*--- Print some information to the console. Be verbose at the first
            iteration only (mostly for debugging purposes). ---*/
           // Note that the MASTER_NODE might not contain all the markers being moved.
@@ -5891,12 +5875,10 @@ void CSurfaceMovement::Surface_Plunging(CGeometry *geometry, CConfig *config,
     /*-- Check if we want to update the motion origin for the given marker ---*/
     
     if (config->GetMoveMotion_Origin(jMarker) == YES) {
-      Center[0] = config->GetMotion_Origin_X(jMarker) + VarCoord[0];
-      Center[1] = config->GetMotion_Origin_Y(jMarker) + VarCoord[1];
-      Center[2] = config->GetMotion_Origin_Z(jMarker) + VarCoord[2];
-      config->SetMotion_Origin_X(jMarker, Center[0]);
-      config->SetMotion_Origin_Y(jMarker, Center[1]);
-      config->SetMotion_Origin_Z(jMarker, Center[2]);
+      for (iDim = 0; iDim < 3; iDim++){
+        Center[iDim] += VarCoord[iDim];
+        config->SetMarkerMotion_Origin(Center, jMarker);
+      }
     }
   }
   
@@ -5954,23 +5936,16 @@ void CSurfaceMovement::Surface_Pitching(CGeometry *geometry, CConfig *config,
         Moving_Tag = config->GetMarker_Moving_TagBound(jMarker);
         Marker_Tag = config->GetMarker_All_TagBound(iMarker);
         
-        if (Marker_Tag == Moving_Tag) {
+        if (Marker_Tag == Moving_Tag && (config->GetKind_SurfaceMovement(jMarker) == DEFORMING)) {
           
           /*--- Pitching origin, frequency, and amplitude from config. ---*/
           
-          Center[0] = config->GetMotion_Origin_X(jMarker);
-          Center[1] = config->GetMotion_Origin_Y(jMarker);
-          Center[2] = config->GetMotion_Origin_Z(jMarker);
-          Omega[0]  = config->GetPitching_Omega_X(jMarker)/config->GetOmega_Ref();
-          Omega[1]  = config->GetPitching_Omega_Y(jMarker)/config->GetOmega_Ref();
-          Omega[2]  = config->GetPitching_Omega_Z(jMarker)/config->GetOmega_Ref();
-          Ampl[0]   = config->GetPitching_Ampl_X(jMarker)*DEG2RAD;
-          Ampl[1]   = config->GetPitching_Ampl_Y(jMarker)*DEG2RAD;
-          Ampl[2]   = config->GetPitching_Ampl_Z(jMarker)*DEG2RAD;
-          Phase[0]  = config->GetPitching_Phase_X(jMarker)*DEG2RAD;
-          Phase[1]  = config->GetPitching_Phase_Y(jMarker)*DEG2RAD;
-          Phase[2]  = config->GetPitching_Phase_Z(jMarker)*DEG2RAD;
-          
+          for (iDim = 0; iDim < 3; iDim++){
+            Ampl[iDim]   = config->GetMarkerPitching_Ampl(jMarker)[iDim]*DEG2RAD;
+            Omega[iDim]  = config->GetMarkerPitching_Omega(jMarker)[iDim]/config->GetOmega_Ref();
+            Phase[iDim]  = config->GetMarkerPitching_Phase(jMarker)[iDim]*DEG2RAD;
+            Center[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+          }
           /*--- Print some information to the console. Be verbose at the first
            iteration only (mostly for debugging purposes). ---*/
           // Note that the MASTER_NODE might not contain all the markers being moved.
@@ -6103,17 +6078,14 @@ void CSurfaceMovement::Surface_Rotating(CGeometry *geometry, CConfig *config,
         Moving_Tag = config->GetMarker_Moving_TagBound(jMarker);
         Marker_Tag = config->GetMarker_All_TagBound(iMarker);
         
-        if (Marker_Tag == Moving_Tag) {
+        if (Marker_Tag == Moving_Tag && (config->GetKind_SurfaceMovement(jMarker) == DEFORMING)) {
           
           /*--- Rotation origin and angular velocity from config. ---*/
           
-          Center[0] = config->GetMotion_Origin_X(jMarker);
-          Center[1] = config->GetMotion_Origin_Y(jMarker);
-          Center[2] = config->GetMotion_Origin_Z(jMarker);
-          Omega[0]  = config->GetRotation_Rate_X(jMarker)/config->GetOmega_Ref();
-          Omega[1]  = config->GetRotation_Rate_Y(jMarker)/config->GetOmega_Ref();
-          Omega[2]  = config->GetRotation_Rate_Z(jMarker)/config->GetOmega_Ref();
-          
+          for (iDim = 0; iDim < 3; iDim++){
+            Omega[iDim]  = config->GetMarkerRotationRate(jMarker)[iDim]/config->GetOmega_Ref();
+            Center[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+          }
           /*--- Print some information to the console. Be verbose at the first
            iteration only (mostly for debugging purposes). ---*/
           // Note that the MASTER_NODE might not contain all the markers being moved.
@@ -6208,9 +6180,9 @@ void CSurfaceMovement::Surface_Rotating(CGeometry *geometry, CConfig *config,
     
     if (config->GetMoveMotion_Origin(jMarker) == YES) {
         
-      Center_Aux[0] = config->GetMotion_Origin_X(jMarker);
-      Center_Aux[1] = config->GetMotion_Origin_Y(jMarker);
-      Center_Aux[2] = config->GetMotion_Origin_Z(jMarker);
+      for (iDim = 0; iDim < 3; iDim++){
+        Center_Aux[iDim] = config->GetMarkerMotion_Origin(jMarker)[iDim];
+      }
       
       /*--- Calculate non-dim. position from rotation center ---*/
       
@@ -6236,9 +6208,11 @@ void CSurfaceMovement::Surface_Rotating(CGeometry *geometry, CConfig *config,
       for (iDim = 0; iDim < nDim; iDim++)
         VarCoord[iDim] = (rotCoord[iDim]-Center_Aux[iDim])/Lref;
       if (nDim == 2) VarCoord[nDim] = 0.0;
-      config->SetMotion_Origin_X(jMarker, Center_Aux[0]+VarCoord[0]);
-      config->SetMotion_Origin_Y(jMarker, Center_Aux[1]+VarCoord[1]);
-      config->SetMotion_Origin_Z(jMarker, Center_Aux[2]+VarCoord[2]);
+      
+      for (iDim = 0; iDim < 3; iDim++){
+        Center_Aux[iDim] += VarCoord[iDim];
+        config->SetMarkerMotion_Origin(Center_Aux, jMarker);
+      }
     }
   }
 
@@ -6298,10 +6272,10 @@ void CSurfaceMovement::AeroelasticDeform(CGeometry *geometry, CConfig *config, u
   string Monitoring_Tag = config->GetMarker_Monitoring_TagBound(iMarker_Monitoring);
   
   /*--- Calculate the plunge displacement for the Typical Section Wing Model taking into account rotation ---*/
-  if (config->GetKind_GridMovement(ZONE_0) == AEROELASTIC_RIGID_MOTION) {
+  if (config->GetKind_GridMovement() == AEROELASTIC_RIGID_MOTION) {
     su2double Omega, dt, psi;
     dt = config->GetDelta_UnstTimeND();
-    Omega  = (config->GetRotation_Rate_Z(ZONE_0)/config->GetOmega_Ref());
+    Omega  = (config->GetRotation_Rate()[3]/config->GetOmega_Ref());
     psi = Omega*(dt*ExtIter);
     
     /*--- Correct for the airfoil starting position (This is hardcoded in here) ---*/
@@ -6369,19 +6343,18 @@ void CSurfaceMovement::SetBoundary_Flutter3D(CGeometry *geometry, CConfig *confi
   su2double Omega[3], Ampl[3];
   su2double DEG2RAD = PI_NUMBER/180.0;
   bool adjoint = config->GetContinuous_Adjoint();
-	
+  unsigned short iDim = 0, nDim = 3;
+  
   /*--- Retrieve values from the config file ---*/
   
   deltaT = config->GetDelta_UnstTimeND();
   
   /*--- Pitching origin, frequency, and amplitude from config. ---*/
   
-  Omega[0]  = (config->GetPitching_Omega_X(iZone)/config->GetOmega_Ref());
-  Omega[1]  = (config->GetPitching_Omega_Y(iZone)/config->GetOmega_Ref());
-  Omega[2]  = (config->GetPitching_Omega_Z(iZone)/config->GetOmega_Ref());
-  Ampl[0]   = config->GetPitching_Ampl_X(iZone)*DEG2RAD;
-  Ampl[1]   = config->GetPitching_Ampl_Y(iZone)*DEG2RAD;
-  Ampl[2]   = config->GetPitching_Ampl_Z(iZone)*DEG2RAD;
+  for (iDim = 0; iDim < 3; iDim++){
+    Omega[iDim] = config->GetPitching_Omega()[iDim]/config->GetOmega_Ref();
+    Ampl[iDim] = config->GetPitching_Ampl()[iDim]*DEG2RAD;
+  }
   
   /*--- Compute delta time based on physical time step ---*/
   
@@ -6542,8 +6515,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
   
   /*--- If rotating as well, prepare the rotation matrix ---*/
   
-  if (config->GetGrid_Movement() &&
-      config->GetKind_GridMovement(iZone) == EXTERNAL_ROTATION) {
+  if (config->GetKind_GridMovement() == EXTERNAL_ROTATION) {
     
     /*--- Variables needed only for rotation ---*/
     
@@ -6552,16 +6524,16 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
     su2double cosPhi, sinPhi, cosPsi, sinPsi;
     
     /*--- Center of rotation & angular velocity vector from config ---*/
-    Center[0] = config->GetMotion_Origin_X(iZone);
-    Center[1] = config->GetMotion_Origin_Y(iZone);
-    Center[2] = config->GetMotion_Origin_Z(iZone);
+    Center[0] = config->GetMotion_Origin()[0];
+    Center[1] = config->GetMotion_Origin()[1];
+    Center[2] = config->GetMotion_Origin()[2];
     
     /*--- Angular velocity vector from config ---*/
     
     dt = static_cast<su2double>(iter)*config->GetDelta_UnstTimeND();
-    Omega[0]  = config->GetRotation_Rate_X(iZone);
-    Omega[1]  = config->GetRotation_Rate_Y(iZone);
-    Omega[2]  = config->GetRotation_Rate_Z(iZone);
+    Omega[0]  = config->GetRotation_Rate()[0];
+    Omega[1]  = config->GetRotation_Rate()[1];
+    Omega[2]  = config->GetRotation_Rate()[2];
     
     /*--- For the unsteady adjoint, use reverse time ---*/
     if (adjoint) {
@@ -6622,8 +6594,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
          rotation matrix. It is assumed that the coordinates in
          Coord_Old have already been rotated using SetRigid_Rotation(). ---*/
         
-        if (config->GetGrid_Movement() &&
-            config->GetKind_GridMovement(iZone) == EXTERNAL_ROTATION) {
+        if (config->GetKind_GridMovement() == EXTERNAL_ROTATION) {
           
           /*--- Calculate non-dim. position from rotation center ---*/
           

From c0e624fecd1c8e7104bc3515bbfdd4dc1bbebf33 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 1 Apr 2019 11:43:25 +0200
Subject: [PATCH 131/539] Added check if volumetric deformation is needed

---
 Common/src/grid_movement_structure.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 200c3c424bc7..e9c3ae0d5181 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -67,11 +67,11 @@ CVolumetricMovement::CVolumetricMovement(CGeometry *geometry, CConfig *config) :
 	  nIterMesh = 0;
 
 	  /*--- Initialize matrix, solution, and r.h.s. structures for the linear solver. ---*/
-
-	  LinSysSol.Initialize(nPoint, nPointDomain, nVar, 0.0);
-	  LinSysRes.Initialize(nPoint, nPointDomain, nVar, 0.0);
-	  StiffMatrix.Initialize(nPoint, nPointDomain, nVar, nVar, false, geometry, config);
-
+    if (config->GetVolumetric_Movement()){
+      LinSysSol.Initialize(nPoint, nPointDomain, nVar, 0.0);
+      LinSysRes.Initialize(nPoint, nPointDomain, nVar, 0.0);
+      StiffMatrix.Initialize(nPoint, nPointDomain, nVar, nVar, false, geometry, config);
+    }
 }
 
 CVolumetricMovement::~CVolumetricMovement(void) { }

From d530e9a7fc271c301e727800ea1da09a16f0f854 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 1 Apr 2019 11:43:55 +0200
Subject: [PATCH 132/539] Memory fix in interpolation structure

---
 Common/src/interpolation_structure.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/src/interpolation_structure.cpp b/Common/src/interpolation_structure.cpp
index 3f0d1a81ccc0..352bde19ed9b 100644
--- a/Common/src/interpolation_structure.cpp
+++ b/Common/src/interpolation_structure.cpp
@@ -957,7 +957,7 @@ void CIsoparametric::Set_TransferCoeff(CConfig **config) {
         nNodes = (unsigned int)Buffer_Receive_FaceIndex[iProcessor*MaxFace_Donor+iFace+1] -
                 (unsigned int)Buffer_Receive_FaceIndex[iProcessor*MaxFace_Donor+iFace];
 
-        su2double *X = new su2double[nNodes*nDim];
+        su2double *X = new su2double[nNodes*(nDim+1)];
         faceindex = Buffer_Receive_FaceIndex[iProcessor*MaxFace_Donor+iFace]; // first index of this face
         for (iDonor=0; iDonor<nNodes; iDonor++) {
           jVertex = Buffer_Receive_FaceNodes[iDonor+faceindex]; // index which points to the stored coordinates, global points
@@ -1074,7 +1074,7 @@ void CIsoparametric::Isoparameters(unsigned short nDim, unsigned short nDonor,
   su2double *x_tmp = new su2double[nDim+1];
   su2double *Q     = new su2double[nDonor*nDonor];
   su2double *R     = new su2double[nDonor*nDonor];
-  su2double *A     = new su2double[nDim+1*nDonor];
+  su2double *A     = new su2double[(nDim+2)*nDonor];
   su2double *A2    = NULL;
   su2double *x2    = new su2double[nDim+1];
   

From 4960cbb820ffab1551e2e4402a2b09649c68ae7f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 12:05:50 +0200
Subject: [PATCH 133/539] More clear distinction between base and subconfig at
 allocation of config container.

Also removed dependency on nDim upon construction.
---
 Common/include/config_structure.hpp      |   5 +-
 Common/src/config_structure.cpp          |  27 ++++--
 SU2_CFD/include/driver_structure.hpp     |  12 ---
 SU2_CFD/src/SU2_CFD.cpp                  |  32 +++----
 SU2_CFD/src/driver_direct_multizone.cpp  |   2 -
 SU2_CFD/src/driver_direct_singlezone.cpp |   2 -
 SU2_CFD/src/driver_structure.cpp         |  51 ++++------
 SU2_DEF/src/SU2_DEF.cpp                  |   4 +-
 SU2_DOT/src/SU2_DOT.cpp                  |  10 +-
 SU2_GEO/src/SU2_GEO.cpp                  |   4 +-
 SU2_MSH/src/SU2_MSH.cpp                  | 116 +++++++++++------------
 SU2_SOL/src/SU2_SOL.cpp                  |  13 ++-
 12 files changed, 131 insertions(+), 147 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 1202a5dbd25e..9680966b4680 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -72,6 +72,7 @@ class CConfig {
 private:
   SU2_MPI::Comm SU2_Communicator; /*!< \brief MPI communicator of SU2.*/
   int rank, size;
+  bool base_config;
   unsigned short Kind_SU2; /*!< \brief Kind of SU2 software component.*/
   unsigned short Ref_NonDim; /*!< \brief Kind of non dimensionalization.*/
   unsigned short Ref_Inc_NonDim; /*!< \brief Kind of non dimensionalization.*/
@@ -1391,12 +1392,12 @@ class CConfig {
   /*!
    * \brief Constructor of the class which reads the input file.
    */
-  CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level);
+  CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_nZone, unsigned short verb_level);
   
   /*!
    * \brief Constructor of the class which reads the input file and uses default options from another config.
    */
-  CConfig(CConfig * config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level);
+  CConfig(CConfig * config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short verb_level);
   
   /*!
    * \brief Constructor of the class which reads the input file.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 6d4a619a8906..a22286963b6d 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -57,14 +57,16 @@ vector<double> GEMM_Profile_MaxTime;      /*!< \brief Maximum time spent for thi
 #include "../include/ad_structure.hpp"
 #include "../include/toolboxes/printing_toolbox.hpp"
 
-CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level) {
+CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_nZone, unsigned short verb_level) {
+  
+  base_config = true;
   
   /*--- Store MPI rank and size ---*/ 
   
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
-  iZone = val_iZone;
+  iZone = val_nZone;
   nZone = val_nZone;
 
   /*--- Initialize pointers to Null---*/
@@ -85,7 +87,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
   /*--- Configuration file postprocessing ---*/
 
-  SetPostprocessing(val_software, val_iZone, val_nDim);
+  SetPostprocessing(val_software, iZone, 0);
 
   /*--- Configuration file boundaries/markers setting ---*/
 
@@ -94,11 +96,15 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
   /*--- Configuration file output ---*/
 
   if ((rank == MASTER_NODE) && (verb_level == VERB_HIGH))
-    SetOutput(val_software, val_iZone);
+    SetOutput(val_software, iZone);
 
 }
 
-CConfig::CConfig(CConfig* base_config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nDim, unsigned short verb_level) {
+CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, unsigned short verb_level) {
+  
+  unsigned short val_nDim;
+  
+  base_config = false;
   
   /*--- Store MPI rank and size ---*/ 
   
@@ -122,11 +128,15 @@ CConfig::CConfig(CConfig* base_config, char case_filename[MAX_STRING_SIZE], unsi
   
   /*--- Set default options from base config ---*/
   
-  SetDefaultFromConfig(base_config);
+  SetDefaultFromConfig(config);
   
   /*--- Set the default values for all of the options that weren't set ---*/
       
   SetDefault();
+  
+  /*--- Get the dimension --- */
+  
+  val_nDim = GetnDim(Mesh_FileName, Mesh_FileFormat);
 
   /*--- Configuration file postprocessing ---*/
 
@@ -145,6 +155,8 @@ CConfig::CConfig(CConfig* base_config, char case_filename[MAX_STRING_SIZE], unsi
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software) {
 
+  base_config = true;
+  
   /*--- Store MPI rank and size ---*/ 
   
   rank = SU2_MPI::GetRank();
@@ -186,6 +198,8 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
 
+  base_config = true;
+  
   /*--- Store MPI rank and size ---*/ 
   
   rank = SU2_MPI::GetRank();
@@ -2546,6 +2560,7 @@ void CConfig::SetDefaultFromConfig(CConfig *config){
     curr_iter = iter++;   
     if (config->option_map[curr_iter->first]->GetValue().size() > 0){
       option_map[curr_iter->first]->SetValue(config->option_map[curr_iter->first]->GetValue());
+      all_options.erase(curr_iter);      
     }
   }
 }
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 79dbbbf63e8d..19e3ee202c49 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -119,7 +119,6 @@ class CDriver {
    */
   CDriver(char* confFile,
           unsigned short val_nZone,
-          unsigned short val_nDim,
           bool val_periodic,
           SU2_Comm MPICommunicator);
 
@@ -701,7 +700,6 @@ class CGeneralDriver : public CDriver {
    */
   CGeneralDriver(char* confFile,
                  unsigned short val_nZone,
-                 unsigned short val_nDim,
                  bool val_periodic,
                  SU2_Comm MPICommunicator);
 
@@ -765,7 +763,6 @@ class CFluidDriver : public CDriver {
    */
   CFluidDriver(char* confFile,
                unsigned short val_nZone,
-               unsigned short val_nDim,
                bool val_periodic,
                SU2_Comm MPICommunicator);
 
@@ -869,7 +866,6 @@ class CTurbomachineryDriver : public CFluidDriver {
    */
   CTurbomachineryDriver(char* confFile,
                         unsigned short val_nZone,
-                        unsigned short val_nDim,
                         bool val_periodic,
                         SU2_Comm MPICommunicator);
 
@@ -928,7 +924,6 @@ class CDiscAdjFluidDriver : public CFluidDriver {
     */
   CDiscAdjFluidDriver(char* confFile,
                    unsigned short val_nZone,
-                   unsigned short val_nDim,
                    bool val_periodic,
                    SU2_Comm MPICommunicator);
 
@@ -985,7 +980,6 @@ class CDiscAdjTurbomachineryDriver : public  CDiscAdjFluidDriver {
 	   */
   CDiscAdjTurbomachineryDriver(char* confFile,
                    unsigned short val_nZone,
-                   unsigned short val_nDim,
                    bool val_periodic,
                    SU2_Comm MPICommunicator);
 
@@ -1040,7 +1034,6 @@ class CHBDriver : public CDriver {
    */
   CHBDriver(char* confFile,
             unsigned short val_nZone,
-            unsigned short val_nDim,
             bool val_periodic,
             SU2_Comm MPICommunicator);
 
@@ -1115,7 +1108,6 @@ class CFSIDriver : public CDriver {
    */
   CFSIDriver(char* confFile,
              unsigned short val_nZone,
-             unsigned short val_nDim,
              bool val_periodic,
              SU2_Comm MPICommunicator);
 
@@ -1240,7 +1232,6 @@ class CDiscAdjFSIDriver : public CDriver {
    */
   CDiscAdjFSIDriver(char* confFile,
                     unsigned short val_nZone,
-                    unsigned short val_nDim,
                     bool val_periodic,
                     SU2_Comm MPICommunicator);
 
@@ -1484,7 +1475,6 @@ class CMultiphysicsZonalDriver : public CDriver {
    */
   CMultiphysicsZonalDriver(char* confFile,
                            unsigned short val_nZone,
-                           unsigned short val_nDim,
                            bool val_periodic,
                            SU2_Comm MPICommunicator);
 
@@ -1536,7 +1526,6 @@ class CSinglezoneDriver : public CDriver {
    */
   CSinglezoneDriver(char* confFile,
              unsigned short val_nZone,
-             unsigned short val_nDim,
              bool val_periodic,
              SU2_Comm MPICommunicator);
 
@@ -1619,7 +1608,6 @@ class CMultizoneDriver : public CDriver {
    */
   CMultizoneDriver(char* confFile,
              unsigned short val_nZone,
-             unsigned short val_nDim,
              bool val_periodic,
              SU2_Comm MPICommunicator);
 
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 7715d68a7136..44d7e4a90645 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -49,7 +49,7 @@ using namespace std;
 
 int main(int argc, char *argv[]) {
   
-  unsigned short nZone, nDim;
+  unsigned short nZone;
   char config_file_name[MAX_STRING_SIZE];
   bool fsi, turbo, zone_specific, periodic = false;
   
@@ -89,11 +89,7 @@ int main(int argc, char *argv[]) {
   
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_CFD);
-  if (config->GetKind_Solver() == MULTIZONE)
-    nZone  = config->GetnConfigFiles();
-  else
-    nZone  = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
-  nDim     = CConfig::GetnDim(config->GetMesh_FileName(), config->GetMesh_FileFormat());
+  nZone    = config->GetnZone();
   fsi      = config->GetFSI_Simulation();
   turbo    = config->GetBoolTurbomachinery();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
@@ -110,7 +106,7 @@ int main(int argc, char *argv[]) {
       SU2_MPI::Error("The required solver doesn't support multizone simulations", CURRENT_FUNCTION);
     }
 
-    driver = new CSinglezoneDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+    driver = new CSinglezoneDriver(config_file_name, nZone, periodic, MPICommunicator);
 
   }
   else if ( (config->GetKind_Solver() == FEM_ELASTICITY ||
@@ -122,19 +118,19 @@ int main(int argc, char *argv[]) {
       SU2_MPI::Error("The required solver doesn't support multizone simulations", CURRENT_FUNCTION);
     }
     
-    driver = new CGeneralDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+    driver = new CGeneralDriver(config_file_name, nZone, periodic, MPICommunicator);
 
-  } else if (config->GetKind_Solver() == MULTIZONE) {
+  } else if (config->GetMultizone_Problem() && !turbo) {
 
     /*--- Multizone Driver. ---*/
 
-    driver = new CMultizoneDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+    driver = new CMultizoneDriver(config_file_name, nZone, periodic, MPICommunicator);
 
   } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
 
     /*--- Harmonic balance problem: instantiate the Harmonic Balance driver class. ---*/
 
-    driver = new CHBDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+    driver = new CHBDriver(config_file_name, nZone, periodic, MPICommunicator);
 
   } else if ((nZone == 2) && fsi) {
 
@@ -144,7 +140,7 @@ int main(int argc, char *argv[]) {
     /*--- If the problem is a discrete adjoint FSI problem ---*/
     if (disc_adj_fsi) {
       if (stat_fsi) {
-        driver = new CDiscAdjFSIDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+        driver = new CDiscAdjFSIDriver(config_file_name, nZone, periodic, MPICommunicator);
       }
       else {
         SU2_MPI::Error("WARNING: There is no discrete adjoint implementation for dynamic FSI. ", CURRENT_FUNCTION);
@@ -152,11 +148,11 @@ int main(int argc, char *argv[]) {
     }
     /*--- If the problem is a direct FSI problem ---*/
     else{
-      driver = new CFSIDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+      driver = new CFSIDriver(config_file_name, nZone, periodic, MPICommunicator);
     }
 
   } else if (zone_specific) {
-    driver = new CMultiphysicsZonalDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+    driver = new CMultiphysicsZonalDriver(config_file_name, nZone, periodic, MPICommunicator);
   } else {
 
     /*--- Multi-zone problem: instantiate the multi-zone driver class by default
@@ -166,23 +162,23 @@ int main(int argc, char *argv[]) {
 
       if (turbo) {
 
-        driver = new CDiscAdjTurbomachineryDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+        driver = new CDiscAdjTurbomachineryDriver(config_file_name, nZone, periodic, MPICommunicator);
 
       } else {
 
-        driver = new CDiscAdjFluidDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+        driver = new CDiscAdjFluidDriver(config_file_name, nZone, periodic, MPICommunicator);
         
       }
 
     } else if (turbo) {
 
-      driver = new CTurbomachineryDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+      driver = new CTurbomachineryDriver(config_file_name, nZone, periodic, MPICommunicator);
 
     } else {
 
       /*--- Instantiate the class for external aerodynamics ---*/
 
-      driver = new CFluidDriver(config_file_name, nZone, nDim, periodic, MPICommunicator);
+      driver = new CFluidDriver(config_file_name, nZone, periodic, MPICommunicator);
       
     }
     
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index b0b186c58004..441d035a4da4 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -41,11 +41,9 @@
 
 CMultizoneDriver::CMultizoneDriver(char* confFile,
                        unsigned short val_nZone,
-                       unsigned short val_nDim,
                        bool val_periodic,
                        SU2_Comm MPICommunicator) : CDriver(confFile,
                                                           val_nZone,
-                                                          val_nDim,
                                                           val_periodic,
                                                           MPICommunicator) {
 
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index 9657af22a442..85a604dfc7b9 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -41,11 +41,9 @@
 
 CSinglezoneDriver::CSinglezoneDriver(char* confFile,
                        unsigned short val_nZone,
-                       unsigned short val_nDim,
                        bool val_periodic,
                        SU2_Comm MPICommunicator) : CDriver(confFile,
                                                           val_nZone,
-                                                          val_nDim,
                                                           val_periodic,
                                                           MPICommunicator) {
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index c44ef2350bed..3dc645591915 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -41,12 +41,12 @@
 #ifdef VTUNEPROF
 #include <ittnotify.h>
 #endif
+#include <fenv.h>
 
 CDriver::CDriver(char* confFile,
                  unsigned short val_nZone,
-                 unsigned short val_nDim,
                  bool val_periodic,
-                 SU2_Comm MPICommunicator):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), ExtIter(0), nZone(val_nZone), nDim(val_nDim), StopCalc(false), fsi(false), fem_solver(false) {
+                 SU2_Comm MPICommunicator):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), ExtIter(0), nZone(val_nZone), StopCalc(false), fsi(false), fem_solver(false) {
 
 
   unsigned short jZone, iSol;
@@ -190,6 +190,8 @@ CDriver::CDriver(char* confFile,
     }
 
   }
+  
+  nDim = geometry_container[ZONE_0][INST_0][MESH_0]->GetnDim();
 
   /*--- If activated by the compile directive, perform a partition analysis. ---*/
 #if PARTITION
@@ -785,7 +787,7 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
 
   /*--- Initialize the configuration of the driver ---*/
 
-  driver_config = new CConfig(config_file_name, SU2_CFD, ZONE_0, nZone, nDim, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_CFD, nZone, VERB_NONE);
 
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
@@ -797,12 +799,12 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
 
-    if (driver_config->GetKind_Solver() == MULTIZONE){
+    if (driver_config->GetnConfigFiles() > 0){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(zone_file_name, SU2_CFD, iZone, nZone, nDim, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_CFD, iZone, nZone, VERB_HIGH);
     }
     else{
-      config_container[iZone] = new CConfig(config_file_name, SU2_CFD, iZone, nZone, nDim, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_CFD, iZone, nZone, VERB_HIGH);
     }
 
     /*--- Set the MPI communicator ---*/
@@ -846,15 +848,17 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
 
       CGeometry *geometry_aux = NULL;
 
+      /*--- All ranks process the grid and call ParMETIS for partitioning ---*/
+
+      geometry_aux = new CPhysicalGeometry(config_container[iZone], iZone, nZone);
+      
+      nDim = geometry_aux->GetnDim();
+      
       /*--- For the FEM solver with time-accurate local time-stepping, use
        a dummy solver class to retrieve the initial flow state. ---*/
 
       CSolver *solver_aux = NULL;
-      if (fem_solver) solver_aux = new CFEM_DG_EulerSolver(config_container[iZone], nDim, MESH_0);
-
-      /*--- All ranks process the grid and call ParMETIS for partitioning ---*/
-
-      geometry_aux = new CPhysicalGeometry(config_container[iZone], iZone, nZone);
+      if (fem_solver) solver_aux = new CFEM_DG_EulerSolver(config_container[iZone], nDim, MESH_0);      
 
       /*--- Color the initial grid and set the send-receive domains (ParMETIS) ---*/
 
@@ -4031,11 +4035,9 @@ void CDriver::Output(unsigned long ExtIter) {
 
 CDriver::~CDriver(void) {}
 
-CGeneralDriver::CGeneralDriver(char* confFile, unsigned short val_nZone,
-                               unsigned short val_nDim, bool val_periodic,
+CGeneralDriver::CGeneralDriver(char* confFile, unsigned short val_nZone, bool val_periodic,
                                SU2_Comm MPICommunicator) : CDriver(confFile,
                                                                    val_nZone,
-                                                                   val_nDim,
                                                                    val_periodic,
                                                                    MPICommunicator) { }
 
@@ -4090,7 +4092,7 @@ void CGeneralDriver::DynamicMeshUpdate(unsigned long ExtIter) {
   }
 }
 
-CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, unsigned short val_nDim, bool val_periodic, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, val_nDim, val_periodic, MPICommunicator) { }
+CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, bool val_periodic, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, val_periodic, MPICommunicator) { }
 
 CFluidDriver::~CFluidDriver(void) { }
 
@@ -4194,10 +4196,8 @@ void CFluidDriver::DynamicMeshUpdate(unsigned long ExtIter) {
 }
 
 CTurbomachineryDriver::CTurbomachineryDriver(char* confFile,
-    unsigned short val_nZone,
-    unsigned short val_nDim, bool val_periodic, SU2_Comm MPICommunicator) : CFluidDriver(confFile,
+    unsigned short val_nZone, bool val_periodic, SU2_Comm MPICommunicator) : CFluidDriver(confFile,
         val_nZone,
-        val_nDim,
         val_periodic,
         MPICommunicator) { }
 
@@ -4419,11 +4419,9 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 }
 
 CDiscAdjFluidDriver::CDiscAdjFluidDriver(char* confFile,
-                                                 unsigned short val_nZone,
-                                                 unsigned short val_nDim, bool val_periodic,
+                                                 unsigned short val_nZone, bool val_periodic,
                                          SU2_Comm MPICommunicator) : CFluidDriver(confFile,
 																										 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	val_nZone,
-                                                                                    val_nDim,
                                                                                     val_periodic,
                                                                                     MPICommunicator) {
 
@@ -4798,9 +4796,8 @@ void CDiscAdjFluidDriver::DirectRun(){
 
 CDiscAdjTurbomachineryDriver::CDiscAdjTurbomachineryDriver(char* confFile,
                                                            unsigned short val_nZone,
-                                                           unsigned short val_nDim,
                                                            bool val_periodic,
-                                                           SU2_Comm MPICommunicator): CDiscAdjFluidDriver(confFile, val_nZone, val_nDim, val_periodic, MPICommunicator){ }
+                                                           SU2_Comm MPICommunicator): CDiscAdjFluidDriver(confFile, val_nZone, val_periodic, MPICommunicator){ }
 CDiscAdjTurbomachineryDriver::~CDiscAdjTurbomachineryDriver(){
 
 }
@@ -4905,11 +4902,9 @@ void CDiscAdjTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone
 
 CHBDriver::CHBDriver(char* confFile,
     unsigned short val_nZone,
-    unsigned short val_nDim,
     bool val_periodic,
     SU2_Comm MPICommunicator) : CDriver(confFile,
         val_nZone,
-        val_nDim,
         val_periodic,
         MPICommunicator) {
   unsigned short kInst;
@@ -5459,11 +5454,9 @@ void CHBDriver::ComputeHB_Operator() {
 
 CFSIDriver::CFSIDriver(char* confFile,
                        unsigned short val_nZone,
-                       unsigned short val_nDim,
                        bool val_periodic,
                        SU2_Comm MPICommunicator) : CDriver(confFile,
                                                            val_nZone,
-                                                           val_nDim,
                                                            val_periodic,
                                                            MPICommunicator) {
   unsigned short iVar;
@@ -5955,11 +5948,9 @@ void CFSIDriver::DynamicMeshUpdate(unsigned long ExtIter){
 
 CDiscAdjFSIDriver::CDiscAdjFSIDriver(char* confFile,
                                      unsigned short val_nZone,
-                                     unsigned short val_nDim,
                                      bool val_periodic,
                                      SU2_Comm MPICommunicator) : CDriver(confFile,
                                                                             val_nZone,
-                                                                            val_nDim,
                                                                             val_periodic,
                                                                             MPICommunicator) {
 
@@ -7510,11 +7501,9 @@ void CDiscAdjFSIDriver::Transfer_Tractions(unsigned short donorZone, unsigned sh
 
 CMultiphysicsZonalDriver::CMultiphysicsZonalDriver(char* confFile,
                                                    unsigned short val_nZone,
-                                                   unsigned short val_nDim,
                                                    bool val_periodic,
                                                    SU2_Comm MPICommunicator) : CDriver(confFile,
                                                                                        val_nZone,
-                                                                                       val_nDim,
                                                                                        val_periodic,
                                                                                        MPICommunicator) { }
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 226866f5efce..c7f63fbb1fea 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) {
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_DEF);
 
-  nZone    = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
+  nZone    = config->GetnZone();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
 
   /*--- Definition of the containers per zones ---*/
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
     
-    config_container[iZone] = new CConfig(config_file_name, SU2_DEF, iZone, nZone, 0, VERB_HIGH);
+    config_container[iZone] = new CConfig(config_file_name, SU2_DEF, nZone, VERB_HIGH);
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
     
     /*--- Definition of the geometry class to store the primal grid in the partitioning process. ---*/
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 967cae0961e9..4bf90e5d0bb1 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_DOT);
 
-  nZone    = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
+  nZone    = config->GetnZone();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
 
   /*--- Definition of the containers per zones ---*/
@@ -109,13 +109,13 @@ int main(int argc, char *argv[]) {
   }
   
   /*--- Initialize the configuration of the driver ---*/
-  driver_config = new CConfig(config_file_name, SU2_DOT, ZONE_0, nZone, 0, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_DOT, nZone, VERB_NONE);
 
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
 
   /*--- Store a boolean for multizone problems ---*/
-  multizone = (driver_config->GetKind_Solver() == MULTIZONE);
+  multizone = (driver_config->GetMultizone_Problem());
 
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
@@ -129,10 +129,10 @@ int main(int argc, char *argv[]) {
     
     if (multizone){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(zone_file_name, SU2_DOT, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
     }
     else{
-      config_container[iZone] = new CConfig(config_file_name, SU2_DOT, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
     }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
 
diff --git a/SU2_GEO/src/SU2_GEO.cpp b/SU2_GEO/src/SU2_GEO.cpp
index ceb97a9b9a44..fbc9ccc598a2 100644
--- a/SU2_GEO/src/SU2_GEO.cpp
+++ b/SU2_GEO/src/SU2_GEO.cpp
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_GEO);
 
-  nZone    = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
+  nZone    = config->GetnZone();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
 
   /*--- Definition of the containers per zones ---*/
@@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
     
-    config_container[iZone] = new CConfig(config_file_name, SU2_GEO, iZone, nZone, 0, VERB_HIGH);
+    config_container[iZone] = new CConfig(config_file_name, SU2_GEO, nZone, VERB_HIGH);
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
     
     /*--- Definition of the geometry class to store the primal grid in the partitioning process. ---*/
diff --git a/SU2_MSH/src/SU2_MSH.cpp b/SU2_MSH/src/SU2_MSH.cpp
index 09a57a3bc7ce..2d07222927d0 100644
--- a/SU2_MSH/src/SU2_MSH.cpp
+++ b/SU2_MSH/src/SU2_MSH.cpp
@@ -2,37 +2,37 @@
  * \file SU2_MSH.cpp
  * \brief Main file of Mesh Adaptation Code (SU2_MSH).
  * \author F. Palacios, T. Economon
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../include/SU2_MSH.hpp"
@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_MSH);
 
-  nZone    = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
+  nZone    = config->GetnZone();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
 
   /*--- Definition of the containers per zones ---*/
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
     
-    config_container[iZone] = new CConfig(config_file_name, SU2_MSH, iZone, nZone, 0, VERB_HIGH);
+    config_container[iZone] = new CConfig(config_file_name, SU2_MSH, nZone, VERB_HIGH);
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
     
     /*--- Definition of the geometry class to store the primal grid in the partitioning process. ---*/
@@ -323,30 +323,30 @@ int main(int argc, char *argv[]) {
     }
     
 	}
-  
-  if (rank == MASTER_NODE)
-    cout << endl <<"------------------------- Solver Postprocessing -------------------------" << endl;
-  
-  if (geometry_container != NULL) {
-    for (iZone = 0; iZone < nZone; iZone++) {
-      if (geometry_container[iZone] != NULL) {
-        delete geometry_container[iZone];
-      }
-    }
-    delete [] geometry_container;
-  }
-  if (rank == MASTER_NODE) cout << "Deleted CGeometry container." << endl;
-  
-  
-  if (config_container != NULL) {
-    for (iZone = 0; iZone < nZone; iZone++) {
-      if (config_container[iZone] != NULL) {
-        delete config_container[iZone];
-      }
-    }
-    delete [] config_container;
-  }
-  if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
+  
+  if (rank == MASTER_NODE)
+    cout << endl <<"------------------------- Solver Postprocessing -------------------------" << endl;
+  
+  if (geometry_container != NULL) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (geometry_container[iZone] != NULL) {
+        delete geometry_container[iZone];
+      }
+    }
+    delete [] geometry_container;
+  }
+  if (rank == MASTER_NODE) cout << "Deleted CGeometry container." << endl;
+  
+  
+  if (config_container != NULL) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (config_container[iZone] != NULL) {
+        delete config_container[iZone];
+      }
+    }
+    delete [] config_container;
+  }
+  if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
   
   delete config;
   config = NULL;
@@ -381,4 +381,4 @@ int main(int argc, char *argv[]) {
   return EXIT_SUCCESS;
   
 }
-
+
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 2fe936f744bb..4fbc245dd257 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -81,8 +81,7 @@ int main(int argc, char *argv[]) {
   CConfig *config = NULL;
   config = new CConfig(config_file_name, SU2_SOL);
 
-  if (config->GetKind_Solver() == MULTIZONE) nZone  = config->GetnConfigFiles();
-  else nZone  = CConfig::GetnZone(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
+  nZone = config->GetnZone();
   periodic = CConfig::GetPeriodic(config->GetMesh_FileName(), config->GetMesh_FileFormat(), config);
 
   /*--- Definition of the containers per zones ---*/
@@ -101,13 +100,13 @@ int main(int argc, char *argv[]) {
   }
 
   /*--- Initialize the configuration of the driver ---*/
-  driver_config = new CConfig(config_file_name, SU2_SOL, ZONE_0, nZone, 0, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_SOL, nZone,VERB_NONE);
 
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
 
   /*--- Store a boolean for multizone problems ---*/
-  multizone = (driver_config->GetKind_Solver() == MULTIZONE);
+  multizone = (config->GetMultizone_Problem());
 
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
@@ -121,17 +120,17 @@ int main(int argc, char *argv[]) {
 
     if (multizone){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(zone_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_SOL, iZone, nZone, VERB_HIGH);
     }
     else{
-      config_container[iZone] = new CConfig(config_file_name, SU2_SOL, iZone, nZone, 0, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_SOL, iZone, nZone, VERB_HIGH);
     }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
 
   }
 
   /*--- Set the multizone part of the problem. ---*/
-  if (driver_config->GetKind_Solver() == MULTIZONE){
+  if (config->GetMultizone_Problem()){
     for (iZone = 0; iZone < nZone; iZone++) {
       /*--- Set the interface markers for multizone ---*/
       config_container[iZone]->SetMultizone(driver_config, config_container);

From 7ede926d538c63d7611897e82d8922d35d97b0a7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 12:08:27 +0200
Subject: [PATCH 134/539] More fixes to grid and surface movement

---
 Common/include/config_structure.inl     |   2 +-
 Common/include/option_structure.hpp     |  24 +-
 Common/src/config_structure.cpp         | 209 ++++++------
 Common/src/grid_movement_structure.cpp  |  10 +-
 SU2_CFD/src/driver_direct_multizone.cpp |  14 +-
 SU2_CFD/src/driver_structure.cpp        |  55 +--
 SU2_CFD/src/iteration_structure.cpp     | 422 ++++++++++++------------
 SU2_CFD/src/numerics_adjoint_mean.cpp   |   8 +-
 SU2_CFD/src/numerics_direct_mean.cpp    |   6 +-
 SU2_CFD/src/solver_adjoint_mean.cpp     |   6 +-
 SU2_CFD/src/solver_direct_mean_fem.cpp  |   3 +-
 SU2_CFD/src/solver_structure.cpp        |   4 +-
 12 files changed, 383 insertions(+), 380 deletions(-)

diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 3fb2eca5164d..54fdaf17ac9b 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1589,7 +1589,7 @@ inline su2double CConfig::GetFixAzimuthalLine(void) { return FixAzimuthalLine; }
 
 inline su2double CConfig::GetCFLRedCoeff_Turb(void) { return CFLRedCoeff_Turb; }
 
-inline bool CConfig::GetGrid_Movement(void) { return (Kind_GridMovement != NO_MOVEMENT) || (nMarker_Moving > 0); }
+inline bool CConfig::GetGrid_Movement(void) { return (Kind_GridMovement != NO_MOVEMENT) || (nKind_SurfaceMovement > 0); }
 
 inline unsigned short CConfig::GetKind_SurfaceMovement(unsigned short iMarkerMoving){return Kind_SurfaceMovement[iMarkerMoving];}
 
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 82018bf23413..b859df1fc894 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -649,44 +649,46 @@ static const map<string, ENUM_CONDUCTIVITYMODEL_TURB> TurbConductivityModel_Map
 enum ENUM_GRIDMOVEMENT {
   NO_MOVEMENT = 0, /*!< \brief Simulation on a static mesh. */
   RIGID_MOTION = 2,		/*!< \brief Simulation with rigid mesh motion (plunging/pitching/rotation). */
-  FLUID_STRUCTURE = 3,		/*!< \brief Fluid structure deformation. */
-  EXTERNAL = 4,
-  EXTERNAL_ROTATION = 5,
   ROTATING_FRAME = 8,    /*!< \brief Simulation in a rotating frame. */
   ELASTICITY = 9,    /*!< \brief Linear Elasticity. */
   STEADY_TRANSLATION = 11,    /*!< \brief Simulation in a steadily translating frame. */
   GUST = 12, /*!< \brief Simulation on a static mesh with a gust. */
   MOVING_HTP = 13,    /*!< \brief Simulation with moving HTP (rotation). */
-  FLUID_STRUCTURE_STATIC = 14 /*!< \brief Fluid structure deformation with no grid velocity. */
 
 };
 
 static const map<string, ENUM_GRIDMOVEMENT> GridMovement_Map = CCreateMap<string, ENUM_GRIDMOVEMENT>
 ("NONE", NO_MOVEMENT)
 ("RIGID_MOTION", RIGID_MOTION)
-("FLUID_STRUCTURE", FLUID_STRUCTURE)
 ("ROTATING_FRAME", ROTATING_FRAME)
 ("ELASTICITY", ELASTICITY)
 ("MOVING_HTP", MOVING_HTP)
 ("STEADY_TRANSLATION", STEADY_TRANSLATION)
-("GUST", GUST)
-("FLUID_STRUCTURE_STATIC", FLUID_STRUCTURE_STATIC)
-("EXTERNAL", EXTERNAL)
-("EXTERNAL_ROTATION", EXTERNAL_ROTATION);
+("GUST", GUST);
+
 
 
 enum ENUM_SURFACEMOVEMENT {
   DEFORMING = 1,
   MOVING_WALL = 2,
   AEROELASTIC = 3,    /*!< \brief Simulation with aeroelastic motion. */
-  AEROELASTIC_RIGID_MOTION = 4 /*!< \brief Simulation with rotation and aeroelastic motion. */
+  AEROELASTIC_RIGID_MOTION = 4, /*!< \brief Simulation with rotation and aeroelastic motion. */
+  FLUID_STRUCTURE = 5,		/*!< \brief Fluid structure deformation. */
+  EXTERNAL = 6,
+  EXTERNAL_ROTATION = 7,
+  FLUID_STRUCTURE_STATIC = 8 /*!< \brief Fluid structure deformation with no grid velocity. */
+  
 };
 
 static const map<string, ENUM_SURFACEMOVEMENT> SurfaceMovement_Map = CCreateMap<string, ENUM_SURFACEMOVEMENT>
 ("DEFORMING", DEFORMING)
 ("MOVING_WALL", MOVING_WALL)
 ("AEROELASTIC_RIGID_MOTION", AEROELASTIC_RIGID_MOTION)
-("AEROELASTIC", AEROELASTIC);
+("AEROELASTIC", AEROELASTIC)
+("FLUID_STRUCTURE_STATIC", FLUID_STRUCTURE_STATIC)
+("FLUID_STRUCTURE", FLUID_STRUCTURE)
+("EXTERNAL", EXTERNAL)
+("EXTERNAL_ROTATION", EXTERNAL_ROTATION);
 
 
 /*!
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index a22286963b6d..81c9319ca2d1 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3146,59 +3146,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     
   }
   
-  /*--- Force number of span-wise section to 1 if 2D case ---*/
-  if(val_nDim ==2){
-    nSpanWiseSections_User=1;
-    Kind_SpanWise= EQUISPACED;
+  if (nKind_SurfaceMovement > 1 && GetSurface_Movement(FLUID_STRUCTURE)){
+    SU2_MPI::Error("FSI in combination with moving surfaces is currently not supported.", CURRENT_FUNCTION);    
   }
 
-  /*--- Set number of TurboPerformance markers ---*/
-  if(nMarker_Turbomachinery > 0){
-    if(nMarker_Turbomachinery > 1){
-      nMarker_TurboPerformance = nMarker_Turbomachinery + SU2_TYPE::Int(nMarker_Turbomachinery/2) + 1;
-    }else{
-      nMarker_TurboPerformance = nMarker_Turbomachinery;
-    }
-  } else {
-    nMarker_TurboPerformance = 0;
-    nSpanWiseSections =1;
-  }
-
-  /*--- Set number of TurboPerformance markers ---*/
-  if(nMarker_Turbomachinery != 0){
-    nSpan_iZones = new unsigned short[nZone];
-  }
-
-  /*--- Set number of TurboPerformance markers ---*/
-  if(RampRotatingFrame && !DiscreteAdjoint){
-      FinalRotation_Rate_Z = Rotation_Rate[3];
-      if(abs(FinalRotation_Rate_Z) > 0.0){
-        Rotation_Rate[3] = RampRotatingFrame_Coeff[0];
-      }
-    
-  }
-
-  if(RampOutletPressure && !DiscreteAdjoint){
-    for (iMarker = 0; iMarker < nMarker_Giles; iMarker++){
-      if (Kind_Data_Giles[iMarker] == STATIC_PRESSURE || Kind_Data_Giles[iMarker] == STATIC_PRESSURE_1D || Kind_Data_Giles[iMarker] == RADIAL_EQUILIBRIUM ){
-        FinalOutletPressure   = Giles_Var1[iMarker];
-        Giles_Var1[iMarker] = RampOutletPressure_Coeff[0];
-      }
-    }
-    for (iMarker = 0; iMarker < nMarker_Riemann; iMarker++){
-      if (Kind_Data_Riemann[iMarker] == STATIC_PRESSURE || Kind_Data_Riemann[iMarker] == RADIAL_EQUILIBRIUM){
-        FinalOutletPressure      = Riemann_Var1[iMarker];
-        Riemann_Var1[iMarker] = RampOutletPressure_Coeff[0];
-      }
-    }
-  }
-
-  /*--- Check on extra Relaxation factor for Giles---*/
-  if(ExtraRelFacGiles[1] > 0.5){
-    ExtraRelFacGiles[1] = 0.5;
-  }
-
-  if (nKind_SurfaceMovement != nMarker_Moving){
+  if (nKind_SurfaceMovement != nMarker_Moving && !GetSurface_Movement(FLUID_STRUCTURE)){
     SU2_MPI::Error("Number of KIND_SURFACE_MOVEMENT must match number of MARKER_MOVING", CURRENT_FUNCTION);
   }
 
@@ -3206,10 +3158,24 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
-  if (Time_Domain && Unsteady_Simulation == STEADY){
-    SU2_MPI::Error("UNSTEADY_SIMULATION must be different from STEADY (default) if TIME_DOMAIN=YES", CURRENT_FUNCTION);
-  }
+  /*--- Fluid-Structure Interaction problems ---*/
 
+  if (FSI_Problem) {
+    unsigned short* new_surface_movement = new unsigned short[nMarker_Moving + 1];
+    for (unsigned short iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++){
+      new_surface_movement[iMarker_Moving] = Kind_SurfaceMovement[iMarker_Moving];
+    }
+    if (nKind_SurfaceMovement != 0) delete [] Kind_SurfaceMovement;
+    Kind_SurfaceMovement = new_surface_movement;
+    nKind_SurfaceMovement++;
+    if ((Dynamic_Analysis == STATIC) && (Unsteady_Simulation == STEADY)) {
+      Kind_SurfaceMovement[nMarker_Moving] = FLUID_STRUCTURE_STATIC;
+    }
+    else{
+      Kind_SurfaceMovement[nMarker_Moving] = FLUID_STRUCTURE;
+    }
+  }
+  
   /*--- If we're solving a purely steady problem with no prescribed grid
    movement (both rotating frame and moving walls can be steady), make sure that
    there is no grid motion ---*/
@@ -3220,8 +3186,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       
       if((Kind_GridMovement != ROTATING_FRAME) &&
          (Kind_GridMovement != STEADY_TRANSLATION) &&
-         (Kind_GridMovement != FLUID_STRUCTURE) && 
-         (Kind_GridMovement != FLUID_STRUCTURE_STATIC) &&
          (Kind_GridMovement != NONE)){
         SU2_MPI::Error("Unsupported kind of grid movement for steady state problems.", CURRENT_FUNCTION);      
       }
@@ -3232,7 +3196,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       }  
     } 
   }
-
+  
   /*--- The Line Search should be applied only in the deformation stage. ---*/
 
   if (Kind_SU2 != SU2_DEF) {
@@ -3385,7 +3349,58 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       }
   	}
   }
+  
+  /*--- Force number of span-wise section to 1 if 2D case ---*/
+  if(val_nDim ==2){
+    nSpanWiseSections_User=1;
+    Kind_SpanWise= EQUISPACED;
+  }
 
+  /*--- Set number of TurboPerformance markers ---*/
+  if(nMarker_Turbomachinery > 0){
+    if(nMarker_Turbomachinery > 1){
+      nMarker_TurboPerformance = nMarker_Turbomachinery + SU2_TYPE::Int(nMarker_Turbomachinery/2) + 1;
+    }else{
+      nMarker_TurboPerformance = nMarker_Turbomachinery;
+    }
+  } else {
+    nMarker_TurboPerformance = 0;
+    nSpanWiseSections =1;
+  }
+
+  /*--- Set number of TurboPerformance markers ---*/
+  if(nMarker_Turbomachinery != 0){
+    nSpan_iZones = new unsigned short[nZone];
+  }
+
+  /*--- Set number of TurboPerformance markers ---*/
+  if(GetGrid_Movement() && RampRotatingFrame && !DiscreteAdjoint){
+      FinalRotation_Rate_Z = Rotation_Rate[2];
+      if(abs(FinalRotation_Rate_Z) > 0.0){
+        Rotation_Rate[2] = RampRotatingFrame_Coeff[0];
+      }
+    
+  }
+
+  if(RampOutletPressure && !DiscreteAdjoint){
+    for (iMarker = 0; iMarker < nMarker_Giles; iMarker++){
+      if (Kind_Data_Giles[iMarker] == STATIC_PRESSURE || Kind_Data_Giles[iMarker] == STATIC_PRESSURE_1D || Kind_Data_Giles[iMarker] == RADIAL_EQUILIBRIUM ){
+        FinalOutletPressure   = Giles_Var1[iMarker];
+        Giles_Var1[iMarker] = RampOutletPressure_Coeff[0];
+      }
+    }
+    for (iMarker = 0; iMarker < nMarker_Riemann; iMarker++){
+      if (Kind_Data_Riemann[iMarker] == STATIC_PRESSURE || Kind_Data_Riemann[iMarker] == RADIAL_EQUILIBRIUM){
+        FinalOutletPressure      = Riemann_Var1[iMarker];
+        Riemann_Var1[iMarker] = RampOutletPressure_Coeff[0];
+      }
+    }
+  }
+
+  /*--- Check on extra Relaxation factor for Giles---*/
+  if(ExtraRelFacGiles[1] > 0.5){
+    ExtraRelFacGiles[1] = 0.5;
+  }
     /*--- Use the various rigid-motion input frequencies to determine the period to be used with harmonic balance cases.
      There are THREE types of motion to consider, namely: rotation, pitching, and plunging.
      The largest period of motion is the one to be used for harmonic balance  calculations. ---*/
@@ -3558,17 +3573,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       Aeroelastic_plunge[iMarker] = 0.0;
     }
   }
-
-  /*--- Fluid-Structure Interaction problems ---*/
-
-  if (FSI_Problem) {
-    if ((Dynamic_Analysis == STATIC) && (Unsteady_Simulation == STEADY)) {
-      Kind_GridMovement = FLUID_STRUCTURE_STATIC;
-    }
-    else{
-      Kind_GridMovement = FLUID_STRUCTURE;
-    }
-  }
   
   if (MGCycle == FULLMG_CYCLE) FinestMesh = nMGLevels;
   else FinestMesh = MESH_0;
@@ -5110,29 +5114,31 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       cout << "The reference length is " << RefLength;
       if (SystemMeasurements == US) cout << " ft." << endl; else cout << " m." << endl;
 
-      if ((nRefOriginMoment_X > 1) || (nRefOriginMoment_Y > 1) || (nRefOriginMoment_Z > 1)) {
-        cout << "Surface(s) where the force coefficients are evaluated and \n";
-        cout << "their reference origin for moment computation: \n";
-
-        for (iMarker_Monitoring = 0; iMarker_Monitoring < nMarker_Monitoring; iMarker_Monitoring++) {
-          cout << "   - " << Marker_Monitoring[iMarker_Monitoring] << " (" << RefOriginMoment_X[iMarker_Monitoring] <<", "<<RefOriginMoment_Y[iMarker_Monitoring] <<", "<< RefOriginMoment_Z[iMarker_Monitoring] << ")";
-          if (iMarker_Monitoring < nMarker_Monitoring-1) cout << ".\n";
-          else {
-          if (SystemMeasurements == US) cout <<" ft."<< endl;
-          else cout <<" m."<< endl;
+      if (nMarker_Monitoring != 0){
+        if ((nRefOriginMoment_X > 1) || (nRefOriginMoment_Y > 1) || (nRefOriginMoment_Z > 1)) {
+          cout << "Surface(s) where the force coefficients are evaluated and \n";
+          cout << "their reference origin for moment computation: \n";
+          
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nMarker_Monitoring; iMarker_Monitoring++) {
+            cout << "   - " << Marker_Monitoring[iMarker_Monitoring] << " (" << RefOriginMoment_X[iMarker_Monitoring] <<", "<<RefOriginMoment_Y[iMarker_Monitoring] <<", "<< RefOriginMoment_Z[iMarker_Monitoring] << ")";
+            if (iMarker_Monitoring < nMarker_Monitoring-1) cout << ".\n";
+            else {
+              if (SystemMeasurements == US) cout <<" ft."<< endl;
+              else cout <<" m."<< endl;
+            }
+            
           }
-
         }
-      }
-      else {
-        cout << "Reference origin for moment evaluation is (" << RefOriginMoment_X[0] << ", " << RefOriginMoment_Y[0] << ", " << RefOriginMoment_Z[0] << ")." << endl;
-        cout << "Surface(s) where the force coefficients are evaluated: ";
-        for (iMarker_Monitoring = 0; iMarker_Monitoring < nMarker_Monitoring; iMarker_Monitoring++) {
-          cout << Marker_Monitoring[iMarker_Monitoring];
-          if (iMarker_Monitoring < nMarker_Monitoring-1) cout << ", ";
-          else cout <<"."<< endl;
+        else {
+          cout << "Reference origin for moment evaluation is (" << RefOriginMoment_X[0] << ", " << RefOriginMoment_Y[0] << ", " << RefOriginMoment_Z[0] << ")." << endl;
+          cout << "Surface(s) where the force coefficients are evaluated: ";
+          for (iMarker_Monitoring = 0; iMarker_Monitoring < nMarker_Monitoring; iMarker_Monitoring++) {
+            cout << Marker_Monitoring[iMarker_Monitoring];
+            if (iMarker_Monitoring < nMarker_Monitoring-1) cout << ", ";
+            else cout <<"."<< endl;
+          }
+          cout<< endl;
         }
-        cout<< endl;
       }
     }
     
@@ -6796,7 +6802,7 @@ CConfig::~CConfig(void) {
   /*--- Delete all of the option objects in the global option map ---*/
     
   for(map<string, COptionBase*>::iterator itr = option_map.begin(); itr != option_map.end(); itr++) {
-    delete itr->second;
+//    delete itr->second;
   }
 
   if (TimeDOFsADER_DG           != NULL) delete [] TimeDOFsADER_DG;
@@ -7803,24 +7809,23 @@ void CConfig::SetnPeriodicIndex(unsigned short val_index) {
 
 bool CConfig::GetVolumetric_Movement(){
   bool volumetric_movement = false;
-  if (GetGrid_Movement()){
-    switch(Kind_GridMovement){
-    case FLUID_STRUCTURE: case EXTERNAL: case EXTERNAL_ROTATION:
-    case FLUID_STRUCTURE_STATIC:
-      volumetric_movement = true;
-      break;
-    }
-    if (GetSurface_Movement(AEROELASTIC) || 
-        GetSurface_Movement(DEFORMING) ||
-        GetSurface_Movement(AEROELASTIC_RIGID_MOTION)){
-      volumetric_movement = true;
-    }
+  
+  if (GetSurface_Movement(AEROELASTIC) || 
+      GetSurface_Movement(DEFORMING) ||
+      GetSurface_Movement(AEROELASTIC_RIGID_MOTION)||
+      GetSurface_Movement(FLUID_STRUCTURE) ||
+      GetSurface_Movement(FLUID_STRUCTURE_STATIC) ||
+      GetSurface_Movement(EXTERNAL) || 
+      GetSurface_Movement(EXTERNAL_ROTATION)){
+    volumetric_movement = true;
   }
+  
+  if (Kind_SU2 == SU2_DEF){ volumetric_movement = true;}
   return volumetric_movement;
 }
 
 bool CConfig::GetSurface_Movement(unsigned short kind_movement){
-  for (unsigned short iMarkerMoving = 0; iMarkerMoving < nMarker_Moving; iMarkerMoving++){
+  for (unsigned short iMarkerMoving = 0; iMarkerMoving < nKind_SurfaceMovement; iMarkerMoving++){
     if (Kind_SurfaceMovement[iMarkerMoving] == kind_movement){
       return true;
     }
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index e9c3ae0d5181..b1c2363a065a 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -9313,7 +9313,9 @@ void CElasticityMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig
 
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
 
-    if ((config->GetMarker_All_ZoneInterface(iMarker) != 0) && (Kind_SU2 == SU2_CFD)) {
+    if ((config->GetMarker_All_ZoneInterface(iMarker) != 0 || 
+         config->GetMarker_All_Moving(iMarker)) 
+        && (Kind_SU2 == SU2_CFD)) {
 
       for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
 
@@ -9331,13 +9333,15 @@ void CElasticityMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig
         }
       }
     }
-  }
+  } 
   StiffMatrix.SendReceive_Solution(LinSysSol, geometry, config);
 
   /*--- Apply displacement boundary conditions to the FSI interfaces. ---*/
 
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if ((config->GetMarker_All_ZoneInterface(iMarker) != 0) && (Kind_SU2 == SU2_CFD)) {
+    if ((config->GetMarker_All_ZoneInterface(iMarker) != 0 || 
+         config->GetMarker_All_Moving(iMarker)) 
+        && (Kind_SU2 == SU2_CFD)) {
       SetMoving_Boundary(geometry, config, iMarker);
     }
   }
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 441d035a4da4..47bab2e8c54d 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -112,16 +112,20 @@ CMultizoneDriver::CMultizoneDriver(char* confFile,
   prefixed_motion = new bool[nZone];
   for (iZone = 0; iZone < nZone; iZone++){
     switch (config_container[iZone]->GetKind_GridMovement()){
-      case RIGID_MOTION: case DEFORMING:
-      case EXTERNAL: case EXTERNAL_ROTATION:
-      case AEROELASTIC: case AEROELASTIC_RIGID_MOTION:
+      case RIGID_MOTION: 
       case ELASTICITY:
         prefixed_motion[iZone] = true; break;
-      case FLUID_STRUCTURE: case FLUID_STRUCTURE_STATIC:
-      case STEADY_TRANSLATION: case MOVING_WALL: case ROTATING_FRAME:
+      case STEADY_TRANSLATION: case ROTATING_FRAME:
       case NO_MOVEMENT: case GUST: default:
         prefixed_motion[iZone] = false; break;
     }
+    if (config_container[iZone]->GetSurface_Movement(AEROELASTIC) || 
+        config_container[iZone]->GetSurface_Movement(AEROELASTIC_RIGID_MOTION) ||
+        config_container[iZone]->GetSurface_Movement(DEFORMING) ||
+        config_container[iZone]->GetSurface_Movement(EXTERNAL) ||
+        config_container[iZone]->GetSurface_Movement(EXTERNAL_ROTATION)){
+      prefixed_motion[iZone] = true;
+    }
   }
 
 }
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 3dc645591915..1442ace0de71 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -384,7 +384,7 @@ CDriver::CDriver(char* confFile,
     if (!fem_solver && (config_container[iZone]->GetGrid_Movement() ||
                         (config_container[iZone]->GetDirectDiff() == D_DESIGN))) {
       if (rank == MASTER_NODE)
-        cout << "Setting dynamic mesh structure for zone "<< iZone + 1<<"." << endl;
+        cout << "Setting dynamic mesh structure for zone "<< iZone <<"." << endl;
       for (iInst = 0; iInst < nInst[iZone]; iInst++){
         grid_movement[iZone][iInst] = new CVolumetricMovement(geometry_container[iZone][iInst][MESH_0], config_container[iZone]);
       }
@@ -426,9 +426,10 @@ CDriver::CDriver(char* confFile,
       }
     }
 
-    if (config_container[iZone]->GetKind_GridMovement(iZone) == FLUID_STRUCTURE_STATIC){
+    if (config_container[iZone]->GetSurface_Movement(FLUID_STRUCTURE_STATIC) ||
+        config_container[iZone]->GetSurface_Movement(FLUID_STRUCTURE)){
       if (rank == MASTER_NODE)
-        cout << "Setting moving mesh structure for static FSI problems." << endl;
+        cout << "Setting moving mesh structure for FSI problems." << endl;
       /*--- Instantiate the container for the grid movement structure ---*/
       for (iInst = 0; iInst < nInst[iZone]; iInst++)
         grid_movement[iZone][iInst] = new CElasticityMovement(geometry_container[iZone][iInst][MESH_0], config_container[iZone]);
@@ -452,8 +453,8 @@ CDriver::CDriver(char* confFile,
        Not for the FEM solver, because this is handled later, because
        the integration points must be known. ---*/
   if( !fem_solver ) {
-    Kind_Grid_Movement = config_container[ZONE_0]->GetKind_GridMovement(ZONE_0);
-    initStaticMovement = (config_container[ZONE_0]->GetGrid_Movement() && (Kind_Grid_Movement == MOVING_WALL
+    Kind_Grid_Movement = config_container[ZONE_0]->GetKind_GridMovement();
+    initStaticMovement = (config_container[ZONE_0]->GetGrid_Movement() && (config_container[ZONE_0]->GetSurface_Movement(MOVING_WALL)
                           || Kind_Grid_Movement == ROTATING_FRAME || Kind_Grid_Movement == STEADY_TRANSLATION));
 
 
@@ -814,7 +815,7 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
   }
 
   /*--- Set the multizone part of the problem. ---*/
-  if (driver_config->GetKind_Solver() == MULTIZONE){
+  if (driver_config->GetMultizone_Problem()){
     for (iZone = 0; iZone < nZone; iZone++) {
       /*--- Set the interface markers for multizone ---*/
       config_container[iZone]->SetMultizone(driver_config, config_container);
@@ -1139,7 +1140,7 @@ void CDriver::Geometrical_Preprocessing_DGFEM() {
       DGMesh->CoordinatesSolDOFs();
 
       /*--- Initialize the static mesh movement, if necessary. ---*/
-      const unsigned short Kind_Grid_Movement = config_container[iZone]->GetKind_GridMovement(iZone);
+      const unsigned short Kind_Grid_Movement = config_container[iZone]->GetKind_GridMovement();
       const bool initStaticMovement = (config_container[iZone]->GetGrid_Movement() &&
                                       (Kind_Grid_Movement == MOVING_WALL    ||
                                        Kind_Grid_Movement == ROTATING_FRAME ||
@@ -3570,27 +3571,10 @@ void CDriver::InitStaticMeshMovement(){
   unsigned short Kind_Grid_Movement;
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    Kind_Grid_Movement = config_container[iZone]->GetKind_GridMovement(iZone);
+    Kind_Grid_Movement = config_container[iZone]->GetKind_GridMovement();
 
     switch (Kind_Grid_Movement) {
 
-    case MOVING_WALL:
-
-      /*--- Fixed wall velocities: set the grid velocities only one time
-         before the first iteration flow solver. ---*/
-      if (rank == MASTER_NODE)
-        cout << endl << " Setting the moving wall velocities." << endl;
-
-      surface_movement[iZone]->Moving_Walls(geometry_container[iZone][INST_0][MESH_0],
-          config_container[iZone], iZone, 0);
-
-      /*--- Update the grid velocities on the coarser multigrid levels after
-           setting the moving wall velocities for the finest mesh. ---*/
-      for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        grid_movement[iZone][iInst]->UpdateMultiGrid(geometry_container[iZone][iInst], config_container[iZone]);
-      break;
-
-
     case ROTATING_FRAME:
 
       /*--- Steadily rotating frame: set the grid velocities just once
@@ -3629,6 +3613,23 @@ void CDriver::InitStaticMeshMovement(){
 
       break;
     }
+
+    if (config_container[iZone]->GetnMarker_Moving() > 0){
+      
+      /*--- Fixed wall velocities: set the grid velocities only one time
+       before the first iteration flow solver. ---*/
+      if (rank == MASTER_NODE)
+        cout << endl << " Setting the moving wall velocities." << endl;
+      
+      surface_movement[iZone]->Moving_Walls(geometry_container[iZone][INST_0][MESH_0],
+                                            config_container[iZone], iZone, 0);
+      
+      /*--- Update the grid velocities on the coarser multigrid levels after
+         setting the moving wall velocities for the finest mesh. ---*/
+      for (iInst = 0; iInst < nInst[iZone]; iInst++)
+        grid_movement[iZone][iInst]->UpdateMultiGrid(geometry_container[iZone][iInst], config_container[iZone]);
+      
+    }
   }
 }
 
@@ -4339,10 +4340,10 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
     if(ExtIter % rampFreq == 0 &&  ExtIter <= finalRamp_Iter){
 
       for (iZone = 0; iZone < nZone; iZone++) {
-        rot_z_final = config_container[iZone]->GetFinalRotation_Rate_Z(iZone);
+        rot_z_final = config_container[iZone]->GetFinalRotation_Rate_Z();
         if(abs(rot_z_final) > 0.0){
           rot_z = rot_z_ini + ExtIter*( rot_z_final - rot_z_ini)/finalRamp_Iter;
-          config_container[iZone]->SetRotation_Rate_Z(rot_z, iZone);
+          config_container[iZone]->GetRotation_Rate()[2] = rot_z;
           if(rank == MASTER_NODE && print && ExtIter > 0) {
             cout << endl << " Updated rotating frame grid velocities";
             cout << " for zone " << iZone << "." << endl;
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 6f4d014bdb9e..6294d59e6369 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -63,7 +63,7 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
           unsigned long ExtIter)   {
 
   unsigned short iDim;
-  unsigned short Kind_Grid_Movement = config_container[val_iZone]->GetKind_GridMovement(val_iZone);
+  unsigned short Kind_Grid_Movement = config_container[val_iZone]->GetKind_GridMovement();
   unsigned long nIterMesh;
   unsigned long iPoint;
   bool stat_mesh = true;
@@ -75,7 +75,7 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
    so that the meshes are positioned correctly for each instance. ---*/
   if (harmonic_balance) {
     ExtIter = val_iInst;
-    Kind_Grid_Movement = config_container[val_iZone]->GetKind_GridMovement(ZONE_0);
+    Kind_Grid_Movement = config_container[val_iZone]->GetKind_GridMovement();
   }
 
   /*--- Perform mesh movement depending on specified type ---*/
@@ -107,182 +107,6 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
 
       break;
 
-    case DEFORMING:
-
-      if (rank == MASTER_NODE)
-        cout << endl << " Updating surface positions." << endl;
-
-      /*--- Translating ---*/
-
-      /*--- Compute the new node locations for moving markers ---*/
-
-      surface_movement[val_iZone]->Surface_Translating(geometry_container[val_iZone][val_iInst][MESH_0],
-                                            config_container[val_iZone], ExtIter, val_iZone);
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
-
-      /*--- Plunging ---*/
-
-      /*--- Compute the new node locations for moving markers ---*/
-
-      surface_movement[val_iZone]->Surface_Plunging(geometry_container[val_iZone][val_iInst][MESH_0],
-                                         config_container[val_iZone], ExtIter, val_iZone);
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
-
-      /*--- Pitching ---*/
-
-      /*--- Compute the new node locations for moving markers ---*/
-
-      surface_movement[val_iZone]->Surface_Pitching(geometry_container[val_iZone][val_iInst][MESH_0],
-                                         config_container[val_iZone], ExtIter, val_iZone);
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
-
-      /*--- Rotating ---*/
-
-      /*--- Compute the new node locations for moving markers ---*/
-
-      surface_movement[val_iZone]->Surface_Rotating(geometry_container[val_iZone][val_iInst][MESH_0],
-                                         config_container[val_iZone], ExtIter, val_iZone);
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
-
-      /*--- Update the grid velocities on the fine mesh using finite
-       differencing based on node coordinates at previous times. ---*/
-
-      if (!adjoint) {
-        if (rank == MASTER_NODE)
-          cout << " Computing grid velocities by finite differencing." << endl;
-        geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
-      }
-
-      /*--- Update the multigrid structure after moving the finest grid,
-       including computing the grid velocities on the coarser levels. ---*/
-
-      grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-
-      break;
-
-    case EXTERNAL: case EXTERNAL_ROTATION:
-
-      /*--- Apply rigid rotation to entire grid first, if necessary ---*/
-
-      if (Kind_Grid_Movement == EXTERNAL_ROTATION) {
-        if (rank == MASTER_NODE)
-          cout << " Updating node locations by rigid rotation." << endl;
-        grid_movement[val_iZone][val_iInst]->Rigid_Rotation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                      config_container[val_iZone], val_iZone, ExtIter);
-      }
-
-      /*--- Load new surface node locations from external files ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Updating surface locations from file." << endl;
-      surface_movement[val_iZone]->SetExternal_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                                config_container[val_iZone], val_iZone, ExtIter);
-
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if (rank == MASTER_NODE)
-        cout << " Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
-
-      /*--- Update the grid velocities on the fine mesh using finite
-       differencing based on node coordinates at previous times. ---*/
-
-      if (!adjoint) {
-        if (rank == MASTER_NODE)
-          cout << " Computing grid velocities by finite differencing." << endl;
-        geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
-      }
-
-      /*--- Update the multigrid structure after moving the finest grid,
-       including computing the grid velocities on the coarser levels. ---*/
-
-      grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-
-      break;
-
-    case AEROELASTIC: case AEROELASTIC_RIGID_MOTION:
-
-      /*--- Apply rigid mesh transformation to entire grid first, if necessary ---*/
-      if (IntIter == 0) {
-        if (Kind_Grid_Movement == AEROELASTIC_RIGID_MOTION) {
-
-          if (rank == MASTER_NODE) {
-            cout << endl << " Performing rigid mesh transformation." << endl;
-          }
-
-          /*--- Move each node in the volume mesh using the specified type
-           of rigid mesh motion. These routines also compute analytic grid
-           velocities for the fine mesh. ---*/
-
-          grid_movement[val_iZone][val_iInst]->Rigid_Translation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], val_iZone, ExtIter);
-          grid_movement[val_iZone][val_iInst]->Rigid_Plunging(geometry_container[val_iZone][val_iInst][MESH_0],
-                                        config_container[val_iZone], val_iZone, ExtIter);
-          grid_movement[val_iZone][val_iInst]->Rigid_Pitching(geometry_container[val_iZone][val_iInst][MESH_0],
-                                        config_container[val_iZone], val_iZone, ExtIter);
-          grid_movement[val_iZone][val_iInst]->Rigid_Rotation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                        config_container[val_iZone], val_iZone, ExtIter);
-
-          /*--- Update the multigrid structure after moving the finest grid,
-           including computing the grid velocities on the coarser levels. ---*/
-
-          grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-        }
-
-      }
-
-      /*--- Use the if statement to move the grid only at selected dual time step iterations. ---*/
-      else if (IntIter % config_container[val_iZone]->GetAeroelasticIter() == 0) {
-
-        if (rank == MASTER_NODE)
-          cout << endl << " Solving aeroelastic equations and updating surface positions." << endl;
-
-        /*--- Solve the aeroelastic equations for the new node locations of the moving markers(surfaces) ---*/
-
-        solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->Aeroelastic(surface_movement[val_iZone], geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], ExtIter);
-
-        /*--- Deform the volume grid around the new boundary locations ---*/
-
-        if (rank == MASTER_NODE)
-          cout << " Deforming the volume grid due to the aeroelastic movement." << endl;
-        grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
-                                             config_container[val_iZone], true);
-
-        /*--- Update the grid velocities on the fine mesh using finite
-         differencing based on node coordinates at previous times. ---*/
-
-        if (rank == MASTER_NODE)
-          cout << " Computing grid velocities by finite differencing." << endl;
-        geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
-
-        /*--- Update the multigrid structure after moving the finest grid,
-         including computing the grid velocities on the coarser levels. ---*/
-
-        grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-      }
-
-      break;
 
     case ELASTICITY:
 
@@ -306,8 +130,147 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
 
       break;
 
-    case FLUID_STRUCTURE:
+ 	/*--- Already initialized in the static mesh movement routine at driver level. ---*/ 
+    case STEADY_TRANSLATION: case ROTATING_FRAME:
+      break;
 
+  }
+  
+  if (config_container[val_iZone]->GetSurface_Movement(DEFORMING)){
+    if (rank == MASTER_NODE)
+      cout << endl << " Updating surface positions." << endl;
+    
+    /*--- Translating ---*/
+    
+    /*--- Compute the new node locations for moving markers ---*/
+    
+    surface_movement[val_iZone]->Surface_Translating(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                     config_container[val_iZone], ExtIter, val_iZone);
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Deforming the volume grid." << endl;
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], true);
+    
+    /*--- Plunging ---*/
+    
+    /*--- Compute the new node locations for moving markers ---*/
+    
+    surface_movement[val_iZone]->Surface_Plunging(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                  config_container[val_iZone], ExtIter, val_iZone);
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Deforming the volume grid." << endl;
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], true);
+    
+    /*--- Pitching ---*/
+    
+    /*--- Compute the new node locations for moving markers ---*/
+    
+    surface_movement[val_iZone]->Surface_Pitching(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                  config_container[val_iZone], ExtIter, val_iZone);
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Deforming the volume grid." << endl;
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], true);
+    
+    /*--- Rotating ---*/
+    
+    /*--- Compute the new node locations for moving markers ---*/
+    
+    surface_movement[val_iZone]->Surface_Rotating(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                  config_container[val_iZone], ExtIter, val_iZone);
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Deforming the volume grid." << endl;
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], true);
+    
+    /*--- Update the grid velocities on the fine mesh using finite
+           differencing based on node coordinates at previous times. ---*/
+    
+    if (!adjoint) {
+      if (rank == MASTER_NODE)
+        cout << " Computing grid velocities by finite differencing." << endl;
+      geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
+    }
+    
+    /*--- Update the multigrid structure after moving the finest grid,
+           including computing the grid velocities on the coarser levels. ---*/
+    
+    grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
+    
+  }
+  
+  if (config_container[val_iZone]->GetSurface_Movement(AEROELASTIC) 
+      || config_container[val_iZone]->GetSurface_Movement(AEROELASTIC_RIGID_MOTION)){
+    
+    /*--- Apply rigid mesh transformation to entire grid first, if necessary ---*/
+    if (IntIter == 0) {
+      if (Kind_Grid_Movement == AEROELASTIC_RIGID_MOTION) {
+        
+        if (rank == MASTER_NODE) {
+          cout << endl << " Performing rigid mesh transformation." << endl;
+        }
+        
+        /*--- Move each node in the volume mesh using the specified type
+         of rigid mesh motion. These routines also compute analytic grid
+         velocities for the fine mesh. ---*/
+        
+        grid_movement[val_iZone][val_iInst]->Rigid_Translation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], val_iZone, ExtIter);
+        grid_movement[val_iZone][val_iInst]->Rigid_Plunging(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                            config_container[val_iZone], val_iZone, ExtIter);
+        grid_movement[val_iZone][val_iInst]->Rigid_Pitching(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                            config_container[val_iZone], val_iZone, ExtIter);
+        grid_movement[val_iZone][val_iInst]->Rigid_Rotation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                            config_container[val_iZone], val_iZone, ExtIter);
+        
+        /*--- Update the multigrid structure after moving the finest grid,
+         including computing the grid velocities on the coarser levels. ---*/
+        
+        grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
+      }
+      
+    }
+    
+    /*--- Use the if statement to move the grid only at selected dual time step iterations. ---*/
+    else if (IntIter % config_container[val_iZone]->GetAeroelasticIter() == 0) {
+      
+      if (rank == MASTER_NODE)
+        cout << endl << " Solving aeroelastic equations and updating surface positions." << endl;
+      
+      /*--- Solve the aeroelastic equations for the new node locations of the moving markers(surfaces) ---*/
+      
+      solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL]->Aeroelastic(surface_movement[val_iZone], geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], ExtIter);
+      
+      /*--- Deform the volume grid around the new boundary locations ---*/
+      
+      if (rank == MASTER_NODE)
+        cout << " Deforming the volume grid due to the aeroelastic movement." << endl;
+      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                                 config_container[val_iZone], true);
+      
+      /*--- Update the grid velocities on the fine mesh using finite
+       differencing based on node coordinates at previous times. ---*/
+      
+      if (rank == MASTER_NODE)
+        cout << " Computing grid velocities by finite differencing." << endl;
+      geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
+      
+      /*--- Update the multigrid structure after moving the finest grid,
+       including computing the grid velocities on the coarser levels. ---*/
+      
+      grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
+    }
+  }
+  if (config_container[val_iZone]->GetSurface_Movement(FLUID_STRUCTURE)){
       if (rank == MASTER_NODE)
         cout << endl << "Deforming the grid for Fluid-Structure Interaction applications." << endl;
 
@@ -315,7 +278,7 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
 
       if (rank == MASTER_NODE)
         cout << "Deforming the volume grid." << endl;
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation_Elas(geometry_container[val_iZone][val_iInst][MESH_0],
                                            config_container[val_iZone], true);
 
       nIterMesh = grid_movement[val_iZone][val_iInst]->Get_nIterMesh();
@@ -335,45 +298,70 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
        including computing the grid velocities on the coarser levels. ---*/
 
       grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-
-      break;
-	/*--- Already initialized in the static mesh movement routine at driver level. ---*/ 
-    case STEADY_TRANSLATION: case MOVING_WALL: case ROTATING_FRAME:
-      break;
-
-    case FLUID_STRUCTURE_STATIC:
-
-      if ((rank == MASTER_NODE) && (!discrete_adjoint))
-        cout << endl << "Deforming the grid for static Fluid-Structure Interaction applications." << endl;
-
-      /*--- Deform the volume grid around the new boundary locations ---*/
-
-      if ((rank == MASTER_NODE) && (!discrete_adjoint))
-        cout << "Deforming the volume grid." << endl;
-
-      grid_movement[val_iZone][val_iInst]->SetVolume_Deformation_Elas(geometry_container[val_iZone][val_iInst][MESH_0],
-                                                           config_container[val_iZone], true, false);
-
-      if ((rank == MASTER_NODE) && (!discrete_adjoint))
-        cout << "There is no grid velocity." << endl;
-
-      /*--- Update the multigrid structure after moving the finest grid,
+    
+  }
+  if (config_container[val_iZone]->GetSurface_Movement(FLUID_STRUCTURE_STATIC)){
+    
+    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+      cout << endl << "Deforming the grid for static Fluid-Structure Interaction applications." << endl;
+    
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+      cout << "Deforming the volume grid." << endl;
+    
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation_Elas(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                                    config_container[val_iZone], true, false);
+    
+    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+      cout << "There is no grid velocity." << endl;
+    
+    /*--- Update the multigrid structure after moving the finest grid,
        including computing the grid velocities on the coarser levels. ---*/
-
-      grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
-
-      break;
-
-    case NO_MOVEMENT: case GUST: default:
-
-      /*--- There is no mesh motion specified for this zone. ---*/
+    
+    grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
+    
+  }
+  if (config_container[val_iZone]->GetSurface_Movement(EXTERNAL) || config_container[val_iZone]->GetSurface_Movement(EXTERNAL_ROTATION)){
+    /*--- Apply rigid rotation to entire grid first, if necessary ---*/
+    
+    if (Kind_Grid_Movement == EXTERNAL_ROTATION) {
       if (rank == MASTER_NODE)
-        cout << "No mesh motion specified." << endl;
-
-      break;
+        cout << " Updating node locations by rigid rotation." << endl;
+      grid_movement[val_iZone][val_iInst]->Rigid_Rotation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                          config_container[val_iZone], val_iZone, ExtIter);
+    }
+    
+    /*--- Load new surface node locations from external files ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Updating surface locations from file." << endl;
+    surface_movement[val_iZone]->SetExternal_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                         config_container[val_iZone], val_iZone, ExtIter);
+    
+    /*--- Deform the volume grid around the new boundary locations ---*/
+    
+    if (rank == MASTER_NODE)
+      cout << " Deforming the volume grid." << endl;
+    grid_movement[val_iZone][val_iInst]->SetVolume_Deformation(geometry_container[val_iZone][val_iInst][MESH_0],
+                                                               config_container[val_iZone], true);
+    
+    /*--- Update the grid velocities on the fine mesh using finite
+       differencing based on node coordinates at previous times. ---*/
+    
+    if (!adjoint) {
+      if (rank == MASTER_NODE)
+        cout << " Computing grid velocities by finite differencing." << endl;
+      geometry_container[val_iZone][val_iInst][MESH_0]->SetGridVelocity(config_container[val_iZone], ExtIter);
+    }
+    
+    /*--- Update the multigrid structure after moving the finest grid,
+       including computing the grid velocities on the coarser levels. ---*/
+    
+    grid_movement[val_iZone][val_iInst]->UpdateMultiGrid(geometry_container[val_iZone][val_iInst], config_container[val_iZone]);
+     
   }
-
-}
+ }
 
 void CIteration::Preprocess(COutput *output,
                             CIntegration ****integration_container,
@@ -888,7 +876,7 @@ void CFluidIteration::SetWind_GustField(CConfig *config_container, CGeometry **g
   unsigned short GustDir = config_container->GetGust_Dir(); // Gust direction
   
   /*--- Variables needed to compute the gust ---*/
-  unsigned short Kind_Grid_Movement = config_container->GetKind_GridMovement(ZONE_0);
+  unsigned short Kind_Grid_Movement = config_container->GetKind_GridMovement();
   unsigned long iPoint;
   unsigned short iMGlevel, nMGlevel = config_container->GetnMGLevels();
   
diff --git a/SU2_CFD/src/numerics_adjoint_mean.cpp b/SU2_CFD/src/numerics_adjoint_mean.cpp
index b11c74c5c5bc..abdaf0536071 100644
--- a/SU2_CFD/src/numerics_adjoint_mean.cpp
+++ b/SU2_CFD/src/numerics_adjoint_mean.cpp
@@ -1515,10 +1515,10 @@ void CSourceRotatingFrame_AdjFlow::ComputeResidual(su2double *val_residual, su2d
   bool implicit = (config->GetKind_TimeIntScheme_AdjFlow() == EULER_IMPLICIT);
 
   /*--- Retrieve the angular velocity vector from config. ---*/
-
-  Omega[0]  = config->GetRotation_Rate_X(ZONE_0)/config->GetOmega_Ref();
-  Omega[1]  = config->GetRotation_Rate_Y(ZONE_0)/config->GetOmega_Ref();
-  Omega[2]  = config->GetRotation_Rate_Z(ZONE_0)/config->GetOmega_Ref();
+  
+  for (iDim = 0; iDim < 3; iDim++){
+    Omega[iDim] = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+  }
   
   /*--- Get the adjoint velocity vector at the current node. ---*/
   
diff --git a/SU2_CFD/src/numerics_direct_mean.cpp b/SU2_CFD/src/numerics_direct_mean.cpp
index 6afd5b1f0316..5a2b97b30ee7 100644
--- a/SU2_CFD/src/numerics_direct_mean.cpp
+++ b/SU2_CFD/src/numerics_direct_mean.cpp
@@ -5768,9 +5768,9 @@ void CSourceRotatingFrame_Flow::ComputeResidual(su2double *val_residual, su2doub
   
   /*--- Retrieve the angular velocity vector from config. ---*/
   
-  Omega[0] = config->GetRotation_Rate_X(config->GetiZone())/config->GetOmega_Ref();
-  Omega[1] = config->GetRotation_Rate_Y(config->GetiZone())/config->GetOmega_Ref();
-  Omega[2] = config->GetRotation_Rate_Z(config->GetiZone())/config->GetOmega_Ref();
+  for (iDim = 0; iDim < 3; iDim++){
+    Omega[iDim] = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+  }
   
   /*--- Get the momentum vector at the current node. ---*/
   
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 2f0120ac890b..773f6907120d 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -6651,9 +6651,9 @@ void CAdjNSSolver::Viscous_Sensitivity(CGeometry *geometry, CSolver **solver_con
             source_v_1 = 0.0;
             if (rotating_frame) {
               
-              Omega[0]  = (config->GetRotation_Rate_X(ZONE_0)/config->GetOmega_Ref());
-              Omega[1]  = (config->GetRotation_Rate_Y(ZONE_0)/config->GetOmega_Ref());
-              Omega[2]  = (config->GetRotation_Rate_Z(ZONE_0)/config->GetOmega_Ref());
+              for (iDim = 0; iDim < 3; iDim++){
+                Omega[iDim] = config->GetRotation_Rate()[iDim]/config->GetOmega_Ref();
+              }
               
               /*--- Calculate momentum source terms as: rho * ( Omega X V ) ---*/
               
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index c35075ba4a49..29d1ddab6f2a 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -3455,9 +3455,8 @@ void CFEM_DG_EulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_co
   if(config->GetGrid_Movement() && !harmonic_balance) {
 
     /*--- Determine the type of grid motion. ---*/
-    switch( config->GetKind_GridMovement(0) ) {
+    switch( config->GetKind_GridMovement() ) {
 
-      case MOVING_WALL:
       case ROTATING_FRAME:
       case STEADY_TRANSLATION: {
 
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 97fc32ed4bd2..45a93ed04e61 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -1773,10 +1773,10 @@ void CSolver::Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometr
           /*--- Note that the calculation of the forces and the subsequent displacements ...
            is only correct for the airfoil that starts at the 0 degree position ---*/
           
-          if (config->GetKind_GridMovement(ZONE_0) == AEROELASTIC_RIGID_MOTION) {
+          if (config->GetKind_GridMovement() == AEROELASTIC_RIGID_MOTION) {
             su2double Omega, dt, psi;
             dt = config->GetDelta_UnstTimeND();
-            Omega  = (config->GetRotation_Rate_Z(ZONE_0)/config->GetOmega_Ref());
+            Omega  = (config->GetRotation_Rate()[3]/config->GetOmega_Ref());
             psi = Omega*(dt*ExtIter);
             
             /*--- Correct for the airfoil starting position (This is hardcoded in here) ---*/

From d05800743297df939776646e5d22c5f63f8de1f7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 12:09:57 +0200
Subject: [PATCH 135/539] Removed nDim in constructor call in SU2_CFD.py

---
 SU2_CFD/src/solver_direct_mean.cpp     | 5 +++--
 SU2_CFD/src/solver_direct_mean_inc.cpp | 2 +-
 SU2_PY/SU2_CFD.py                      | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 865a49d71b14..c1fb359bb2e6 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -3498,7 +3498,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
   Temperature_FreeStreamND = 0.0, Gas_ConstantND = 0.0,
   Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0,
   Tke_FreeStreamND = 0.0, Energy_FreeStreamND = 0.0,
-  Total_UnstTimeND = 0.0, Delta_UnstTimeND = 0.0, TgammaR = 0.0;
+  Total_UnstTimeND = 0.0, Delta_UnstTimeND = 0.0, TgammaR = 0.0, Heat_Flux_Ref = 0.0;
 
   unsigned short iDim;
 
@@ -3733,6 +3733,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
   Time_Ref          = Length_Ref/Velocity_Ref;                                     config->SetTime_Ref(Time_Ref);
   Omega_Ref         = Velocity_Ref/Length_Ref;                                     config->SetOmega_Ref(Omega_Ref);
   Force_Ref         = config->GetDensity_Ref()*Velocity_Ref*Velocity_Ref*Length_Ref*Length_Ref; config->SetForce_Ref(Force_Ref);
+  Heat_Flux_Ref     = Density_Ref*Velocity_Ref*Velocity_Ref*Velocity_Ref;           config->SetHeat_Flux_Ref(Heat_Flux_Ref);
   Gas_Constant_Ref  = Velocity_Ref*Velocity_Ref/config->GetTemperature_Ref();      config->SetGas_Constant_Ref(Gas_Constant_Ref);
   Viscosity_Ref     = config->GetDensity_Ref()*Velocity_Ref*Length_Ref;            config->SetViscosity_Ref(Viscosity_Ref);
   Conductivity_Ref  = Viscosity_Ref*Gas_Constant_Ref;                              config->SetConductivity_Ref(Conductivity_Ref);
@@ -4024,8 +4025,8 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     ModelTable.PrintFooter();
     
     if (unsteady){
+      NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTableOut << "-- Unsteady conditions" << endl;
       NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
       NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 629310785c24..e195963016ac 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -2340,8 +2340,8 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
     ModelTable.PrintFooter();
 
     if (unsteady){
+      NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTableOut << "-- Unsteady conditions" << endl;
       NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
       NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
index 8d18d382e949..8d80253e5652 100755
--- a/SU2_PY/SU2_CFD.py
+++ b/SU2_PY/SU2_CFD.py
@@ -93,13 +93,13 @@ def main():
   # Initialize the corresponding driver of SU2, this includes solver preprocessing
   try:
     if (options.nZone == 1) and ( options.fem or options.poisson_equation or options.wave_equation or options.heat_equation ):
-      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.periodic, comm);
     elif options.harmonic_balance:
-      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.periodic, comm);
     elif (options.nZone == 2) and (options.fsi):
-      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:

From 8fd81d04e50819c43848488646c64b9d1a8339ea Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 12:23:56 +0200
Subject: [PATCH 136/539] Adapted test cases

---
 .../aeroelastic/aeroelastic_NACA64A010.cfg    |  9 +--
 .../coupled_cht/incompressible/config.cfg     |  3 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg  |  3 +-
 .../fea_fsi/WallChannel_2d/configFSI.cfg      |  3 +-
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |  9 ++-
 .../fea_fsi/WallChannel_2d/configFlow.cfg     | 12 ++--
 TestCases/gust/inv_gust_NACA0012.cfg          |  8 +--
 TestCases/harmonic_balance/HB.cfg             | 18 ++----
 .../hb_rans_preconditioning/davis.cfg         | 17 ++----
 TestCases/moving_wall/cavity/lam_cavity.cfg   |  9 +--
 .../spinning_cylinder/spinning_cylinder.cfg   | 21 ++-----
 .../pitching_naca64a010/turb_NACA64A010.cfg   | 17 ++----
 .../pitching_oneram6/turb_ONERAM6.cfg         | 18 ++----
 .../flatPlate_rigidMotion_Conf.cfg            | 47 +-------------
 .../launch_flatPlate_rigidMotion.py           |  8 +--
 .../launch_unsteady_CHT_FlatPlate.py          |  8 +--
 .../unsteady_CHT_FlatPlate_Conf.cfg           | 61 -------------------
 .../caradonna_tung/rot_caradonna_tung.cfg     | 13 +---
 TestCases/rotating/naca0012/rot_NACA0012.cfg  | 13 +---
 .../sliding_interface/bars_SST_2D/bars.cfg    | 13 +++-
 .../channel_2D/channel_2D_NN.cfg              | 28 ++-------
 .../channel_2D/channel_2D_WA.cfg              | 52 ++++++----------
 .../channel_3D/channel_3D_NN.cfg              | 25 ++------
 .../channel_3D/channel_3D_WA.cfg              | 28 ++-------
 .../incompressible_steady/config.cfg          |  4 +-
 .../incompressible_unsteady/config.cfg        |  4 +-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  | 32 +++-------
 TestCases/sliding_interface/pipe/pipe_WA.cfg  | 26 ++------
 .../rotating_cylinders/rot_cylinders_NN.cfg   | 39 +++++-------
 .../rotating_cylinders/rot_cylinders_WA.cfg   | 41 ++++++-------
 .../single_stage/single_stage_NN.cfg          | 27 ++------
 .../single_stage/single_stage_WA.cfg          | 30 ++-------
 .../sup_vor_shed_NN.cfg                       | 26 ++------
 .../sup_vor_shed_WA.cfg                       | 29 ++-------
 .../uniform_flow/uniform_NN.cfg               | 42 ++++---------
 .../uniform_flow/uniform_WA.cfg               | 27 ++------
 .../turbomachinery/APU_turbocharger/Jones.cfg | 25 ++------
 .../pitching_NACA64A010.cfg                   | 22 +++----
 .../turb_NACA64A010.cfg                       | 17 ++----
 .../plunging_naca0012/plunging_NACA0012.cfg   | 18 ++----
 40 files changed, 211 insertions(+), 641 deletions(-)

diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 80acc8f90bc1..c3e8c2767a0a 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -75,14 +75,7 @@ UNST_TIME= 50.0
 UNST_INT_ITER= 100
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
-%                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, ELASTICITY,
-%                       EXTERNAL, AEROELASTIC_RIGID_MOTION, GUST)
-GRID_MOVEMENT_KIND= AEROELASTIC
+SURFACE_MOVEMENT= AEROELASTIC
 %
 % Motion mach number (non-dimensional). Used for initializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
diff --git a/TestCases/coupled_cht/incompressible/config.cfg b/TestCases/coupled_cht/incompressible/config.cfg
index a39d6d04b5eb..4973ca891963 100644
--- a/TestCases/coupled_cht/incompressible/config.cfg
+++ b/TestCases/coupled_cht/incompressible/config.cfg
@@ -8,8 +8,7 @@
 % File Version 6.0.1 "Falcon"                                                  	%
 %                                                                              	%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-PHYSICAL_PROBLEM= MULTIZONE
+PHYSICAL_PROBLEM= MULTIPHYSICS
 
 CONFIG_LIST = (configFlow.cfg, configSolid.cfg)
 
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 782388026e41..8ce7f488bdd3 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -21,8 +21,7 @@ PHYSICAL_PROBLEM= EULER
 MATH_PROBLEM= DIRECT
 KIND_TURB_MODEL= NONE
 
-GRID_MOVEMENT = YES
-GRID_MOVEMENT_KIND = FLUID_STRUCTURE_STATIC
+GRID_MOVEMENT = FLUID_STRUCTURE_STATIC
 MULTIZONE_MESH = NO
 INNER_ITER= 60
 %
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
index 7bbf47c3c182..58bbbf48543e 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
@@ -5,8 +5,9 @@
 % Institution: Imperial College London                                         %
 % Date: 2016.02.01                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-PHYSICAL_PROBLEM= MULTIZONE
+MULTIZONE= YES
 
+PHYSICAL_PROBLEM=MULTIPHYSICS
 CONFIG_LIST = (configFlow.cfg, configFEA.cfg)
 
 MARKER_ZONE_INTERFACE = (wallUpwF, wallUpwS, wallUpperF, wallUpperS, wallDownF, wallDownS)
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index 06a4958a4362..2663b8cd334c 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -5,6 +5,13 @@
 % Institution: Imperial College London                                         %
 % Date: 2016.02.01                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+MULTIZONE=YES
+TIME_ITER=3
+TIME_STEP= 0.005
+RESTART_ITER=2
+
+
+SURFACE_MOVEMENT=FLUID_STRUCTURE
 PHYSICAL_PROBLEM= FLUID_STRUCTURE_INTERACTION
 FSI_FLUID_PROBLEM = NAVIER_STOKES
 FSI_STRUCTURAL_PROBLEM = ELASTICITY
@@ -95,7 +102,7 @@ DEFORM_NONLINEAR_ITER= 1
 DEFORM_LINEAR_SOLVER= FGMRES
 DEFORM_LINEAR_SOLVER_PREC= LU_SGS
 DEFORM_LINEAR_ITER= 500
-DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
+DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 WRT_CON_FREQ= 100
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index 1e76daae45da..b88406be41bc 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -7,8 +7,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 PHYSICAL_PROBLEM= NAVIER_STOKES
 
-GRID_MOVEMENT = YES
-GRID_MOVEMENT_KIND = FLUID_STRUCTURE
+%GRID_MOVEMENT = YES
+%SURFACE_MOVEMENT = FLUID_STRUCTURE
 
 UNST_INT_ITER= 50
 INNER_ITER=50
@@ -77,10 +77,10 @@ DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
 
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
-WRT_CON_FREQ= 100
-WRT_CON_FREQ_DUALTIME= 100
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 100
+WRT_CON_FREQ= 1
+WRT_CON_FREQ_DUALTIME= 1
+WRT_SOL_FREQ= 1
+WRT_SOL_FREQ_DUALTIME= 1
 
 VOLUME_FLOW_FILENAME= results_flow
 RESTART_FLOW_FILENAME= solution_flow.dat
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index a1e781476de8..de0ad6165617 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -73,20 +73,14 @@ UNST_INT_ITER= 100
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, ELASTICITY,
 %                       EXTERNAL, AEROELASTIC_RIGID_MOTION)
-GRID_MOVEMENT_KIND= GUST
+GRID_MOVEMENT= GUST
 %
 % Motion mach number (non-dimensional). Used for initializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
 MACH_MOTION= 0.2
-%
-% Moving wall boundary marker(s) (NONE = no marker, ignored for RIGID_MOTION)
-MARKER_MOVING= ( NONE )
 
 % --------------------------- GUST SIMULATION ---------------------------------%
 %
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 06143a558d08..7477836c7184 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -51,25 +51,15 @@ OMEGA_HB = [0,106.69842,-106.69842]
 % Number of internal iterations (dual time method)
 %UNST_INT_ITER= 100
 %
-% Mesh motion for unsteady simulations (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_ROTATION, RIGID_PITCHING)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
-MOTION_ORIGIN_X= ( 0.248 )
-MOTION_ORIGIN_Y= ( 0.0 )
-MOTION_ORIGIN_Z= ( 0.0 )
+MOTION_ORIGIN= ( 0.248 0.0 0.0 )
 
-PITCHING_OMEGA_X= ( 0.0 )
-PITCHING_OMEGA_Y= ( 0.0 )
-PITCHING_OMEGA_Z= ( 106.69842 )
+PITCHING_OMEGA= ( 0.0 0.0 106.69842)
 
-PITCHING_AMPL_X= ( 0.0 )
-PITCHING_AMPL_Y= ( 0.0 )
-PITCHING_AMPL_Z= ( 1.01 )
+PITCHING_AMPL= ( 0.0 0.0 1.01 )
 
- 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 0c9d3f18cec3..2f437a8a1744 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -42,23 +42,14 @@ HB_PERIOD= 0.057465
 % List of frequencies to be resolved for harmonic balance method
 OMEGA_HB = [0,109.339, 218.678, 328.017,-109.339, -218.678, -328.017]
 %
-% Mesh motion for unsteady simulations (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_ROTATION, RIGID_PITCHING)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
-MOTION_ORIGIN_X= ( 0.25 )
-MOTION_ORIGIN_Y= ( 0.0 )
-MOTION_ORIGIN_Z= ( 0.0 )
+MOTION_ORIGIN= ( 0.25 0.0 0.0)
 
-PITCHING_OMEGA_X= ( 0.0 )
-PITCHING_OMEGA_Y= ( 0.0 )
-PITCHING_OMEGA_Z= ( 109.933 )
+PITCHING_OMEGA= ( 0.0 0.0 109.933 )
 
-PITCHING_AMPL_X= ( 0.0 )
-PITCHING_AMPL_Y= ( 0.0 )
-PITCHING_AMPL_Z= ( 1.01 )
+PITCHING_AMPL= ( 0.0 0.0 1.01 )
 
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index e17130f229fe..cb09da2cd3e1 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -47,13 +47,10 @@ REYNOLDS_LENGTH= 1.0
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, ELASTICITY, 
 %                       EXTERNAL)
-GRID_MOVEMENT_KIND= MOVING_WALL
+SURFACE_MOVEMENT= MOVING_WALL
 %
 % Motion mach number (non-dimensional). Used for initializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
@@ -63,9 +60,7 @@ MACH_MOTION= 0.1
 MARKER_MOVING= ( upper )
 %
 % Translational velocity (m/s) in the x, y, & z directions
-TRANSLATION_RATE_X= 33.179
-TRANSLATION_RATE_Y= 0.0
-TRANSLATION_RATE_Z= 0.0
+SURFACE_TRANSLATION_RATE= 33.179 0.0 0.0
 
 % ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 %
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 14c007e09743..d39db0ed5665 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -62,12 +62,9 @@ UNST_INT_ITER= 200
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, EXTERNAL)
-GRID_MOVEMENT_KIND= MOVING_WALL
+SURFACE_MOVEMENT= MOVING_WALL
 %
 % Motion mach number (non-dimensional). Used for intitializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
@@ -77,20 +74,10 @@ MACH_MOTION= 0.1
 MARKER_MOVING= ( cylinder )
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.5
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+SURFACE_MOTION_ORIGIN= 0.5 0.0 0.0 
 %
 % Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 0.0
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = -199.0738
-%
-% Translational velocity (m/s) in the x, y, & z directions
-TRANSLATION_RATE_X = 0.0
-TRANSLATION_RATE_Y = 0.0
-TRANSLATION_RATE_Z = 0.0
-
+SURFACE_ROTATION_RATE = 0.0 0.0 -199.0738
 % ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 %
 % Reference origin for moment computation
@@ -157,7 +144,7 @@ SENS_REMOVE_SHARP= NO
 LINEAR_SOLVER= FGMRES
 %
 % Preconditioner of the Krylov linear solver (JACOBI, LINELET, LU_SGS)
-LINEAR_SOLVER_PREC= LU_SGS
+LINEAR_SOLVER_PREC= ILU
 %
 % Minimum error of the linear solver for implicit formulations
 LINEAR_SOLVER_ERROR= 1E-4
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index 052c3a7f14bc..cf289b972fb9 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -47,29 +47,20 @@ UNST_INT_ITER= 2000
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 251
 %
-% Mesh motion for unsteady simulations (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_MOTION, FLUID_STRUCTURE)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
 % Mach number (non-dimensional, based on the mesh velocity and freestream vals.)
 MACH_MOTION= 0.796
 %
 % Coordinates of the rigid motion origin
-MOTION_ORIGIN_X= 0.248
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.248 0.0 0.0
 %
 % Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 106.69842
+PITCHING_OMEGA= 0.0 0.0 106.69842
 %
 % Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 1.01
+PITCHING_AMPL= 0.0 0.0 1.01
 %
  
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index 827eb15d229a..79fa0755557e 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -67,32 +67,22 @@ UNST_INT_ITER= 350
 UNST_ADJOINT_ITER= 176
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, EXTERNAL)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
 % Motion mach number (non-dimensional). Used for intitializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
 MACH_MOTION= 0.8395
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.201475
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.201475 0.0 0.0
 %
 % Pitching angular freq. (rad/s) about x, y, & z axes
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 116.26733689
-PITCHING_OMEGA_Z= 0.0
+PITCHING_OMEGA= 0.0 116.26733689 0.0
 %
 % Pitching amplitude (degrees) about x, y, & z axes
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 2.5
-PITCHING_AMPL_Z= 0.0
+PITCHING_AMPL= 0.0 2.5 0.0
 
 % ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 %
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 7dee5b94dabd..0ce68c4ca6bd 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -179,15 +179,11 @@ UNST_INT_ITER= 10
 UNST_RESTART_ITER= 0
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, STEADY_TRANSLATION, FLUID_STRUCTURE,
 %                       AEROELASTIC, ELASTICITY, EXTERNAL,
 %                       AEROELASTIC_RIGID_MOTION, GUST)
-GRID_MOVEMENT_KIND= FLUID_STRUCTURE
+SURFACE_MOVEMENT= FLUID_STRUCTURE
 %
 % Motion mach number (non-dimensional). Used for initializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
@@ -197,44 +193,7 @@ MACH_MOTION= 0.03059
 MARKER_MOVING= ( plate )
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= -0.0028
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
-%
-% Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 0.0
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = 0.0
-%
-% Pitching angular freq. (rad/s) about the motion origin
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 0.0
-%
-% Pitching amplitude (degrees) about the motion origin
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 0.0
-%
-% Pitching phase offset (degrees) about the motion origin
-PITCHING_PHASE_X= 0.0
-PITCHING_PHASE_Y= 0.0
-PITCHING_PHASE_Z= 0.0
-%
-% Translational velocity (m/s) in the x, y, & z directions
-TRANSLATION_RATE_X = 0.0
-TRANSLATION_RATE_Y = 0.0
-TRANSLATION_RATE_Z = 0.0
-%
-% Plunging angular freq. (rad/s) in x, y, & z directions
-PLUNGING_OMEGA_X= 0.0
-PLUNGING_OMEGA_Y= 0.0
-PLUNGING_OMEGA_Z= 0.0
-%
-% Plunging amplitude (m) in x, y, & z directions
-PLUNGING_AMPL_X= 0.0
-PLUNGING_AMPL_Y= 0.0
-PLUNGING_AMPL_Z= 0.0
+SURFACE_MOTION_ORIGIN= -0.0028 0.0 0.0
 %
 % Move Motion Origin for marker moving (1 or 0)
 MOVE_MOTION_ORIGIN = 1
@@ -483,7 +442,7 @@ DEFORM_COEFF = 1E6
 %
 % Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME,
 %                                           WALL_DISTANCE, CONSTANT_STIFFNESS)
-DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
+DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
 % Deform the grid only close to the surface. It is possible to specify how much
 % of the volumetric grid is going to be deformed in meters or inches (1E6 by default)
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
index 0f65e737b41a..ab650b57f386 100755
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
@@ -101,13 +101,13 @@ def main():
   # Initialize the corresponding driver of SU2, this includes solver preprocessing
   try:
     if (options.nZone == 1) and ( options.fem or options.poisson_equation or options.wave_equation or options.heat_equation ):
-      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.periodic, comm);
     elif options.harmonic_balance:
-      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.periodic, comm);
     elif (options.nZone == 2) and (options.fsi):
-      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
index 77479b8b6cd0..ef5ee61ee87c 100755
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
@@ -100,13 +100,13 @@ def main():
   # Initialize the corresponding driver of SU2, this includes solver preprocessing
   try:
     if (options.nZone == 1) and ( options.fem or options.poisson_equation or options.wave_equation or options.heat_equation ):
-      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.periodic, comm);
     elif options.harmonic_balance:
-      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.periodic, comm);
     elif (options.nZone == 2) and (options.fsi):
-      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.nDim, options.periodic, comm);
+      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 5379ea3b1a27..3b68f8ef018d 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -178,67 +178,6 @@ UNST_INT_ITER= 10
 % Iteration number to begin unsteady restarts
 UNST_RESTART_ITER= 0
 
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= NO
-%
-% Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
-%                       MOVING_WALL, STEADY_TRANSLATION, FLUID_STRUCTURE,
-%                       AEROELASTIC, ELASTICITY, EXTERNAL,
-%                       AEROELASTIC_RIGID_MOTION, GUST)
-GRID_MOVEMENT_KIND= FLUID_STRUCTURE
-%
-% Motion mach number (non-dimensional). Used for initializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.03059
-%
-% Moving wall boundary marker(s) (NONE = no marker, ignored for RIGID_MOTION)
-MARKER_MOVING= ( plate )
-%
-% Coordinates of the motion origin
-MOTION_ORIGIN_X= -0.0028
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
-%
-% Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 0.0
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = 0.0
-%
-% Pitching angular freq. (rad/s) about the motion origin
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 0.0
-%
-% Pitching amplitude (degrees) about the motion origin
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 0.0
-%
-% Pitching phase offset (degrees) about the motion origin
-PITCHING_PHASE_X= 0.0
-PITCHING_PHASE_Y= 0.0
-PITCHING_PHASE_Z= 0.0
-%
-% Translational velocity (m/s) in the x, y, & z directions
-TRANSLATION_RATE_X = 0.0
-TRANSLATION_RATE_Y = 0.0
-TRANSLATION_RATE_Z = 0.0
-%
-% Plunging angular freq. (rad/s) in x, y, & z directions
-PLUNGING_OMEGA_X= 0.0
-PLUNGING_OMEGA_Y= 0.0
-PLUNGING_OMEGA_Z= 0.0
-%
-% Plunging amplitude (m) in x, y, & z directions
-PLUNGING_AMPL_X= 0.0
-PLUNGING_AMPL_Y= 0.0
-PLUNGING_AMPL_Z= 0.0
-%
-% Move Motion Origin for marker moving (1 or 0)
-MOVE_MOTION_ORIGIN = 1
-
 % ----------------------- BODY FORCE DEFINITION -------------------------------%
 %
 % Apply a body force as a source term (NO, YES)
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 39ea47be8ac2..50b003182b0d 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -54,26 +54,19 @@ REF_AREA= 1.0
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, EXTERNAL)
-GRID_MOVEMENT_KIND= ROTATING_FRAME
+GRID_MOVEMENT= ROTATING_FRAME
 %
 % Motion mach number (non-dimensional). Used for intitializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
 MACH_MOTION= 0.877
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.0
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.0 0.0 0.0
 %
 % Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 261.79938779914943
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = 0.0
+ROTATION_RATE = 261.79938779914943 0.0 0.0
 % 1250 RPM -> 130.89969389957471
 % 2500 RPM -> 261.79938779914943
 
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 442255e17a53..079cb123913f 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -54,26 +54,19 @@ REF_AREA= 1.0
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, FLUID_STRUCTURE, AEROELASTIC, EXTERNAL)
-GRID_MOVEMENT_KIND= ROTATING_FRAME
+GRID_MOVEMENT= ROTATING_FRAME
 %
 % Motion mach number (non-dimensional). Used for intitializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
 MACH_MOTION= 0.7958
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.5
-MOTION_ORIGIN_Y= -32.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.5 -32.0 0.0
 %
 % Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 0.0
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = 8.25
+ROTATION_RATE = 0.0 0.0 8.25
 
 % ----------------------- BOUNDARY CONDITION DEFINITION -----------------------%
 %
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index b414130021bc..ee846102a850 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -9,6 +9,17 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
+MULTIZONE=YES
+
+%CONFIG_LIST = (configFlow.cfg, configFEA.cfg)
+
+TIME_DOMAIN = YES
+TIME_ITER = 3
+TIME_STEP = 0.005
+
+OUTER_ITER = 5
+
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES,
@@ -158,7 +169,7 @@ MARKER_MONITORING= ( wall1_bars )
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
 % Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= NO
+%GRID_MOVEMENT= NO
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 3183ca68602c..96fe723a29a5 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -10,8 +10,12 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE = YES
 %
-%
+% List of sub config files to specify zone specific options 
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
+
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -82,28 +86,6 @@ MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface,
 
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0  0.0
-ROTATION_RATE_Y = 0.0 0.0  0.0
-ROTATION_RATE_Z = 0.0 0.1 -0.1
-%
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index b741b61fd2d8..19f7be9e2f0c 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -10,7 +10,26 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE = YES
 %
+% List of sub config files to specify zone specific options 
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
+%
+% Enable time domain
+TIME_DOMAIN= YES
+%
+% Number of time steps
+TIME_ITER= 32000
+%
+% Time step
+TIME_STEP= 0.1
+%
+% Max. time
+MAX_TIME= 10
+%
+% Number of internal iterations
+INNER_ITER= 50
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -29,16 +48,6 @@ RESTART_SOL= NO
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 50
-
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -83,29 +92,6 @@ MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface,
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0  0.0
-ROTATION_RATE_Y = 0.0 0.0  0.0
-ROTATION_RATE_Z = 0.0 0.1 -0.1
-%
-%
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 09b3334514a5..1858bf38afef 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -10,7 +10,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable Multizone mode
+MULTIZONE= YES
 %
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -83,28 +87,7 @@ MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface,
 %KIND_INTERPOLATION= ISOPARAMETRIC
 %
 %
-%
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
 
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 0.1
-ROTATION_RATE_Y = 0.0 0.0 0.0
-ROTATION_RATE_Z = 0.0 0.1 0.0
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index cd0feb0ede6f..6450e2302356 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -10,6 +10,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable Multizone mode
+MULTIZONE= YES
+%
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
 %
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
@@ -85,29 +90,6 @@ KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 0.1
-ROTATION_RATE_Y = 0.0 0.0 0.0
-ROTATION_RATE_Z = 0.0 0.1 0.0
-%
-%
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
diff --git a/TestCases/sliding_interface/incompressible_steady/config.cfg b/TestCases/sliding_interface/incompressible_steady/config.cfg
index 3f0a2c81b071..c7b120c24795 100644
--- a/TestCases/sliding_interface/incompressible_steady/config.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/config.cfg
@@ -9,13 +9,13 @@
 %                                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-PHYSICAL_PROBLEM= MULTIZONE
+PHYSICAL_PROBLEM= MULTIPHYSICS
 
 CONFIG_LIST = (configOut.cfg, configCircle.cfg)
 
 MARKER_ZONE_INTERFACE= (circleOut, circleIn)
 
-MESH_FILENAME= meshCircle.su2
+MULTIZONE_MESH= NO
 
 TIME_DOMAIN = NO
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/config.cfg b/TestCases/sliding_interface/incompressible_unsteady/config.cfg
index de42431bdf0d..574298720b1f 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/config.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/config.cfg
@@ -9,13 +9,13 @@
 %                                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-PHYSICAL_PROBLEM= MULTIZONE
+PHYSICAL_PROBLEM= MULTIPHYSICS
 
 CONFIG_LIST = (configOut.cfg, configCircle.cfg)
 
 MARKER_ZONE_INTERFACE= (circleOut, circleIn)
 
-MESH_FILENAME= meshCircle.su2
+MULTIZONE_MESH=NO
 
 TIME_DOMAIN = YES
 TIME_ITER = 1
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index f5254531ac3e..deacfb45546f 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -10,8 +10,18 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE= YES
 %
+% List of config files for zone specific options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg, zone_4.cfg, zone_5.cfg)
 %
+%
+TIME_ITER= 10
+%
+OUTER_ITER=1
+%
+INNER_ITER=200
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -85,29 +95,7 @@ MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_
 %KIND_INTERPOLATION= ISOPARAMETRIC
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION RIGID_MOTION RIGID_MOTION 
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0 0.0 0.0 
-MOTION_ORIGIN_Y= 0.0 0.0 0.0 0.0 0.0 
-MOTION_ORIGIN_Z= 0.0 0.0 0.0 0.0 0.0
 
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.1 0.2 -0.1 0.1
-ROTATION_RATE_Y = 0.0 0.0 0.0  0.0 0.0
-ROTATION_RATE_Z = 0.0 0.0 0.0  0.0 0.0
-%
-%
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 09743629389e..22d9baf0cb5e 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -10,7 +10,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE= YES
 %
+% List of config files for zone specific options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg, zone_4.cfg, zone_5.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -86,28 +90,6 @@ MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION RIGID_MOTION RIGID_MOTION 
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0 0.0 0.0 
-MOTION_ORIGIN_Y= 0.0 0.0 0.0 0.0 0.0 
-MOTION_ORIGIN_Z= 0.0 0.0 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.1 0.2 -0.1 0.1
-ROTATION_RATE_Y = 0.0 0.0 0.0  0.0 0.0
-ROTATION_RATE_Z = 0.0 0.0 0.0  0.0 0.0
-%
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 49eb02a8df05..59c6e311b42a 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -9,7 +9,23 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE= YES
 %
+% Config list for zone specific options
+CONFIG_LIST = (zone_1.cfg, zone_2.cfg, zone_3.cfg)
+%
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 5
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -87,29 +103,6 @@ MARKER_FLUID_INTERFACE= ( domain_interface, external_interface, internal_interfa
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 0.0
-ROTATION_RATE_Y = 0.0 0.0 0.0
-ROTATION_RATE_Z = 0.0 0.1 -0.1
-%
-%
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 6f8092bad311..b2e8f204cb98 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -10,6 +10,24 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
+% Enable multizone mode
+MULTIZONE= YES
+%
+% Config list for zone specific options
+CONFIG_LIST = (zone_1.cfg, zone_2.cfg, zone_3.cfg)
+%
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 5
+%
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -88,29 +106,6 @@ KIND_INTERPOLATION= WEIGHTED_AVERAGE
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 0.0
-ROTATION_RATE_Y = 0.0 0.0 0.0
-ROTATION_RATE_Z = 0.0 0.1 -0.1
-%
-%
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 6bab2bf9e5b5..f3726de69562 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -10,8 +10,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE= YES
 %
-%
+% List of config files to set zone specific options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -97,29 +100,7 @@ KIND_INTERPOLATION= ISOPARAMETRIC
 %KIND_INTERPOLATION= SLIDING_MESH
 %
 %
-%
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
 
-MOTION_ORIGIN_X= 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.1
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 0.0
-%
 %
 %
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index bbfeca961c5e..85ad5b56a005 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -11,6 +11,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
+% Enable multizone mode
+MULTIZONE= YES
+%
+% List of config files to set zone specific options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
@@ -98,31 +103,6 @@ KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.0
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.1
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 0.0
-%
-%
-%
-%
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 14b6372b3bcb..46428cc4d574 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -11,6 +11,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
+% Enable Multizone mode
+MULTIZONE= YES
+%
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -88,28 +93,7 @@ MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.4
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
 
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 0.1
-%
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index f7ce85894625..12ba43bcfbac 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -11,6 +11,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
+% Enable Multizone mode
+MULTIZONE= YES
+%
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -89,30 +94,6 @@ KIND_INTERPOLATION= WEIGHTED_AVERAGE
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.4
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 0.1
-%
-%
-%
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index a38f8e73d0c6..9ba3d178e7d4 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -10,7 +10,18 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable Multizone mode
+MULTIZONE= YES
 %
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
+%
+%
+TIME_DOMAIN=YES
+%
+TIME_STEP= 1e-04
+TIME_ITER= 10
+INNER_ITER= 120
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -30,17 +41,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-1ST_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 1E-4
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.01
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 120
-
-UNST_RESTART_ITER = 2
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -89,27 +89,7 @@ MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.3
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
 
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 160.0
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index abc3adcb4202..6f5e304fa95e 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -10,7 +10,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable Multizone mode
+MULTIZONE= YES
 %
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -90,29 +94,6 @@ KIND_INTERPOLATION= WEIGHTED_AVERAGE
 MARKER_SYM= ( up, down )
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= RIGID_MOTION RIGID_MOTION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-
-MOTION_ORIGIN_X= 0.0 0.3
-MOTION_ORIGIN_Y= 0.0 0.0
-MOTION_ORIGIN_Z= 0.0 0.0
-
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_X = 0.0 0.0 
-ROTATION_RATE_Y = 0.0 0.0 
-ROTATION_RATE_Z = 0.0 160.0
-%
-%
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index 171709d2d18e..eaa4acdf7578 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -9,6 +9,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone feature
+MULTIZONE= YES
+%
+% List of config files for zone-specific options
+CONFIG_LIST=(stator.cfg, rotor.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -154,11 +159,6 @@ RAMP_OUTLET_PRESSURE= NO
 % Parameters of the outlet pressure ramp (starting outlet pressure, updating-iteration-frequency, total number of iteration for the ramp)
 RAMP_OUTLET_PRESSURE_COEFF= (400000.0, 10.0, 500)
 %
-% Specify ramp option fr rotating frame (YES, NO) default NO
-RAMP_ROTATING_FRAME= YES
-%
-% Parameters of the rotating frame ramp (starting rotational speed, updating-iteration-frequency, total number of iteration for the ramp)
-RAMP_ROTATING_FRAME_COEFF= (0.0, 39.0, 500)
 %
 % Specify Kind of average process for linearizing the Navier-Stokes equation at inflow and outflow BC included mixing-plane
 % (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA 
@@ -187,20 +187,7 @@ MARKER_PLOTTING= (BLADE1, BLADE2)
 KIND_ADAPT= PERIODIC
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= ROTATING_FRAME ROTATING_FRAME
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_Z  = 0.0  7508.3 
+
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index d58fc60c3d5b..fac28232c1f6 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -47,32 +47,24 @@ UNST_INT_ITER= 110
 UNST_ADJOINT_ITER= 251
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_MOTION, FLUID_STRUCTURE)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+%GRID_MOVEMENT= RIGID_MOTION
 %
+SURFACE_MOVEMENT= DEFORMING
+
+MARKER_MOVING= airfoil
 % Motion mach number (non-dimensional). Used for initializing a viscous flow
 % with the Reynolds number and for computing force coeffs. with dynamic meshes.
 MACH_MOTION= 0.796
 %
 % Coordinates of the rigid motion origin
-MOTION_ORIGIN_X= 0.248
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+SURFACE_MOTION_ORIGIN= 0.248 0.0 0.0
 %
 % Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 106.69842
+SURFACE_PITCHING_OMEGA= 0.0 0.0 106.69842
 %
 % Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 1.01
- 
+SURFACE_PITCHING_AMPL= 0.0 0.0 1.01
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index f768fcb5af0c..40a6fbcb69cb 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -47,29 +47,20 @@ UNST_INT_ITER= 2000
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 251
 %
-% Mesh motion for unsteady simulations (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_MOTION, FLUID_STRUCTURE)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
 % Mach number (non-dimensional, based on the mesh velocity and freestream vals.)
 MACH_MOTION= 0.796
 %
 % Coordinates of the rigid motion origin
-MOTION_ORIGIN_X= 0.248
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.248 0.0 0.0
 %
 % Pitching angular freq. (rad/s) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 106.69842
+PITCHING_OMEGA= 0.0 0.0 106.69842
 %
 % Pitching amplitude (degrees) about x, y, & z axes (RIGID_MOTION only)
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 1.01
+PITCHING_AMPL= 0.0 0.0 1.01
 %
  
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index b19ba63d59cd..d6f784e5c188 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -45,27 +45,17 @@ UNST_INT_ITER= 1000
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
-% Mesh motion for unsteady simulations (NO, YES)
-GRID_MOVEMENT= YES
-%
 % Type of mesh motion (NONE, FLUTTER, RIGID_ROTATION, RIGID_PITCHING)
-GRID_MOVEMENT_KIND= RIGID_MOTION
+GRID_MOVEMENT= RIGID_MOTION
 %
 % Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.25
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
+MOTION_ORIGIN= 0.25 0.0 0.0
 %
 % Plunging angular freq. (rad/s) in x, y, & z directions
-PLUNGING_OMEGA_X= 0.0
-PLUNGING_OMEGA_Y= 106.69842
-PLUNGING_OMEGA_Z= 0.0
+PLUNGING_OMEGA= 0.0 106.69842 0.0
 %
 % Plunging amplitude (m) in x, y, & z directions
-PLUNGING_AMPL_X= 0.0
-PLUNGING_AMPL_Y= 1.01
-PLUNGING_AMPL_Z= 0.0
-
+PLUNGING_AMPL= 0.0 1.01 0.0
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)

From a134a787fb61d5c48ef6643dae4683dacaabf7b2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 12:24:19 +0200
Subject: [PATCH 137/539] Update codi and medi

---
 externals/codi | 2 +-
 externals/medi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/externals/codi b/externals/codi
index bd4a639c2fe6..501dcf0305df 160000
--- a/externals/codi
+++ b/externals/codi
@@ -1 +1 @@
-Subproject commit bd4a639c2fe625a80946c8365bd2976a2868cf46
+Subproject commit 501dcf0305df147481630f20ce37c2e624fb351f
diff --git a/externals/medi b/externals/medi
index 46a97e1d6e8f..a95a23ce7585 160000
--- a/externals/medi
+++ b/externals/medi
@@ -1 +1 @@
-Subproject commit 46a97e1d6e8fdd3cb42b06534cff6acad2a49693
+Subproject commit a95a23ce7585905c3a731b28c1bb512028fc02bb

From 02a78b469336c42f6033e3158531b86884e21ce0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 2 Apr 2019 14:00:03 +0200
Subject: [PATCH 138/539] Adapted regression test config files and script

---
 TestCases/TestCase.py                         | 13 ++++++++--
 TestCases/serial_regression.py                | 10 ++++++-
 .../channel_2D/channel_2D_NN.cfg              | 26 ++++++++++++-------
 .../channel_2D/channel_2D_WA.cfg              | 15 ++++++-----
 .../channel_3D/channel_3D_NN.cfg              | 15 +++++++++++
 .../channel_3D/channel_3D_WA.cfg              | 25 ++++++++++--------
 .../rotating_cylinders/rot_cylinders_NN.cfg   | 15 +++--------
 .../rotating_cylinders/rot_cylinders_WA.cfg   |  5 +++-
 .../APU_turbocharger/Jones_rst.cfg            | 25 +++++-------------
 .../axial_stage_2D/Axial_stage2D.cfg          | 21 +++++----------
 10 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index d4d3178bbbeb..87f0126150a1 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -64,6 +64,9 @@ def __init__(self,tag_in):
         # Indicate whether to disable restart
         self.no_restart = False
 
+        # multizone problem
+        self.multizone = False
+
         # The test condition. These must be set after initialization
         self.test_iter = 1
         self.ntest_vals = 4
@@ -669,11 +672,17 @@ def adjust_iter(self):
         file_out = open(self.cfg_file,'w')
         file_out.write('%% This file automatically generated by the regression script\n')
         file_out.write('%% Number of iterations changed to %d\n'%(self.test_iter+1))
+        if self.multizone and self.unsteady:
+            adjust_string = "TIME_ITER"
+        elif self.multizone:
+            adjust_string = "OUTER_ITER"
+        else:
+            adjust_string = "EXT_ITER"
         for line in lines:
-            if not line.startswith("EXT_ITER"):
+            if not line.startswith(adjust_string):
                 file_out.write(line)
             else:
-                file_out.write("EXT_ITER=%d\n"%(self.test_iter+1))
+                file_out.write(adjust_string+"=%d\n"%(self.test_iter+1))
         file_out.close()
         os.chdir(workdir)
 
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 136002925bfa..9c9944fe33ce 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -870,9 +870,10 @@ def main():
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
     uniform_flow.unsteady  = True
+    uniform_flow.multizone = True
     test_list.append(uniform_flow) 
 
-    # Channel_2D
+   # Channel_2D
     channel_2D           = TestCase('channel_2D')
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
@@ -882,6 +883,7 @@ def main():
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
     channel_2D.unsteady  = True
+    channel_2D.multizone = True
     test_list.append(channel_2D)
 
     # Channel_3D
@@ -894,6 +896,7 @@ def main():
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
     channel_3D.unsteady  = True
+    channel_3D.multizone = True
     test_list.append(channel_3D)
 
     # Pipe
@@ -906,6 +909,7 @@ def main():
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
     pipe.unsteady  = True
+    pipe.multizone = True
     test_list.append(pipe)
 
     # Rotating cylinders
@@ -918,6 +922,7 @@ def main():
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
     rotating_cylinders.unsteady  = True
+    rotating_cylinders.multizone = True
     test_list.append(rotating_cylinders)
 
     # Supersonic vortex shedding
@@ -930,6 +935,7 @@ def main():
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
     supersonic_vortex_shedding.unsteady  = True
+    supersonic_vortex_shedding.multizone = True
     test_list.append(supersonic_vortex_shedding)
 
     # Bars_SST_2D
@@ -941,6 +947,7 @@ def main():
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
+    bars_SST_2D.multizone = True
     test_list.append(bars_SST_2D)
     
     # Sliding mesh with incompressible flows (steady)
@@ -952,6 +959,7 @@ def main():
     slinc_steady.su2_exec  = "SU2_CFD"
     slinc_steady.timeout   = 100
     slinc_steady.tol       = 0.00001
+    slinc_steady.multizone = True
     test_list.append(slinc_steady)
     
     # Sliding mesh with incompressible flows (unsteady)
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 96fe723a29a5..c245fa94fcf0 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -15,7 +15,22 @@ MULTIZONE = YES
 %
 % List of sub config files to specify zone specific options 
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
-
+%
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 50
+%
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -34,15 +49,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 50
-
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 19f7be9e2f0c..53a6ea42840a 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -16,19 +16,20 @@ MULTIZONE = YES
 % List of sub config files to specify zone specific options 
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
 %
-% Enable time domain
-TIME_DOMAIN= YES
+%
+% Enable time dependent problem
+TIME_DOMAIN = YES
 %
 % Number of time steps
-TIME_ITER= 32000
+TIME_ITER = 32000
 %
 % Time step
-TIME_STEP= 0.1
+TIME_STEP = 0.1
 %
-% Max. time
-MAX_TIME= 10
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
 %
-% Number of internal iterations
+% Inner iterations
 INNER_ITER= 50
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 1858bf38afef..c73f6de4553f 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -16,6 +16,21 @@ MULTIZONE= YES
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
 %
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 20
+%
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 6450e2302356..408933e581ba 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -16,6 +16,20 @@ MULTIZONE= YES
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg)
 %
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 20
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -34,17 +48,6 @@ RESTART_SOL= NO
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 20
-%
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 59c6e311b42a..28ab477f6475 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -25,7 +25,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 5
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 200
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -45,16 +48,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-
-UNST_RESTART_ITER = 2
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index b2e8f204cb98..f6af4c1299b5 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -26,7 +26,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 5
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 200
 %
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index a0898c32ae9f..a3638fe888e8 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -9,6 +9,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone feature
+MULTIZONE= YES
+%
+% List of config files for zone-specific options
+CONFIG_LIST=(stator.cfg, rotor.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -158,11 +163,6 @@ RAMP_OUTLET_PRESSURE= NO
 % Parameters of the outlet pressure ramp (starting outlet pressure, updating-iteration-frequency, total number of iteration for the ramp)
 RAMP_OUTLET_PRESSURE_COEFF= (400000.0, 10.0, 500)
 %
-% Specify ramp option fr rotating frame (YES, NO) default NO
-RAMP_ROTATING_FRAME= NO
-%
-% Parameters of the rotating frame ramp (starting rotational speed, updating-iteration-frequency, total number of iteration for the ramp)
-RAMP_ROTATING_FRAME_COEFF= (0.0, 39.0, 500)
 %
 % Specify Kind of average process for linearizing the Navier-Stokes equation at inflow and outflow BC included mixing-plane
 % (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA 
@@ -191,20 +191,7 @@ MARKER_PLOTTING= (BLADE1, BLADE2)
 KIND_ADAPT= PERIODIC
 %
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= ROTATING_FRAME ROTATING_FRAME
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
-ROTATION_RATE_Z  = 0.0  7508.3 
+
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index d91cfaeaf61d..182d73953c94 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -9,6 +9,11 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Enable multizone mode
+MULTIZONE= YES
+%
+% List of config files
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -192,21 +197,7 @@ CFL_ADAPT= NO
 % Parameters of the adaptive CFL number (factor down, factor up, CFL min value, CFL max value )
 CFL_ADAPT_PARAM= ( 1.3, 1.2, 1.0, 10.0)
 %
-%
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= YES
-%
-% Type of dynamic mesh (NONE, ROTATING_FRAME)
-GRID_MOVEMENT_KIND= STEADY_TRANSLATION STEADY_TRANSLATION
-%
-% Motion mach number (non-dimensional). Used for intitializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.35
-%
-%Steady transaltion rate
-TRANSLATION_RATE_Y= 0.0 -150.0
+
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %

From f8e809a00991d461b0cbecd7b9751491ed7493d4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 3 Apr 2019 15:37:06 +0200
Subject: [PATCH 139/539] Moved default checks for whether to print screen
 output to base output class

---
 Common/src/config_structure.cpp         |  2 +-
 SU2_CFD/include/output_structure.hpp    | 58 +------------------------
 SU2_CFD/include/output_structure.inl    |  6 ---
 SU2_CFD/src/driver_direct_multizone.cpp |  2 +-
 SU2_CFD/src/output_direct_heat.cpp      |  7 +--
 SU2_CFD/src/output_direct_mean.cpp      | 39 -----------------
 SU2_CFD/src/output_direct_mean_fem.cpp  | 39 -----------------
 SU2_CFD/src/output_direct_mean_inc.cpp  | 42 ------------------
 SU2_CFD/src/output_driver.cpp           |  6 +--
 SU2_CFD/src/output_structure.cpp        | 42 ++++++++++++++++++
 10 files changed, 52 insertions(+), 191 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index f62b2f3c7cdc..2e8405bcde8b 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3364,7 +3364,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   	/* Initialize the Harmonic balance Frequency pointer */
   	if (Omega_HB == NULL) {
   		Omega_HB = new su2double[nOmega_HB];
-  		for (iZone = 0; iZone < nOmega_HB; iZone++ )
+  		for (unsigned short iZone = 0; iZone < nOmega_HB; iZone++ )
   			Omega_HB[iZone] = 0.0;
   	}else {
   		if (nOmega_HB != nTimeInstances) {
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 231a10f3985a..87aadcadad81 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1102,24 +1102,6 @@ class CFlowOutput : public COutput {
   
   void SetHistoryOutputFields(CConfig *config);
   
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-  
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
   bool SetInit_Residuals(CConfig *config);
@@ -1163,26 +1145,6 @@ class CIncFlowOutput : public COutput {
 
   void SetHistoryOutputFields(CConfig *config);
   
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  
   void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   
   void SetVolumeOutputFields(CConfig *config);
@@ -1241,25 +1203,7 @@ class CFlowFEMOutput : public COutput {
   void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
   
   void SetHistoryOutputFields(CConfig *config);
-  
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-  
+
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
   bool SetInit_Residuals(CConfig *config);
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index f628126a8557..eaeec57eab9e 100644
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -49,12 +49,6 @@ inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { ret
 inline void COutput::SetHistoryOutputFields(CConfig *config){}
 
 inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
- 
-inline bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
-
-inline bool COutput::WriteScreen_Header(CConfig *config) { return true; }
-
-inline bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { return true; }
 
 inline void COutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 093a88dd4222..5b8d0766e3dc 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -365,7 +365,7 @@ void CMultizoneDriver::Run_Jacobi() {
       driver_config->SetOuterIter(iOuter_Iter);
 
       /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
-      iteration_container[iZone][INST_0]->Solve(output[ZONE_0], integration_container, geometry_container, solver_container,
+      iteration_container[iZone][INST_0]->Solve(output[iZone], integration_container, geometry_container, solver_container,
           numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
       /*--- A corrector step can help preventing numerical instabilities ---*/
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index a9b221e4d093..4c475a409c06 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -145,14 +145,15 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
-  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
-  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
   
   AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
   
+  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  
 }
 
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index e5ddd8abb939..901a4c05d0be 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -661,45 +661,6 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   }
 }
 
-bool CFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
-}
-
-bool CFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
-  return write_header;
-}
-
-bool CFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
-  
-  if ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-
-  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
-}
-
 su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
   unsigned short iDim, jDim;
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index 21d819707e67..618201bf5aae 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -436,45 +436,6 @@ void CFlowFEMOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver
   
 }
 
-bool CFlowFEMOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
-}
-
-bool CFlowFEMOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
-  return write_header;
-}
-
-bool CFlowFEMOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
-  
-  if ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-
-  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
-}
-
 su2double CFlowFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
   unsigned short iDim, jDim;
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index b850281a5ac3..5d76283e5f2a 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -282,48 +282,6 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-bool CIncFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
-}
-
-bool CIncFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
-  return write_header;
-}
-
-bool CIncFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
-  
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime ){
-    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-
-  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
-}
-
-
-
 inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
   
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 59a6b01f58d6..1c2358a90840 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -265,15 +265,15 @@ void CDriverOutput::SetScreen_Output(COutput **output, CConfig *driver_config, C
 inline bool CDriverOutput::WriteScreen_Header(CConfig *driver_config, CConfig **config) {
 
   unsigned short iZone;
-  bool write_header = true;
+  bool write_header = true, write_zone = false;
 
   /*--- If the zone output is disabled for every zone ---*/
   for (iZone = 0; iZone < nZone; iZone++){
-    write_header = (write_header && (!config[iZone]->GetWrt_ZoneConv()));
+    write_zone = config[iZone]->GetWrt_ZoneConv();
   }
 
   /*--- If the outer iteration is zero ---*/
-  write_header = (write_header && (driver_config->GetOuterIter() == 0));
+  write_header = (write_header && (driver_config->GetOuterIter() == 0)) || write_zone;
 
   return write_header;
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index f5bd97efeb03..05ab2e28681f 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -9740,3 +9740,45 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     }
   }
 }
+
+bool COutput::WriteScreen_Header(CConfig *config) {  
+  bool write_header = false;
+  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
+  } else {
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+  }
+
+  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
+
+  return write_header;
+}
+
+bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+  bool write_output = false;
+  
+  write_output = config->GetnInner_Iter() - 1 == config->GetInnerIter();
+  
+  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) )){
+    write_output = write_output || PrintOutput(config->GetInnerIter(), config->GetWrt_Con_Freq_DualTime());
+  }
+  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
+    write_output = write_output ||  PrintOutput(config->GetInnerIter(), config->GetWrt_Con_Freq()) ;    
+  } 
+
+  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
+  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
+
+  return write_output;
+}
+
+bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
+ if (!write_dualtime){
+   return true;
+ }
+ else {
+   return false;
+ }
+}
+

From 462a5c4854c70613d7e0878481dea3ecd7c45ff0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 3 Apr 2019 15:37:35 +0200
Subject: [PATCH 140/539] Some small fixes

---
 SU2_CFD/src/driver_structure.cpp    |  2 +-
 SU2_CFD/src/iteration_structure.cpp |  3 +--
 SU2_CFD/src/output_driver.cpp       | 12 ++++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index b972f1b92682..39552f41ce36 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3664,7 +3664,7 @@ void CDriver::Output_Preprocessing(){
 
     /*--- Initial print to console for this zone. ---*/
 
-    if (rank == MASTER_NODE) cout << "Zone " << iZone+1;
+    if (rank == MASTER_NODE) cout << "Zone " << iZone;
 
     /*--- Loop over all zones and instantiate the physics iteration. ---*/
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index fd991e95f1b4..126a529b9423 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1488,8 +1488,7 @@ void CFEAIteration::Iterate(COutput *output,
 
         /*--- Write the convergence history (first, compute Von Mises stress) ---*/
         solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-        write_output = output->PrintOutput(IntIter-1, config_container[val_iZone]->GetWrt_Con_Freq_DualTime());
-        if (write_output) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+        output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
 
         config_container[val_iZone]->SetInnerIter(IntIter);
         config_container[val_iZone]->SetIntIter(IntIter);
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 1c2358a90840..393a6f10c821 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -100,7 +100,9 @@ void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConf
   string name, header;
   su2double val, avgsol, avgzone;
 
-  SetHistoryOutputValue("TIME_ITER", driver_config->GetTimeIter());
+  if (driver_config->GetTime_Domain()){
+    SetHistoryOutputValue("TIME_ITER", driver_config->GetTimeIter());
+  }
   SetHistoryOutputValue("OUTER_ITER", driver_config->GetOuterIter());
 
   for (iZone = 0; iZone < nZone; iZone++){
@@ -162,9 +164,11 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
   unsigned short iZone, iSol, iVar;
   unsigned short iReqField;
   string name, header;
-
-  AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
-  RequestedScreenFields.push_back("TIME_ITER"); RequestedHistoryFields.push_back("TIME_ITER");
+  
+  if (config[ZONE_0]->GetTime_Domain()){
+    AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
+    RequestedScreenFields.push_back("TIME_ITER"); RequestedHistoryFields.push_back("TIME_ITER");
+  }
   AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER");
   RequestedScreenFields.push_back("OUTER_ITER"); RequestedHistoryFields.push_back("OUTER_ITER");
 

From 607ecbeb7b5ba3570e89af93ac88ac395892682e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 4 Apr 2019 11:37:03 +0200
Subject: [PATCH 141/539] Adapted sliding mesh test cases

---
 TestCases/TestCase.py                         | 14 ++++++-----
 .../sliding_interface/bars_SST_2D/bars.cfg    |  8 +++----
 .../channel_2D/channel_2D_NN.cfg              |  3 ++-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |  4 ++++
 TestCases/sliding_interface/pipe/pipe_WA.cfg  | 10 ++++++++
 .../sup_vor_shed_NN.cfg                       | 23 +++++++++++--------
 .../sup_vor_shed_WA.cfg                       | 23 +++++++++++--------
 7 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index ed6ed7b38028..0bfa2bd7c51f 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -144,16 +144,17 @@ def run_test(self):
                     if line.find('Begin Solver') > -1:
                         start_solver=True
                 else:   # Found the --Begin solver --- line; parse the input
-                    if self.new_output:
+                    if self.new_output or self.multizone:
                         raw_data = line.strip() # Strip removes whitespaces head-tail
-                        raw_data = raw_data[1:-1].split('|') # Remove heat-tail bars before splitting 
+                        raw_data = raw_data[1:-1].split('|') # Remove heat-tail bars before splitting
                     else:
                         raw_data = line.split()
                     try:
                         iter_number = int(raw_data[0])
-                        if self.unsteady:
+                        if self.unsteady and not self.multizone:
                             iter_number = int(raw_data[1])
                         data = raw_data[len(raw_data) - len(self.test_vals):]
+                        print( iter_number)
                     except ValueError:
                         continue
                     except IndexError:
@@ -683,12 +684,13 @@ def adjust_iter(self):
             adjust_string = "TIME_ITER"
         elif self.multizone:
             adjust_string = "OUTER_ITER"
-	elif self.new_output:
-	    adjust_string = "ITER"
+        elif self.new_output:
+            adjust_string = "ITER"
         else:
             adjust_string = "EXT_ITER"
+        print(adjust_string)
         for line in lines:
-            if not line.strip().split("=")[0] == adjust_string:
+            if not line.strip().split("=")[0].strip() == adjust_string:
                 file_out.write(line)
             else:
                 file_out.write(adjust_string+"=%d\n"%(self.test_iter+1))
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index ee846102a850..5eaa0c65e10f 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -14,12 +14,12 @@ MULTIZONE=YES
 
 %CONFIG_LIST = (configFlow.cfg, configFEA.cfg)
 
-TIME_DOMAIN = YES
+TIME_DOMAIN = NO
 TIME_ITER = 3
 TIME_STEP = 0.005
-
-OUTER_ITER = 5
-
+INNER_ITER= 1
+OUTER_ITER = 100
+%WRT_ZONE_CONV=YES
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES,
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index c245fa94fcf0..4612b334fd79 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -26,11 +26,12 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 10
 %
 % Inner iterations
 INNER_ITER= 50
 %
+WRT_ZONE_CONV=YES
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index deacfb45546f..d7882e1c8ee8 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -16,6 +16,10 @@ MULTIZONE= YES
 % List of config files for zone specific options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg, zone_4.cfg, zone_5.cfg)
 %
+TIME_DOMAIN=YES
+%
+% Time step
+TIME_STEP= 0.1
 %
 TIME_ITER= 10
 %
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 22d9baf0cb5e..7426cef71419 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -16,6 +16,16 @@ MULTIZONE= YES
 % List of config files for zone specific options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg, zone_3.cfg, zone_4.cfg, zone_5.cfg)
 %
+TIME_DOMAIN=YES
+%
+TIME_STEP= 0.1
+%
+TIME_ITER= 10
+%
+OUTER_ITER=1
+%
+INNER_ITER=200
+%
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 46428cc4d574..69e7fa1b61a3 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -17,6 +17,20 @@ MULTIZONE= YES
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 100
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -36,15 +50,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 100
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 12ba43bcfbac..86574f297276 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -17,6 +17,20 @@ MULTIZONE= YES
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
+% Enable time dependent problem
+TIME_DOMAIN = YES
+%
+% Number of time steps
+TIME_ITER = 32000
+%
+% Time step
+TIME_STEP = 0.1
+%
+% Number of outer iterations (Block-Gauss-Seidel)
+OUTER_ITER = 1
+%
+% Inner iterations
+INNER_ITER= 100
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -36,15 +50,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 100
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)

From 8f5a53660bfbe77cbb627c828a04634c001f7fdb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 4 Apr 2019 18:49:46 +0200
Subject: [PATCH 142/539] Some changes of variables names

---
 Common/include/config_structure.hpp |  8 ++++----
 Common/include/config_structure.inl |  8 ++++----
 Common/src/config_structure.cpp     | 25 +++++++++++++++++--------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index ca869644ff41..951cd752a9a1 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1071,10 +1071,10 @@ class CConfig {
 
   ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
   bool Time_Domain;             /*!< \brief Determines if the multizone problem is solved in time-domain */
-  unsigned long Outer_Iter,    /*!< \brief Determines the number of outer iterations in the multizone problem */
-  Inner_Iter,                   /*!< \brief Determines the number of inner iterations in each multizone block */
-  Time_Iter,                    /*!< \brief Determines the number of time iterations in the multizone problem */
-  Iter,                         /*!< \brief Determines the number of pseudo-time iterations in a single-zone problem */
+  unsigned long nOuterIter,    /*!< \brief Determines the number of outer iterations in the multizone problem */
+  nInnerIter,                   /*!< \brief Determines the number of inner iterations in each multizone block */
+  nTimeIter,                    /*!< \brief Determines the number of time iterations in the multizone problem */
+  nIter,                         /*!< \brief Determines the number of pseudo-time iterations in a single-zone problem */
   Restart_Iter;                 /*!< \brief Determines the restart iteration in the multizone problem */
   su2double Time_Step;          /*!< \brief Determines the time step for the multizone problem */
   su2double Max_Time;           /*!< \brief Determines the maximum time for the time-domain problems */
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index d8980e623a64..839358494fa1 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2036,13 +2036,13 @@ inline string CConfig::GetMarkerTag_ZoneInterface(unsigned short val_iMarker) {
 
 inline bool CConfig::GetTime_Domain(void) { return Time_Domain; }
 
-inline unsigned long CConfig::GetnInner_Iter(void) { return Inner_Iter; }
+inline unsigned long CConfig::GetnInner_Iter(void) { return nInnerIter; }
 
-inline unsigned long CConfig::GetnOuter_Iter(void) { return Outer_Iter; }
+inline unsigned long CConfig::GetnOuter_Iter(void) { return nOuterIter; }
 
-inline unsigned long CConfig::GetnTime_Iter(void) { return Time_Iter; }
+inline unsigned long CConfig::GetnTime_Iter(void) { return nTimeIter; }
 
-inline unsigned long CConfig::GetnIter(void) { return Iter; }
+inline unsigned long CConfig::GetnIter(void) { return nIter; }
 
 inline unsigned long CConfig::GetRestart_Iter(void) { return Restart_Iter; }
 
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 2e8405bcde8b..a8ff3be80e7f 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2177,13 +2177,13 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Determines if the multizone problem is solved for time-domain. */
   addBoolOption("TIME_DOMAIN", Time_Domain, false);
   /* DESCRIPTION: Number of outer iterations in the multizone problem. */
-  addUnsignedLongOption("OUTER_ITER", Outer_Iter, 1);
+  addUnsignedLongOption("OUTER_ITER", nOuterIter, 1);
   /* DESCRIPTION: Number of inner iterations in each multizone block. */
-  addUnsignedLongOption("INNER_ITER", Inner_Iter, 1);
+  addUnsignedLongOption("INNER_ITER", nInnerIter, 1);
   /* DESCRIPTION: Number of time steps solved in the multizone problem. */
-  addUnsignedLongOption("TIME_ITER", Time_Iter, 1);
+  addUnsignedLongOption("TIME_ITER", nTimeIter, 1);
   /* DESCRIPTION: Number of iterations in each single-zone block. */
-  addUnsignedLongOption("ITER", Iter, 1000);
+  addUnsignedLongOption("ITER", nIter, 1000);
   /* DESCRIPTION: Restart iteration in the multizone problem. */
   addUnsignedLongOption("RESTART_ITER", Restart_Iter, 1);
   /* DESCRIPTION: Minimum error threshold for the linear solver for the implicit formulation */
@@ -3177,10 +3177,19 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
-  if (!Time_Domain){
-    Time_Iter = 1;
+  if (Unsteady_Simulation == TIME_STEPPING){
+    nIter      = 1;
+    nInnerIter  = 1;
   }
   
+  if (!Time_Domain){
+    nTimeIter = 1;
+  } 
+  
+  if (Time_Domain){
+    Delta_UnstTime = Time_Step;
+    Delta_DynTime  = Time_Step;
+  }
   /*--- Fluid-Structure Interaction problems ---*/
 
   if (FSI_Problem) {
@@ -6023,8 +6032,8 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     cout << endl <<"------------------ Convergence Criteria  ( Zone "  << iZone << " ) ---------------------" << endl;
 
     if (SinglezoneDriver){
-      cout << "Maximum number of solver subiterations: " << Iter <<"."<< endl;
-      cout << "Maximum number of physical time-steps: " << Time_Iter <<"."<< endl;
+      cout << "Maximum number of solver subiterations: " << nIter <<"."<< endl;
+      cout << "Maximum number of physical time-steps: " << nTimeIter <<"."<< endl;
     }
     else{
       cout << "Maximum number of iterations: " << nExtIter <<"."<< endl;

From 2451394eb6fd95b7af04cdae4d68184831b56ccb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 4 Apr 2019 18:51:45 +0200
Subject: [PATCH 143/539] Some minor fixes to make the unsteady FEM solver work
 with new driver

---
 SU2_CFD/src/iteration_structure.cpp | 2 +-
 SU2_CFD/src/output_structure.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 126a529b9423..3300e799e76d 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -773,7 +773,7 @@ void CFluidIteration::Solve(COutput *output,
 
   /*--- Boolean to determine if we are running a static or dynamic case ---*/
   bool steady = (config_container[val_iZone]->GetUnsteady_Simulation() == STEADY);
-  bool unsteady = ((config_container[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool unsteady = !steady;
 
   unsigned long Inner_Iter, nInner_Iter = config_container[val_iZone]->GetnInner_Iter();
   bool StopCalc = false;
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 05ab2e28681f..f8153e9f0372 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -9744,7 +9744,7 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
 bool COutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
+    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }

From d5f352d06c3030572a0e715c7fc9c1d71063d58c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 4 Apr 2019 18:53:43 +0200
Subject: [PATCH 144/539] Adapted more test cases

---
 TestCases/TestCase.py                         |   6 +-
 .../nPoly3_QuadDominant/fem_Sphere_reg.cfg    |   7 +-
 .../fem_Sphere_reg_ADER.cfg                   |  14 +-
 .../nPoly4/fem_unst_cylinder.cfg              |  17 +-
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |  16 +-
 TestCases/new_output_regression.py            | 202 ++++++++++++++----
 6 files changed, 209 insertions(+), 53 deletions(-)

diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index 0bfa2bd7c51f..2f72c27fb6ed 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -151,10 +151,9 @@ def run_test(self):
                         raw_data = line.split()
                     try:
                         iter_number = int(raw_data[0])
-                        if self.unsteady and not self.multizone:
+                        if self.unsteady and not self.multizone and not self.new_output:
                             iter_number = int(raw_data[1])
                         data = raw_data[len(raw_data) - len(self.test_vals):]
-                        print( iter_number)
                     except ValueError:
                         continue
                     except IndexError:
@@ -680,7 +679,7 @@ def adjust_iter(self):
         file_out = open(self.cfg_file,'w')
         file_out.write('%% This file automatically generated by the regression script\n')
         file_out.write('%% Number of iterations changed to %d\n'%(self.test_iter+1))
-        if self.multizone and self.unsteady:
+        if (self.multizone or self.new_output) and self.unsteady:
             adjust_string = "TIME_ITER"
         elif self.multizone:
             adjust_string = "OUTER_ITER"
@@ -688,7 +687,6 @@ def adjust_iter(self):
             adjust_string = "ITER"
         else:
             adjust_string = "EXT_ITER"
-        print(adjust_string)
         for line in lines:
             if not line.strip().split("=")[0].strip() == adjust_string:
                 file_out.write(line)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 95537555e5d5..754f64fc2da4 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -23,6 +23,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %RESTART_SOL= YES
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -91,7 +93,7 @@ MARKER_DESIGNING = ( Sphere )
 CFL_NUMBER= 0.15
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 %
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
@@ -189,3 +191,6 @@ WRT_SOL_FREQ= 2500
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index f3e22680faab..2138a6629e06 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -22,6 +22,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 %RESTART_SOL= YES
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -86,15 +89,16 @@ MARKER_DESIGNING = ( Sphere )
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 UNSTEADY_SIMULATION= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 2.0e-6
+TIME_STEP= 2.0e-6
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.15
@@ -105,7 +109,7 @@ UNST_CFL_NUMBER= 0.15
 CFL_NUMBER= 0.125
 %
 % Number of total iterations
-EXT_ITER= 11
+TIME_ITER= 11
 
 % ------------------ FEM FLOW NUMERICAL METHOD DEFINITION ----------------------%
 %
@@ -213,3 +217,7 @@ WRT_SOL_FREQ_DUALTIME= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT = (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
+
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 1943441affc5..02ef3309c681 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -22,7 +22,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= YES
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -89,15 +91,17 @@ MARKER_DESIGNING = ( Cylinder )
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+% Enable time dependent simulation
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 UNSTEADY_SIMULATION= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 1e-6
+TIME_STEP= 1e-6
 %
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.05
@@ -108,7 +112,7 @@ UNST_CFL_NUMBER= 0.05
 CFL_NUMBER= 0.125
 %
 % Number of total iterations
-EXT_ITER= 11
+TIME_ITER= 12
 
 % ------------------ FEM FLOW NUMERICAL METHOD DEFINITION ----------------------%
 %
@@ -205,3 +209,6 @@ WRT_SOL_FREQ_DUALTIME= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 6dba40e17903..9524c3fdb0af 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -22,6 +22,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= YES
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -89,15 +92,18 @@ MARKER_DESIGNING = ( Cylinder )
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+% Time dependent problem
+TIME_DOMAIN= YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 UNSTEADY_SIMULATION= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 1.6e-5
+TIME_STEP= 1.6e-5
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.05
@@ -108,7 +114,7 @@ UNST_CFL_NUMBER= 0.05
 CFL_NUMBER= 0.125
 %
 % Number of total iterations
-EXT_ITER= 11
+TIME_ITER= 11
 
 % ------------------ FEM FLOW NUMERICAL METHOD DEFINITION ----------------------%
 %
@@ -216,3 +222,7 @@ WRT_SOL_FREQ_DUALTIME= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
+
diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index 140a0a86924c..1a2052562b89 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -413,6 +413,7 @@ def main():
     fem_ns_sphere.test_iter = 10
     fem_ns_sphere.test_vals = [-0.288121,0.240324,0.000258,21.797363] #last 4 columns
     fem_ns_sphere.su2_exec  = "SU2_CFD"
+    fem_ns_sphere.new_output = True
     fem_ns_sphere.timeout   = 1600
     fem_ns_sphere.tol       = 0.00001
     test_list.append(fem_ns_sphere)
@@ -424,6 +425,8 @@ def main():
     fem_ns_sphere_ader.test_iter = 10
     fem_ns_sphere_ader.test_vals = [-35.000000,-35.000000,0.000047,31.110911] #last 4 columns
     fem_ns_sphere_ader.su2_exec  = "SU2_CFD"
+    fem_ns_sphere_ader.new_output = True
+    fem_ns_sphere_ader.unsteady   = True
     fem_ns_sphere_ader.timeout   = 1600
     fem_ns_sphere_ader.tol       = 0.00001
     test_list.append(fem_ns_sphere_ader)
@@ -432,9 +435,11 @@ def main():
     fem_ns_unsteady_cylinder           = TestCase('fem_ns_unsteady_cylinder')
     fem_ns_unsteady_cylinder.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder.cfg_file  = "fem_unst_cylinder.cfg"
-    fem_ns_unsteady_cylinder.test_iter = 10
+    fem_ns_unsteady_cylinder.test_iter = 11
     fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
     fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder.new_output = True
+    fem_ns_unsteady_cylinder.unsteady   = True
     fem_ns_unsteady_cylinder.timeout   = 1600
     fem_ns_unsteady_cylinder.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder)
@@ -443,50 +448,172 @@ def main():
     fem_ns_unsteady_cylinder_ader           = TestCase('fem_ns_unsteady_cylinder_ader')
     fem_ns_unsteady_cylinder_ader.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder_ader.cfg_file  = "fem_unst_cylinder_ADER.cfg"
-    fem_ns_unsteady_cylinder_ader.test_iter = 10
+    fem_ns_unsteady_cylinder_ader.test_iter = 11
     fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
     fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder_ader.new_output = True
+    fem_ns_unsteady_cylinder_ader.unsteady   = True
     fem_ns_unsteady_cylinder_ader.timeout   = 1600
     fem_ns_unsteady_cylinder_ader.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder_ader)
 
+    ######################################
+    ### Sliding Mesh                   ###
+    ######################################
+
+    # Uniform flow
+    uniform_flow         = TestCase('uniform_flow')
+    uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
+    uniform_flow.cfg_file  = "uniform_NN.cfg"
+    uniform_flow.test_iter = 10
+    uniform_flow.test_vals = [10.000000, 0.000000, 0.432864, -5.596207] #last 4 columns
+    uniform_flow.su2_exec  = "SU2_CFD"
+    uniform_flow.timeout   = 1600
+    uniform_flow.tol       = 0.000001
+    uniform_flow.unsteady  = True
+    uniform_flow.multizone = True
+    test_list.append(uniform_flow) 
+
+   # Channel_2D
+    channel_2D           = TestCase('channel_2D')
+    channel_2D.cfg_dir   = "sliding_interface/channel_2D"
+    channel_2D.cfg_file  = "channel_2D_WA.cfg"
+    channel_2D.test_iter = 4
+    channel_2D.test_vals = [0.000000, 1.497633, 1.199455, 0.904683] #last 4 columns
+    channel_2D.su2_exec  = "SU2_CFD"
+    channel_2D.timeout   = 100
+    channel_2D.tol       = 0.00001
+    channel_2D.unsteady  = True
+    channel_2D.multizone = True
+    test_list.append(channel_2D)
+
+    # Channel_3D
+    channel_3D           = TestCase('channel_3D')
+    channel_3D.cfg_dir   = "sliding_interface/channel_3D"
+    channel_3D.cfg_file  = "channel_3D_WA.cfg"
+    channel_3D.test_iter = 1
+    channel_3D.test_vals = [1.000000, 0.000000, 1.834878, 1.892644, 1.606895] #last 4 columns
+    channel_3D.su2_exec  = "SU2_CFD"
+    channel_3D.timeout   = 1600
+    channel_3D.tol       = 0.00001
+    channel_3D.unsteady  = True
+    channel_3D.multizone = True
+    test_list.append(channel_3D)
+
+    # Pipe
+    pipe           = TestCase('pipe')
+    pipe.cfg_dir   = "sliding_interface/pipe"
+    pipe.cfg_file  = "pipe_NN.cfg"
+    pipe.test_iter = 2
+    pipe.test_vals = [ -0.341198, -0.045916, 0.800374, 0.699486] #last 4 columns
+    pipe.su2_exec  = "SU2_CFD"
+    pipe.timeout   = 1600
+    pipe.tol       = 0.00001
+    pipe.unsteady  = True
+    pipe.multizone = True
+    test_list.append(pipe)
+    
+    # Rotating cylinders
+    rotating_cylinders           = TestCase('rotating_cylinders')
+    rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
+    rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
+    rotating_cylinders.test_iter = 3
+    rotating_cylinders.test_vals = [0.000000,2.018268, 1.942868, 1.696582] #last 4 columns
+    rotating_cylinders.su2_exec  = "SU2_CFD"
+    rotating_cylinders.timeout   = 1600
+    rotating_cylinders.tol       = 0.00001
+    rotating_cylinders.unsteady  = True
+    rotating_cylinders.multizone = True
+    test_list.append(rotating_cylinders)
+    
+    # Supersonic vortex shedding
+    supersonic_vortex_shedding           = TestCase('supersonic_vortex_shedding')
+    supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
+    supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
+    supersonic_vortex_shedding.test_iter = 5
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 2.162202, 2.304635] #last 4 columns
+    supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
+    supersonic_vortex_shedding.timeout   = 1600
+    supersonic_vortex_shedding.tol       = 0.00001
+    supersonic_vortex_shedding.unsteady  = True
+    supersonic_vortex_shedding.multizone = True
+    test_list.append(supersonic_vortex_shedding)
+    
+    # Bars_SST_2D
+    bars_SST_2D           = TestCase('bars_SST_2D')
+    bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
+    bars_SST_2D.cfg_file  = "bars.cfg"
+    bars_SST_2D.test_iter = 13
+    bars_SST_2D.test_vals = [-0.941341, -0.270420, -1.840081,-1.159466] #last 4 columns
+    bars_SST_2D.su2_exec  = "SU2_CFD"
+    bars_SST_2D.timeout   = 1600
+    bars_SST_2D.tol       = 0.00001
+    bars_SST_2D.multizone = True
+    test_list.append(bars_SST_2D)
+    
+    # Sliding mesh with incompressible flows (steady)
+    slinc_steady           = TestCase('slinc_steady')
+    slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
+    slinc_steady.cfg_file  = "config.cfg"
+    slinc_steady.test_iter = 19
+    slinc_steady.test_vals = [19.000000, -1.766116,  -2.206522] #last 3 columns
+    slinc_steady.su2_exec  = "SU2_CFD"
+    slinc_steady.timeout   = 100
+    slinc_steady.tol       = 0.00001
+    slinc_steady.multizone = True
+    test_list.append(slinc_steady)
+    
+    # Sliding mesh with incompressible flows (unsteady)
+    # slinc_unsteady           = TestCase('slinc_unsteady')
+    # slinc_unsteady.cfg_dir   = "sliding_interface/incompressible_unsteady"
+    # slinc_unsteady.cfg_file  = "config.cfg"
+    # slinc_unsteady.test_iter = 19
+    # slinc_unsteady.test_vals = [-3.515218,1.930028,0.000000,0.000000] #last 4 columns
+    # slinc_unsteady.su2_exec  = "SU2_CFD"
+    # slinc_unsteady.timeout   = 100
+    # slinc_unsteady.tol       = 0.00001
+    # slinc_unsteady.unsteady  = True
+    # test_list.append(slinc_unsteady)
+
     ##########################
     ### FEA - FSI          ###
     ##########################
 
-    # Static beam, 3d
-    statbeam3d           = TestCase('statbeam3d')
-    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
-    statbeam3d.cfg_file  = "configBeam_3d.cfg"
-    statbeam3d.new_output= True
-    statbeam3d.test_iter = 0
-    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
-    statbeam3d.su2_exec  = "SU2_CFD"
-    statbeam3d.timeout   = 1600
-    statbeam3d.tol       = 0.00001
-    test_list.append(statbeam3d)
-
-    # # Dynamic beam, 2d
-    dynbeam2d           = TestCase('dynbeam2d')
-    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
-    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
-    dynbeam2d.unsteady  = True
-    dynbeam2d.new_output= True  
-    dynbeam2d.test_iter = 6 
-    dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
-    dynbeam2d.su2_exec  = "SU2_CFD"
-    dynbeam2d.timeout   = 1600
-    dynbeam2d.tol       = 0.00001
-    test_list.append(dynbeam2d)
+#    # Static beam, 3d
+#    statbeam3d           = TestCase('statbeam3d')
+#    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
+#    statbeam3d.cfg_file  = "configBeam_3d.cfg"
+#    statbeam3d.new_output= True
+#    statbeam3d.test_iter = 0
+#    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
+#    statbeam3d.su2_exec  = "SU2_CFD"
+#    statbeam3d.timeout   = 1600
+#    statbeam3d.tol       = 0.00001
+#    test_list.append(statbeam3d)
+#
+#    # # Dynamic beam, 2d
+#    dynbeam2d           = TestCase('dynbeam2d')
+#    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
+#    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
+#    dynbeam2d.unsteady  = True
+#    dynbeam2d.new_output= True  
+#    dynbeam2d.test_iter = 6 
+#    dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
+#    dynbeam2d.su2_exec  = "SU2_CFD"
+#    dynbeam2d.timeout   = 1600
+#    dynbeam2d.tol       = 0.00001
+#    test_list.append(dynbeam2d)
 
     # # FSI, 2d
     fsi2d           = TestCase('fsi2d')
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.578187, -5.758338] #last 4 columns
     fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
+    fsi2d.multizone = True
+    fsi2d.unsteady  = True
     fsi2d.tol       = 0.00001
     test_list.append(fsi2d)    
 
@@ -505,16 +632,17 @@ def main():
     # ### Zonal multiphysics ###
     # ##########################
 
-    # # CHT incompressible
-    # cht_incompressible           = TestCase('cht_incompressible')
-    # cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
-    # cht_incompressible.cfg_file  = "config.cfg"
-    # cht_incompressible.test_iter = 10
-    # cht_incompressible.test_vals = [0.000000, 0.000000, -7.685301, -12947.783696] #last 4 columns
-    # cht_incompressible.su2_exec  = "SU2_CFD"
-    # cht_incompressible.timeout   = 1600
-    # cht_incompressible.tol       = 0.00001
-    # test_list.append(cht_incompressible)
+    # CHT incompressible
+    cht_incompressible           = TestCase('cht_incompressible')
+    cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
+    cht_incompressible.cfg_file  = "config.cfg"
+    cht_incompressible.test_iter = 10
+    cht_incompressible.test_vals = [ 10, -1.552349, -6.795633, -3.342894] #last 4 columns
+    cht_incompressible.su2_exec  = "SU2_CFD"
+    cht_incompressible.timeout   = 1600
+    cht_incompressible.multizone = True
+    cht_incompressible.tol       = 0.00001
+    test_list.append(cht_incompressible)
 
     ######################################
     ### RUN TESTS                      ###

From 5f7b77ba89306089b8cf456cad0a6281ed7ad46c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 8 Apr 2019 16:35:26 +0200
Subject: [PATCH 145/539] Some adjustments and fixes

---
 SU2_CFD/include/iteration_structure.hpp     |  34 +-
 SU2_CFD/include/output_structure.hpp        |  18 -
 SU2_CFD/src/driver_direct_singlezone.cpp    |   2 +-
 SU2_CFD/src/iteration_structure.cpp         |  31 +-
 SU2_CFD/src/output_adjoint_discrete.cpp     | 165 +++----
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 209 ++++-----
 SU2_CFD/src/output_adjoint_mean.cpp         | 448 ++++++++++++--------
 SU2_CFD/src/output_direct_mean.cpp          |  11 +
 SU2_CFD/src/output_structure.cpp            |  29 +-
 9 files changed, 509 insertions(+), 438 deletions(-)

diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index 4a1b94bf94cc..dd72384e770f 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -984,7 +984,7 @@ class CFEAIteration : public CIteration {
  * \brief Class for driving an iteration of the adjoint fluid system.
  * \author T. Economon
  */
-class CAdjFluidIteration : public CIteration {
+class CAdjFluidIteration : public CFluidIteration {
 public:
   
   /*!
@@ -1054,38 +1054,6 @@ class CAdjFluidIteration : public CIteration {
               unsigned short val_iZone,
               unsigned short val_iInst);
   
-  /*!
-   * \brief Monitors the convergence and other metrics for the adjoint fluid system.
-   */
-  bool Monitor(COutput *output,
-      CIntegration ****integration_container,
-      CGeometry ****geometry_container,
-      CSolver *****solver_container,
-      CNumerics ******numerics_container,
-      CConfig **config_container,
-      CSurfaceMovement **surface_movement,
-      CVolumetricMovement ***grid_movement,
-      CFreeFormDefBox*** FFDBox,
-      unsigned short val_iZone,
-      unsigned short val_iInst);
-  
-  /*!
-   * \brief Postprocess ???.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry_container - Geometrical definition of the problem.
-   * \param[in] config_container - Definition of the particular problem.
-   */
-  void Postprocess(COutput *output,
-                   CIntegration ****integration_container,
-                   CGeometry ****geometry_container,
-                   CSolver *****solver_container,
-                   CNumerics ******numerics_container,
-                   CConfig **config_container,
-                   CSurfaceMovement **surface_movement,
-                   CVolumetricMovement ***grid_movement,
-                   CFreeFormDefBox*** FFDBox,
-                   unsigned short val_iZone,
-                   unsigned short val_iInst);
 
   
 };
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 87aadcadad81..1a1a025cf04e 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1366,24 +1366,6 @@ class CAdjFlowOutput : public COutput {
       CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
   
   void SetHistoryOutputFields(CConfig *config);
-
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
     
   void SetVolumeOutputFields(CConfig *config);
   
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index 26109e2e7a6f..3d05ba59b1cb 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -71,7 +71,7 @@ void CSinglezoneDriver::StartSolver() {
 
   /*--- Set the initial time iteration to the restart iteration. ---*/
   if (config_container[ZONE_0]->GetRestart() && driver_config->GetTime_Domain())
-    TimeIter = config_container[ZONE_0]->GetRestart_Iter();
+    TimeIter = config_container[ZONE_0]->GetUnst_RestartIter();
   
   /*--- Run the problem until the number of time iterations required is reached. ---*/
   while ( TimeIter < config_container[ZONE_0]->GetnTime_Iter() ) {
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 3300e799e76d..0e5544163208 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -742,6 +742,11 @@ bool CFluidIteration::Monitor(COutput *output,
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
     output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);    
   }
+  
+  if (config_container[val_iZone]->GetCFL_Adapt() == YES) {
+      if (!(config_container[val_iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
+        output->SetCFL_Number(solver_container, config_container, val_iZone);
+  }
 
   return StopCalc;
 
@@ -789,7 +794,7 @@ void CFluidIteration::Solve(COutput *output,
 
   /*--- If the problem is multizone, the block iterates on the number of internal iterations ---*/
   /*--- If the problem is single zone, the block iterates on the number of iterations (pseudo-time)---*/
-  if (multizone)
+  if (multizone || unsteady)
     nInner_Iter = config_container[val_iZone]->GetnInner_Iter();
   else
     nInner_Iter = config_container[val_iZone]->GetnIter();
@@ -1869,7 +1874,7 @@ void CFEAIteration::Solve(COutput *output,
 
 }
 
-CAdjFluidIteration::CAdjFluidIteration(CConfig *config) : CIteration(config) { }
+CAdjFluidIteration::CAdjFluidIteration(CConfig *config) : CFluidIteration(config) { }
 CAdjFluidIteration::~CAdjFluidIteration(void) { }
 void CAdjFluidIteration::Preprocess(COutput *output,
                                        CIntegration ****integration_container,
@@ -2074,28 +2079,6 @@ void CAdjFluidIteration::Update(COutput *output,
   }
 }
 
-bool CAdjFluidIteration::Monitor(COutput *output,
-    CIntegration ****integration_container,
-    CGeometry ****geometry_container,
-    CSolver *****solver_container,
-    CNumerics ******numerics_container,
-    CConfig **config_container,
-    CSurfaceMovement **surface_movement,
-    CVolumetricMovement ***grid_movement,
-    CFreeFormDefBox*** FFDBox,
-    unsigned short val_iZone,
-    unsigned short val_iInst)     { return false; }
-void CAdjFluidIteration::Postprocess(COutput *output,
-                                     CIntegration ****integration_container,
-                                     CGeometry ****geometry_container,
-                                     CSolver *****solver_container,
-                                     CNumerics ******numerics_container,
-                                     CConfig **config_container,
-                                     CSurfaceMovement **surface_movement,
-                                     CVolumetricMovement ***grid_movement,
-                                     CFreeFormDefBox*** FFDBox,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) { }
 
 CDiscAdjFluidIteration::CDiscAdjFluidIteration(CConfig *config) : CIteration(config) {
   
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 1182506cbf75..258e48e609b9 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -48,7 +48,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   if (nRequestedHistoryFields == 0){
     RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITIES");
+    RequestedHistoryFields.push_back("SENSITIVITY");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
 
@@ -105,18 +105,20 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint energy.
   AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
-    break;  
-  case SST:
-    /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-    /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
+      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -131,32 +133,34 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint energy.
   AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
-    break;  
-  case SST:
-    /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
-    /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
+      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      /// DESCRIPTION: Maximum residual of the adjoint dissipation.
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: SENSITIVITIES, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
   /// DESCRIPTION: Currently used wall-clock time.
@@ -170,8 +174,9 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
   CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
 
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
   
   SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
@@ -182,15 +187,17 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   } else {
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
-    break;
-  default: break;
+  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+      SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
+      break;
+    default: break;
+    }
   }
   SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
   SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
@@ -201,15 +208,17 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   } else {
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
-    break;
-  default: break;
+  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
+      break;
+    default: break;
+    }
   }
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
   SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
@@ -244,18 +253,20 @@ void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
   /// DESCRIPTION: Adjoint energy.
   AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");           
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Adjoint nu tilde.
-    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
-    break;  
-  case SST:
-    /// DESCRIPTION: Adjoint kinetic energy.
-    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
-    /// DESCRIPTION: Adjoint dissipation.
-    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Adjoint nu tilde.
+      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Adjoint kinetic energy.
+      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
+      /// DESCRIPTION: Adjoint dissipation.
+      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -283,18 +294,20 @@ void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
   /// DESCRIPTION: Residual of the adjoint energy. 
   AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Residual of the nu tilde. 
-    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
-    break;  
-  case SST:
-    /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-    AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
-    /// DESCRIPTION: Residual of the adjoint dissipation.
-    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){      
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Residual of the nu tilde. 
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Residual of the adjoint kinetic energy. 
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+      /// DESCRIPTION: Residual of the adjoint dissipation.
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -318,7 +331,7 @@ void CDiscAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CS
   CVariable* Node_AdjTurb = NULL;
   CPoint*    Node_Geo     = geometry->node[iPoint];
   
-  if (config->GetKind_Turb_Model() != NONE){
+  if (config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Disc()){
     Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
   }
   
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index 5e31ea34ca6e..b133c4ce5970 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -52,7 +52,7 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   if (nRequestedHistoryFields == 0){
     RequestedHistoryFields.push_back("ITER");
     RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITIES");
+    RequestedHistoryFields.push_back("SENSITIVITY");
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
@@ -109,18 +109,20 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-    AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
-    break;  
-  case SST:
-    /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-    AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-    /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-    AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
+      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -135,33 +137,35 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-    AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
-    break;  
-  case SST:
-    /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-    AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
-    /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-    AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
+      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      /// DESCRIPTION: Maximum residual of the adjoint dissipation.
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
   
-  /// BEGIN_GROUP: SENSITIVITIES, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
   /// DESCRIPTION: Currently used wall-clock time.
@@ -193,15 +197,17 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     if (nDim == 3) SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(4)));
     else           SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(3)));
   }
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
-    break;
-  default: break;
+  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+      SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
+      break;
+    default: break;
+    }
   }
   SetHistoryOutputValue("MAX_ADJ_PRESSURE", log10(adjflow_solver->GetRes_Max(0)));
   SetHistoryOutputValue("MAX_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_Max(1)));
@@ -216,17 +222,18 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     if (nDim == 3) SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(3)));
   }
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
-    break;
-  default: break;
+  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
+      break;
+    default: break;
+    }
   }
-  
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
   SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
@@ -263,18 +270,20 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION");
   }
 
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Adjoint nu tilde.
-    AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
-    break;  
-  case SST:
-    /// DESCRIPTION: Adjoint kinetic energy.
-    AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
-    /// DESCRIPTION: Adjoint dissipation.
-    AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Adjoint nu tilde.
+      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Adjoint kinetic energy.
+      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
+      /// DESCRIPTION: Adjoint dissipation.
+      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -302,18 +311,20 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("RES_ADJ_Velocity-Z", "Residual_Adjoint_Velocity_z", "RESIDUAL"); 
   /// DESCRIPTION: Residual of the adjoint energy. 
   AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    /// DESCRIPTION: Residual of the nu tilde. 
-    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
-    break;  
-  case SST:
-    /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-    AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
-    /// DESCRIPTION: Residual of the adjoint dissipation.
-    AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
-    break;
-  default: break;
+  if (!config->GetFrozen_Visc_Disc()){      
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Residual of the nu tilde. 
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Residual of the adjoint kinetic energy. 
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+      /// DESCRIPTION: Residual of the adjoint dissipation.
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+      break;
+    default: break;
+    }
   }
   /// END_GROUP
   
@@ -338,7 +349,7 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
   CVariable* Node_AdjTurb = NULL;
   CPoint*    Node_Geo     = geometry->node[iPoint];
   
-  if (config->GetKind_Turb_Model() != NONE){
+  if (config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Disc()){
     Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
   }
   if (weakly_coupled_heat){
@@ -365,17 +376,19 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
     else           SetVolumeOutputValue("ADJ_HEAT", iPoint, Node_AdjFlow->GetSolution(3));
   }
   // Turbulent 
-  switch(turb_model){
-  case SST:
-    SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
-    SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
-    break;
-  case NONE:
-    break;
+  if (!config->GetFrozen_Visc_Disc()){         
+    switch(turb_model){
+    case SST:
+      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+      SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+      break;
+    case NONE:
+      break;
+    }
   }
   
   // Residuals
@@ -385,17 +398,19 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
   if (nDim == 3){
     SetVolumeOutputValue("RES_ADJ_VELOCITY-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
   } 
-  switch(config->GetKind_Turb_Model()){
-  case SST:
-    SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-    SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-    break;
-  case NONE:
-    break;
+  if (!config->GetFrozen_Visc_Disc()){            
+    switch(config->GetKind_Turb_Model()){
+    case SST:
+      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      break;
+    case NONE:
+      break;
+    }
   }
   
   SetVolumeOutputValue("SENSITIVITY_X", iPoint, Node_AdjFlow->GetSensitivity(0));
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index af8a7eaea2c0..ebf44f86cc8b 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -42,7 +42,34 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   nDim = geometry->GetnDim();
   
   turb_model = config->GetKind_Turb_Model();
- 
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    RequestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+
+  if (nRequestedScreenFields == 0){
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");
+    RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
+    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
+    RequestedScreenFields.push_back("SENS_GEO");
+    RequestedScreenFields.push_back("SENS_AOA");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("SOLUTION");    
+    RequestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
+  MultiZoneHeaderString = ss.str();
 }
 
 CAdjFlowOutput::~CAdjFlowOutput(void) {
@@ -54,44 +81,89 @@ CAdjFlowOutput::~CAdjFlowOutput(void) {
 }
 
 
-inline bool CAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
-  return true;
-}
-
-inline bool CAdjFlowOutput::WriteScreen_Header(CConfig *config) {return true;  }
-
-inline bool CAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {return true;  }
-
-
 void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
-  // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "INT_ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "EXT_ITER");
-  
-  AddHistoryOutput("ADJOINT_DENSITY",    "Res[A_Rho]",  FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-X", "Res[A_RhoU]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-Y", "Res[A_RhoV]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_MOMENTUM-Z", "Res[A_RhoW]", FORMAT_FIXED, "RESIDUALS");
-  AddHistoryOutput("ADJOINT_ENERGY",     "Res[A_E]",    FORMAT_FIXED, "RESIDUALS");
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddHistoryOutput("ADJOINT_NU_TILDE", "Res[A_nu]", FORMAT_FIXED, "RESIDUALS");
-    break;  
-  case SST:
-    AddHistoryOutput("ADJOINT_KINETIC_ENERGY", "Res[A_k]", FORMAT_FIXED, "RESIDUALS");
-    AddHistoryOutput("ADJOINT_DISSIPATION",    "Res[A_w]", FORMAT_FIXED, "RESIDUALS");
-    break;
-  default: break;
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The internal iteration index.
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The external iteration index.
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Root-mean square residual of the adjoint density.
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Root-mean square residual of the adjoint energy.
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  if (!config->GetFrozen_Visc_Cont()){
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
+      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+      break;
+    default: break;
+    }
   }
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITIES");
-  
-  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
-  
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Maximum residual of the adjoint density.
+  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: Maximum residual of the adjoint energy.
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  if (!config->GetFrozen_Visc_Cont()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
+      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      /// DESCRIPTION: Maximum residual of the adjoint dissipation.
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+      break;
+    default: break;
+    }
+  }
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+
 }
 
 inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
@@ -99,118 +171,146 @@ inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
 
   CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
   CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
+
+  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
+  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
   
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
-  
-  SetHistoryOutputValue("ADJOINT_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
-  SetHistoryOutputValue("ADJOINT_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
-  SetHistoryOutputValue("ADJOINT_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
+  SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
+  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
+  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+    SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
+  } else {
+    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
+  }
+  if (!config[val_iZone]->GetFrozen_Visc_Cont()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+      SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
+      break;
+    default: break;
+    }
+  }
+  SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
+  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_Max(2)));
   if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
-    SetHistoryOutputValue("ADJOINT_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
-    SetHistoryOutputValue("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
+    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_Max(3)));
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(4)));
   } else {
-    SetHistoryOutputValue("ADJOINT_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
+    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("ADJOINT_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("ADJOINT_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
-    break;
-  default: break;
+  if (!config[val_iZone]->GetFrozen_Visc_Cont()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
+      break;
+    default: break;
+    }
   }
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
   SetHistoryOutputValue("PHYS_TIME", timeused);
-
 }
 
 void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
-  
-  
-  // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
+  /// DESCRIPTION: x coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
+  /// DESCRIPTION: y coordinates of the mesh nodes.
   AddVolumeOutput("COORD-Y", "y", "COORDINATES");
   if (nDim == 3)
+    /// DESCRIPTION: z coordinates of the mesh nodes.
     AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  
-  // SOLUTION
-  AddVolumeOutput("ADJOINT_DENSITY",    "Adjoint_Density",    "SOLUTION");
-  AddVolumeOutput("ADJOINT_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION");
-  AddVolumeOutput("ADJOINT_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
+  /// DESCRIPTION: Adjoint density.
+  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "SOLUTION"); 
+  /// DESCRIPTION: Adjoint momentum x-component.
+  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION"); 
+  /// DESCRIPTION: Adjoint momentum y-component.
+  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION"); 
   if (nDim == 3)
-    AddVolumeOutput("ADJOINT_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION");
-  AddVolumeOutput("ADJOINT_ENERGY", "Adjoint_Energy", "SOLUTION");
-  
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("ADJOINT_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION");
-    break;  
-  case SST:
-    AddVolumeOutput("ADJOINT_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION");
-    AddVolumeOutput("ADJOINT_DISSIPATION", "Adjoint_Omega", "SOLUTION");
-    break;
-  default: break;
+    /// DESCRIPTION: Adjoint momentum z-component.
+    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
+  /// DESCRIPTION: Adjoint energy.
+  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");       
+  if (!config->GetFrozen_Visc_Cont()){    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Adjoint nu tilde.
+      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Adjoint kinetic energy.
+      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
+      /// DESCRIPTION: Adjoint dissipation.
+      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
+      break;
+    default: break;
+    }
   }
+  /// END_GROUP
   
+  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
   if (config->GetGrid_Movement()){
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    /// DESCRIPTION: Grid velocity x-component.
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
+    /// DESCRIPTION: Grid velocity y-component.
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
     if (nDim == 3)    
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+      /// DESCRIPTION: Grid velocity z-component.
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
   }
-  
-  // Limiters
-  AddVolumeOutput("LIMITER_ADJOINT_DENSITY",    "Limiter_Adjoint_Density",    "LIMITER");
-  AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-X", "Limiter_Adjoint_Momentum_x", "LIMITER");
-  AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-Y", "Limiter_Adjoint_Momentum_y", "LIMITER");
-  if (nDim == 3)
-    AddVolumeOutput("LIMITER_ADJOINT_MOMENTUM-Z", "Limiter_Adjoint_Momentum_z", "LIMITER");
-  AddVolumeOutput("LIMITER_ADJOINT_ENERGY",       "Limiter_Adjoint_Energy",     "LIMITER");
-  
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("LIMITER_ADJOINT_NU_TILDE", "Limiter_Adjoint_Nu_Tilde", "SOLUTION");
-    break;  
-  case SST:
-    AddVolumeOutput("LIMITER_ADJOINT_KINETIC_ENERGY", "Limiter_Adjoint_TKE", "SOLUTION");
-    AddVolumeOutput("LIMITER_ADJOINT_DISSIPATION",    "Limiter_Adjoint_Omega", "SOLUTION");
-    break;
-  default: break;
-  }
-  
-  // Residuals
-  AddVolumeOutput("RESIDUAL_ADJOINT_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Residual of the adjoint density.
+  AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint momentum x-component.
+  AddVolumeOutput("RES_ADJ_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");  
+  /// DESCRIPTION: Residual of the adjoint momentum y-component.
+  AddVolumeOutput("RES_ADJ_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");  
   if (nDim == 3)
-    AddVolumeOutput("RESIDUAL_ADJOINT_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ADJOINT_ENERGY",       "Residual_Adjoint_Energy", "RESIDUAL");
-  
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    AddVolumeOutput("RESIDUAL_ADJOINT_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL");
-    break;  
-  case SST:
-    AddVolumeOutput("RESIDUAL_ADJOINT_KINETIC_ENERGY", "Residual_Adjoint_TKE", "RESIDUAL");
-    AddVolumeOutput("RESIDUAL_ADJOINT_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
-    break;
-  default: break;
+    /// DESCRIPTION: Residual of the adjoint momentum z-component.
+    AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
+  /// DESCRIPTION: Residual of the adjoint energy. 
+  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL"); 
+  if (!config->GetFrozen_Visc_Cont()){      
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: Residual of the nu tilde. 
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+      break;  
+    case SST:
+      /// DESCRIPTION: Residual of the adjoint kinetic energy. 
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+      /// DESCRIPTION: Residual of the adjoint dissipation.
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+      break;
+    default: break;
+    }
   }
+  /// END_GROUP
   
-  // Sensitivity
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY");
-  
-  // Dissipation Sensor
-  if (config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED){
-    AddVolumeOutput("DISSIPATION_SENSOR", "Dissipation_Sensor", "DISSIPATION_SENSOR");
-  }
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.  
+  /// DESCRIPTION: Sensitivity in normal direction.
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  /// END_GROUP
 }
 
 void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -219,7 +319,7 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   CVariable* Node_AdjTurb = NULL;
   CPoint*    Node_Geo     = geometry->node[iPoint];
   
-  if (config->GetKind_Turb_Model() != NONE){
+  if (config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Cont()){
     Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
   }
   
@@ -228,82 +328,58 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   if (nDim == 3)
     SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
   
-  SetVolumeOutputValue("ADJOINT_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
-  SetVolumeOutputValue("ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
-  SetVolumeOutputValue("ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
+  SetVolumeOutputValue("ADJ_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
+  SetVolumeOutputValue("ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
+  SetVolumeOutputValue("ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
   if (nDim == 3){
-    SetVolumeOutputValue("ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
-    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
+    SetVolumeOutputValue("ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
+    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
   } else {
-    SetVolumeOutputValue("ADJOINT_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
+    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
   }
   
   // Turbulent 
-  switch(turb_model){
-  case SST:
-    SetVolumeOutputValue("ADJOINT_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
-    SetVolumeOutputValue("ADJOINT_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("ADJOINT_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
-    break;
-  case NONE:
-    break;
-  }
-  
-  // Limiters
-  SetVolumeOutputValue("LIMITER_ADJOINT_DENSITY", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
-  SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-X", iPoint, Node_AdjFlow->GetLimiter_Primitive(1));
-  SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-Y", iPoint, Node_AdjFlow->GetLimiter_Primitive(2));
-  if (nDim == 3){
-    SetVolumeOutputValue("LIMITER_ADJOINT_MOMENTUM-Z", iPoint, Node_AdjFlow->GetLimiter_Primitive(3));
-    SetVolumeOutputValue("LIMITER_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetLimiter_Primitive(4));
-  } else {
-    SetVolumeOutputValue("LIMITER_ADJOINT_ENERGY", iPoint, Node_AdjFlow->GetLimiter_Primitive(3));   
-  }
-  
-  switch(config->GetKind_Turb_Model()){
-  case SST:
-    SetVolumeOutputValue("LIMITER_ADJOINT_TKE", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
-    SetVolumeOutputValue("LIMITER_ADJOINT_OMEGA", iPoint, Node_AdjFlow->GetLimiter_Primitive(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("LIMITER_ADJOINT_NU_TILDE", iPoint, Node_AdjFlow->GetLimiter_Primitive(0));
-    break;
-  case NONE:
-    break;
+  if (!config->GetFrozen_Visc_Cont()){         
+    switch(turb_model){
+    case SST:
+      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+      SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+      break;
+    case NONE:
+      break;
+    }
   }
   
   // Residuals
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_DENSITY",    iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-X", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
-  SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Y", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  SetVolumeOutputValue("RES_ADJ_DENSITY", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
+  SetVolumeOutputValue("RES_ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
+  SetVolumeOutputValue("RES_ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
   if (nDim == 3){
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_MOMENTUM-Z", iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY",     iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+    SetVolumeOutputValue("RES_ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
+    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(4) - Node_AdjFlow->GetSolution_Old(4));
   } else {
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_ENERGY",     iPoint, solver[ADJFLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
   }
   
-  switch(config->GetKind_Turb_Model()){
-  case SST:
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_TKE",   iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_OMEGA", iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RESIDUAL_ADJOINT_NU_TILDE", iPoint, solver[ADJTURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    break;
-  case NONE:
-    break;
+  if (!config->GetFrozen_Visc_Cont()){            
+    switch(config->GetKind_Turb_Model()){
+    case SST:
+      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      break;
+    case NONE:
+      break;
+    }
   }
 
-  if (config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED){
-    SetVolumeOutputValue("DISSIPATION_SENSOR", iPoint, Node_AdjFlow->GetSensor());
-  }
-  
 }
 
 void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 901a4c05d0be..cbd64e89733f 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -229,6 +229,13 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
   /// END_GROUP 
   
+  /// BEGIN_GROUP: AEROELASTIC, DESCRIPTION: Aeroelastic plunge, pitch
+  /// DESCRIPTION: Aeroelastic plunge
+  AddHistoryOutputPerSurface("PLUNGE", "plunge", FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Aeroelastic pitch
+  AddHistoryOutputPerSurface("PITCH",  "pitch",  FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// END_GROUP
+   
   /// DESCRIPTION: Angle of attack  
   AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
   /// DESCRIPTION: Linear solver iterations   
@@ -638,6 +645,10 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
       SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
     
     SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
+    if (config[val_iZone]->GetAeroelastic_Simulation()){
+      SetHistoryOutputPerSurfaceValue("PITCH", config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("PLUNGE", config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring), iMarker_Monitoring);
+    }
   }
   
   SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index f8153e9f0372..f989faaaba7b 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -9540,6 +9540,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     SetHistoryFile_Header(config);    
     
     string RequestedField;
+    vector<string> FieldsToRemove;
   
     /*--- Set screen convergence output header ---*/
     
@@ -9548,14 +9549,36 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
       RequestedField = RequestedScreenFields[iReqField];  
       if (HistoryOutput_Map.count(RequestedField) > 0){ 
         ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
-      } else {
-        SU2_MPI::Error(string("Requested screen output field ") + RequestedField + string(" not defined in current solver.") , CURRENT_FUNCTION);
       }
-      if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
+      else if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
         ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
+      }else {
+        FieldsToRemove.push_back(RequestedField);
+      }
+    }
+    
+    /*--- Remove fields which are not defined --- */
+    if (FieldsToRemove.size() > 0){
+      if (rank == MASTER_NODE){ 
+      
+      }
+    }
+    for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
+      if (rank == MASTER_NODE) {
+        if (iReqField == 0) cout << "Info: Ignoring the following screen output fields:" << endl;
+        cout << FieldsToRemove[iReqField];
+        if (iReqField != FieldsToRemove.size()-1){
+          cout << ", ";
+        } else {
+          cout << endl;
+        }
       }
+      RequestedScreenFields.erase(std::find(RequestedScreenFields.begin(), RequestedScreenFields.end(), FieldsToRemove[iReqField]));
+
     }
     
+    nRequestedScreenFields = RequestedScreenFields.size();
+    
     if (config->GetMultizone_Problem()){
       MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
       MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);

From 3e6c5553869735cba5ea35eb97953568425524d0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 8 Apr 2019 16:36:45 +0200
Subject: [PATCH 146/539] Further adaption of test cases

---
 .../aeroelastic/aeroelastic_NACA64A010.cfg    | 20 +++++++++++++------
 .../cont_adj_euler/naca0012/inv_NACA0012.cfg  |  9 ++++++++-
 .../cont_adj_euler/oneram6/inv_ONERAM6.cfg    |  9 ++++++---
 .../cont_adj_euler/wedge/inv_wedge_ROE.cfg    |  8 ++++++--
 .../cylinder/lam_cylinder.cfg                 |  8 +++++++-
 .../naca0012_sub/lam_NACA0012.cfg             |  7 ++++++-
 .../naca0012_trans/lam_NACA0012.cfg           |  7 ++++++-
 .../cont_adj_rans/naca0012/turb_nasa.cfg      |  9 ++++++++-
 .../naca0012/turb_nasa_binary.cfg             |  8 +++++++-
 .../cont_adj_rans/rae2822/turb_SA_RAE2822.cfg |  8 +++++++-
 TestCases/ddes/flatplate/ddes_flatplate.cfg   | 20 ++++++++++++-------
 TestCases/euler/bluntbody/blunt.cfg           |  8 +++++++-
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  4 +++-
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg  |  4 ++--
 .../naca0012/inv_NACA0012_ContAdj.cfg         |  8 ++++++--
 TestCases/gust/inv_gust_NACA0012.cfg          | 17 +++++++++++-----
 TestCases/moving_wall/cavity/lam_cavity.cfg   | 10 ++++++++--
 .../spinning_cylinder/spinning_cylinder.cfg   |  8 +++++++-
 .../poiseuille/lam_poiseuille.cfg             |  7 ++++++-
 TestCases/nicf/LS89/turb_SA_PR.cfg            |  8 +++++++-
 TestCases/nicf/LS89/turb_SST_PR.cfg           |  8 +++++++-
 TestCases/nicf/edge/edge_PPR.cfg              |  8 +++++++-
 TestCases/nicf/edge/edge_VW.cfg               |  8 +++++++-
 TestCases/polar/naca0012/inv_NACA0012.cfg     | 11 +++++++++-
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg  |  8 +++++++-
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg  |  7 ++++++-
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg  |  7 ++++++-
 .../naca0012/turb_NACA0012_uq_p1c1.cfg        |  7 ++++++-
 .../naca0012/turb_NACA0012_uq_p1c2.cfg        |  7 ++++++-
 .../transitional_BC_model_ConfigFile.cfg      |  8 +++++++-
 .../unsteady/square_cylinder/turb_square.cfg  | 18 ++++++++++++-----
 31 files changed, 228 insertions(+), 56 deletions(-)

diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index c3e8c2767a0a..67d411bcc9e9 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -24,7 +24,10 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
+%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -60,19 +63,22 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+% Time domain
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, SPECTRAL_METHOD)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.00174532925199
+TIME_STEP= 0.00174532925199
 % 36 steps per period, based on the pitch natural frequency
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 100
+INNER_ITER= 100
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 SURFACE_MOVEMENT= AEROELASTIC
@@ -256,7 +262,7 @@ VISUALIZE_VOLUME_DEF= NO
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 360
+TIME_ITER= 360
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -318,4 +324,6 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 1
-
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG_ON_SURFACE, PLUNGE, PITCH) 
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 33ddcc117dfd..7c83cbc4d677 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -30,6 +30,10 @@ READ_BINARY_RESTART= NO
 %
 % Number of zones
 NZONES= 1
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
+
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -99,7 +103,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -318,6 +322,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) 
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index 0461450a58bf..a38da0939f25 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -25,7 +25,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -110,7 +112,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -275,7 +277,8 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
 % Kind of deformation (TRANSLATION, ROTATION, SCALE,
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index eeeb59dd3bc4..bc807a2d4c47 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -28,7 +28,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -99,7 +101,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=100
+ITER=100
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -264,6 +266,8 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) 
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 32eee76aaa32..7ece8894018e 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -30,6 +30,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -103,7 +106,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -284,6 +287,9 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 8ebb0e2db365..daedc55ebbf2 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -29,6 +29,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -102,7 +105,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -269,6 +272,8 @@ WRT_SOL_FREQ= 5000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index eea5fd7a4b35..9f50b0b274e7 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -29,6 +29,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -102,7 +105,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -280,6 +283,8 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 5
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 81b6a6446cd4..3474204418bd 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -31,6 +31,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -95,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 100
+ITER= 100
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -341,4 +344,8 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
+
 
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 5d7ab0b10128..b343fe8a3a79 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -31,6 +31,9 @@ WRT_BINARY_RESTART= YES
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -95,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 100
+ITER= 100
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -341,4 +344,7 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index 0726d4302edc..a57654db905b 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -29,6 +29,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -90,7 +93,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
@@ -255,6 +258,9 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index fd7384339861..9ace1cea84dd 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -26,6 +26,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -61,27 +64,27 @@ REF_LENGTH= 1.0
 REF_AREA= 2.0
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
+
+% Enable time domain
+TIME_DOMAIN= YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%UNSTEADY_SIMULATION= NO
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 % U_inf = 69.4448 - dt*=0.02 - dt=0.000288
-UNST_TIMESTEP= 0.000288
+TIME_STEP= 0.000288
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 20.0
+MAX_TIME= 20.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 20
+INNER_ITER= 20
 %
-% Iteration number to begin unsteady restarts
-UNST_RESTART_ITER= 0
 
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
@@ -127,7 +130,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 10
+TIME_ITER= 10
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -247,3 +250,6 @@ WRT_SURF_FREQ_DUALTIME= 50000
 WRT_CON_FREQ_DUALTIME= 1
 WRT_LIMITERS= NO
 WRT_RESIDUALS= NO
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index fdec7a9f7810..2b7894ee0df7 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -21,6 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO 
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -81,7 +84,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.1, 0.9, 5.0, 50.0 )
 %
 % Number of total iterations
-EXT_ITER= 2500 
+ITER= 2500 
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -208,3 +211,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index 1d0cc55ba045..b4edecbd83ed 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -25,11 +25,13 @@ ELASTICITY_MODULUS=3E7
 POISSON_RATIO=0.3
 MATERIAL_DENSITY=7854
 FORMULATION_ELASTICITY_2D = PLANE_STRESS
+TIME_DOMAIN=YES
 DYNAMIC_ANALYSIS= YES
 DYN_TIMESTEP= 0.01
+TIME_STEP=0.01
 DYN_TIME= 0.1
 EXT_ITER=2
-TIME_ITER=2
+TIME_ITER=6
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.2601
 NEWMARK_GAMMA=0.52
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 6a5cf77f5e87..3968e8aab517 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -23,7 +23,7 @@ MATH_PROBLEM= DIRECT
 RESTART_SOL= NO
 %
 % New singlezone driver
-SINGLEZONE_DRIVER= NO
+SINGLEZONE_DRIVER= YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -112,7 +112,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-ITER= 500
+ITER=101 
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 324a1e2458ce..74eb6db9846c 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -27,7 +27,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -115,7 +117,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 5.0
 %
 % Number of total iterations
-EXT_ITER= 500
+ITER= 500
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -320,6 +322,8 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) 
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index de0ad6165617..1c67f15a40a5 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -21,6 +21,9 @@ MATH_PROBLEM= DIRECT
 %
 % Regime type (COMPRESSIBLE, INCOMPRESSIBLE)
 REGIME_TYPE= COMPRESSIBLE
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -57,19 +60,21 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+% Enable time domain
+TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, SPECTRAL_METHOD)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.001469304
+TIME_STEP= 0.001469304
 % Corresponds to a ds of 0.2
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 100
+INNER_ITER= 100
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
@@ -216,7 +221,7 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 401
+TIME_ITER= 401
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -281,4 +286,6 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 1
-
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index cb09da2cd3e1..e8194fc1cd11 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -24,7 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -103,7 +105,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -236,3 +238,7 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
+
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index d39db0ed5665..5378f5ec4f62 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+% 
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -122,7 +125,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -268,3 +271,6 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 56687dac7e60..040c10a72b34 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -30,7 +30,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER =YES
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -266,3 +268,6 @@ WRT_SOL_FREQ= 500
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 8eba6e59cad7..d0a03c24e48f 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -24,6 +24,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -174,7 +177,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 5000
+ITER= 5000
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -332,3 +335,6 @@ WRT_SOL_FREQ= 500
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 38483c7ccd9b..1617a838f99c 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -24,6 +24,8 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -174,7 +176,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 5000
+ITER= 5000
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -332,3 +334,7 @@ WRT_SOL_FREQ= 500
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index e57939381fb1..51e456d2f32a 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -20,6 +20,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 %---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 
@@ -107,7 +110,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 500
+ITER= 500
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -243,3 +246,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 820d2b7fd429..45b29bb6c251 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -20,6 +20,9 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER= YES
 
 %---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 
@@ -107,7 +110,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 500
+ITER= 500
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -243,3 +246,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 6e1fc40b1ba9..adace5c59eb5 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -25,6 +25,9 @@ RESTART_SOL= NO
 % Number of Zones needed for python scripts
 NZONES= 1
 %
+% New singlezone driver
+%SINGLEZONE_DRIVER=YES
+
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -101,7 +104,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -315,6 +318,12 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
+% 
+% History output
+HISTORY_OUTPUT= (RMS_RES, AERO_COEFF)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index 8fd6df48f453..ae8d8b409bd7 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -26,6 +26,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -111,7 +113,7 @@ CFL_ADAPT= YES
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
 % Coefficient for the limiter
@@ -266,3 +268,7 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 84a1a83c9030..b7f37a0e00b8 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -26,6 +26,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -111,7 +113,7 @@ CFL_ADAPT= YES
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
 % Coefficient for the limiter
@@ -266,3 +268,6 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index e3fe59840638..14adaabedee3 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -26,6 +26,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -111,7 +113,7 @@ CFL_ADAPT= YES
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
 % Coefficient for the limiter
@@ -266,3 +268,6 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 60592902876e..ffd794e7d331 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -26,6 +26,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -111,7 +113,7 @@ CFL_ADAPT= YES
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
 % Coefficient for the limiter
@@ -266,3 +268,6 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index f5f6156fd744..a15a245d54d3 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -26,6 +26,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 %
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -111,7 +113,7 @@ CFL_ADAPT= YES
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
 % Coefficient for the limiter
@@ -266,3 +268,6 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 9b265cf2439c..53ec130dc774 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -31,6 +31,9 @@ REGIME_TYPE= INCOMPRESSIBLE
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -122,7 +125,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 250000
+ITER= 250000
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -283,3 +286,6 @@ WRT_SOL_FREQ= 500
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index d8d2766446fb..b5145a35670a 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -33,24 +33,29 @@ READ_BINARY_RESTART= NO
 %
 % Unsteady restart iteration (need previous restart files)
 UNST_RESTART_ITER= 2
-
+%
+% New singlezone driver
+SINGLEZONE_DRIVER=YES
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+% Enable time domain
+TIME_DOMAIN = YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0015
+TIME_STEP= 0.0015
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 3.75
+MAX_TIME= 3.75
 % 2500 iterations - 3.75
 % 3500 iterations - 5.25
 % 5000 iterations - 7.50
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 10
+INNER_ITER= 10
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -119,7 +124,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 3
+TIME_ITER= 3
 %
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
@@ -272,3 +277,6 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 1
+% 
+% Screen output 
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)

From 279a405ce511ac0d357c596ea4fe389ce68e3850 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 8 Apr 2019 16:37:31 +0200
Subject: [PATCH 147/539] Moved over more test cases

---
 TestCases/new_output_regression.py | 899 +++++++++++++++++++++++++++--
 1 file changed, 865 insertions(+), 34 deletions(-)

diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index 1a2052562b89..6bc2e7718dd2 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -98,6 +98,43 @@ def main():
     oneram6.tol       = 0.00001
     test_list.append(oneram6)
     
+    # Fixed CL NACA0012
+    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
+    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
+    fixedCL_naca0012.test_iter = 100
+    fixedCL_naca0012.test_vals = [-2.582897, 2.820443, 0.295158, 0.019324] #last 4 columns
+    fixedCL_naca0012.su2_exec  = "SU2_CFD"
+    fixedCL_naca0012.new_output = True
+    fixedCL_naca0012.timeout   = 1600
+    fixedCL_naca0012.tol       = 0.00001
+    test_list.append(fixedCL_naca0012)
+    
+    # Polar sweep of the inviscid NACA0012
+    polar_naca0012           = TestCase('polar_naca0012')
+    polar_naca0012.cfg_dir   = "polar/naca0012"
+    polar_naca0012.cfg_file  = "inv_NACA0012.cfg"
+    polar_naca0012.polar     = True
+    polar_naca0012.new_output= True
+    polar_naca0012.test_iter = 10
+    polar_naca0012.test_vals = [-1.319488, 4.112397, 0.011954, 0.009584] #last 4 columns
+    polar_naca0012.su2_exec  = "compute_polar.py -n 1 -i 11"
+    polar_naca0012.timeout   = 1600
+    polar_naca0012.tol       = 0.00001
+    test_list.append(polar_naca0012)
+
+    # HYPERSONIC FLOW PAST BLUNT BODY
+    bluntbody           = TestCase('bluntbody')
+    bluntbody.cfg_dir   = "euler/bluntbody"
+    bluntbody.cfg_file  = "blunt.cfg"
+    bluntbody.new_output = True
+    bluntbody.test_iter = 20
+    bluntbody.test_vals = [0.626808, 7.014695, -0.000000, 1.648024] #last 4 columns
+    bluntbody.su2_exec  = "SU2_CFD"
+    bluntbody.timeout   = 1600
+    bluntbody.tol       = 0.00001
+    test_list.append(bluntbody)
+
     ##########################
     ###  Compressible N-S  ###
     ##########################
@@ -139,16 +176,16 @@ def main():
     test_list.append(cylinder_lowmach)
 
     # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
-   # poiseuille           = TestCase('poiseuille')
-   # poiseuille.cfg_dir   = "navierstokes/poiseuille"
-   # poiseuille.cfg_file  = "lam_poiseuille.cfg"
-   # poiseuille.test_iter = 10
-   # poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
-   # poiseuille.su2_exec  = "SU2_CFD"
-   # poiseuille.new_output = True
-   # poiseuille.timeout   = 1600
-   # poiseuille.tol       = 0.00001
-   # test_list.append(poiseuille)
+    poiseuille           = TestCase('poiseuille')
+    poiseuille.cfg_dir   = "navierstokes/poiseuille"
+    poiseuille.cfg_file  = "lam_poiseuille.cfg"
+    poiseuille.test_iter = 10
+    poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
+    poiseuille.su2_exec  = "SU2_CFD"
+    poiseuille.new_output = True
+    poiseuille.timeout   = 1600
+    poiseuille.tol       = 0.00001
+    test_list.append(poiseuille)
 
     # 2D Poiseuille flow (inlet profile file)
     poiseuille_profile           = TestCase('poiseuille_profile')
@@ -457,6 +494,429 @@ def main():
     fem_ns_unsteady_cylinder_ader.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder_ader)
 
+    #########################
+    ###    Transition     ###
+    #########################
+
+    # Schubauer-Klebanoff Natural Transition
+    schubauer_klebanoff_transition              = TestCase('Schubauer_Klebanoff')
+    schubauer_klebanoff_transition.cfg_dir      = "transition/Schubauer_Klebanoff"
+    schubauer_klebanoff_transition.cfg_file     = "transitional_BC_model_ConfigFile.cfg"
+    schubauer_klebanoff_transition.test_iter    = 10
+    schubauer_klebanoff_transition.new_output   = True
+    schubauer_klebanoff_transition.test_vals    = [-8.029756, -14.278066, 0.000053, 0.007986] #last 4 columns
+    schubauer_klebanoff_transition.su2_exec     = "SU2_CFD"
+    schubauer_klebanoff_transition.timeout      = 1600
+    schubauer_klebanoff_transition.tol          = 0.00001
+    test_list.append(schubauer_klebanoff_transition)
+
+    #####################################
+    ### Cont. adj. compressible Euler ###
+    #####################################
+
+    # Inviscid NACA0012
+    contadj_naca0012           = TestCase('contadj_naca0012')
+    contadj_naca0012.cfg_dir   = "cont_adj_euler/naca0012"
+    contadj_naca0012.cfg_file  = "inv_NACA0012.cfg"
+    contadj_naca0012.test_iter = 5
+    contadj_naca0012.test_vals = [-9.787554, -15.192510, 0.300920, 0.019552] #last 4 columns
+    contadj_naca0012.su2_exec  = "SU2_CFD"
+    contadj_naca0012.new_output = True
+    contadj_naca0012.timeout   = 1600
+    contadj_naca0012.tol       = 0.001
+    test_list.append(contadj_naca0012)
+
+    # Inviscid ONERA M6
+    contadj_oneram6           = TestCase('contadj_oneram6')
+    contadj_oneram6.cfg_dir   = "cont_adj_euler/oneram6"
+    contadj_oneram6.cfg_file  = "inv_ONERAM6.cfg"
+    contadj_oneram6.test_iter = 10
+    contadj_oneram6.test_vals = [-12.133160, -12.706697, 0.685900, 0.007594] #last 4 columns
+    contadj_oneram6.su2_exec  = "SU2_CFD"
+    contadj_oneram6.new_output = True
+    contadj_oneram6.timeout   = 1600
+    contadj_oneram6.tol       = 0.00001
+    test_list.append(contadj_oneram6)
+
+    # Inviscid WEDGE: tests averaged outflow total pressure adjoint
+    contadj_wedge             = TestCase('contadj_wedge')
+    contadj_wedge.cfg_dir   = "cont_adj_euler/wedge"
+    contadj_wedge.cfg_file  = "inv_wedge_ROE.cfg"
+    contadj_wedge.test_iter = 10
+    contadj_wedge.test_vals = [2.856008, -2.767216, 1.0029e+06, 1.3024e-13] #last 4 columns
+    contadj_wedge.su2_exec  = "SU2_CFD"
+    contadj_wedge.new_output = True
+    contadj_wedge.timeout   = 1600
+    contadj_wedge.tol       = 0.00001
+    test_list.append(contadj_wedge)
+    
+    # Inviscid fixed CL NACA0012
+    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
+    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
+    contadj_fixedCL_naca0012.test_iter = 100
+    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
+    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
+    contadj_fixedCL_naca0012.new_output= True
+    contadj_fixedCL_naca0012.timeout   = 1600
+    contadj_fixedCL_naca0012.tol       = 0.00001
+    test_list.append(contadj_fixedCL_naca0012)
+
+    ###################################
+    ### Cont. adj. compressible N-S ###
+    ###################################
+
+    # Adjoint laminar cylinder
+    contadj_ns_cylinder           = TestCase('contadj_ns_cylinder')
+    contadj_ns_cylinder.cfg_dir   = "cont_adj_navierstokes/cylinder"
+    contadj_ns_cylinder.cfg_file  = "lam_cylinder.cfg"
+    contadj_ns_cylinder.test_iter = 20
+    contadj_ns_cylinder.test_vals = [ -3.665848, -9.132055, 2.056700, -0.000000] #last 4 columns
+    contadj_ns_cylinder.su2_exec  = "SU2_CFD"
+    contadj_ns_cylinder.new_output = True
+    contadj_ns_cylinder.timeout   = 1600
+    contadj_ns_cylinder.tol       = 0.00001
+    test_list.append(contadj_ns_cylinder)
+
+    # Adjoint laminar naca0012 subsonic
+    contadj_ns_naca0012_sub           = TestCase('contadj_ns_naca0012_sub')
+    contadj_ns_naca0012_sub.cfg_dir   = "cont_adj_navierstokes/naca0012_sub"
+    contadj_ns_naca0012_sub.cfg_file  = "lam_NACA0012.cfg"
+    contadj_ns_naca0012_sub.test_iter = 20
+    contadj_ns_naca0012_sub.test_vals = [-2.743268, -8.215193, 0.518810, 0.001210] #last 4 columns
+    contadj_ns_naca0012_sub.su2_exec  = "SU2_CFD"
+    contadj_ns_naca0012_sub.new_output =True
+    contadj_ns_naca0012_sub.timeout   = 1600
+    contadj_ns_naca0012_sub.tol       = 0.00001
+    test_list.append(contadj_ns_naca0012_sub)
+    
+    # Adjoint laminar naca0012 transonic
+    contadj_ns_naca0012_trans           = TestCase('contadj_ns_naca0012_trans')
+    contadj_ns_naca0012_trans.cfg_dir   = "cont_adj_navierstokes/naca0012_trans"
+    contadj_ns_naca0012_trans.cfg_file  = "lam_NACA0012.cfg"
+    contadj_ns_naca0012_trans.test_iter = 20
+    contadj_ns_naca0012_trans.test_vals = [-1.039664, -6.575019, 1.772300, 0.012495] #last 4 columns
+    contadj_ns_naca0012_trans.su2_exec  = "SU2_CFD"
+    contadj_ns_naca0012_trans.new_output = True
+    contadj_ns_naca0012_trans.timeout   = 1600
+    contadj_ns_naca0012_trans.tol       = 0.00001
+    test_list.append(contadj_ns_naca0012_trans)
+
+    #######################################################
+    ### Cont. adj. compressible RANS (frozen viscosity) ###
+    #######################################################
+
+    # Adjoint turbulent NACA0012
+    contadj_rans_naca0012           = TestCase('contadj_rans_naca0012')
+    contadj_rans_naca0012.cfg_dir   = "cont_adj_rans/naca0012"
+    contadj_rans_naca0012.cfg_file  = "turb_nasa.cfg"
+    contadj_rans_naca0012.test_iter = 20
+    contadj_rans_naca0012.test_vals = [ -0.794162, -5.761722, 19.214000, -0.000000] #last 4 columns
+    contadj_rans_naca0012.su2_exec  = "SU2_CFD"
+    contadj_rans_naca0012.new_output = True
+    contadj_rans_naca0012.timeout   = 1600
+    contadj_rans_naca0012.tol       = 0.00001
+    test_list.append(contadj_rans_naca0012)
+   
+    # Adjoint turbulent NACA0012 with binary restarts
+    contadj_rans_naca0012_bin           = TestCase('contadj_rans_naca0012_bin')
+    contadj_rans_naca0012_bin.cfg_dir   = "cont_adj_rans/naca0012"
+    contadj_rans_naca0012_bin.cfg_file  = "turb_nasa_binary.cfg"
+    contadj_rans_naca0012_bin.test_iter = 18
+    contadj_rans_naca0012_bin.test_vals = [-0.794169, -5.761671, 19.214000, -0.000000] #last 4 columns
+    contadj_rans_naca0012_bin.su2_exec  = "SU2_CFD"
+    contadj_rans_naca0012_bin.new_output = True
+    contadj_rans_naca0012_bin.timeout   = 1600
+    contadj_rans_naca0012_bin.tol       = 0.00001
+    test_list.append(contadj_rans_naca0012_bin)
+ 
+    # Adjoint turbulent RAE2822
+    contadj_rans_rae2822           = TestCase('contadj_rans_rae2822')
+    contadj_rans_rae2822.cfg_dir   = "cont_adj_rans/rae2822"
+    contadj_rans_rae2822.cfg_file  = "turb_SA_RAE2822.cfg"
+    contadj_rans_rae2822.test_iter = 20
+    contadj_rans_rae2822.test_vals = [-5.369688, -10.872209, -0.212470, 0.005448] #last 4 columns
+    contadj_rans_rae2822.su2_exec  = "SU2_CFD"
+    contadj_rans_rae2822.new_output = True
+    contadj_rans_rae2822.timeout   = 1600
+    contadj_rans_rae2822.tol       = 0.00001
+    test_list.append(contadj_rans_rae2822)
+
+    #############################
+    ### Compressibele RANS UQ ###
+    #############################
+
+    # NACA0012 1c
+    turb_naca0012_1c           = TestCase('turb_naca0012_1c')
+    turb_naca0012_1c.cfg_dir   = "rans_uq/naca0012"
+    turb_naca0012_1c.cfg_file  = "turb_NACA0012_uq_1c.cfg"
+    turb_naca0012_1c.test_iter = 10
+    turb_naca0012_1c.test_vals = [-4.946255, 1.262038, 5.575706, 2.057785] #last 4 columns
+    turb_naca0012_1c.su2_exec  = "SU2_CFD"
+    turb_naca0012_1c.new_output = True
+    turb_naca0012_1c.timeout   = 1600
+    turb_naca0012_1c.tol       = 0.00001
+    test_list.append(turb_naca0012_1c)
+
+    # NACA0012 2c
+    turb_naca0012_2c           = TestCase('turb_naca0012_2c')
+    turb_naca0012_2c.cfg_dir   = "rans_uq/naca0012"
+    turb_naca0012_2c.cfg_file  = "turb_NACA0012_uq_2c.cfg"
+    turb_naca0012_2c.test_iter = 10
+    turb_naca0012_2c.test_vals = [-5.343094, 1.137839, 5.337548, 1.919739] #last 4 columns
+    turb_naca0012_2c.su2_exec  = "SU2_CFD"
+    turb_naca0012_2c.new_output = True
+    turb_naca0012_2c.timeout   = 1600
+    turb_naca0012_2c.tol       = 0.00001
+    test_list.append(turb_naca0012_2c)
+
+    # NACA0012 3c
+    turb_naca0012_3c           = TestCase('turb_naca0012_3c')
+    turb_naca0012_3c.cfg_dir   = "rans_uq/naca0012"
+    turb_naca0012_3c.cfg_file  = "turb_NACA0012_uq_3c.cfg"
+    turb_naca0012_3c.test_iter = 10
+    turb_naca0012_3c.test_vals = [-5.421229, 1.099570, 5.184366, 1.835606] #last 4 columns
+    turb_naca0012_3c.su2_exec  = "SU2_CFD"
+    turb_naca0012_3c.new_output = True
+    turb_naca0012_3c.timeout   = 1600
+    turb_naca0012_3c.tol       = 0.00001
+    test_list.append(turb_naca0012_3c)
+
+    # NACA0012 p1c1
+    turb_naca0012_p1c1           = TestCase('turb_naca0012_p1c1')
+    turb_naca0012_p1c1.cfg_dir   = "rans_uq/naca0012"
+    turb_naca0012_p1c1.cfg_file  = "turb_NACA0012_uq_p1c1.cfg"
+    turb_naca0012_p1c1.test_iter = 10
+    turb_naca0012_p1c1.test_vals = [-5.022106, 1.280795, 5.960837, 2.302647] #last 4 columns
+    turb_naca0012_p1c1.su2_exec  = "SU2_CFD"
+    turb_naca0012_p1c1.new_output = True
+    turb_naca0012_p1c1.timeout   = 1600
+    turb_naca0012_p1c1.tol       = 0.00001
+    test_list.append(turb_naca0012_p1c1)
+
+    # NACA0012 p1c2
+    turb_naca0012_p1c2           = TestCase('turb_naca0012_p1c2')
+    turb_naca0012_p1c2.cfg_dir   = "rans_uq/naca0012"
+    turb_naca0012_p1c2.cfg_file  = "turb_NACA0012_uq_p1c2.cfg"
+    turb_naca0012_p1c2.test_iter = 10
+    turb_naca0012_p1c2.test_vals = [-5.357006, 1.154966, 5.635942, 2.088563] #last 4 columns
+    turb_naca0012_p1c2.su2_exec  = "SU2_CFD"
+    turb_naca0012_p1c2.new_output = True
+    turb_naca0012_p1c2.timeout   = 1600
+    turb_naca0012_p1c2.tol       = 0.00001
+    test_list.append(turb_naca0012_p1c2)
+
+    ######################################
+    ### Harmonic Balance               ###
+    ######################################
+    
+    # Description of the regression test
+    harmonic_balance           = TestCase('harmonic_balance')
+    harmonic_balance.cfg_dir   = "harmonic_balance"
+    harmonic_balance.cfg_file  = "HB.cfg"
+    harmonic_balance.test_iter = 25
+    harmonic_balance.test_vals = [-1.569573, 3.941896, 0.008780, 0.079775] #last 4 columns
+    harmonic_balance.su2_exec  = "SU2_CFD"
+    harmonic_balance.timeout   = 1600
+    harmonic_balance.tol       = 0.00001
+    test_list.append(harmonic_balance)
+
+    # Turbulent pitching NACA 64a010 airfoil
+    hb_rans_preconditioning           = TestCase('hb_rans_preconditioning')
+    hb_rans_preconditioning.cfg_dir   = "harmonic_balance/hb_rans_preconditioning"
+    hb_rans_preconditioning.cfg_file  = "davis.cfg"
+    hb_rans_preconditioning.test_iter = 25
+    hb_rans_preconditioning.test_vals = [-1.900982, -5.880438, 0.007758, 0.125934] #last 4 columns
+    hb_rans_preconditioning.su2_exec  = "SU2_CFD"
+    hb_rans_preconditioning.timeout   = 1600
+    hb_rans_preconditioning.tol       = 0.00001
+    test_list.append(hb_rans_preconditioning)
+
+   ######################################
+   ### Moving Wall                    ###
+   ######################################
+   
+    # Lid-driven cavity
+    cavity           = TestCase('cavity')
+    cavity.cfg_dir   = "moving_wall/cavity"
+    cavity.cfg_file  = "lam_cavity.cfg"
+    cavity.test_iter = 25
+    cavity.test_vals = [-5.627934, -0.164470, 0.051972, 2.547034] #last 4 columns
+    cavity.su2_exec  = "SU2_CFD"
+    cavity.new_output = True
+    cavity.timeout   = 1600
+    cavity.tol       = 0.00001
+    test_list.append(cavity)
+
+    # Spinning cylinder
+    spinning_cylinder           = TestCase('spinning_cylinder')
+    spinning_cylinder.cfg_dir   = "moving_wall/spinning_cylinder"
+    spinning_cylinder.cfg_file  = "spinning_cylinder.cfg"
+    spinning_cylinder.test_iter = 25
+    spinning_cylinder.test_vals = [-7.719673, -2.279643, 1.721389, 1.710467] #last 4 columns
+    spinning_cylinder.su2_exec  = "SU2_CFD"
+    spinning_cylinder.new_output = True
+    spinning_cylinder.timeout   = 1600
+    spinning_cylinder.tol       = 0.00001
+    test_list.append(spinning_cylinder)
+
+    ######################################
+    ### Unsteady                       ###
+    ######################################
+
+    # Square cylinder
+    square_cylinder           = TestCase('square_cylinder')
+    square_cylinder.cfg_dir   = "unsteady/square_cylinder"
+    square_cylinder.cfg_file  = "turb_square.cfg"
+    square_cylinder.test_iter = 3
+    square_cylinder.test_vals = [-1.166421, 0.076804, 1.398548, 2.197047] #last 4 columns
+    square_cylinder.su2_exec  = "SU2_CFD"
+    square_cylinder.timeout   = 1600
+    square_cylinder.tol       = 0.00001
+    square_cylinder.unsteady  = True
+    square_cylinder.new_output = True
+    test_list.append(square_cylinder)
+
+    # Gust
+    sine_gust           = TestCase('sine_gust')
+    sine_gust.cfg_dir   = "gust"
+    sine_gust.cfg_file  = "inv_gust_NACA0012.cfg"
+    sine_gust.test_iter = 5
+    sine_gust.test_vals = [-1.977531, 3.481790, -0.006222, -0.001342] #last 4 columns
+    sine_gust.su2_exec  = "SU2_CFD"
+    sine_gust.timeout   = 1600
+    sine_gust.tol       = 0.00001
+    sine_gust.unsteady  = True
+    sine_gust.new_output = True
+    test_list.append(sine_gust)
+
+    # Aeroelastic
+    aeroelastic         = TestCase('aeroelastic')
+    aeroelastic.cfg_dir   = "aeroelastic"
+    aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
+    aeroelastic.test_iter = 2
+    aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
+    aeroelastic.su2_exec  = "SU2_CFD"
+    aeroelastic.timeout   = 1600
+    aeroelastic.tol       = 0.000001
+    aeroelastic.unsteady  = True
+    aeroelastic.new_output = True
+    test_list.append(aeroelastic) 
+
+    # Delayed Detached Eddy Simulation
+    ddes_flatplate        = TestCase('ddes_flatplate')
+    ddes_flatplate.cfg_dir   = "ddes/flatplate"
+    ddes_flatplate.cfg_file  = "ddes_flatplate.cfg"
+    ddes_flatplate.test_iter = 10
+    ddes_flatplate.test_vals = [-2.714758, -5.883004, -0.215005, 0.023783] #last 4 columns
+    ddes_flatplate.su2_exec  = "SU2_CFD"
+    ddes_flatplate.timeout   = 1600
+    ddes_flatplate.tol       = 0.00001
+    ddes_flatplate.unsteady  = True
+    ddes_flatplate.new_output = True
+    test_list.append(ddes_flatplate)    
+
+    ######################################
+    ### NICFD                          ###
+    ######################################
+
+    # ls89_sa
+    ls89_sa           = TestCase('ls89_sa')
+    ls89_sa.cfg_dir   = "nicf/LS89"
+    ls89_sa.cfg_file  = "turb_SA_PR.cfg"
+    ls89_sa.test_iter = 20
+    ls89_sa.test_vals = [-5.050658, -13.393664, 0.174911, 0.430700] #last 4 columns
+    ls89_sa.su2_exec  = "SU2_CFD"
+    ls89_sa.new_output= True
+    ls89_sa.timeout   = 1600
+    ls89_sa.tol       = 0.00001
+    test_list.append(ls89_sa)
+
+    # Rarefaction shock wave edge_VW
+    edge_VW           = TestCase('edge_VW')
+    edge_VW.cfg_dir   = "nicf/edge"
+    edge_VW.cfg_file  = "edge_VW.cfg"
+    edge_VW.test_iter = 20
+    edge_VW.test_vals = [-0.720910, 5.481122, -0.000853, 0.000000] #last 4 columns
+    edge_VW.su2_exec  = "SU2_CFD"
+    edge_VW.new_output = True
+    edge_VW.timeout   = 1600
+    edge_VW.tol       = 0.00001
+    test_list.append(edge_VW)
+
+    # Rarefaction shock wave edge_PPR               
+    edge_PPR           = TestCase('edge_PPR')
+    edge_PPR.cfg_dir   = "nicf/edge"
+    edge_PPR.cfg_file  = "edge_PPR.cfg"
+    edge_PPR.test_iter = 20
+    edge_PPR.test_vals = [-1.688033, 4.505202, 0.000916, 0.000000] #last 4 columns
+    edge_PPR.su2_exec  = "SU2_CFD"
+    edge_PPR.new_output = True
+    edge_PPR.timeout   = 1600
+    edge_PPR.tol       = 0.00001
+    test_list.append(edge_PPR)
+    
+    
+    ######################################
+    ### turbomachinery                 ###
+    ######################################
+    
+    # Jones APU Turbocharger
+    Jones_tc           = TestCase('jones_turbocharger')
+    Jones_tc.cfg_dir   = "turbomachinery/APU_turbocharger"
+    Jones_tc.cfg_file  = "Jones.cfg"
+    Jones_tc.test_iter = 5
+    Jones_tc.test_vals = [-5.304569, 0.419188, 80.085850, 1.034777] #last 4 columns
+    Jones_tc.su2_exec  = "SU2_CFD"
+    Jones_tc.timeout   = 1600
+    Jones_tc.tol       = 0.00001
+    test_list.append(Jones_tc)
+
+    # Jones APU Turbocharger restart
+    Jones_tc_rst           = TestCase('jones_turbocharger_restart')
+    Jones_tc_rst.cfg_dir   = "turbomachinery/APU_turbocharger"
+    Jones_tc_rst.cfg_file  = "Jones_rst.cfg"
+    Jones_tc_rst.test_iter = 5
+    Jones_tc_rst.test_vals = [-4.423322, -1.618510, 82.250600, 2.791319] #last 4 columns
+    Jones_tc_rst.su2_exec  = "SU2_CFD"
+    Jones_tc_rst.timeout   = 1600
+    Jones_tc_rst.tol       = 0.00001
+    test_list.append(Jones_tc_rst)
+
+    # 2D axial stage
+    axial_stage2D           = TestCase('axial_stage2D')
+    axial_stage2D.cfg_dir   = "turbomachinery/axial_stage_2D"
+    axial_stage2D.cfg_file  = "Axial_stage2D.cfg"
+    axial_stage2D.test_iter = 20
+    axial_stage2D.test_vals = [-1.837052, 5.787185, 73.679900, 0.888919] #last 4 columns
+    axial_stage2D.su2_exec  = "SU2_CFD"
+    axial_stage2D.timeout   = 1600
+    axial_stage2D.tol       = 0.00001
+    test_list.append(axial_stage2D)
+    
+    # 2D transonic stator
+    transonic_stator           = TestCase('transonic_stator')
+    transonic_stator.cfg_dir   = "turbomachinery/transonic_stator_2D"
+    transonic_stator.cfg_file  = "transonic_stator.cfg"
+    transonic_stator.test_iter = 20
+    transonic_stator.test_vals = [-1.114556, 6.120416, 67.101480, 0.070037] #last 4 columns
+    transonic_stator.su2_exec  = "SU2_CFD"
+    transonic_stator.timeout   = 1600
+    transonic_stator.tol       = 0.00001
+    test_list.append(transonic_stator)
+    
+    # 2D transonic stator restart
+    transonic_stator_rst           = TestCase('transonic_stator_restart')
+    transonic_stator_rst.cfg_dir   = "turbomachinery/transonic_stator_2D"
+    transonic_stator_rst.cfg_file  = "transonic_stator_rst.cfg"
+    transonic_stator_rst.test_iter = 20
+    transonic_stator_rst.test_vals = [-0.486965, 4.460638, 6.455770, 0.004009] #last 4 columns
+    transonic_stator_rst.su2_exec  = "SU2_CFD"
+    transonic_stator_rst.timeout   = 1600
+    transonic_stator_rst.tol       = 0.00001
+    test_list.append(transonic_stator_rst)
+
+
     ######################################
     ### Sliding Mesh                   ###
     ######################################
@@ -579,30 +1039,30 @@ def main():
     ### FEA - FSI          ###
     ##########################
 
-#    # Static beam, 3d
-#    statbeam3d           = TestCase('statbeam3d')
-#    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
-#    statbeam3d.cfg_file  = "configBeam_3d.cfg"
-#    statbeam3d.new_output= True
-#    statbeam3d.test_iter = 0
-#    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
-#    statbeam3d.su2_exec  = "SU2_CFD"
-#    statbeam3d.timeout   = 1600
-#    statbeam3d.tol       = 0.00001
-#    test_list.append(statbeam3d)
-#
-#    # # Dynamic beam, 2d
-#    dynbeam2d           = TestCase('dynbeam2d')
-#    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
-#    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
-#    dynbeam2d.unsteady  = True
-#    dynbeam2d.new_output= True  
-#    dynbeam2d.test_iter = 6 
-#    dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
-#    dynbeam2d.su2_exec  = "SU2_CFD"
-#    dynbeam2d.timeout   = 1600
-#    dynbeam2d.tol       = 0.00001
-#    test_list.append(dynbeam2d)
+    # Static beam, 3d
+    statbeam3d           = TestCase('statbeam3d')
+    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
+    statbeam3d.cfg_file  = "configBeam_3d.cfg"
+    statbeam3d.new_output= True
+    statbeam3d.test_iter = 0
+    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
+    statbeam3d.su2_exec  = "SU2_CFD"
+    statbeam3d.timeout   = 1600
+    statbeam3d.tol       = 0.00001
+    test_list.append(statbeam3d)
+
+    # # Dynamic beam, 2d
+    dynbeam2d           = TestCase('dynbeam2d')
+    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
+    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
+    dynbeam2d.unsteady  = True
+    dynbeam2d.new_output= True  
+    dynbeam2d.test_iter = 6 
+    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66299.000000] #last 4 columns
+    dynbeam2d.su2_exec  = "SU2_CFD"
+    dynbeam2d.timeout   = 1600
+    dynbeam2d.tol       = 0.00001
+    test_list.append(dynbeam2d)
 
     # # FSI, 2d
     fsi2d           = TestCase('fsi2d')
@@ -650,6 +1110,377 @@ def main():
 
     pass_list = [ test.run_test() for test in test_list ]
 
+    
+    ######################################
+    ### RUN SU2_GEO TESTS              ###
+    ######################################
+    
+    # NACA0012
+    naca0012_geo           = TestCase('naca0012_geo')
+    naca0012_geo.cfg_dir   = "optimization_euler/steady_naca0012"
+    naca0012_geo.cfg_file  = "inv_NACA0012_adv.cfg"
+    naca0012_geo.test_vals = [0.99975, 62.0455, 0.120041, 0.00208202] #chord, LE radius, ToC, Alpha
+    naca0012_geo.su2_exec  = "SU2_GEO"
+    naca0012_geo.timeout   = 1600
+    naca0012_geo.tol       = 0.00001
+    pass_list.append(naca0012_geo.run_geo())
+    test_list.append(naca0012_geo)
+
+    ######################################
+    ### RUN SU2_DEF TESTS              ###
+    ######################################
+    
+    # Inviscid NACA0012 (triangles)
+    naca0012_def            = TestCase('naca0012_def')
+    naca0012_def.cfg_dir   = "deformation/naca0012"
+    naca0012_def.cfg_file  = "def_NACA0012.cfg"
+    naca0012_def.test_iter = 10
+    naca0012_def.test_vals = [0.00344658] #residual
+    naca0012_def.su2_exec  = "SU2_DEF"
+    naca0012_def.timeout   = 1600
+    naca0012_def.tol       = 1e-08
+    
+    pass_list.append(naca0012_def.run_def())
+    test_list.append(naca0012_def)
+    
+    # Inviscid NACA0012 based on SURFACE_FILE input (surface_bump.dat)
+    naca0012_def_file            = TestCase('naca0012_def_file')
+    naca0012_def_file.cfg_dir   = "deformation/naca0012"
+    naca0012_def_file.cfg_file  = "surface_file_NACA0012.cfg"
+    naca0012_def_file.test_iter = 10
+    naca0012_def_file.test_vals = [0.00344658] #residual
+    naca0012_def_file.su2_exec  = "mpirun -n 2 SU2_DEF"
+    naca0012_def_file.timeout   = 1600
+    naca0012_def_file.tol       = 1e-8
+    
+    pass_list.append(naca0012_def_file.run_def())
+    test_list.append(naca0012_def_file)
+    
+    # RAE2822 (mixed tris + quads)
+    rae2822_def            = TestCase('rae2822_def')
+    rae2822_def.cfg_dir   = "deformation/rae2822"
+    rae2822_def.cfg_file  = "def_RAE2822.cfg"
+    rae2822_def.test_iter = 10
+    rae2822_def.test_vals = [7.94218e-09] #residual
+    rae2822_def.su2_exec  = "SU2_DEF"
+    rae2822_def.timeout   = 1600
+    rae2822_def.tol       = 1e-13
+    
+    pass_list.append(rae2822_def.run_def())
+    test_list.append(rae2822_def)
+    
+    # Turb NACA4412 (quads, wall distance)
+    naca4412_def            = TestCase('naca4412_def')
+    naca4412_def.cfg_dir   = "deformation/naca4412"
+    naca4412_def.cfg_file  = "def_NACA4412.cfg"
+    naca4412_def.test_iter = 10
+    naca4412_def.test_vals = [8.855370e-13] #residual
+    naca4412_def.su2_exec  = "SU2_DEF"
+    naca4412_def.timeout   = 1600
+    naca4412_def.tol       = 1e-12
+    
+    pass_list.append(naca4412_def.run_def())
+    test_list.append(naca4412_def)
+
+    # Brick of tets (inverse volume)
+    brick_tets_def            = TestCase('brick_tets_def')
+    brick_tets_def.cfg_dir   = "deformation/brick_tets"
+    brick_tets_def.cfg_file  = "def_brick_tets.cfg"
+    brick_tets_def.test_iter = 10
+    brick_tets_def.test_vals = [8.973010e-04] #residual
+    brick_tets_def.su2_exec  = "SU2_DEF"
+    brick_tets_def.timeout   = 1600
+    brick_tets_def.tol       = 1e-09
+    
+    pass_list.append(brick_tets_def.run_def())
+    test_list.append(brick_tets_def)
+
+    # Brick of isotropic hexas (inverse volume)
+    brick_hex_def           = TestCase('brick_hex_def')
+    brick_hex_def.cfg_dir   = "deformation/brick_hex"
+    brick_hex_def.cfg_file  = "def_brick_hex.cfg"
+    brick_hex_def.test_iter = 10
+    brick_hex_def.test_vals = [2.082100e-04] #residual
+    brick_hex_def.su2_exec  = "SU2_DEF"
+    brick_hex_def.timeout   = 1600
+    brick_hex_def.tol       = 1e-09
+    
+    pass_list.append(brick_hex_def.run_def())
+    test_list.append(brick_hex_def)
+
+    # Brick with a pyramid layer (inverse volume)
+    brick_pyra_def           = TestCase('brick_pyra_def')
+    brick_pyra_def.cfg_dir   = "deformation/brick_pyra"
+    brick_pyra_def.cfg_file  = "def_brick_pyra.cfg"
+    brick_pyra_def.test_iter = 10
+    brick_pyra_def.test_vals = [0.00183115] #residual
+    brick_pyra_def.su2_exec  = "SU2_DEF"
+    brick_pyra_def.timeout   = 1600
+    brick_pyra_def.tol       = 1e-08
+    
+    pass_list.append(brick_pyra_def.run_def())
+    test_list.append(brick_pyra_def)
+
+    # Brick of isotropic prisms (inverse volume)
+    brick_prism_def           = TestCase('brick_prism_def')
+    brick_prism_def.cfg_dir   = "deformation/brick_prism"
+    brick_prism_def.cfg_file  = "def_brick_prism.cfg"
+    brick_prism_def.test_iter = 10
+    brick_prism_def.test_vals = [5.684440e-03] #residual
+    brick_prism_def.su2_exec  = "SU2_DEF"
+    brick_prism_def.timeout   = 1600
+    brick_prism_def.tol       = 1e-08
+    
+    pass_list.append(brick_prism_def.run_def())
+    test_list.append(brick_prism_def)
+    
+    # Brick of prisms with high aspect ratio cells near the wall (wall distance)
+    brick_prism_rans_def           = TestCase('brick_prism_rans_def')
+    brick_prism_rans_def.cfg_dir   = "deformation/brick_prism_rans"
+    brick_prism_rans_def.cfg_file  = "def_brick_prism_rans.cfg"
+    brick_prism_rans_def.test_iter = 10
+    brick_prism_rans_def.test_vals = [2.762780e-07] #residual
+    brick_prism_rans_def.su2_exec  = "SU2_DEF"
+    brick_prism_rans_def.timeout   = 1600
+    brick_prism_rans_def.tol       = 1e-12
+    
+    pass_list.append(brick_prism_rans_def.run_def())
+    test_list.append(brick_prism_rans_def)
+    
+    # Brick of hexas with high aspect ratio cells near the wall (inverse volume)
+    brick_hex_rans_def           = TestCase('brick_hex_rans_def')
+    brick_hex_rans_def.cfg_dir   = "deformation/brick_hex_rans"
+    brick_hex_rans_def.cfg_file  = "def_brick_hex_rans.cfg"
+    brick_hex_rans_def.test_iter = 10
+    brick_hex_rans_def.test_vals = [2.260750e-07] #residual
+    brick_hex_rans_def.su2_exec  = "SU2_DEF"
+    brick_hex_rans_def.timeout   = 1600
+    brick_hex_rans_def.tol       = 1e-12
+    
+    pass_list.append(brick_hex_rans_def.run_def())
+    test_list.append(brick_hex_rans_def)
+
+    # Cylindrical FFD test
+    cylinder_ffd_def           = TestCase('cylinder_ffd_def')
+    cylinder_ffd_def.cfg_dir   = "deformation/cylindrical_ffd"
+    cylinder_ffd_def.cfg_file  = "def_cylindrical.cfg"
+    cylinder_ffd_def.test_iter = 10
+    cylinder_ffd_def.test_vals = [0.000470133] #residual
+    cylinder_ffd_def.su2_exec  = "SU2_DEF"
+    cylinder_ffd_def.timeout   = 1600
+    cylinder_ffd_def.tol       = 1e-09
+
+    pass_list.append(cylinder_ffd_def.run_def())
+    test_list.append(cylinder_ffd_def)
+
+    # Spherical FFD test
+    sphere_ffd_def           = TestCase('sphere_ffd_def')
+    sphere_ffd_def.cfg_dir   = "deformation/spherical_ffd"
+    sphere_ffd_def.cfg_file  = "def_spherical.cfg"
+    sphere_ffd_def.test_iter = 10
+    sphere_ffd_def.test_vals = [0.00356699] #residual
+    sphere_ffd_def.su2_exec  = "SU2_DEF"
+    sphere_ffd_def.timeout   = 1600
+    sphere_ffd_def.tol       = 1e-08
+
+    pass_list.append(sphere_ffd_def.run_def())
+    test_list.append(sphere_ffd_def)
+    
+    # Spherical FFD test using BSplines
+    sphere_ffd_def_bspline           = TestCase('sphere_ffd_def_bspline')
+    sphere_ffd_def_bspline.cfg_dir   = "deformation/spherical_ffd"
+    sphere_ffd_def_bspline.cfg_file  = "def_spherical_bspline.cfg"
+    sphere_ffd_def_bspline.test_iter = 10
+    sphere_ffd_def_bspline.test_vals = [0.00206808] #residual
+    sphere_ffd_def_bspline.su2_exec  = "SU2_DEF"
+    sphere_ffd_def_bspline.timeout   = 1600
+    sphere_ffd_def_bspline.tol       = 1e-08
+
+    pass_list.append(sphere_ffd_def_bspline.run_def())
+    test_list.append(sphere_ffd_def_bspline)
+   
+    ######################################
+    ### RUN PYTHON TESTS               ###
+    ###################################### 
+    
+    # test continuous_adjoint.py
+    contadj_euler_py = TestCase('contadj_euler_py')
+    contadj_euler_py.cfg_dir = "cont_adj_euler/naca0012"
+    contadj_euler_py.cfg_file  = "inv_NACA0012.cfg"
+    contadj_euler_py.test_iter = 10
+    contadj_euler_py.su2_exec  = "continuous_adjoint.py"
+    contadj_euler_py.timeout   = 1600
+    contadj_euler_py.reference_file = "of_grad_cd.dat.ref"
+    contadj_euler_py.test_file = "of_grad_cd.dat"
+    pass_list.append(contadj_euler_py.run_filediff())
+    test_list.append(contadj_euler_py)
+
+    # test shape_optimization.py
+    shape_opt_euler_py           = TestCase('shape_opt_euler_py')
+    shape_opt_euler_py.cfg_dir   = "optimization_euler/steady_naca0012"
+    shape_opt_euler_py.cfg_file  = "inv_NACA0012_adv.cfg"
+    shape_opt_euler_py.test_iter = 1
+    shape_opt_euler_py.test_vals = [1, 1, 2.134974E-05, 3.829535E-03] #last 4 columns
+    shape_opt_euler_py.su2_exec  = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
+    shape_opt_euler_py.timeout   = 1600
+    shape_opt_euler_py.tol       = 0.00001
+    pass_list.append(shape_opt_euler_py.run_opt())
+    test_list.append(shape_opt_euler_py)
+
+    # Multiple functionals with the continuous adjoint
+    contadj_multi_py            = TestCase('contadj_multi_py')
+    contadj_multi_py.cfg_dir    = "cont_adj_euler/wedge"
+    contadj_multi_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
+    contadj_multi_py.test_iter  = 10
+    contadj_multi_py.su2_exec   = "continuous_adjoint.py"
+    contadj_multi_py.timeout    = 1600
+    contadj_multi_py.reference_file = "of_grad_combo.dat.ref"
+    contadj_multi_py.test_file  = "of_grad_combo.dat"
+    pass_list.append(contadj_multi_py.run_filediff())
+    test_list.append(contadj_multi_py)
+    
+    # Optimization with multiple objectives, with gradients evaluated individually
+    # the difference in gradient value relative to combined case 
+    # is due to lack of solution file for the adjoint and small number of iterations
+    opt_multiobj_py            = TestCase('opt_multiobj_py')
+    opt_multiobj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+    opt_multiobj_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
+    opt_multiobj_py.test_iter  = 1
+    opt_multiobj_py.test_vals = [1, 1, 1.084701E+02, 3.799222E+00] #last 4 columns
+    opt_multiobj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
+    opt_multiobj_py.timeout    = 1600
+    opt_multiobj_py.tol       = 0.00001
+    pass_list.append(opt_multiobj_py.run_opt())
+    test_list.append(opt_multiobj_py)
+
+    # test optimization, with multiple objectives and gradient evaluated as 'combo' 
+    opt_multiobjcombo_py            = TestCase('opt_multiobjcombo_py')
+    opt_multiobjcombo_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+    opt_multiobjcombo_py.cfg_file   = "inv_wedge_ROE_multiobj_combo.cfg"
+    opt_multiobjcombo_py.test_iter  = 1
+    opt_multiobjcombo_py.test_vals = [1, 1, 1.084701E+02, 3.789322E+00] #last 4 columns
+    opt_multiobjcombo_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
+    opt_multiobjcombo_py.timeout    = 1600
+    opt_multiobjcombo_py.tol       = 0.00001
+    pass_list.append(opt_multiobjcombo_py.run_opt())
+    test_list.append(opt_multiobjcombo_py)
+
+    # test optimization, with multiple objectives evaluated on a single surface
+    opt_multiobj1surf_py            = TestCase('opt_multiobj1surf_py')
+    opt_multiobj1surf_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+    opt_multiobj1surf_py.cfg_file   = "inv_wedge_ROE_multiobj_1surf.cfg"
+    opt_multiobj1surf_py.test_iter  = 1
+    opt_multiobj1surf_py.test_vals = [1, 1, 3.083034E+01, 3.789380E+00] #last 4 columns
+    opt_multiobj1surf_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT  -f"
+    opt_multiobj1surf_py.timeout    = 1600
+    opt_multiobj1surf_py.tol       = 0.00001
+    pass_list.append(opt_multiobj1surf_py.run_opt())
+    test_list.append(opt_multiobj1surf_py)
+
+    # test optimization, with a single objective evaluated on multiple surfaces
+    opt_2surf1obj_py            = TestCase('opt_2surf1obj_py')
+    opt_2surf1obj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+    opt_2surf1obj_py.cfg_file   = "inv_wedge_ROE_2surf_1obj.cfg"
+    opt_2surf1obj_py.test_iter  = 1    
+    opt_2surf1obj_py.test_vals = [1.000000, 1.000000, 2.005657, 0.000341] #last 4 columns
+    opt_2surf1obj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT  -f"
+    opt_2surf1obj_py.timeout    = 1600
+    opt_2surf1obj_py.tol       = 0.00001
+    pass_list.append(opt_2surf1obj_py.run_opt())
+    test_list.append(opt_2surf1obj_py)
+
+    ##########################
+    ###   Python wrapper   ###
+    ##########################
+    
+    # NACA0012 
+    pywrapper_naca0012           = TestCase('pywrapper_naca0012')
+    pywrapper_naca0012.cfg_dir   = "euler/naca0012"
+    pywrapper_naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
+    pywrapper_naca0012.test_iter = 20
+    pywrapper_naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
+    pywrapper_naca0012.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_naca0012.timeout   = 1600
+    pywrapper_naca0012.tol       = 0.00001
+    test_list.append(pywrapper_naca0012)
+    pass_list.append(pywrapper_naca0012.run_test())
+
+    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
+    pywrapper_turb_naca0012_sst           = TestCase('pywrapper_turb_naca0012_sst')
+    pywrapper_turb_naca0012_sst.cfg_dir   = "rans/naca0012"
+    pywrapper_turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
+    pywrapper_turb_naca0012_sst.test_iter = 10
+    pywrapper_turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
+    pywrapper_turb_naca0012_sst.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_turb_naca0012_sst.timeout   = 3200
+    pywrapper_turb_naca0012_sst.tol       = 0.00001
+    test_list.append(pywrapper_turb_naca0012_sst)
+    pass_list.append(pywrapper_turb_naca0012_sst.run_test())
+
+    # Square cylinder
+    pywrapper_square_cylinder           = TestCase('pywrapper_square_cylinder')
+    pywrapper_square_cylinder.cfg_dir   = "unsteady/square_cylinder"
+    pywrapper_square_cylinder.cfg_file  = "turb_square.cfg"
+    pywrapper_square_cylinder.test_iter = 3
+    pywrapper_square_cylinder.test_vals = [-1.166421, 0.076804, 1.398548, 2.197047] #last 4 columns
+    pywrapper_square_cylinder.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_square_cylinder.timeout   = 1600
+    pywrapper_square_cylinder.tol       = 0.00001
+    pywrapper_square_cylinder.unsteady  = True
+    test_list.append(pywrapper_square_cylinder)
+    pass_list.append(pywrapper_square_cylinder.run_test())
+
+    # Aeroelastic
+    pywrapper_aeroelastic         = TestCase('pywrapper_aeroelastic')
+    pywrapper_aeroelastic.cfg_dir   = "aeroelastic"
+    pywrapper_aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
+    pywrapper_aeroelastic.test_iter = 2
+    pywrapper_aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
+    pywrapper_aeroelastic.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_aeroelastic.timeout   = 1600
+    pywrapper_aeroelastic.tol       = 0.000001
+    pywrapper_aeroelastic.unsteady  = True
+    test_list.append(pywrapper_aeroelastic)
+    pass_list.append(pywrapper_aeroelastic.run_test())
+
+    # FSI, 2d
+    pywrapper_fsi2d           = TestCase('pywrapper_fsi2d')
+    pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
+    pywrapper_fsi2d.cfg_file  = "configFSI_2D.cfg"
+    pywrapper_fsi2d.test_iter = 4
+    pywrapper_fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
+    pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
+    pywrapper_fsi2d.timeout   = 1600
+    pywrapper_fsi2d.tol       = 0.00001
+    test_list.append(pywrapper_fsi2d)
+    pass_list.append(pywrapper_fsi2d.run_test())
+
+    # Unsteady CHT
+    pywrapper_unsteadyCHT               = TestCase('pywrapper_unsteadyCHT')
+    pywrapper_unsteadyCHT.cfg_dir       = "py_wrapper/flatPlate_unsteady_CHT"
+    pywrapper_unsteadyCHT.cfg_file      = "unsteady_CHT_FlatPlate_Conf.cfg"
+    pywrapper_unsteadyCHT.test_iter     = 5
+    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.263309, 0.001077, 0.145818] #last 4 columns
+    pywrapper_unsteadyCHT.su2_exec      = "python launch_unsteady_CHT_FlatPlate.py -f"
+    pywrapper_unsteadyCHT.timeout       = 1600
+    pywrapper_unsteadyCHT.tol           = 0.00001
+    pywrapper_unsteadyCHT.unsteady      = True
+    test_list.append(pywrapper_unsteadyCHT)
+    pass_list.append(pywrapper_unsteadyCHT.run_test())
+
+    # Rigid motion
+    pywrapper_rigidMotion               = TestCase('pywrapper_rigidMotion')
+    pywrapper_rigidMotion.cfg_dir       = "py_wrapper/flatPlate_rigidMotion"
+    pywrapper_rigidMotion.cfg_file      = "flatPlate_rigidMotion_Conf.cfg"
+    pywrapper_rigidMotion.test_iter     = 5
+    pywrapper_rigidMotion.test_vals     = [-1.598116, 2.259671, -0.040621, 0.144134] #last 4 columns
+    pywrapper_rigidMotion.su2_exec      = "python launch_flatPlate_rigidMotion.py -f"
+    pywrapper_rigidMotion.timeout       = 1600
+    pywrapper_rigidMotion.tol           = 0.00001
+    pywrapper_rigidMotion.unsteady      = True
+    test_list.append(pywrapper_rigidMotion)
+    pass_list.append(pywrapper_rigidMotion.run_test())
+
     # Tests summary
     print('==================================================================')
     print('Summary of the serial tests')

From e6451fe9e13f159981e60b11b53ec81c2f7f340b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 8 Apr 2019 16:41:57 +0200
Subject: [PATCH 148/539] Further fix

---
 Common/src/config_structure.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index a8ff3be80e7f..f905f535af2d 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3190,6 +3190,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     Delta_UnstTime = Time_Step;
     Delta_DynTime  = Time_Step;
   }
+  
+  if (SinglezoneDriver && !Time_Domain){
+    nExtIter = nIter;
+  }
   /*--- Fluid-Structure Interaction problems ---*/
 
   if (FSI_Problem) {

From dd4d546eeab2573bc84d3c46e94293d491e2dbb9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Apr 2019 15:28:55 +0200
Subject: [PATCH 149/539] Added preliminary csv output

---
 Common/include/option_structure.hpp  | 108 ---------------------------
 SU2_CFD/include/output_structure.hpp |  11 ++-
 SU2_CFD/obj/Makefile.am              |   1 +
 SU2_CFD/src/output_csv.cpp           |  77 +++++++++++++++++++
 SU2_CFD/src/output_structure.cpp     |  23 ++++--
 5 files changed, 106 insertions(+), 114 deletions(-)
 create mode 100644 SU2_CFD/src/output_csv.cpp

diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index f4a18af5de94..b859df1fc894 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1959,114 +1959,6 @@ static const map<string, ENUM_INPUT_REF> Input_Ref_Map = CCreateMap<string, ENUM
 ("SU2", SU2_REF)
 ("CUSTOM", CUSTOM_REF);
 
-///*!
-// * \brief types of screen output fields
-// */
-//enum ENUM_SCREEN_OUTPUT {
-//  SOUT_INTITER,    /*!< \brief Internal iteration. */
-//  SOUT_EXTITER,    /*!< \brief External iteration. */
-//  SOUT_TIME,       /*!< \brief Time taken by the iteration. */
-//  SOUT_PHYSTIME,   /*!< \brief Physical time of the iteration. */
-//  SOUT_RHO,       /*!< \brief Density output. */
-//  SOUT_RHOU1,     /*!< \brief Momentum-x output. */
-//  SOUT_RHOU2,     /*!< \brief Momentum-y output. */
-//  SOUT_RHOU3,     /*!< \brief Momentum-z output. */
-//  SOUT_RHOE,      /*!< \brief Rho-E output. */
-//  SOUT_PRESS,     /*!< \brief Pressure output. */
-//  SOUT_CL,        /*!< \brief Lift coefficient output. */
-//  SOUT_CD,        /*!< \brief Drag coefficient output. */
-//  SOUT_CMX,       /*!< \brief Moment X coefficient output. */
-//  SOUT_CMY,       /*!< \brief Moment Y coefficient output. */
-//  SOUT_CMZ,        /*!< \brief Moment Z coefficient output. */
-//  SOUT_CFX,        /*!< \brief Force X coefficient output. */
-//  SOUT_CFY,        /*!< \brief Force Y coefficient output. */
-//  SOUT_CFZ,        /*!< \brief Force Z coefficient output. */
-//  SOUT_CEFF,       /*!< \brief Efficiency coefficient output. */
-//  SOUT_AOA,       /*!< \brief Angle of attack output. */
-//  SOUT_SA,        /*!< \brief Spalart-Allmaras Nu. */
-//  SOUT_K,         /*!< \brief k-w Kinetic energy. */
-//  SOUT_W,         /*!< \brief k-w Rate of dissipation. */
-//  SOUT_TEMP,      /*!< \brief Temperature. */
-//  SOUT_UTOL,       /*!< \brief Elasticity displacement norm. */
-//  SOUT_RTOL,       /*!< \brief Elasticity residual norm. */
-//  SOUT_ETOL,       /*!< \brief Elasticity energy norm. */
-//  SOUT_VMS,        /*!< \brief Elasticity Maximum Von Mises stress. */
-//  SOUT_DISPX,        /*!< \brief Norm of the displacement vector - x component. */
-//  SOUT_DISPY,       /*!< \brief Norm of the displacement vector - y component. */
-//  SOUT_DISPZ        /*!< \brief Norm of the displacement vector - z component. */
-//};
-
-//static const map<string, ENUM_SCREEN_OUTPUT> Screen_Output_Map = CCreateMap<string, ENUM_SCREEN_OUTPUT>
-//("INT_ITER", SOUT_INTITER)
-//("EXT_ITER", SOUT_EXTITER)
-//("TIME", SOUT_TIME)
-//("PHYSICAL_TIME", SOUT_PHYSTIME)
-//("DENSITY", SOUT_RHO)
-//("MOMENTUM-X", SOUT_RHOU1)
-//("MOMENTUM-Y", SOUT_RHOU2)
-//("MOMENTUM-Z", SOUT_RHOU3)
-//("RHO-E", SOUT_RHOE)
-//("PRESSURE", SOUT_PRESS)
-//("LIFT", SOUT_CL)
-//("DRAG", SOUT_CD)
-//("MOMENT-X", SOUT_CMX)
-//("MOMENT-Y", SOUT_CMY)
-//("MOMENT-Z", SOUT_CMZ)
-//("FORCE-X", SOUT_CFX)
-//("FORCE-Y", SOUT_CFY)
-//("FORCE-Z", SOUT_CFZ)
-//("AOA", SOUT_AOA)
-//("EFFICIENCY", SOUT_CEFF)
-//("SA-NU", SOUT_SA)
-//("K-W_KINETIC", SOUT_K)
-//("K-W_DISSIPATION", SOUT_W)
-//("TEMPERATURE", SOUT_TEMP)
-//("UTOL", SOUT_UTOL)
-//("RTOL", SOUT_RTOL)
-//("ETOL", SOUT_ETOL)
-//("DISPX", SOUT_DISPX)
-//("DISPY", SOUT_DISPY)
-//("DISPZ", SOUT_DISPZ)
-//("VON_MISES_STRESS", SOUT_VMS);
-
-///*!
-// * \brief types of screen output fields
-// */
-//enum ENUM_HISTFILE_OUTPUT {
-//  HOUT_INTITER = 0,    /*!< \brief Internal iteration. */
-//  HOUT_EXTITER = 1,    /*!< \brief External iteration. */
-//  HOUT_TIME = 2,       /*!< \brief Time taken by the iteration. */
-//  HOUT_PHYSTIME = 3,   /*!< \brief Physical time of the iteration. */
-//  HOUT_RESIDUALS = 4,       /*!< \brief Residuals output. */
-//  HOUT_LINSOL_ITER = 5,     /*!< \brief Linear solver iteration. */
-//  HOUT_CUSTOM_OF = 6,       /*!< \brief Custom objective function. */
-//  HOUT_AEROCOEFF = 10,      /*!< \brief Aerodynamic coefficients. */
-//  HOUT_FORCECOEFF = 11,     /*!< \brief Force coefficients(projection in X, Y, Z) . */
-//  HOUT_AOA = 12,            /*!< \brief Angle of attack. */
-//  HOUT_EFF = 13,            /*!< \brief Efficiency. */
-//  HOUT_CFL = 14,            /*!< \brief CFL Number. */
-//  HOUT_LOAD_RAMP = 50,      /*!< \brief Load coefficient transfered as a ramp. */
-//  HOUT_LOAD_INCREMENT = 51,       /*!< \brief Load increment (non-linear elasticity). */
-//  HOUT_VMS = 53        /*!< \brief Elasticity Maximum Von Mises stress. */
-//};
-
-//static const map<string, ENUM_HISTFILE_OUTPUT> HistFile_Output_Map = CCreateMap<string, ENUM_HISTFILE_OUTPUT>
-//("INT_ITER", HOUT_INTITER)
-//("EXT_ITER", HOUT_EXTITER)
-//("TIME", HOUT_TIME)
-//("PHYSICAL_TIME", HOUT_PHYSTIME)
-//("RESIDUALS", HOUT_RESIDUALS)
-//("LINEAR_SOLVER_ITER", HOUT_LINSOL_ITER)
-//("CUSTOM_OF", HOUT_CUSTOM_OF)
-//("AEROCOEFF", HOUT_AEROCOEFF)
-//("FORCECOEFF", HOUT_FORCECOEFF)
-//("AOA", HOUT_AOA)
-//("EFFICIENCY", HOUT_EFF)
-//("CFL_NUMBER", HOUT_CFL)
-//("LOAD_RAMP", HOUT_LOAD_RAMP)
-//("LOAD_INCREMENT", HOUT_LOAD_INCREMENT)
-//("VON_MISES_STRESS", HOUT_VMS);
-
 /*!
  * \brief types of filter kernels, initially intended for structural topology optimization applications
  */
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 1a1a025cf04e..0aa333636874 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -128,7 +128,9 @@ class COutput {
   int *Conn_Hexa_Par;
   int *Conn_Pris_Par;
   int *Conn_Pyra_Par;
-
+  map<unsigned long,unsigned long> Global2Renumber, 
+                                   Renumber2Global;
+  
   unsigned long nGlobalPoint_Sort;
   unsigned long nLocalPoint_Sort;
   unsigned long nPoint_Restart;
@@ -600,6 +602,13 @@ class COutput {
    */
   void WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
   
+  /*!
+   * \brief Write the solution data and connectivity to a CSV file.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void WriteSurface_CSV(CConfig *config, CGeometry *geometry);
+  
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index fcf7fbbb77ad..554b09038941 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -119,6 +119,7 @@ libSU2Core_sources = \
   ../src/output_fieldview.cpp \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
+  ../src/output_csv.cpp \
   ../src/output_direct_elasticity.cpp \
   ../src/output_direct_mean.cpp \
   ../src/output_direct_mean_fem.cpp \
diff --git a/SU2_CFD/src/output_csv.cpp b/SU2_CFD/src/output_csv.cpp
new file mode 100644
index 000000000000..aeea6ebce3db
--- /dev/null
+++ b/SU2_CFD/src/output_csv.cpp
@@ -0,0 +1,77 @@
+#include "../include/output_structure.hpp"
+
+void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
+  
+  unsigned short iVar;
+  
+  unsigned long iPoint;
+  unsigned long iExtIter = config->GetExtIter();
+  char cstr[200], buffer[50];
+  ofstream Surf_file;
+  
+  int iProcessor;
+  
+  string filename;
+  
+  switch (config->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES : case RANS :
+    filename = config->GetSurfFlowCoeff_FileName();
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
+  case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+    filename = config->GetSurfAdjCoeff_FileName();
+    break;
+  default: break;
+  }
+  
+  strcpy (cstr, filename.c_str());
+  
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(config->GetiInst()));
+    
+  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+  }
+  else
+    SPRINTF (buffer, ".csv");
+  
+  strcat(cstr, buffer);
+  Surf_file.precision(15);
+  
+  
+  if (rank == MASTER_NODE) {
+    Surf_file.open(cstr, ios::out);
+    Surf_file << "\"Point\",";
+    
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
+      Surf_file << "\"" << Variable_Names[iVar] << "\",";
+    }
+    Surf_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
+    
+  }
+  
+  /*--- Write surface and volumetric solution data. ---*/
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
+        
+        Surf_file << Renumber2Global[iPoint+1] << ", ";
+        
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++){
+          Surf_file << scientific << Parallel_Surf_Data[iVar][iPoint];
+          if (iVar != GlobalField_Counter -1) Surf_file << ", ";
+        }
+        Surf_file << endl;
+      }
+    }
+    Surf_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+}
\ No newline at end of file
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index f989faaaba7b..e501bc3fd799 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -2661,16 +2661,16 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
        Force the use of SU2_SOL to merge and write the viz. files in this
        case to save overhead. ---*/
 
-      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY)) {
+      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY) && (FileFormat != TECPLOT_BINARY)) {
         Wrt_Vol = false;
         Wrt_Srf = false;
       }
 #endif
 
 //    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-    
+
 //    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-    
+
 //    switch (config[iZone]->GetKind_Solver()) {
 //      case EULER : case NAVIER_STOKES : case RANS :
 //        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
@@ -2807,8 +2807,16 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
        SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
        
      }
-
-
+     
+     /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+     
+     if (config[iZone]->GetWrt_Csv_Sol()){
+     
+       if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+     
+       WriteSurface_CSV(config[iZone], geometry[iZone][iInst][MESH_0]);
+     
+     }
       /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
 
       if (Wrt_Vol) {
@@ -5543,6 +5551,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   map<unsigned long,unsigned long> Global2Renumber;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
     Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
+    Renumber2Global[renumbRecv[ii] + 1] = globalRecv[ii];
   }
   
   
@@ -5904,6 +5913,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   for (int ii = 0; ii < nElem_Send[size]; ii++) {
     Global2Renumber[outliers[ii]] = idSend[ii] + 1;
+    Renumber2Global[idSend[ii] + 1] = outliers[ii];
   }
   
   /*--- We can now overwrite the local connectivity for our surface elems
@@ -6677,6 +6687,9 @@ void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
 void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
   
   if (Parallel_Surf_Data != NULL) {
+    
+    Global2Renumber.clear();
+    Renumber2Global.clear();
     /*--- Deallocate memory for surface solution data ---*/
     
     for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {

From bc6b1c00d3d8cad54af14ca8236e08580f84e127 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Apr 2019 15:30:54 +0200
Subject: [PATCH 150/539] Added warning instead of error if field/group cannot
 be found

---
 SU2_CFD/src/output_structure.cpp | 134 ++++++++++++++++++++++---------
 1 file changed, 95 insertions(+), 39 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index e501bc3fd799..7683c4e97318 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -9390,13 +9390,6 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
     }
   }
   
-  
-  for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-    if (!found_field[iReqField]){
-      SU2_MPI::Error("Requested history field " + RequestedHistoryFields[iReqField] + " not defined in the current solver.", CURRENT_FUNCTION);
-    }
-  }
-  
   /*--- Print the string to file and remove the last character (a separator) ---*/
   HistFile << out.str().substr(0, out.str().size() - 1);
   HistFile << endl;
@@ -9490,7 +9483,6 @@ void COutput::SetScreen_Output(CConfig *config) {
   }
 }
 
-
 void COutput::PreprocessHistoryOutput(CConfig *config){
   
   if (rank == MASTER_NODE){
@@ -9531,33 +9523,20 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
     strcat(char_histfile, buffer);
     
-//    if(!(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), "EXT_ITER") != RequestedHistoryFields.end())) {
-//      RequestedHistoryFields.push_back("EXT_ITER");
-//      nRequestedHistoryFields++;
-//    }
-    
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
     SetHistoryOutputFields(config);
+    
+    /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    
     Postprocess_HistoryFields(config);
     
-    /*--- Open the history file ---*/
-    
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    
-    /*--- Add the header to the history file. ---*/
-    
-    SetHistoryFile_Header(config);    
+    /*--- Set screen convergence output header and remove unavailable fields ---*/
     
     string RequestedField;
     vector<string> FieldsToRemove;
-  
-    /*--- Set screen convergence output header ---*/
+    vector<bool> FoundField(nRequestedHistoryFields, false);
     
-    // Evaluate the requested output
     for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
       RequestedField = RequestedScreenFields[iReqField];  
       if (HistoryOutput_Map.count(RequestedField) > 0){ 
@@ -9571,15 +9550,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     }
     
     /*--- Remove fields which are not defined --- */
-    if (FieldsToRemove.size() > 0){
-      if (rank == MASTER_NODE){ 
-      
-      }
-    }
+    
     for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
       if (rank == MASTER_NODE) {
-        if (iReqField == 0) cout << "Info: Ignoring the following screen output fields:" << endl;
-        cout << FieldsToRemove[iReqField];
+        if (iReqField == 0){
+          cout << "  Info: Ignoring the following screen output fields:" << endl;
+          cout << "  ";
+        }        cout << FieldsToRemove[iReqField];
         if (iReqField != FieldsToRemove.size()-1){
           cout << ", ";
         } else {
@@ -9587,11 +9564,73 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
         }
       }
       RequestedScreenFields.erase(std::find(RequestedScreenFields.begin(), RequestedScreenFields.end(), FieldsToRemove[iReqField]));
-
     }
     
     nRequestedScreenFields = RequestedScreenFields.size();
     
+    /*--- Remove unavailable fields from the history file output ---*/
+    
+    FieldsToRemove.clear();
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup){
+          FoundField[iReqField] = true;
+        }
+      }
+    }
+    
+    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+        for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+          RequestedField = RequestedHistoryFields[iReqField];   
+          if (RequestedField == Field.OutputGroup){
+            FoundField[iReqField] = true;
+          }
+        }
+      }
+    }
+    
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      if (!FoundField[iReqField]){
+        FieldsToRemove.push_back(RequestedHistoryFields[iReqField]);
+      }
+    }
+    
+    /*--- Remove fields which are not defined --- */    
+    
+    for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
+      if (rank == MASTER_NODE) {
+        if (iReqField == 0){
+          cout << "  Info: Ignoring the following history output fields/groups:" << endl;
+          cout << "  ";
+        }        cout << FieldsToRemove[iReqField];
+        if (iReqField != FieldsToRemove.size()-1){
+          cout << ", ";
+        } else {
+          cout << endl;
+        }
+      }
+      RequestedHistoryFields.erase(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), FieldsToRemove[iReqField]));
+    }
+    
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+        
+    /*--- Open the history file ---*/
+    
+    cout << "History filename: " << char_histfile << endl;
+    HistFile.open(char_histfile, ios::out);
+    HistFile.precision(15);
+    
+    /*--- Add the header to the history file. ---*/
+    
+    SetHistoryFile_Header(config);    
+    
+    /*--- Set the multizone screen header ---*/
+
     if (config->GetMultizone_Problem()){
       MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
       MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
@@ -9623,7 +9662,8 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   GlobalField_Counter = 0;
   
   string RequestedField;
-  std::vector<bool> found_field(nRequestedVolumeFields, false);
+  std::vector<bool> FoundField(nRequestedVolumeFields, false);
+  vector<string> FieldsToRemove;
   
   
   /*--- Loop through all fields defined in the corresponding SetVolumeOutputFields(). 
@@ -9646,17 +9686,33 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
         Variable_Names.push_back(Field.FieldName);
         GlobalField_Counter++;
         
-        found_field[iReqField] = true;
+        FoundField[iReqField] = true;
       }
     }    
   }
   
-  /*--- Check if all requested fields were found ---*/
-  
   for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
-    if (!found_field[iReqField]){
-      SU2_MPI::Error(string("There is no volume output field/group with name ") + RequestedVolumeFields[iReqField] + string(" defined in the current solver."), CURRENT_FUNCTION);
+    if (!FoundField[iReqField]){
+      FieldsToRemove.push_back(RequestedVolumeFields[iReqField]);
+    }
+  }
+  
+  /*--- Remove fields which are not defined --- */    
+  
+  for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
+    if (rank == MASTER_NODE) {
+      if (iReqField == 0){
+        cout << "  Info: Ignoring the following volume output fields/groups:" << endl;
+        cout << "  ";
+      }
+      cout << FieldsToRemove[iReqField];
+      if (iReqField != FieldsToRemove.size()-1){
+        cout << ", ";
+      } else {
+        cout << endl;
+      }
     }
+    RequestedVolumeFields.erase(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), FieldsToRemove[iReqField]));
   }
   
   

From 63e1761f63f3da08313c345925351565f2a7daee Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:42:42 +0200
Subject: [PATCH 151/539] Added file extension argument to filename routines in
 config

---
 Common/include/config_structure.hpp      |  6 ++--
 Common/src/config_structure.cpp          | 25 ++++++++--------
 Common/src/geometry_structure.cpp        |  6 ++--
 SU2_CFD/src/driver_structure.cpp         |  2 +-
 SU2_CFD/src/output_mesh.cpp              |  0
 SU2_CFD/src/solver_adjoint_mean.cpp      |  4 +--
 SU2_CFD/src/solver_direct_elasticity.cpp | 10 +++----
 SU2_CFD/src/solver_direct_heat.cpp       |  4 +--
 SU2_CFD/src/solver_direct_mean.cpp       | 16 +++++------
 SU2_CFD/src/solver_direct_mean_inc.cpp   | 16 +++++------
 SU2_CFD/src/solver_direct_turbulent.cpp  |  4 +--
 SU2_CFD/src/solver_structure.cpp         | 36 ++++++++++++------------
 12 files changed, 65 insertions(+), 64 deletions(-)
 create mode 100644 SU2_CFD/src/output_mesh.cpp

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 951cd752a9a1..9882e9b8b83a 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5471,7 +5471,7 @@ class CConfig {
    * \brief Append the zone index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
    */
-  string GetMultizone_FileName(string val_filename, int val_iZone);
+  string GetMultizone_FileName(string val_filename, int val_iZone, string ext);
 
   /*!
    * \brief Append the zone index to the restart or the solution files.
@@ -5483,7 +5483,7 @@ class CConfig {
    * \brief Append the instance index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
    */
-  string GetMultiInstance_FileName(string val_filename, int val_iInst);
+  string GetMultiInstance_FileName(string val_filename, int val_iInst, string ext);
 
   /*!
    * \brief Append the instance index to the restart or the solution files.
@@ -5563,7 +5563,7 @@ class CConfig {
    * \param[in] val_iter - Unsteady iteration number or time instance.
    * \return Name of the file with the iteration number for an unsteady solution file.
    */
-  string GetUnsteady_FileName(string val_filename, int val_iter);
+  string GetUnsteady_FileName(string val_filename, int val_iter, string ext);
   
   /*!
    * \brief Append the input filename string with the appropriate objective function extension.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index f905f535af2d..927de426804f 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7279,7 +7279,7 @@ CConfig::~CConfig(void) {
 
 }
 
-string CConfig::GetUnsteady_FileName(string val_filename, int val_iter) {
+string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string ext) {
 
   string UnstExt, UnstFilename = val_filename;
   char buffer[50];
@@ -7295,19 +7295,20 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter) {
   if ((Wrt_Unsteady) || (Wrt_Dynamic)) {
     unsigned short lastindex = UnstFilename.find_last_of(".");
     UnstFilename = UnstFilename.substr(0, lastindex);
-    if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d.dat", val_iter);
-    if ((val_iter >= 10)   && (val_iter < 100))   SPRINTF (buffer, "_000%d.dat",  val_iter);
-    if ((val_iter >= 100)  && (val_iter < 1000))  SPRINTF (buffer, "_00%d.dat",   val_iter);
-    if ((val_iter >= 1000) && (val_iter < 10000)) SPRINTF (buffer, "_0%d.dat",    val_iter);
-    if (val_iter >= 10000) SPRINTF (buffer, "_%d.dat", val_iter);
+    if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d", val_iter);
+    if ((val_iter >= 10)   && (val_iter < 100))   SPRINTF (buffer, "_000%d",  val_iter);
+    if ((val_iter >= 100)  && (val_iter < 1000))  SPRINTF (buffer, "_00%d",   val_iter);
+    if ((val_iter >= 1000) && (val_iter < 10000)) SPRINTF (buffer, "_0%d",    val_iter);
+    if (val_iter >= 10000) SPRINTF (buffer, "_%d", val_iter);
     string UnstExt = string(buffer);
+    UnstExt += ext;
     UnstFilename.append(UnstExt);
   }
 
   return UnstFilename;
 }
 
-string CConfig::GetMultizone_FileName(string val_filename, int val_iZone) {
+string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, string ext) {
 
     string multizone_filename = val_filename;
     char buffer[50];
@@ -7315,8 +7316,8 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone) {
     if (GetnZone() > 1 ) {
         unsigned short lastindex = multizone_filename.find_last_of(".");
         multizone_filename = multizone_filename.substr(0, lastindex);
-        SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
-        multizone_filename.append(string(buffer));
+        SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
+        multizone_filename.append(string(buffer)+ext);
     }
     return multizone_filename;
 }
@@ -7335,16 +7336,16 @@ string CConfig::GetMultizone_HistoryFileName(string val_filename, int val_iZone)
     return multizone_filename;
 }
 
-string CConfig::GetMultiInstance_FileName(string val_filename, int val_iInst) {
+string CConfig::GetMultiInstance_FileName(string val_filename, int val_iInst, string ext) {
 
     string multizone_filename = val_filename;
     char buffer[50];
 
     unsigned short lastindex = multizone_filename.find_last_of(".");
     multizone_filename = multizone_filename.substr(0, lastindex);
-    SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iInst));
+    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iInst));
     multizone_filename.append(string(buffer));
-
+    multizone_filename += ext;
     return multizone_filename;
 }
 
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 3e05ef1af950..a2519abc2f98 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -2376,7 +2376,7 @@ CPhysicalGeometry::CPhysicalGeometry(CConfig *config, unsigned short val_iZone,
 
     string str = "boundary.dat";
 
-    str = config->GetMultizone_FileName(str, val_iZone);
+    str = config->GetMultizone_FileName(str, val_iZone, ".dat");
 
     /*--- Open .su2 grid file ---*/
     
@@ -18548,11 +18548,11 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   filename = config->GetObjFunc_Extension(filename);
 
   if (config->GetUnsteady_Simulation()) {
-    filename = config->GetUnsteady_FileName(filename, nExtIter-1);
+    filename = config->GetUnsteady_FileName(filename, nExtIter-1, ".dat");
   }
 
 	if (config->GetnZone() > 1){
-		filename = config->GetMultizone_FileName(filename, config->GetiZone());
+		filename = config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
 	}
 
   if (config->GetRead_Binary_Restart()) {
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 39552f41ce36..81efb17b1d70 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -2764,7 +2764,7 @@ void CDriver::Numerics_Preprocessing(CNumerics *****numerics_container,
 
       filename = config->GetFEA_FileName();
       if (nZone > 1)
-        filename = config->GetMultizone_FileName(filename, iZone);
+        filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
       properties_file.open(filename.data(), ios::in);
 
diff --git a/SU2_CFD/src/output_mesh.cpp b/SU2_CFD/src/output_mesh.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 773f6907120d..42557843f7bf 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -5727,12 +5727,12 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
+    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
 
   if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
+    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 93b67f714db4..2ec3d573a580 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -1004,7 +1004,7 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
 
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
 
@@ -1142,7 +1142,7 @@ void CFEASolver::Set_Prestretch(CGeometry *geometry, CConfig *config) {
   
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
   
   if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
   
@@ -1317,7 +1317,7 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   reference_file.open(filename.data(), ios::in);
 
@@ -4943,10 +4943,10 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
   /*--- If multizone, append zone name ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (dynamic) {
-    filename = config->GetUnsteady_FileName(filename, val_iter);
+    filename = config->GetUnsteady_FileName(filename, val_iter, ".dat");
   }
 
   /*--- Read all lines in the restart file ---*/
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 370b6249e0d5..aa99d5c2866b 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -334,12 +334,12 @@ void CHeatSolverFVM::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
+    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
 
   if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
+    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index a00854c51a92..6fe8a63ea95f 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -199,7 +199,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone);
+    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
 
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
@@ -208,7 +208,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -216,7 +216,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Read and store the restart metadata. ---*/
@@ -13699,12 +13699,12 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
+    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
 
   if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
+    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
@@ -15086,7 +15086,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone);
+    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
 
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
@@ -15095,7 +15095,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -15103,7 +15103,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Read and store the restart metadata. ---*/
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index f1c9d893f742..93c9d6af7f8a 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -124,7 +124,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone);
+    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
 
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
@@ -133,7 +133,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -141,7 +141,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Read and store the restart metadata. ---*/
@@ -7041,12 +7041,12 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-  restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
+  restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
   
   if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
+    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
@@ -7301,7 +7301,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone);
+    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
 
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
@@ -7310,7 +7310,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -7318,7 +7318,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter);
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Read and store the restart metadata. ---*/
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index 5848638b06e6..07aa0f0c968d 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -1108,12 +1108,12 @@ void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
 
   /*--- Modify file name for multizone problems ---*/
   if (nZone >1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
+    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
   
   if (dual_time|| time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
+    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 324b76cb05f8..da5e201bf432 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -2041,7 +2041,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   /*--- First, we load the restart file for time n ---*/
 
@@ -2049,7 +2049,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- Modify file name for an unsteady restart ---*/
   Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter);
+  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
   /*--- Open the restart file, throw an error if this fails. ---*/
 
@@ -2120,7 +2120,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
     /*--- Modify file name for an unsteady restart ---*/
     Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter);
+    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
     /*--- Open the restart file, throw an error if this fails. ---*/
 
@@ -3207,12 +3207,12 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    profile_filename = config->GetMultizone_FileName(profile_filename, iZone);
+    profile_filename = config->GetMultizone_FileName(profile_filename, iZone, ".dat");
 
   /*--- Modify file name for an unsteady restart ---*/
 
   if (dual_time || time_stepping)
-    profile_filename = config->GetUnsteady_FileName(profile_filename, val_iter);
+    profile_filename = config->GetUnsteady_FileName(profile_filename, val_iter, ".dat");
 
   /*--- Open the file and check for problems. If a file can not be found,
    then a warning will be printed, but the calculation will continue
@@ -3558,16 +3558,16 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-    filename = config->GetMultiInstance_FileName(filename, config->GetiInst());
+    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   /*--- Read only the number of variables in the restart file. ---*/
@@ -4008,17 +4008,17 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1 )
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-    filename = config->GetMultiInstance_FileName(filename, config->GetiInst());
+    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
 
   if (config->GetWrt_Unsteady() || config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   /*--- Output the file name to the console. ---*/
@@ -4150,13 +4150,13 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetWrt_Unsteady() || config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   /*--- Output the file name to the console. ---*/
@@ -4284,7 +4284,7 @@ void CBaselineSolver_FEM::SetOutputVariables(CGeometry *geometry, CConfig *confi
   /*--- Unsteady problems require an iteration number to be appended. ---*/
 
   if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   /*--- Read only the number of variables in the restart file. ---*/
@@ -4504,7 +4504,7 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   string restart_filename = config->GetSolution_FlowFileName();
 
   if (config->GetWrt_Unsteady()) {
-    restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter));
+    restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), ".dat");
   }
 
   int counter = 0;

From ad0b82f939c1fdc0ecfbfe9568fcfbd0ef2f1c0f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:43:21 +0200
Subject: [PATCH 152/539] Added Mesh output class

---
 SU2_CFD/include/output_structure.hpp | 27 ++++++++++++++++
 SU2_CFD/src/output_mesh.cpp          | 47 ++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 0aa333636874..4950c48b14d4 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1576,4 +1576,31 @@ class CDiscAdjFEAOutput : public COutput {
 
 };
 
+/*! \class CMeshOutput
+ *  \brief Output class for elasticity discrete adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CMeshOutput : public COutput {
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CMeshOutput(void);
+
+  void SetVolumeOutputFields(CConfig *config);
+
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
+
+
 #include "output_structure.inl"
diff --git a/SU2_CFD/src/output_mesh.cpp b/SU2_CFD/src/output_mesh.cpp
index e69de29bb2d1..0fbe091d8c29 100644
--- a/SU2_CFD/src/output_mesh.cpp
+++ b/SU2_CFD/src/output_mesh.cpp
@@ -0,0 +1,47 @@
+#include "../include/output_structure.hpp"
+
+CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+
+  nDim = geometry->GetnDim();
+
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  RequestedVolumeFields.push_back("COORDINATES");
+  nRequestedVolumeFields = RequestedVolumeFields.size();
+    
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetMesh_Out_FileName();
+  
+  /*--- Set the surface filename ---*/
+  
+  SurfaceFilename = "surface_mesh";
+  
+}
+
+CMeshOutput::~CMeshOutput(void) {
+
+
+}
+
+void CMeshOutput::SetVolumeOutputFields(CConfig *config){
+
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+
+  
+}
+
+void CMeshOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+
+  CPoint*    Node_Geo  = geometry->node[iPoint];
+ 
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+}

From 9b05d97010c5c52e5437118bc7d036dc818bd832 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:50:20 +0200
Subject: [PATCH 153/539] Added filenames to output classes

---
 SU2_CFD/include/output_structure.hpp        |  2 ++
 SU2_CFD/include/output_structure.inl        | 15 ++++++++++++++-
 SU2_CFD/src/output_adjoint_discrete.cpp     | 16 ++++++++++++++++
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 15 +++++++++++++++
 SU2_CFD/src/output_adjoint_elasticity.cpp   | 13 ++++++++++++-
 SU2_CFD/src/output_adjoint_mean.cpp         | 16 ++++++++++++++++
 SU2_CFD/src/output_direct_elasticity.cpp    | 12 ++++++++++++
 SU2_CFD/src/output_direct_heat.cpp          | 13 +++++++++++++
 SU2_CFD/src/output_direct_mean.cpp          | 12 ++++++++++++
 SU2_CFD/src/output_direct_mean_fem.cpp      | 13 +++++++++++++
 SU2_CFD/src/output_direct_mean_inc.cpp      | 12 ++++++++++++
 11 files changed, 137 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4950c48b14d4..09181fd4fd4c 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -301,6 +301,8 @@ class COutput {
   
   bool multizone, grid_movement, fem_output;
   
+  string VolumeFilename, SurfaceFilename, RestartFilename;
+  
 public:
 
   /*! 
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index eaeec57eab9e..3afd5840a80d 100644
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -135,4 +135,17 @@ inline bool COutput::SetInit_Residuals(CConfig *config) {return false;}
 
 inline bool COutput::SetUpdate_Averages(CConfig *config, bool dualtime) {return false;}
 
-inline COutputLegacy* COutput::GetLegacyOutput() {return output_legacy;}
\ No newline at end of file
+inline COutputLegacy* COutput::GetLegacyOutput() {return output_legacy;}
+
+inline void COutput::SetVolume_Filename(string filename){VolumeFilename = filename;}
+
+inline void COutput::SetSurface_Filename(string filename){SurfaceFilename = filename;}
+
+inline string COutput::GetVolume_Filename(){return VolumeFilename;}
+
+inline string COutput::GetSurface_Filename(){return SurfaceFilename;}
+
+inline void COutput::SetRestart_Filename(string filename){RestartFilename = filename;}
+
+inline string COutput::GetRestart_Filename(){return RestartFilename;}
+
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 258e48e609b9..aa19fda1256d 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -73,6 +73,22 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetAdj_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_AdjFileName();
+  
+  /*--- Add the obj. function extension --- */
+  
+  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+  
 }
 
 CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index b133c4ce5970..7b208bb4ce69 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -77,6 +77,21 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   ss << "Zone " << config->GetiZone() << " (Adj. Incomp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetAdj_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_AdjFileName();
+  
+  /*--- Add the obj. function extension --- */
+  
+  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
 }
 
 CDiscAdjFlowIncOutput::~CDiscAdjFlowIncOutput(void) {
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 0ce1cb8f8db3..9c718b360e84 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -77,7 +77,18 @@ CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsig
   ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
 
-
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetAdj_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfStructure_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_AdjFEMFileName();
+  
 }
 
 CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index ebf44f86cc8b..ac5d053d91e1 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -70,6 +70,22 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
+  
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetAdj_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_AdjFileName();
+  
+  /*--- Add the obj. function extension --- */
+  
+  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
 }
 
 CAdjFlowOutput::~CAdjFlowOutput(void) {
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 0a68b0b5b382..3e64474a685c 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -86,6 +86,18 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Structure)";
   MultiZoneHeaderString = ss.str();
+  
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetStructure_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfStructure_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_FEMFileName();
 
 }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 4c475a409c06..f3d25b70caa8 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -65,6 +65,19 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Solid Heat)";
   MultiZoneHeaderString = ss.str();
+  
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetHeat_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfHeat_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_HeatFileName();
+  
 }
 
 CHeatOutput::~CHeatOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index cbd64e89733f..9f81b1844627 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -97,6 +97,18 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetFlow_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_FlowFileName();
+  
 }
 
 CFlowOutput::~CFlowOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index 618201bf5aae..fae7e6dfb8e5 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -102,6 +102,19 @@ CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **s
   /*--- Use FEM merging routines --- */
   
   fem_output = true;
+    
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetFlow_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_FlowFileName();
+  
 }
 
 CFlowFEMOutput::~CFlowFEMOutput(void) {
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 5d76283e5f2a..eb1a8a0cb49b 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -99,6 +99,18 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   ss << "Zone " << config->GetiZone() << " (Incomp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetFlow_FileName(); 
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_FlowFileName();
+  
 }
 
 CIncFlowOutput::~CIncFlowOutput(void) {

From 9e6cb17ae5fa8cacd24ff81e030d5bfb5f4e800a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:51:09 +0200
Subject: [PATCH 154/539] Modified SU2 mesh ascii writer to use parallel data

---
 SU2_CFD/src/output_su2.cpp | 369 ++++++++++++++++++++++---------------
 1 file changed, 220 insertions(+), 149 deletions(-)

diff --git a/SU2_CFD/src/output_su2.cpp b/SU2_CFD/src/output_su2.cpp
index f3994e9d1900..1ad4bf37b67e 100644
--- a/SU2_CFD/src/output_su2.cpp
+++ b/SU2_CFD/src/output_su2.cpp
@@ -37,151 +37,220 @@
 
 #include "../include/output_structure.hpp"
 
-void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, ofstream& output_file) {
+void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   
-  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, nElem;
+  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
   unsigned short iMarker, iDim, nDim = geometry->GetnDim(), iChar, iPeriodic, nPeriodic = 0, VTK_Type, nMarker_;
   short SendTo;
   su2double *center, *angles, *transl;
   ifstream input_file;
-  string Grid_Marker, text_line, Marker_Tag, str;
+  string filename, Grid_Marker, text_line, Marker_Tag, str;
   string::size_type position;
-
-  if (config->GetnZone() > 1){
-    output_file << "IZONE= " << val_iZone+1 << endl;
-  }
-
-  /*--- Write dimensions data. ---*/
-
-  output_file << "NDIME= " << nDim << endl;
-  
-  /*--- Write the angle of attack offset. ---*/
+  int iProcessor;
   
-  output_file << "AOA_OFFSET= " << config->GetAoA_Offset() << endl;
+  ofstream output_file;
+  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
   
-  /*--- Write the angle of attack offset. ---*/
-  
-  output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
+  filename = VolumeFilename + string(".su2");
 
-  /*--- Write connectivity data. ---*/
-  
-  nElem = nGlobal_Tria+nGlobal_Quad+nGlobal_Tetr+nGlobal_Hexa+nGlobal_Pris+nGlobal_Pyra;
-  
-  output_file << "NELEM= " << nElem<< endl;
-  
-  nElem = 0;
-  
-  for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    output_file << "5\t";
-    output_file << Conn_Tria[iNode+0]-1 << "\t"; output_file << Conn_Tria[iNode+1]-1 << "\t";
-    output_file << Conn_Tria[iNode+2]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
-  }
+  /*--- Special cases where a number needs to be appended to the file name. ---*/
+
+  filename = config->GetMultizone_FileName(filename, config->GetiZone(), ".su2");
+
+  strcpy (out_file, filename.c_str());
+  strcpy (cstr, out_file); 
   
-  for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    output_file << "9\t";
-    output_file << Conn_Quad[iNode+0]-1 << "\t"; output_file << Conn_Quad[iNode+1]-1 << "\t";
-    output_file << Conn_Quad[iNode+2]-1 << "\t"; output_file << Conn_Quad[iNode+3]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
+  if (rank == MASTER_NODE){
+    
+    
+    output_file.open(cstr, ios::out);
+    
+    if (config->GetnZone() > 1){
+      output_file << "IZONE= " << config->GetiZone()+1 << endl;
+    }
+    
+    /*--- Write dimensions data. ---*/
+    
+    output_file << "NDIME= " << nDim << endl;
+    
+    /*--- Write the angle of attack offset. ---*/
+    
+    output_file << "AOA_OFFSET= " << config->GetAoA_Offset() << endl;
+    
+    /*--- Write the angle of attack offset. ---*/
+    
+    output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
+    
+    output_file << "NELEM= " << nGlobal_Elem_Par<< endl;
+    
+    output_file.close();
   }
   
-  for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-    iNode = iElem*N_POINTS_TETRAHEDRON;
-    output_file << "10\t";
-    output_file << Conn_Tetr[iNode+0]-1 << "\t" << Conn_Tetr[iNode+1]-1 << "\t";
-    output_file << Conn_Tetr[iNode+2]-1 << "\t" << Conn_Tetr[iNode+3]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
+  output_file.open(cstr, ios::out | ios::app);
+  output_file.precision(15);
+  nElem = 0;
+  offset = 0;
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+        iNode = iElem*N_POINTS_TRIANGLE;
+        output_file << "5\t";                
+        output_file << Conn_Tria_Par[iNode+0]-1 << "\t";
+        output_file << Conn_Tria_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Tria_Par[iNode+2]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+        iNode = iElem*N_POINTS_QUADRILATERAL;
+        output_file << "9\t";
+        output_file << Conn_Quad_Par[iNode+0]-1 << "\t"; output_file << Conn_Quad_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Quad_Par[iNode+2]-1 << "\t"; output_file << Conn_Quad_Par[iNode+3]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+        iNode = iElem*N_POINTS_TETRAHEDRON;
+        output_file << "10\t";
+        output_file << Conn_Tetr_Par[iNode+0]-1 << "\t" << Conn_Tetr_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Tetr_Par[iNode+2]-1 << "\t" << Conn_Tetr_Par[iNode+3]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }  
+      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+        iNode = iElem*N_POINTS_HEXAHEDRON;
+        output_file << "12\t";
+        output_file << Conn_Hexa_Par[iNode+0]-1 << "\t" << Conn_Hexa_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Hexa_Par[iNode+2]-1 << "\t" << Conn_Hexa_Par[iNode+3]-1 << "\t";
+        output_file << Conn_Hexa_Par[iNode+4]-1 << "\t" << Conn_Hexa_Par[iNode+5]-1 << "\t";
+        output_file << Conn_Hexa_Par[iNode+6]-1 << "\t" << Conn_Hexa_Par[iNode+7]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+        iNode = iElem*N_POINTS_PRISM;
+        output_file << "13\t";
+        output_file << Conn_Pris_Par[iNode+0]-1 << "\t" << Conn_Pris_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Pris_Par[iNode+2]-1 << "\t" << Conn_Pris_Par[iNode+3]-1 << "\t";
+        output_file << Conn_Pris_Par[iNode+4]-1 << "\t" << Conn_Pris_Par[iNode+5]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      
+      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+        iNode = iElem*N_POINTS_PYRAMID;
+        output_file << "14\t";
+        output_file << Conn_Pyra_Par[iNode+0]-1 << "\t" << Conn_Pyra_Par[iNode+1]-1 << "\t";
+        output_file << Conn_Pyra_Par[iNode+2]-1 << "\t" << Conn_Pyra_Par[iNode+3]-1 << "\t";
+        output_file << Conn_Pyra_Par[iNode+4]-1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+    }
+    output_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nElem, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);    
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
   }
   
-  for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-    iNode = iElem*N_POINTS_HEXAHEDRON;
-    output_file << "12\t";
-    output_file << Conn_Hexa[iNode+0]-1 << "\t" << Conn_Hexa[iNode+1]-1 << "\t";
-    output_file << Conn_Hexa[iNode+2]-1 << "\t" << Conn_Hexa[iNode+3]-1 << "\t";
-    output_file << Conn_Hexa[iNode+4]-1 << "\t" << Conn_Hexa[iNode+5]-1 << "\t";
-    output_file << Conn_Hexa[iNode+6]-1 << "\t" << Conn_Hexa[iNode+7]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
-  }
   
-  for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-    iNode = iElem*N_POINTS_PRISM;
-    output_file << "13\t";
-    output_file << Conn_Pris[iNode+0]-1 << "\t" << Conn_Pris[iNode+1]-1 << "\t";
-    output_file << Conn_Pris[iNode+2]-1 << "\t" << Conn_Pris[iNode+3]-1 << "\t";
-    output_file << Conn_Pris[iNode+4]-1 << "\t" << Conn_Pris[iNode+5]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
+  /*--- Write the node coordinates ---*/
+  if (rank == MASTER_NODE){
+    output_file << "NPOIN= " << nGlobal_Poin_Par;
+    if (geometry->GetGlobal_nPointDomain() != nGlobal_Poin_Par)
+      output_file << "\t" << geometry->GetGlobal_nPointDomain();
+    output_file << endl;
+    output_file.flush();    
   }
   
-  for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-    iNode = iElem*N_POINTS_PYRAMID;
-    output_file << "14\t";
-    output_file << Conn_Pyra[iNode+0]-1 << "\t" << Conn_Pyra[iNode+1]-1 << "\t";
-    output_file << Conn_Pyra[iNode+2]-1 << "\t" << Conn_Pyra[iNode+3]-1 << "\t";
-    output_file << Conn_Pyra[iNode+4]-1 << "\t";
-    output_file << nElem << "\n"; nElem++;
-  }
   
-  /*--- Write the node coordinates ---*/
+  unsigned long Global_Index, myPoint = 0;
+  offset = 0;
   
-  output_file << "NPOIN= " << nGlobal_Doma;
-  if (geometry->GetGlobal_nPointDomain() != nGlobal_Doma)
-    output_file << "\t" << geometry->GetGlobal_nPointDomain();
-  output_file << endl;
-
-  for (iPoint = 0; iPoint < nGlobal_Doma; iPoint++) {
-     for (iDim = 0; iDim < nDim; iDim++)
-      output_file << scientific << Coords[iDim][iPoint] << "\t";
-    output_file << iPoint << endl;
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+        
+        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+        
+        Global_Index = iPoint + offset;
+        
+        /*--- Only write original domain points, i.e., exclude any periodic
+         or halo nodes, even if they are output in the viz. files. ---*/
+        
+        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+          
+          /*--- Loop over the variables and write the values to file ---*/
+          
+          for (iDim = 0; iDim < nDim; iDim++) {
+            output_file << scientific << Parallel_Data[iDim][iPoint] << "\t";
+          }
+          
+          /*--- Write global index. (note outer loop over procs) ---*/
+          
+          output_file << Global_Index << "\t";
+          myPoint++;
+          
+          output_file << "\n";
+        }
+      }
+    }
+    /*--- Flush the file and wait for all processors to arrive. ---*/
+    output_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
   }
   
-  /*--- Read the boundary information ---*/
-
-  str = "boundary.dat";
-
-  str = config->GetMultizone_FileName(str, val_iZone);
-
-  input_file.open(str.c_str(), ios::out);
+  output_file.close();
   
-  /*--- Read grid file with format SU2 ---*/
-  
-  while (getline (input_file, text_line)) {
-
-    /*--- Write the physical boundaries ---*/
+  if (rank == MASTER_NODE){
+    
+    output_file.open(cstr, ios::out | ios::app);
+    
+    /*--- Read the boundary information ---*/
+    
+    str = "boundary.dat";
+    
+    str = config->GetMultizone_FileName(str, config->GetiZone(), ".dat");
     
-    position = text_line.find ("NMARK=",0);
-    if (position != string::npos) {
+    input_file.open(str.c_str(), ios::out);
+    
+    /*--- Read grid file with format SU2 ---*/
+    
+    while (getline (input_file, text_line)) {
       
-      text_line.erase (0,6); nMarker_ = atoi(text_line.c_str());
-      output_file << "NMARK= " << nMarker_ << endl;
+      /*--- Write the physical boundaries ---*/
       
-      for (iMarker = 0 ; iMarker < nMarker_; iMarker++) {
+      position = text_line.find ("NMARK=",0);
+      if (position != string::npos) {
         
-        getline (input_file, text_line);
-        text_line.erase (0,11);
-        string::size_type position;
-        for (iChar = 0; iChar < 20; iChar++) {
-          position = text_line.find( " ", 0 );
-          if (position != string::npos) text_line.erase (position,1);
-          position = text_line.find( "\r", 0 );
-          if (position != string::npos) text_line.erase (position,1);
-          position = text_line.find( "\n", 0 );
-          if (position != string::npos) text_line.erase (position,1);
-        }
-        Marker_Tag = text_line.c_str();
-        
-        /*--- Standart physical boundary ---*/
+        text_line.erase (0,6); nMarker_ = atoi(text_line.c_str());
+        output_file << "NMARK= " << nMarker_ << endl;
         
+        for (iMarker = 0 ; iMarker < nMarker_; iMarker++) {
+          
+          getline (input_file, text_line);
+          text_line.erase (0,11);
+          string::size_type position;
+          for (iChar = 0; iChar < 20; iChar++) {
+            position = text_line.find( " ", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+            position = text_line.find( "\r", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+            position = text_line.find( "\n", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+          }
+          Marker_Tag = text_line.c_str();
+          
+          /*--- Standart physical boundary ---*/
+          
           getline (input_file, text_line);
           
           text_line.erase (0,13); nElem_Bound_ = atoi(text_line.c_str());
           output_file << "MARKER_TAG= " << Marker_Tag << endl;
           output_file << "MARKER_ELEMS= " << nElem_Bound_<< endl;
           getline (input_file, text_line);
-
+          
           text_line.erase (0,8); SendTo = atoi(text_line.c_str());
-
+          
           if (Marker_Tag == "SEND_RECEIVE"){
             output_file << "SEND_TO= " << SendTo << endl;
           }
@@ -194,53 +263,55 @@ void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry, unsigned sh
             output_file << VTK_Type;
             
             switch(VTK_Type) {
-              case LINE:
-                bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
-                output_file << "\t" << vnodes_edge[0] << "\t" << vnodes_edge[1] << endl;
-                break;
-              case TRIANGLE:
-                bound_line >> vnodes_triangle[0]; bound_line >> vnodes_triangle[1]; bound_line >> vnodes_triangle[2];
-                output_file << "\t" << vnodes_triangle[0] << "\t" << vnodes_triangle[1] << "\t" << vnodes_triangle[2] << endl;
-                break;
-              case QUADRILATERAL:
-                bound_line >> vnodes_quad[0]; bound_line >> vnodes_quad[1]; bound_line >> vnodes_quad[2]; bound_line >> vnodes_quad[3];
-                output_file << "\t" << vnodes_quad[0] << "\t" << vnodes_quad[1] << "\t" << vnodes_quad[2] << "\t" << vnodes_quad[3] << endl;
-                break;
-              case VERTEX:
-                bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
-                output_file << "\t" << vnodes_edge[0] <<  "\t" << vnodes_edge[1] <<endl;
-                break;
+            case LINE:
+              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
+              output_file << "\t" << vnodes_edge[0] << "\t" << vnodes_edge[1] << endl;
+              break;
+            case TRIANGLE:
+              bound_line >> vnodes_triangle[0]; bound_line >> vnodes_triangle[1]; bound_line >> vnodes_triangle[2];
+              output_file << "\t" << vnodes_triangle[0] << "\t" << vnodes_triangle[1] << "\t" << vnodes_triangle[2] << endl;
+              break;
+            case QUADRILATERAL:
+              bound_line >> vnodes_quad[0]; bound_line >> vnodes_quad[1]; bound_line >> vnodes_quad[2]; bound_line >> vnodes_quad[3];
+              output_file << "\t" << vnodes_quad[0] << "\t" << vnodes_quad[1] << "\t" << vnodes_quad[2] << "\t" << vnodes_quad[3] << endl;
+              break;
+            case VERTEX:
+              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
+              output_file << "\t" << vnodes_edge[0] <<  "\t" << vnodes_edge[1] <<endl;
+              break;
             }
           }
+        }
       }
+      
     }
     
-  }
-  
-  input_file.close();
-
-  remove(str.c_str());
-
-  /*--- Get the total number of periodic transformations ---*/
-  
-  nPeriodic = config->GetnPeriodicIndex();
-  output_file << "NPERIODIC= " << nPeriodic << endl;
-  
-  /*--- From iPeriodic obtain the iMarker ---*/
-  
-  for (iPeriodic = 0; iPeriodic < nPeriodic; iPeriodic++) {
+    input_file.close();
+    
+//    remove(str.c_str());
     
-    /*--- Retrieve the supplied periodic information. ---*/
+    /*--- Get the total number of periodic transformations ---*/
     
-    center = config->GetPeriodicCenter(iPeriodic);
-    angles = config->GetPeriodicRotation(iPeriodic);
-    transl = config->GetPeriodicTranslate(iPeriodic);
+    nPeriodic = config->GetnPeriodicIndex();
+    output_file << "NPERIODIC= " << nPeriodic << endl;
     
-    output_file << "PERIODIC_INDEX= " << iPeriodic << endl;
-    output_file << center[0] << "\t" << center[1] << "\t" << center[2] << endl;
-    output_file << angles[0] << "\t" << angles[1] << "\t" << angles[2] << endl;
-    output_file << transl[0] << "\t" << transl[1] << "\t" << transl[2] << endl;
+    /*--- From iPeriodic obtain the iMarker ---*/
     
+    for (iPeriodic = 0; iPeriodic < nPeriodic; iPeriodic++) {
+      
+      /*--- Retrieve the supplied periodic information. ---*/
+      
+      center = config->GetPeriodicCenter(iPeriodic);
+      angles = config->GetPeriodicRotation(iPeriodic);
+      transl = config->GetPeriodicTranslate(iPeriodic);
+      
+      output_file << "PERIODIC_INDEX= " << iPeriodic << endl;
+      output_file << center[0] << "\t" << center[1] << "\t" << center[2] << endl;
+      output_file << angles[0] << "\t" << angles[1] << "\t" << angles[2] << endl;
+      output_file << transl[0] << "\t" << transl[1] << "\t" << transl[2] << endl;
+      
+    }
+    output_file.close();
   }
 
 }

From a2d2ced84e455af1b8b5068a3f71584fac4b2edd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:52:32 +0200
Subject: [PATCH 155/539] Modified paraview writer to use new filename routines

---
 SU2_CFD/src/output_paraview.cpp | 94 ++++-----------------------------
 1 file changed, 9 insertions(+), 85 deletions(-)

diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp
index e3ed54bf76b2..bbff026a203f 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output_paraview.cpp
@@ -1957,103 +1957,28 @@ void COutput::SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsign
   
 }
 
-void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol) {
+void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
 
   unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned short Kind_Solver = config->GetKind_Solver();
 
   unsigned long iPoint, iElem, iNode;
-  unsigned long iExtIter = config->GetExtIter();
 
   unsigned long nSurf_Elem_Storage;
   unsigned long nGlobal_Elem_Storage;
 
-  bool adjoint = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-
-  char cstr[200], buffer[50];
   string filename, fieldname;
   ofstream Paraview_File;
 
   int iProcessor;
-
-  /*--- Write file name with extension ---*/
-  if (surf_sol) {
-    if (adjoint || disc_adj)
-      filename = config->GetSurfAdjCoeff_FileName();
-    else
-      filename = config->GetSurfFlowCoeff_FileName();
-  }
-  else {
-    if (adjoint || disc_adj)
-      filename = config->GetAdj_FileName();
-    else
-      filename = config->GetFlow_FileName();
-  }
-
-  if (Kind_Solver == FEM_ELASTICITY) {
-    if (surf_sol)
-      filename = config->GetSurfStructure_FileName().c_str();
-    else
-      filename = config->GetStructure_FileName().c_str();
-  }
   
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-    else filename = config->GetHeat_FileName().c_str();
-  }
+  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".vtk");
+  else filename          = GetFilename(config, VolumeFilename, ".vtk");
 
-  if (config->GetKind_SU2() == SU2_DOT) {
-    if (surf_sol)
-      filename = config->GetSurfSens_FileName();
-    else
-      filename = config->GetVolSens_FileName();
-  }
-
-  strcpy (cstr, filename.c_str());
-
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS ||
-       Kind_Solver == DISC_ADJ_EULER || Kind_Solver == DISC_ADJ_NAVIER_STOKES || Kind_Solver == DISC_ADJ_RANS ||
-       Kind_Solver == FEM_ELASTICITY || Kind_Solver == HEAT_EQUATION_FVM) &&
-      (val_nZone > 1) &&
-      (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    if (SU2_TYPE::Int(val_iInst) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(val_iInst));
-    if ((SU2_TYPE::Int(val_iInst) >= 10) && (SU2_TYPE::Int(val_iInst) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(val_iInst));
-    if ((SU2_TYPE::Int(val_iInst) >= 100) && (SU2_TYPE::Int(val_iInst) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(val_iInst));
-    if ((SU2_TYPE::Int(val_iInst) >= 1000) && (SU2_TYPE::Int(val_iInst) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(val_iInst));
-    if (SU2_TYPE::Int(val_iInst) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(val_iInst));
-
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-
-  } else if (config->GetDynamic_Analysis() && config->GetWrt_Dynamic()) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-  } else {
-    SPRINTF (buffer, ".vtk");
-  }
-
-  strcat(cstr, buffer);
 
   /*--- Open Paraview ASCII file and write the header. ---*/
 
     if (rank == MASTER_NODE) {
-  Paraview_File.open(cstr, ios::out);
+  Paraview_File.open(filename.c_str(), ios::out);
   Paraview_File.precision(6);
   Paraview_File << "# vtk DataFile Version 3.0\n";
   Paraview_File << "vtk output\n";
@@ -2074,7 +1999,7 @@ void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry,
 
   /*--- Each processor opens the file. ---*/
 
-  Paraview_File.open(cstr, ios::out | ios::app);
+  Paraview_File.open(filename.c_str(), ios::out | ios::app);
 
   /*--- Write surface and volumetric point coordinates. ---*/
 
@@ -2410,10 +2335,8 @@ found = Variable_Names[iField].find("_z");
 
 void COutput::WriteParaViewBinary_Parallel(CConfig *config,
                                            CGeometry *geometry,
-                                           CSolver **solver,
                                            unsigned short val_iZone,
                                            unsigned short val_nZone,
-                                           unsigned short val_nInst,
                                            bool surf_sol) {
   
   unsigned short iDim, nDim = geometry->GetnDim();
@@ -2422,14 +2345,15 @@ void COutput::WriteParaViewBinary_Parallel(CConfig *config,
   
   string filename, fieldname;
   ofstream Paraview_File;
-  
-  filename = GetVTKFilename(config, val_iZone, val_nZone, surf_sol);
-  
+    
   int MAX_STRING_LENGTH = 255;
   char str_buf[MAX_STRING_LENGTH], fname[100];
   
   const int NCOORDS = 3;
   
+  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".vtk");
+  else filename          = GetFilename(config, VolumeFilename, ".vtk");
+
   strcpy(fname, filename.c_str());
   
   /*--- Check for big endian. We have to swap bytes otherwise. ---*/

From c9e501a2f0510d7d3359bb11feebb10dcdd17e7b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:52:57 +0200
Subject: [PATCH 156/539] Modified tecplot writer to use new filename routines

---
 SU2_CFD/src/output_tecplot.cpp | 67 ++++++++--------------------------
 1 file changed, 15 insertions(+), 52 deletions(-)

diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output_tecplot.cpp
index 2766684cbad8..2da29cb00954 100644
--- a/SU2_CFD/src/output_tecplot.cpp
+++ b/SU2_CFD/src/output_tecplot.cpp
@@ -790,67 +790,26 @@ void COutput::SetCSV_MeshASCII(CConfig *config, CGeometry *geometry) {
 
 }
 
-namespace
-{
-
-  std::string GetTecplotFilename(CConfig *config, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol, const char *extension) {
-
-    const bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-    const unsigned short Kind_Solver = config->GetKind_Solver();
-    string filename;
-
-    if (config->GetKind_SU2() == SU2_DOT) {
-      if (surf_sol) filename = config->GetSurfSens_FileName();
-      else filename = config->GetVolSens_FileName();
-    }
-    else if (Kind_Solver == FEM_ELASTICITY) {
-      if (surf_sol) filename = config->GetSurfStructure_FileName().c_str();
-      else filename = config->GetStructure_FileName().c_str();
-    }
-    else if (surf_sol) {
-      if (adjoint) filename = config->GetSurfAdjCoeff_FileName();
-      else filename = config->GetSurfFlowCoeff_FileName();
-    }
-    else {
-      if (adjoint)
-        filename = config->GetAdj_FileName();
-      else filename = config->GetFlow_FileName();
-    }
-    
-    ostringstream string_stream;
-    string_stream << filename;
-    
-    /*--- Special cases where a number needs to be appended to the file name. ---*/
-    if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-         Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS ||
-         Kind_Solver == DISC_ADJ_EULER || Kind_Solver == DISC_ADJ_NAVIER_STOKES || Kind_Solver == DISC_ADJ_RANS) &&
-        (val_nZone > 1) ) {
-      string_stream << '_' << val_iZone;
-    }
-    
-    const unsigned long iExtIter = config->GetExtIter();
-    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady() && config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-      string_stream << '_' << setfill('0') << setw(5) << iExtIter;
-    }
-
-    string_stream << extension;
-    return string_stream.str();
-  }
-
-} /* namespace */
-
-void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol) {
+void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
   
   unsigned short iVar, nDim = geometry->GetnDim();
   
   unsigned long iPoint, iElem, iNode;
   unsigned long iExtIter = config->GetExtIter();
   
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
+    iExtIter = config->GetiInst();
+  }
+  
   int iProcessor;
 
-  string filename = GetTecplotFilename(config, val_iZone, val_nZone, surf_sol, ".dat");
   ofstream Tecplot_File;
   
+  string filename;
+  
+  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".dat");
+  else filename          = GetFilename(config, VolumeFilename, ".dat");
+  
   /*--- Open Tecplot ASCII file and write the header. ---*/
   
   if (rank == MASTER_NODE) {
@@ -1103,7 +1062,11 @@ void COutput::WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry,
   
   /*--- Open Tecplot binary file. ---*/
   
-  string filename = GetTecplotFilename(config, val_iZone, val_nZone, surf_sol, ".szplt");
+  string filename;
+  
+  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".szplt");
+  else filename          = GetFilename(config, VolumeFilename, ".szplt");
+
   
   string data_set_title = surf_sol
     ? "Visualization of the surface solution"

From 94e456975078e9319dd6e5f219bd51cc820cb4d8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:53:40 +0200
Subject: [PATCH 157/539] Modified CSV writer (global indices still not working
 properly)

---
 SU2_CFD/src/output_csv.cpp | 50 ++++++++++++--------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/SU2_CFD/src/output_csv.cpp b/SU2_CFD/src/output_csv.cpp
index aeea6ebce3db..41a42b9030d2 100644
--- a/SU2_CFD/src/output_csv.cpp
+++ b/SU2_CFD/src/output_csv.cpp
@@ -2,75 +2,57 @@
 
 void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
-  unsigned short iVar;
-  
-  unsigned long iPoint;
-  unsigned long iExtIter = config->GetExtIter();
-  char cstr[200], buffer[50];
+  unsigned short iVar;  
+  unsigned long iPoint, index, offset, myPoint;
   ofstream Surf_file;
   
   int iProcessor;
   
   string filename;
   
-  switch (config->GetKind_Solver()) {
-  case EULER : case NAVIER_STOKES : case RANS :
-    filename = config->GetSurfFlowCoeff_FileName();
-    break;
-  case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-  case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-    filename = config->GetSurfAdjCoeff_FileName();
-    break;
-  default: break;
-  }
-  
-  strcpy (cstr, filename.c_str());
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(config->GetiInst()));
-    
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
-  }
-  else
-    SPRINTF (buffer, ".csv");
+  filename = GetFilename(config, SurfaceFilename, ".csv");
   
-  strcat(cstr, buffer);
   Surf_file.precision(15);
   
   
   if (rank == MASTER_NODE) {
-    Surf_file.open(cstr, ios::out);
+    Surf_file.open(filename.c_str(), ios::out);
     Surf_file << "\"Point\",";
     
     for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
       Surf_file << "\"" << Variable_Names[iVar] << "\",";
     }
     Surf_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    
+    Surf_file.close();
   }
   
+  /*--- Open file on every processor ---*/
+  
+  Surf_file.open(filename.c_str(), ios::out| ios::app);
+  
   /*--- Write surface and volumetric solution data. ---*/
   
+  offset = 0; myPoint = 0;
   for (iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
       for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
         
-        Surf_file << Renumber2Global[iPoint+1] << ", ";
+        index = iPoint + offset;
+        
+        Surf_file << Renumber2Global[index+1] << ", ";
         
         for (iVar = 0; iVar < GlobalField_Counter; iVar++){
           Surf_file << scientific << Parallel_Surf_Data[iVar][iPoint];
           if (iVar != GlobalField_Counter -1) Surf_file << ", ";
         }
         Surf_file << endl;
+        
+        myPoint++;
       }
     }
     Surf_file.flush();
 #ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);    
     SU2_MPI::Barrier(MPI_COMM_WORLD);
 #endif
   }

From 1fc6fda3357a377d4cf2f2bd089093b460122df8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 14:54:18 +0200
Subject: [PATCH 158/539] Updated legacy output to use new filename routines

---
 SU2_CFD/src/output_structure_legacy.cpp | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index 6586d1faed56..71e220c256ae 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -4058,15 +4058,15 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+    filename= config->GetMultizone_FileName(filename, val_iZone, ".dat");
   
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
   } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
   
   /*--- Open the restart file and write the solution. ---*/
@@ -17585,19 +17585,19 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+    filename= config->GetMultizone_FileName(filename, val_iZone, ".dat");
   
   /*--- Append the zone number if multiple instance problems ---*/
   if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+    filename= config->GetMultiInstance_FileName(filename, val_iInst, ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
   } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
   
   /*--- Only the master node writes the header. ---*/
@@ -17713,19 +17713,19 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
 
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+    filename= config->GetMultizone_FileName(filename, val_iZone, ".dat");
 
   /*--- Append the zone number if multiple instance problems ---*/
   if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+    filename= config->GetMultiInstance_FileName(filename, val_iInst, ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
   } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   strcpy(fname, filename.c_str());

From 2e1e275b9b4e824d697c6e1633aac14e8e5d619c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:06:15 +0200
Subject: [PATCH 159/539] Removed some of the old merging routines

---
 SU2_CFD/src/output_structure.cpp | 10910 ++++++++++-------------------
 1 file changed, 3799 insertions(+), 7111 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 7683c4e97318..e39afd5237bd 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -499,1814 +499,784 @@ COutput::~COutput(void) {
 }
 
 
-void COutput::MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-  /*--- Flags identifying the types of files to be written. ---*/
-  
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
-  
-  /*--- Merge connectivity for each type of element (excluding halos). Note
-   that we only need to merge the connectivity once, as it does not change
-   during computation. Check whether the base file has been written. ---*/
-  
-  /*--- Merge volumetric grid. ---*/
-  
-  if (Wrt_Vol) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
-      cout <<"Merging volumetric triangle grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, TRIANGLE    );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
-      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, QUADRILATERAL   );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
-      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, TETRAHEDRON );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
-      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, HEXAHEDRON  );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
-      cout <<"Merging volumetric prism grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, PRISM       );
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
-      cout <<"Merging volumetric pyramid grid connectivity." << endl;
-    MergeVolumetricConnectivity(config, geometry, PYRAMID     );
-    
-  }
-  
-  /*--- Merge surface grid. ---*/
-  
-  if (Wrt_Srf) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
-      cout <<"Merging surface line grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, LINE);
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
-      cout <<"Merging surface triangle grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, TRIANGLE);
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
-      cout <<"Merging surface quadrilateral grid connectivity." << endl;
-    MergeSurfaceConnectivity(config, geometry, QUADRILATERAL);
+
+void COutput::SetConvHistory_Body(CGeometry ****geometry,
+                                     CSolver *****solver_container,
+                                     CConfig **config,
+                                     CIntegration ****integration,
+                                     bool DualTime_Iteration,
+                                     su2double timeused,
+                                     unsigned short val_iZone,
+                                     unsigned short val_iInst) {
+
+
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    bool write_header, write_history, write_screen;
+
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+
+    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
+                    timeused, val_iZone, val_iInst);
     
+    Postprocess_HistoryData(config[val_iZone], DualTime_Iteration);
+        
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
+    if (write_history) SetHistoryFile_Output(config[val_iZone]);
+
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    write_header = WriteScreen_Header(config[val_iZone]);
+    if (write_header) SetScreen_Header(config[val_iZone]);
+
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
+    if (write_screen) SetScreen_Output(config[val_iZone]);
+
   }
-  
-  /*--- Update total number of volume elements after merge. ---*/
-  
-  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
-  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
-  
-  /*--- Update total number of surface elements after merge. ---*/
-  
-  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
-  
+
 }
 
-void COutput::MergeCoordinates(CConfig *config, CGeometry *geometry) {
-  
-  /*--- Local variables needed on all processors ---*/
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint;
-  
-  unsigned short kind_SU2 = config->GetKind_SU2();
-  
-#ifndef HAVE_MPI
-  
-  /*--- In serial, the single process has access to all geometry, so simply
-   load the coordinates into the data structure. ---*/
-  
-  unsigned short iMarker;
-  unsigned long iVertex, nTotalPoints = 0;
-  int SendRecv;
-  
-  bool isPeriodic;
+void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
   
-  /*--- First, create a structure to locate any periodic halo nodes ---*/
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
+  unsigned short iMesh;
   
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
-         * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
-         * is different in each case ---*/
+  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned long ExtIter = config[val_iZone]->GetExtIter();
+  unsigned short nVar = 1;
 
-        if (kind_SU2 == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
+  bool energy = config[val_iZone]->GetEnergy_Equation();
+  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
 
-        if (isPeriodic && (SendRecv < 0)) {
-          Local_Halo[iPoint] = false;
-        }
+  switch( config[val_iZone]->GetKind_Solver()) {
+    case EULER : case NAVIER_STOKES : case RANS:
+      if (energy) {
+        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
       }
-      
-    }
-  }
-  
-  /*--- Total number of points in the mesh (this might include periodic points). ---*/
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (!Local_Halo[iPoint]) nTotalPoints++;
-  
-  nGlobal_Poin = nTotalPoints;
-  nGlobal_Doma = geometry->GetnPointDomain();
-  
-  /*--- Allocate the coordinates data structure. ---*/
-  
-  Coords = new su2double*[nDim];
-  for (iDim = 0; iDim < nDim; iDim++) {
-    Coords[iDim] = new su2double[nGlobal_Poin];
-  }
-  
-  /*--- Loop over the mesh to collect the coords of the local points ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- Check if the node belongs to the domain (i.e, not a halo node).
-     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
-    
-    if (!Local_Halo[iPoint]) {
-      
-      /*--- Retrieve the current coordinates at this node. ---*/
-      
-      unsigned long iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      for (iDim = 0; iDim < nDim; iDim++) {
-        Coords[iDim][iGlobal_Index] = geometry->node[iPoint]->GetCoord(iDim);
-        
-        /*--- If US system, the output should be in inches ---*/
-        
-        if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-          Coords[iDim][iGlobal_Index] *= 12.0;
-        }
-        
+      else if (weakly_coupled_heat) {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
       }
-      
-    }
+      else {
+        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+      }
+      break;
+    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+      break;
+    case HEAT_EQUATION_FVM:
+      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      break;
   }
   
-  
-  delete [] Local_Halo;
-  
-#else
-  
-  /*--- MPI preprocessing ---*/
-  int iProcessor, nProcessor = size;
-  unsigned long jPoint;
+  if (RhoRes_New < EPS) RhoRes_New = EPS;
+  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
 
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  /*--- Local variables needed for merging the geometry with MPI. ---*/
-  
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+  Div = RhoRes_Old[val_iZone]/RhoRes_New;
+  Diff = RhoRes_New-RhoRes_Old[val_iZone];
 
-          /*--- For SU2_CFD and SU2_SOL we want to remove the periodic halo nodes,
-           * but for SU2_DEF we want them to be included, therefore the definition of a periodic point
-           * is different in each case ---*/
+  /*--- Compute MG factor ---*/
 
-          if (kind_SU2 == SU2_DEF) {
-            isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-          }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          }
-          if (isPeriodic) {
-            Local_Halo[iPoint] = false;
-          }
-        }
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
+    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
+  }
+
+  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
+  else power = config[val_iZone]->GetCFL_AdaptParam(1);
+
+  /*--- Detect a stall in the residual ---*/
+
+  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
+
+  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
+  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
+
+  CFLFactor = pow(Div, power);
+
+  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+    CFL = config[val_iZone]->GetCFL(iMesh);
+    CFL *= CFLFactor;
+
+    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
       }
+      break;
     }
-    
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-  }
-  Buffer_Send_nPoin[0] = nLocalPoint;
-  
-  /*--- Communicate the total number of nodes on this domain. ---*/
-  
-  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  
-  if (rank == MASTER_NODE) {
-    nGlobal_Doma = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
+    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
+      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
+        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
+      break;
     }
+
+    config[val_iZone]->SetCFL(iMesh, CFL);
+  }
+
+  switch( config[val_iZone]->GetKind_Solver()) {
+  case EULER : case NAVIER_STOKES : case RANS:
+    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+    break;
+  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+    break;
+  case HEAT_EQUATION_FVM:
+    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    break;
   }
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
   
-  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_X = NULL;
+}
+
+void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
+                                      unsigned long iExtIter, unsigned short val_nZone) {
   
-  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Y = NULL;
+  unsigned short iZone, iInst, nInst;
   
-  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
-  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
-    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
-    }
-    Coords = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      Coords[iDim] = new su2double[nGlobal_Poin];
-    }
-  }
-  
-  /*--- Main communication routine. Loop over each coordinate and perform
-   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
-   all nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  /*--- Loop over this partition to collect the coords of the local points. ---*/
-  su2double *Coords_Local; jPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+  for (iZone = 0; iZone < val_nZone; iZone++) {
     
-    /*--- Check for halos and write only if requested ---*/
-    if (!Local_Halo[iPoint] || Wrt_Halo) {
-      
-      /*--- Retrieve local coordinates at this node. ---*/
-      Coords_Local = geometry->node[iPoint]->GetCoord();
-      
-      /*--- Load local coords into the temporary send buffer. ---*/
-      Buffer_Send_X[jPoint] = Coords_Local[0];
-      Buffer_Send_Y[jPoint] = Coords_Local[1];
-      if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
-      
-      /*--- If US system, the output should be in inches ---*/
-      
-      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-        Buffer_Send_X[jPoint] *= 12.0;
-        Buffer_Send_Y[jPoint] *= 12.0;
-        if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+    nInst = config[iZone]->GetnTimeInstances();
+
+    for (iInst = 0; iInst < nInst; iInst++) {
+
+      config[iZone]->SetiInst(iInst);
+
+      /*--- Flags identifying the types of files to be written. ---*/
+
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+
+      /*--- Get the file output format ---*/
+
+      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+
+      /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
+
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
+        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
       }
-      
-      /*--- Store the global index for this local node. ---*/
-      Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Increment jPoint as the counter. We need this because iPoint
-       may include halo nodes that we skip over during this loop. ---*/
-      jPoint++;
-    }
-  }
-  
-  /*--- Gather the coordinate data on the master node using MPI. ---*/
-  
-  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) {
-    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  }
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- The master node unpacks and sorts this variable by global index ---*/
-  
-  if (rank == MASTER_NODE) {
-    jPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        /*--- Get global index, then loop over each variable and store ---*/
-        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-        if (iGlobal_Index >= nGlobal_Poin) {
-          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
+
+      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+
+      if ((Wrt_Vol || Wrt_Srf)) {
+        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
+        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
+      }
+
+      /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
+
+
+      if (rank == MASTER_NODE) {
+
+        if (Wrt_Vol) {
+
+          switch (FileFormat) {
+
+          case TECPLOT:
+
+            /*--- Write a Tecplot ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
+            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
+
+          case FIELDVIEW:
+
+            /*--- Write a FieldView ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
+
+          case TECPLOT_BINARY:
+
+            /*--- Write a Tecplot binary solution file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
+            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
+            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
+            break;
+
+          case FIELDVIEW_BINARY:
+
+            /*--- Write a binary binary file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
+            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
+
+          case PARAVIEW:
+
+            /*--- Write a Paraview ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
+            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            break;
+
+          default:
+            break;
+          }
+
         }
-        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
-        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
-        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
-        jPoint++;
+
+        if (Wrt_Srf) {
+
+          switch (FileFormat) {
+
+          case TECPLOT:
+
+            /*--- Write a Tecplot ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
+            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
+
+          case TECPLOT_BINARY:
+
+            /*--- Write a Tecplot binary solution file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
+            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
+            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
+            break;
+
+          case PARAVIEW:
+
+            /*--- Write a Paraview ASCII file ---*/
+
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
+            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            break;
+
+          default:
+            break;
+          }
+        }
+
+        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
+          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+        }
+
+        if (FileFormat == TECPLOT_BINARY) {
+          if (!wrote_base_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+          if (!wrote_surf_file)
+            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
+        }
+
+        if (Wrt_Vol || Wrt_Srf)
+          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
       }
-      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-      jPoint = (iProcessor+1)*nBuffer_Scalar;
+
+
+
+      /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
+
+#ifdef HAVE_MPI
+      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
+
     }
+
   }
-  
-  /*--- Immediately release the temporary data buffers. ---*/
-  
-  delete [] Local_Halo;
-  delete [] Buffer_Send_X;
-  delete [] Buffer_Send_Y;
-  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
-  delete [] Buffer_Send_GlobalIndex;
+}
+
+void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
+
+  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
+  unsigned short iZone;
+  ofstream output_file;
+  string str;
+
+  /*--- Read the name of the output and input file ---*/
+
+  if (su2_file) {
   if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_X;
-    delete [] Buffer_Recv_Y;
-    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
-    delete [] Buffer_Recv_GlobalIndex;
-    delete [] Buffer_Recv_nPoin;
+      str = config[ZONE_0]->GetMesh_Out_FileName();
+      strcpy (out_file, str.c_str());
+      strcpy (cstr, out_file);
+      output_file.precision(15);
+      output_file.open(cstr, ios::out);
+      if (val_nZone > 1){
+        output_file << "NZONE= " << val_nZone << endl;
+      }
+    }
   }
-  
-#endif
-  
-}
 
-void COutput::MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  int iProcessor;
-  unsigned short NODES_PER_ELEMENT;
-  unsigned long iPoint, iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
-  
-  unsigned long iVertex, iMarker;
-  unsigned long jElem;
-  int SendRecv, RecvFrom;
-  
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
-  
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  unsigned short kind_SU2 = config->GetKind_SU2();
-  
-  int *Conn_Elem = NULL;
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
-  switch (Elem_Type) {
-    case TRIANGLE:
-      nLocalElem = geometry->GetnElemTria();
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      nLocalElem = geometry->GetnElemQuad();
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    case TETRAHEDRON:
-      nLocalElem = geometry->GetnElemTetr();
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      nLocalElem = geometry->GetnElemHexa();
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      nLocalElem = geometry->GetnElemPris();
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      nLocalElem = geometry->GetnElemPyra();
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      nLocalElem = 0;
-      NODES_PER_ELEMENT = 0;
-      break;
-  }
-  
-  /*--- Find the max number of this element type among all
-   partitions and set up buffers. ---*/
-  
-  Buffer_Send_nElem[0] = nLocalElem;
-  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalElem = nLocalElem;
-  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
-#endif
-  
-  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
-  
-  /*--- Send and Recv buffers ---*/
-  
-  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
-  unsigned long *Buffer_Recv_Elem = NULL;
-  
-  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
-  unsigned short *Buffer_Recv_Halo = NULL;
-  
-  /*--- Prepare the receive buffers on the master node only. ---*/
-  
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
-    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
-    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that we part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (kind_SU2 != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found ---*/
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+    /*--- Flags identifying the types of files to be written. ---*/
+    
+    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
+    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
+    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
+    
+    /*--- Merge the node coordinates and connectivity if necessary. This
+     is only performed if a volume solution file is requested, and it
+     is active by default. ---*/
+    
+    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
+    MergeConnectivity(config[iZone], geometry[iZone], iZone);
+    
+    /*--- Merge coordinates of all grid nodes (excluding ghost points).
+     The grid coordinates are always merged and included first in the
+     restart files. ---*/
+    
+    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
+    MergeCoordinates(config[iZone], geometry[iZone]);
+    
+    /*--- Write restart, Tecplot or Paraview files using the merged data.
+     This data lives only on the master, and these routines are currently
+     executed by the master proc alone (as if in serial). ---*/
+    
+    if (rank == MASTER_NODE) {
       
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
+      if (Wrt_Vol) {
         
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
+        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
         
-        if (kind_SU2 == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        /*--- Write a Tecplot ASCII file ---*/
+
+        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
+          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
         }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
+          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
         }
         
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
       }
-    }
-  }
-  
-  /*--- Loop over all elements in this partition and load the
-   elements of the current type into the buffer to be sent to
-   the master node. ---*/
-  
-  jNode = 0; jElem = 0;
-  for (iElem = 0; iElem < geometry->GetnElem(); iElem++) {
-    if (geometry->elem[iElem]->GetVTK_Type() == Elem_Type) {
       
-      /*--- Loop over all nodes in this element and load the
-       connectivity into the send buffer. ---*/
-      
-      Buffer_Send_Halo[jElem] = false;
-      for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-        
-        /*--- Store the global index values directly. ---*/
+      if (Wrt_Srf) {
         
-        iPoint = geometry->elem[iElem]->GetNode(iNode);
-        Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
+        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
         
-        /*--- Check if this is a halo node. If so, flag this element
-         as a halo cell. We will use this later to sort and remove
-         any duplicates from the connectivity list. ---*/
+        /*--- Write a Tecplot ASCII file ---*/
         
-        if (Local_Halo[iPoint]) {
-          Buffer_Send_Halo[jElem] = true;
+        if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
+          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
+        }
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
+        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
+          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
+          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
         }
         
-        /*--- Increment jNode as the counter. We need this because iElem
-         may include other elements that we skip over during this loop. ---*/
+      }
+      
+      /*--- Write a .su2 ASCII file ---*/
+
+      if (su2_file) {
+
+      if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
+
+        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
+      
+      /*--- Write an stl surface file ---*/
+
+      if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
+      
+        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
         
-        jNode++;
       }
-      jElem++;
-    }
-  }
-  
-  /*--- Gather the element connectivity information. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
-  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
-#endif
-  
-  /*--- The master node unpacks and sorts the connectivity. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*---  We need to remove any duplicate elements (halo cells) that
-     exist on multiple partitions. Start by initializing all elements
-     to the "write" state by using a boolean array. ---*/
-    
-    Write_Elem = new bool[size*MaxLocalElem];
-    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
-      Write_Elem[iElem] = true;
-    }
-    
-    /*--- Remove the rind layer from the solution only if requested ---*/
-    
-    if (!Wrt_Halo) {
       
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
+      /*--- Write a binary file with the grid coordinates alone. ---*/
       
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-          
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
-          
-        }
-        kElem = (iProcessor+1)*MaxLocalElem;
+      if (Wrt_Crd) {
+        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
+        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
       }
+
+      
+      /*--- Deallocate connectivity ---*/
+      
+      DeallocateConnectivity(config[iZone], geometry[iZone], true);
+      DeallocateConnectivity(config[iZone], geometry[iZone], false);
+      DeallocateCoordinates(config[iZone], geometry[iZone]);
+      
     }
+
+    /*--- Final broadcast (informing other procs that the base output
+     file was written). ---*/
     
-    /*--- Store the unique connectivity list for this element type. ---*/
+#ifdef HAVE_MPI
+    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+#endif
     
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-        
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
-          
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
-          
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
-          
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
-          }
-        }
-      }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] Local_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
+    /*--- Write an csv surface file, done in parallel ---*/
+
+    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
+
+    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
+
   }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
+
   if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case TRIANGLE:
-        nGlobal_Tria = nElem_Total;
-        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_Quad = nElem_Total;
-        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
-        break;
-      case TETRAHEDRON:
-        nGlobal_Tetr = nElem_Total;
-        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
-        break;
-      case HEXAHEDRON:
-        nGlobal_Hexa = nElem_Total;
-        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
-        break;
-      case PRISM:
-        nGlobal_Pris = nElem_Total;
-        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
-        break;
-      case PYRAMID:
-        nGlobal_Pyra = nElem_Total;
-        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-        break;
+    if (su2_file){
+      output_file.close();
     }
   }
-  
 }
 
-void COutput::MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  unsigned short NODES_PER_ELEMENT;
-  
-  unsigned short iMarker;
-  unsigned long iPoint, iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
-  
-  int iProcessor;
-  unsigned long jElem;
-  
-  unsigned long iVertex;
-  
-  int SendRecv, RecvFrom;
-  
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0, iGlobal_Index, jPoint, kPoint;
-  
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL, notPeriodic, notHalo, addedPeriodic;
-  
-  
-  int *Conn_Elem = NULL;
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
-  nLocalElem = 0;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
-        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
-          nLocalElem++;
+void COutput::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
+
+  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
+  unsigned long iVertex, iPoint, nPoint, nVertex;
+  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
+
+  unsigned short iZone;
+
+  CSolver ***solver = new CSolver**[val_nZone];
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    solver[iZone] = new CSolver*[1];
+  }
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+
+    nPoint = geometry[iZone][INST_0]->GetnPoint();
+    nDim   = geometry[iZone][INST_0]->GetnDim();
+    nMarker = config[iZone]->GetnMarker_All();
+    nVar = nDim + 1;
+
+    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
+
+    vector<string> fieldnames;
+    fieldnames.push_back("\"Point\"");
+    fieldnames.push_back("\"x\"");
+    fieldnames.push_back("\"y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"z\"");
+    }
+    fieldnames.push_back("\"Sensitivity_x\"");
+    fieldnames.push_back("\"Sensitivity_y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"Sensitivity_z\"");
+    }
+    fieldnames.push_back("\"Surface_Sensitivity\"");
+
+    solver[iZone][INST_0] = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
+
+    for (iPoint = 0; iPoint < nPoint; iPoint++) {
+      for (iDim = 0; iDim < nDim; iDim++) {
+        solver[iZone][INST_0]->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
+      }
+      for (iVar = 0; iVar < nDim; iVar++) {
+        solver[iZone][INST_0]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
+      }
+    }
+
+    /*--- Compute the sensitivity in normal direction ---*/
+
+    for (iMarker = 0; iMarker < nMarker; iMarker++) {
+
+      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX )   ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL )  ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL )  ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
+        
+        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
+
+        for (iVertex = 0; iVertex < nVertex; iVertex++) {
+          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
+          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
+          Prod = 0.0;
+          Area = 0.0;
+          for (iDim = 0; iDim < nDim; iDim++) {
+
+            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
+
+            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
+
+            /*--- Calculate scalar product for projection onto the normal vector ---*/
+
+            Prod += Normal[iDim]*SensDim;
+
+            Area += Normal[iDim]*Normal[iDim];
+          }
+
+          Area = sqrt(Area);
+
+          /*--- Projection of the gradient onto the normal vector of the surface ---*/
+
+          Sens = Prod/Area;
+
+          solver[iZone][INST_0]->node[iPoint]->SetSolution(2*nDim, Sens);
+
         }
       }
     }
   }
-  
-  switch (Elem_Type) {
-    case LINE:
-      NODES_PER_ELEMENT = N_POINTS_LINE;
-      break;
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      NODES_PER_ELEMENT = 0;
-      break;
+
+  /*--- Merge the information and write the output files ---*/
+
+  SetBaselineResult_Files(solver, geometry, config, 0, val_nZone);
+
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    delete solver[iZone][0];
+    delete solver[iZone];
   }
+  delete [] solver;
+}
+
+
+void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
+                                       CGeometry ****geometry,
+                                       CConfig **config,
+                                       unsigned long iExtIter,
+                                       unsigned short iZone,
+                                       unsigned short val_nZone) {
   
-  /*--- Find the max number of this element type among all
-   partitions and set up buffers. ---*/
-  
-  Buffer_Send_nElem[0] = nLocalElem;
-  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
+  unsigned short iVar, iInst;
+  unsigned long iPoint;
   
+  unsigned short nInst = config[iZone]->GetnTimeInstances();
+
+    /*--- Get the file output format ---*/
+    
+    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    
+    for (iInst = 0; iInst < nInst; iInst++){
+
+      config[iZone]->SetiInst(iInst);
+      
+      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
+      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
+
+      /*--- Flags identifying the types of files to be written. ---*/
+      /*--- For now, we are disabling the parallel writers for Tecplot
+          ASCII until we have parallel versions of all file formats
+          available. SU2_SOL will remain intact for writing files
+          until this capability is completed. ---*/
+
+      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
+      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalElem = nLocalElem;
-  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+      /*--- Do not merge the connectivity or write the visualization files
+     if we are running in parallel, unless we are using ParaView binary.
+       Force the use of SU2_SOL to merge and write the viz. files in this
+       case to save overhead. ---*/
+
+      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY) && (FileFormat != TECPLOT_BINARY)) {
+        Wrt_Vol = false;
+        Wrt_Srf = false;
+      }
 #endif
-  
-  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
-  
-  /*--- Send and Recv buffers ---*/
-  
-  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
-  unsigned long *Buffer_Recv_Elem = NULL;
-  
-  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
-  unsigned short *Buffer_Recv_Halo = NULL;
-  
-  /*--- Prepare the receive buffers on the master node only. ---*/
-  
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
-    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
-    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that we part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-            (SendRecv < 0)) {
-          Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-        }
+
+
+
+    /*--- Write a template inlet profile file if requested. ---*/
+
+    if (config[iZone]->GetWrt_InletFile()) {
+      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
+
+      if (rank == MASTER_NODE) {
+        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
       }
+      config[iZone]->SetWrt_InletFile(false);
     }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found ---*/
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++) Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
+
+    /*--- This switch statement will become a call to a virtual function
+     defined within each of the "physics" output child classes that loads
+     the local data for that particular problem alone. ---*/
+
+      if (rank == MASTER_NODE)
+        cout << endl << "Loading solution output data locally on each rank." << endl;
+
+      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
+         
+    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
+
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+
+      if (rank == MASTER_NODE)
+        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
       
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        iGlobal_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain ---*/
-        notPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                       (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
-                       (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (iGlobal_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-      }
-    }
-  }
-  
-  /*--- Loop over all elements in this partition and load the
-   elements of the current type into the buffer to be sent to
-   the master node. ---*/
-  jNode = 0; jElem = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-    if (config->GetMarker_All_Plotting(iMarker) == YES)
-      for (iElem = 0; iElem < geometry->GetnElem_Bound(iMarker); iElem++) {
-        
-        if (geometry->bound[iMarker][iElem]->GetVTK_Type() == Elem_Type) {
-          
-          /*--- Loop over all nodes in this element and load the
-           connectivity into the send buffer. ---*/
-          
-          Buffer_Send_Halo[jElem] = false;
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            
-            /*--- Store the global index values directly. ---*/
-            
-            iPoint = geometry->bound[iMarker][iElem]->GetNode(iNode);
-            Buffer_Send_Elem[jNode] = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Check if this is a halo node. If so, flag this element
-             as a halo cell. We will use this later to sort and remove
-             any duplicates from the connectivity list. ---*/
-            
-            if (Local_Halo[iPoint])
-              Buffer_Send_Halo[jElem] = true;
-            
-            /*--- Increment jNode as the counter. We need this because iElem
-             may include other elements that we skip over during this loop. ---*/
-            
-            jNode++;
-          }
-          jElem++;
-        }
+      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
       }
-  
-  /*--- Gather the element connectivity information. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
-  for (iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
-#endif
-  
-  /*--- The master node unpacks and sorts the connectivity. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*---  We need to remove any duplicate elements (halo cells) that
-     exist on multiple partitions. Start by initializing all elements
-     to the "write" state by using a boolean array. ---*/
-    
-    Write_Elem = new bool[size*MaxLocalElem];
-    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
-      Write_Elem[iElem] = true;
-    }
-    
-    /*--- Remove the rind layer from the solution only if requested ---*/
-    
-    if (!Wrt_Halo) {
-      
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
       
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-          
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
-          
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
         }
-        kElem = (iProcessor+1)*MaxLocalElem;
       }
+      
     }
     
-    /*--- Store the unique connectivity list for this element type. ---*/
-    
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-        
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
-          
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
-          
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
-          
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
-          }
-        }
-      }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] Local_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
-  }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case LINE:
-        nGlobal_Line = nElem_Total;
-        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
-        break;
-      case TRIANGLE:
-        nGlobal_BoundTria = nElem_Total;
-        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_BoundQuad = nElem_Total;
-        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-        break;
-    }
-  }
-  
-}
+    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
 
-void COutput::MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
-  
-  /*--- Local variables needed on all processors ---*/
-  unsigned short iVar;
-  unsigned long iPoint = 0, jPoint = 0;
-  
-  nVar_Total = config->fields.size() - 1;
-  
-  /*--- Merge the solution either in serial or parallel. ---*/
-  
-#ifndef HAVE_MPI
-  
-  /*--- In serial, the single process has access to all solution data,
-   so it is simple to retrieve and store inside Solution_Data. ---*/
-  
-  unsigned short iMarker;
-  unsigned long iVertex, nTotalPoints = 0;
-  int SendRecv;
-  
-  /*--- First, create a structure to locate any periodic halo nodes ---*/
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-            (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1) &&
-            (SendRecv < 0)) {
-          Local_Halo[iPoint] = false;
+    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
+        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+
+      if (rank == MASTER_NODE)
+        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
+      
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
         }
       }
       
-    }
-  }
-  
-  /*--- Total number of points in the mesh (this might include periodic points). ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (!Local_Halo[iPoint]) nTotalPoints++;
-  
-  nGlobal_Poin = nTotalPoints;
-  Data = new su2double*[nVar_Total];
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    Data[iVar] = new su2double[nGlobal_Poin];
-  }
-  
-  /*--- Loop over all points in the mesh, but only write data
-   for nodes in the domain (ignore periodic halo nodes). ---*/
-  
-  jPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    if (!Local_Halo[iPoint]) {
-      
-      /*--- Solution (first, and second system of equations) ---*/
+      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
+        delete [] Local_Data_Copy[iPoint];
+      delete [] Local_Data_Copy;
       
-      unsigned short jVar = 0;
-      for (iVar = 0; iVar < nVar_Total; iVar++) {
-        Data[jVar][jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        jVar++;
-      }
     }
     
-    /*--- Increment jPoint as the counter. We need this because iPoint
-     may include halo nodes that we skip over during this loop. ---*/
-    
-    jPoint++;
+    /*--- After loading the data local to a processor, we perform a sorting,
+     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
     
-  }
-  
-#else
-  
-  /*--- MPI preprocessing ---*/
-  
-  int nProcessor = size, iProcessor;
-  
-  /*--- Local variables needed for merging with MPI ---*/
-  
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-  
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  bool Wrt_Halo = config->GetWrt_Halo(), isPeriodic;
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-  
-  if (Wrt_Halo) {
-    nLocalPoint = geometry->GetnPoint();
-  } else {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo[iPoint] = false;
-        }
-      }
+    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
+    if (fem_output){
+      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+    }
+    else {
+      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
     }
     
-    /*--- Sum total number of nodes that belong to the domain ---*/
-    
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-    
-  }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-  
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[nProcessor];
-  
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  nBuffer_Scalar = MaxLocalPoint;
-  
-  /*--- Send and Recv buffers. ---*/
-  
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
-  
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-  
-  /*--- Prepare the receive buffers in the master node only. ---*/
-  if (rank == MASTER_NODE) {
-    
-    Buffer_Recv_Var = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-    
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
-    
-  }
-  
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-  
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
-    
-    /*--- Loop over this partition to collect the current variable ---*/
-    jPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      
-      /*--- Check for halos and write only if requested ---*/
-      if (!Local_Halo[iPoint] || Wrt_Halo) {
-        
-        /*--- Get this variable into the temporary send buffer. ---*/
-        Buffer_Send_Var[jPoint] = solver->node[iPoint]->GetSolution(iVar);
-        
-        /*--- Only send/recv the volumes & global indices during the first loop ---*/
-        if (iVar == 0) {
-          Buffer_Send_GlobalIndex[jPoint] = geometry->node[iPoint]->GetGlobalIndex();
-        }
-        jPoint++;
-      }
-    }
-    
-    /*--- Gather the data on the master node. ---*/
-    
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-    if (iVar == 0) {
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-    }
-    
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
-          
-          /*--- Get global index, then loop over each variable and store ---*/
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-          jPoint++;
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-  }
-  
-  /*--- Immediately release the temporary buffers. ---*/
-  
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
-  
-#endif
-  
-  delete [] Local_Halo;
-  
-}
+    /*--- Write either a binary or ASCII restart file in parallel. ---*/
 
-void COutput::SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-  
-  /*--- Local variables ---*/
-  
-  unsigned short nZone = geometry->GetnZone();
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar, iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool grid_movement = config->GetGrid_Movement();
-  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  ofstream restart_file;
-  ofstream meta_file;
-  string filename, meta_filename;
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  
-  /*--- Retrieve filename from config ---*/
-  
-  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
-  
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
-  
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()));
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  }
-  
-  /*--- Open the restart file and write the solution. ---*/
-  
-  restart_file.open(filename.c_str(), ios::out);
-  restart_file.precision(15);
-  
-  /*--- Write the header line based on the particular solver ----*/
-  
-  restart_file << "\"PointID\"";
-  
-  /*--- Mesh coordinates are always written to the restart first ---*/
-  
-  if (nDim == 2) {
-    restart_file << "\t\"x\"\t\"y\"";
-  } else {
-    restart_file << "\t\"x\"\t\"y\"\t\"z\"";
-  }
-  
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-  if (( Kind_Solver == FEM_ELASTICITY ) || ( Kind_Solver == DISC_ADJ_FEM))
-      restart_file << "\t\"Displacement_" << iVar+1<<"\"";
-    else
-      restart_file << "\t\"Conservative_" << iVar+1<<"\"";
-  }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
-      }
-    }
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Residual_" << iVar+1<<"\"";
-      }
-    }
-    
-    /*--- Mesh velocities for dynamic mesh cases ---*/
-    
-    if (grid_movement && !fem) {
-      if (nDim == 2) {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
-      } else {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
-      }
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
-      } else
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-      } else {
-        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
-        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
-      }
-    }
-    
-    if (Kind_Solver == RANS) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Eddy_Viscosity\"";
-      } else
-        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
-    }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        restart_file << "\t\"Sharp_Edge_Dist\"";
-      }
-    }
-    
-    if ((Kind_Solver == ADJ_EULER              ) ||
-        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        (Kind_Solver == ADJ_RANS               )   ) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
-    }
-    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_RANS               )) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
-      if (geometry->GetnDim() == 3) {
-        restart_file << "\t\"Sensitivity_z\"";
-      }
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      if (!dynamic_fem) {
-        if (geometry->GetnDim() == 2)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        if (geometry->GetnDim() == 3)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-      }
-      else if (dynamic_fem) {
-        if (geometry->GetnDim() == 2) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        }
-        if (geometry->GetnDim() == 3) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-        }
-      }
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      if (geometry->GetnDim() == 2)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
-      if (geometry->GetnDim() == 3)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
+    if (config[iZone]->GetWrt_Binary_Restart()) {
+      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
+      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+    } else {
+      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
+      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
     }
 
-    
-    if (config->GetExtraOutput()) {
-      string *headings = NULL;
-      //if (Kind_Solver == RANS) {
-      headings = solver[TURB_SOL]->OutputHeadingNames;
-      //}
-      
-      for (iVar = 0; iVar < nVar_Extra; iVar++) {
-        if (headings == NULL) {
-          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
-        } else {
-          restart_file << "\t\""<< headings[iVar] <<"\"";
-        }
-      }
-    }
-  }
-  
-  restart_file << "\n";
-  
-  /*--- Write the restart file ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetGlobal_nPointDomain(); iPoint++) {
-    
-    /*--- Index of the point ---*/
-    restart_file << iPoint << "\t";
-    
-    /*--- Write the grid coordinates first ---*/
-    for (iDim = 0; iDim < nDim; iDim++) {
-      restart_file << scientific << Coords[iDim][iPoint] << "\t";
-    }
-    
-    /*--- Loop over the variables and write the values to file ---*/
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      restart_file << scientific << Data[iVar][iPoint] << "\t";
+    /*--- Write a slice on a structured mesh if requested. ---*/
+
+    if (config[iZone]->GetWrt_Slice()) {
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
+      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
+                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
     }
-    restart_file << "\n";
-  }
 
-  /*--- Write the general header and flow conditions ----*/
+    /*--- Write the solution files if they are requested and we are executing
+     with a single rank (all data on one proc and no comm. overhead). Once we
+     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
+     can allow the write of the viz. files as well. ---*/
 
-  if (dual_time)
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-  else
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-  restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-  restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-  restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-  restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-  restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-  restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-  restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-  if (adjoint) restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-
-  /*--- Close the data portion of the restart file. ---*/
+    if ((Wrt_Vol || Wrt_Srf) && !fem_output) {
+      
+      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
 
-  restart_file.close();
+      if (rank == MASTER_NODE)
+        cout << "Preparing element connectivity across all ranks." << endl;
+     if (fem_output){
+       
+       SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
+       
+       /*--- Sort the surface data and renumber if for writing. ---*/
+ 
+       SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
+       
+     } else {
+       if (FileFormat == TECPLOT_BINARY)
+         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, false);
+       else
+         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, true);
+       
+       /*--- Sort the surface data and renumber if for writing. ---*/
+ 
+       SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
+       
+     }
+     
+     /*--- Write out CSV files in parallel for flow and adjoint. ---*/
+     
+     if (config[iZone]->GetWrt_Csv_Sol()){
+     
+       if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
+     
+       WriteSurface_CSV(config[iZone], geometry[iZone][iInst][MESH_0]);
+     
+     }
+      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
 
-}
+      if (Wrt_Vol) {
 
-void COutput::DeallocateCoordinates(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  
-  /*--- The master node alone owns all data found in this routine. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for coordinate data ---*/
-    
-    for (iDim = 0; iDim < nDim; iDim++) {
-      delete [] Coords[iDim];
-    }
-    delete [] Coords;
-  }
-}
+        switch (FileFormat) {
 
-void COutput::DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol) {
+          case TECPLOT:
 
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for connectivity data ---*/
-    if (surf_sol) {
-      if (nGlobal_Line > 0      && Conn_Line      != NULL) delete [] Conn_Line;
-      if (nGlobal_BoundTria > 0 && Conn_BoundTria != NULL) delete [] Conn_BoundTria;
-      if (nGlobal_BoundQuad > 0 && Conn_BoundQuad != NULL) delete [] Conn_BoundQuad;
-    }
-    else {
-      if (nGlobal_Tria > 0 && Conn_Tria != NULL) delete [] Conn_Tria;
-      if (nGlobal_Quad > 0 && Conn_Quad != NULL) delete [] Conn_Quad;
-      if (nGlobal_Tetr > 0 && Conn_Tetr != NULL) delete [] Conn_Tetr;
-      if (nGlobal_Hexa > 0 && Conn_Hexa != NULL) delete [] Conn_Hexa;
-      if (nGlobal_Pris > 0 && Conn_Pris != NULL) delete [] Conn_Pris;
-      if (nGlobal_Pyra > 0 && Conn_Pyra != NULL) delete [] Conn_Pyra;
-      
-    }
-    
-  }
-}
+            /*--- Write a Tecplot ASCII file ---*/
 
-void COutput::DeallocateSolution(CConfig *config, CGeometry *geometry) {
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+            break;
 
-  /*--- The master node alone owns all data found in this routine. ---*/
-  if (rank == MASTER_NODE) {
-    
-    /*--- Deallocate memory for solution data ---*/
-    for (unsigned short iVar = 0; iVar < nVar_Total; iVar++) {
-      delete [] Data[iVar];
-    }
-    delete [] Data;
-    
-  }
-}
+          case FIELDVIEW:
 
-void COutput::SetConvHistory_Body(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
+            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
 
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
 
-  /*--- Output using only the master node ---*/
+            break;
 
-  if (rank == MASTER_NODE) {
+          case TECPLOT_BINARY:
 
-    bool write_header, write_history, write_screen;
+          /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
 
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-
-    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
-                    timeused, val_iZone, val_iInst);
-    
-    Postprocess_HistoryData(config[val_iZone], DualTime_Iteration);
-        
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
-    if (write_history) SetHistoryFile_Output(config[val_iZone]);
-
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = WriteScreen_Header(config[val_iZone]);
-    if (write_header) SetScreen_Header(config[val_iZone]);
-
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
-    if (write_screen) SetScreen_Output(config[val_iZone]);
-
-  }
-
-}
-
-void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
-  
-  su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
-  unsigned short iMesh;
-  
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
-  unsigned short nVar = 1;
-
-  bool energy = config[val_iZone]->GetEnergy_Equation();
-  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-    case EULER : case NAVIER_STOKES : case RANS:
-      if (energy) {
-        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-      }
-      else if (weakly_coupled_heat) {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      }
-      else {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-      }
-      break;
-    case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-      break;
-    case HEAT_EQUATION_FVM:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-      break;
-  }
-  
-  if (RhoRes_New < EPS) RhoRes_New = EPS;
-  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
-
-  Div = RhoRes_Old[val_iZone]/RhoRes_New;
-  Diff = RhoRes_New-RhoRes_Old[val_iZone];
-
-  /*--- Compute MG factor ---*/
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
-    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
-  }
-
-  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
-  else power = config[val_iZone]->GetCFL_AdaptParam(1);
-
-  /*--- Detect a stall in the residual ---*/
-
-  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
-
-  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
-  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
-
-  CFLFactor = pow(Div, power);
-
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    CFL = config[val_iZone]->GetCFL(iMesh);
-    CFL *= CFLFactor;
-
-    if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
-      }
-      break;
-    }
-    if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
-      break;
-    }
-
-    config[val_iZone]->SetCFL(iMesh, CFL);
-  }
-
-  switch( config[val_iZone]->GetKind_Solver()) {
-  case EULER : case NAVIER_STOKES : case RANS:
-    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
-    break;
-  case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
-    break;
-  case HEAT_EQUATION_FVM:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    break;
-  }
-  
-}
-
-void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                      unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone, iInst, nInst;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    nInst = config[iZone]->GetnTimeInstances();
-
-    for (iInst = 0; iInst < nInst; iInst++) {
-
-      config[iZone]->SetiInst(iInst);
-
-      /*--- Flags identifying the types of files to be written. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-
-      /*--- Get the file output format ---*/
-
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-
-      /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
-      }
-
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-      }
-
-      /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-
-
-      if (rank == MASTER_NODE) {
-
-        if (Wrt_Vol) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- Write a FieldView ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
-            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
+          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
+          WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                                      iZone, val_nZone, false);
             break;
 
           case FIELDVIEW_BINARY:
 
-            /*--- Write a binary binary file ---*/
+            /*--- FieldView binary files not yet available for parallel output. ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
+            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
             break;
 
           case PARAVIEW:
 
             /*--- Write a Paraview ASCII file ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+            break;
+            
+          case PARAVIEW_BINARY:
+            
+            /*--- Write a Paraview binary file ---*/
+            
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
+            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, false);
             break;
 
           default:
@@ -2323,2330 +1293,325 @@ void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry,
 
             /*--- Write a Tecplot ASCII file ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
             break;
 
           case TECPLOT_BINARY:
 
-            /*--- Write a Tecplot binary solution file ---*/
+            /*--- Write a Tecplot binary file ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
-            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
+            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
+            WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                iZone, val_nZone, true);
             break;
 
           case PARAVIEW:
 
             /*--- Write a Paraview ASCII file ---*/
 
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
+            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+            break;
+
+          case PARAVIEW_BINARY:
+            
+            /*--- Write a Paraview binary file ---*/
+            
+            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
+            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
+                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, true);
             break;
+            
 
           default:
             break;
           }
-        }
 
-        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
-          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
         }
 
-        if (FileFormat == TECPLOT_BINARY) {
-          if (!wrote_base_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-          if (!wrote_surf_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-        }
+        /*--- Clean up the connectivity data that was allocated for output. ---*/
 
-        if (Wrt_Vol || Wrt_Srf)
-          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-      }
+        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
+        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
+
+        /*--- Clean up the surface data that was only needed for output. ---*/
 
+        DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
+      }
 
-      /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
+      /*--- Deallocate the nodal data needed for writing restarts. ---*/
 
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
+      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
 
     }
 
-  }
 }
 
-void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
-
-  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-  unsigned short iZone;
-  ofstream output_file;
-  string str;
-
-  /*--- Read the name of the output and input file ---*/
-
-  if (su2_file) {
-  if (rank == MASTER_NODE) {
-      str = config[ZONE_0]->GetMesh_Out_FileName();
-      strcpy (out_file, str.c_str());
-      strcpy (cstr, out_file);
-      output_file.precision(15);
-      output_file.open(cstr, ios::out);
-      if (val_nZone > 1){
-        output_file << "NZONE= " << val_nZone << endl;
-      }
-    }
-  }
+void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool val_sort) {
 
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
-    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
-    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
-    
-    /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
-    MergeConnectivity(config[iZone], geometry[iZone], iZone);
+  /*--- Flags identifying the types of files to be written. ---*/
+  
+  bool Wrt_Vol = config->GetWrt_Vol_Sol();
+  bool Wrt_Srf = config->GetWrt_Srf_Sol();
+  
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+  
+  if (Wrt_Vol) {
     
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting volumetric grid connectivity." << endl;
     
-    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone]);
+    SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
+    SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
+    SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
+    SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
+    SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
+    SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);
     
-    /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
+  }
+  
+  /*--- Sort surface grid connectivity. ---*/
+  
+  if (Wrt_Srf) {
     
-    if (rank == MASTER_NODE) {
-      
-      if (Wrt_Vol) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        }
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-        
-        if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        }
-        
-      }
-      
-      /*--- Write a .su2 ASCII file ---*/
-
-      if (su2_file) {
-
-      if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
-
-        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
-      
-      /*--- Write an stl surface file ---*/
-
-      if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
-      
-        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
-        
-      }
-      
-      /*--- Write a binary file with the grid coordinates alone. ---*/
-      
-      if (Wrt_Crd) {
-        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
-        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
-      }
-
-      
-      /*--- Deallocate connectivity ---*/
-      
-      DeallocateConnectivity(config[iZone], geometry[iZone], true);
-      DeallocateConnectivity(config[iZone], geometry[iZone], false);
-      DeallocateCoordinates(config[iZone], geometry[iZone]);
-      
-    }
-
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting surface grid connectivity." << endl;
     
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
+    SortSurfaceConnectivity(config, geometry, LINE         );
+    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
     
-    /*--- Write an csv surface file, done in parallel ---*/
-
-    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
-
-    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
-
-  }
-
-  if (rank == MASTER_NODE) {
-    if (su2_file){
-      output_file.close();
-    }
   }
+  
+  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  
+  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+  nSurf_Elem_Par   = nTotal_Surf_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
 }
 
-void COutput::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
-
-  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
-  unsigned long iVertex, iPoint, nPoint, nVertex;
-  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
-
-  unsigned short iZone;
+void COutput::SortVolumetricConnectivity(CConfig *config,
+                                         CGeometry *geometry,
+                                         unsigned short Elem_Type,
+                                         bool val_sort) {
+  
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT = 0;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
+  
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
 
-  CSolver ***solver = new CSolver**[val_nZone];
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    solver[iZone] = new CSolver*[1];
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
   }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-    nPoint = geometry[iZone][INST_0]->GetnPoint();
-    nDim   = geometry[iZone][INST_0]->GetnDim();
-    nMarker = config[iZone]->GetnMarker_All();
-    nVar = nDim + 1;
-
-    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
-
-    vector<string> fieldnames;
-    fieldnames.push_back("\"Point\"");
-    fieldnames.push_back("\"x\"");
-    fieldnames.push_back("\"y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"z\"");
-    }
-    fieldnames.push_back("\"Sensitivity_x\"");
-    fieldnames.push_back("\"Sensitivity_y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"Sensitivity_z\"");
-    }
-    fieldnames.push_back("\"Surface_Sensitivity\"");
-
-    solver[iZone][INST_0] = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
-
-    for (iPoint = 0; iPoint < nPoint; iPoint++) {
-      for (iDim = 0; iDim < nDim; iDim++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
-      }
-      for (iVar = 0; iVar < nDim; iVar++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
       }
     }
-
-    /*--- Compute the sensitivity in normal direction ---*/
-
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX )   ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL )  ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL )  ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
         
-        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
-
-        for (iVertex = 0; iVertex < nVertex; iVertex++) {
-          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
-          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
-          Prod = 0.0;
-          Area = 0.0;
-          for (iDim = 0; iDim < nDim; iDim++) {
-
-            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
-
-            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
-
-            /*--- Calculate scalar product for projection onto the normal vector ---*/
-
-            Prod += Normal[iDim]*SensDim;
-
-            Area += Normal[iDim]*Normal[iDim];
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
           }
-
-          Area = sqrt(Area);
-
-          /*--- Projection of the gradient onto the normal vector of the surface ---*/
-
-          Sens = Prod/Area;
-
-          solver[iZone][INST_0]->node[iPoint]->SetSolution(2*nDim, Sens);
-
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
         }
+        
       }
     }
   }
-
-  /*--- Merge the information and write the output files ---*/
-
-  SetBaselineResult_Files(solver, geometry, config, 0, val_nZone);
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    delete solver[iZone][0];
-    delete solver[iZone];
-  }
-  delete [] solver;
-}
-
-
-void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
-                                       CGeometry ****geometry,
-                                       CConfig **config,
-                                       unsigned long iExtIter,
-                                       unsigned short iZone,
-                                       unsigned short val_nZone) {
   
-  unsigned short iVar, iInst;
-  unsigned long iPoint;
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
   
-  unsigned short nInst = config[iZone]->GetnTimeInstances();
-
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
-    for (iInst = 0; iInst < nInst; iInst++){
-
-      config[iZone]->SetiInst(iInst);
-      
-      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
-
-      /*--- Flags identifying the types of files to be written. ---*/
-      /*--- For now, we are disabling the parallel writers for Tecplot
-          ASCII until we have parallel versions of all file formats
-          available. SU2_SOL will remain intact for writing files
-          until this capability is completed. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+  nLocalPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
 
 #ifdef HAVE_MPI
-      /*--- Do not merge the connectivity or write the visualization files
-     if we are running in parallel, unless we are using ParaView binary.
-       Force the use of SU2_SOL to merge and write the viz. files in this
-       case to save overhead. ---*/
-
-      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY) && (FileFormat != TECPLOT_BINARY)) {
-        Wrt_Vol = false;
-        Wrt_Srf = false;
-      }
-#endif
-
-//    /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-
-//    if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-
-//    switch (config[iZone]->GetKind_Solver()) {
-//      case EULER : case NAVIER_STOKES : case RANS :
-//        if (Wrt_Csv) SetSurfaceCSV_Flow(config[iZone], geometry[iZone][iInst][MESH_0],
-//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-//        break;
-//      case ADJ_EULER : case ADJ_NAVIER_STOKES : case ADJ_RANS :
-//      case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-//        if (Wrt_Csv) SetSurfaceCSV_Adjoint(config[iZone], geometry[iZone][iInst][MESH_0],
-//            solver_container[iZone][iInst][MESH_0][ADJFLOW_SOL],
-//            solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, iInst);
-//        break;
-//      default: break;
-//    }
-
-    /*--- Write a template inlet profile file if requested. ---*/
-
-    if (config[iZone]->GetWrt_InletFile()) {
-      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      if (rank == MASTER_NODE) {
-        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-      }
-      config[iZone]->SetWrt_InletFile(false);
-    }
-
-    /*--- This switch statement will become a call to a virtual function
-     defined within each of the "physics" output child classes that loads
-     the local data for that particular problem alone. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << endl << "Loading solution output data locally on each rank." << endl;
-
-      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-         
-    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
-        }
-      }
-      
-    }
-    
-    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
-        }
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
-        delete [] Local_Data_Copy[iPoint];
-      delete [] Local_Data_Copy;
-      
-    }
-    
-    /*--- After loading the data local to a processor, we perform a sorting,
-     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-    if (fem_output){
-      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-    }
-    else {
-      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
-    }
-    
-    /*--- Write either a binary or ASCII restart file in parallel. ---*/
-
-    if (config[iZone]->GetWrt_Binary_Restart()) {
-      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    } else {
-      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
-    }
-
-    /*--- Write a slice on a structured mesh if requested. ---*/
-
-    if (config[iZone]->GetWrt_Slice()) {
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-    }
-
-    /*--- Write the solution files if they are requested and we are executing
-     with a single rank (all data on one proc and no comm. overhead). Once we
-     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
-     can allow the write of the viz. files as well. ---*/
-
-    if ((Wrt_Vol || Wrt_Srf) && !fem_output) {
-      
-      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Preparing element connectivity across all ranks." << endl;
-     if (fem_output){
-       
-       SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-       
-       /*--- Sort the surface data and renumber if for writing. ---*/
- 
-       SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-       
-     } else {
-       if (FileFormat == TECPLOT_BINARY)
-         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, false);
-       else
-         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, true);
-       
-       /*--- Sort the surface data and renumber if for writing. ---*/
- 
-       SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
-       
-     }
-     
-     /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-     
-     if (config[iZone]->GetWrt_Csv_Sol()){
-     
-       if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-     
-       WriteSurface_CSV(config[iZone], geometry[iZone][iInst][MESH_0]);
-     
-     }
-      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
-
-      if (Wrt_Vol) {
-
-        switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-
-            break;
-
-          case TECPLOT_BINARY:
-
-          /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
-
-          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
-          WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                      iZone, val_nZone, false);
-            break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- FieldView binary files not yet available for parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
-            WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                iZone, val_nZone, true);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
-            break;
-
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, true);
-            break;
-            
-
-          default:
-            break;
-          }
-
-        }
-
-        /*--- Clean up the connectivity data that was allocated for output. ---*/
-
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
-
-        /*--- Clean up the surface data that was only needed for output. ---*/
-
-        DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      }
-
-      /*--- Deallocate the nodal data needed for writing restarts. ---*/
-
-      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-    }
-
-}
-
-void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool val_sort) {
-
-  /*--- Flags identifying the types of files to be written. ---*/
-  
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
-  
-  /*--- Sort connectivity for each type of element (excluding halos). Note
-   In these routines, we sort the connectivity into a linear partitioning
-   across all processors based on the global index of the grid nodes. ---*/
-  
-  /*--- Sort volumetric grid connectivity. ---*/
-  
-  if (Wrt_Vol) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting volumetric grid connectivity." << endl;
-    
-    SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
-    SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
-    SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
-    SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
-    SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
-    SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);
-    
-  }
-  
-  /*--- Sort surface grid connectivity. ---*/
-  
-  if (Wrt_Srf) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting surface grid connectivity." << endl;
-    
-    SortSurfaceConnectivity(config, geometry, LINE         );
-    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
-    
-  }
-  
-  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
-  
-  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
-#ifndef HAVE_MPI
-  nGlobal_Elem_Par = nTotal_Elem;
-  nSurf_Elem_Par   = nTotal_Surf_Elem;
-#else
-  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-}
-
-void COutput::SortVolumetricConnectivity(CConfig *config,
-                                         CGeometry *geometry,
-                                         unsigned short Elem_Type,
-                                         bool val_sort) {
-  
-  unsigned long iProcessor;
-  unsigned short NODES_PER_ELEMENT = 0;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
-  unsigned long nElem_Total = 0, Global_Index;
-  
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  int *Local_Halo = NULL;
-  int *Conn_Elem  = NULL;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
-  switch (Elem_Type) {
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    case TETRAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the connectivity distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many elements we must send to each other rank in order to
-   have all elements sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++ ) {
-    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
-      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-        
-        /*--- Get the index of the current point. ---*/
-        
-        iPoint = geometry->elem[ii]->GetNode(jj);
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- Search for the lowest global index in this element. We
-         send the element to the processor owning the range that includes
-         the lowest global index value. ---*/
-        
-        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-          jPoint = geometry->elem[ii]->GetNode(kk);
-          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-          if (newID < Global_Index) Global_Index = newID;
-        }
-        
-        /*--- Search for the processor that owns this point. If we are
-         sorting the elements, we use the linear partitioning to find
-         the rank, otherwise, we simply have the current rank load its
-         own elements into the connectivity data structure. ---*/
-        
-        if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-        } else {
-          iProcessor = rank;
-        }
-        
-        
-        /*--- If we have not visited this element yet, increment our
-         number of elements that must be sent to a particular proc. ---*/
-        
-        if ((nElem_Flag[iProcessor] != ii)) {
-          nElem_Flag[iProcessor] = ii;
-          nElem_Send[iProcessor+1]++;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send connectivities. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  unsigned long *connSend = NULL;
-  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
-  /*--- Create an index variable to keep track of our index
-   position as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
-  
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++) {
-    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
-      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-        
-        /*--- Get the index of the current point. ---*/
-        
-        iPoint = geometry->elem[ii]->GetNode(jj);
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- Search for the lowest global index in this element. We
-         send the element to the processor owning the range that includes
-         the lowest global index value. ---*/
-        
-        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-          jPoint = geometry->elem[ii]->GetNode(kk);
-          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-          if (newID < Global_Index) Global_Index = newID;
-        }
-       
-        /*--- Search for the processor that owns this point. If we are
-         sorting the elements, we use the linear partitioning to find
-         the rank, otherwise, we simply have the current rank load its
-         own elements into the connectivity data structure. ---*/
-        
-        if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-        } else {
-          iProcessor = rank;
-        }
-        
-        
-        /*--- Load connectivity into the buffer for sending ---*/
-        
-        if (nElem_Flag[iProcessor] != ii) {
-          
-          nElem_Flag[iProcessor] = ii;
-          unsigned long nn = index[iProcessor];
-          unsigned long mm = haloIndex[iProcessor];
-          
-          /*--- Load the connectivity values. ---*/
-          
-          for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-            iPoint = geometry->elem[ii]->GetNode(kk);
-            connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
-            
-            /*--- Check if this is a halo node. If so, flag this element
-             as a halo cell. We will use this later to sort and remove
-             any duplicates from the connectivity list. ---*/
-            
-            if (Local_Halo[iPoint]) haloSend[mm] = true;
-            
-          }
-          
-          /*--- Increment the index by the message length ---*/
-          
-          index[iProcessor]    += NODES_PER_ELEMENT;
-          haloIndex[iProcessor]++;
-          
-        }
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] haloIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *connRecv = NULL;
-  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
-  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
-  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. Note that we add 1 here
-   to the connectivity for vizualization packages. First, allocate
-   appropriate amount of memory for this section. ---*/
-  
-  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
-  int count = 0; nElem_Total = 0;
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
-    }
-  }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  switch (Elem_Type) {
-    case TRIANGLE:
-      nParallel_Tria = nElem_Total;
-      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
-      break;
-    case QUADRILATERAL:
-      nParallel_Quad = nElem_Total;
-      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
-      break;
-    case TETRAHEDRON:
-      nParallel_Tetr = nElem_Total;
-      if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
-      break;
-    case HEXAHEDRON:
-      nParallel_Hexa = nElem_Total;
-      if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
-      break;
-    case PRISM:
-      nParallel_Pris = nElem_Total;
-      if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
-      break;
-    case PYRAMID:
-      nParallel_Pyra = nElem_Total;
-      if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      break;
-  }
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
-  delete [] Local_Halo;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic; 
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-
-}
-
-void COutput::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  unsigned long iProcessor;
-  unsigned short NODES_PER_ELEMENT;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
-  unsigned long nElem_Total = 0, Global_Index;
-  
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  int *Local_Halo = NULL;
-  int *Conn_Elem  = NULL;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
-  switch (Elem_Type) {
-    case LINE:
-      NODES_PER_ELEMENT = N_POINTS_LINE;
-      break;
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      NODES_PER_ELEMENT = 0;
-      break;
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the connectivity distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many elements we must send to each other rank in order to
-   have all elements sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      
-      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
-        
-        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
-          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-            
-            /*--- Get the index of the current point. ---*/
-            
-            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
-            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Search for the lowest global index in this element. We
-             send the element to the processor owning the range that includes
-             the lowest global index value. ---*/
-            
-            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-              if (newID < Global_Index) Global_Index = newID;
-            }
-            
-            /*--- Search for the processor that owns this point ---*/
-            
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
-            /*--- If we have not visited this element yet, increment our
-             number of elements that must be sent to a particular proc. ---*/
-            
-            if ((nElem_Flag[iProcessor] != ii)) {
-              nElem_Flag[iProcessor] = ii;
-              nElem_Send[iProcessor+1]++;
-            }
-            
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send connectivities. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  unsigned long *connSend = NULL;
-  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
-  /*--- Create an index variable to keep track of our index
-   position as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
-  
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      
-      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
-        
-        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
-          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-            
-            /*--- Get the index of the current point. ---*/
-            
-            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
-            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Search for the lowest global index in this element. We
-             send the element to the processor owning the range that includes
-             the lowest global index value. ---*/
-            
-            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-              if (newID < Global_Index) Global_Index = newID;
-            }
-            
-            /*--- Search for the processor that owns this point ---*/
-            
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
-            /*--- Load connectivity into the buffer for sending ---*/
-            
-            if (nElem_Flag[iProcessor] != ii) {
-              
-              nElem_Flag[iProcessor] = ii;
-              unsigned long nn = index[iProcessor];
-              unsigned long mm = haloIndex[iProcessor];
-              
-              /*--- Load the connectivity values. ---*/
-              
-              for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-                iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-                connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
-                
-                /*--- Check if this is a halo node. If so, flag this element
-                 as a halo cell. We will use this later to sort and remove
-                 any duplicates from the connectivity list. ---*/
-                
-                if (Local_Halo[iPoint]) haloSend[mm] = true;
-                
-              }
-              
-              /*--- Increment the index by the message length ---*/
-              
-              index[iProcessor]    += NODES_PER_ELEMENT;
-              haloIndex[iProcessor]++;
-              
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] haloIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *connRecv = NULL;
-  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
-  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
-  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. Note that we add 1 here
-   to the connectivity for vizualization packages. First, allocate
-   appropriate amount of memory for this section. ---*/
-  
-  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
-  int count = 0; nElem_Total = 0;
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
-    }
-  }
-
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  switch (Elem_Type) {
-    case LINE:
-      nParallel_Line = nElem_Total;
-      if (nParallel_Line > 0) Conn_BoundLine_Par = Conn_Elem;
-      break;
-    case TRIANGLE:
-      nParallel_BoundTria = nElem_Total;
-      if (nParallel_BoundTria > 0) Conn_BoundTria_Par = Conn_Elem;
-      break;
-    case QUADRILATERAL:
-      nParallel_BoundQuad = nElem_Total;
-      if (nParallel_BoundQuad > 0) Conn_BoundQuad_Par = Conn_Elem;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      break;
-  }
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
-  delete [] Local_Halo;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-  
-}
-
-void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
-  
-  unsigned long iProcessor;
-  unsigned long iPoint, Global_Index, nTotalPoint;
-  
-  int VARS_PER_POINT = GlobalField_Counter;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint_Sort;
-#endif
-  
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the grid nodes distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many nodes we must send to each other rank in order to
-   have all nodes sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  int *nPoint_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-    nPoint_Flag[ii]= -1;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
-    
-    /*--- We only write interior points and recovered periodic points. ---*/
-    
-    if (!Local_Halo_Sort[iPoint]) {
-      
-      /*--- Get the global index of the current point. ---*/
-      
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this node yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        nPoint_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-  
-  /*--- Prepare to send coordinates. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
-    
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  su2double *connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for sending the global ID. ---*/
-  
-  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-  
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
-  
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- We only write interior points and recovered periodic points. ---*/
-    
-    if (!Local_Halo_Sort[iPoint]) {
-      
-      /*--- Get the index of the current point. ---*/
-      
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Search for the processor that owns this point. ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-      
-      /*--- Load node coordinates into the buffer for sending. ---*/
-      
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        unsigned long nn = index[iProcessor];
-        
-        /*--- Load the data values. ---*/
-        
-        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-          connSend[nn] = Local_Data[iPoint][kk]; nn++;
-        }
-        
-        /*--- Load the global ID (minus offset) for sorting the
-         points once they all reach the correct processor. ---*/
-        
-        nn = idIndex[iProcessor];
-        idSend[nn] = Global_Index - starting_node[iProcessor];
-        
-        /*--- Increment the index by the message length ---*/
-        
-        index[iProcessor]  += VARS_PER_POINT;
-        idIndex[iProcessor]++;
-        
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] idIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
-  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
-    idRecv[ii] = 0;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the global IDs. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = VARS_PER_POINT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = VARS_PER_POINT*nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = VARS_PER_POINT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = VARS_PER_POINT*nPoint_Recv[rank];
-  int ll = VARS_PER_POINT*nPoint_Send[rank];
-  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nPoint_Recv[rank];
-  ll = nPoint_Send[rank];
-  kk = nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. First, allocate the
-   appropriate amount of memory for this section. ---*/
-  
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
-      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
-    }
-  }
-  
-  /*--- Store the total number of local points my rank has for
-   the current section after completing the communications. ---*/
-  
-  nParallel_Poin = nPoint_Recv[size];
-  
-  /*--- Reduce the total number of points we will write in the output files. ---*/
-
-#ifndef HAVE_MPI
-  nGlobal_Poin_Par = nParallel_Poin;
-#else
-  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] idSend;
-  delete [] idRecv;
-  delete [] nPoint_Recv;
-  delete [] nPoint_Send;
-  delete [] nPoint_Flag;
-
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-  
-}
-
-void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iMarker;
-  unsigned long iProcessor;
-  unsigned long iPoint, jPoint, kPoint, iElem;
-  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
-  
-  int VARS_PER_POINT = GlobalField_Counter;
-  int *Local_Halo = NULL;
-  int iNode, count;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
-  /*---         linear partitions across all procs and the output data     ---*/
-  /*---         for the entire field is similarly linearly partitioned.    ---*/
-  /*---         We need to identify which nodes in the volume data are     ---*/
-  /*---         also surface points. Our first step is to loop over all    ---*/
-  /*---         of the sorted surface connectivity and create a data       ---*/
-  /*---         structure on each proc that can identify the local surf    ---*/
-  /*---         points. Note that the linear partitioning is slightly      ---*/
-  /*---         different between the nodes and elements, so we will       ---*/
-  /*---         have to move between the two systems in this routine.      ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. This is the linear partitioning for nodes. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-  
-  /*--- Sum total number of nodes that belong to the domain ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
 #endif
   
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
+  /*--- Compute the number of points that will be on each processor.
    This is a linear partitioning with the addition of a simple load
    balancing for any remainder points. ---*/
   
   unsigned long *npoint_procs  = new unsigned long[size];
   unsigned long *starting_node = new unsigned long[size];
   unsigned long *ending_node   = new unsigned long[size];
-  
-  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
-  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
   
   unsigned long total_pt_accounted = 0;
   for (int ii = 0; ii < size; ii++) {
@@ -4665,131 +1630,84 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   starting_node[0] = 0;
   ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Nodes[0] = 0;
+  nPoint_Linear[0] = 0;
   for (int ii = 1; ii < size; ii++) {
     starting_node[ii] = ending_node[ii-1];
     ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear_Nodes[size] = nTotalPoint;
-  
-  /*--- Prepare to check and communicate the nodes that each proc has
-   locally from the surface connectivity. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  /*--- Loop through our local line elements and check where each
-   of the grid nodes resides based on global index. ---*/
-  
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Reset out flags and then loop through our local triangle surface
-   elements performing the same check for where each grid node resides. ---*/
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
-      }
-      
-    }
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
   }
+  nPoint_Linear[size] = nTotalPoint;
   
-  /*--- Reset out flags and then loop through our local quad surface
-   elements performing the same check for where each grid node resides. ---*/
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++ ) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+        
+        /*--- Get the index of the current point. ---*/
+        
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
+        
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+        
+        /*--- Search for the processor that owns this point. If we are
+         sorting the elements, we use the linear partitioning to find
+         the rank, otherwise, we simply have the current rank load its
+         own elements into the connectivity data structure. ---*/
+        
+        if (val_sort) {
+          iProcessor = Global_Index/npoint_procs[0];
+          if (iProcessor >= (unsigned long)size)
+            iProcessor = (unsigned long)size-1;
+          if (Global_Index >= nPoint_Linear[iProcessor])
+            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+          else
+            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        } else {
+          iProcessor = rank;
+        }
+        
+        
+        /*--- If we have not visited this element yet, increment our
+         number of elements that must be sent to a particular proc. ---*/
+        
+        if ((nElem_Flag[iProcessor] != ii)) {
+          nElem_Flag[iProcessor] = ii;
+          nElem_Send[iProcessor+1]++;
+        }
+        
       }
-      
     }
   }
   
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
+  /*--- Communicate the number of cells to be sent/recv'd amongst
    all processors. After this communication, each proc knows how
-   many nodes it will receive from each other processor. ---*/
+   many cells it will receive from each other processor. ---*/
   
 #ifdef HAVE_MPI
   SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
@@ -4798,7 +1716,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   nElem_Recv[1] = nElem_Send[1];
 #endif
   
-  /*--- Prepare to send. First check how many
+  /*--- Prepare to send connectivities. First check how many
    messages we will be sending and receiving. Here we also put
    the counters into cumulative storage format to make the
    communications simpler. ---*/
@@ -4814,158 +1732,162 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
     nElem_Recv[ii+1] += nElem_Recv[ii];
   }
   
-  /*--- Allocate arrays for sending the global ID. ---*/
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
   
-  unsigned long *idSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
   
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
+  /*--- Allocate arrays for storing halo flags. ---*/
   
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
   
-  /*--- Now loop back through the local connectivities for the surface
-   elements and load up the global IDs for sending to their home proc. ---*/
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
   
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
-        
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
-        
-        /*--- Load the connectivity values. ---*/
-        
-        idSend[nn] = Global_Index; nn++;
-        
-        /*--- Increment the index by the message length ---*/
-        
-        idIndex[iProcessor]++;
-        
-      }
-      
-    }
-  }
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
   
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
   
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
-        
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
-        
-        /*--- Load the connectivity values. ---*/
-        
-        idSend[nn] = Global_Index; nn++;
-        
-        /*--- Increment the index by the message length ---*/
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
         
-        idIndex[iProcessor]++;
+        /*--- Get the index of the current point. ---*/
         
-      }
-      
-    }
-  }
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
         
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
         
-        /*--- Load the connectivity values. ---*/
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+       
+        /*--- Search for the processor that owns this point. If we are
+         sorting the elements, we use the linear partitioning to find
+         the rank, otherwise, we simply have the current rank load its
+         own elements into the connectivity data structure. ---*/
         
-        idSend[nn] = Global_Index; nn++;
+        if (val_sort) {
+          iProcessor = Global_Index/npoint_procs[0];
+          if (iProcessor >= (unsigned long)size)
+            iProcessor = (unsigned long)size-1;
+          if (Global_Index >= nPoint_Linear[iProcessor])
+            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+          else
+            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        } else {
+          iProcessor = rank;
+        }
         
-        /*--- Increment the index by the message length ---*/
         
-        idIndex[iProcessor]++;
+        /*--- Load connectivity into the buffer for sending ---*/
         
+        if (nElem_Flag[iProcessor] != ii) {
+          
+          nElem_Flag[iProcessor] = ii;
+          unsigned long nn = index[iProcessor];
+          unsigned long mm = haloIndex[iProcessor];
+          
+          /*--- Load the connectivity values. ---*/
+          
+          for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+            iPoint = geometry->elem[ii]->GetNode(kk);
+            connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+            
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. ---*/
+            
+            if (Local_Halo[iPoint]) haloSend[mm] = true;
+            
+          }
+          
+          /*--- Increment the index by the message length ---*/
+          
+          index[iProcessor]    += NODES_PER_ELEMENT;
+          haloIndex[iProcessor]++;
+          
+        }
       }
-      
     }
   }
   
-  /*--- Allocate the memory that we need for receiving the global IDs
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] haloIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
   
-  unsigned long *idRecv = NULL;
-  idRecv = new unsigned long[nElem_Recv[size]];
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
   for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    idRecv[ii] = 0;
+    haloRecv[ii] = false;
   
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
    and the flags for the halo cells. ---*/
   
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
   
-  /*--- Launch the non-blocking recv's for the global IDs. ---*/
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
   unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
   for (int ii=0; ii<size; ii++) {
     if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
       int ll     = nElem_Recv[ii];
@@ -4973,13 +1895,13 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
       int count  = kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
       iMessage++;
     }
   }
   
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
@@ -4987,10 +1909,10 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
       int ll = nElem_Send[ii];
       int kk = nElem_Send[ii+1] - nElem_Send[ii];
       int count  = kk;
-      int dest = ii;
+      int dest   = ii;
       int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
       iMessage++;
     }
   }
@@ -4998,20 +1920,26 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
   
-  int mm = nElem_Recv[rank];
-  int ll = nElem_Send[rank];
-  int kk = nElem_Send[rank+1];
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
   
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  int number = nSends;
+  int number = 2*nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = nRecvs;
+  number = 2*nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -5019,116 +1947,117 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   delete [] recv_req;
 #endif
   
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Each proc now knows which is its local grid nodes from     ---*/
-  /*---         the entire volume solution are part of the surface. We     ---*/
-  /*---         now apply a mask to extract just those points on the       ---*/
-  /*---         surface. We also need to perform a renumbering so that     ---*/
-  /*---         the surface data (nodes and connectivity) have their       ---*/
-  /*---         own global numbering. This is important for writing        ---*/
-  /*---         output files in a later routine.                           ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- Create a local data structure that acts as a mask to extract the
-   set of points within the local set that are on the surface. ---*/
-  
-  int *surfPoint = new int[nParallel_Poin];
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) surfPoint[iPoint] = -1;
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
   
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
-  }
-  
-  /*--- First, add up the number of surface points I have on my rank. ---*/
-  
-  nSurf_Poin_Par = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-    if (surfPoint[iPoint] != -1) {
-      nSurf_Poin_Par++;
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
     }
   }
   
-  /*--- Communicate this number of local surface points to all other
-   processors so that it can be used to create offsets for the new
-   global numbering for the surface points. ---*/
-  
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  
-  for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nSurf_Poin_Par;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-  
-  /*--- Go to cumulative storage format to compute the offsets. ---*/
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
   
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nParallel_Tria = nElem_Total;
+      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nElem_Total;
+      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
+      break;
+    case TETRAHEDRON:
+      nParallel_Tetr = nElem_Total;
+      if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
+      break;
+    case HEXAHEDRON:
+      nParallel_Hexa = nElem_Total;
+      if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
+      break;
+    case PRISM:
+      nParallel_Pris = nElem_Total;
+      if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
+      break;
+    case PYRAMID:
+      nParallel_Pyra = nElem_Total;
+      if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
   }
   
-  /*--- Now that we know the number of local surface points that we have,
-   we can allocate the new data structure to hold these points alone. Here,
-   we also copy the data for those points from our volume data structure. ---*/
+  /*--- Free temporary memory from communications ---*/
   
-  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
-    count = 0;
-    for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
-      if (surfPoint[ii] !=-1) {
-        Parallel_Surf_Data[jj][count] = Parallel_Data[jj][ii];
-        count++;
-      }
-    }
-  }
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic; 
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+
+}
+
+void COutput::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
   
-  /*--- Reduce the total number of surf points we have. This will be
-   needed for writing the surface solution files later. ---*/
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
   
-#ifndef HAVE_MPI
-  nGlobal_Surf_Poin = nSurf_Poin_Par;
-#else
-  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
   
-  /*--- Now that we know every proc's global offset for the number of
-   surface points, we can create the new global numbering. Here, we
-   create a new mapping using two arrays, which will need to be
-   communicated. We use our mask again here.  ---*/
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
   
-  unsigned long *globalP = new unsigned long[nSurf_Poin_Par];
-  unsigned long *renumbP = new unsigned long[nSurf_Poin_Par];
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
   
-  count = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-    if (surfPoint[iPoint] != -1) {
-      globalP[count] = surfPoint[iPoint];
-      renumbP[count] = count + nPoint_Recv[rank];
-      count++;
-    }
-  }
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
   
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 3: Communicate the arrays with the new global surface point   ---*/
-  /*---         numbering to the procs that hold the connectivity for      ---*/
-  /*---         each element. This will be done in two phases. First,      ---*/
-  /*---         we send the arrays around to the other procs based on      ---*/
-  /*---         the linear partitioning for the elems. This gets us        ---*/
-  /*---         most of the way there, however, due to the type of         ---*/
-  /*---         linear partitioning for the elements, there may exist      ---*/
-  /*---         elements that have nodes outside of the linear part.       ---*/
-  /*---         bounds. This is because the elems are distributed based    ---*/
-  /*---         on the node with the smallest global ID.                   ---*/
-  /*--------------------------------------------------------------------------*/
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
   
-  /*--- First, we perform the linear partitioning again as it is done
-   for elements, which is slightly different than for nodes (above). ---*/
+  switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      NODES_PER_ELEMENT = 0;
+      break;
+  }
   
   /*--- Force the removal of all added periodic elements (use global index).
    First, we isolate and create a list of all added periodic points, excluding
@@ -5206,6 +2135,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
    we are also choosing to keep periodic nodes that were part of the original
    domain. We will check the communicated list of added periodic points. ---*/
   
+  Local_Halo = new int[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
     Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
   
@@ -5280,7 +2210,12 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
    This is a linear partitioning with the addition of a simple load
    balancing for any remainder points. ---*/
   
-  total_pt_accounted = 0;
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
   for (int ii = 0; ii < size; ii++) {
     npoint_procs[ii] = nTotalPoint/size;
     total_pt_accounted = total_pt_accounted + npoint_procs[ii];
@@ -5288,7 +2223,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   /*--- Get the number of remainder points after the even division. ---*/
   
-  rem_points = nTotalPoint-total_pt_accounted;
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
   for (unsigned long ii = 0; ii < rem_points; ii++) {
     npoint_procs[ii]++;
   }
@@ -5297,15 +2232,24 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   starting_node[0] = 0;
   ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Elems[0] = 0;
+  nPoint_Linear[0] = 0;
   for (int ii = 1; ii < size; ii++) {
     starting_node[ii] = ending_node[ii-1];
     ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
   }
-  nPoint_Linear_Elems[size] = nTotalPoint;
+  nPoint_Linear[size] = nTotalPoint;
   
-  /*--- Reset our flags and counters ---*/
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
   
   for (int ii=0; ii < size; ii++) {
     nElem_Send[ii] = 0;
@@ -5313,32 +2257,52 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
     nElem_Flag[ii]= -1;
   }
   nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  /*--- Loop through my local surface nodes, find which proc the global
-   value lives on, then communicate the global ID and remumbered value. ---*/
-  
-  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
-    
-    Global_Index = globalP[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-    
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-    
-    if ((nElem_Flag[iProcessor] != ii)) {
-      nElem_Flag[iProcessor] = ii;
-      nElem_Send[iProcessor+1]++;
+
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- If we have not visited this element yet, increment our
+             number of elements that must be sent to a particular proc. ---*/
+            
+            if ((nElem_Flag[iProcessor] != ii)) {
+              nElem_Flag[iProcessor] = ii;
+              nElem_Send[iProcessor+1]++;
+            }
+            
+          }
+        }
+      }
     }
-    
   }
   
   /*--- Communicate the number of cells to be sent/recv'd amongst
@@ -5352,12 +2316,12 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   nElem_Recv[1] = nElem_Send[1];
 #endif
   
-  /*--- Prepare to send. First check how many
+  /*--- Prepare to send connectivities. First check how many
    messages we will be sending and receiving. Here we also put
    the counters into cumulative storage format to make the
    communications simpler. ---*/
   
-  nSends = 0; nRecvs = 0;
+  int nSends = 0, nRecvs = 0;
   for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
   
   for (int ii = 0; ii < size; ii++) {
@@ -5368,79 +2332,117 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
     nElem_Recv[ii+1] += nElem_Recv[ii];
   }
   
-  /*--- Allocate memory to hold the globals that we are
+  /*--- Allocate memory to hold the connectivity that we are
    sending. ---*/
   
-  unsigned long *globalSend = NULL;
-  globalSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    globalSend[ii] = 0;
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
   
-  /*--- Allocate memory to hold the renumbering that we are
-   sending. ---*/
+  /*--- Allocate arrays for storing halo flags. ---*/
   
-  unsigned long *renumbSend = NULL;
-  renumbSend = new unsigned long[nElem_Send[size]];
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
   for (int ii = 0; ii < nElem_Send[size]; ii++)
-    renumbSend[ii] = 0;
+    haloSend[ii] = false;
   
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
   unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
   
-  /*--- Loop back through and load up the buffers for the global IDs
-   and their new renumbering values. ---*/
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
   
-  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
-    
-    Global_Index = globalP[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-    
-    
-    if (nElem_Flag[iProcessor] != ii) {
-      
-      nElem_Flag[iProcessor] = ii;
-      unsigned long nn = index[iProcessor];
-      
-      globalSend[nn] = Global_Index;
-      renumbSend[nn] = renumbP[ii];
-      
-      /*--- Increment the index by the message length ---*/
-      
-      index[iProcessor]++;
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
       
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- Load connectivity into the buffer for sending ---*/
+            
+            if (nElem_Flag[iProcessor] != ii) {
+              
+              nElem_Flag[iProcessor] = ii;
+              unsigned long nn = index[iProcessor];
+              unsigned long mm = haloIndex[iProcessor];
+              
+              /*--- Load the connectivity values. ---*/
+              
+              for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+                iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+                connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+                
+                /*--- Check if this is a halo node. If so, flag this element
+                 as a halo cell. We will use this later to sort and remove
+                 any duplicates from the connectivity list. ---*/
+                
+                if (Local_Halo[iPoint]) haloSend[mm] = true;
+                
+              }
+              
+              /*--- Increment the index by the message length ---*/
+              
+              index[iProcessor]    += NODES_PER_ELEMENT;
+              haloIndex[iProcessor]++;
+              
+            }
+          }
+        }
+      }
     }
   }
   
   /*--- Free memory after loading up the send buffer. ---*/
   
   delete [] index;
+  delete [] haloIndex;
   
-  /*--- Allocate the memory that we need for receiving the
+  /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
   
-  unsigned long *globalRecv = NULL;
-  globalRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    globalRecv[ii] = 0;
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
   
-  unsigned long *renumbRecv = NULL;
-  renumbRecv = new unsigned long[nElem_Recv[size]];
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
   for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    renumbRecv[ii] = 0;
+    haloRecv[ii] = false;
   
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
@@ -5449,39 +2451,39 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   send_req = new SU2_MPI::Request[2*nSends];
   recv_req = new SU2_MPI::Request[2*nRecvs];
   
-  /*--- Launch the non-blocking recv's for the global ID. ---*/
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
-  iMessage = 0;
+  unsigned long iMessage = 0;
   for (int ii=0; ii<size; ii++) {
     if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
       int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
+      int count  = NODES_PER_ELEMENT*kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(globalRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage]));
       iMessage++;
     }
   }
   
-  /*--- Launch the non-blocking sends of the global ID. ---*/
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
     if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
       int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
+      int count  = NODES_PER_ELEMENT*kk;
       int dest = ii;
       int tag    = rank + 1;
-      SU2_MPI::Isend(&(globalSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
                      MPI_COMM_WORLD, &(send_req[iMessage]));
       iMessage++;
     }
   }
   
-  /*--- Launch the non-blocking recv's for the renumbered ID. ---*/
+  /*--- Repeat the process to communicate the halo flags. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
@@ -5491,13 +2493,13 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
       int count  = kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(renumbRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
       iMessage++;
     }
   }
   
-  /*--- Launch the non-blocking sends of the renumbered ID. ---*/
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
@@ -5505,34 +2507,33 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
       int ll = nElem_Send[ii];
       int kk = nElem_Send[ii+1] - nElem_Send[ii];
       int count  = kk;
-      int dest = ii;
+      int dest   = ii;
       int tag    = rank + 1;
-      SU2_MPI::Isend(&(renumbSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
                      MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
       iMessage++;
     }
   }
-  
 #endif
   
-  /*--- Load our own procs data into the buffers directly. ---*/
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
   
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) globalRecv[mm] = globalSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
   
   mm = nElem_Recv[rank];
   ll = nElem_Send[rank];
   kk = nElem_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) renumbRecv[mm] = renumbSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
   
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  number = 2*nSends;
+  int number = 2*nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
@@ -5544,247 +2545,304 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   delete [] recv_req;
 #endif
   
-  /*-- Now update my local connectivitiy for the surface with the new
-   numbering. Create a new mapping for global -> renumber for nodes. Note
-   the adding of 1 back in here for the eventual viz. purposes. ---*/
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
   
-  map<unsigned long,unsigned long> Global2Renumber;
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
-    Renumber2Global[renumbRecv[ii] + 1] = globalRecv[ii];
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
+    }
   }
+
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
   
+  switch (Elem_Type) {
+    case LINE:
+      nParallel_Line = nElem_Total;
+      if (nParallel_Line > 0) Conn_BoundLine_Par = Conn_Elem;
+      break;
+    case TRIANGLE:
+      nParallel_BoundTria = nElem_Total;
+      if (nParallel_BoundTria > 0) Conn_BoundTria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_BoundQuad = nElem_Total;
+      if (nParallel_BoundQuad > 0) Conn_BoundQuad_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
   
-  /*--- The final step is one last pass over all elements to check
-   for points outside of the linear partitions of the elements. Again,
-   note that elems were distributed based on their smallest global ID,
-   so some nodes of the elem may have global IDs lying outside of the
-   linear partitioning. We need to recover the mapping for these
-   outliers. We loop over all local surface elements to find these. ---*/
+  /*--- Free temporary memory from communications ---*/
   
-  vector<unsigned long>::iterator it;
-  vector<unsigned long> outliers;
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
   
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
-  }
+}
+
+void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
   
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  unsigned long iProcessor;
+  unsigned long iPoint, Global_Index, nTotalPoint;
   
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
-  }
+  int VARS_PER_POINT = GlobalField_Counter;
   
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
   
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint_Sort;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
   }
   
-  /*--- Create a unique list of global IDs that fall outside of our procs
-   linear partition. ---*/
+  /*--- Get the number of remainder points after the even division. ---*/
   
-  sort(outliers.begin(), outliers.end());
-  it = unique(outliers.begin(), outliers.end());
-  outliers.resize(it - outliers.begin());
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
   
-  /*--- Now loop over the outliers and communicate to those procs that
-   hold the new numbering for our outlier points. We need to ask for the
-   new numbering from these procs. ---*/
+  /*--- Store the local number of nodes and the beginning/end index ---*/
   
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
   }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  nPoint_Linear[size] = nTotalPoint;
   
-  for (int ii = 0; ii < (int)outliers.size(); ii++) {
-    
-    Global_Index = outliers[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+    nPoint_Flag[ii]= -1;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
     
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
+    /*--- We only write interior points and recovered periodic points. ---*/
     
-    if ((nElem_Flag[iProcessor] != ii)) {
-      nElem_Flag[iProcessor] = ii;
-      nElem_Send[iProcessor+1]++;
+    if (!Local_Halo_Sort[iPoint]) {
+      
+      /*--- Get the global index of the current point. ---*/
+      
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this node yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        nPoint_Send[iProcessor+1]++;
+      }
+      
     }
-    
   }
   
-  /*--- Communicate the number of cells to be sent/recv'd amongst
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
    all processors. After this communication, each proc knows how
    many cells it will receive from each other processor. ---*/
   
 #ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
 #else
-  nElem_Recv[1] = nElem_Send[1];
+  nPoint_Recv[1] = nPoint_Send[1];
 #endif
   
-  /*--- Prepare to send connectivities. First check how many
+  /*--- Prepare to send coordinates. First check how many
    messages we will be sending and receiving. Here we also put
    the counters into cumulative storage format to make the
    communications simpler. ---*/
   
-  nSends = 0; nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
   
   for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
     
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
   }
   
-  delete [] idSend;
-  idSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  su2double *connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
     idSend[ii] = 0;
   
-  /*--- Reset our index variable for reuse. ---*/
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
   
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
   
-  /*--- Loop over the outliers again and load up the global IDs. ---*/
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
   
-  for (int ii = 0; ii < (int)outliers.size(); ii++) {
-    
-    Global_Index = outliers[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
     
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
+    /*--- We only write interior points and recovered periodic points. ---*/
     
-    if ((nElem_Flag[iProcessor] != ii)) {
+    if (!Local_Halo_Sort[iPoint]) {
       
-      nElem_Flag[iProcessor] = ii;
-      unsigned long nn = idIndex[iProcessor];
+      /*--- Get the index of the current point. ---*/
       
-      /*--- Load the global ID values. ---*/
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
       
-      idSend[nn] = Global_Index; nn++;
+      /*--- Search for the processor that owns this point. ---*/
       
-      /*--- Increment the index by the message length ---*/
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
       
-      idIndex[iProcessor]++;
+      /*--- Load node coordinates into the buffer for sending. ---*/
       
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        unsigned long nn = index[iProcessor];
+        
+        /*--- Load the data values. ---*/
+        
+        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+          connSend[nn] = Local_Data[iPoint][kk]; nn++;
+        }
+        
+        /*--- Load the global ID (minus offset) for sorting the
+         points once they all reach the correct processor. ---*/
+        
+        nn = idIndex[iProcessor];
+        idSend[nn] = Global_Index - starting_node[iProcessor];
+        
+        /*--- Increment the index by the message length ---*/
+        
+        index[iProcessor]  += VARS_PER_POINT;
+        idIndex[iProcessor]++;
+        
+      }
     }
   }
   
-  /*--- Allocate the memory that we need for receiving the
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] idIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
   
-  delete [] idRecv;
-  idRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+  su2double *connRecv = NULL;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
     idRecv[ii] = 0;
   
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
+   and the global IDs. ---*/
   
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
   
-  iMessage = 0;
+  unsigned long iMessage = 0;
   for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage]));
       iMessage++;
     }
@@ -5794,91 +2852,46 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
       int dest = ii;
       int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
                      MPI_COMM_WORLD, &(send_req[iMessage]));
       iMessage++;
     }
   }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  number = nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- The procs holding the outlier grid nodes now have the global IDs
-   that they need to have their renumbering shared. ---*/
-  
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-      if (idRecv[ii] == globalP[iPoint]) {
-        idRecv[ii] = renumbP[iPoint];
-      }
-    }
-  }
-  
-  /*--- Now simply reverse the last communication to give the renumbered IDs
-   back to the owner of the outlier points. Note everything is flipped. ---*/
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[nRecvs];
-  recv_req = new SU2_MPI::Request[nSends];
   
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  /*--- Repeat the process to communicate the global IDs. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
       int count  = kk;
-      int dest = ii;
+      int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
       iMessage++;
     }
   }
   
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
   
   iMessage = 0;
   for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
       int count  = kk;
-      int source = ii;
+      int dest   = ii;
       int tag    = rank + 1;
-      SU2_MPI::Isend(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
       iMessage++;
     }
   }
@@ -5886,20 +2899,26 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
   
-  mm = nElem_Send[rank];
-  ll = nElem_Recv[rank];
-  kk = nElem_Recv[rank+1];
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) idSend[mm] = idRecv[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
   
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  number = nRecvs;
+  int number = 2*nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = nSends;
+  number = 2*nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -5907,2911 +2926,2580 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   delete [] recv_req;
 #endif
   
-  /*--- Add the renumbering for the outliers to the map from before carrying
-   the global -> renumber transformation. Note that by construction, 
-   nElem_Send[ii] == outliers.size(). We also add in the 1 for viz. here. ---*/
-  
-  for (int ii = 0; ii < nElem_Send[size]; ii++) {
-    Global2Renumber[outliers[ii]] = idSend[ii] + 1;
-    Renumber2Global[idSend[ii] + 1] = outliers[ii];
-  }
-  
-  /*--- We can now overwrite the local connectivity for our surface elems
-   using our completed map with the new global renumbering. Whew!! Note
-   the -1 when accessing the conn from the map. ---*/
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. First, allocate the
+   appropriate amount of memory for this section. ---*/
   
-  for (iElem = 0; iElem < nParallel_Line; iElem++) {
-    iNode = (int)iElem*N_POINTS_LINE;
-    Conn_BoundLine_Par[iNode+0] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+0]-1];
-    Conn_BoundLine_Par[iNode+1] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+1]-1];
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
+      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+    }
   }
   
-  for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-    iNode = (int)iElem*N_POINTS_TRIANGLE;
-    Conn_BoundTria_Par[iNode+0] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+0]-1];
-    Conn_BoundTria_Par[iNode+1] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+1]-1];
-    Conn_BoundTria_Par[iNode+2] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+2]-1];
-  }
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
   
-  for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-    iNode = (int)iElem*N_POINTS_QUADRILATERAL;
-    Conn_BoundQuad_Par[iNode+0] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+0]-1];
-    Conn_BoundQuad_Par[iNode+1] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+1]-1];
-    Conn_BoundQuad_Par[iNode+2] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+2]-1];
-    Conn_BoundQuad_Par[iNode+3] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+3]-1];
-  }
+  nParallel_Poin = nPoint_Recv[size];
   
-  /*--- Free temporary memory ---*/
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
   
-  delete [] idIndex;
-  delete [] surfPoint;
-  delete [] globalP;
-  delete [] renumbP;
+  /*--- Free temporary memory from communications ---*/
   
+  delete [] connSend;
+  delete [] connRecv;
   delete [] idSend;
   delete [] idRecv;
-  delete [] globalSend;
-  delete [] globalRecv;
-  delete [] renumbSend;
-  delete [] renumbRecv;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Local_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] nPoint_Recv;
+  delete [] nPoint_Send;
+  delete [] nPoint_Flag;
+
   delete [] npoint_procs;
   delete [] starting_node;
   delete [] ending_node;
-  delete [] nPoint_Linear_Elems;
-  delete [] nPoint_Linear_Nodes;
-  delete [] nPoint_Send;
-  delete [] nPoint_Recv;
+  delete [] nPoint_Linear;
   
 }
 
-void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
-  /*--- Local variables ---*/
+  unsigned short iMarker;
+  unsigned long iProcessor;
+  unsigned long iPoint, jPoint, kPoint, iElem;
+  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
   
-  unsigned short nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
-  unsigned short iVar;
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  bool adjoint   = (config->GetContinuous_Adjoint() ||
-                    config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  ofstream restart_file;
-  string filename;
+  int VARS_PER_POINT = GlobalField_Counter;
+  int *Local_Halo = NULL;
+  int iNode, count;
+  int SendRecv, RecvFrom;
   
-  int iProcessor;
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
 
-  /*--- Retrieve filename from config ---*/
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
   
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
+  /*---         linear partitions across all procs and the output data     ---*/
+  /*---         for the entire field is similarly linearly partitioned.    ---*/
+  /*---         We need to identify which nodes in the volume data are     ---*/
+  /*---         also surface points. Our first step is to loop over all    ---*/
+  /*---         of the sorted surface connectivity and create a data       ---*/
+  /*---         structure on each proc that can identify the local surf    ---*/
+  /*---         points. Note that the linear partitioning is slightly      ---*/
+  /*---         different between the nodes and elements, so we will       ---*/
+  /*---         have to move between the two systems in this routine.      ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. This is the linear partitioning for nodes. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
+      }
+    }
   }
   
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+  /*--- Sum total number of nodes that belong to the domain ---*/
   
-  /*--- Append the zone number if multiple instance problems ---*/
-  if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  
+  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
+  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
   }
   
-  /*--- Only the master node writes the header. ---*/
+  /*--- Get the number of remainder points after the even division. ---*/
   
-  if (rank == MASTER_NODE) {
-    restart_file.open(filename.c_str(), ios::out);
-    restart_file.precision(15);
-    restart_file << "\"PointID\"";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++)
-      restart_file << "\t\"" << Variable_Names[iVar] << "\"";
-    restart_file << "\t\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    restart_file.close();
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Nodes[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Nodes[size] = nTotalPoint;
+  
+  /*--- Prepare to check and communicate the nodes that each proc has
+   locally from the surface connectivity. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
   }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
   
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
+  /*--- Loop through our local line elements and check where each
+   of the grid nodes resides based on global index. ---*/
   
-  /*--- All processors open the file. ---*/
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
   
-  restart_file.open(filename.c_str(), ios::out | ios::app);
-  restart_file.precision(15);
+  /*--- Reset out flags and then loop through our local triangle surface
+   elements performing the same check for where each grid node resides. ---*/
   
-  /*--- Write the restart file in parallel, processor by processor. ---*/
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
   
-  unsigned long myPoint = 0, offset = 0, Global_Index;
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-        
-        /*--- Global Index of the current point. (note outer loop over procs) ---*/
-        
-        Global_Index = iPoint + offset;
-        
-        /*--- Only write original domain points, i.e., exclude any periodic
-         or halo nodes, even if they are output in the viz. files. ---*/
-        
-        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-          
-          /*--- Write global index. (note outer loop over procs) ---*/
-          
-          restart_file << Global_Index << "\t";
-          myPoint++;
-          
-          /*--- Loop over the variables and write the values to file ---*/
-          
-          for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-            restart_file << scientific << Parallel_Data[iVar][iPoint] << "\t";
-          }
-          restart_file << "\n";
-        }
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
       }
+      
     }
-    /*--- Flush the file and wait for all processors to arrive. ---*/
-    restart_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-    
   }
-
-  /*--- Write the metadata (master rank alone) ----*/
-
-  if (rank == MASTER_NODE) {
-    if (dual_time)
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-    else
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-
-    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+  
+  /*--- Reset out flags and then loop through our local quad surface
+   elements performing the same check for where each grid node resides. ---*/
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
     }
   }
-
-  /*--- All processors close the file. ---*/
-
-  restart_file.close();
   
-}
-
-void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
-
-  /*--- Local variables ---*/
-
-  unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool adjoint   = (config->GetContinuous_Adjoint() ||
-                    config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool wrt_perf  = config->GetWrt_Performance();
-  ofstream restart_file;
-  string filename;
-  char str_buf[CGNS_STRING_SIZE], fname[100];
-  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
-
-  /*--- Retrieve filename from config ---*/
-
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
-
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
-
-  /*--- Append the zone number if multiple instance problems ---*/
-  if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  } else if ((fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
-  }
-
-  strcpy(fname, filename.c_str());
-
-  /*--- Prepare the first ints containing the counts. The first is a
-   magic number that we can use to check for binary files (it is the hex
-   representation for "SU2"). The second two values are number of variables
-   and number of points (DoFs). The last two values are for metadata: 
-   one int for ExtIter and 8 su2doubles. ---*/
-
-  int var_buf_size = 5;
-  int var_buf[5] = {535532, GlobalField_Counter, (int)nGlobalPoint_Sort, 1, 8};
-
-  /*--- Prepare the 1D data buffer on this rank. ---*/
-
-  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
-
-  /*--- For now, create a temp 1D buffer to load up the data for writing.
-   This will be replaced with a derived data type most likely. ---*/
-
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
-
-  /*--- Prepare metadata. ---*/
-
-  int Restart_ExtIter;
-  if (dual_time)
-    Restart_ExtIter= (int)config->GetExtIter() + 1;
-  else
-    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
-
-  passivedouble Restart_Metadata[8] = {
-    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
-    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
-    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
-    SU2_TYPE::GetValue(config->GetdCD_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
-    0.0
-  };
-
-  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
-  }
-
-  /*--- Set a timer for the binary file writing. ---*/
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many nodes it will receive from each other processor. ---*/
   
-#ifndef HAVE_MPI
-  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
 #else
-  StartTime = MPI_Wtime();
+  nElem_Recv[1] = nElem_Send[1];
 #endif
   
-#ifndef HAVE_MPI
-
-  FILE* fhw;
-  fhw = fopen(fname, "wb");
-
-  /*--- Error check for opening the file. ---*/
-
-  if (!fhw) {
-    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
-  }
-
-  /*--- First, write the number of variables and points. ---*/
-
-  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
-  file_size += (su2double)var_buf_size*sizeof(int);
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
   
-  /*--- Write the variable names to the file. Note that we are adopting a
-   fixed length of 33 for the string length to match with CGNS. This is 
-   needed for when we read the strings later. ---*/
-
-  for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
-    fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
-    file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
-  }
-
-  /*--- Call to write the entire restart file data in binary in one shot. ---*/
-
-  fwrite(buf, GlobalField_Counter*nParallel_Poin, sizeof(passivedouble), fhw);
-  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
-
-  /*--- Write the external iteration. ---*/
-
-  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
-  file_size += (su2double)sizeof(int);
-
-  /*--- Write the metadata. ---*/
-
-  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
-  file_size += (su2double)8*sizeof(passivedouble);
-
-  /*--- Close the file. ---*/
-
-  fclose(fhw);
-
-#else
-
-  /*--- Parallel binary output using MPI I/O. ---*/
-
-  MPI_File fhw;
-  SU2_MPI::Status status;
-  MPI_Datatype etype, filetype;
-  MPI_Offset disp;
-  int ierr;
-
-  /*--- We're writing only su2doubles in the data portion of the file. ---*/
-
-  etype = MPI_DOUBLE;
-
-  /*--- Define a derived datatype for this ranks contiguous chunk of data
-   that will be placed in the restart (1D array size = num points * num vars). ---*/
-
-  MPI_Type_contiguous(GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &filetype);
-  MPI_Type_commit(&filetype);
-
-  /*--- All ranks open the file using MPI. Here, we try to open the file with
-   exclusive so that an error is generated if the file exists. We always want
-   to write a fresh restart file, so we delete any existing files and create
-   a new one. ---*/
-
-  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                       MPI_INFO_NULL, &fhw);
-  if (ierr != MPI_SUCCESS)  {
-    MPI_File_close(&fhw);
-    if (rank == 0)
-      MPI_File_delete(fname, MPI_INFO_NULL);
-    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                         MPI_INFO_NULL, &fhw);
-  }
-
-  /*--- Error check opening the file. ---*/
-
-  if (ierr) {
-    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
   }
-
-  /*--- First, write the number of variables and points (i.e., cols and rows),
-   which we will need in order to read the file later. Also, write the 
-   variable string names here. Only the master rank writes the header. ---*/
-
-  if (rank == MASTER_NODE) {
-    MPI_File_write(fhw, var_buf, var_buf_size, MPI_INT, MPI_STATUS_IGNORE);
-    file_size += (su2double)var_buf_size*sizeof(int);
-
-    /*--- Write the variable names to the file. Note that we are adopting a
-     fixed length of 33 for the string length to match with CGNS. This is
-     needed for when we read the strings later. ---*/
-
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
-      strcpy(str_buf, Variable_Names[iVar].c_str());
-      MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
-      file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Now loop back through the local connectivities for the surface
+   elements and load up the global IDs for sending to their home proc. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
     }
   }
-
-  /*--- Compute the offset for this rank's linear partition of the data in bytes.
-   After the calculations above, we have the partition sizes store in nPoint_Linear
-   in cumulative storage format. ---*/
-
-  disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-          GlobalField_Counter*nPoint_Cum[rank]*sizeof(passivedouble));
-
-  /*--- Set the view for the MPI file write, i.e., describe the location in
-   the file that this rank "sees" for writing its piece of the restart file. ---*/
-
-  MPI_File_set_view(fhw, disp, etype, filetype, (char*)"native", MPI_INFO_NULL);
-
-  /*--- Collective call for all ranks to write to their view simultaneously. ---*/
-
-  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
-  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
-
-  /*--- Free the derived datatype. ---*/
-
-  MPI_Type_free(&filetype);
-
-  /*--- Reset the file view before writing the metadata. ---*/
-
-  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
-
-  /*--- Finally, the master rank writes the metadata. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- External iteration. ---*/
-
-    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble));
-    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
-    file_size += (su2double)sizeof(int);
-
-    /*--- Additional doubles for AoA, AoS, etc. ---*/
-
-    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble) + 1*sizeof(int));
-    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
-    file_size += (su2double)8*sizeof(passivedouble);
-
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
   }
-
-  /*--- All ranks close the file after writing. ---*/
-
-  MPI_File_close(&fhw);
-
-#endif
-
-  /*--- Compute and store the write time. ---*/
   
-#ifndef HAVE_MPI
-  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-  StopTime = MPI_Wtime();
-#endif
-  UsedTime = StopTime-StartTime;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
   
-  /*--- Communicate the total file size for the restart ---*/
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  /*--- Allocate the memory that we need for receiving the global IDs
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *idRecv = NULL;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
   
 #ifdef HAVE_MPI
-  su2double my_file_size = file_size;
-  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
-                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
   
-  /*--- Compute and store the bandwidth ---*/
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
   
-  Bandwidth = file_size/(1.0e6)/UsedTime;
-  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
+  /*--- Launch the non-blocking recv's for the global IDs. ---*/
   
-  if ((rank == MASTER_NODE) && (wrt_perf)) {
-    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
-    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
   }
   
-  /*--- Free temporary data buffer for writing the binary file. ---*/
-
-  delete [] buf;
-
-}
-
-void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
-                             CSolver *FlowSolver, unsigned long iExtIter,
-                             unsigned short val_iZone, unsigned short val_direction) {
-
-  /*--- This routine is for exporting slices of field data for 2D cartesian
-   grids. It assumes that the grid points lie on lines of constant x-
-   or y-coordinates. It is a simple way to export slices or profiles on
-   these meshes for use in verification and validation work. It will
-   eventually be replaced by general routines for probing/slicing.  ---*/
-
-  int DIRECTION = (int)val_direction;
-
-  su2double coordMin, coordMax;
-  coordMin = config->GetStations_Bounds(0);
-  coordMax = config->GetStations_Bounds(1);
-
-  unsigned short iVar;
-  unsigned long iPoint, iVertex, Global_Index;
-  char cstr[200];
-
-  int rank = MASTER_NODE, iProcessor, nProcessor = SINGLE_NODE;
-#ifdef HAVE_MPI
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nProcessor);
-#endif
-
-  bool isPeriodic;
-
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-
-  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
     }
   }
-
-  /*--- Sum total number of nodes that belong to the domain ---*/
-
-  unsigned long nTotalPoint;
-  unsigned long nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = nElem_Recv[rank];
+  int ll = nElem_Send[rank];
+  int kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
+  int number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
 #endif
-
-  unsigned long *npoint_procs  = new unsigned long[nProcessor];
-  unsigned long *nPoint_Linear = new unsigned long[nProcessor+1];
-
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < nProcessor; ii++) {
-    npoint_procs[ii] = nTotalPoint/nProcessor;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-
-  /*--- Store the point offsets for each rank. ---*/
-
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < nProcessor; ii++) {
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[nProcessor] = nTotalPoint;
-
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long nLocalVertex_Surface = 0;
-  unsigned long MaxLocalVertex_Surface = 0;
-
-  /*--- Find the max number of vertices we will send from among all
-   partitions and set up buffers. The master node will handle the
-   writing of the CSV file after gathering all of the data. ---*/
-
-  nLocalVertex_Surface = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-
-    /*--- Global Index of the current point. (note outer loop over procs) ---*/
-
-    Global_Index = iPoint + nPoint_Linear[rank];
-
-    /*--- Only write original domain points, i.e., exclude any periodic
-     or halo nodes, even if they are output in the viz. files. ---*/
-
-    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
-          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
-        nLocalVertex_Surface++;
-      }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Each proc now knows which is its local grid nodes from     ---*/
+  /*---         the entire volume solution are part of the surface. We     ---*/
+  /*---         now apply a mask to extract just those points on the       ---*/
+  /*---         surface. We also need to perform a renumbering so that     ---*/
+  /*---         the surface data (nodes and connectivity) have their       ---*/
+  /*---         own global numbering. This is important for writing        ---*/
+  /*---         output files in a later routine.                           ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Create a local data structure that acts as a mask to extract the
+   set of points within the local set that are on the surface. ---*/
+  
+  int *surfPoint = new int[nParallel_Poin];
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) surfPoint[iPoint] = -1;
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
+  }
+  
+  /*--- First, add up the number of surface points I have on my rank. ---*/
+  
+  nSurf_Poin_Par = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      nSurf_Poin_Par++;
     }
   }
-
-  /*--- Communicate the number of local vertices on each partition
-   to the master node ---*/
-
-  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
-
+  
+  /*--- Communicate this number of local surface points to all other
+   processors so that it can be used to create offsets for the new
+   global numbering for the surface points. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  
+  for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nSurf_Poin_Par;
+  
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
 #else
-  MaxLocalVertex_Surface = nLocalVertex_Surface;
-  Buffer_Recv_nVertex[0] = Buffer_Send_nVertex[0];
+  nPoint_Recv[1] = nPoint_Send[1];
 #endif
-
-  /*--- Send and Recv buffers ---*/
-
-  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*GlobalField_Counter];
-  su2double *Buffer_Recv_Data = NULL;
-
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-
-  /*--- Prepare the receive buffers on the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
-    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
+  
+  /*--- Go to cumulative storage format to compute the offsets. ---*/
+  
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
   }
-
-  /*--- Loop over all vertices in this partition and load the
-   data of the specified type into the buffer to be sent to
-   the master node. ---*/
-
-  nLocalVertex_Surface = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-
-    /*--- Global Index of the current point. (note outer loop over procs) ---*/
-
-    Global_Index = iPoint + nPoint_Linear[rank];
-
-    /*--- Only write original domain points, i.e., exclude any periodic
-     or halo nodes, even if they are output in the viz. files. ---*/
-
-    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
-          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
-        Buffer_Send_GlobalIndex[nLocalVertex_Surface] = Global_Index;
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Buffer_Send_Data[nLocalVertex_Surface*GlobalField_Counter+iVar] = Parallel_Data[iVar][iPoint];
-        }
-        nLocalVertex_Surface++;
+  
+  /*--- Now that we know the number of local surface points that we have,
+   we can allocate the new data structure to hold these points alone. Here,
+   we also copy the data for those points from our volume data structure. ---*/
+  
+  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
+    count = 0;
+    for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
+      if (surfPoint[ii] !=-1) {
+        Parallel_Surf_Data[jj][count] = Parallel_Data[jj][ii];
+        count++;
       }
     }
   }
-
-  /*--- Send the information to the master node ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Reduce the total number of surf points we have. This will be
+   needed for writing the surface solution files later. ---*/
+  
+#ifndef HAVE_MPI
+  nGlobal_Surf_Poin = nSurf_Poin_Par;
 #else
-  for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
-    Buffer_Recv_GlobalIndex[iVertex] = Buffer_Send_GlobalIndex[iVertex];
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      Buffer_Recv_Data[iVertex*GlobalField_Counter+iVar] = Buffer_Send_Data[iVertex*GlobalField_Counter+iVar];
-    }
-  }
+  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
-
-  /*--- The master node unpacks the data and writes the surface CSV file ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Write file name with extension if unsteady ---*/
-    char buffer[50];
-    string filename = "slice";
-    if (DIRECTION == 0) {
-      SPRINTF (buffer, "_vert.csv");
-    } else if (DIRECTION == 1) {
-      SPRINTF (buffer, "_hori.csv");
-    }
-    ofstream SurfFlow_file;
-
-    /*--- Write file name with extension if unsteady ---*/
-    strcpy (cstr, filename.c_str());
-    strcat (cstr, buffer);
-    SurfFlow_file.precision(15);
-    SurfFlow_file.open(cstr, ios::out);
-
-    /*--- Global index is first, then the rest of the data. We already have the names. ---*/
-
-    SurfFlow_file << "\"Global_Index\",";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      SurfFlow_file << "\"" << Variable_Names[iVar] << "\",";
+  
+  /*--- Now that we know every proc's global offset for the number of
+   surface points, we can create the new global numbering. Here, we
+   create a new mapping using two arrays, which will need to be
+   communicated. We use our mask again here.  ---*/
+  
+  unsigned long *globalP = new unsigned long[nSurf_Poin_Par];
+  unsigned long *renumbP = new unsigned long[nSurf_Poin_Par];
+  
+  count = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      globalP[count] = surfPoint[iPoint];
+      renumbP[count] = count + nPoint_Recv[rank];
+      count++;
     }
-    SurfFlow_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-
-    /*--- Loop through all of the collected data and write each node's values ---*/
-
-    unsigned long Total_Index;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-
-        /*--- Current index position and global index ---*/
-
-        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
-        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
-
-        /*--- Write the the data ---*/
-
-        SurfFlow_file << scientific << Global_Index;
-        Total_Index  = iProcessor*MaxLocalVertex_Surface*GlobalField_Counter+iVertex*GlobalField_Counter;
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          SurfFlow_file << scientific << ", " << Buffer_Recv_Data[Total_Index+iVar];
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 3: Communicate the arrays with the new global surface point   ---*/
+  /*---         numbering to the procs that hold the connectivity for      ---*/
+  /*---         each element. This will be done in two phases. First,      ---*/
+  /*---         we send the arrays around to the other procs based on      ---*/
+  /*---         the linear partitioning for the elems. This gets us        ---*/
+  /*---         most of the way there, however, due to the type of         ---*/
+  /*---         linear partitioning for the elements, there may exist      ---*/
+  /*---         elements that have nodes outside of the linear part.       ---*/
+  /*---         bounds. This is because the elems are distributed based    ---*/
+  /*---         on the node with the smallest global ID.                   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- First, we perform the linear partitioning again as it is done
+   for elements, which is slightly different than for nodes (above). ---*/
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
         }
-        SurfFlow_file << endl;
-
       }
     }
-
-    /*--- Close the CSV file ---*/
-
-    SurfFlow_file.close();
-
-    /*--- Release the recv buffers on the master node ---*/
-
-    delete [] Buffer_Recv_Data;
-    delete [] Buffer_Recv_GlobalIndex;
-    delete [] Buffer_Recv_nVertex;
-
   }
-
-  /*--- Release the memory for the remaining buffers and exit ---*/
-
-  delete [] Buffer_Send_Data;
-  delete [] Buffer_Send_GlobalIndex;
   
-}
-
-void COutput::DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol) {
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
   
-  /*--- Deallocate memory for connectivity data on each processor. ---*/
+  /*--- First communicate the number of points that each rank has found. ---*/
   
-  if (surf_sol) {
-    if (nParallel_Line > 0      && Conn_BoundLine_Par      != NULL)
-      delete [] Conn_BoundLine_Par;
-    if (nParallel_BoundTria > 0 && Conn_BoundTria_Par != NULL)
-      delete [] Conn_BoundTria_Par;
-    if (nParallel_BoundQuad > 0 && Conn_BoundQuad_Par != NULL)
-      delete [] Conn_BoundQuad_Par;
-  }
-  else {
-    if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
-    if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
-    if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
-    if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
-    if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
-    if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
-  }
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
   
-}
-
-void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
   
-  /*--- Deallocate memory for solution data ---*/
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
   
-  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
   }
-  if (Parallel_Data != NULL) delete [] Parallel_Data;
-
-}
-
-void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
   
-  if (Parallel_Surf_Data != NULL) {
-    
-    Global2Renumber.clear();
-    Renumber2Global.clear();
-    /*--- Deallocate memory for surface solution data ---*/
-    
-    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
-    }
-    delete [] Parallel_Surf_Data;
-  }
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
   
-}
-
-void COutput::MergeInletCoordinates(CConfig *config, CGeometry *geometry) {
-
-  /*--- Local variables needed on all processors ---*/
-
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, jPoint, kPoint;
-
-  int iProcessor, nProcessor = size;
-
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-
-  unsigned long index, iChar;
-
-  char str_buf[MAX_STRING_SIZE];
-  vector<string> Marker_Tags;
-  vector<string>::iterator it;
-
-  unsigned long *nRowCum_Counter = NULL;
-
-  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
-
-  /*--- Search all boundaries on the present rank to count the number
-   of nodes found on inlet markers. ---*/
-
-  nLocalPoint = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- Only communicate owned nodes to avoid duplicates. ---*/
-
-        if (geometry->node[iPoint]->GetDomain())
-          nLocalPoint++;
-
-      }
-    }
-  }
-  Buffer_Send_nPoin[0] = nLocalPoint;
-
-  /*--- Communicate the total number of nodes on this domain. ---*/
-
 #ifdef HAVE_MPI
-  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
 #else
-  Buffer_Recv_nPoin[0] = Buffer_Send_nPoin[0];
-  MaxLocalPoint        = nLocalPoint;
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
 #endif
-
-  /*--- Send and Recv buffers. ---*/
-
-  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_X = NULL;
-
-  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Y = NULL;
-
-  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
-  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
-
-  char *Buffer_Send_Str = new char[MaxLocalPoint*MAX_STRING_SIZE];
-  char *Buffer_Recv_Str = NULL;
-
-  /*--- Prepare the receive buffers in the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
-    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Str = new char[nProcessor*MaxLocalPoint*MAX_STRING_SIZE];
-
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-
-    unsigned long nGlobal_InletPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_InletPoint += Buffer_Recv_nPoin[iProcessor];
-    }
-    InletCoords = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      InletCoords[iDim] = new su2double[nGlobal_InletPoint];
-    }
-  }
-
-  /*--- Main communication routine. Loop over each coordinate and perform
-   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
-   all nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by marker tag in one large n-dim. array. ---*/
-
-  /*--- Loop over this partition to collect the coords of the local points. ---*/
-
-  su2double *Coords_Local; jPoint = 0;
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
-
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
       for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- Only communicate owned nodes to avoid duplicates. ---*/
-
-        if (geometry->node[iPoint]->GetDomain()) {
-
-          /*--- Retrieve local coordinates at this node. ---*/
-
-          Coords_Local = geometry->node[iPoint]->GetCoord();
-
-          /*--- Load local coords into the temporary send buffer. ---*/
-
-          Buffer_Send_X[jPoint] = Coords_Local[0];
-          Buffer_Send_Y[jPoint] = Coords_Local[1];
-          if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
-
-          /*--- If US system, the output should be in inches ---*/
-
-          if (config->GetSystemMeasurements() == US) {
-            Buffer_Send_X[jPoint] *= 12.0;
-            Buffer_Send_Y[jPoint] *= 12.0;
-            if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
           }
-
-          /*--- Store the marker tag for this particular node. ---*/
-
-          SPRINTF(&Buffer_Send_Str[jPoint*MAX_STRING_SIZE], "%s",
-                  config->GetMarker_All_TagBound(iMarker).c_str());
-
-          /*--- Increment jPoint as the counter. We need this because iPoint
-           may include halo nodes that we skip over during this loop. ---*/
           
-          jPoint++;
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
           
         }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
       }
     }
   }
-
-  /*--- Gather the coordinate data on the master node using MPI. ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_X, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_X, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Y, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Y, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) {
-    SU2_MPI::Gather(Buffer_Send_Z, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Z, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Elems[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Elems[size] = nTotalPoint;
+  
+  /*--- Reset our flags and counters ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
   }
-  SU2_MPI::Gather(Buffer_Send_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, Buffer_Recv_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < MaxLocalPoint; iPoint++) {
-    Buffer_Recv_X[iPoint] = Buffer_Send_X[iPoint];
-    Buffer_Recv_Y[iPoint] = Buffer_Send_Y[iPoint];
-    if (nDim == 3) Buffer_Recv_Z[iPoint] = Buffer_Send_Z[iPoint];
-    index = iPoint*MAX_STRING_SIZE;
-    for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
-      Buffer_Recv_Str[index + iChar] = Buffer_Send_Str[index + iChar];
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  /*--- Loop through my local surface nodes, find which proc the global
+   value lives on, then communicate the global ID and remumbered value. ---*/
+  
+  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
     }
+    
   }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
 #endif
-
-  /*--- The master node unpacks and sorts this variable by marker tag. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    Marker_Tags_InletFile.clear();
-
-    /*--- First, parse the marker tags to count how many total inlet markers
-     we have now on the master. ---*/
-
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        index = (iProcessor*MaxLocalPoint + iPoint)*MAX_STRING_SIZE;
-        for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
-          str_buf[iChar] = Buffer_Recv_Str[index + iChar];
-        }
-        Marker_Tags.push_back(str_buf);
-        Marker_Tags_InletFile.push_back(str_buf);
-      }
-    }
-
-    /*--- Sort and remove the duplicate inlet marker strings. ---*/
-
-    sort(Marker_Tags_InletFile.begin(), Marker_Tags_InletFile.end());
-    Marker_Tags_InletFile.erase(unique(Marker_Tags_InletFile.begin(),
-                                       Marker_Tags_InletFile.end()),
-                                Marker_Tags_InletFile.end());
-
-    /*--- Store the unique number of markers for writing later. ---*/
-
-    nMarker_InletFile = Marker_Tags_InletFile.size();
-
-    /*--- Count the number of rows (nodes) per marker. ---*/
-
-    nRow_InletFile = new unsigned long[nMarker_InletFile];
-    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-      nRow_InletFile[iMarker] = 0;
-    }
-
-    /*--- Now count the number of points per marker. ---*/
-
-    jPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[jPoint]) {
-            nRow_InletFile[iMarker]++;
-          }
-        }
-        jPoint++;
-      }
-    }
-
-    /*--- Now put the number of points per marker into cumulative storage.
-     We will also create an extra counter to make sorting easier. ---*/
-
-    nRowCum_InletFile = new unsigned long[nMarker_InletFile+1];
-    nRowCum_Counter   = new unsigned long[nMarker_InletFile+1];
-
-    nRowCum_InletFile[0] = 0; nRowCum_Counter[0] = 0;
-    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-      nRowCum_InletFile[iMarker+1] = nRowCum_InletFile[iMarker] + nRow_InletFile[iMarker];
-      nRowCum_Counter[iMarker+1]   = nRowCum_Counter[iMarker]   + nRow_InletFile[iMarker];
+  
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the globals that we are
+   sending. ---*/
+  
+  unsigned long *globalSend = NULL;
+  globalSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    globalSend[ii] = 0;
+  
+  /*--- Allocate memory to hold the renumbering that we are
+   sending. ---*/
+  
+  unsigned long *renumbSend = NULL;
+  renumbSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    renumbSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
+  
+  /*--- Loop back through and load up the buffers for the global IDs
+   and their new renumbering values. ---*/
+  
+  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    
+    if (nElem_Flag[iProcessor] != ii) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = index[iProcessor];
+      
+      globalSend[nn] = Global_Index;
+      renumbSend[nn] = renumbP[ii];
+      
+      /*--- Increment the index by the message length ---*/
+      
+      index[iProcessor]++;
+      
     }
-
-    /*--- Load up the coordinates, sorted into chunks per marker. ---*/
-
-    jPoint = 0; kPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[kPoint]) {
-
-            /*--- Find our current index for this marker and store coords. ---*/
-
-            index = nRowCum_Counter[iMarker];
-            InletCoords[0][index] = Buffer_Recv_X[jPoint];
-            InletCoords[1][index] = Buffer_Recv_Y[jPoint];
-            if (nDim == 3) InletCoords[2][index] = Buffer_Recv_Z[jPoint];
-
-            /*--- Increment the counter for this marker. ---*/
-
-            nRowCum_Counter[iMarker]++;
-
-          }
-        }
-
-        /*--- Increment point counter for marker tags and data. ---*/
-
-        kPoint++;
-        jPoint++;
-        
-      }
-
-      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-
-      jPoint = (iProcessor+1)*MaxLocalPoint;
-
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *globalRecv = NULL;
+  globalRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    globalRecv[ii] = 0;
+  
+  unsigned long *renumbRecv = NULL;
+  renumbRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    renumbRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(globalRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
     }
   }
-
-  /*--- Immediately release the temporary data buffers. ---*/
-
-  delete [] Buffer_Send_X;
-  delete [] Buffer_Send_Y;
-  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
-  delete [] Buffer_Send_Str;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_X;
-    delete [] Buffer_Recv_Y;
-    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
-    delete [] Buffer_Recv_nPoin;
-    delete [] Buffer_Recv_Str;
-    delete [] nRowCum_Counter;
+  
+  /*--- Launch the non-blocking sends of the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(globalSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
   }
-
-}
-
-void COutput::Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver) {
-
-  unsigned short iMarker, iDim, iVar;
-  unsigned long iPoint;
-  su2double turb_val[2] = {0.0,0.0};
-
-  const unsigned short nDim = geometry->GetnDim();
-
-  bool turbulent = (config->GetKind_Solver() == RANS ||
-                    config->GetKind_Solver() == ADJ_RANS ||
-                    config->GetKind_Solver() == DISC_ADJ_RANS);
-
-  unsigned short nVar_Turb = 0;
-  if (turbulent)
-    switch (config->GetKind_Turb_Model()) {
-      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-        nVar_Turb = 1;
-        turb_val[0] = solver[TURB_SOL]->GetNuTilde_Inf();
-        break;
-      case SST:
-        nVar_Turb = 2;
-        turb_val[0] = solver[TURB_SOL]->GetTke_Inf();
-        turb_val[1] = solver[TURB_SOL]->GetOmega_Inf();
-        break;
-      default:
-        SU2_MPI::Error("Specified turbulence model unavailable or none selected", CURRENT_FUNCTION);
-        break;
+  
+  /*--- Launch the non-blocking recv's for the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(renumbRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
     }
-
-  /*--- Count the number of columns that we have for this flow case.
-   Here, we have nDim entries for node coordinates, 2 entries for the total
-   conditions or mass flow, another nDim for the direction vector, and
-   finally entries for the number of turbulence variables. ---*/
-
-  unsigned short nCol_InletFile = nDim + 2 + nDim + nVar_Turb;
-
-  /*--- Write the inlet profile file. Note that we have already merged
-   all of the information for the markers and coordinates previously
-   in the MergeInletCoordinates() routine. ---*/
-
-  ofstream node_file("inlet_example.dat");
-
-  node_file << "NMARK= " << nMarker_InletFile << endl;
-
-  for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-
-    /*--- Access the default data for this marker. ---*/
-
-    string Marker_Tag   = Marker_Tags_InletFile[iMarker];
-    su2double p_total   = config->GetInlet_Ptotal(Marker_Tag);
-    su2double t_total   = config->GetInlet_Ttotal(Marker_Tag);
-    su2double* flow_dir = config->GetInlet_FlowDir(Marker_Tag);
-
-    /*--- Header information for this marker. ---*/
-
-    node_file << "MARKER_TAG= " << Marker_Tag              << endl;
-    node_file << "NROW="        << nRow_InletFile[iMarker] << endl;
-    node_file << "NCOL="        << nCol_InletFile          << endl;
-
-    node_file << setprecision(15);
-    node_file << std::scientific;
-
-    /*--- Loop over the data structure and write the coords and vars to file. ---*/
-
-    for (iPoint = nRowCum_InletFile[iMarker]; iPoint < nRowCum_InletFile[iMarker+1]; iPoint++) {
-
-      for (iDim = 0; iDim < nDim; iDim++) {
-        node_file << InletCoords[iDim][iPoint] << "\t";
-      }
-      node_file << t_total << "\t" << p_total;
-      for (iDim = 0; iDim < nDim; iDim++) {
-        node_file << "\t" << flow_dir[iDim];
-      }
-      for (iVar = 0; iVar < nVar_Turb; iVar++) {
-        node_file << "\t" << turb_val[iVar];
-      }
-      node_file << endl;
+  }
+  
+  /*--- Launch the non-blocking sends of the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(renumbSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
     }
-
   }
-  node_file.close();
-
-  /*--- Print a message to inform the user about the template file. ---*/
   
-  stringstream err;
-  err << endl;
-  err << "  Created a template inlet profile file with node coordinates" << endl;
-  err << "  and solver variables at `inlet_example.dat`." << endl;
-  err << "  You can use this file as a guide for making your own inlet" << endl;
-  err << "  specification." << endl << endl;
-  SU2_MPI::Error(err.str(), CURRENT_FUNCTION);
-
-}
-
-void COutput::DeallocateInletCoordinates(CConfig *config, CGeometry *geometry) {
-
-  unsigned short iDim, nDim = geometry->GetnDim();
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Deallocate memory for inlet coordinate data ---*/
-
-    if (nRow_InletFile != NULL)    delete [] nRow_InletFile;
-    if (nRowCum_InletFile != NULL) delete [] nRowCum_InletFile;
-
-    Marker_Tags_InletFile.clear();
-
-    for (iDim = 0; iDim < nDim; iDim++) {
-      if (InletCoords[iDim] != NULL) delete [] InletCoords[iDim];
+#endif
+  
+  /*--- Load our own procs data into the buffers directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) globalRecv[mm] = globalSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) renumbRecv[mm] = renumbSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*-- Now update my local connectivitiy for the surface with the new
+   numbering. Create a new mapping for global -> renumber for nodes. Note
+   the adding of 1 back in here for the eventual viz. purposes. ---*/
+  
+  map<unsigned long,unsigned long> Global2Renumber;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
+    Renumber2Global[renumbRecv[ii] + 1] = globalRecv[ii];
+  }
+  
+  
+  /*--- The final step is one last pass over all elements to check
+   for points outside of the linear partitions of the elements. Again,
+   note that elems were distributed based on their smallest global ID,
+   so some nodes of the elem may have global IDs lying outside of the
+   linear partitioning. We need to recover the mapping for these
+   outliers. We loop over all local surface elements to find these. ---*/
+  
+  vector<unsigned long>::iterator it;
+  vector<unsigned long> outliers;
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_BoundLine_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
     }
-    if (InletCoords != NULL) delete [] InletCoords;
-  }
-
-}
-
-
-
-void COutput::MergeConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-
-  /*--- Flags identifying the types of files to be written. ---*/
-
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
-
-  /*--- Merge connectivity for each type of element (excluding halos). Note
-   that we only need to merge the connectivity once, as it does not change
-   during computation. Check whether the base file has been written. ---*/
-
-  /*--- Merge volumetric grid. ---*/
-
-  if (Wrt_Vol) {
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tria != 0))
-      cout <<"Merging volumetric triangle grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, TRIANGLE    );
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Quad != 0))
-      cout <<"Merging volumetric quadrilateral grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL   );
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Tetr != 0))
-      cout <<"Merging volumetric tetrahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON );
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Hexa != 0))
-      cout <<"Merging volumetric hexahedron grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON  );
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pris != 0))
-      cout <<"Merging volumetric prism grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, PRISM       );
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Pyra != 0))
-      cout <<"Merging volumetric pyramid grid connectivity." << endl;
-    MergeVolumetricConnectivity_FEM(config, geometry, PYRAMID     );
-
   }
-
-  /*--- Merge surface grid. ---*/
-
-  if (Wrt_Srf) {
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_Line != 0))
-      cout <<"Merging surface line grid connectivity." << endl;
-    MergeSurfaceConnectivity_FEM(config, geometry, LINE);
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundTria != 0))
-      cout <<"Merging surface triangle grid connectivity." << endl;
-    MergeSurfaceConnectivity_FEM(config, geometry, TRIANGLE);
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE) && (nGlobal_BoundQuad != 0))
-      cout <<"Merging surface quadrilateral grid connectivity." << endl;
-    MergeSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);
-
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_BoundTria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
   }
-
-  /*--- Update total number of volume elements after merge. ---*/
-
-  nGlobal_Elem = nGlobal_Tria + nGlobal_Quad + nGlobal_Tetr +
-  nGlobal_Hexa + nGlobal_Pyra + nGlobal_Pris;
-
-  /*--- Update total number of surface elements after merge. ---*/
-
-  nSurf_Elem = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
-
-}
-
-void COutput::MergeCoordinates_FEM(CConfig *config, CGeometry *geometry) {
-
-  /*--- Local variables needed on all processors ---*/
-
-  unsigned short iDim;
-  unsigned long iPoint;
-
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned short nDim = DGGeometry->GetnDim();
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
-
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-  vector<su2double> DOFsCoords;
-  vector<unsigned long> globalID;
-
-  /*--- Set the global ID and the coordinates of the local DOFs
-        by looping over the owned volume elements. ---*/
-  unsigned long nLocalPoint = 0;
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-
-      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
-      globalID.push_back(globalIndex);
-
-      const su2double *coor = volElem[l].coorSolDOFs.data() + j*nDim;
-      for(unsigned short k=0; k<nDim; ++k) DOFsCoords.push_back(coor[k]);
-
-      nLocalPoint++;
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_BoundQuad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
     }
   }
-
-#ifndef HAVE_MPI
-
-  /*--- In serial, the single process has access to all geometry, so simply
-   load the coordinates into the data structure. ---*/
-
-  // need to double check for halos in parallel
-
-  nGlobal_Poin = nLocalPoint;
-  nGlobal_Doma = nLocalPoint;
-
-  /*--- Allocate the coordinates data structure. ---*/
-
-  Coords = new su2double*[nDim];
-  for (iDim = 0; iDim < nDim; iDim++) {
-    Coords[iDim] = new su2double[nGlobal_Poin];
+  
+  /*--- Create a unique list of global IDs that fall outside of our procs
+   linear partition. ---*/
+  
+  sort(outliers.begin(), outliers.end());
+  it = unique(outliers.begin(), outliers.end());
+  outliers.resize(it - outliers.begin());
+  
+  /*--- Now loop over the outliers and communicate to those procs that
+   hold the new numbering for our outlier points. We need to ask for the
+   new numbering from these procs. ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
   }
-
-  /*--- Loop over the mesh to collect the coords of the local points ---*/
-
-  for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
-
-    /*--- Check if the node belongs to the domain (i.e, not a halo node).
-     Sort by the global index, even in serial there is a renumbering (e.g. RCM). ---*/
-
-    /*--- Retrieve the current coordinates at this node. ---*/
-
-    unsigned long iGlobal_Index = globalID[iPoint];
-
-    for (iDim = 0; iDim < nDim; iDim++) {
-      Coords[iDim][iGlobal_Index] = DOFsCoords[iPoint*nDim+iDim];
-
-      /*--- If US system, the output should be in inches ---*/
-
-      if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-        Coords[iDim][iGlobal_Index] *= 12.0;
-      }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
     }
+    
   }
-
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
 #else
-
-  /*--- MPI preprocessing ---*/
-  int iProcessor, nProcessor = size;
-  unsigned long jPoint;
-
-  /*--- Local variables needed for merging the geometry with MPI. ---*/
-
-  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
-  unsigned long MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-
-  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
-
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. ---*/
-
-  // Need to double check halo layers
-
-  Buffer_Send_nPoin[0] = nLocalPoint;
-
-  /*--- Communicate the total number of nodes on this domain. ---*/
-
-  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-
-  if (rank == MASTER_NODE) {
-    nGlobal_Doma = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Doma += Buffer_Recv_nPoin[iProcessor];
-    }
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
   }
-  nBuffer_Scalar = MaxLocalPoint;
-
-  /*--- Send and Recv buffers. ---*/
-
-  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_X = NULL;
-
-  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Y = NULL;
-
-  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
-  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
-
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-
-  /*--- Prepare the receive buffers in the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
-    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[nProcessor*MaxLocalPoint];
-
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoin[iProcessor];
-    }
-    Coords = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      Coords[iDim] = new su2double[nGlobal_Poin];
+  
+  delete [] idSend;
+  idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Reset our index variable for reuse. ---*/
+  
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop over the outliers again and load up the global IDs. ---*/
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = idIndex[iProcessor];
+      
+      /*--- Load the global ID values. ---*/
+      
+      idSend[nn] = Global_Index; nn++;
+      
+      /*--- Increment the index by the message length ---*/
+      
+      idIndex[iProcessor]++;
+      
     }
   }
-
-  /*--- Main communication routine. Loop over each coordinate and perform
-   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
-   all nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-
-  /*--- Loop over this partition to collect the coords of the local points. ---*/
-  jPoint = 0;
-  for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
-
-    /*--- Check for halos and write only if requested ---*/
-    //    if (!Local_Halo[iPoint] || Wrt_Halo) {
-
-    /*--- Load local coords into the temporary send buffer. These were stored above ---*/
-    Buffer_Send_X[jPoint] = DOFsCoords[iPoint*nDim+0];
-    Buffer_Send_Y[jPoint] = DOFsCoords[iPoint*nDim+1];
-    if (nDim == 3) Buffer_Send_Z[jPoint] = DOFsCoords[iPoint*nDim+2];
-
-    /*--- If US system, the output should be in inches ---*/
-
-    if ((config->GetSystemMeasurements() == US) && (config->GetKind_SU2() != SU2_DEF)) {
-      Buffer_Send_X[jPoint] *= 12.0;
-      Buffer_Send_Y[jPoint] *= 12.0;
-      if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  delete [] idRecv;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
     }
-
-    /*--- Store the global index for this local node. ---*/
-    Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
-
-    /*--- Increment jPoint as the counter. We need this because iPoint
-     may include halo nodes that we skip over during this loop. ---*/
-    jPoint++;
-    //    }
-  }
-
-  /*--- Gather the coordinate data on the master node using MPI. ---*/
-
-  SU2_MPI::Gather(Buffer_Send_X, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_X, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Y, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Y, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) {
-    SU2_MPI::Gather(Buffer_Send_Z, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Z, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
   }
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-
-  /*--- The master node unpacks and sorts this variable by global index ---*/
-
-  if (rank == MASTER_NODE) {
-    jPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        /*--- Get global index, then loop over each variable and store ---*/
-        iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-        if (iGlobal_Index >= nGlobal_Poin){
-          cout << iGlobal_Index << " " << nGlobal_Poin << endl;
-        }
-        Coords[0][iGlobal_Index] = Buffer_Recv_X[jPoint];
-        Coords[1][iGlobal_Index] = Buffer_Recv_Y[jPoint];
-        if (nDim == 3) Coords[2][iGlobal_Index] = Buffer_Recv_Z[jPoint];
-        jPoint++;
-      }
-      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-      jPoint = (iProcessor+1)*nBuffer_Scalar;
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
     }
   }
-
-  /*--- Immediately release the temporary data buffers. ---*/
-
-  //  delete [] Local_Halo;
-  delete [] Buffer_Send_X;
-  delete [] Buffer_Send_Y;
-  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_X;
-    delete [] Buffer_Recv_Y;
-    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
-    delete [] Buffer_Recv_GlobalIndex;
-    delete [] Buffer_Recv_nPoin;
-  }
-
 #endif
-
-}
-
-void COutput::MergeVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-
-  int iProcessor;
-  unsigned short NODES_PER_ELEMENT = 0;
-  unsigned long iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
-
-  unsigned long jElem;
-
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0;
-
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL;
-
-  int *Conn_Elem = NULL;
-
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-
-  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
-
-  const CFEMStandardElement *standardElementsSol = DGGeometry->GetStandardElementsSol();
-
-  /* Define the vectors for the connectivity of the local linear subelements. */
-  vector<unsigned long> volumeConn;
-
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-  map<unsigned long, unsigned long> mapLocal2Global;
-  unsigned long ii = 0;
-  for(unsigned long i=0; i<nVolElemOwned; ++i) {
-    for(unsigned short j=0; j<volElem[i].nDOFsSol; ++j, ++ii) {
-      mapLocal2Global[ii] = volElem[i].offsetDOFsSolGlobal+j;
-    }
-  }
-
-  /*--- Counter for keeping track of the number of this element locally. ---*/
-  nLocalElem = 0;
-  for(unsigned long i=0; i<nVolElemOwned; ++i) {
-
-    /* Determine the necessary data from the corresponding standard elem,
-     such as the number of linear sub elements, the number of DOFs per
-     linear sub element and the corresponding local connectivity. */
-    const unsigned short ind       = volElem[i].indStandardElement;
-    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
-    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
-
-    /*--- Only store the linear sub elements if they are of
-     the current type that we are merging. ---*/
-    if (Elem_Type == VTK_Type1) {
-
-      const unsigned short nSubElems       = standardElementsSol[ind].GetNSubElemsType1();
-      const unsigned short nDOFsPerSubElem = standardElementsSol[ind].GetNDOFsPerSubElem(VTK_Type1);
-      const unsigned short *connSubElems   = standardElementsSol[ind].GetSubConnType1();
-
-      /* Loop over the number of subfaces and store the required data. */
-      unsigned short kk = 0;
-      for(unsigned short j=0; j<nSubElems; ++j) {
-
-        /*--- Store the global index for the surface conn ---*/
-        for(unsigned short k=0; k<nDOFsPerSubElem; ++k, ++kk)
-          volumeConn.push_back(mapLocal2Global[volElem[i].offsetDOFsSolLocal+connSubElems[kk]]);
-
-        nLocalElem++;
-      }
-
-    } else if (Elem_Type == VTK_Type2) {
-
-      const unsigned short nSubElems       = standardElementsSol[ind].GetNSubElemsType2();
-      const unsigned short nDOFsPerSubElem = standardElementsSol[ind].GetNDOFsPerSubElem(VTK_Type2);
-      const unsigned short *connSubElems   = standardElementsSol[ind].GetSubConnType2();
-
-      /* Loop over the number of subfaces and store the required data. */
-      unsigned short kk = 0;
-      for(unsigned short j=0; j<nSubElems; ++j) {
-
-        /*--- Store the global index for the surface conn ---*/
-        for(unsigned short k=0; k<nDOFsPerSubElem; ++k, ++kk)
-          volumeConn.push_back(mapLocal2Global[volElem[i].offsetDOFsSolLocal+connSubElems[kk]]);
-
-        nLocalElem++;
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- The procs holding the outlier grid nodes now have the global IDs
+   that they need to have their renumbering shared. ---*/
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
+      if (idRecv[ii] == globalP[iPoint]) {
+        idRecv[ii] = renumbP[iPoint];
       }
     }
   }
-
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-
-  switch (Elem_Type) {
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    case TETRAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-  }
-
-  /*--- Find the max number of this element type among all
-   partitions and set up buffers. ---*/
-
-  Buffer_Send_nElem[0] = nLocalElem;
-  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
-
+  
+  /*--- Now simply reverse the last communication to give the renumbered IDs
+   back to the owner of the outlier points. Note everything is flipped. ---*/
+  
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalElem = nLocalElem;
-  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
-#endif
-
-  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
-
-  /*--- Send and Recv buffers ---*/
-
-  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
-  unsigned long *Buffer_Recv_Elem = NULL;
-
-  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
-  unsigned short *Buffer_Recv_Halo = NULL;
-
-  /*--- Prepare the receive buffers on the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
-    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
-    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nRecvs];
+  recv_req = new SU2_MPI::Request[nSends];
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
   }
-
-  /*--- Loop over all elements in this partition and load the
-   elements of the current type into the buffer to be sent to
-   the master node. ---*/
-
-  jNode = 0;
-  for (iElem = 0; iElem < nLocalElem; iElem++) {
-
-    /*--- Loop over all nodes in this element and load the
-     connectivity into the send buffer. ---*/
-    Buffer_Send_Halo[iElem] = false;
-    for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-
-      /*--- Store the global index values directly. ---*/
-
-      Buffer_Send_Elem[jNode] = volumeConn[iElem*NODES_PER_ELEMENT+iNode];
-
-      /*--- Increment jNode as the counter. We need this because iElem
-       may include other elements that we skip over during this loop. ---*/
-
-      jNode++;
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
     }
   }
-
-  /*--- Gather the element connectivity information. ---*/
-
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Send[rank];
+  ll = nElem_Recv[rank];
+  kk = nElem_Recv[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idSend[mm] = idRecv[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
 #ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (unsigned long iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
-  for (unsigned long iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
 #endif
-
-  /*--- The master node unpacks and sorts the connectivity. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*---  We need to remove any duplicate elements (halo cells) that
-     exist on multiple partitions. Start by initializing all elements
-     to the "write" state by using a boolean array. ---*/
-
-    Write_Elem = new bool[size*MaxLocalElem];
-    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
-      Write_Elem[iElem] = true;
-    }
-
-    /*--- Remove the rind layer from the solution only if requested ---*/
-
-    if (!Wrt_Halo) {
-
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
-
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
-
-        }
-        kElem = (iProcessor+1)*MaxLocalElem;
-      }
-    }
-
-    /*--- Store the unique connectivity list for this element type. ---*/
-
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
-
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
-
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
-
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
-
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
-          }
-        }
-      }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
-    }
+  
+  /*--- Add the renumbering for the outliers to the map from before carrying
+   the global -> renumber transformation. Note that by construction, 
+   nElem_Send[ii] == outliers.size(). We also add in the 1 for viz. here. ---*/
+  
+  for (int ii = 0; ii < nElem_Send[size]; ii++) {
+    Global2Renumber[outliers[ii]] = idSend[ii] + 1;
+    Renumber2Global[idSend[ii] + 1] = outliers[ii];
   }
-
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
+  
+  /*--- We can now overwrite the local connectivity for our surface elems
+   using our completed map with the new global renumbering. Whew!! Note
+   the -1 when accessing the conn from the map. ---*/
+  
+  for (iElem = 0; iElem < nParallel_Line; iElem++) {
+    iNode = (int)iElem*N_POINTS_LINE;
+    Conn_BoundLine_Par[iNode+0] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+0]-1];
+    Conn_BoundLine_Par[iNode+1] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+1]-1];
   }
-
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-
-  if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case TRIANGLE:
-        nGlobal_Tria = nElem_Total;
-        if (nGlobal_Tria > 0) Conn_Tria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_Quad = nElem_Total;
-        if (nGlobal_Quad > 0) Conn_Quad = Conn_Elem;
-        break;
-      case TETRAHEDRON:
-        nGlobal_Tetr = nElem_Total;
-        if (nGlobal_Tetr > 0) Conn_Tetr = Conn_Elem;
-        break;
-      case HEXAHEDRON:
-        nGlobal_Hexa = nElem_Total;
-        if (nGlobal_Hexa > 0) Conn_Hexa = Conn_Elem;
-        break;
-      case PRISM:
-        nGlobal_Pris = nElem_Total;
-        if (nGlobal_Pris > 0) Conn_Pris = Conn_Elem;
-        break;
-      case PYRAMID:
-        nGlobal_Pyra = nElem_Total;
-        if (nGlobal_Pyra > 0) Conn_Pyra = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-    }
+  
+  for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
+    iNode = (int)iElem*N_POINTS_TRIANGLE;
+    Conn_BoundTria_Par[iNode+0] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+0]-1];
+    Conn_BoundTria_Par[iNode+1] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+1]-1];
+    Conn_BoundTria_Par[iNode+2] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+2]-1];
+  }
+  
+  for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
+    iNode = (int)iElem*N_POINTS_QUADRILATERAL;
+    Conn_BoundQuad_Par[iNode+0] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+0]-1];
+    Conn_BoundQuad_Par[iNode+1] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+1]-1];
+    Conn_BoundQuad_Par[iNode+2] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+2]-1];
+    Conn_BoundQuad_Par[iNode+3] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+3]-1];
   }
   
+  /*--- Free temporary memory ---*/
+  
+  delete [] idIndex;
+  delete [] surfPoint;
+  delete [] globalP;
+  delete [] renumbP;
+  
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] globalSend;
+  delete [] globalRecv;
+  delete [] renumbSend;
+  delete [] renumbRecv;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Local_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear_Elems;
+  delete [] nPoint_Linear_Nodes;
+  delete [] nPoint_Send;
+  delete [] nPoint_Recv;
+  
 }
 
-void COutput::MergeSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-
-  unsigned short NODES_PER_ELEMENT = 0;
-
-  unsigned long iNode, jNode;
-  unsigned long iElem = 0;
-  unsigned long nLocalElem = 0, nElem_Total = 0;
-
+void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+  
+  /*--- Local variables ---*/
+  
+  unsigned short nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
+  unsigned short iVar;
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
+  bool adjoint   = (config->GetContinuous_Adjoint() ||
+                    config->GetDiscrete_Adjoint());
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  ofstream restart_file;
+  string filename;
+  
   int iProcessor;
-  unsigned long jElem;
-
-  unsigned long Buffer_Send_nElem[1], *Buffer_Recv_nElem = NULL;
-  unsigned long nBuffer_Scalar = 0;
-  unsigned long kNode = 0, kElem = 0;
-  unsigned long MaxLocalElem = 0;
-
-  bool Wrt_Halo = config->GetWrt_Halo();
-  bool *Write_Elem = NULL;
-
-  int *Conn_Elem = NULL;
-
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-
-  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
-
-  const CBoundaryFEM *boundaries = DGGeometry->GetBoundaries();
-
-  const CFEMStandardBoundaryFace *standardBoundaryFacesSol = DGGeometry->GetStandardBoundaryFacesSol();
 
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-  map<unsigned long, unsigned long> mapLocal2Global;
-  unsigned long ii = 0;
-  for(unsigned long i=0; i<nVolElemOwned; ++i) {
-    for(unsigned short j=0; j<volElem[i].nDOFsSol; ++j, ++ii) {
-      mapLocal2Global[ii] = volElem[i].offsetDOFsSolGlobal+j;
-    }
+  /*--- Retrieve filename from config ---*/
+  
+  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else if (disc_adj_fem){
+    filename = config->GetRestart_AdjFEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
   }
+  
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
+  
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (nInst > 1)
+    filename= config->GetMultiInstance_FileName(filename, val_iInst);
 
-  /* Define the vectors for the connectivity of the local linear subelements. */
-  vector<unsigned long>  surfaceConn;
-
-  /*--- Counter for keeping track of the number of this element locally. ---*/
-  nLocalElem = 0;
-
-  /* Loop over the boundary markers. */
-  for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
-    if( !boundaries[iMarker].periodicBoundary ) {
-
-      /* Check for markers to be plotted. */
-      if (config->GetMarker_All_Plotting(iMarker) == YES) {
-
-        /* Loop over the surface elements of this marker. */
-        const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
-        for(unsigned long i=0; i<surfElem.size(); ++i) {
-
-          /* Determine the necessary data from the corresponding standard face,
-           such as the number of linear subfaces, the number of DOFs per
-           linear subface and the corresponding local connectivity. */
-          const unsigned short ind           = surfElem[i].indStandardElement;
-          const unsigned short VTK_Type      = standardBoundaryFacesSol[ind].GetVTK_Type();
-
-          /*--- Only store the linear sub-elements if they are of
-           the current type that we are merging. ---*/
-          if (VTK_Type == Elem_Type) {
-
-            const unsigned short nSubFaces     = standardBoundaryFacesSol[ind].GetNSubFaces();
-            const unsigned short nDOFsPerFace  = standardBoundaryFacesSol[ind].GetNDOFsPerSubFace();
-            const unsigned short *connSubFaces = standardBoundaryFacesSol[ind].GetSubFaceConn();
-
-            /* Loop over the number of subfaces and store the required data. */
-            unsigned short ii = 0;
-            for(unsigned short j=0; j<nSubFaces; ++j) {
-
-              /*--- Store the global index for the surface conn ---*/
-              for(unsigned short k=0; k<nDOFsPerFace; ++k, ++ii)
-                surfaceConn.push_back(mapLocal2Global[surfElem[i].DOFsSolFace[connSubFaces[ii]]]);
-
-              nLocalElem++;
-            }
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
+  
+  /*--- Only the master node writes the header. ---*/
+  
+  if (rank == MASTER_NODE) {
+    restart_file.open(filename.c_str(), ios::out);
+    restart_file.precision(15);
+    restart_file << "\"PointID\"";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++)
+      restart_file << "\t\"" << Variable_Names[iVar] << "\"";
+    restart_file << "\t\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
+    restart_file.close();
+  }
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  
+  /*--- All processors open the file. ---*/
+  
+  restart_file.open(filename.c_str(), ios::out | ios::app);
+  restart_file.precision(15);
+  
+  /*--- Write the restart file in parallel, processor by processor. ---*/
+  
+  unsigned long myPoint = 0, offset = 0, Global_Index;
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+        
+        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+        
+        Global_Index = iPoint + offset;
+        
+        /*--- Only write original domain points, i.e., exclude any periodic
+         or halo nodes, even if they are output in the viz. files. ---*/
+        
+        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+          
+          /*--- Write global index. (note outer loop over procs) ---*/
+          
+          restart_file << Global_Index << "\t";
+          myPoint++;
+          
+          /*--- Loop over the variables and write the values to file ---*/
+          
+          for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+            restart_file << scientific << Parallel_Data[iVar][iPoint] << "\t";
           }
+          restart_file << "\n";
         }
       }
     }
-  }
-
-  switch (Elem_Type) {
-    case LINE:
-      NODES_PER_ELEMENT = N_POINTS_LINE;
-      break;
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-  }
-
-  /*--- Find the max number of this element type among all
-   partitions and set up buffers. ---*/
-
-  Buffer_Send_nElem[0] = nLocalElem;
-  if (rank == MASTER_NODE) Buffer_Recv_nElem = new unsigned long[size];
-
+    /*--- Flush the file and wait for all processors to arrive. ---*/
+    restart_file.flush();
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalElem, &MaxLocalElem, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nElem, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nElem, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalElem = nLocalElem;
-  Buffer_Recv_nElem[0] = Buffer_Send_nElem[0];
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
 #endif
+    
+  }
 
-  nBuffer_Scalar = MaxLocalElem*NODES_PER_ELEMENT;
+  /*--- Write the metadata (master rank alone) ----*/
 
-  /*--- Send and Recv buffers ---*/
+  if (rank == MASTER_NODE) {
+    if (dual_time)
+      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+    else
+      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
 
-  unsigned long *Buffer_Send_Elem = new unsigned long[nBuffer_Scalar];
-  unsigned long *Buffer_Recv_Elem = NULL;
+    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+    }
+  }
 
-  unsigned short *Buffer_Send_Halo = new unsigned short[MaxLocalElem];
-  unsigned short *Buffer_Recv_Halo = NULL;
+  /*--- All processors close the file. ---*/
 
-  /*--- Prepare the receive buffers on the master node only. ---*/
+  restart_file.close();
+  
+}
 
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Elem = new unsigned long[size*nBuffer_Scalar];
-    Buffer_Recv_Halo = new unsigned short[size*MaxLocalElem];
-    if (MaxLocalElem > 0) Conn_Elem = new int[size*MaxLocalElem*NODES_PER_ELEMENT];
-  }
+void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
 
-  /*--- Loop over all elements in this partition and load the
-   elements of the current type into the buffer to be sent to
-   the master node. ---*/
-  jNode = 0;
-  for (iElem = 0; iElem < nLocalElem; iElem++) {
+  /*--- Local variables ---*/
 
-    /*--- Loop over all nodes in this element and load the
-     connectivity into the send buffer. ---*/
-    Buffer_Send_Halo[iElem] = false;
-    for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
+  unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
+  unsigned long iPoint, iExtIter = config->GetExtIter();
+  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
+  bool adjoint   = (config->GetContinuous_Adjoint() ||
+                    config->GetDiscrete_Adjoint());
+  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool wrt_perf  = config->GetWrt_Performance();
+  ofstream restart_file;
+  string filename;
+  char str_buf[CGNS_STRING_SIZE], fname[100];
+  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
 
-      /*--- Store the global index values directly. ---*/
-      Buffer_Send_Elem[jNode] = surfaceConn[iElem*NODES_PER_ELEMENT+iNode];
+  /*--- Retrieve filename from config ---*/
 
-      /*--- Increment jNode as the counter for the buffer array. ---*/
-      jNode++;
-    }
+  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+    filename = config->GetRestart_AdjFileName();
+    filename = config->GetObjFunc_Extension(filename);
+  } else if (fem) {
+    filename = config->GetRestart_FEMFileName();
+  } else {
+    filename = config->GetRestart_FlowFileName();
   }
 
-  /*--- Gather the element connectivity information. ---*/
+  /*--- Append the zone number if multizone problems ---*/
+  if (nZone > 1)
+    filename= config->GetMultizone_FileName(filename, val_iZone);
 
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_Elem, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, Buffer_Recv_Halo, MaxLocalElem, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (unsigned long iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Elem[iPoint] = Buffer_Send_Elem[iPoint];
-  for (unsigned long iPoint = 0; iPoint < MaxLocalElem; iPoint++) Buffer_Recv_Halo[iPoint] = Buffer_Send_Halo[iPoint];
-#endif
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (nInst > 1)
+    filename= config->GetMultiInstance_FileName(filename, val_iInst);
 
-  /*--- The master node unpacks and sorts the connectivity. ---*/
+  /*--- Unsteady problems require an iteration number to be appended. ---*/
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+  } else if (config->GetWrt_Unsteady()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  } else if ((fem) && (config->GetWrt_Dynamic())) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+  }
 
-  if (rank == MASTER_NODE) {
+  strcpy(fname, filename.c_str());
 
-    /*---  We need to remove any duplicate elements (halo cells) that
-     exist on multiple partitions. Start by initializing all elements
-     to the "write" state by using a boolean array. ---*/
+  /*--- Prepare the first ints containing the counts. The first is a
+   magic number that we can use to check for binary files (it is the hex
+   representation for "SU2"). The second two values are number of variables
+   and number of points (DoFs). The last two values are for metadata: 
+   one int for ExtIter and 8 su2doubles. ---*/
 
-    Write_Elem = new bool[size*MaxLocalElem];
-    for (iElem = 0; iElem < size*MaxLocalElem; iElem++) {
-      Write_Elem[iElem] = true;
-    }
+  int var_buf_size = 5;
+  int var_buf[5] = {535532, GlobalField_Counter, (int)nGlobalPoint_Sort, 1, 8};
 
-    /*--- Remove the rind layer from the solution only if requested ---*/
+  /*--- Prepare the 1D data buffer on this rank. ---*/
 
-    if (!Wrt_Halo) {
+  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
 
-      /*--- Loop for flagging duplicate elements so that they are not
-       included in the final connectivity list. ---*/
+  /*--- For now, create a temp 1D buffer to load up the data for writing.
+   This will be replaced with a derived data type most likely. ---*/
 
-      kElem = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
+      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
 
-          /*--- Check if this element was marked as a halo. ---*/
-          if (Buffer_Recv_Halo[kElem+iElem])
-            Write_Elem[kElem+iElem] = false;
+  /*--- Prepare metadata. ---*/
 
-        }
-        kElem = (iProcessor+1)*MaxLocalElem;
-      }
-    }
+  int Restart_ExtIter;
+  if (dual_time)
+    Restart_ExtIter= (int)config->GetExtIter() + 1;
+  else
+    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
 
-    /*--- Store the unique connectivity list for this element type. ---*/
+  passivedouble Restart_Metadata[8] = {
+    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
+    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
+    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
+    SU2_TYPE::GetValue(config->GetdCD_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
+    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
+    0.0
+  };
 
-    jNode = 0; kNode = 0; jElem = 0; nElem_Total = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      for (iElem = 0; iElem < Buffer_Recv_nElem[iProcessor]; iElem++) {
+  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
+  }
 
-        /*--- Only write the elements that were flagged for it. ---*/
-        if (Write_Elem[jElem+iElem]) {
+  /*--- Set a timer for the binary file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
+#ifndef HAVE_MPI
 
-          /*--- Increment total count for this element type ---*/
-          nElem_Total++;
+  FILE* fhw;
+  fhw = fopen(fname, "wb");
 
-          /*--- Get global index, then loop over each variable and store.
-           Note that we are adding one to the index value because CGNS/Tecplot
-           use 1-based indexing.---*/
+  /*--- Error check for opening the file. ---*/
 
-          for (iNode = 0; iNode < NODES_PER_ELEMENT; iNode++) {
-            Conn_Elem[kNode] = (int)Buffer_Recv_Elem[jNode+iElem*NODES_PER_ELEMENT+iNode] + 1;
-            kNode++;
-          }
-        }
-      }
-      /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-      jElem = (iProcessor+1)*MaxLocalElem;
-      jNode = (iProcessor+1)*nBuffer_Scalar;
-    }
+  if (!fhw) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
   }
 
-  /*--- Immediately release the temporary buffers. ---*/
-  delete [] Buffer_Send_Elem;
-  delete [] Buffer_Send_Halo;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nElem;
-    delete [] Buffer_Recv_Elem;
-    delete [] Buffer_Recv_Halo;
-    delete [] Write_Elem;
-  }
+  /*--- First, write the number of variables and points. ---*/
 
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
+  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
+  file_size += (su2double)var_buf_size*sizeof(int);
+  
+  /*--- Write the variable names to the file. Note that we are adopting a
+   fixed length of 33 for the string length to match with CGNS. This is 
+   needed for when we read the strings later. ---*/
 
-  if (rank == MASTER_NODE) {
-    switch (Elem_Type) {
-      case LINE:
-        nGlobal_Line = nElem_Total;
-        if (nGlobal_Line > 0) Conn_Line = Conn_Elem;
-        break;
-      case TRIANGLE:
-        nGlobal_BoundTria = nElem_Total;
-        if (nGlobal_BoundTria > 0) Conn_BoundTria = Conn_Elem;
-        break;
-      case QUADRILATERAL:
-        nGlobal_BoundQuad = nElem_Total;
-        if (nGlobal_BoundQuad > 0) Conn_BoundQuad = Conn_Elem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-    }
+  for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
+    fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
+    file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
   }
-}
 
-void COutput::MergeSolution_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
+  /*--- Call to write the entire restart file data in binary in one shot. ---*/
 
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  unsigned short iVar = 0, FirstIndex = NONE, SecondIndex = NONE, ThirdIndex = NONE;
-  unsigned short nVar_First = 0, nVar_Second = 0, nVar_Third = 0;
+  fwrite(buf, GlobalField_Counter*nParallel_Poin, sizeof(passivedouble), fhw);
+  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
 
-  unsigned long iPoint = 0, jPoint = 0;
+  /*--- Write the external iteration. ---*/
 
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
+  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
+  file_size += (su2double)sizeof(int);
 
-  int iProcessor;
+  /*--- Write the metadata. ---*/
 
-  /*--- Prepare send buffers for the conservative variables. Need to
-   find the total number of conservative variables and also the
-   index for their particular solution container. ---*/
+  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
+  file_size += (su2double)8*sizeof(passivedouble);
 
-  switch (Kind_Solver) {
-    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; ThirdIndex = NONE; break;
-    default: SecondIndex = NONE; ThirdIndex = NONE; break;
-  }
+  /*--- Close the file. ---*/
 
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  if (ThirdIndex != NONE) nVar_Third = solver[ThirdIndex]->GetnVar();
-  nVar_Consv = nVar_First + nVar_Second + nVar_Third;
-  nVar_Total = nVar_Consv;
+  fclose(fhw);
 
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+#else
 
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+  /*--- Parallel binary output using MPI I/O. ---*/
 
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-  map<unsigned long, unsigned long> mapLocal2Global;
-  vector<su2double> DOFsSol;
-  vector<unsigned long> globalID;
+  MPI_File fhw;
+  SU2_MPI::Status status;
+  MPI_Datatype etype, filetype;
+  MPI_Offset disp;
+  int ierr;
 
-  /*--- Update the solution by looping over the owned volume elements. ---*/
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+  /*--- We're writing only su2doubles in the data portion of the file. ---*/
 
-    /* Set the pointers for the residual and solution for this element. */
-    const unsigned long offset  = nVar_Consv*volElem[l].offsetDOFsSolLocal;
-    su2double *solDOFs          = solver[FirstIndex]->GetVecSolDOFs() + offset;
+  etype = MPI_DOUBLE;
 
-    /* Loop over the DOFs for this element and store the solution. */
+  /*--- Define a derived datatype for this ranks contiguous chunk of data
+   that will be placed in the restart (1D array size = num points * num vars). ---*/
 
-    unsigned int i = 0;
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+  MPI_Type_contiguous(GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &filetype);
+  MPI_Type_commit(&filetype);
 
-      nLocalPoint++;
-      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
-      globalID.push_back(globalIndex);
+  /*--- All ranks open the file using MPI. Here, we try to open the file with
+   exclusive so that an error is generated if the file exists. We always want
+   to write a fresh restart file, so we delete any existing files and create
+   a new one. ---*/
 
-      for(unsigned short iVar=0; iVar<nVar_Consv; ++iVar, ++i) {
-        DOFsSol.push_back(solDOFs[i]);
-      }
-    }
+  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                       MPI_INFO_NULL, &fhw);
+  if (ierr != MPI_SUCCESS)  {
+    MPI_File_close(&fhw);
+    if (rank == 0)
+      MPI_File_delete(fname, MPI_INFO_NULL);
+    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                         MPI_INFO_NULL, &fhw);
   }
-  Buffer_Send_nPoint[0] = nLocalPoint;
-
-  /*--- Each processor sends its local number of nodes to the master. ---*/
-
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
-
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalPoint = nLocalPoint;
-  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
-#endif
-
-  nBuffer_Scalar = MaxLocalPoint;
-
-  /*--- Send and Recv buffers. ---*/
 
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
+  /*--- Error check opening the file. ---*/
 
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  if (ierr) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  }
 
-  /*--- Prepare the receive buffers in the master node only. ---*/
+  /*--- First, write the number of variables and points (i.e., cols and rows),
+   which we will need in order to read the file later. Also, write the 
+   variable string names here. Only the master rank writes the header. ---*/
 
   if (rank == MASTER_NODE) {
+    MPI_File_write(fhw, var_buf, var_buf_size, MPI_INT, MPI_STATUS_IGNORE);
+    file_size += (su2double)var_buf_size*sizeof(int);
 
-    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+    /*--- Write the variable names to the file. Note that we are adopting a
+     fixed length of 33 for the string length to match with CGNS. This is
+     needed for when we read the strings later. ---*/
 
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
+      strcpy(str_buf, Variable_Names[iVar].c_str());
+      MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
+      file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
     }
   }
 
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
+  /*--- Compute the offset for this rank's linear partition of the data in bytes.
+   After the calculations above, we have the partition sizes store in nPoint_Linear
+   in cumulative storage format. ---*/
 
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
+  disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+          GlobalField_Counter*nPoint_Cum[rank]*sizeof(passivedouble));
 
-    /*--- Loop over this partition to collect the current variable ---*/
+  /*--- Set the view for the MPI file write, i.e., describe the location in
+   the file that this rank "sees" for writing its piece of the restart file. ---*/
 
-    jPoint = 0;
-    for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+  MPI_File_set_view(fhw, disp, etype, filetype, (char*)"native", MPI_INFO_NULL);
 
-      /*--- Get this variable into the temporary send buffer. ---*/
+  /*--- Collective call for all ranks to write to their view simultaneously. ---*/
 
-      Buffer_Send_Var[jPoint] = DOFsSol[iPoint*nVar_Consv+iVar];
+  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
+  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
 
-      /*--- Only send/recv the volumes & global indices during the first loop ---*/
+  /*--- Free the derived datatype. ---*/
 
-      if (iVar == 0) {
-        Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
-      }
+  MPI_Type_free(&filetype);
 
-      jPoint++;
+  /*--- Reset the file view before writing the metadata. ---*/
 
-    }
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
 
-    /*--- Gather the data on the master node. ---*/
+  /*--- Finally, the master rank writes the metadata. ---*/
 
-#ifdef HAVE_MPI
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
+  if (rank == MASTER_NODE) {
 
-    if (iVar == 0) {
-#ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
-#endif
-    }
+    /*--- External iteration. ---*/
 
-    /*--- The master node unpacks and sorts this variable by global index ---*/
+    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble));
+    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
+    file_size += (su2double)sizeof(int);
 
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
+    /*--- Additional doubles for AoA, AoS, etc. ---*/
 
-          /*--- Get global index, then loop over each variable and store ---*/
+    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble) + 1*sizeof(int));
+    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
+    file_size += (su2double)8*sizeof(passivedouble);
 
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
+  }
 
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
+  /*--- All ranks close the file after writing. ---*/
 
-          jPoint++;
+  MPI_File_close(&fhw);
 
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
+#endif
 
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  /*--- Communicate the total file size for the restart ---*/
+  
+#ifdef HAVE_MPI
+  su2double my_file_size = file_size;
+  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
+                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
+  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
+  
+  if ((rank == MASTER_NODE) && (wrt_perf)) {
+    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
+    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
   }
+  
+  /*--- Free temporary data buffer for writing the binary file. ---*/
 
-  /*--- Immediately release the temporary buffers. ---*/
-
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nPoint;
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
+  delete [] buf;
 
 }
 
-void COutput::MergeBaselineSolution_FEM(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) {
-
-  /*--- Local variables needed on all processors ---*/
-  unsigned short iVar;
-  unsigned long iPoint = 0, jPoint = 0;
-
-  unsigned long Buffer_Send_nPoint[1], *Buffer_Recv_nPoint = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-  unsigned long iGlobal_Index = 0, nBuffer_Scalar = 0;
-
-  int iProcessor;
-
-  /*--- We know the number of fields from reading the restart. ---*/
+void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
+                             CSolver *FlowSolver, unsigned long iExtIter,
+                             unsigned short val_iZone, unsigned short val_direction) {
 
-  nVar_Total = config->fields.size() - 1;
+  /*--- This routine is for exporting slices of field data for 2D cartesian
+   grids. It assumes that the grid points lie on lines of constant x-
+   or y-coordinates. It is a simple way to export slices or profiles on
+   these meshes for use in verification and validation work. It will
+   eventually be replaced by general routines for probing/slicing.  ---*/
 
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  int DIRECTION = (int)val_direction;
 
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem = DGGeometry->GetVolElem();
+  su2double coordMin, coordMax;
+  coordMin = config->GetStations_Bounds(0);
+  coordMax = config->GetStations_Bounds(1);
 
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-  vector<su2double> DOFsSol;
-  vector<unsigned long> globalID;
+  unsigned short iVar;
+  unsigned long iPoint, iVertex, Global_Index;
+  char cstr[200];
 
-  /*--- Update the solution by looping over the owned volume elements. ---*/
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+  int rank = MASTER_NODE, iProcessor, nProcessor = SINGLE_NODE;
+#ifdef HAVE_MPI
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nProcessor);
+#endif
 
-    /* Set the pointers for the residual and solution for this element. */
-    const unsigned long offset  = nVar_Total*volElem[l].offsetDOFsSolLocal;
-    su2double *solDOFs          = solver->GetVecSolDOFs() + offset;
+  bool isPeriodic;
 
-    /* Loop over the DOFs for this element and store the solution. */
+  int *Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
 
-    unsigned int i = 0;
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
 
-      nLocalPoint++;
-      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
-      globalID.push_back(globalIndex);
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
 
-      for(unsigned short iVar=0; iVar<nVar_Total; ++iVar, ++i) {
-        DOFsSol.push_back(solDOFs[i]);
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
       }
     }
   }
-  Buffer_Send_nPoint[0] = nLocalPoint;
 
-  /*--- Each processor sends its local number of nodes to the master. ---*/
+  /*--- Sum total number of nodes that belong to the domain ---*/
 
-  if (rank == MASTER_NODE) Buffer_Recv_nPoint = new unsigned long[size];
+  unsigned long nTotalPoint;
+  unsigned long nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
 
 #ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nPoint, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nPoint, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #else
-  MaxLocalPoint = nLocalPoint;
-  Buffer_Recv_nPoint[0] = Buffer_Send_nPoint[0];
+  nTotalPoint = nLocalPoint;
 #endif
 
-  nBuffer_Scalar = MaxLocalPoint;
-
-  /*--- Send and Recv buffers. ---*/
-
-  su2double *Buffer_Send_Var = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Var = NULL;
+  unsigned long *npoint_procs  = new unsigned long[nProcessor];
+  unsigned long *nPoint_Linear = new unsigned long[nProcessor+1];
 
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long[MaxLocalPoint];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < nProcessor; ii++) {
+    npoint_procs[ii] = nTotalPoint/nProcessor;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
 
-  /*--- Prepare the receive buffers in the master node only. ---*/
+  /*--- Get the number of remainder points after the even division. ---*/
 
-  if (rank == MASTER_NODE) {
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
 
-    Buffer_Recv_Var = new su2double[size*MaxLocalPoint];
-    Buffer_Recv_GlobalIndex = new unsigned long[size*MaxLocalPoint];
+  /*--- Store the point offsets for each rank. ---*/
 
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-    nGlobal_Poin = 0;
-    for (iProcessor = 0; iProcessor < size; iProcessor++) {
-      nGlobal_Poin += Buffer_Recv_nPoint[iProcessor];
-    }
-    Data = new su2double*[nVar_Total];
-    for (iVar = 0; iVar < nVar_Total; iVar++) {
-      Data[iVar] = new su2double[nGlobal_Poin];
-    }
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < nProcessor; ii++) {
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
   }
+  nPoint_Linear[nProcessor] = nTotalPoint;
 
-  /*--- Main communication routine. Loop over each variable that has
-   been requested by the user and perform the MPI comm. Temporary
-   1-D buffers are used to send the solution for each variable at all
-   nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by global index in one large n-dim. array. ---*/
-
-  for (iVar = 0; iVar < nVar_Total; iVar++) {
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long nLocalVertex_Surface = 0;
+  unsigned long MaxLocalVertex_Surface = 0;
 
-    /*--- Loop over this partition to collect the current variable ---*/
+  /*--- Find the max number of vertices we will send from among all
+   partitions and set up buffers. The master node will handle the
+   writing of the CSV file after gathering all of the data. ---*/
 
-    jPoint = 0;
-    for (iPoint = 0; iPoint < nLocalPoint; iPoint++) {
+  nLocalVertex_Surface = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
 
-      /*--- Get this variable into the temporary send buffer. ---*/
+    /*--- Global Index of the current point. (note outer loop over procs) ---*/
 
-      Buffer_Send_Var[jPoint] = DOFsSol[iPoint*nVar_Total+iVar];
+    Global_Index = iPoint + nPoint_Linear[rank];
 
-      /*--- Only send/recv the volumes & global indices during the first loop ---*/
+    /*--- Only write original domain points, i.e., exclude any periodic
+     or halo nodes, even if they are output in the viz. files. ---*/
 
-      if (iVar == 0) {
-        Buffer_Send_GlobalIndex[jPoint] = globalID[iPoint];
+    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
+          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
+        nLocalVertex_Surface++;
       }
-
-      jPoint++;
-
     }
+  }
 
-    /*--- Gather the data on the master node. ---*/
+  /*--- Communicate the number of local vertices on each partition
+   to the master node ---*/
 
-#ifdef HAVE_MPI
-    SU2_MPI::Gather(Buffer_Send_Var, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Var, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-#else
-    for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
-#endif
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
 
-    if (iVar == 0) {
 #ifdef HAVE_MPI
-      SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
 #else
-      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_GlobalIndex[iPoint] = Buffer_Send_GlobalIndex[iPoint];
+  MaxLocalVertex_Surface = nLocalVertex_Surface;
+  Buffer_Recv_nVertex[0] = Buffer_Send_nVertex[0];
 #endif
-    }
-
-    /*--- The master node unpacks and sorts this variable by global index ---*/
-
-    if (rank == MASTER_NODE) {
-      jPoint = 0;
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        for (iPoint = 0; iPoint < Buffer_Recv_nPoint[iProcessor]; iPoint++) {
 
-          /*--- Get global index, then loop over each variable and store ---*/
-
-          iGlobal_Index = Buffer_Recv_GlobalIndex[jPoint];
-
-          Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
-
-          jPoint++;
-
-        }
-        /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-        jPoint = (iProcessor+1)*nBuffer_Scalar;
-      }
-    }
-
-  }
-
-  /*--- Immediately release the temporary buffers. ---*/
-
-  delete [] Buffer_Send_Var;
-  delete [] Buffer_Send_GlobalIndex;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_nPoint;
-    delete [] Buffer_Recv_Var;
-    delete [] Buffer_Recv_GlobalIndex;
-  }
-  
-}
-
-void COutput::SetResult_Files_FEM(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
-                                  unsigned long iExtIter, unsigned short val_nZone) {
-
-  unsigned short iZone;
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-    /*--- Check whether we are writing any output at all. We can
-     disable all output to avoid serial bottleneck at scale. ---*/
-    if (config[iZone]->GetWrt_Output()) {
+  /*--- Send and Recv buffers ---*/
 
-      /*--- Flags identifying the types of files to be written. ---*/
+  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*GlobalField_Counter];
+  su2double *Buffer_Recv_Data = NULL;
 
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *Buffer_Recv_GlobalIndex = NULL;
 
-      /*--- Get the file output format ---*/
+  /*--- Prepare the receive buffers on the master node only. ---*/
 
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+  if (rank == MASTER_NODE) {
+    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
+    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
+  }
 
-      /*--- Merge the node coordinates and connectivity, if necessary. This
-       is only performed if a volume solution file is requested, and it
-       is active by default. ---*/
+  /*--- Loop over all vertices in this partition and load the
+   data of the specified type into the buffer to be sent to
+   the master node. ---*/
 
-      if (Wrt_Vol || Wrt_Srf) {
-        if (rank == MASTER_NODE) cout << endl << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity_FEM(config[iZone], geometry[iZone][MESH_0], iZone);
-      }
+  nLocalVertex_Surface = 0;
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
 
-      /*--- Merge coordinates of all grid nodes (excluding ghost points).
-       The grid coordinates are always merged and included first in the
-       restart files. ---*/
+    /*--- Global Index of the current point. (note outer loop over procs) ---*/
 
-      if (rank == MASTER_NODE) cout << "Merging coordinates in the Master node." << endl;
-      MergeCoordinates_FEM(config[iZone], geometry[iZone][MESH_0]);
+    Global_Index = iPoint + nPoint_Linear[rank];
 
-      if ((rank == MASTER_NODE) && (Wrt_Vol || Wrt_Srf)) {
-        if (FileFormat == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume and surface mesh files." << endl;
-          SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][MESH_0], iZone);
-          SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][MESH_0], iZone);
+    /*--- Only write original domain points, i.e., exclude any periodic
+     or halo nodes, even if they are output in the viz. files. ---*/
+
+    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
+          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
+        Buffer_Send_GlobalIndex[nLocalVertex_Surface] = Global_Index;
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          Buffer_Send_Data[nLocalVertex_Surface*GlobalField_Counter+iVar] = Parallel_Data[iVar][iPoint];
         }
+        nLocalVertex_Surface++;
       }
+    }
+  }
 
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
-
-      if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-      MergeSolution_FEM(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone);
+  /*--- Send the information to the master node ---*/
 
-      /*--- Write restart, or Tecplot files using the merged data.
-       This data lives only on the master, and these routines are currently
-       executed by the master proc alone (as if in serial). ---*/
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
+    Buffer_Recv_GlobalIndex[iVertex] = Buffer_Send_GlobalIndex[iVertex];
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      Buffer_Recv_Data[iVertex*GlobalField_Counter+iVar] = Buffer_Send_Data[iVertex*GlobalField_Counter+iVar];
+    }
+  }
+#endif
 
-      if (rank == MASTER_NODE) {
+  /*--- The master node unpacks the data and writes the surface CSV file ---*/
 
-        /*--- Write a native restart file ---*/
+  if (rank == MASTER_NODE) {
 
-        if (rank == MASTER_NODE) cout << "Writing SU2 native restart file." << endl;
-        SetRestart(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone);
+    /*--- Write file name with extension if unsteady ---*/
+    char buffer[50];
+    string filename = "slice";
+    if (DIRECTION == 0) {
+      SPRINTF (buffer, "_vert.csv");
+    } else if (DIRECTION == 1) {
+      SPRINTF (buffer, "_hori.csv");
+    }
+    ofstream SurfFlow_file;
 
-        if (Wrt_Vol) {
+    /*--- Write file name with extension if unsteady ---*/
+    strcpy (cstr, filename.c_str());
+    strcat (cstr, buffer);
+    SurfFlow_file.precision(15);
+    SurfFlow_file.open(cstr, ios::out);
 
-          switch (FileFormat) {
+    /*--- Global index is first, then the rest of the data. We already have the names. ---*/
 
-            case TECPLOT:
+    SurfFlow_file << "\"Global_Index\",";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
+      SurfFlow_file << "\"" << Variable_Names[iVar] << "\",";
+    }
+    SurfFlow_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
 
-              /*--- Write a Tecplot ASCII file ---*/
+    /*--- Loop through all of the collected data and write each node's values ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0], iZone, val_nZone, false);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
+    unsigned long Total_Index;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
 
-            case FIELDVIEW:
+        /*--- Current index position and global index ---*/
 
-              /*--- Write a FieldView ASCII file ---*/
+        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
+        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
 
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
-              SetFieldViewASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
+        /*--- Write the the data ---*/
 
-            case TECPLOT_BINARY:
+        SurfFlow_file << scientific << Global_Index;
+        Total_Index  = iProcessor*MaxLocalVertex_Surface*GlobalField_Counter+iVertex*GlobalField_Counter;
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+          SurfFlow_file << scientific << ", " << Buffer_Recv_Data[Total_Index+iVar];
+        }
+        SurfFlow_file << endl;
 
-              /*--- Write a Tecplot binary solution file ---*/
+      }
+    }
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
-              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][MESH_0], iZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
+    /*--- Close the CSV file ---*/
 
-            case FIELDVIEW_BINARY:
+    SurfFlow_file.close();
 
-              /*--- Write a FieldView binary file ---*/
+    /*--- Release the recv buffers on the master node ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
-              SetFieldViewBinary(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
+    delete [] Buffer_Recv_Data;
+    delete [] Buffer_Recv_GlobalIndex;
+    delete [] Buffer_Recv_nVertex;
 
-            case PARAVIEW:
+  }
 
-              /*--- Write a Paraview ASCII file ---*/
+  /*--- Release the memory for the remaining buffers and exit ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, false);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
+  delete [] Buffer_Send_Data;
+  delete [] Buffer_Send_GlobalIndex;
+  
+}
 
-            default:
-              break;
-          }
+void COutput::DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol) {
+  
+  /*--- Deallocate memory for connectivity data on each processor. ---*/
+  
+  if (surf_sol) {
+    if (nParallel_Line > 0      && Conn_BoundLine_Par      != NULL)
+      delete [] Conn_BoundLine_Par;
+    if (nParallel_BoundTria > 0 && Conn_BoundTria_Par != NULL)
+      delete [] Conn_BoundTria_Par;
+    if (nParallel_BoundQuad > 0 && Conn_BoundQuad_Par != NULL)
+      delete [] Conn_BoundQuad_Par;
+  }
+  else {
+    if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
+    if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
+    if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
+    if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
+    if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
+    if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
+  }
+  
+}
 
-        }
+void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
+  
+  /*--- Deallocate memory for solution data ---*/
+  
+  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  }
+  if (Parallel_Data != NULL) delete [] Parallel_Data;
 
-        if (Wrt_Srf) {
+}
 
-          switch (FileFormat) {
+void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
+  
+  if (Parallel_Surf_Data != NULL) {
+    
+    Global2Renumber.clear();
+    Renumber2Global.clear();
+    /*--- Deallocate memory for surface solution data ---*/
+    
+    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
+    }
+    delete [] Parallel_Surf_Data;
+  }
+  
+}
 
-            case TECPLOT:
+void COutput::MergeInletCoordinates(CConfig *config, CGeometry *geometry) {
 
-              /*--- Write a Tecplot ASCII file ---*/
+  /*--- Local variables needed on all processors ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII surface solution file." << endl;
-              SetTecplotASCII(config[iZone], geometry[iZone][MESH_0], solver_container[iZone][MESH_0] , iZone, val_nZone, true);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-              break;
+  unsigned short iDim, nDim = geometry->GetnDim();
+  unsigned long iPoint, jPoint, kPoint;
 
-            case TECPLOT_BINARY:
+  int iProcessor, nProcessor = size;
 
-              /*--- Write a Tecplot binary solution file ---*/
+  unsigned long iVertex, iMarker;
+  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
+  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
-              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][MESH_0], iZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-              break;
+  unsigned long index, iChar;
 
-            case PARAVIEW:
+  char str_buf[MAX_STRING_SIZE];
+  vector<string> Marker_Tags;
+  vector<string>::iterator it;
 
-              /*--- Write a Paraview ASCII file ---*/
+  unsigned long *nRowCum_Counter = NULL;
 
-              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, true);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
-              break;
+  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
 
-            default:
-              break;
-          }
+  /*--- Search all boundaries on the present rank to count the number
+   of nodes found on inlet markers. ---*/
 
-        }
+  nLocalPoint = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
 
-        /*--- Release memory needed for merging the solution data. ---*/
+        /*--- Only communicate owned nodes to avoid duplicates. ---*/
 
-        DeallocateCoordinates(config[iZone], geometry[iZone][MESH_0]);
-        DeallocateSolution(config[iZone], geometry[iZone][MESH_0]);
+        if (geometry->node[iPoint]->GetDomain())
+          nLocalPoint++;
 
       }
-
-      /*--- Final broadcast (informing other procs that the base output
-       file was written). ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-      SU2_MPI::Bcast(&wrote_surf_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-
-    } else {
-      if (rank == MASTER_NODE) cout << endl << "Restart and solution output disabled." << endl;
     }
   }
-}
-
-void COutput::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                          unsigned long iExtIter, unsigned short val_nZone) {
+  Buffer_Send_nPoin[0] = nLocalPoint;
 
-  unsigned short iZone, iInst, nInst;
+  /*--- Communicate the total number of nodes on this domain. ---*/
 
-  for (iZone = 0; iZone < val_nZone; iZone++) {
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+#else
+  Buffer_Recv_nPoin[0] = Buffer_Send_nPoin[0];
+  MaxLocalPoint        = nLocalPoint;
+#endif
 
-    nInst = config[iZone]->GetnTimeInstances();
+  /*--- Send and Recv buffers. ---*/
 
-    for (iInst = 0; iInst < nInst; iInst++) {
+  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_X = NULL;
 
-      config[iZone]->SetiInst(iInst);
+  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
+  su2double *Buffer_Recv_Y = NULL;
 
-      /*--- Flags identifying the types of files to be written. ---*/
+  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
+  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
 
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
+  char *Buffer_Send_Str = new char[MaxLocalPoint*MAX_STRING_SIZE];
+  char *Buffer_Recv_Str = NULL;
 
-      /*--- Get the file output format ---*/
+  /*--- Prepare the receive buffers in the master node only. ---*/
 
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+  if (rank == MASTER_NODE) {
 
-      /*--- Merge the node coordinates and connectivity if necessary. This
-       is only performed if a volume solution file is requested, and it
-       is active by default. ---*/
+    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
+    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
+    Buffer_Recv_Str = new char[nProcessor*MaxLocalPoint*MAX_STRING_SIZE];
 
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity_FEM(config[iZone], geometry[iZone][iInst], iZone);
-      }
+    /*--- Sum total number of nodes to be written and allocate arrays ---*/
 
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
+    unsigned long nGlobal_InletPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      nGlobal_InletPoint += Buffer_Recv_nPoin[iProcessor];
+    }
+    InletCoords = new su2double*[nDim];
+    for (iDim = 0; iDim < nDim; iDim++) {
+      InletCoords[iDim] = new su2double[nGlobal_InletPoint];
+    }
+  }
 
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-        MergeBaselineSolution_FEM(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-      }
+  /*--- Main communication routine. Loop over each coordinate and perform
+   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
+   all nodes on each partition to the master node. These are then unpacked
+   by the master and sorted by marker tag in one large n-dim. array. ---*/
 
-      /*--- Write restart, Tecplot or Paraview files using the merged data.
-       This data lives only on the master, and these routines are currently
-       executed by the master proc alone (as if in serial). ---*/
+  /*--- Loop over this partition to collect the coords of the local points. ---*/
 
-      if (rank == MASTER_NODE) {
+  su2double *Coords_Local; jPoint = 0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
 
-        if (Wrt_Vol) {
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
 
-          switch (FileFormat) {
+        /*--- Only communicate owned nodes to avoid duplicates. ---*/
 
-            case TECPLOT:
+        if (geometry->node[iPoint]->GetDomain()) {
 
-              /*--- Write a Tecplot ASCII file ---*/
+          /*--- Retrieve local coordinates at this node. ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
-              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
+          Coords_Local = geometry->node[iPoint]->GetCoord();
 
-            case FIELDVIEW:
+          /*--- Load local coords into the temporary send buffer. ---*/
 
-              /*--- Write a FieldView ASCII file ---*/
+          Buffer_Send_X[jPoint] = Coords_Local[0];
+          Buffer_Send_Y[jPoint] = Coords_Local[1];
+          if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
 
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-              SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
+          /*--- If US system, the output should be in inches ---*/
 
-            case TECPLOT_BINARY:
+          if (config->GetSystemMeasurements() == US) {
+            Buffer_Send_X[jPoint] *= 12.0;
+            Buffer_Send_Y[jPoint] *= 12.0;
+            if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
+          }
 
-              /*--- Write a Tecplot binary solution file ---*/
+          /*--- Store the marker tag for this particular node. ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
-              SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
-              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-              break;
+          SPRINTF(&Buffer_Send_Str[jPoint*MAX_STRING_SIZE], "%s",
+                  config->GetMarker_All_TagBound(iMarker).c_str());
 
-            case FIELDVIEW_BINARY:
+          /*--- Increment jPoint as the counter. We need this because iPoint
+           may include halo nodes that we skip over during this loop. ---*/
+          
+          jPoint++;
+          
+        }
+      }
+    }
+  }
 
-              /*--- Write a binary binary file ---*/
+  /*--- Gather the coordinate data on the master node using MPI. ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-              SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
+#ifdef HAVE_MPI
+  SU2_MPI::Gather(Buffer_Send_X, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_X, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Gather(Buffer_Send_Y, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Y, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  if (nDim == 3) {
+    SU2_MPI::Gather(Buffer_Send_Z, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Z, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  }
+  SU2_MPI::Gather(Buffer_Send_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, Buffer_Recv_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < MaxLocalPoint; iPoint++) {
+    Buffer_Recv_X[iPoint] = Buffer_Send_X[iPoint];
+    Buffer_Recv_Y[iPoint] = Buffer_Send_Y[iPoint];
+    if (nDim == 3) Buffer_Recv_Z[iPoint] = Buffer_Send_Z[iPoint];
+    index = iPoint*MAX_STRING_SIZE;
+    for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
+      Buffer_Recv_Str[index + iChar] = Buffer_Send_Str[index + iChar];
+    }
+  }
+#endif
 
-            case PARAVIEW:
+  /*--- The master node unpacks and sorts this variable by marker tag. ---*/
 
-              /*--- Write a Paraview ASCII file ---*/
+  if (rank == MASTER_NODE) {
 
-              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
+    Marker_Tags_InletFile.clear();
 
-            default:
-              break;
-          }
+    /*--- First, parse the marker tags to count how many total inlet markers
+     we have now on the master. ---*/
 
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        index = (iProcessor*MaxLocalPoint + iPoint)*MAX_STRING_SIZE;
+        for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
+          str_buf[iChar] = Buffer_Recv_Str[index + iChar];
         }
+        Marker_Tags.push_back(str_buf);
+        Marker_Tags_InletFile.push_back(str_buf);
+      }
+    }
 
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-            case TECPLOT:
-
-              /*--- Write a Tecplot ASCII file ---*/
-
-              if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
-              SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-              break;
+    /*--- Sort and remove the duplicate inlet marker strings. ---*/
 
-            case TECPLOT_BINARY:
+    sort(Marker_Tags_InletFile.begin(), Marker_Tags_InletFile.end());
+    Marker_Tags_InletFile.erase(unique(Marker_Tags_InletFile.begin(),
+                                       Marker_Tags_InletFile.end()),
+                                Marker_Tags_InletFile.end());
 
-              /*--- Write a Tecplot binary solution file ---*/
+    /*--- Store the unique number of markers for writing later. ---*/
 
-              if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
-              SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
-              SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-              break;
+    nMarker_InletFile = Marker_Tags_InletFile.size();
 
-            case PARAVIEW:
+    /*--- Count the number of rows (nodes) per marker. ---*/
 
-              /*--- Write a Paraview ASCII file ---*/
+    nRow_InletFile = new unsigned long[nMarker_InletFile];
+    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+      nRow_InletFile[iMarker] = 0;
+    }
 
-              if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-              break;
+    /*--- Now count the number of points per marker. ---*/
 
-            default:
-              break;
+    jPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[jPoint]) {
+            nRow_InletFile[iMarker]++;
           }
         }
-
-        if (FileFormat == TECPLOT_BINARY) {
-          if (!wrote_base_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-          if (!wrote_surf_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-        }
-
-        if (Wrt_Vol || Wrt_Srf)
-          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
+        jPoint++;
       }
-    
-      /*--- Final broadcast (informing other procs that the base output
-       file was written). ---*/
-    
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
     }
-  }
-}
 
-void COutput::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) {
-
-  unsigned short iDim;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short nDim = geometry->GetnDim();
-
-  unsigned long iVar, jVar;
-  unsigned long iPoint, jPoint, FirstIndex = NONE, SecondIndex = NONE;
-  unsigned long nVar_First = 0, nVar_Second = 0, nVar_Consv_Par = 0;
-
-  stringstream varname;
+    /*--- Now put the number of points per marker into cumulative storage.
+     We will also create an extra counter to make sorting easier. ---*/
 
-  /*--- Use a switch statement to decide how many solver containers we have
-   in this zone for output. ---*/
+    nRowCum_InletFile = new unsigned long[nMarker_InletFile+1];
+    nRowCum_Counter   = new unsigned long[nMarker_InletFile+1];
 
-  switch (Kind_Solver) {
-    case FEM_EULER : case FEM_NAVIER_STOKES: case FEM_LES: FirstIndex = FLOW_SOL; SecondIndex = NONE; break;
-    case FEM_RANS : FirstIndex = FLOW_SOL; SecondIndex = TURB_SOL; break;
-    default: SecondIndex = NONE; break;
-  }
+    nRowCum_InletFile[0] = 0; nRowCum_Counter[0] = 0;
+    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+      nRowCum_InletFile[iMarker+1] = nRowCum_InletFile[iMarker] + nRow_InletFile[iMarker];
+      nRowCum_Counter[iMarker+1]   = nRowCum_Counter[iMarker]   + nRow_InletFile[iMarker];
+    }
 
-  nVar_First = solver[FirstIndex]->GetnVar();
-  if (SecondIndex != NONE) nVar_Second = solver[SecondIndex]->GetnVar();
-  nVar_Consv_Par = nVar_First + nVar_Second;
+    /*--- Load up the coordinates, sorted into chunks per marker. ---*/
 
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: Register the variables that will be output. To register a  ---*/
-  /*---         variable, two things are required. First, increment the    ---*/
-  /*---         counter for the number of variables (nVar_Par), which      ---*/
-  /*---         controls the size of the data structure allocation, i.e.,  ---*/
-  /*---         the number of columns in an nPoint x nVar structure.       ---*/
-  /*---         Second, add a name for the variable to the vector that     ---*/
-  /*---         holds the string names.                                    ---*/
-  /*--------------------------------------------------------------------------*/
+    jPoint = 0; kPoint = 0;
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
+        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
+          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[kPoint]) {
 
-  /*--- All output files first need the grid coordinates. ---*/
+            /*--- Find our current index for this marker and store coords. ---*/
 
-  GlobalField_Counter  = 1; Variable_Names.push_back("x");
-  GlobalField_Counter += 1; Variable_Names.push_back("y");
-  if (geometry->GetnDim() == 3) {
-    GlobalField_Counter += 1; Variable_Names.push_back("z");
-  }
+            index = nRowCum_Counter[iMarker];
+            InletCoords[0][index] = Buffer_Recv_X[jPoint];
+            InletCoords[1][index] = Buffer_Recv_Y[jPoint];
+            if (nDim == 3) InletCoords[2][index] = Buffer_Recv_Z[jPoint];
 
-  /*--- At a mininum, the restarts and visualization files need the
-   conservative variables, so these follow next. ---*/
+            /*--- Increment the counter for this marker. ---*/
 
-  GlobalField_Counter += nVar_Consv_Par;
+            nRowCum_Counter[iMarker]++;
 
-  Variable_Names.push_back("Density");
-  Variable_Names.push_back("X-Momentum");
-  Variable_Names.push_back("Y-Momentum");
-  if (geometry->GetnDim() == 3) Variable_Names.push_back("Z-Momentum");
-  Variable_Names.push_back("Energy");
+          }
+        }
 
-  /*--- Eventually, turbulence model from second container goes here. ---*/
+        /*--- Increment point counter for marker tags and data. ---*/
 
-  if (!config->GetLow_MemoryOutput()) {
+        kPoint++;
+        jPoint++;
+        
+      }
 
-    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
+      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
 
-    GlobalField_Counter += 1;
-    Variable_Names.push_back("Pressure");
+      jPoint = (iProcessor+1)*MaxLocalPoint;
 
-    GlobalField_Counter += 3;
-    Variable_Names.push_back("Temperature");
-    if (config->GetOutput_FileFormat() == PARAVIEW){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
     }
-    Variable_Names.push_back("Mach");
+  }
 
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-    if (Kind_Solver == FEM_NAVIER_STOKES){
-      GlobalField_Counter += 1;
-      Variable_Names.push_back("Laminar_Viscosity");
-    }
-    if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
-      GlobalField_Counter += 1;
-      Variable_Names.push_back("Eddy_Viscosity");
-    }
+  /*--- Immediately release the temporary data buffers. ---*/
+
+  delete [] Buffer_Send_X;
+  delete [] Buffer_Send_Y;
+  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
+  delete [] Buffer_Send_Str;
+  if (rank == MASTER_NODE) {
+    delete [] Buffer_Recv_X;
+    delete [] Buffer_Recv_Y;
+    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
+    delete [] Buffer_Recv_nPoin;
+    delete [] Buffer_Recv_Str;
+    delete [] nRowCum_Counter;
   }
 
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
+}
 
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+void COutput::Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver) {
 
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+  unsigned short iMarker, iDim, iVar;
+  unsigned long iPoint;
+  su2double turb_val[2] = {0.0,0.0};
 
-  /*--- Get a pointer to the fluid model class from the DG-FEM solver
-   so that we can access the states below. ---*/
+  const unsigned short nDim = geometry->GetnDim();
 
-  CFluidModel *DGFluidModel = solver[FLOW_SOL]->GetFluidModel();
+  bool turbulent = (config->GetKind_Solver() == RANS ||
+                    config->GetKind_Solver() == ADJ_RANS ||
+                    config->GetKind_Solver() == DISC_ADJ_RANS);
 
-  /*--- Allocate the local data structure now that we know how many
-   variables are in the output. ---*/
+  unsigned short nVar_Turb = 0;
+  if (turbulent)
+    switch (config->GetKind_Turb_Model()) {
+      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+        nVar_Turb = 1;
+        turb_val[0] = solver[TURB_SOL]->GetNuTilde_Inf();
+        break;
+      case SST:
+        nVar_Turb = 2;
+        turb_val[0] = solver[TURB_SOL]->GetTke_Inf();
+        turb_val[1] = solver[TURB_SOL]->GetOmega_Inf();
+        break;
+      default:
+        SU2_MPI::Error("Specified turbulence model unavailable or none selected", CURRENT_FUNCTION);
+        break;
+    }
 
-  Local_Data = new su2double*[nLocalPoint_Sort];
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-  }
+  /*--- Count the number of columns that we have for this flow case.
+   Here, we have nDim entries for node coordinates, 2 entries for the total
+   conditions or mass flow, another nDim for the direction vector, and
+   finally entries for the number of turbulence variables. ---*/
 
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Loop over all grid nodes and load up the desired data for  ---*/
-  /*---         the restart and vizualization files. Note that we need to  ---*/
-  /*---         increment the iVar variable after each variable load.      ---*/
-  /*---         The idea is that we're filling up the columns of field     ---*/
-  /*---         data for each iPoint (row) of the data structure.          ---*/
-  /*---         This data will then be sorted, communicated, and written   ---*/
-  /*---         to files automatically after this routine. Note that the   ---*/
-  /*---         ordering of the data loading MUST match the order of the   ---*/
-  /*---         variable registration above for the files to be correct.   ---*/
-  /*--------------------------------------------------------------------------*/
+  unsigned short nCol_InletFile = nDim + 2 + nDim + nVar_Turb;
 
-  jPoint = 0;
+  /*--- Write the inlet profile file. Note that we have already merged
+   all of the information for the markers and coordinates previously
+   in the MergeInletCoordinates() routine. ---*/
 
-  /*--- Access the solution by looping over the owned volume elements. ---*/
+  ofstream node_file("inlet_example.dat");
 
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+  node_file << "NMARK= " << nMarker_InletFile << endl;
 
-    /* Set the pointers for the solution for this element. */
+  for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
 
-    const unsigned long offset = nVar_First*volElem[l].offsetDOFsSolLocal;
-    su2double *solDOFs         = solver[FirstIndex]->GetVecSolDOFs() + offset;
+    /*--- Access the default data for this marker. ---*/
 
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+    string Marker_Tag   = Marker_Tags_InletFile[iMarker];
+    su2double p_total   = config->GetInlet_Ptotal(Marker_Tag);
+    su2double t_total   = config->GetInlet_Ttotal(Marker_Tag);
+    su2double* flow_dir = config->GetInlet_FlowDir(Marker_Tag);
 
-      /*--- Restart the column index with each new point. ---*/
+    /*--- Header information for this marker. ---*/
 
-      iVar = 0;
+    node_file << "MARKER_TAG= " << Marker_Tag              << endl;
+    node_file << "NROW="        << nRow_InletFile[iMarker] << endl;
+    node_file << "NCOL="        << nCol_InletFile          << endl;
 
-      /*--- Get the conservative variables for this particular DOF. ---*/
+    node_file << setprecision(15);
+    node_file << std::scientific;
 
-      const su2double *U = solDOFs + j*nVar_First;
+    /*--- Loop over the data structure and write the coords and vars to file. ---*/
 
-      /*--- Load the coordinate values of the solution DOFs. ---*/
+    for (iPoint = nRowCum_InletFile[iMarker]; iPoint < nRowCum_InletFile[iMarker+1]; iPoint++) {
 
-      const su2double *coor = volElem[l].coorSolDOFs.data() + j*nDim;
-      for(unsigned short k=0; k<nDim; ++k) {
-        Local_Data[jPoint][iVar] = coor[k];
-        iVar++;
+      for (iDim = 0; iDim < nDim; iDim++) {
+        node_file << InletCoords[iDim][iPoint] << "\t";
       }
+      node_file << t_total << "\t" << p_total;
+      for (iDim = 0; iDim < nDim; iDim++) {
+        node_file << "\t" << flow_dir[iDim];
+      }
+      for (iVar = 0; iVar < nVar_Turb; iVar++) {
+        node_file << "\t" << turb_val[iVar];
+      }
+      node_file << endl;
+    }
 
-      /* Load the conservative variables. */
+  }
+  node_file.close();
 
-      for(jVar=0; jVar < nVar_First; ++jVar) {
-        Local_Data[jPoint][iVar] = U[jVar];
-        iVar++;
-      }
+  /*--- Print a message to inform the user about the template file. ---*/
+  
+  stringstream err;
+  err << endl;
+  err << "  Created a template inlet profile file with node coordinates" << endl;
+  err << "  and solver variables at `inlet_example.dat`." << endl;
+  err << "  You can use this file as a guide for making your own inlet" << endl;
+  err << "  specification." << endl << endl;
+  SU2_MPI::Error(err.str(), CURRENT_FUNCTION);
 
-      /*--- Prepare the primitive states. ---*/
+}
 
-      const su2double DensityInv = 1.0/U[0];
-      su2double vel[3], Velocity2 = 0.0;
-      for(iDim=0; iDim<nDim; ++iDim) {
-        vel[iDim] = U[iDim+1]*DensityInv;
-        Velocity2 += vel[iDim]*vel[iDim];
-      }
-      su2double StaticEnergy = U[nDim+1]*DensityInv - 0.5*Velocity2;
-      DGFluidModel->SetTDState_rhoe(U[0], StaticEnergy);
+void COutput::DeallocateInletCoordinates(CConfig *config, CGeometry *geometry) {
 
-      /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
+  unsigned short iDim, nDim = geometry->GetnDim();
 
-      Local_Data[jPoint][iVar] = DGFluidModel->GetPressure(); iVar++;
-      Local_Data[jPoint][iVar] = DGFluidModel->GetTemperature(); iVar++;
-      Local_Data[jPoint][iVar] = DGFluidModel->GetCp(); iVar++;
-      Local_Data[jPoint][iVar] = sqrt(Velocity2)/DGFluidModel->GetSoundSpeed(); iVar++;
+  /*--- The master node alone owns all data found in this routine. ---*/
 
-      /*--- New variables can be loaded to the Local_Data structure here,
-       assuming they were registered above correctly. ---*/
+  if (rank == MASTER_NODE) {
 
-      if (Kind_Solver == FEM_NAVIER_STOKES){
-        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
-      }
-      if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
-        // todo: Export Eddy instead of Laminar viscosity
-        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
-      }
+    /*--- Deallocate memory for inlet coordinate data ---*/
+
+    if (nRow_InletFile != NULL)    delete [] nRow_InletFile;
+    if (nRowCum_InletFile != NULL) delete [] nRowCum_InletFile;
 
-      /*--- Increment the point counter. ---*/
+    Marker_Tags_InletFile.clear();
 
-      jPoint++;
+    for (iDim = 0; iDim < nDim; iDim++) {
+      if (InletCoords[iDim] != NULL) delete [] InletCoords[iDim];
     }
+    if (InletCoords != NULL) delete [] InletCoords;
   }
 
 }
 
+
+
+
 void COutput::PrepareOffsets(CConfig *config, CGeometry *geometry) {
 
   unsigned long iPoint;

From 30d746a7626542fdcd73e81e13d56ca573d2d166 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:07:14 +0200
Subject: [PATCH 160/539] Changed the Local_Data array to a std::vector

---
 SU2_CFD/include/output_structure.hpp |  2 +-
 SU2_CFD/src/output_structure.cpp     | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 09181fd4fd4c..af21f551cf94 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -142,7 +142,7 @@ class COutput {
   unsigned long *nPoint_Lin;
   unsigned long *nPoint_Cum;
   
-  su2double **Local_Data;
+  std::vector< std::vector<su2double>> Local_Data;
   su2double **Local_Data_Copy;      // Local data copy for cte. lift mode
   su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
   su2double **Parallel_Surf_Data;   // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index e39afd5237bd..470e1c7c5e61 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -102,7 +102,6 @@ COutput::COutput(CConfig *config) {
   Conn_Tria_Par = NULL;  Conn_Quad_Par = NULL;       Conn_Tetr_Par = NULL;
   Conn_Hexa_Par = NULL;  Conn_Pris_Par = NULL;       Conn_Pyra_Par = NULL;
   
-  Local_Data         = NULL;
   Local_Data_Copy    = NULL;
   Parallel_Data      = NULL;
   Parallel_Surf_Data = NULL;
@@ -477,12 +476,6 @@ COutput::~COutput(void) {
     delete [] NuFactorOut;
   }
   
-  if (Local_Data != NULL){
-    for (unsigned long iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
-      if (Local_Data[iPoint] != NULL) delete [] Local_Data[iPoint];
-    delete [] Local_Data;
-  }
-  
   /*--- Deallocate the structures holding the linear partitioning ---*/
 
   if (Local_Halo_Sort != NULL) delete [] Local_Halo_Sort;
@@ -6410,18 +6403,9 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
   
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
-    
-  unsigned long iPoint;
+   
+  Local_Data.resize(nLocalPoint_Sort, std::vector<su2double>(GlobalField_Counter, 0.0));
   
-  unsigned short iField;
-    
-  Local_Data = new su2double*[nLocalPoint_Sort];
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
-    Local_Data[iPoint] = new su2double[GlobalField_Counter];
-    for (iField = 0; iField < GlobalField_Counter; iField++){
-      Local_Data[iPoint][iField] = 0.0;
-    }
-  }
 }
 
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){

From 8ce0c1c0e71c08e7eb7dd97233727180c115b37f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:09:43 +0200
Subject: [PATCH 161/539] Updated declaration of writing routines in header

---
 SU2_CFD/include/output_structure.hpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index af21f551cf94..5c4615f9bd4c 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -471,7 +471,7 @@ class COutput {
    * \param[in] solver - Flow, adjoint or linearized solution.
    * \param[in] val_iZone - iZone index.
    */
-  void WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst);
+  void WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry);
 
   /*!
    * \brief Write a native SU2 restart file (binary) in parallel.
@@ -480,7 +480,7 @@ class COutput {
    * \param[in] solver - Flow, adjoint or linearized solution.
    * \param[in] val_iZone - iZone index.
    */
-  void WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst);
+  void WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry);
 
   /*!
    * \brief Write the x, y, & z coordinates to a CGNS output file.
@@ -532,7 +532,7 @@ class COutput {
    * \param[in] val_nZone - Total number of zones.
    * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
    */
-  void WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol);
+  void WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
 
   /*!
    * \brief Write a Paraview binary solution file with parallel output.
@@ -542,7 +542,7 @@ class COutput {
    * \param[in] val_nZone - Total number of zones.
    * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
    */
-  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_nInst, bool surf_sol);
+  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
   
   /*!
    * \brief Write a Tecplot ASCII solution file.
@@ -592,7 +592,7 @@ class COutput {
    * \param[in] val_nZone - Total number of zones.
    * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
    */
-  void WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, unsigned short val_iInst, unsigned short val_nInst, bool surf_sol);
+  void WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
 
   /*!
    * \brief Write a Tecplot binary solution file with parallel output.
@@ -625,7 +625,7 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_iZone - iZone index.
    */
-  void SetSU2_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, ofstream &output_file);
+  void SetSU2_MeshASCII(CConfig *config, CGeometry *geometry);
   
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
@@ -842,18 +842,18 @@ class COutput {
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
+   * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
-  void SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool val_sort);
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort);
 
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing (DG-FEM solver).
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_nZone - iZone index.
+   * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
    */
-  void SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
+  void SortConnectivity_FEM(CConfig *config, CGeometry *geometry, bool surf);
 
   /*!
    * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.

From 21be2e3e681599822735d8d74a22acf3a4b2d8e0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:10:04 +0200
Subject: [PATCH 162/539] Added default filenames to COutput

---
 SU2_CFD/src/output_structure.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 470e1c7c5e61..d7454609ab4a 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -51,6 +51,12 @@ COutput::COutput(CConfig *config) {
   
   ConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
   MultiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  
+  /*--- Set default filenames ---*/
+  
+  SurfaceFilename = "surface";
+  VolumeFilename  = "volume";
+  RestartFilename = "restart";
 
   unsigned short iDim, iZone, iSpan, iMarker;
   

From 814446b38ef551d46597529624e6c2e470a57018 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:19:58 +0200
Subject: [PATCH 163/539] Added a routine to append all necessary numbers to a
 filename

---
 SU2_CFD/include/output_structure.hpp |  9 +++++++++
 SU2_CFD/src/output_structure.cpp     | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 5c4615f9bd4c..3d1a9ec488f4 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -611,6 +611,15 @@ class COutput {
    */
   void WriteSurface_CSV(CConfig *config, CGeometry *geometry);
   
+  /*!
+   * \brief Add any numbers necessary to the filename (iteration number, zone ID ...)
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] filename - the base filename.
+   * \param[in] ext - the extension to be added.
+   * \return The new filename
+   */
+  string GetFilename(CConfig *config, string filename, string ext);
+  
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index d7454609ab4a..5bac362c4023 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -1041,6 +1041,27 @@ void COutput::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsi
 }
 
 
+string COutput::GetFilename(CConfig *config, string filename, string ext){
+  
+  /*--- Add the extension --- */
+  
+  filename = filename + string(ext);
+  
+  /*--- Append the zone number if multizone problems ---*/
+  if (config->GetnZone() > 1)
+    filename = config->GetMultizone_FileName(filename, config->GetiZone(), ext);
+
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (config->GetnTimeInstances() > 1)
+    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ext);
+
+  if (config->GetTime_Domain()){
+    filename = config->GetUnsteady_FileName(filename, config->GetExtIter(), ext);
+  }
+  
+  return filename;
+}
+
 void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
                                        CGeometry ****geometry,
                                        CConfig **config,

From 77eb003d822e51bdf5b9943b8c1c1ed64418e8f5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:20:41 +0200
Subject: [PATCH 164/539] Removed declarations from old merging routines from
 header file

---
 SU2_CFD/include/output_structure.hpp | 133 ---------------------------
 1 file changed, 133 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 3d1a9ec488f4..36ac89953eaf 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -314,51 +314,7 @@ class COutput {
    * \brief Destructor of the class. 
    */
   virtual ~COutput(void);
-
-  /*!
-   * \brief Writes and organizes the all the output files, except the history one, for serial computations with the FEM solver.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Total number of domains in the grid file.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetResult_Files_FEM(CSolver ****solver_container, CGeometry ***geometry, CConfig **config,
-                       unsigned long iExtIter, unsigned short val_nZone);
   
-  /*!
-   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Total number of domains in the grid file.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                               unsigned long iExtIter, unsigned short val_nZone);
-
-  /*!
-   * \brief Writes and organizes the all the output files, except the history one, for DG-FEM simulations (SU2_SOL).
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Total number of domains in the grid file.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                   unsigned long iExtIter, unsigned short val_nZone);
-
-  /*!
-   * \brief Writes and organizes the all the output files, except the history one, for serial computations.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file);
-
   /*!
    * \brief Create and write the file with the FSI convergence history.
    * \param[in] iIter - Current iteration.
@@ -366,95 +322,6 @@ class COutput {
    */
   bool PrintOutput(unsigned long iIter, unsigned long iFreq);
 
-  /*!
-   * \brief Merge the geometry into a data structure used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Merge the FEM geometry into a data structure used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Merge the node coordinates from all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void MergeCoordinates(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Merge the node coordinates from all processors for the FEM solver.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void MergeCoordinates_FEM(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Merge the connectivity for a single element type from all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void MergeVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-  
-  /*!
-   * \brief Merge the connectivity for a single element type from all processors for the FEM solver.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void MergeVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-  
-  /*!
-   * \brief Merge the connectivity for a single element type from all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void MergeSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-  
-  /*!
-   * \brief Merge the connectivity for a single element type from all processors for the FEM solver.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void MergeSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-
-  /*!
-   * \brief Merge the FEM solution into a data structure used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeSolution_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-  
-  /*!
-   * \brief Merge the solution into a data structure used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeBaselineSolution(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone);
-
-  /*!
-   * \brief Merge the solution into a data structure used for output file writing (DG-FEM).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void MergeBaselineSolution_FEM(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone);
-
   /*!
    * \brief Write a native SU2 restart file.
    * \param[in] config - Definition of the particular problem.

From 0a0642177fd5a5692e9fc11badbcf9b189e3d88e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:21:36 +0200
Subject: [PATCH 165/539] Added new routines to load solution data and to write
 volume and surface data

---
 SU2_CFD/include/output_structure.hpp |  28 ++++
 SU2_CFD/src/output_structure.cpp     | 239 +++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 36ac89953eaf..4b3f9d099d6d 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -478,6 +478,34 @@ class COutput {
    */
   void WriteSurface_CSV(CConfig *config, CGeometry *geometry);
   
+  /*!
+   * \brief Load the data from the solvers into the local data array and sort it for the linear partitioning.
+   * 
+   * After calling this method the data is distributed to all processors based on a linear partition 
+   * and is ready to be written in parallel to file using the SetVolume_Output or SetSurface_Output routines.
+   * 
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
+  void Load_Data(CGeometry *geometry, CConfig *config, CSolver **solver_container);
+    
+  /*!
+   * \brief Write the linear partitioned volume data in parallel to file. Load_Data has to be called before!
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] format - The data format of the output files.
+   */
+  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  
+  /*!
+   * \brief Write the linear partitioned surface data in parallel to file. Load_Data has to be called before!
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] format - The data format of the output files.
+   */
+  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  
   /*!
    * \brief Add any numbers necessary to the filename (iteration number, zone ID ...)
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 5bac362c4023..552c24f3aa53 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -1062,6 +1062,245 @@ string COutput::GetFilename(CConfig *config, string filename, string ext){
   return filename;
 }
 
+
+void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_container){
+  
+  /*--- Collect that data defined in the subclasses from the different processors ---*/
+  
+  if (rank == MASTER_NODE)
+    cout << endl << "Loading solution output data locally on each rank." << endl;
+  
+  CollectVolumeData(config, geometry, solver_container);
+  
+  /*--- Sort the data, needed for volume and surface output ---*/
+  
+  if (rank == MASTER_NODE) 
+    cout << "Sorting output data across all ranks." << endl;
+  
+  if (fem_output){
+    SortOutputData_FEM(config, geometry);
+  }
+  else {
+    SortOutputData(config, geometry);
+  }
+}
+
+void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+  
+  unsigned short iZone = config->GetiZone();
+  unsigned short nZone = config->GetnZone();
+
+  /*--- Write files depending on the format --- */
+  
+  switch (format) {
+  
+  case CSV:
+    
+    SortConnectivity(config, geometry, true, true);
+    
+    if (rank == MASTER_NODE) {
+        cout << "Writing surface CSV file." << endl;
+    }
+    
+    WriteSurface_CSV(config, geometry);
+  
+    break;  
+    
+  case TECPLOT_BINARY:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, true, false);
+    
+    /*--- Write tecplot binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Tecplot binary file surface solution file." << endl;  
+    }
+    
+    WriteTecplotBinary_Parallel(config, geometry, iZone, config->GetnZone(), true);
+      
+    break;
+    
+  case TECPLOT:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, true, true);
+    
+    /*--- Write tecplot binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Tecplot ASCII file surface solution file." << endl;
+    }
+    
+    WriteTecplotASCII_Parallel(config, geometry, iZone, config->GetnZone(), true);
+
+    break;
+    
+  case PARAVIEW_BINARY:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, true, true);
+    
+    /*--- Write paraview binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Paraview binary file surface solution file." << endl;
+    }
+    
+    WriteParaViewBinary_Parallel(config, geometry, iZone, nZone, true);
+    
+    break;
+    
+  case PARAVIEW:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, true, true);
+    
+    /*--- Write paraview binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Paraview ASCII file surface solution file." << endl;
+    }
+
+    WriteParaViewASCII_Parallel(config, geometry, iZone, nZone, true);
+
+    break;
+  default:
+    SU2_MPI::Error("Requested surface output format not available.", CURRENT_FUNCTION);
+    break;
+  } 
+
+  /*--- Clean up the surface data that was only needed for output. ---*/
+ 
+  DeallocateConnectivity_Parallel(config, geometry, true);
+  
+}
+
+void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+   
+  unsigned short iZone = config->GetiZone();
+  unsigned short nZone = config->GetnZone();
+
+  /*--- Write files depending on the format --- */
+  
+  switch (format) {
+    
+  case SU2_RESTART_ASCII:
+    
+    if (rank == MASTER_NODE) {
+        cout << "Writing SU2 ASCII restart file." << endl;     
+    }
+   
+    WriteRestart_Parallel_ASCII(config, geometry);
+    
+    break;
+    
+  case SU2_RESTART_BINARY:
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing SU2 binary restart file." << endl;   
+    }
+
+    WriteRestart_Parallel_Binary(config, geometry);
+    
+    break;
+  
+  case SU2_MESH:
+    
+    /*--- Load and sort the output data and connectivity.
+     *  Note that the solver container is not need in this case. ---*/
+    
+    SortConnectivity(config, geometry, false, true);
+    
+    /*--- Set the mesh ASCII format ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing SU2 mesh file." << endl;
+    }
+    
+    SetSU2_MeshASCII(config, geometry);
+    
+    break;    
+    
+  case TECPLOT_BINARY:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, false, false);
+    
+    /*--- Write tecplot binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Tecplot binary file volume solution file." << endl;
+    }
+    
+    WriteTecplotBinary_Parallel(config, geometry, iZone, config->GetnZone(), false);
+      
+    break;
+    
+  case TECPLOT:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, false, true);
+    
+    /*--- Write tecplot binary ---*/
+    
+    if (rank == MASTER_NODE) {
+      cout << "Writing Tecplot ASCII file volume solution file." << endl;
+    }
+    
+    WriteTecplotASCII_Parallel(config, geometry, iZone, config->GetnZone(), false);
+
+    break;
+    
+  case PARAVIEW_BINARY:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, false, true);
+    
+    /*--- Write paraview binary ---*/
+    if (rank == MASTER_NODE) {
+      cout << "Writing Paraview binary file volume solution file." << endl;
+    }
+    
+    WriteParaViewBinary_Parallel(config, geometry, iZone, nZone, false);
+    
+    break;
+    
+  case PARAVIEW:
+    
+    /*--- Load and sort the output data and connectivity. ---*/
+    
+    SortConnectivity(config, geometry, false, true);
+    
+    /*--- Write paraview binary ---*/
+    if (rank == MASTER_NODE) {
+        cout << "Writing Paraview ASCII file volume solution file." << endl;      
+    }
+    
+    WriteParaViewASCII_Parallel(config, geometry, iZone, nZone, false);
+
+    break;
+    
+  default:
+    SU2_MPI::Error("Requested volume output format not available.", CURRENT_FUNCTION);
+    break;
+  } 
+
+  /*--- Clean up the surface data that was only needed for output. ---*/
+  
+  if (format != SU2_RESTART_ASCII && format != SU2_RESTART_BINARY)
+    DeallocateConnectivity_Parallel(config, geometry, false);
+  
+}
+
+
 void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
                                        CGeometry ****geometry,
                                        CConfig **config,

From 0fb3a157618597fdbcc011d7edcfb9dd9a4a68a4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:23:17 +0200
Subject: [PATCH 166/539] Added missing declarations of Get/Set filename
 routines in COutput

---
 SU2_CFD/include/output_structure.hpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 4b3f9d099d6d..806c614756ff 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -971,6 +971,19 @@ class COutput {
   void Postprocess_HistoryFields(CConfig *config);
   
   COutputLegacy* GetLegacyOutput();
+  
+  void SetVolume_Filename(string filename);
+  
+  void SetSurface_Filename(string filename);
+  
+  string GetVolume_Filename();
+  
+  string GetSurface_Filename(); 
+  
+  void SetRestart_Filename(string filename);
+    
+  string GetRestart_Filename();
+  
 };
 
 /*! \class CFlowOutput

From 931c91fe9370a385433b5bf7ec42a3178db4b0e1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:27:13 +0200
Subject: [PATCH 167/539] Disabled writing of metadata for now.

---
 SU2_CFD/src/output_structure.cpp | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 552c24f3aa53..df094f0a8d18 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -4743,25 +4743,25 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry,
 
   /*--- Write the metadata (master rank alone) ----*/
 
-  if (rank == MASTER_NODE) {
-    if (dual_time)
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-    else
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-
-    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-    }
-  }
+//  if (rank == MASTER_NODE) {
+//    if (dual_time)
+//      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+//    else
+//      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+//    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+//    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+//    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+//    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+//    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+//    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+//    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+
+//    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+//          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+//          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+//      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+//    }
+//  }
 
   /*--- All processors close the file. ---*/
 
@@ -4855,11 +4855,11 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
     0.0
   };
 
-  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
-  }
+//  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+//        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+//        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+//    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
+//  }
 
   /*--- Set a timer for the binary file writing. ---*/
   

From f3d580c26f949a440d16a09f6c1973fb382c6cce Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:28:04 +0200
Subject: [PATCH 168/539] Adapted calls for writing routines

---
 SU2_CFD/src/output_structure.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index df094f0a8d18..9fa7f23b7ae0 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -1424,10 +1424,10 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
     if (config[iZone]->GetWrt_Binary_Restart()) {
       if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0]);
     } else {
       if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], iZone, iInst);
+      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0]);
     }
 
     /*--- Write a slice on a structured mesh if requested. ---*/
@@ -1490,8 +1490,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             /*--- Write a Tecplot ASCII file ---*/
 
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, false);
             break;
 
           case FIELDVIEW:
@@ -1509,8 +1508,8 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
           if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
           WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                      iZone, val_nZone, false);
-            break;
+              iZone, val_nZone, false);
+          break;
 
           case FIELDVIEW_BINARY:
 
@@ -1525,8 +1524,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             /*--- Write a Paraview ASCII file ---*/
 
             if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, false);
             break;
             
           case PARAVIEW_BINARY:
@@ -1535,7 +1533,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             
             if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
             WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                        solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, false);
+                                        iZone, val_nZone, false);
             break;
 
           default:
@@ -1553,8 +1551,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             /*--- Write a Tecplot ASCII file ---*/
 
             if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
             break;
 
           case TECPLOT_BINARY:
@@ -1571,8 +1568,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             /*--- Write a Paraview ASCII file ---*/
 
             if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, true);
+            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
             break;
 
           case PARAVIEW_BINARY:
@@ -1580,8 +1576,7 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
             /*--- Write a Paraview binary file ---*/
             
             if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                         solver_container[iZone][iInst][MESH_0], iZone, val_nZone, nInst, true);
+            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
             break;
             
 

From f586b67b0aeaa6dcf6beb0cd61983172ead50ee7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:28:45 +0200
Subject: [PATCH 169/539] Merged SortConnectivity and SortSurfaceConnectivity

---
 SU2_CFD/src/output_structure.cpp | 75 ++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 9fa7f23b7ae0..89cc01ed0b1e 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -1605,60 +1605,79 @@ void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
 
 }
 
-void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool val_sort) {
+void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort) {
 
-  /*--- Flags identifying the types of files to be written. ---*/
-  
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
-  
   /*--- Sort connectivity for each type of element (excluding halos). Note
    In these routines, we sort the connectivity into a linear partitioning
    across all processors based on the global index of the grid nodes. ---*/
   
   /*--- Sort volumetric grid connectivity. ---*/
   
-  if (Wrt_Vol) {
+  if (!surf) {
     
     if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
       cout <<"Sorting volumetric grid connectivity." << endl;
     
-    SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
-    SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
-    SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
-    SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
-    SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
-    SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);
+    if (!fem_output){
+      SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
+      SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
+      SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
+      SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
+      SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
+      SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);  
+    } else {
+      SortVolumetricConnectivity_FEM(config, geometry, TRIANGLE     );
+      SortVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL);
+      SortVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON  );
+      SortVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON   );
+      SortVolumetricConnectivity_FEM(config, geometry, PRISM        );
+      SortVolumetricConnectivity_FEM(config, geometry, PYRAMID      );
+    }
+    
+    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
     
+    unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
   }
   
   /*--- Sort surface grid connectivity. ---*/
   
-  if (Wrt_Srf) {
+  else {
     
     if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
       cout <<"Sorting surface grid connectivity." << endl;
     
-    SortSurfaceConnectivity(config, geometry, LINE         );
-    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
+    if (!fem_output){
+      SortSurfaceConnectivity(config, geometry, LINE         );
+      SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+      SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
+    } else {
+      SortSurfaceConnectivity_FEM(config, geometry, LINE         );
+      SortSurfaceConnectivity_FEM(config, geometry, TRIANGLE     );
+      SortSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);   
+    }    
     
-  }
-  
-  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
-  
-  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
+    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
 #ifndef HAVE_MPI
-  nGlobal_Elem_Par = nTotal_Elem;
-  nSurf_Elem_Par   = nTotal_Surf_Elem;
+    nSurf_Elem_Par   = nTotal_Surf_Elem;
 #else
-  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
-  
+    
+    /*--- Sort the surface output data --- */
+    if (fem_output){
+      SortOutputData_Surface_FEM(config, geometry);
+    } else {
+      SortOutputData_Surface(config, geometry);
+    }
+  }
 }
 
+
 void COutput::SortVolumetricConnectivity(CConfig *config,
                                          CGeometry *geometry,
                                          unsigned short Elem_Type,

From 99eaf22434f83b169c78a20ff60576eb4ee2b338 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:32:11 +0200
Subject: [PATCH 170/539] Added missing deallocation call for surface data

---
 SU2_CFD/src/output_structure.cpp | 59 ++++++++++----------------------
 1 file changed, 18 insertions(+), 41 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 89cc01ed0b1e..cffe103b899e 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -1178,6 +1178,8 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
  
   DeallocateConnectivity_Parallel(config, geometry, true);
   
+  DeallocateSurfaceData_Parallel(config, geometry);
+  
 }
 
 void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
@@ -4647,7 +4649,7 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
 }
 
-void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry) {
   
   /*--- Local variables ---*/
   
@@ -4656,43 +4658,29 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry,
   unsigned long iPoint, iExtIter = config->GetExtIter();
   bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  bool adjoint   = (config->GetContinuous_Adjoint() ||
-                    config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+
   ofstream restart_file;
   string filename;
   
   int iProcessor;
-
-  /*--- Retrieve filename from config ---*/
   
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
+  filename = RestartFilename;
   
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+    filename= config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
   
   /*--- Append the zone number if multiple instance problems ---*/
   if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+    filename= config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
   } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
   
   /*--- Only the master node writes the header. ---*/
@@ -4783,15 +4771,13 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry,
   
 }
 
-void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_iInst) {
+void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry) {
 
   /*--- Local variables ---*/
 
   unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
   unsigned long iPoint, iExtIter = config->GetExtIter();
   bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool adjoint   = (config->GetContinuous_Adjoint() ||
-                    config->GetDiscrete_Adjoint());
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool wrt_perf  = config->GetWrt_Performance();
@@ -4799,33 +4785,24 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry,
   string filename;
   char str_buf[CGNS_STRING_SIZE], fname[100];
   su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
-
-  /*--- Retrieve filename from config ---*/
-
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
+  
+  filename = RestartFilename;
 
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, val_iZone);
+    filename= config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
 
   /*--- Append the zone number if multiple instance problems ---*/
   if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, val_iInst);
+    filename= config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
   } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter));
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   }
 
   strcpy(fname, filename.c_str());

From 4589bea219f82e5ae60fa22187033ebdac5db2ab Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:33:11 +0200
Subject: [PATCH 171/539] Merge SortConnectivity_FEM and
 SortSurfaceConnectivity_FEM

---
 SU2_CFD/src/output_structure.cpp | 43 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index cffe103b899e..8dc7d0d33f9c 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -5889,12 +5889,8 @@ void COutput::PrepareOffsets(CConfig *config, CGeometry *geometry) {
   
 }
 
-void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
+void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, bool surf) {
 
-  /*--- Flags identifying the types of files to be written. ---*/
-
-  bool Wrt_Vol = config->GetWrt_Vol_Sol();
-  bool Wrt_Srf = config->GetWrt_Srf_Sol();
 
   /*--- Sort connectivity for each type of element (excluding halos). Note
    In these routines, we sort the connectivity into a linear partitioning
@@ -5902,7 +5898,7 @@ void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigne
 
   /*--- Sort volumetric grid connectivity. ---*/
 
-  if (Wrt_Vol) {
+  if (!surf) {
 
     if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
       cout <<"Sorting volumetric grid connectivity." << endl;
@@ -5913,12 +5909,20 @@ void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigne
     SortVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON   );
     SortVolumetricConnectivity_FEM(config, geometry, PRISM        );
     SortVolumetricConnectivity_FEM(config, geometry, PYRAMID      );
-
+    
+    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  
+    unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+  #ifndef HAVE_MPI
+    nGlobal_Elem_Par = nTotal_Elem;
+  #else
+    SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  #endif
   }
 
   /*--- Sort surface grid connectivity. ---*/
 
-  if (Wrt_Srf) {
+  else {
 
     if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
       cout <<"Sorting surface grid connectivity." << endl;
@@ -5926,21 +5930,16 @@ void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigne
     SortSurfaceConnectivity_FEM(config, geometry, LINE         );
     SortSurfaceConnectivity_FEM(config, geometry, TRIANGLE     );
     SortSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);
-
-  }
-
-  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
-
-  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
-#ifndef HAVE_MPI
-  nGlobal_Elem_Par = nTotal_Elem;
-  nSurf_Elem_Par   = nTotal_Surf_Elem;
-#else
-  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
+    
+    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
   
+    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
+  #ifndef HAVE_MPI
+    nSurf_Elem_Par   = nTotal_Surf_Elem;
+  #else
+    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  #endif
+  }
 }
 
 void COutput::SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {

From 8d75815322cde9ae270f4ebf529aa9f938915d62 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:34:08 +0200
Subject: [PATCH 172/539] Removed more old merging routines

---
 SU2_CFD/src/output_structure.cpp | 409 -------------------------------
 1 file changed, 409 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 8dc7d0d33f9c..944a4923f0de 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -632,415 +632,6 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
   
 }
 
-void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry, CConfig **config,
-                                      unsigned long iExtIter, unsigned short val_nZone) {
-  
-  unsigned short iZone, iInst, nInst;
-  
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    nInst = config[iZone]->GetnTimeInstances();
-
-    for (iInst = 0; iInst < nInst; iInst++) {
-
-      config[iZone]->SetiInst(iInst);
-
-      /*--- Flags identifying the types of files to be written. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      if (config[iZone]->GetKind_SU2() == SU2_DOT) { Wrt_Vol = false; }
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-
-      /*--- Get the file output format ---*/
-
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-
-      /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging connectivities in the Master node." << endl;
-        MergeConnectivity(config[iZone], geometry[iZone][iInst], iZone);
-      }
-
-      /*--- Merge the solution data needed for volume solutions and restarts ---*/
-
-      if ((Wrt_Vol || Wrt_Srf)) {
-        if (rank == MASTER_NODE) cout << "Merging solution in the Master node." << endl;
-        MergeBaselineSolution(config[iZone], geometry[iZone][iInst], solver[iZone][iInst], iZone);
-      }
-
-      /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-
-
-      if (rank == MASTER_NODE) {
-
-        if (Wrt_Vol) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (volume grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- Write a FieldView ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (volume grid)." << endl;
-            SetTecplotBinary_DomainMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- Write a binary binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (volume grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file (surface grid)." << endl;
-            SetTecplotASCII(config[iZone], geometry[iZone][iInst], &solver[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary solution file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot Binary file (surface grid)." << endl;
-            SetTecplotBinary_SurfaceMesh(config[iZone], geometry[iZone][iInst], iZone);
-            SetTecplotBinary_SurfaceSolution(config[iZone], geometry[iZone][iInst], iZone);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII file (surface grid)." << endl;
-            SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
-            break;
-
-          default:
-            break;
-          }
-        }
-
-        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
-          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-        }
-
-        if (FileFormat == TECPLOT_BINARY) {
-          if (!wrote_base_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-          if (!wrote_surf_file)
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], wrote_surf_file);
-        }
-
-        if (Wrt_Vol || Wrt_Srf)
-          DeallocateSolution(config[iZone], geometry[iZone][iInst]);
-      }
-
-
-
-      /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-
-#ifdef HAVE_MPI
-      SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-
-    }
-
-  }
-}
-
-void COutput::SetMesh_Files(CGeometry **geometry, CConfig **config, unsigned short val_nZone, bool new_file, bool su2_file) {
-
-  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-  unsigned short iZone;
-  ofstream output_file;
-  string str;
-
-  /*--- Read the name of the output and input file ---*/
-
-  if (su2_file) {
-  if (rank == MASTER_NODE) {
-      str = config[ZONE_0]->GetMesh_Out_FileName();
-      strcpy (out_file, str.c_str());
-      strcpy (cstr, out_file);
-      output_file.precision(15);
-      output_file.open(cstr, ios::out);
-      if (val_nZone > 1){
-        output_file << "NZONE= " << val_nZone << endl;
-      }
-    }
-  }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    
-    /*--- Flags identifying the types of files to be written. ---*/
-    
-    bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
-    bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
-    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
-    
-    /*--- Merge the node coordinates and connectivity if necessary. This
-     is only performed if a volume solution file is requested, and it
-     is active by default. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid connectivity." << endl;
-    MergeConnectivity(config[iZone], geometry[iZone], iZone);
-    
-    /*--- Merge coordinates of all grid nodes (excluding ghost points).
-     The grid coordinates are always merged and included first in the
-     restart files. ---*/
-    
-    if (rank == MASTER_NODE) cout <<"Merging grid coordinates." << endl;
-    MergeCoordinates(config[iZone], geometry[iZone]);
-    
-    /*--- Write restart, Tecplot or Paraview files using the merged data.
-     This data lives only on the master, and these routines are currently
-     executed by the master proc alone (as if in serial). ---*/
-    
-    if (rank == MASTER_NODE) {
-      
-      if (Wrt_Vol) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-
-        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false,new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        }
-        
-      }
-      
-      if (Wrt_Srf) {
-        
-        if (rank == MASTER_NODE) cout <<"Writing surface mesh file." << endl;
-        
-        /*--- Write a Tecplot ASCII file ---*/
-        
-        if (config[iZone]->GetOutput_FileFormat()==PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true,new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview surface mesh file by default." << endl;
-          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, true, new_file);
-        }
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot surface mesh file by default." << endl;
-          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, true, new_file);
-        }
-        
-      }
-      
-      /*--- Write a .su2 ASCII file ---*/
-
-      if (su2_file) {
-
-      if (rank == MASTER_NODE) cout <<"Writing .su2 file." << endl;
-
-        SetSU2_MeshASCII(config[iZone], geometry[iZone], iZone, output_file);
-      
-      /*--- Write an stl surface file ---*/
-
-      if (rank == MASTER_NODE) cout <<"Writing .stl surface file." << endl;
-      
-        SetSTL_MeshASCII(config[iZone], geometry[iZone]);
-        
-      }
-      
-      /*--- Write a binary file with the grid coordinates alone. ---*/
-      
-      if (Wrt_Crd) {
-        if (rank == MASTER_NODE) cout <<"Writing .dat binary coordinates file." << endl;
-        WriteCoordinates_Binary(config[iZone], geometry[iZone], iZone);
-      }
-
-      
-      /*--- Deallocate connectivity ---*/
-      
-      DeallocateConnectivity(config[iZone], geometry[iZone], true);
-      DeallocateConnectivity(config[iZone], geometry[iZone], false);
-      DeallocateCoordinates(config[iZone], geometry[iZone]);
-      
-    }
-
-    /*--- Final broadcast (informing other procs that the base output
-     file was written). ---*/
-    
-#ifdef HAVE_MPI
-    SU2_MPI::Bcast(&wrote_base_file, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-    /*--- Write an csv surface file, done in parallel ---*/
-
-    if (rank == MASTER_NODE) cout <<"Writing .csv surface file." << endl;
-
-    if (su2_file) SetCSV_MeshASCII(config[iZone], geometry[iZone]);
-
-  }
-
-  if (rank == MASTER_NODE) {
-    if (su2_file){
-      output_file.close();
-    }
-  }
-}
-
-void COutput::SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
-
-  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
-  unsigned long iVertex, iPoint, nPoint, nVertex;
-  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
-
-  unsigned short iZone;
-
-  CSolver ***solver = new CSolver**[val_nZone];
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    solver[iZone] = new CSolver*[1];
-  }
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-
-    nPoint = geometry[iZone][INST_0]->GetnPoint();
-    nDim   = geometry[iZone][INST_0]->GetnDim();
-    nMarker = config[iZone]->GetnMarker_All();
-    nVar = nDim + 1;
-
-    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
-
-    vector<string> fieldnames;
-    fieldnames.push_back("\"Point\"");
-    fieldnames.push_back("\"x\"");
-    fieldnames.push_back("\"y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"z\"");
-    }
-    fieldnames.push_back("\"Sensitivity_x\"");
-    fieldnames.push_back("\"Sensitivity_y\"");
-    if (nDim == 3) {
-      fieldnames.push_back("\"Sensitivity_z\"");
-    }
-    fieldnames.push_back("\"Surface_Sensitivity\"");
-
-    solver[iZone][INST_0] = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
-
-    for (iPoint = 0; iPoint < nPoint; iPoint++) {
-      for (iDim = 0; iDim < nDim; iDim++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
-      }
-      for (iVar = 0; iVar < nDim; iVar++) {
-        solver[iZone][INST_0]->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
-      }
-    }
-
-    /*--- Compute the sensitivity in normal direction ---*/
-
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX )   ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL )  ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL )  ||
-         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
-        
-        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
-
-        for (iVertex = 0; iVertex < nVertex; iVertex++) {
-          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
-          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
-          Prod = 0.0;
-          Area = 0.0;
-          for (iDim = 0; iDim < nDim; iDim++) {
-
-            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
-
-            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
-
-            /*--- Calculate scalar product for projection onto the normal vector ---*/
-
-            Prod += Normal[iDim]*SensDim;
-
-            Area += Normal[iDim]*Normal[iDim];
-          }
-
-          Area = sqrt(Area);
-
-          /*--- Projection of the gradient onto the normal vector of the surface ---*/
-
-          Sens = Prod/Area;
-
-          solver[iZone][INST_0]->node[iPoint]->SetSolution(2*nDim, Sens);
-
-        }
-      }
-    }
-  }
-
-  /*--- Merge the information and write the output files ---*/
-
-  SetBaselineResult_Files(solver, geometry, config, 0, val_nZone);
-
-  for (iZone = 0; iZone < val_nZone; iZone++) {
-    delete solver[iZone][0];
-    delete solver[iZone];
-  }
-  delete [] solver;
-}
-
-
 string COutput::GetFilename(CConfig *config, string filename, string ext){
   
   /*--- Add the extension --- */

From 45690b16c396ab553772296eb965498f8cac5a66 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 15:34:24 +0200
Subject: [PATCH 173/539] Removed check for solution field

---
 SU2_CFD/src/output_structure.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 944a4923f0de..0207f104d64b 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -6171,18 +6171,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
 
-  /*--- Make sure that coordinates and conservative variables are always in the volume output --- */
+  /*--- Make sure that coordinates are always in the volume output --- */
   
   if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
     RequestedVolumeFields.push_back("COORDINATES");
     nRequestedVolumeFields++;
   }
   
-  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "SOLUTION") != RequestedVolumeFields.end())) {
-    RequestedVolumeFields.push_back("SOLUTION");
-    nRequestedVolumeFields++;
-  }
-  
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);

From 79cbcbbb72a5f37c22a79daf19742162487d264c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:26:03 +0200
Subject: [PATCH 174/539] Moved filename routine to config structure

---
 Common/include/config_structure.hpp  |  9 +++++++++
 Common/src/config_structure.cpp      | 26 ++++++++++++++++++++++++++
 SU2_CFD/include/output_structure.hpp | 11 +----------
 SU2_CFD/src/output_baseline.cpp      |  0
 4 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 SU2_CFD/src/output_baseline.cpp

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 9882e9b8b83a..ccbc1dc22b8e 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5467,6 +5467,15 @@ class CConfig {
    */
   string GetRestart_HeatFileName(void);
   
+  /*!
+   * \brief Add any numbers necessary to the filename (iteration number, zone ID ...)
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] filename - the base filename.
+   * \param[in] ext - the extension to be added.
+   * \return The new filename
+   */
+  string GetFilename(string filename, string ext);
+  
   /*!
    * \brief Append the zone index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 927de426804f..353e0fe8c4bc 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7279,6 +7279,32 @@ CConfig::~CConfig(void) {
 
 }
 
+string CConfig::GetFilename(string filename, string ext){
+  
+  /*--- Remove any extension --- */
+  
+  unsigned short lastindex = filename.find_last_of(".");
+  filename = filename.substr(0, lastindex);
+  
+  /*--- Add the extension --- */
+  
+  filename = filename + string(ext);
+  
+  /*--- Append the zone number if multizone problems ---*/
+  if (GetnZone() > 1)
+    filename = GetMultizone_FileName(filename, GetiZone(), ext);
+
+  /*--- Append the zone number if multiple instance problems ---*/
+  if (GetnTimeInstances() > 1)
+    filename = GetMultiInstance_FileName(filename, GetiInst(), ext);
+
+  if (GetWrt_Unsteady()){
+    filename = GetUnsteady_FileName(filename, GetExtIter(), ext);
+  }
+  
+  return filename;
+}
+
 string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string ext) {
 
   string UnstExt, UnstFilename = val_filename;
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 806c614756ff..b5ee7abff5fd 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -505,16 +505,7 @@ class COutput {
    * \param[in] format - The data format of the output files.
    */
   void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format);
-  
-  /*!
-   * \brief Add any numbers necessary to the filename (iteration number, zone ID ...)
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] filename - the base filename.
-   * \param[in] ext - the extension to be added.
-   * \return The new filename
-   */
-  string GetFilename(CConfig *config, string filename, string ext);
-  
+
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_baseline.cpp b/SU2_CFD/src/output_baseline.cpp
new file mode 100644
index 000000000000..e69de29bb2d1

From e1c56469d0f388a0373822f7a8ea6c0c9c94f2ee Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:26:21 +0200
Subject: [PATCH 175/539] Added missing enums

---
 Common/include/option_structure.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index b859df1fc894..4c6435b53d23 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1554,8 +1554,12 @@ enum ENUM_OUTPUT {
   CSV = 5,			         /*!< \brief Comma-separated values format for the solution output. */
   CGNS_SOL = 6,  	     	 /*!< \brief CGNS format for the solution output. */
   PARAVIEW = 7,  		     /*!< \brief Paraview ASCII format for the solution output. */
-  PARAVIEW_BINARY = 8    /*!< \brief Paraview binary format for the solution output. */
+  PARAVIEW_BINARY = 8,    /*!< \brief Paraview binary format for the solution output. */
+  SU2_MESH      = 9,      /*!< \brief SU2 mesh format (only used internally). */
+  SU2_RESTART_BINARY = 10,/*!< \brief SU2 binary restart format (only used internally). */
+  SU2_RESTART_ASCII = 11  /*!< \brief SU2 ASCII restart format (only used internally). */
 };
+
 static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPUT>
 ("TECPLOT", TECPLOT)
 ("TECPLOT_BINARY", TECPLOT_BINARY)

From 48d817c2843a6504d59e30b31ee19f57b64e88fb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:28:18 +0200
Subject: [PATCH 176/539] Added baseline output class

---
 SU2_CFD/include/output_structure.hpp |  28 ++++-
 SU2_CFD/include/solver_structure.hpp |  11 +-
 SU2_CFD/include/solver_structure.inl |   2 +
 SU2_CFD/src/output_baseline.cpp      |  86 ++++++++++++++
 SU2_CFD/src/output_structure.cpp     |  11 +-
 SU2_CFD/src/solver_structure.cpp     |  41 ++-----
 SU2_SOL/obj/Makefile.am              |   2 +
 SU2_SOL/src/SU2_SOL.cpp              | 162 +++++++++++++++++++++++----
 8 files changed, 287 insertions(+), 56 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index b5ee7abff5fd..606adfa2467b 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -1487,7 +1487,7 @@ class CDiscAdjFEAOutput : public COutput {
 };
 
 /*! \class CMeshOutput
- *  \brief Output class for elasticity discrete adjoint problems.
+ *  \brief Output class for mesh solution.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
@@ -1513,4 +1513,30 @@ class CMeshOutput : public COutput {
 };
 
 
+/*! \class CBaselineOutput
+ *  \brief Output class for baseline solver output.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CBaselineOutput : public COutput {
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CBaselineOutput(void);
+
+  void SetVolumeOutputFields(CConfig *config);
+
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
+
 #include "output_structure.inl"
diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 49d639b3ea16..409d5eb25aca 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -158,6 +158,8 @@ class CSolver {
   CVariable** node;  /*!< \brief Vector which the define the variables for each problem. */
   CVariable* node_infty; /*!< \brief CVariable storing the free stream conditions. */
   
+  vector<string> fields;
+  
   /*!
    * \brief Constructor of the class.
    */
@@ -4375,6 +4377,12 @@ class CSolver {
    * \param[out] val_solvername - Name of the solver.
    */
   string GetSolverName(void);
+  
+  /*!
+   * \brief Get the solution fields.
+   * \return A vector containing the solution fields.
+   */
+  vector<string> GetSolutionFields();
 
 };
 
@@ -4384,6 +4392,7 @@ class CSolver {
  * \author F. Palacios, T. Economon.
  */
 class CBaselineSolver : public CSolver {
+  
 public:
   
   /*!
@@ -4443,7 +4452,7 @@ class CBaselineSolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    */
   void SetOutputVariables(CGeometry *geometry, CConfig *config);
-
+  
 };
 
 /*!
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index 3a481b461ee2..c9d1f9b3003c 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -2523,3 +2523,5 @@ inline unsigned short CDiscAdjFEASolver::GetnDVFEA(void) { return nDV; }
 inline su2double CDiscAdjFEASolver::GetVal_EField(unsigned short iVal) { return EField[iVal]; }
 
 inline su2double CDiscAdjFEASolver::GetVal_DVFEA(unsigned short iVal) { return DV_Val[iVal]; }
+
+inline vector<string> CSolver::GetSolutionFields(){return fields;}
diff --git a/SU2_CFD/src/output_baseline.cpp b/SU2_CFD/src/output_baseline.cpp
index e69de29bb2d1..da8de04f8f70 100644
--- a/SU2_CFD/src/output_baseline.cpp
+++ b/SU2_CFD/src/output_baseline.cpp
@@ -0,0 +1,86 @@
+#include "../include/output_structure.hpp"
+
+CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
+
+  nDim = geometry->GetnDim();
+  
+  unsigned short iField = 0;
+
+  /*--- Set the requested volume fields to all fields in the solver ---*/
+  
+  RequestedVolumeFields = solver->GetSolutionFields();
+  
+  /*--- remove the point ID from the fields --- */
+  
+  RequestedVolumeFields.erase(RequestedVolumeFields.begin());
+  
+  nRequestedVolumeFields = RequestedVolumeFields.size();
+    
+  /*--- Remove first and last character of the strings (the quotation marks) ---*/
+  
+  for (iField = 0; iField < nRequestedVolumeFields; iField++){
+    RequestedVolumeFields[iField] = RequestedVolumeFields[iField].substr(1, RequestedVolumeFields[iField].size() - 2);
+  }
+     
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = "baseline";
+  
+  /*--- Set the surface filename ---*/
+  
+  SurfaceFilename = "surface_baseline";
+  
+}
+
+CBaselineOutput::~CBaselineOutput(void) {
+
+
+}
+
+void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
+
+  unsigned short iField = 0;
+    
+  /*--- The first three fields should be the coordinates, if not, something is wrong ---*/
+  
+  if (RequestedVolumeFields[0] != "x" || RequestedVolumeFields[1] != "y"){
+    SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
+  }
+  if (nDim == 3){
+    if (RequestedVolumeFields[2] != "z"){
+      SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
+    }
+  }
+  
+  // Grid coordinates
+  
+  AddVolumeOutput(RequestedVolumeFields[0], RequestedVolumeFields[0], "COORDINATES");
+  AddVolumeOutput(RequestedVolumeFields[1], RequestedVolumeFields[1], "COORDINATES");
+  if (nDim == 3)
+    AddVolumeOutput(RequestedVolumeFields[2], RequestedVolumeFields[2], "COORDINATES");
+
+  // Add all the remaining fields
+  
+  for (iField = nDim-1; iField < nRequestedVolumeFields; iField++){
+    AddVolumeOutput(RequestedVolumeFields[iField], RequestedVolumeFields[iField], "SOLUTION");
+  }
+  
+}
+
+void CBaselineOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  unsigned short iField = 0;
+  
+  if (nRequestedVolumeFields != solver[0]->GetnVar()){
+    SU2_MPI::Error("Number of requested fields and number of variables do not match.", CURRENT_FUNCTION);
+  }
+  
+  /*--- Take the solver at index 0 --- */
+  
+  CVariable* Node_Sol  = solver[0]->node[iPoint];
+   
+  for (iField = 0; iField < nRequestedVolumeFields; iField++){
+    SetVolumeOutputValue(RequestedVolumeFields[iField], iPoint, Node_Sol->GetSolution(iField));
+  }
+  
+}
\ No newline at end of file
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 0207f104d64b..75ca3ca963ec 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -6171,12 +6171,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
 
-  /*--- Make sure that coordinates are always in the volume output --- */
+//  /*--- Make sure that coordinates are always in the volume output --- */
+  
+//  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
+//    RequestedVolumeFields.push_back("COORDINATES");
+//    nRequestedVolumeFields++;
+//  }
   
-  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
-    RequestedVolumeFields.push_back("COORDINATES");
-    nRequestedVolumeFields++;
-  }
   
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index da5e201bf432..55541df9c47c 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -2198,7 +2198,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   unsigned short iVar;
   long index, iPoint_Local = 0; unsigned long iPoint_Global = 0;
   int counter = 0;
-  config->fields.clear();
+  fields.clear();
 
   Restart_Vars = new int[5];
 
@@ -2296,14 +2296,14 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   getline (restart_file, text_line);
   stringstream ss(text_line);
   while (ss >> Tag) {
-    config->fields.push_back(Tag);
+    fields.push_back(Tag);
     if (ss.peek() == ',') ss.ignore();
   }
 
   /*--- Set the number of variables, one per field in the
    restart file (without including the PointID) ---*/
 
-  Restart_Vars[1] = (int)config->fields.size() - 1;
+  Restart_Vars[1] = (int)fields.size() - 1;
 
   /*--- Allocate memory for the restart data. ---*/
 
@@ -2349,7 +2349,7 @@ void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, CConfig *config, stri
   strcpy(fname, val_filename.c_str());
   int nRestart_Vars = 5, nFields;
   Restart_Vars = new int[5];
-  config->fields.clear();
+  fields.clear();
 
 #ifndef HAVE_MPI
 
@@ -2391,13 +2391,13 @@ void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, CConfig *config, stri
    needed for when we read the strings later. We pad the beginning of the
    variable string vector with the Point_ID tag that wasn't written. ---*/
 
-  config->fields.push_back("Point_ID");
+  fields.push_back("Point_ID");
   for (iVar = 0; iVar < nFields; iVar++) {
     ret = fread(str_buf, sizeof(char), CGNS_STRING_SIZE, fhw);
     if (ret != (unsigned long)CGNS_STRING_SIZE) {
       SU2_MPI::Error("Error reading restart file.", CURRENT_FUNCTION);
     }
-    config->fields.push_back(str_buf);
+    fields.push_back(str_buf);
   }
 
   /*--- For now, create a temp 1D buffer to read the data from file. ---*/
@@ -2482,7 +2482,7 @@ void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, CConfig *config, stri
   /*--- Now parse the string names and load into the config class in case
    we need them for writing visualization files (SU2_SOL). ---*/
 
-  config->fields.push_back("Point_ID");
+  fields.push_back("Point_ID");
   for (iVar = 0; iVar < nFields; iVar++) {
     index = iVar*CGNS_STRING_SIZE;
     field_buf.append("\"");
@@ -2491,7 +2491,7 @@ void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, CConfig *config, stri
     }
     field_buf.append(str_buf);
     field_buf.append("\"");
-    config->fields.push_back(field_buf.c_str());
+    fields.push_back(field_buf.c_str());
     field_buf.clear();
   }
 
@@ -3760,8 +3760,9 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     getline (restart_file, text_line);
 
     stringstream ss(text_line);
+    fields.clear();
     while (ss >> Tag) {
-      config->fields.push_back(Tag);
+      fields.push_back(Tag);
       if (ss.peek() == ',') ss.ignore();
     }
 
@@ -3772,11 +3773,7 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     /*--- Set the number of variables, one per field in the
      restart file (without including the PointID) ---*/
 
-    nVar = config->fields.size() - 1;
-
-    /*--- Clear the fields vector since we'll read it again. ---*/
-
-    config->fields.clear();
+    nVar = fields.size() - 1;
 
   }
 
@@ -4005,21 +4002,7 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
     filename = config->GetSolution_FlowFileName();
   }
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1 )
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
-
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-
-  if (config->GetWrt_Unsteady() || config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  }
+  filename = config->GetFilename(filename, ".dat");
 
   /*--- Output the file name to the console. ---*/
 
diff --git a/SU2_SOL/obj/Makefile.am b/SU2_SOL/obj/Makefile.am
index 024e4153a461..014b47d1d9c0 100644
--- a/SU2_SOL/obj/Makefile.am
+++ b/SU2_SOL/obj/Makefile.am
@@ -50,6 +50,8 @@ ___bin_SU2_SOL_CXXFLAGS =
 ___bin_SU2_SOL_LDADD = \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-output_structure.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_baseline.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_csv.o \
   ../../SU2_CFD/src/libSU2Core_a-output_cgns.o \
   ../../SU2_CFD/src/libSU2Core_a-output_tecplot.o \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index a0ed72571dbf..d966818e486a 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
 
   /*--- Pointer to different structures that will be used throughout the entire code ---*/
 
-  COutput *output                 = NULL;
+  COutput **output                 = NULL;
   CGeometry ***geometry_container = NULL;
   CSolver ***solver_container     = NULL;
   CConfig **config_container      = NULL;
@@ -91,12 +91,14 @@ int main(int argc, char *argv[]) {
   geometry_container = new CGeometry**[nZone];
   nInst = new unsigned short[nZone];
   driver_config = NULL;
-
+  output   = new COutput*[nZone];
+  
   for (iZone = 0; iZone < nZone; iZone++) {
     solver_container[iZone]       = NULL;
     config_container[iZone]       = NULL;
     geometry_container[iZone]     = NULL;
     nInst[iZone]                  = 1;
+    output[iZone]                 = NULL;
   }
 
   /*--- Initialize the configuration of the driver ---*/
@@ -260,13 +262,12 @@ int main(int argc, char *argv[]) {
   if (rank == MASTER_NODE)
     cout << endl <<"------------------------- Solution Postprocessing -----------------------" << endl;
   
-	/*--- Definition of the output class (one for all the zones) ---*/
-	output = new COutput(config_container[ZONE_0]);
-  
   /*---  Check whether this is an FSI, fluid unsteady, harmonic balance or structural dynamic simulation and call the
    solution merging routines accordingly.---*/
 
   if (multizone){
+    
+
 
     bool TimeDomain = driver_config->GetTime_Domain();
 
@@ -289,6 +290,10 @@ int main(int argc, char *argv[]) {
         config_container[iZone]->SetiInst(INST_0);
         config_container[iZone]->SetExtIter(TimeIter);
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
+        
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+        
       }
 
       /*--- Loop over the whole time domain ---*/
@@ -315,7 +320,22 @@ int main(int argc, char *argv[]) {
           }
 
           if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << ", t = " << Physical_t << " s ." << endl;
-          output->SetBaselineResult_Files(solver_container, geometry_container, config_container, TimeIter, nZone);
+          
+          for (iZone = 0; iZone < nZone; iZone++){
+            
+            /*--- Load the data --- */
+            
+            output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+            
+            /*--- If requested, write the volume output for visualization purposes --- */
+            
+            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+    
+            /*--- Deallocate data --- */
+            
+            output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+          
+          }
         }
 
         TimeIter++;
@@ -330,8 +350,25 @@ int main(int argc, char *argv[]) {
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+      
+      }
+      for (iZone = 0; iZone < nZone; iZone++){
+        
+        /*--- Load the data --- */
+        
+        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+      
+        /*--- If requested, write the volume output for visualization purposes --- */
+        
+        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+
+        /*--- Deallocate data --- */
+        
+        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+        
       }
-      output->SetBaselineResult_Files(solver_container, geometry_container, config_container, 0, nZone);
     }
 
   }
@@ -400,6 +437,9 @@ int main(int argc, char *argv[]) {
                                iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
+          output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0], solver_container[ZONE_0][INST_0], ZONE_0);
+          output[ZONE_0]->PreprocessVolumeOutput(config_container[ZONE_0],geometry_container[ZONE_0][INST_0]);
+         
           SolutionInstantiatedFlow = true;
         }
           solver_container[ZONE_0][INST_0]->LoadRestart_FSI(geometry_container[ZONE_0][INST_0], config_container[ZONE_0], SU2_TYPE::Int(MESH_0));
@@ -413,12 +453,28 @@ int main(int argc, char *argv[]) {
                                iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_1]->GetnExtIter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
+          output[ZONE_1] = new CBaselineOutput(config_container[ZONE_1], geometry_container[ZONE_1][INST_0], solver_container[ZONE_1][INST_0], ZONE_1);
+          output[ZONE_1]->PreprocessVolumeOutput(config_container[ZONE_1],geometry_container[ZONE_1][INST_0]);
           SolutionInstantiatedFEM = true;
         }
           solver_container[ZONE_1][INST_0]->LoadRestart_FSI(geometry_container[ZONE_1][INST_0], config_container[ZONE_1], SU2_TYPE::Int(MESH_0));
 
         if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
-        output->SetBaselineResult_Files(solver_container, geometry_container, config_container, iExtIter, nZone);
+        for (iZone = 0; iZone < nZone; iZone++){
+          
+          /*--- Load the data --- */
+          
+          output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+        
+          /*--- If requested, write the volume output for visualization purposes --- */
+          
+          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+  
+          /*--- Deallocate data --- */
+          
+          output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+          
+        }
       }
 
       iExtIter++;
@@ -481,7 +537,7 @@ int main(int argc, char *argv[]) {
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
-              output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, iExtIter, nZone);
+//              output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, iExtIter, nZone);
             }
         
         iExtIter++;
@@ -499,7 +555,7 @@ int main(int argc, char *argv[]) {
       solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
     }
 
-    output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, 0, nZone);
+//    output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, 0, nZone);
     }
 
   }
@@ -553,6 +609,9 @@ int main(int argc, char *argv[]) {
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
+                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
+                  output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+                  
                   SolutionInstantiated[iZone] = true;
                 }
                   config_container[iZone]->SetiInst(INST_0);
@@ -561,8 +620,22 @@ int main(int argc, char *argv[]) {
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
-              output->SetBaselineResult_Files(solver_container, geometry_container, config_container, iExtIter, nZone);
-            }
+              for (iZone = 0; iZone < nZone; iZone++){
+                
+                /*--- Load the data --- */
+                
+                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+              
+                /*--- If requested, write the volume output for visualization purposes --- */
+                
+                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+        
+                /*--- Deallocate data --- */
+                
+                output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+                
+              }
+        }
 
         iExtIter++;
         if (StopCalc) break;
@@ -582,17 +655,33 @@ int main(int argc, char *argv[]) {
           /*--- Either instantiate the solution class or load a restart file. ---*/
           solver_container[iZone][iInst] = new CBaselineSolver(geometry_container[iZone][iInst], config_container[iZone]);
           solver_container[iZone][iInst]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+          solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
+          output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
 
           /*--- Print progress in solution writing to the screen. ---*/
           if (rank == MASTER_NODE) {
             cout << "Storing the volume solution for time instance " << iInst << "." << endl;
           }
 
+            
+          /*--- Load the data --- */
+          
+          output[iZone]->Load_Data(geometry_container[iZone][iInst], config_container[iZone], &solver_container[iZone][iInst]);
+          
+          /*--- If requested, write the volume output for visualization purposes --- */
+          
+          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat());
+          
+          /*--- Deallocate data --- */
+          
+          output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][iInst]);
+          
+          
         }
 
       }
 
-      output->SetBaselineResult_Files(solver_container, geometry_container, config_container, iZone, nZone);
+
     }
 
     else if (config_container[ZONE_0]->GetWrt_Dynamic()){
@@ -639,6 +728,9 @@ int main(int argc, char *argv[]) {
                                        iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                        iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
+                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
+                  output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+                  
                   SolutionInstantiated = true;
                 }
                 config_container[iZone]->SetiInst(INST_0);
@@ -647,8 +739,22 @@ int main(int argc, char *argv[]) {
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
-              output->SetBaselineResult_Files(solver_container, geometry_container, config_container, iExtIter, nZone);
-            }
+              for (iZone = 0; iZone < nZone; iZone++){
+                
+                /*--- Load the data --- */
+                
+                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+              
+                /*--- If requested, write the volume output for visualization purposes --- */
+                
+                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+        
+                /*--- Deallocate data --- */
+                
+                output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+                
+              }        
+        }
         
         iExtIter++;
         if (StopCalc) break;
@@ -659,17 +765,33 @@ int main(int argc, char *argv[]) {
     else {
 
       /*--- Steady simulation: merge the single solution file. ---*/
-
+      
       for (iZone = 0; iZone < nZone; iZone++) {
         config_container[iZone]->SetiInst(INST_0);
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+        
       }
-
-      output->SetBaselineResult_Files(solver_container, geometry_container, config_container, 0, nZone);
-
-		  }
+      
+      for (iZone = 0; iZone < nZone; iZone++){
+        
+        /*--- Load the data --- */
+        
+        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+        
+        /*--- If requested, write the volume output for visualization purposes --- */
+        
+        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+        
+        /*--- Deallocate data --- */
+        
+        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+        
+      }
+    }
     
   }
   

From 5113dfd7cdaf1b8aa653eb1b206f2313ad04744c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:28:54 +0200
Subject: [PATCH 177/539] Adapted GetFilename calls

---
 SU2_CFD/src/output_csv.cpp       |  2 +-
 SU2_CFD/src/output_paraview.cpp  |  8 ++---
 SU2_CFD/src/output_structure.cpp | 60 ++------------------------------
 SU2_CFD/src/output_tecplot.cpp   |  8 ++---
 4 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/SU2_CFD/src/output_csv.cpp b/SU2_CFD/src/output_csv.cpp
index 41a42b9030d2..ce51ebe97fd5 100644
--- a/SU2_CFD/src/output_csv.cpp
+++ b/SU2_CFD/src/output_csv.cpp
@@ -10,7 +10,7 @@ void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
   string filename;
   
-  filename = GetFilename(config, SurfaceFilename, ".csv");
+  filename = config->GetFilename(SurfaceFilename, ".csv");
   
   Surf_file.precision(15);
   
diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp
index bbff026a203f..e41292011cd2 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output_paraview.cpp
@@ -1971,8 +1971,8 @@ void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry,
 
   int iProcessor;
   
-  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".vtk");
-  else filename          = GetFilename(config, VolumeFilename, ".vtk");
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".vtk");
+  else filename          = config->GetFilename(VolumeFilename, ".vtk");
 
 
   /*--- Open Paraview ASCII file and write the header. ---*/
@@ -2351,8 +2351,8 @@ void COutput::WriteParaViewBinary_Parallel(CConfig *config,
   
   const int NCOORDS = 3;
   
-  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".vtk");
-  else filename          = GetFilename(config, VolumeFilename, ".vtk");
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".vtk");
+  else filename          = config->GetFilename(VolumeFilename, ".vtk");
 
   strcpy(fname, filename.c_str());
   
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 75ca3ca963ec..b9a7a7c315d7 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -632,28 +632,6 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
   
 }
 
-string COutput::GetFilename(CConfig *config, string filename, string ext){
-  
-  /*--- Add the extension --- */
-  
-  filename = filename + string(ext);
-  
-  /*--- Append the zone number if multizone problems ---*/
-  if (config->GetnZone() > 1)
-    filename = config->GetMultizone_FileName(filename, config->GetiZone(), ext);
-
-  /*--- Append the zone number if multiple instance problems ---*/
-  if (config->GetnTimeInstances() > 1)
-    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ext);
-
-  if (config->GetTime_Domain()){
-    filename = config->GetUnsteady_FileName(filename, config->GetExtIter(), ext);
-  }
-  
-  return filename;
-}
-
-
 void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_container){
   
   /*--- Collect that data defined in the subclasses from the different processors ---*/
@@ -4255,24 +4233,7 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry)
   
   int iProcessor;
   
-  filename = RestartFilename;
-  
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
-  
-  /*--- Append the zone number if multiple instance problems ---*/
-  if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  }
+  filename = config->GetFilename(RestartFilename, ".dat");
   
   /*--- Only the master node writes the header. ---*/
   
@@ -4377,24 +4338,7 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry)
   char str_buf[CGNS_STRING_SIZE], fname[100];
   su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
   
-  filename = RestartFilename;
-
-  /*--- Append the zone number if multizone problems ---*/
-  if (nZone > 1)
-    filename= config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
-
-  /*--- Append the zone number if multiple instance problems ---*/
-  if (nInst > 1)
-    filename= config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
-  } else if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  } else if ((fem) && (config->GetWrt_Dynamic())) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  }
+  filename = config->GetFilename(RestartFilename, ".dat");
 
   strcpy(fname, filename.c_str());
 
diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output_tecplot.cpp
index 2da29cb00954..4dbaf399b391 100644
--- a/SU2_CFD/src/output_tecplot.cpp
+++ b/SU2_CFD/src/output_tecplot.cpp
@@ -807,8 +807,8 @@ void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, u
   
   string filename;
   
-  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".dat");
-  else filename          = GetFilename(config, VolumeFilename, ".dat");
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".dat");
+  else filename          = config->GetFilename(VolumeFilename, ".dat");
   
   /*--- Open Tecplot ASCII file and write the header. ---*/
   
@@ -1064,8 +1064,8 @@ void COutput::WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry,
   
   string filename;
   
-  if (surf_sol) filename = GetFilename(config, SurfaceFilename, ".szplt");
-  else filename          = GetFilename(config, VolumeFilename, ".szplt");
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".szplt");
+  else filename          = config->GetFilename(VolumeFilename, ".szplt");
 
   
   string data_set_title = surf_sol

From 2fe6fda29a570563ceed5fe1d1913bb7bf38f088 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:29:28 +0200
Subject: [PATCH 178/539] Adapted SU2_DEF for new output

---
 SU2_DEF/obj/Makefile.am |  4 +-
 SU2_DEF/src/SU2_DEF.cpp | 86 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/SU2_DEF/obj/Makefile.am b/SU2_DEF/obj/Makefile.am
index 4d0000f8a755..811d9a7e83ab 100644
--- a/SU2_DEF/obj/Makefile.am
+++ b/SU2_DEF/obj/Makefile.am
@@ -52,10 +52,12 @@ ___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a \
   ../../SU2_CFD/src/libSU2Core_a-output_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-output_cgns.o \
   ../../SU2_CFD/src/libSU2Core_a-output_tecplot.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_mesh.o \
+  ../../SU2_CFD/src/libSU2Core_a-output_csv.o \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
   ../../SU2_CFD/src/libSU2Core_a-output_su2.o \
   ../../SU2_CFD/src/libSU2Core_a-output_paraview.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \  
+  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index c7f63fbb1fea..93f3ae9ea542 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[]) {
   CGeometry **geometry_container      = NULL;
   CSurfaceMovement **surface_movement = NULL;
   CVolumetricMovement **grid_movement = NULL;
-  COutput *output                     = NULL;
+  COutput **output                     = NULL;
 
   /*--- Load in the number of zones and spatial dimensions in the mesh file
    (if no config file is specified, default.cfg is used) ---*/
@@ -90,12 +90,14 @@ int main(int argc, char *argv[]) {
   geometry_container = new CGeometry*[nZone];
   surface_movement   = new CSurfaceMovement*[nZone];
   grid_movement      = new CVolumetricMovement*[nZone];
+  output             = new COutput*[nZone];
 
   for (iZone = 0; iZone < nZone; iZone++) {
     config_container[iZone]       = NULL;
     geometry_container[iZone]     = NULL;
     surface_movement[iZone]       = NULL;
     grid_movement[iZone]          = NULL;
+    output[iZone]                 = NULL;
   }
   
   /*--- Loop over all zones to initialize the various classes. In most
@@ -108,7 +110,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
     
-    config_container[iZone] = new CConfig(config_file_name, SU2_DEF, nZone, VERB_HIGH);
+    config_container[iZone] = new CConfig(config_file_name, SU2_DEF, iZone, VERB_HIGH);
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
     
     /*--- Definition of the geometry class to store the primal grid in the partitioning process. ---*/
@@ -193,20 +195,48 @@ int main(int argc, char *argv[]) {
       
     }
     
+    /*--- Allocate the mesh output ---*/
+    
+    output[iZone] = new CMeshOutput(config_container[iZone], geometry_container[iZone], iZone);
+    
+    /*--- Preprocess the volume output ---*/
+    
+    output[iZone]->PreprocessVolumeOutput(config_container[iZone], geometry_container[iZone]);    
+    
   }
   
-  /*--- initialization of output structure  ---*/
-  
-  output  = new COutput(config_container[ZONE_0]);
-  
+
   /*--- Output original grid for visualization, if requested (surface and volumetric) ---*/
   
   if ((config_container[ZONE_0]->GetVisualize_Volume_Def() ||
        config_container[ZONE_0]->GetVisualize_Surface_Def()) &&
       config_container[ZONE_0]->GetDesign_Variable(0) != NO_DEFORMATION) {
     
-    output->SetMesh_Files(geometry_container, config_container, nZone, true, false);
-    
+    for (iZone = 0; iZone < nZone; iZone++){
+      
+      /*--- Load the data --- */
+      
+      output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
+      
+      if (config_container[iZone]->GetVisualize_Volume_Def()){
+        
+        /*--- If requested, write the volume output for visualization purposes --- */
+        
+        output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+      
+      } 
+      
+      if (config_container[iZone]->GetVisualize_Surface_Def()){
+        
+        /*--- If requested, write the volume output for visualization purposes --- */
+        
+        output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+        
+      }
+      
+      output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone]);
+      
+    }
   }
   
   /*--- Surface grid deformation using design variables ---*/
@@ -286,7 +316,45 @@ int main(int argc, char *argv[]) {
   bool NewFile = false;
   if (config_container[ZONE_0]->GetDesign_Variable(0) == NO_DEFORMATION) NewFile = true;
   
-  output->SetMesh_Files(geometry_container, config_container, nZone, NewFile, true);
+  for (iZone = 0; iZone < nZone; iZone++){
+    
+    /*--- Load the data --- */
+    
+    output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
+    
+    /*--- Write the in the native su2 format ---*/
+    
+    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH);
+    
+    
+    if (config_container[iZone]->GetVisualize_Volume_Def()){
+      
+      /*--- Add a deformed identifier to the filename --- */
+      
+      output[iZone]->SetVolume_Filename(output[iZone]->GetVolume_Filename() + string("_deformed"));    
+      
+      /*--- If requested, write the volume output for visualization purposes --- */
+      
+      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+    
+    } 
+    
+    if (config_container[iZone]->GetVisualize_Surface_Def()){
+      
+      /*--- Add a deformed identifier to the filename --- */
+      
+      output[iZone]->SetSurface_Filename(output[iZone]->GetSurface_Filename() + string("_deformed"));
+      
+      /*--- If requested, write the volume output for visualization purposes --- */
+      
+      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+      
+    }
+    
+    output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone]);
+    
+  }
+
   
   if ((config_container[ZONE_0]->GetDesign_Variable(0) != NO_DEFORMATION) &&
       (config_container[ZONE_0]->GetDesign_Variable(0) != SCALE_GRID)     &&

From 1f18edd5ea62cb40dfaa0d173a01df22bfbdfa22 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:29:57 +0200
Subject: [PATCH 179/539] Adapted drivers for new volume output

---
 SU2_CFD/src/driver_direct_multizone.cpp  | 44 +++++++++++++++++++-----
 SU2_CFD/src/driver_direct_singlezone.cpp | 44 +++++++++++++++++++-----
 SU2_CFD/src/driver_structure.cpp         | 36 +++++++++++++++++--
 3 files changed, 104 insertions(+), 20 deletions(-)

diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 5b8d0766e3dc..d78bb069a4c2 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -532,9 +532,21 @@ void CMultizoneDriver::Update() {
 
 void CMultizoneDriver::Output(unsigned long TimeIter) {
 
+  unsigned short RestartFormat = SU2_RESTART_ASCII;
+  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
+  
+
   
   for (iZone = 0; iZone < nZone; iZone++){
     
+    bool Wrt_Surf = config_container[iZone]->GetWrt_Srf_Sol();
+    bool Wrt_Vol  = config_container[iZone]->GetWrt_Vol_Sol();
+    bool Wrt_CSV  = config_container[iZone]->GetWrt_Csv_Sol();
+    
+    if (config_container[iZone]->GetWrt_Binary_Restart()){
+      RestartFormat = SU2_RESTART_BINARY;
+    }
+    
     bool output_files = false;
     
     /*--- Determine whether a solution needs to be written
@@ -600,14 +612,30 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
       if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
       
       /*--- Execute the routine for writing restart, volume solution,
-     surface solution, and surface comma-separated value files. ---*/
-      
-      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, iZone, nZone);
-      
-      
-      /*--- Execute the routine for writing special output. ---*/
-      // output->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
-      
+       surface solution, and surface comma-separated value files. ---*/
+      for (unsigned short iInst = 0; iInst < nInst[iZone]; iInst++){
+        
+        config_container[iZone]->SetiInst(iInst);
+        
+        output[iZone]->Load_Data(geometry_container[iZone][iInst][MESH_0], config_container[iZone], solver_container[iZone][iInst][MESH_0]);
+        
+        /*--- Write restart files ---*/
+        
+        output[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat);
+        
+        /*--- Write visualization files ---*/
+        
+        if (Wrt_Vol)
+          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+        
+        if (Wrt_Surf)
+          output[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+        if (Wrt_CSV)
+          output[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV);    
+        
+        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][iInst][MESH_0]);
+        
+      }
       
       if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
       
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index 3d05ba59b1cb..a10b18611e70 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -184,6 +184,17 @@ void CSinglezoneDriver::Update() {
 void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
   bool output_files = false;
+  
+  unsigned short RestartFormat = SU2_RESTART_ASCII;
+  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
+  
+  bool Wrt_Surf = config_container[ZONE_0]->GetWrt_Srf_Sol();
+  bool Wrt_Vol  = config_container[ZONE_0]->GetWrt_Vol_Sol();
+  bool Wrt_CSV  = config_container[ZONE_0]->GetWrt_Csv_Sol();
+  
+  if (config_container[ZONE_0]->GetWrt_Binary_Restart()){
+    RestartFormat = SU2_RESTART_BINARY;
+  }
 
   /*--- Determine whether a solution needs to be written
    after the current iteration ---*/
@@ -230,7 +241,7 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
   /*--- write the solution ---*/
 
-  if (output_files) {
+  if (output_files && config_container[ZONE_0]->GetWrt_Output()) {
 
     /*--- Time the output for performance benchmarking. ---*/
 #ifndef HAVE_MPI
@@ -249,14 +260,29 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
-
-    output[ZONE_0]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, TimeIter, ZONE_0, nZone);
-
-
-    /*--- Execute the routine for writing special output. ---*/
-   //output[ZONE_0]->SetSpecial_Output(solver_container, geometry_container, config_container, TimeIter, nZone);
-
-
+    
+    for (unsigned short iInst = 0; iInst < nInst[ZONE_0]; iInst++){
+      
+      config_container[ZONE_0]->SetiInst(iInst);
+      
+      output[ZONE_0]->Load_Data(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], solver_container[ZONE_0][iInst][MESH_0]);
+      
+      /*--- Write restart files ---*/
+      
+      output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat);
+      
+      /*--- Write visualization files ---*/
+      
+      if (Wrt_Vol)
+        output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+      if (Wrt_Surf)
+        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+      if (Wrt_CSV)
+        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV);    
+      
+      output[ZONE_0]->DeallocateData_Parallel(config_container[ZONE_0], geometry_container[ZONE_0][iInst][MESH_0]);
+      
+    }
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
 
     /*--- Store output time and restart the timer for the compute phase. ---*/
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 81efb17b1d70..a1733db4a23a 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -4026,6 +4026,16 @@ void CDriver::Output(unsigned long ExtIter) {
   unsigned long nExtIter = config_container[ZONE_0]->GetnExtIter();
   bool output_files = false;
   
+  unsigned short RestartFormat = SU2_RESTART_ASCII;
+  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
+  
+  bool Wrt_Surf = config_container[ZONE_0]->GetWrt_Srf_Sol();
+  bool Wrt_Vol  = config_container[ZONE_0]->GetWrt_Vol_Sol();
+  bool Wrt_CSV  = config_container[ZONE_0]->GetWrt_Csv_Sol();
+  
+  if (config_container[ZONE_0]->GetWrt_Binary_Restart()){
+    RestartFormat = SU2_RESTART_BINARY;
+  }
   /*--- Determine whether a solution needs to be written
    after the current iteration ---*/
   
@@ -4109,11 +4119,31 @@ void CDriver::Output(unsigned long ExtIter) {
 
     if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
     
+    
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
-    for (iZone = 0; iZone < nZone; iZone++)
-      output[iZone]->SetResult_Files_Parallel(solver_container, geometry_container, config_container, ExtIter, iZone, nZone);
-    
+    for (unsigned short iInst = 0; iInst < nInst[ZONE_0]; iInst++){
+      
+      config_container[ZONE_0]->SetiInst(iInst);
+      
+      output[ZONE_0]->Load_Data(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], solver_container[ZONE_0][iInst][MESH_0]);
+      
+      /*--- Write restart files ---*/
+      
+      output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat);
+      
+      /*--- Write visualization files ---*/
+      
+      if (Wrt_Vol)
+        output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+      if (Wrt_Surf)
+        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+      if (Wrt_CSV)
+        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV);    
+      
+      output[ZONE_0]->DeallocateData_Parallel(config_container[ZONE_0], geometry_container[ZONE_0][iInst][MESH_0]);
+      
+    }
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
     
     /*--- Store output time and restart the timer for the compute phase. ---*/

From c3e55c7238bafc836853409ece62249bd2bdbfdb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 18:30:23 +0200
Subject: [PATCH 180/539] Fixed missing entries in Makefile.am

---
 SU2_CFD/obj/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 554b09038941..270ba7f89f35 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -120,11 +120,13 @@ libSU2Core_sources = \
   ../src/output_su2.cpp \
   ../src/output_paraview.cpp \
   ../src/output_csv.cpp \
+  ../src/output_mesh.cpp \
   ../src/output_direct_elasticity.cpp \
   ../src/output_direct_mean.cpp \
   ../src/output_direct_mean_fem.cpp \
   ../src/output_direct_mean_inc.cpp \
   ../src/output_direct_heat.cpp \
+  ../src/output_baseline.cpp \
   ../src/output_adjoint_elasticity.cpp \
   ../src/output_adjoint_discrete.cpp \
   ../src/output_adjoint_discrete_inc.cpp \

From e7e82ed7d494edf3c9592dc102d212258dbd21ce Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 19:25:04 +0200
Subject: [PATCH 181/539] Moved SetSensitivityFiles to SU2_DOT.

---
 Common/src/config_structure.cpp      |   2 +-
 SU2_CFD/include/solver_structure.hpp |   2 +-
 SU2_CFD/src/solver_structure.cpp     |   6 +-
 SU2_DOT/include/SU2_DOT.hpp          |  10 +++
 SU2_DOT/obj/Makefile.am              |   4 +
 SU2_DOT/src/SU2_DOT.cpp              | 126 +++++++++++++++++++++++++--
 6 files changed, 140 insertions(+), 10 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 353e0fe8c4bc..555cb8de7b44 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7879,7 +7879,7 @@ bool CConfig::GetVolumetric_Movement(){
     volumetric_movement = true;
   }
   
-  if (Kind_SU2 == SU2_DEF){ volumetric_movement = true;}
+  if (Kind_SU2 == SU2_DEF || Kind_SU2 == SU2_DOT){ volumetric_movement = true;}
   return volumetric_movement;
 }
 
diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 409d5eb25aca..7ba14ca5c256 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -4414,7 +4414,7 @@ class CBaselineSolver : public CSolver {
    * \param[in] nVar - Number of variables.
    * \param[in] field_names - Vector of variable names.
    */
-  CBaselineSolver(CGeometry *geometry, CConfig *config, unsigned short nVar, vector<string> field_names);
+  CBaselineSolver(CGeometry *geometry, CConfig *config, unsigned short val_nvar, vector<string> field_names);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 55541df9c47c..94292331ac21 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3499,14 +3499,16 @@ CBaselineSolver::CBaselineSolver(CGeometry *geometry, CConfig *config) {
   
 }
 
-CBaselineSolver::CBaselineSolver(CGeometry *geometry, CConfig *config, unsigned short nVar, vector<string> field_names) {
+CBaselineSolver::CBaselineSolver(CGeometry *geometry, CConfig *config, unsigned short val_nvar, vector<string> field_names) {
 
   unsigned long iPoint;
   unsigned short iVar;
   
+  nVar = val_nvar;
+  
   nPoint = geometry->GetnPoint();
 
-  config->fields = field_names;
+  fields = field_names;
 
   Solution = new su2double[nVar];
 
diff --git a/SU2_DOT/include/SU2_DOT.hpp b/SU2_DOT/include/SU2_DOT.hpp
index 557d4bca0a5b..73df104dd88c 100644
--- a/SU2_DOT/include/SU2_DOT.hpp
+++ b/SU2_DOT/include/SU2_DOT.hpp
@@ -81,3 +81,13 @@ void SetProjection_AD(CGeometry *geometry, CConfig *config, CSurfaceMovement *su
  */
 
 void OutputGradient(su2double** Gradient, CConfig* config, ofstream& Gradient_file);
+
+/*!
+ * \brief Write the sensitivity (including mesh sensitivity) computed with the discrete adjoint method
+ *  on the surface and in the volume to a file.
+ * \param[in] geometry - Geometrical definition of the problem.
+ * \param[in] config - Definition of the particular problem.
+ * \param[in] val_nZone - Number of Zones.
+ */
+
+void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone);
diff --git a/SU2_DOT/obj/Makefile.am b/SU2_DOT/obj/Makefile.am
index 98226f0d6695..1d5e51debbfb 100644
--- a/SU2_DOT/obj/Makefile.am
+++ b/SU2_DOT/obj/Makefile.am
@@ -63,6 +63,8 @@ su2_dot_ldadd += \
   ../../SU2_CFD/src/libSU2Core_a-output_cgns.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_tecplot.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_fieldview.$(OBJEXT) \
+  ../../SU2_CFD/src/libSU2Core_a-output_csv.$(OBJEXT) \
+  ../../SU2_CFD/src/libSU2Core_a-output_baseline.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_su2.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_paraview.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.$(OBJEXT) \
@@ -77,6 +79,8 @@ su2_dot_ldadd += \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_structure_legacy.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_cgns.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_tecplot.$(OBJEXT) \
+  ../../SU2_CFD/src/libSU2Core_AD_a-output_csv.$(OBJEXT) \
+  ../../SU2_CFD/src/libSU2Core_AD_a-output_baseline.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_fieldview.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_su2.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-output_paraview.$(OBJEXT) \
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index e479cac85603..0e91b339f6ec 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -72,7 +72,6 @@ int main(int argc, char *argv[]) {
   CGeometry ***geometry_container       = NULL;
   CSurfaceMovement **surface_movement   = NULL;
   CVolumetricMovement **grid_movement   = NULL;
-  COutput *output                       = NULL;
   unsigned short *nInst                 = NULL;
 
   /*--- Load in the number of zones and spatial dimensions in the mesh file (if no config
@@ -321,8 +320,7 @@ int main(int argc, char *argv[]) {
    if (config_container[ZONE_0]->GetDiscrete_Adjoint()){
      if (rank == MASTER_NODE)
        cout << endl <<"------------------------ Mesh sensitivity Output ------------------------" << endl;
-     output = new COutput(config_container[ZONE_0]);
-     output->SetSensitivity_Files(geometry_container, config_container, nZone);
+     SetSensitivity_Files(geometry_container, config_container, nZone);
    }
 
    if ((config_container[ZONE_0]->GetDesign_Variable(0) != NONE) &&
@@ -439,9 +437,6 @@ int main(int argc, char *argv[]) {
   }
   if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
   
-  if (output != NULL) delete output;
-  if (rank == MASTER_NODE) cout << "Deleted COutput class." << endl;
-
   if (cstr != NULL) delete cstr;
   
   /*--- Synchronization point after a single solver iteration. Compute the
@@ -909,3 +904,122 @@ void OutputGradient(su2double** Gradient, CConfig* config, ofstream& Gradient_fi
     }
   }
 }
+
+
+void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone) {
+
+  unsigned short iMarker,iDim, nDim, iVar, nMarker, nVar;
+  unsigned long iVertex, iPoint, nPoint, nVertex;
+  su2double *Normal, Prod, Sens = 0.0, SensDim, Area;
+  
+  unsigned short iZone;
+  
+  CSolver *solver  = NULL;
+  COutput *output  = NULL;
+
+  
+  for (iZone = 0; iZone < val_nZone; iZone++) {
+    
+    nPoint = geometry[iZone][INST_0]->GetnPoint();
+    nDim   = geometry[iZone][INST_0]->GetnDim();
+    nMarker = config[iZone]->GetnMarker_All();
+    nVar = nDim + 1;
+    
+    /*--- We create a baseline solver to easily merge the sensitivity information ---*/
+    
+    vector<string> fieldnames;
+    fieldnames.push_back("\"Point\"");
+    fieldnames.push_back("\"x\"");
+    fieldnames.push_back("\"y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"z\"");
+    }
+    fieldnames.push_back("\"Sensitivity_x\"");
+    fieldnames.push_back("\"Sensitivity_y\"");
+    if (nDim == 3) {
+      fieldnames.push_back("\"Sensitivity_z\"");
+    }
+    fieldnames.push_back("\"Surface_Sensitivity\"");
+    
+    solver = new CBaselineSolver(geometry[iZone][INST_0], config[iZone], nVar+nDim, fieldnames);
+    
+    for (iPoint = 0; iPoint < nPoint; iPoint++) {
+      for (iDim = 0; iDim < nDim; iDim++) {
+        solver->node[iPoint]->SetSolution(iDim, geometry[iZone][INST_0]->node[iPoint]->GetCoord(iDim));
+      }
+      for (iVar = 0; iVar < nDim; iVar++) {
+        solver->node[iPoint]->SetSolution(iVar+nDim, geometry[iZone][INST_0]->GetSensitivity(iPoint, iVar));
+      }
+    }
+    
+    /*--- Compute the sensitivity in normal direction ---*/
+    
+    for (iMarker = 0; iMarker < nMarker; iMarker++) {
+      
+      if((config[iZone]->GetMarker_All_KindBC(iMarker) == HEAT_FLUX ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == EULER_WALL ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == ISOTHERMAL ) ||
+         (config[iZone]->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE )) {
+        
+        
+        nVertex = geometry[iZone][INST_0]->GetnVertex(iMarker);
+        
+        for (iVertex = 0; iVertex < nVertex; iVertex++) {
+          iPoint = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNode();
+          Normal = geometry[iZone][INST_0]->vertex[iMarker][iVertex]->GetNormal();
+          Prod = 0.0;
+          Area = 0.0;
+          for (iDim = 0; iDim < nDim; iDim++) {
+            
+            /*--- Retrieve the gradient calculated with discrete adjoint method ---*/
+            
+            SensDim = geometry[iZone][INST_0]->GetSensitivity(iPoint, iDim);
+            
+            /*--- Calculate scalar product for projection onto the normal vector ---*/
+            
+            Prod += Normal[iDim]*SensDim;
+            
+            Area += Normal[iDim]*Normal[iDim];
+          }
+          
+          Area = sqrt(Area);
+          
+          /*--- Projection of the gradient onto the normal vector of the surface ---*/
+          
+          Sens = Prod/Area;
+          
+          solver->node[iPoint]->SetSolution(2*nDim, Sens);
+          
+        }
+      }
+    }
+    
+    output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0], solver, iZone);
+    output->PreprocessVolumeOutput(config[iZone], geometry[iZone][INST_0]);
+    
+    /*--- Load the data --- */
+    
+    output->Load_Data(geometry[iZone][INST_0], config[iZone], &solver);
+
+    /*--- Set the surface filename ---*/
+    
+    output->SetSurface_Filename(config[iZone]->GetSurfSens_FileName());
+    
+    /*--- Write to file ---*/
+    
+    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat());
+
+    /*--- Deallocate ---*/
+    
+    output->DeallocateData_Parallel(config[iZone], geometry[iZone][INST_0]);
+    
+    /*--- Free memory ---*/
+    
+    delete output;
+    delete solver;    
+    
+  }
+  
+
+}
+

From 834e24776de66d6d00d213516aed765f35a6c095 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 19:35:29 +0200
Subject: [PATCH 182/539] Replacing last call of old output routine from
 CIteration

---
 SU2_CFD/src/iteration_structure.cpp | 35 +++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 0e5544163208..0dab6bac5d24 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -454,7 +454,18 @@ void CIteration::Output(COutput *output,
 
   
   bool output_files = false;
-
+  
+  unsigned short RestartFormat = SU2_RESTART_ASCII;
+  unsigned short OutputFormat = config_container[val_iZone]->GetOutput_FileFormat();
+  
+  bool Wrt_Surf = config_container[val_iZone]->GetWrt_Srf_Sol();
+  bool Wrt_Vol  = config_container[val_iZone]->GetWrt_Vol_Sol();
+  bool Wrt_CSV  = config_container[val_iZone]->GetWrt_Csv_Sol();
+  
+  if (config_container[val_iZone]->GetWrt_Binary_Restart()){
+    RestartFormat = SU2_RESTART_BINARY;
+  }
+  
   /*--- Determine whether a solution needs to be written
    after the current iteration ---*/
 
@@ -499,12 +510,28 @@ void CIteration::Output(COutput *output,
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
 
-    output->SetResult_Files_Parallel(solver_container, geometry_container, config_container, Iter, val_iZone, nZone);
-
+      config_container[val_iZone]->SetiInst(val_iInst);
+      
+      output->Load_Data(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], solver_container[val_iZone][val_iInst][MESH_0]);
+      
+      /*--- Write restart files ---*/
+      
+      output->SetVolume_Output(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], RestartFormat);
+      
+      /*--- Write visualization files ---*/
+      
+      if (Wrt_Vol)
+        output->SetVolume_Output(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], OutputFormat);
+      if (Wrt_Surf)
+        output->SetSurface_Output(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], OutputFormat);
+      if (Wrt_CSV)
+        output->SetSurface_Output(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], CSV);    
+      
+      output->DeallocateData_Parallel(config_container[val_iZone], geometry_container[val_iZone][val_iInst][MESH_0]);      
+    
     /*--- Execute the routine for writing special output. ---*/
     //output->SetSpecial_Output(solver_container, geometry_container, config_container, Iter, nZone);
 
-
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
 
   }

From 38ab4aae345a66678c0a1348323ec1716d52c099 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Apr 2019 19:37:05 +0200
Subject: [PATCH 183/539] Removing old parallel output routine

---
 SU2_CFD/include/output_structure.hpp |  12 --
 SU2_CFD/src/output_structure.cpp     | 303 ---------------------------
 2 files changed, 315 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 606adfa2467b..da5238d17c2c 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -705,18 +705,6 @@ class COutput {
    */
   su2double GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan);
 
-  /*!
-   * \brief Writes and organizes the all the output files, except the history one, for parallel computations.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Total number of domains in the grid file.
-   * \param[in] val_nZone - Total number of domains in the grid file.
-   */
-  void SetResult_Files_Parallel(CSolver *****solver_container, CGeometry ****geometry, CConfig **config,
-                                unsigned long iExtIter, unsigned short iZone, unsigned short val_nZone);
-
   /*!
    * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index b9a7a7c315d7..fda50f2d61b7 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -872,309 +872,6 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
 }
 
 
-void COutput::SetResult_Files_Parallel(CSolver *****solver_container,
-                                       CGeometry ****geometry,
-                                       CConfig **config,
-                                       unsigned long iExtIter,
-                                       unsigned short iZone,
-                                       unsigned short val_nZone) {
-  
-  unsigned short iVar, iInst;
-  unsigned long iPoint;
-  
-  unsigned short nInst = config[iZone]->GetnTimeInstances();
-
-    /*--- Get the file output format ---*/
-    
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
-    
-    for (iInst = 0; iInst < nInst; iInst++){
-
-      config[iZone]->SetiInst(iInst);
-      
-      bool cont_adj = config[iZone]->GetContinuous_Adjoint();
-      bool disc_adj = config[iZone]->GetDiscrete_Adjoint();
-
-      /*--- Flags identifying the types of files to be written. ---*/
-      /*--- For now, we are disabling the parallel writers for Tecplot
-          ASCII until we have parallel versions of all file formats
-          available. SU2_SOL will remain intact for writing files
-          until this capability is completed. ---*/
-
-      bool Wrt_Vol = config[iZone]->GetWrt_Vol_Sol();
-      bool Wrt_Srf = config[iZone]->GetWrt_Srf_Sol();
-
-#ifdef HAVE_MPI
-      /*--- Do not merge the connectivity or write the visualization files
-     if we are running in parallel, unless we are using ParaView binary.
-       Force the use of SU2_SOL to merge and write the viz. files in this
-       case to save overhead. ---*/
-
-      if ((size > SINGLE_NODE) && (FileFormat != PARAVIEW_BINARY) && (FileFormat != TECPLOT_BINARY)) {
-        Wrt_Vol = false;
-        Wrt_Srf = false;
-      }
-#endif
-
-
-
-    /*--- Write a template inlet profile file if requested. ---*/
-
-    if (config[iZone]->GetWrt_InletFile()) {
-      MergeInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      if (rank == MASTER_NODE) {
-        Write_InletFile_Flow(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-        DeallocateInletCoordinates(config[iZone], geometry[iZone][iInst][MESH_0]);
-      }
-      config[iZone]->SetWrt_InletFile(false);
-    }
-
-    /*--- This switch statement will become a call to a virtual function
-     defined within each of the "physics" output child classes that loads
-     the local data for that particular problem alone. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << endl << "Loading solution output data locally on each rank." << endl;
-
-      CollectVolumeData(config[iZone], geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0]);
-         
-    /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      Local_Data_Copy = new su2double*[geometry[iZone][iInst][MESH_0]->GetnPoint()];
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        Local_Data_Copy[iPoint] = new su2double[GlobalField_Counter];
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data_Copy[iPoint][iVar] = Local_Data[iPoint][iVar];
-        }
-      }
-      
-    }
-    
-    /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
-
-    if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
-
-      if (rank == MASTER_NODE)
-        cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Local_Data[iPoint][iVar] = Local_Data_Copy[iPoint][iVar];
-        }
-      }
-      
-      for (iPoint = 0; iPoint < geometry[iZone][iInst][MESH_0]->GetnPoint(); iPoint++)
-        delete [] Local_Data_Copy[iPoint];
-      delete [] Local_Data_Copy;
-      
-    }
-    
-    /*--- After loading the data local to a processor, we perform a sorting,
-     i.e., a linear partitioning of the data across all ranks in the communicator. ---*/
-    
-    if (rank == MASTER_NODE) cout << "Sorting output data across all ranks." << endl;
-    if (fem_output){
-      SortOutputData_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-    }
-    else {
-      SortOutputData(config[iZone], geometry[iZone][iInst][MESH_0]);
-    }
-    
-    /*--- Write either a binary or ASCII restart file in parallel. ---*/
-
-    if (config[iZone]->GetWrt_Binary_Restart()) {
-      if (rank == MASTER_NODE) cout << "Writing binary SU2 native restart file." << endl;
-      WriteRestart_Parallel_Binary(config[iZone], geometry[iZone][iInst][MESH_0]);
-    } else {
-      if (rank == MASTER_NODE) cout << "Writing ASCII SU2 native restart file." << endl;
-      WriteRestart_Parallel_ASCII(config[iZone], geometry[iZone][iInst][MESH_0]);
-    }
-
-    /*--- Write a slice on a structured mesh if requested. ---*/
-
-    if (config[iZone]->GetWrt_Slice()) {
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 0);
-      WriteCSV_Slice(config[iZone], geometry[iZone][iInst][MESH_0],
-                     solver_container[iZone][iInst][MESH_0][FLOW_SOL], iExtIter, iZone, 1);
-    }
-
-    /*--- Write the solution files if they are requested and we are executing
-     with a single rank (all data on one proc and no comm. overhead). Once we
-     have parallel binary versions of Tecplot / ParaView / CGNS / etc., we
-     can allow the write of the viz. files as well. ---*/
-
-    if ((Wrt_Vol || Wrt_Srf) && !fem_output) {
-      
-      /*--- First, sort all connectivity into linearly partitioned chunks of elements. ---*/
-
-      if (rank == MASTER_NODE)
-        cout << "Preparing element connectivity across all ranks." << endl;
-     if (fem_output){
-       
-       SortConnectivity_FEM(config[iZone], geometry[iZone][iInst][MESH_0], iZone);
-       
-       /*--- Sort the surface data and renumber if for writing. ---*/
- 
-       SortOutputData_Surface_FEM(config[iZone], geometry[iZone][iInst][MESH_0]);
-       
-     } else {
-       if (FileFormat == TECPLOT_BINARY)
-         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, false);
-       else
-         SortConnectivity(config[iZone], geometry[iZone][iInst][MESH_0], iZone, true);
-       
-       /*--- Sort the surface data and renumber if for writing. ---*/
- 
-       SortOutputData_Surface(config[iZone], geometry[iZone][iInst][MESH_0]);
-       
-     }
-     
-     /*--- Write out CSV files in parallel for flow and adjoint. ---*/
-     
-     if (config[iZone]->GetWrt_Csv_Sol()){
-     
-       if (rank == MASTER_NODE) cout << endl << "Writing comma-separated values (CSV) surface files." << endl;
-     
-       WriteSurface_CSV(config[iZone], geometry[iZone][iInst][MESH_0]);
-     
-     }
-      /*--- Write Tecplot/ParaView ASCII files for the volume and/or surface solutions. ---*/
-
-      if (Wrt_Vol) {
-
-        switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file volume solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, false);
-            break;
-
-          case FIELDVIEW:
-
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-
-            break;
-
-          case TECPLOT_BINARY:
-
-          /*--- Write a Tecplot ASCII file instead for now in serial. ---*/
-
-          if (rank == MASTER_NODE) cout << "Writing Tecplot binary volume solution file." << endl;
-          WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-              iZone, val_nZone, false);
-          break;
-
-          case FIELDVIEW_BINARY:
-
-            /*--- FieldView binary files not yet available for parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII volume solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, false);
-            break;
-            
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary volume solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                                        iZone, val_nZone, false);
-            break;
-
-          default:
-            break;
-          }
-
-        }
-
-        if (Wrt_Srf) {
-
-          switch (FileFormat) {
-
-          case TECPLOT:
-
-            /*--- Write a Tecplot ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot ASCII file surface solution file." << endl;
-            WriteTecplotASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
-            break;
-
-          case TECPLOT_BINARY:
-
-            /*--- Write a Tecplot binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Tecplot binary surface solution file." << endl;
-            WriteTecplotBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0],
-                iZone, val_nZone, true);
-            break;
-
-          case PARAVIEW:
-
-            /*--- Write a Paraview ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing Paraview ASCII surface solution file." << endl;
-            WriteParaViewASCII_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
-            break;
-
-          case PARAVIEW_BINARY:
-            
-            /*--- Write a Paraview binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing Paraview binary surface solution file." << endl;
-            WriteParaViewBinary_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], iZone, val_nZone, true);
-            break;
-            
-
-          default:
-            break;
-          }
-
-        }
-
-        /*--- Clean up the connectivity data that was allocated for output. ---*/
-
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], false);
-        DeallocateConnectivity_Parallel(config[iZone], geometry[iZone][iInst][MESH_0], true);
-
-        /*--- Clean up the surface data that was only needed for output. ---*/
-
-        DeallocateSurfaceData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-      }
-
-      /*--- Deallocate the nodal data needed for writing restarts. ---*/
-
-      DeallocateData_Parallel(config[iZone], geometry[iZone][iInst][MESH_0]);
-
-    }
-
-}
 
 void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort) {
 

From 3d7402b94789079bb8ffed411f0553d40fc0e8b6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 13:57:59 +0200
Subject: [PATCH 184/539] Enabled travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b974c79b1279..85ae533de159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ compiler:
 notifications:
     email:
         recipients:
-            - su2code-dev@lists.stanford.edu
+            - tim.albring@scicomp.uni-kl.de
   
 branches:
     only:
-        - develop
+        - feature_input_output
 
 python:
     - 2.7

From 44bcd9eb4330fb56f29bdaead9b44b5521d5eadf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:43:14 +0200
Subject: [PATCH 185/539] Added consistent config option to get restart
 iteration

---
 Common/include/config_structure.hpp           | 12 -----------
 Common/include/config_structure.inl           |  4 ----
 Common/src/config_structure.cpp               |  3 +++
 SU2_CFD/src/driver_direct_singlezone.cpp      |  2 +-
 SU2_CFD/src/driver_structure.cpp              | 20 +++++++++----------
 SU2_CFD/src/integration_structure.cpp         |  2 +-
 SU2_CFD/src/output_structure_legacy.cpp       |  4 ++--
 SU2_CFD/src/solver_direct_elasticity.cpp      |  4 ++--
 SU2_CFD/src/solver_direct_heat.cpp            |  6 +++---
 SU2_CFD/src/solver_direct_mean.cpp            | 20 +++++++++----------
 SU2_CFD/src/solver_direct_mean_inc.cpp        | 20 +++++++++----------
 SU2_CFD/src/solver_structure.cpp              |  4 ++--
 SU2_SOL/src/SU2_SOL.cpp                       | 20 +++++++++----------
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg   |  2 +-
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |  2 +-
 .../incomp_rans/AhmedBody/turb_ahmed.cfg      |  2 +-
 .../flatPlate_rigidMotion_Conf.cfg            |  2 +-
 .../unsteady_CHT_FlatPlate_Conf.cfg           |  2 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |  2 +-
 .../incompressible_unsteady/configCircle.cfg  |  2 +-
 .../incompressible_unsteady/configOut.cfg     |  2 +-
 .../rotating_cylinders/rot_cylinders_WA.cfg   |  2 +-
 .../single_stage/single_stage_NN.cfg          |  2 +-
 .../single_stage/single_stage_WA.cfg          |  2 +-
 .../uniform_flow/uniform_WA.cfg               |  2 +-
 .../unsteady/square_cylinder/turb_square.cfg  |  2 +-
 26 files changed, 67 insertions(+), 80 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index ccbc1dc22b8e..c7f9c06926ad 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -3055,12 +3055,6 @@ class CConfig {
    */
   unsigned long GetDyn_nIntIter(void);
   
-  /*!
-   * \brief Get the restart iteration number for unsteady simulations.
-   * \return Restart iteration number for unsteady simulations.
-   */
-  long GetUnst_RestartIter(void);
-  
   /*!
    * \brief Get the starting direct iteration number for the unsteady adjoint (reverse time integration).
    * \return Starting direct iteration number for the unsteady adjoint.
@@ -3073,12 +3067,6 @@ class CConfig {
    */
   unsigned long GetIter_Avg_Objective(void);
   
-  /*!
-   * \brief Get the restart iteration number for dynamic structural simulations.
-   * \return Restart iteration number for dynamic structural simulations.
-   */
-  long GetDyn_RestartIter(void);
-
   /*!
    * \brief Retrieves the number of periodic time instances for Harmonic Balance.
    * \return: Number of periodic time instances for Harmonic Balance.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 839358494fa1..19ee6c4ea922 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -332,16 +332,12 @@ inline unsigned long CConfig::GetUnst_nIntIter(void) { return Unst_nIntIter; }
 
 inline unsigned long CConfig::GetDyn_nIntIter(void) { return Dyn_nIntIter; }
 
-inline long CConfig::GetUnst_RestartIter(void) { return Unst_RestartIter; }
-
 inline long CConfig::GetUnst_AdjointIter(void) { return Unst_AdjointIter; }
 
 inline bool CConfig::GetReorientElements(void) { return ReorientElements; }
 
 inline unsigned long CConfig::GetIter_Avg_Objective(void) { return Iter_Avg_Objective ; }
 
-inline long CConfig::GetDyn_RestartIter(void) { return Dyn_RestartIter; }
-
 inline string CConfig::GetPlaneTag(unsigned short index) { return PlaneTag[index]; }
 
 inline su2double CConfig::GetEA_IntLimit(unsigned short index) { return EA_IntLimit[index]; }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 555cb8de7b44..81d837838338 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -157,6 +157,9 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
   base_config = true;
   
+  nZone = 1;
+  iZone = 0;
+  
   /*--- Store MPI rank and size ---*/ 
   
   rank = SU2_MPI::GetRank();
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index a10b18611e70..db875124700f 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -71,7 +71,7 @@ void CSinglezoneDriver::StartSolver() {
 
   /*--- Set the initial time iteration to the restart iteration. ---*/
   if (config_container[ZONE_0]->GetRestart() && driver_config->GetTime_Domain())
-    TimeIter = config_container[ZONE_0]->GetUnst_RestartIter();
+    TimeIter = config_container[ZONE_0]->GetRestart_Iter();
   
   /*--- Run the problem until the number of time iterations required is reached. ---*/
   while ( TimeIter < config_container[ZONE_0]->GetnTime_Iter() ) {
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index a1733db4a23a..0253a4ea874f 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -498,12 +498,12 @@ CDriver::CDriver(char* confFile,
   }
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-    ExtIter = config_container[ZONE_0]->GetUnst_RestartIter();
+    ExtIter = config_container[ZONE_0]->GetRestart_Iter();
 
   /*--- Check for a dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY
       && config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
-    ExtIter = config_container[ZONE_0]->GetDyn_RestartIter();
+    ExtIter = config_container[ZONE_0]->GetRestart_Iter();
 
   /*--- Open the FSI convergence history file ---*/
 
@@ -1452,13 +1452,13 @@ void CDriver::Inlet_Preprocessing(CSolver ***solver_container, CGeometry **geome
   if (dual_time) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
     else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-      val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-    else val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+      val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+    else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
   }
 
   if (time_stepping) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-    else val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+    else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
   }
 
   /*--- Assign booleans ---*/
@@ -1584,13 +1584,13 @@ void CDriver::Solver_Restart(CSolver ****solver_container, CGeometry ***geometry
   if (dual_time) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
     else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-      val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-    else val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+      val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+    else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
   }
 
   if (time_stepping) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-    else val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+    else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
   }
 
   /*--- Assign booleans ---*/
@@ -1637,7 +1637,7 @@ void CDriver::Solver_Restart(CSolver ****solver_container, CGeometry ***geometry
       solver_container[val_iInst][MESH_0][TURB_SOL]->LoadRestart(geometry[val_iInst], solver_container[val_iInst], config, val_iter, update_geo);
     }
     if (fem) {
-      if (dynamic) val_iter = SU2_TYPE::Int(config->GetDyn_RestartIter())-1;
+      if (dynamic) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       solver_container[val_iInst][MESH_0][FEA_SOL]->LoadRestart(geometry[val_iInst], solver_container[val_iInst], config, val_iter, update_geo);
     }
     if (fem_euler || fem_ns) {
@@ -1670,7 +1670,7 @@ void CDriver::Solver_Restart(CSolver ****solver_container, CGeometry ***geometry
         solver_container[val_iInst][MESH_0][ADJHEAT_SOL]->LoadRestart(geometry[val_iInst], solver_container[val_iInst], config, val_iter, update_geo);
     }
     if (disc_adj_fem) {
-        if (dynamic) val_iter = SU2_TYPE::Int(config->GetDyn_RestartIter())-1;
+        if (dynamic) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
         solver_container[val_iInst][MESH_0][ADJFEA_SOL]->LoadRestart(geometry[val_iInst], solver_container[val_iInst], config, val_iter, update_geo);
     }
     if (disc_adj_heat) {
diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp
index dcba21877e4b..0f43d64ef5dd 100644
--- a/SU2_CFD/src/integration_structure.cpp
+++ b/SU2_CFD/src/integration_structure.cpp
@@ -228,7 +228,7 @@ void CIntegration::Space_Integration_FEM(CGeometry *geometry,
     unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
 
     bool restart = config->GetRestart();                                  // Restart solution
-    bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetDyn_RestartIter());  // Restart iteration
+    bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetRestart_Iter());  // Restart iteration
 
     /*--- Compute Mass Matrix ---*/
     /*--- The mass matrix is computed only once, at the beginning of the calculation, no matter whether the ---*/
diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index 71e220c256ae..94e0f42c689a 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -4360,7 +4360,7 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   strcpy (cstr, filename.data());
   
   if (config->GetWrt_Unsteady() && config->GetRestart()) {
-    long iExtIter = config->GetUnst_RestartIter();
+    long iExtIter = config->GetRestart_Iter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
@@ -11274,7 +11274,7 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
     strcpy (cstr, filename.data());
 
     if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
-      long iExtIter = config[ZONE_FLOW]->GetUnst_RestartIter();
+      long iExtIter = config[ZONE_FLOW]->GetRestart_Iter();
       if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 2ec3d573a580..dd621e8aba2f 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -1416,7 +1416,7 @@ void CFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
   bool restart = config->GetRestart();                        // Restart analysis
-  bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetDyn_RestartIter()); // Initial calculation for restart
+  bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetRestart_Iter()); // Initial calculation for restart
   
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);     // Discrete adjoint FEM solver
   
@@ -3585,7 +3585,7 @@ su2double CFEASolver::Compute_LoadCoefficient(su2double CurrentTime, su2double R
   bool offset = (restart && fsi && (!stat_fsi));
   su2double DeltaT = config->GetDelta_DynTime();
   su2double OffsetTime = 0.0;
-  OffsetTime = DeltaT * (config->GetDyn_RestartIter()-1);
+  OffsetTime = DeltaT * (config->GetRestart_Iter()-1);
 
   /*--- Polynomial functions from https://en.wikipedia.org/wiki/Smoothstep ---*/
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index aa99d5c2866b..419e4c776796 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -2063,7 +2063,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
 
   /*--- The value of the solution for the first iteration of the dual time ---*/
 
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetUnst_RestartIter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
 
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -2075,12 +2075,12 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
       }
     }
 
-    if ((restart && (long)ExtIter == config->GetUnst_RestartIter()) &&
+    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
 
       /*--- Load an additional restart file for a 2nd-order restart ---*/
 
-      solver_container[MESH_0][HEAT_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetUnst_RestartIter()-1), true);
+      solver_container[MESH_0][HEAT_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), true);
 
       /*--- Push back this new solution to time level N. ---*/
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 6fe8a63ea95f..c6f444d3a1c3 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -206,8 +206,8 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-        Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+        Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -215,7 +215,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -4188,7 +4188,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
   /*--- Make sure that the solution is well initialized for unsteady
    calculations with dual time-stepping (load additional restarts for 2nd-order). ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetUnst_RestartIter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -4204,16 +4204,16 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
       }
     }
     
-    if ((restart && (long)ExtIter == config->GetUnst_RestartIter()) &&
+    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
       
-      solver_container[MESH_0][FLOW_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetUnst_RestartIter()-1), true);
+      solver_container[MESH_0][FLOW_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), true);
       
       /*--- Load an additional restart file for the turbulence model ---*/
       if (rans)
-        solver_container[MESH_0][TURB_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetUnst_RestartIter()-1), false);
+        solver_container[MESH_0][TURB_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), false);
       
       /*--- Push back this new solution to time level N. ---*/
       
@@ -15093,8 +15093,8 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-        Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+        Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -15102,7 +15102,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 93c9d6af7f8a..5e2ed1b2d45c 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -131,8 +131,8 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-        Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+        Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -140,7 +140,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -2428,7 +2428,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   
   /*--- The value of the solution for the first iteration of the dual time ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetUnst_RestartIter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -2444,16 +2444,16 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
       }
     }
     
-    if ((restart && (long)ExtIter == config->GetUnst_RestartIter()) &&
+    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
       
-      solver_container[MESH_0][FLOW_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetUnst_RestartIter()-1), true);
+      solver_container[MESH_0][FLOW_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), true);
       
       /*--- Load an additional restart file for the turbulence model ---*/
       if (rans)
-        solver_container[MESH_0][TURB_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetUnst_RestartIter()-1), false);
+        solver_container[MESH_0][TURB_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), false);
       
       /*--- Push back this new solution to time level N. ---*/
       
@@ -7308,8 +7308,8 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-        Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+        Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
@@ -7317,7 +7317,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+      else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 94292331ac21..a5c935339a33 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -2048,7 +2048,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   /*-------------------------------------------------------------------------------------------*/
 
   /*--- Modify file name for an unsteady restart ---*/
-  Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+  Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
   filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
   /*--- Open the restart file, throw an error if this fails. ---*/
@@ -2119,7 +2119,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
     string filename_n1;
 
     /*--- Modify file name for an unsteady restart ---*/
-    Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
+    Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
     filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
     /*--- Open the restart file, throw an error if this fails. ---*/
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index d966818e486a..a7ebb35a8b77 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -385,8 +385,8 @@ int main(int argc, char *argv[]) {
 
     /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
     if (config_container[ZONE_0]->GetRestart()){
-      iExtIterFlow = config_container[ZONE_0]->GetUnst_RestartIter();
-      iExtIterFEM = config_container[ZONE_1]->GetDyn_RestartIter();
+      iExtIterFlow = config_container[ZONE_0]->GetRestart_Iter();
+      iExtIterFEM = config_container[ZONE_1]->GetRestart_Iter();
       if (iExtIterFlow != iExtIterFEM) {
         SU2_MPI::Error("For multizone computations, please add the number of zones as a second argument for SU2_SOL.", CURRENT_FUNCTION);
       }
@@ -433,7 +433,7 @@ int main(int argc, char *argv[]) {
         /*--- For the fluid zone (ZONE_0) ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFlow == false &&
-            (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetUnst_RestartIter())) ||
+            (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetRestart_Iter())) ||
                                iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
@@ -449,7 +449,7 @@ int main(int argc, char *argv[]) {
         /*--- Either instantiate the solution class or load a restart file. ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFEM == false &&
-            (iExtIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_1]->GetDyn_RestartIter())) ||
+            (iExtIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_1]->GetRestart_Iter())) ||
                                iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_1]->GetnExtIter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
@@ -498,7 +498,7 @@ int main(int argc, char *argv[]) {
 
       /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
       if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetUnst_RestartIter();
+        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
 
       while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
 
@@ -524,7 +524,7 @@ int main(int argc, char *argv[]) {
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
                     (iExtIter == 0 ||
-                     (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetUnst_RestartIter() ||
+                     (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetRestart_Iter() ||
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
 
@@ -576,7 +576,7 @@ int main(int argc, char *argv[]) {
 
       /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
       if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetUnst_RestartIter();
+        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
 
       while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
 
@@ -605,7 +605,7 @@ int main(int argc, char *argv[]) {
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
-                    (iExtIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetUnst_RestartIter() ||
+                    (iExtIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetRestart_Iter() ||
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
@@ -699,7 +699,7 @@ int main(int argc, char *argv[]) {
       /*--- Check for an dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
       if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY &&
           config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetDyn_RestartIter();
+        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
 
       while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
 
@@ -724,7 +724,7 @@ int main(int argc, char *argv[]) {
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated == false &&
-                    (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetDyn_RestartIter())) ||
+                    (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetRestart_Iter())) ||
                                        iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                        iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 3f18b59c27f3..3786fae60b1f 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -31,7 +31,7 @@ MATH_PROBLEM= DIRECT
 RESTART_SOL= YES
 %
 % Unsteady restart iteration (need previous restart files)
-UNST_RESTART_ITER= 2
+RESTART_ITER= 2
 %
 % Unsteady restart iteration (need previous restart files)
 DYN_RESTART_ITER= 2
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index 2663b8cd334c..dde8d68f635f 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -19,7 +19,7 @@ MATH_PROBLEM= DIRECT
 RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
-UNST_RESTART_ITER= 2
+RESTART_ITER= 2
 DYN_RESTART_ITER= 2
 EXT_ITER= 3
 UNST_TIMESTEP= 0.005
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 891de76cc57d..0edfdf1a8310 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -82,7 +82,7 @@ UNST_CFL_NUMBER= 0.0
 UNST_INT_ITER= 200
 %
 % Iteration number to begin unsteady restarts
-UNST_RESTART_ITER= 0
+RESTART_ITER= 0
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 0ce68c4ca6bd..ed6beca8dfb4 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -176,7 +176,7 @@ UNST_CFL_NUMBER= 0.0
 UNST_INT_ITER= 10
 %
 % Iteration number to begin unsteady restarts
-UNST_RESTART_ITER= 0
+RESTART_ITER= 0
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 3b68f8ef018d..37d85d2f1ccc 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -176,7 +176,7 @@ UNST_CFL_NUMBER= 0.0
 UNST_INT_ITER= 10
 %
 % Iteration number to begin unsteady restarts
-UNST_RESTART_ITER= 0
+RESTART_ITER= 0
 
 % ----------------------- BODY FORCE DEFINITION -------------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 622160f9aff4..6c7276806897 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -168,7 +168,7 @@ UNST_INT_ITER= 100
 TIME_INSTANCES= 1
 %
 % Iteration number to begin unsteady restarts
-UNST_RESTART_ITER=2
+RESTART_ITER=2
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 50741829b5f0..cbdd9feb8d5d 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -29,7 +29,7 @@ MULTIZONE_MESH = NO
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIMESTEP= 1.0
 UNST_INT_ITER= 20
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 INNER_ITER = 1
 UNST_TIME= 100
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index bb327ff0b10d..3b9bf5f6002c 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -29,7 +29,7 @@ MULTIZONE_MESH = NO
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIMESTEP= 1.0
 UNST_INT_ITER= 20
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 INNER_ITER = 1
 UNST_TIME= 100
 
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index f6af4c1299b5..671085f79dd8 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -59,7 +59,7 @@ UNST_TIME= 50
 % Number of internal iterations (dual time method)
 UNST_INT_ITER= 200
 
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index f3726de69562..570dcb0e247a 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -47,7 +47,7 @@ UNST_TIME= 10.0
 % Number of internal iterations (dual time method)
 UNST_INT_ITER= 200
 
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 85ad5b56a005..ae5d6dc607a1 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -49,7 +49,7 @@ UNST_TIME= 10.0
 % Number of internal iterations (dual time method)
 UNST_INT_ITER= 200
 
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 6f5e304fa95e..7a1cd99bc0cc 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -43,7 +43,7 @@ UNST_TIME= 0.01
 % Number of internal iterations (dual time method)
 UNST_INT_ITER= 120
 
-UNST_RESTART_ITER = 2
+RESTART_ITER = 2
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index b5145a35670a..554f70ca1e8c 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -32,7 +32,7 @@ WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 %
 % Unsteady restart iteration (need previous restart files)
-UNST_RESTART_ITER= 2
+RESTART_ITER= 2
 %
 % New singlezone driver
 SINGLEZONE_DRIVER=YES

From 5c7fd56a33eb35709b4fa55c5eed8e57c5a640bc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:44:34 +0200
Subject: [PATCH 186/539] added a routine to split strings and made
 ReadBoundSensitivity work

---
 Common/include/toolboxes/printing_toolbox.hpp | 12 ++++++
 Common/src/geometry_structure.cpp             | 38 ++++++++++++-------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index b4fb619ccf6e..4c3aad3f642d 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -157,4 +157,16 @@ class CTablePrinter{
   print_header_bottom_line_;   /*< \brief Printing the header bottom line. */
 };
 
+inline std::vector<std::string> split(const std::string& s, char delimiter)
+{
+  std::vector<std::string> tokens;
+  std::string token;
+  std::istringstream tokenStream(s);
+  while (std::getline(tokenStream, token, delimiter))
+  {
+    tokens.push_back(token);
+  }
+  return tokens;
+}
+
 }
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index a2519abc2f98..1b572cd31856 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -18434,29 +18434,41 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     strcat (cstr, buffer);
     
     /*--- Read the sensitivity file ---*/
-    
-    string::size_type position;
-    
+        
     Surface_file.open(cstr, ios::in);
     
     /*--- Read extra inofmration ---*/
     
-    getline(Surface_file, text_line);
-    text_line.erase (0,9);
-    su2double AoASens = atof(text_line.c_str());
-    config->SetAoA_Sens(AoASens);
+//    getline(Surface_file, text_line);
+//    text_line.erase (0,9);
+//    su2double AoASens = atof(text_line.c_str());
+//    config->SetAoA_Sens(AoASens);
     
     /*--- File header ---*/
     
     getline(Surface_file, text_line);
     
+    vector<string> Fields;
+    string SensField = "Surface_Sensitivity";
+    
+    Fields = PrintingToolbox::split(text_line,',');
+    
+    unsigned short iField = 0;
+    for (iField = 0; iField < Fields.size(); iField++){
+      if (Fields[iField].substr(1,Fields[iField].size()-2) == SensField) break;
+    }
+    
+    if (iField == Fields.size()) {
+      SU2_MPI::Error("Surface sensitivity not found in file " + string(cstr), CURRENT_FUNCTION);
+    }
+    
     while (getline(Surface_file, text_line)) {
-      for (icommas = 0; icommas < 50; icommas++) {
-        position = text_line.find( ",", 0 );
-        if (position!=string::npos) text_line.erase (position,1);
-      }
-      stringstream  point_line(text_line);
-      point_line >> iPoint >> Sensitivity;
+     
+      vector<string> FieldValues = PrintingToolbox::split(text_line, ',');
+      
+      iPoint = std::stoi(FieldValues[0]);
+      
+      Sensitivity = std::stod(FieldValues[iField]);
       
       if (PointInDomain[iPoint]) {
         

From 7c282c9cb1e0e68e21ad677ebd0c3b8e503eb567 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:45:36 +0200
Subject: [PATCH 187/539] Removed some unused arguments

---
 SU2_CFD/include/output_structure.hpp     | 13 ++++---------
 SU2_CFD/src/driver_direct_multizone.cpp  |  2 +-
 SU2_CFD/src/driver_direct_singlezone.cpp |  2 +-
 SU2_CFD/src/iteration_structure.cpp      |  2 +-
 SU2_CFD/src/output_structure.cpp         | 12 ++++++------
 SU2_DEF/src/SU2_DEF.cpp                  |  4 ++--
 SU2_DOT/src/SU2_DOT.cpp                  |  2 +-
 SU2_SOL/src/SU2_SOL.cpp                  | 14 +++++++-------
 8 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index da5238d17c2c..17d5f6947772 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -801,24 +801,19 @@ class COutput {
 
   /*!
    * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
    */
-  void DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol);
+  void DeallocateConnectivity_Parallel(bool surf_sol);
   
   /*!
    * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
    */
-  void DeallocateData_Parallel(CConfig *config, CGeometry *geometry);
+  void DeallocateData_Parallel();
   
   /*!
    * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
    */
-  void DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry);
+  void DeallocateSurfaceData_Parallel();
 
   /*!
    * \brief Merge the node coordinates of all inlet boundaries from all processors.
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index d78bb069a4c2..54ac3d9ef4ff 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -633,7 +633,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         if (Wrt_CSV)
           output[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV);    
         
-        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][iInst][MESH_0]);
+        output[iZone]->DeallocateData_Parallel();
         
       }
       
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index db875124700f..2a95a1a62cef 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -280,7 +280,7 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
       if (Wrt_CSV)
         output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV);    
       
-      output[ZONE_0]->DeallocateData_Parallel(config_container[ZONE_0], geometry_container[ZONE_0][iInst][MESH_0]);
+      output[ZONE_0]->DeallocateData_Parallel();
       
     }
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 0dab6bac5d24..427516527381 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -527,7 +527,7 @@ void CIteration::Output(COutput *output,
       if (Wrt_CSV)
         output->SetSurface_Output(geometry_container[val_iZone][val_iInst][MESH_0], config_container[val_iZone], CSV);    
       
-      output->DeallocateData_Parallel(config_container[val_iZone], geometry_container[val_iZone][val_iInst][MESH_0]);      
+      output->DeallocateData_Parallel();      
     
     /*--- Execute the routine for writing special output. ---*/
     //output->SetSpecial_Output(solver_container, geometry_container, config_container, Iter, nZone);
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index fda50f2d61b7..436c93fd621c 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -745,9 +745,9 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
 
   /*--- Clean up the surface data that was only needed for output. ---*/
  
-  DeallocateConnectivity_Parallel(config, geometry, true);
+  DeallocateConnectivity_Parallel(true);
   
-  DeallocateSurfaceData_Parallel(config, geometry);
+  DeallocateSurfaceData_Parallel();
   
 }
 
@@ -867,7 +867,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   /*--- Clean up the surface data that was only needed for output. ---*/
   
   if (format != SU2_RESTART_ASCII && format != SU2_RESTART_BINARY)
-    DeallocateConnectivity_Parallel(config, geometry, false);
+    DeallocateConnectivity_Parallel(false);
   
 }
 
@@ -4535,7 +4535,7 @@ void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
   
 }
 
-void COutput::DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geometry, bool surf_sol) {
+void COutput::DeallocateConnectivity_Parallel(bool surf_sol) {
   
   /*--- Deallocate memory for connectivity data on each processor. ---*/
   
@@ -4558,7 +4558,7 @@ void COutput::DeallocateConnectivity_Parallel(CConfig *config, CGeometry *geomet
   
 }
 
-void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
+void COutput::DeallocateData_Parallel() {
   
   /*--- Deallocate memory for solution data ---*/
   
@@ -4569,7 +4569,7 @@ void COutput::DeallocateData_Parallel(CConfig *config, CGeometry *geometry) {
 
 }
 
-void COutput::DeallocateSurfaceData_Parallel(CConfig *config, CGeometry *geometry) {
+void COutput::DeallocateSurfaceData_Parallel() {
   
   if (Parallel_Surf_Data != NULL) {
     
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 93f3ae9ea542..b5cf82050dc8 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -234,7 +234,7 @@ int main(int argc, char *argv[]) {
         
       }
       
-      output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone]);
+      output[iZone]->DeallocateData_Parallel();
       
     }
   }
@@ -351,7 +351,7 @@ int main(int argc, char *argv[]) {
       
     }
     
-    output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone]);
+    output[iZone]->DeallocateData_Parallel();
     
   }
 
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 0e91b339f6ec..57e49180baa8 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -1011,7 +1011,7 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
 
     /*--- Deallocate ---*/
     
-    output->DeallocateData_Parallel(config[iZone], geometry[iZone][INST_0]);
+    output->DeallocateData_Parallel();
     
     /*--- Free memory ---*/
     
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index a7ebb35a8b77..ffbc23a342c4 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -333,7 +333,7 @@ int main(int argc, char *argv[]) {
     
             /*--- Deallocate data --- */
             
-            output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+            output[iZone]->DeallocateData_Parallel();
           
           }
         }
@@ -366,7 +366,7 @@ int main(int argc, char *argv[]) {
 
         /*--- Deallocate data --- */
         
-        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+        output[iZone]->DeallocateData_Parallel();
         
       }
     }
@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) {
   
           /*--- Deallocate data --- */
           
-          output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+          output[iZone]->DeallocateData_Parallel();
           
         }
       }
@@ -632,7 +632,7 @@ int main(int argc, char *argv[]) {
         
                 /*--- Deallocate data --- */
                 
-                output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+                output[iZone]->DeallocateData_Parallel();
                 
               }
         }
@@ -674,7 +674,7 @@ int main(int argc, char *argv[]) {
           
           /*--- Deallocate data --- */
           
-          output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][iInst]);
+          output[iZone]->DeallocateData_Parallel();
           
           
         }
@@ -751,7 +751,7 @@ int main(int argc, char *argv[]) {
         
                 /*--- Deallocate data --- */
                 
-                output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+                output[iZone]->DeallocateData_Parallel();
                 
               }        
         }
@@ -788,7 +788,7 @@ int main(int argc, char *argv[]) {
         
         /*--- Deallocate data --- */
         
-        output[iZone]->DeallocateData_Parallel(config_container[iZone], geometry_container[iZone][INST_0]);
+        output[iZone]->DeallocateData_Parallel();
         
       }
     }

From b77edc5fd25e0a9d0f80ac38ccbda7be0f9234f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:46:28 +0200
Subject: [PATCH 188/539] Couple of small fixes

---
 Common/src/grid_movement_structure.cpp |  5 ++-
 SU2_CFD/src/driver_structure.cpp       | 52 ++++++++++++++------------
 SU2_CFD/src/output_structure.cpp       | 13 ++-----
 SU2_CFD/src/output_su2.cpp             |  7 +++-
 4 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 49d42e62894b..6e5a15d20413 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -8996,7 +8996,10 @@ su2double CFreeFormDefBox::GetDerivative5(su2double *uvw, unsigned short dim, un
 
 
 CElasticityMovement::CElasticityMovement(CGeometry *geometry, CConfig *config) : CVolumetricMovement(), System(true) {
-
+  
+    size = SU2_MPI::GetSize();
+    rank = SU2_MPI::GetRank();
+  
     /*--- Initialize the number of spatial dimensions, length of the state
      vector (same as spatial dimensions for grid deformation), and grid nodes. ---*/
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 0253a4ea874f..179ea76ffb72 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -481,7 +481,8 @@ CDriver::CDriver(char* confFile,
 
 //  output = new COutput(config_container[ZONE_0]);
 
-  if  (!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()){
+  if  ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()) || 
+       config_container[ZONE_0]->GetBoolTurbomachinery() || config_container[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE){
     /*--- Open the convergence history file ---*/
     ConvHist_file = NULL;
     ConvHist_file = new ofstream*[nZone];
@@ -4122,27 +4123,31 @@ void CDriver::Output(unsigned long ExtIter) {
     
     /*--- Execute the routine for writing restart, volume solution,
      surface solution, and surface comma-separated value files. ---*/
-    for (unsigned short iInst = 0; iInst < nInst[ZONE_0]; iInst++){
-      
-      config_container[ZONE_0]->SetiInst(iInst);
-      
-      output[ZONE_0]->Load_Data(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], solver_container[ZONE_0][iInst][MESH_0]);
-      
-      /*--- Write restart files ---*/
-      
-      output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat);
-      
-      /*--- Write visualization files ---*/
-      
-      if (Wrt_Vol)
-        output[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
-      if (Wrt_Surf)
-        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
-      if (Wrt_CSV)
-        output[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV);    
-      
-      output[ZONE_0]->DeallocateData_Parallel(config_container[ZONE_0], geometry_container[ZONE_0][iInst][MESH_0]);
-      
+    
+    for (iZone = 0; iZone < nZone; iZone++){
+      for (unsigned short iInst = 0; iInst < nInst[iZone]; iInst++){
+        
+        config_container[iZone]->SetiInst(iInst);
+        
+        output[iZone]->Load_Data(geometry_container[iZone][iInst][MESH_0], config_container[iZone], solver_container[iZone][iInst][MESH_0]);
+        
+        /*--- Write restart files ---*/
+        
+        output[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat);
+        
+        /*--- Write visualization files ---*/
+        
+        if (Wrt_Vol)
+          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+        
+        if (Wrt_Surf)
+          output[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+        if (Wrt_CSV)
+          output[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV);    
+        
+        output[iZone]->DeallocateData_Parallel();
+        
+      }
     }
     if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
     
@@ -4442,8 +4447,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
   /*--- Update the convergence history file (serial and parallel computations). ---*/
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    for (iInst = 0; iInst < nInst[iZone]; iInst++)
-      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))      
+    for (iInst = 0; iInst < nInst[iZone]; iInst++)    
       output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone, iInst);
   }
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 436c93fd621c..719c26cf0053 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -40,7 +40,7 @@
 COutput::COutput(CConfig *config) {
   
   
-  if(!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()){
+  if((!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()) || config->GetBoolTurbomachinery()){
     output_legacy = new COutputLegacy(config);
   }
   
@@ -3919,11 +3919,8 @@ void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry)
   
   /*--- Local variables ---*/
   
-  unsigned short nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
   unsigned short iVar;
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
+  unsigned long iPoint;
 
   ofstream restart_file;
   string filename;
@@ -4024,9 +4021,8 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry)
 
   /*--- Local variables ---*/
 
-  unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
-  bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
+  unsigned short iVar;
+  unsigned long iPoint;
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool wrt_perf  = config->GetWrt_Performance();
@@ -4602,7 +4598,6 @@ void COutput::MergeInletCoordinates(CConfig *config, CGeometry *geometry) {
 
   char str_buf[MAX_STRING_SIZE];
   vector<string> Marker_Tags;
-  vector<string>::iterator it;
 
   unsigned long *nRowCum_Counter = NULL;
 
diff --git a/SU2_CFD/src/output_su2.cpp b/SU2_CFD/src/output_su2.cpp
index 1ad4bf37b67e..0a340f8006bb 100644
--- a/SU2_CFD/src/output_su2.cpp
+++ b/SU2_CFD/src/output_su2.cpp
@@ -51,7 +51,12 @@ void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   ofstream output_file;
   char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
   
-  filename = VolumeFilename + string(".su2");
+  filename = VolumeFilename;
+  unsigned short lastindex = filename.find_last_of(".");
+  filename = filename.substr(0, lastindex);
+  filename += string(".su2");
+  
+
 
   /*--- Special cases where a number needs to be appended to the file name. ---*/
 

From 879235513c352ba1d9837c9e3ee53885515118c6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:47:06 +0200
Subject: [PATCH 189/539] Enabled new single zone driver in SU2_CFD.py

---
 SU2_PY/SU2_CFD.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
index 8d80253e5652..6a1199bbb89c 100755
--- a/SU2_PY/SU2_CFD.py
+++ b/SU2_PY/SU2_CFD.py
@@ -99,7 +99,7 @@ def main():
     elif (options.nZone == 2) and (options.fsi):
       SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:

From 105ac6aae6a5e77d97afa80f7c908ca796cc3a6d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:48:38 +0200
Subject: [PATCH 190/539] Adapted more test cases

---
 TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg        | 3 ++-
 TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg | 7 +++++++
 TestCases/new_output_regression.py                        | 3 +++
 .../steady_naca0012/inv_NACA0012_adv.cfg                  | 8 +++++++-
 TestCases/serial_regression.py                            | 6 ++++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 7c83cbc4d677..a922bdd68e2a 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -325,7 +325,8 @@ WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) 
-
+HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF, SENSITIVITY)
+VOLUME_OUTPUT= (COORDINATES, SOLUTION, PRESSURE, TEMPERATURE, SENSITIVITY)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
 %    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index ff0cc74de464..f5bfd7180598 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -26,6 +26,10 @@ RESTART_SOL= YES
 %
 % Number of Zones
 NZONES= 1
+%
+% New single zone driver
+SINGLEZONE_DRIVER= YES
+
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -345,6 +349,9 @@ VISUALIZE_SURFACE_DEF= YES
 %
 % Visualize the volume deformation (NO, YES)
 VISUALIZE_VOLUME_DEF= YES
+% 
+% History output
+HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
index 6bc2e7718dd2..af555faf334c 100644
--- a/TestCases/new_output_regression.py
+++ b/TestCases/new_output_regression.py
@@ -1312,6 +1312,7 @@ def main():
     contadj_euler_py.timeout   = 1600
     contadj_euler_py.reference_file = "of_grad_cd.dat.ref"
     contadj_euler_py.test_file = "of_grad_cd.dat"
+    contadj_euler_py.new_output = True
     pass_list.append(contadj_euler_py.run_filediff())
     test_list.append(contadj_euler_py)
 
@@ -1323,6 +1324,7 @@ def main():
     shape_opt_euler_py.test_vals = [1, 1, 2.134974E-05, 3.829535E-03] #last 4 columns
     shape_opt_euler_py.su2_exec  = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
     shape_opt_euler_py.timeout   = 1600
+    shape_opt_euler_py.new_output = True
     shape_opt_euler_py.tol       = 0.00001
     pass_list.append(shape_opt_euler_py.run_opt())
     test_list.append(shape_opt_euler_py)
@@ -1334,6 +1336,7 @@ def main():
     contadj_multi_py.test_iter  = 10
     contadj_multi_py.su2_exec   = "continuous_adjoint.py"
     contadj_multi_py.timeout    = 1600
+    contadj_multi_py.new_output = True
     contadj_multi_py.reference_file = "of_grad_combo.dat.ref"
     contadj_multi_py.test_file  = "of_grad_combo.dat"
     pass_list.append(contadj_multi_py.run_filediff())
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index cf6096503435..861a8839ce8d 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -27,6 +27,9 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
+%
+% New single zone driver
+SINGLEZONE_DRIVER=YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -94,7 +97,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -319,6 +322,9 @@ WRT_CON_FREQ_DUALTIME= 10
 %
 % Output rind layers in the solution files
 WRT_HALO= NO
+%
+% History output
+HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index e3180e3b78ec..b6844d51bdc4 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1062,6 +1062,7 @@ def main():
     pywrapper_naca0012.test_iter = 20
     pywrapper_naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
     pywrapper_naca0012.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_naca0012.new_output  = True
     pywrapper_naca0012.timeout   = 1600
     pywrapper_naca0012.tol       = 0.00001
     test_list.append(pywrapper_naca0012)
@@ -1074,6 +1075,7 @@ def main():
     pywrapper_turb_naca0012_sst.test_iter = 10
     pywrapper_turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
     pywrapper_turb_naca0012_sst.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_turb_naca0012_sst.new_output = True
     pywrapper_turb_naca0012_sst.timeout   = 3200
     pywrapper_turb_naca0012_sst.tol       = 0.00001
     test_list.append(pywrapper_turb_naca0012_sst)
@@ -1099,6 +1101,7 @@ def main():
     pywrapper_aeroelastic.test_iter = 2
     pywrapper_aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
     pywrapper_aeroelastic.su2_exec  = "SU2_CFD.py -f"
+    pywrapper_aeroelastic.new_output  = True
     pywrapper_aeroelastic.timeout   = 1600
     pywrapper_aeroelastic.tol       = 0.000001
     pywrapper_aeroelastic.unsteady  = True
@@ -1112,6 +1115,7 @@ def main():
     pywrapper_fsi2d.test_iter = 4
     pywrapper_fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
+    pywrapper_fsi2d.new_output  = True
     pywrapper_fsi2d.timeout   = 1600
     pywrapper_fsi2d.tol       = 0.00001
     test_list.append(pywrapper_fsi2d)
@@ -1125,6 +1129,7 @@ def main():
     pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.263309, 0.001077, 0.145818] #last 4 columns
     pywrapper_unsteadyCHT.su2_exec      = "python launch_unsteady_CHT_FlatPlate.py -f"
     pywrapper_unsteadyCHT.timeout       = 1600
+    pywrapper_unsteadyCHT.new_output    = True
     pywrapper_unsteadyCHT.tol           = 0.00001
     pywrapper_unsteadyCHT.unsteady      = True
     test_list.append(pywrapper_unsteadyCHT)
@@ -1137,6 +1142,7 @@ def main():
     pywrapper_rigidMotion.test_iter     = 5
     pywrapper_rigidMotion.test_vals     = [-1.598116, 2.259671, -0.040621, 0.144134] #last 4 columns
     pywrapper_rigidMotion.su2_exec      = "python launch_flatPlate_rigidMotion.py -f"
+    pywrapper_rigidMotion.new_output      = True
     pywrapper_rigidMotion.timeout       = 1600
     pywrapper_rigidMotion.tol           = 0.00001
     pywrapper_rigidMotion.unsteady      = True

From 56b3642c6f2e25bde9ac88293c3e6039fe1a7ecc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:49:29 +0200
Subject: [PATCH 191/539] Singlezone driver is now enabled by default

---
 Common/src/config_structure.cpp | 2 +-
 TestCases/TestCase.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 81d837838338..aff1f3c5753a 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2194,7 +2194,7 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Total Physical Time for time-domain problems (s) */
   addDoubleOption("MAX_TIME", Max_Time, 1.0);
   /* DESCRIPTION: Determines if the single-zone driver is used. (TEMPORARY) */
-  addBoolOption("SINGLEZONE_DRIVER", SinglezoneDriver, false);
+  addBoolOption("SINGLEZONE_DRIVER", SinglezoneDriver, true);
   /* DESCRIPTION: Determines if the special output is written out */
   addBoolOption("SPECIAL_OUTPUT", SpecialOutput, false);
 
diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index 2f72c27fb6ed..80cb8efb20d0 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -65,7 +65,7 @@ def __init__(self,tag_in):
         self.no_restart = False
 
         # Indicate whether the new output is used
-        self.new_output = False   
+        self.new_output = True   
 
         # multizone problem
         self.multizone = False

From 2e2e7d836fec890a6c51637e83c788ee442d8544 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:50:36 +0200
Subject: [PATCH 192/539] adapted serial_regression

---
 TestCases/serial_regression.py | 405 ++++++++++++++++++++++++++++++---
 1 file changed, 373 insertions(+), 32 deletions(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index b6844d51bdc4..613829731778 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -50,6 +50,54 @@ def main():
     ## Compressible Euler ###
     #########################
 
+    # Channel
+    channel           = TestCase('channel')
+    channel.cfg_dir   = "euler/channel"
+    channel.cfg_file  = "inv_channel_RK.cfg"
+    channel.test_iter = 10
+    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
+    channel.su2_exec  = "SU2_CFD"
+    channel.timeout   = 1600
+    channel.new_output = True
+    channel.tol       = 0.00001
+    test_list.append(channel)
+
+    # NACA0012 
+    naca0012           = TestCase('naca0012')
+    naca0012.cfg_dir   = "euler/naca0012"
+    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
+    naca0012.test_iter = 20
+    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
+    naca0012.su2_exec  = "SU2_CFD"
+    naca0012.timeout   = 1600
+    naca0012.new_output= True
+    naca0012.tol       = 0.00001
+    test_list.append(naca0012)
+
+    # Supersonic wedge 
+    wedge           = TestCase('wedge')
+    wedge.cfg_dir   = "euler/wedge"
+    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
+    wedge.test_iter = 20
+    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
+    wedge.su2_exec  = "SU2_CFD"
+    wedge.timeout   = 1600
+    wedge.new_output= True
+    wedge.tol       = 0.00001
+    test_list.append(wedge)
+
+    # ONERA M6 Wing
+    oneram6           = TestCase('oneram6')
+    oneram6.cfg_dir   = "euler/oneram6"
+    oneram6.cfg_file  = "inv_ONERAM6.cfg"
+    oneram6.test_iter = 10
+    oneram6.test_vals = [-10.384532, -9.835738, 0.282580, 0.012694] #last 4 columns
+    oneram6.su2_exec  = "SU2_CFD"
+    oneram6.timeout   = 9600
+    oneram6.new_output = True
+    oneram6.tol       = 0.00001
+    test_list.append(oneram6)
+    
     # Fixed CL NACA0012
     fixedCL_naca0012           = TestCase('fixedcl_naca0012')
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
@@ -57,6 +105,7 @@ def main():
     fixedCL_naca0012.test_iter = 100
     fixedCL_naca0012.test_vals = [-2.582897, 2.820443, 0.295158, 0.019324] #last 4 columns
     fixedCL_naca0012.su2_exec  = "SU2_CFD"
+    fixedCL_naca0012.new_output = True
     fixedCL_naca0012.timeout   = 1600
     fixedCL_naca0012.tol       = 0.00001
     test_list.append(fixedCL_naca0012)
@@ -66,6 +115,7 @@ def main():
     polar_naca0012.cfg_dir   = "polar/naca0012"
     polar_naca0012.cfg_file  = "inv_NACA0012.cfg"
     polar_naca0012.polar     = True
+    polar_naca0012.new_output= True
     polar_naca0012.test_iter = 10
     polar_naca0012.test_vals = [-1.319488, 4.112397, 0.011954, 0.009584] #last 4 columns
     polar_naca0012.su2_exec  = "compute_polar.py -n 1 -i 11"
@@ -77,6 +127,7 @@ def main():
     bluntbody           = TestCase('bluntbody')
     bluntbody.cfg_dir   = "euler/bluntbody"
     bluntbody.cfg_file  = "blunt.cfg"
+    bluntbody.new_output = True
     bluntbody.test_iter = 20
     bluntbody.test_vals = [0.626808, 7.014695, -0.000000, 1.648024] #last 4 columns
     bluntbody.su2_exec  = "SU2_CFD"
@@ -88,6 +139,41 @@ def main():
     ###  Compressible N-S  ###
     ##########################
 
+    # Laminar flat plate
+    flatplate           = TestCase('flatplate')
+    flatplate.cfg_dir   = "navierstokes/flatplate"
+    flatplate.cfg_file  = "lam_flatplate.cfg"
+    flatplate.test_iter = 20
+    flatplate.test_vals = [-4.680777, 0.781234, -0.135957, 0.022977] #last 4 columns
+    flatplate.su2_exec  = "SU2_CFD"
+    flatplate.new_output = True
+    flatplate.timeout   = 1600
+    flatplate.tol       = 0.00001
+    test_list.append(flatplate)
+
+    # Laminar cylinder (steady)
+    cylinder           = TestCase('cylinder')
+    cylinder.cfg_dir   = "navierstokes/cylinder"
+    cylinder.cfg_file  = "lam_cylinder.cfg"
+    cylinder.test_iter = 25
+    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
+    cylinder.su2_exec  = "SU2_CFD"
+    cylinder.new_output = True
+    cylinder.timeout   = 1600
+    cylinder.tol       = 0.00001
+    test_list.append(cylinder)
+
+    # Laminar cylinder (low Mach correction)
+    cylinder_lowmach           = TestCase('cylinder_lowmach')
+    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
+    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
+    cylinder_lowmach.test_iter = 25
+    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
+    cylinder_lowmach.su2_exec  = "SU2_CFD"
+    cylinder_lowmach.new_output = True
+    cylinder_lowmach.timeout   = 1600
+    cylinder_lowmach.tol       = 0.00001
+    test_list.append(cylinder_lowmach)
 
     # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
     poiseuille           = TestCase('poiseuille')
@@ -96,10 +182,223 @@ def main():
     poiseuille.test_iter = 10
     poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
     poiseuille.su2_exec  = "SU2_CFD"
+    poiseuille.new_output = True
     poiseuille.timeout   = 1600
     poiseuille.tol       = 0.00001
     test_list.append(poiseuille)
     
+    # 2D Poiseuille flow (inlet profile file)
+    poiseuille_profile           = TestCase('poiseuille_profile')
+    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
+    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
+    poiseuille_profile.test_iter = 10
+    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
+    poiseuille_profile.su2_exec  = "SU2_CFD"
+    poiseuille_profile.new_output = True
+    poiseuille_profile.timeout   = 1600
+    poiseuille_profile.tol       = 0.00001
+    test_list.append(poiseuille_profile)
+    
+    ##########################
+    ### Compressible RANS  ###
+    ##########################
+
+    # RAE2822 SA
+    rae2822_sa           = TestCase('rae2822_sa')
+    rae2822_sa.cfg_dir   = "rans/rae2822"
+    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
+    rae2822_sa.test_iter = 20
+    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
+    rae2822_sa.su2_exec  = "SU2_CFD"
+    rae2822_sa.timeout   = 1600
+    rae2822_sa.new_output = True
+    rae2822_sa.tol       = 0.00001
+    test_list.append(rae2822_sa)
+    
+    # RAE2822 SST
+    rae2822_sst           = TestCase('rae2822_sst')
+    rae2822_sst.cfg_dir   = "rans/rae2822"
+    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
+    rae2822_sst.test_iter = 20
+    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
+    rae2822_sst.su2_exec  = "SU2_CFD"
+    rae2822_sst.new_output = True
+    rae2822_sst.timeout   = 1600
+    rae2822_sst.tol       = 0.00001
+    test_list.append(rae2822_sst)
+
+    # Flat plate
+    turb_flatplate           = TestCase('turb_flatplate')
+    turb_flatplate.cfg_dir   = "rans/flatplate"
+    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
+    turb_flatplate.test_iter = 20
+    turb_flatplate.test_vals = [-4.157169, -6.737133, -0.176253, 0.057446] #last 4 columns
+    turb_flatplate.su2_exec  = "SU2_CFD"
+    turb_flatplate.new_output  = True
+    turb_flatplate.timeout   = 1600
+    turb_flatplate.tol       = 0.00001
+    test_list.append(turb_flatplate)
+
+    # ONERA M6 Wing
+    turb_oneram6           = TestCase('turb_oneram6')
+    turb_oneram6.cfg_dir   = "rans/oneram6"
+    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
+    turb_oneram6.test_iter = 10
+    turb_oneram6.test_vals = [-2.327431, -6.564331, 0.230257, 0.155839]#last 4 columns
+    turb_oneram6.su2_exec  = "SU2_CFD"
+    turb_oneram6.new_output = True
+    turb_oneram6.timeout   = 3200
+    turb_oneram6.tol       = 0.00001
+    test_list.append(turb_oneram6)
+
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
+    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
+    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
+    turb_naca0012_sa.test_iter = 10
+    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa.new_output = True
+    turb_naca0012_sa.timeout   = 3200
+    turb_naca0012_sa.tol       = 0.00001
+    test_list.append(turb_naca0012_sa)
+   
+    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
+    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
+    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
+    turb_naca0012_sa_bin.test_iter = 10
+    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
+    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
+    turb_naca0012_sa_bin.new_output  = True
+    turb_naca0012_sa_bin.timeout   = 3200
+    turb_naca0012_sa_bin.tol       = 0.00001
+    test_list.append(turb_naca0012_sa_bin)
+ 
+    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
+    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
+    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
+    turb_naca0012_sst.test_iter = 10
+    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
+    turb_naca0012_sst.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst.new_output  = True
+    turb_naca0012_sst.timeout   = 3200
+    turb_naca0012_sst.tol       = 0.00001
+    test_list.append(turb_naca0012_sst)
+
+    # PROPELLER 
+    propeller           = TestCase('propeller')
+    propeller.cfg_dir   = "rans/propeller"
+    propeller.cfg_file  = "propeller.cfg"
+    propeller.test_iter = 10
+    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
+    propeller.su2_exec  = "SU2_CFD"
+    propeller.new_output = True
+    propeller.timeout   = 3200
+    propeller.tol       = 0.00001
+    test_list.append(propeller)
+    #################################
+    ## Compressible RANS Restart  ###
+    #################################
+
+    # NACA0012 SST Multigrid restart
+    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
+    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
+    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
+    turb_naca0012_sst_restart_mg.test_iter = 50
+    turb_naca0012_sst_restart_mg.ntest_vals = 5
+    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
+    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
+    turb_naca0012_sst_restart_mg.new_output  = True
+    turb_naca0012_sst_restart_mg.timeout   = 3200
+    turb_naca0012_sst_restart_mg.tol       = 0.000001
+    test_list.append(turb_naca0012_sst_restart_mg)
+    
+    #############################
+    ### Incompressible Euler  ###
+    #############################
+
+    # NACA0012 Hydrofoil
+    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
+    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
+    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
+    inc_euler_naca0012.test_iter = 20
+    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
+    inc_euler_naca0012.su2_exec  = "SU2_CFD"
+    inc_euler_naca0012.new_output = True
+    inc_euler_naca0012.timeout   = 1600
+    inc_euler_naca0012.tol       = 0.00001
+    test_list.append(inc_euler_naca0012)
+
+    # C-D nozzle with pressure inlet and mass flow outlet
+    inc_nozzle           = TestCase('inc_nozzle')
+    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
+    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
+    inc_nozzle.test_iter = 20
+    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
+    inc_nozzle.su2_exec  = "SU2_CFD"
+    inc_nozzle.new_output = True
+    inc_nozzle.timeout   = 1600
+    inc_nozzle.tol       = 0.00001
+    test_list.append(inc_nozzle)
+
+    #############################
+    ### Incompressible N-S    ###
+    #############################
+
+    # Laminar cylinder
+    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
+    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
+    inc_lam_cylinder.test_iter = 10
+    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
+    inc_lam_cylinder.new_output  = True
+    inc_lam_cylinder.su2_exec  = "SU2_CFD"
+    inc_lam_cylinder.timeout   = 1600
+    inc_lam_cylinder.tol       = 0.00001
+    test_list.append(inc_lam_cylinder)
+
+    # Buoyancy-driven cavity
+    inc_buoyancy          = TestCase('inc_buoyancy')
+    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
+    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
+    inc_buoyancy.test_iter = 20
+    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
+    inc_buoyancy.new_output  = True
+    inc_buoyancy.su2_exec  = "SU2_CFD"
+    inc_buoyancy.timeout   = 1600
+    inc_buoyancy.tol       = 0.00001
+    test_list.append(inc_buoyancy)
+
+    # Laminar heated cylinder with polynomial fluid model
+    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
+    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
+    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
+    inc_poly_cylinder.test_iter = 20
+    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
+    inc_poly_cylinder.new_output  = True
+    inc_poly_cylinder.su2_exec  = "SU2_CFD"
+    inc_poly_cylinder.timeout   = 1600
+    inc_poly_cylinder.tol       = 0.00001
+    test_list.append(inc_poly_cylinder)
+
+    ############################
+    ### Incompressible RANS  ###
+    ############################
+
+    # NACA0012
+    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
+    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
+    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
+    inc_turb_naca0012.test_iter = 20
+    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
+    inc_turb_naca0012.new_output  = True
+    inc_turb_naca0012.su2_exec  = "SU2_CFD"
+    inc_turb_naca0012.timeout   = 1600
+    inc_turb_naca0012.tol       = 0.00001
+    test_list.append(inc_turb_naca0012)
+    
     ####################
     ### DG-FEM Euler ###
     ####################
@@ -111,6 +410,7 @@ def main():
     fem_euler_naca0012.test_iter = 10
     fem_euler_naca0012.test_vals = [-6.519946,-5.976944,0.255551,0.000028] #last 4 columns
     fem_euler_naca0012.su2_exec  = "SU2_CFD"
+    fem_euler_naca0012.new_output = True
     fem_euler_naca0012.timeout   = 1600
     fem_euler_naca0012.tol       = 0.00001
     test_list.append(fem_euler_naca0012)
@@ -126,6 +426,7 @@ def main():
     fem_ns_flatplate.test_iter = 25
     fem_ns_flatplate.test_vals = [1.383727,3.175247,0.058387,0.257951] #last 4 columns
     fem_ns_flatplate.su2_exec  = "SU2_CFD"
+    fem_ns_flatplate.new_output = True
     fem_ns_flatplate.timeout   = 1600
     fem_ns_flatplate.tol       = 0.00001
     test_list.append(fem_ns_flatplate)
@@ -137,6 +438,7 @@ def main():
     fem_ns_cylinder.test_iter = 10
     fem_ns_cylinder.test_vals = [0.454960,0.979123,-0.000028,79.984799] #last 4 columns
     fem_ns_cylinder.su2_exec  = "SU2_CFD"
+    fem_ns_cylinder.new_output  = True
     fem_ns_cylinder.timeout   = 1600
     fem_ns_cylinder.tol       = 0.00001
     test_list.append(fem_ns_cylinder)
@@ -148,6 +450,7 @@ def main():
     fem_ns_sphere.test_iter = 10
     fem_ns_sphere.test_vals = [-0.288121,0.240324,0.000258,21.797363] #last 4 columns
     fem_ns_sphere.su2_exec  = "SU2_CFD"
+    fem_ns_sphere.new_output = True
     fem_ns_sphere.timeout   = 1600
     fem_ns_sphere.tol       = 0.00001
     test_list.append(fem_ns_sphere)
@@ -159,6 +462,8 @@ def main():
     fem_ns_sphere_ader.test_iter = 10
     fem_ns_sphere_ader.test_vals = [-35.000000,-35.000000,0.000047,31.110911] #last 4 columns
     fem_ns_sphere_ader.su2_exec  = "SU2_CFD"
+    fem_ns_sphere_ader.new_output = True
+    fem_ns_sphere_ader.unsteady   = True
     fem_ns_sphere_ader.timeout   = 1600
     fem_ns_sphere_ader.tol       = 0.00001
     test_list.append(fem_ns_sphere_ader)
@@ -167,9 +472,11 @@ def main():
     fem_ns_unsteady_cylinder           = TestCase('fem_ns_unsteady_cylinder')
     fem_ns_unsteady_cylinder.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder.cfg_file  = "fem_unst_cylinder.cfg"
-    fem_ns_unsteady_cylinder.test_iter = 10
+    fem_ns_unsteady_cylinder.test_iter = 11
     fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
     fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder.new_output = True
+    fem_ns_unsteady_cylinder.unsteady   = True
     fem_ns_unsteady_cylinder.timeout   = 1600
     fem_ns_unsteady_cylinder.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder)
@@ -178,9 +485,11 @@ def main():
     fem_ns_unsteady_cylinder_ader           = TestCase('fem_ns_unsteady_cylinder_ader')
     fem_ns_unsteady_cylinder_ader.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder_ader.cfg_file  = "fem_unst_cylinder_ADER.cfg"
-    fem_ns_unsteady_cylinder_ader.test_iter = 10
+    fem_ns_unsteady_cylinder_ader.test_iter = 11
     fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
     fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
+    fem_ns_unsteady_cylinder_ader.new_output = True
+    fem_ns_unsteady_cylinder_ader.unsteady   = True
     fem_ns_unsteady_cylinder_ader.timeout   = 1600
     fem_ns_unsteady_cylinder_ader.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder_ader)
@@ -194,6 +503,7 @@ def main():
     schubauer_klebanoff_transition.cfg_dir      = "transition/Schubauer_Klebanoff"
     schubauer_klebanoff_transition.cfg_file     = "transitional_BC_model_ConfigFile.cfg"
     schubauer_klebanoff_transition.test_iter    = 10
+    schubauer_klebanoff_transition.new_output   = True
     schubauer_klebanoff_transition.test_vals    = [-8.029756, -14.278066, 0.000053, 0.007986] #last 4 columns
     schubauer_klebanoff_transition.su2_exec     = "SU2_CFD"
     schubauer_klebanoff_transition.timeout      = 1600
@@ -211,6 +521,7 @@ def main():
     contadj_naca0012.test_iter = 5
     contadj_naca0012.test_vals = [-9.787554, -15.192510, 0.300920, 0.019552] #last 4 columns
     contadj_naca0012.su2_exec  = "SU2_CFD"
+    contadj_naca0012.new_output = True
     contadj_naca0012.timeout   = 1600
     contadj_naca0012.tol       = 0.001
     test_list.append(contadj_naca0012)
@@ -222,6 +533,7 @@ def main():
     contadj_oneram6.test_iter = 10
     contadj_oneram6.test_vals = [-12.133160, -12.706697, 0.685900, 0.007594] #last 4 columns
     contadj_oneram6.su2_exec  = "SU2_CFD"
+    contadj_oneram6.new_output = True
     contadj_oneram6.timeout   = 1600
     contadj_oneram6.tol       = 0.00001
     test_list.append(contadj_oneram6)
@@ -233,6 +545,7 @@ def main():
     contadj_wedge.test_iter = 10
     contadj_wedge.test_vals = [2.856008, -2.767216, 1.0029e+06, 1.3024e-13] #last 4 columns
     contadj_wedge.su2_exec  = "SU2_CFD"
+    contadj_wedge.new_output = True
     contadj_wedge.timeout   = 1600
     contadj_wedge.tol       = 0.00001
     test_list.append(contadj_wedge)
@@ -244,6 +557,7 @@ def main():
     contadj_fixedCL_naca0012.test_iter = 100
     contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
     contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
+    contadj_fixedCL_naca0012.new_output= True
     contadj_fixedCL_naca0012.timeout   = 1600
     contadj_fixedCL_naca0012.tol       = 0.00001
     test_list.append(contadj_fixedCL_naca0012)
@@ -259,6 +573,7 @@ def main():
     contadj_ns_cylinder.test_iter = 20
     contadj_ns_cylinder.test_vals = [ -3.665848, -9.132055, 2.056700, -0.000000] #last 4 columns
     contadj_ns_cylinder.su2_exec  = "SU2_CFD"
+    contadj_ns_cylinder.new_output = True
     contadj_ns_cylinder.timeout   = 1600
     contadj_ns_cylinder.tol       = 0.00001
     test_list.append(contadj_ns_cylinder)
@@ -270,6 +585,7 @@ def main():
     contadj_ns_naca0012_sub.test_iter = 20
     contadj_ns_naca0012_sub.test_vals = [-2.743268, -8.215193, 0.518810, 0.001210] #last 4 columns
     contadj_ns_naca0012_sub.su2_exec  = "SU2_CFD"
+    contadj_ns_naca0012_sub.new_output =True
     contadj_ns_naca0012_sub.timeout   = 1600
     contadj_ns_naca0012_sub.tol       = 0.00001
     test_list.append(contadj_ns_naca0012_sub)
@@ -281,6 +597,7 @@ def main():
     contadj_ns_naca0012_trans.test_iter = 20
     contadj_ns_naca0012_trans.test_vals = [-1.039664, -6.575019, 1.772300, 0.012495] #last 4 columns
     contadj_ns_naca0012_trans.su2_exec  = "SU2_CFD"
+    contadj_ns_naca0012_trans.new_output = True
     contadj_ns_naca0012_trans.timeout   = 1600
     contadj_ns_naca0012_trans.tol       = 0.00001
     test_list.append(contadj_ns_naca0012_trans)
@@ -296,6 +613,7 @@ def main():
     contadj_rans_naca0012.test_iter = 20
     contadj_rans_naca0012.test_vals = [ -0.794162, -5.761722, 19.214000, -0.000000] #last 4 columns
     contadj_rans_naca0012.su2_exec  = "SU2_CFD"
+    contadj_rans_naca0012.new_output = True
     contadj_rans_naca0012.timeout   = 1600
     contadj_rans_naca0012.tol       = 0.00001
     test_list.append(contadj_rans_naca0012)
@@ -304,9 +622,10 @@ def main():
     contadj_rans_naca0012_bin           = TestCase('contadj_rans_naca0012_bin')
     contadj_rans_naca0012_bin.cfg_dir   = "cont_adj_rans/naca0012"
     contadj_rans_naca0012_bin.cfg_file  = "turb_nasa_binary.cfg"
-    contadj_rans_naca0012_bin.test_iter = 20
+    contadj_rans_naca0012_bin.test_iter = 18
     contadj_rans_naca0012_bin.test_vals = [-0.794169, -5.761671, 19.214000, -0.000000] #last 4 columns
     contadj_rans_naca0012_bin.su2_exec  = "SU2_CFD"
+    contadj_rans_naca0012_bin.new_output = True
     contadj_rans_naca0012_bin.timeout   = 1600
     contadj_rans_naca0012_bin.tol       = 0.00001
     test_list.append(contadj_rans_naca0012_bin)
@@ -318,6 +637,7 @@ def main():
     contadj_rans_rae2822.test_iter = 20
     contadj_rans_rae2822.test_vals = [-5.369688, -10.872209, -0.212470, 0.005448] #last 4 columns
     contadj_rans_rae2822.su2_exec  = "SU2_CFD"
+    contadj_rans_rae2822.new_output = True
     contadj_rans_rae2822.timeout   = 1600
     contadj_rans_rae2822.tol       = 0.00001
     test_list.append(contadj_rans_rae2822)
@@ -333,6 +653,7 @@ def main():
     turb_naca0012_1c.test_iter = 10
     turb_naca0012_1c.test_vals = [-4.946255, 1.262038, 5.575706, 2.057785] #last 4 columns
     turb_naca0012_1c.su2_exec  = "SU2_CFD"
+    turb_naca0012_1c.new_output = True
     turb_naca0012_1c.timeout   = 1600
     turb_naca0012_1c.tol       = 0.00001
     test_list.append(turb_naca0012_1c)
@@ -344,6 +665,7 @@ def main():
     turb_naca0012_2c.test_iter = 10
     turb_naca0012_2c.test_vals = [-5.343094, 1.137839, 5.337548, 1.919739] #last 4 columns
     turb_naca0012_2c.su2_exec  = "SU2_CFD"
+    turb_naca0012_2c.new_output = True
     turb_naca0012_2c.timeout   = 1600
     turb_naca0012_2c.tol       = 0.00001
     test_list.append(turb_naca0012_2c)
@@ -355,6 +677,7 @@ def main():
     turb_naca0012_3c.test_iter = 10
     turb_naca0012_3c.test_vals = [-5.421229, 1.099570, 5.184366, 1.835606] #last 4 columns
     turb_naca0012_3c.su2_exec  = "SU2_CFD"
+    turb_naca0012_3c.new_output = True
     turb_naca0012_3c.timeout   = 1600
     turb_naca0012_3c.tol       = 0.00001
     test_list.append(turb_naca0012_3c)
@@ -366,6 +689,7 @@ def main():
     turb_naca0012_p1c1.test_iter = 10
     turb_naca0012_p1c1.test_vals = [-5.022106, 1.280795, 5.960837, 2.302647] #last 4 columns
     turb_naca0012_p1c1.su2_exec  = "SU2_CFD"
+    turb_naca0012_p1c1.new_output = True
     turb_naca0012_p1c1.timeout   = 1600
     turb_naca0012_p1c1.tol       = 0.00001
     test_list.append(turb_naca0012_p1c1)
@@ -377,6 +701,7 @@ def main():
     turb_naca0012_p1c2.test_iter = 10
     turb_naca0012_p1c2.test_vals = [-5.357006, 1.154966, 5.635942, 2.088563] #last 4 columns
     turb_naca0012_p1c2.su2_exec  = "SU2_CFD"
+    turb_naca0012_p1c2.new_output = True
     turb_naca0012_p1c2.timeout   = 1600
     turb_naca0012_p1c2.tol       = 0.00001
     test_list.append(turb_naca0012_p1c2)
@@ -418,6 +743,7 @@ def main():
     cavity.test_iter = 25
     cavity.test_vals = [-5.627934, -0.164470, 0.051972, 2.547034] #last 4 columns
     cavity.su2_exec  = "SU2_CFD"
+    cavity.new_output = True
     cavity.timeout   = 1600
     cavity.tol       = 0.00001
     test_list.append(cavity)
@@ -429,6 +755,7 @@ def main():
     spinning_cylinder.test_iter = 25
     spinning_cylinder.test_vals = [-7.719673, -2.279643, 1.721389, 1.710467] #last 4 columns
     spinning_cylinder.su2_exec  = "SU2_CFD"
+    spinning_cylinder.new_output = True
     spinning_cylinder.timeout   = 1600
     spinning_cylinder.tol       = 0.00001
     test_list.append(spinning_cylinder)
@@ -447,6 +774,7 @@ def main():
     square_cylinder.timeout   = 1600
     square_cylinder.tol       = 0.00001
     square_cylinder.unsteady  = True
+    square_cylinder.new_output = True
     test_list.append(square_cylinder)
 
     # Gust
@@ -459,6 +787,7 @@ def main():
     sine_gust.timeout   = 1600
     sine_gust.tol       = 0.00001
     sine_gust.unsteady  = True
+    sine_gust.new_output = True
     test_list.append(sine_gust)
 
     # Aeroelastic
@@ -471,6 +800,7 @@ def main():
     aeroelastic.timeout   = 1600
     aeroelastic.tol       = 0.000001
     aeroelastic.unsteady  = True
+    aeroelastic.new_output = True
     test_list.append(aeroelastic) 
 
     # Delayed Detached Eddy Simulation
@@ -483,6 +813,7 @@ def main():
     ddes_flatplate.timeout   = 1600
     ddes_flatplate.tol       = 0.00001
     ddes_flatplate.unsteady  = True
+    ddes_flatplate.new_output = True
     test_list.append(ddes_flatplate)    
 
     ######################################
@@ -496,6 +827,7 @@ def main():
     ls89_sa.test_iter = 20
     ls89_sa.test_vals = [-5.050658, -13.393664, 0.174911, 0.430700] #last 4 columns
     ls89_sa.su2_exec  = "SU2_CFD"
+    ls89_sa.new_output= True
     ls89_sa.timeout   = 1600
     ls89_sa.tol       = 0.00001
     test_list.append(ls89_sa)
@@ -507,6 +839,7 @@ def main():
     edge_VW.test_iter = 20
     edge_VW.test_vals = [-0.720910, 5.481122, -0.000853, 0.000000] #last 4 columns
     edge_VW.su2_exec  = "SU2_CFD"
+    edge_VW.new_output = True
     edge_VW.timeout   = 1600
     edge_VW.tol       = 0.00001
     test_list.append(edge_VW)
@@ -518,6 +851,7 @@ def main():
     edge_PPR.test_iter = 20
     edge_PPR.test_vals = [-1.688033, 4.505202, 0.000916, 0.000000] #last 4 columns
     edge_PPR.su2_exec  = "SU2_CFD"
+    edge_PPR.new_output = True
     edge_PPR.timeout   = 1600
     edge_PPR.tol       = 0.00001
     test_list.append(edge_PPR)
@@ -591,8 +925,8 @@ def main():
     uniform_flow         = TestCase('uniform_flow')
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
-    uniform_flow.test_iter = 50
-    uniform_flow.test_vals = [-0.368877, 5.156053, 0.000000, 0.000000] #last 4 columns
+    uniform_flow.test_iter = 10
+    uniform_flow.test_vals = [10.000000, 0.000000, 0.432864, -5.596207] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -605,7 +939,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 4
-    channel_2D.test_vals = [-1.656852, 4.263152, 0.000000, 0.000000] #last 4 columns
+    channel_2D.test_vals = [0.000000, 1.497633, 1.199455, 0.904683] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -618,7 +952,7 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 1
-    channel_3D.test_vals = [-1.899946, 4.032882, 0.000000, 0.000000] #last 4 columns
+    channel_3D.test_vals = [1.000000, 0.000000, 1.834878, 1.892644, 1.606895] #last 4 columns
     channel_3D.su2_exec  = "SU2_CFD"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
@@ -631,7 +965,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [-3.503708, 3.194241, 0.000000, 0.000000] #last 4 columns
+    pipe.test_vals = [ -0.341198, -0.045916, 0.800374, 0.699486] #last 4 columns
     pipe.su2_exec  = "SU2_CFD"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -644,7 +978,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [-1.254672, 4.530738, 0.000000, 0.000000] #last 4 columns
+    rotating_cylinders.test_vals = [0.000000,2.018268, 1.942868, 1.696582] #last 4 columns
     rotating_cylinders.su2_exec  = "SU2_CFD"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -657,7 +991,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [-1.130591, 4.595041, 0.000000, 0.000000] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 2.162202, 2.304635] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -670,7 +1004,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [-2.138791, 1.639495, -0.000831, 0.117497] #last 4 columns
+    bars_SST_2D.test_vals = [-0.941341, -0.270420, -1.840081,-1.159466] #last 4 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -682,7 +1016,7 @@ def main():
     slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
     slinc_steady.cfg_file  = "config.cfg"
     slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [-4.214657,1.265231,0.000000,0.000000] #last 4 columns
+    slinc_steady.test_vals = [19.000000, -1.766116,  -2.206522] #last 3 columns
     slinc_steady.su2_exec  = "SU2_CFD"
     slinc_steady.timeout   = 100
     slinc_steady.tol       = 0.00001
@@ -717,60 +1051,64 @@ def main():
     statbeam3d.tol       = 0.00001
     test_list.append(statbeam3d)
 
-    # Dynamic beam, 2d
+    # # Dynamic beam, 2d
     dynbeam2d           = TestCase('dynbeam2d')
     dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
     dynbeam2d.cfg_file  = "configBeam_2d.cfg"
+    dynbeam2d.unsteady  = True
     dynbeam2d.new_output= True
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [-9.420640, -5.365872, -12.430382, 6.5210e+04] #last 4 columns
+    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66299.000000] #last 4 columns
     dynbeam2d.su2_exec  = "SU2_CFD"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001
     test_list.append(dynbeam2d)
 
-    # FSI, 2d
+    # # FSI, 2d
     fsi2d           = TestCase('fsi2d')
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.578187, -5.758338] #last 4 columns
     fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
+    fsi2d.multizone = True
+    fsi2d.unsteady  = True
     fsi2d.tol       = 0.00001
     test_list.append(fsi2d)    
 
-    # FSI, 2D airfoil with RBF interpolation
-    airfoilRBF           = TestCase('airfoil_fsi_rbf')
-    airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
-    airfoilRBF.cfg_file  = "config.cfg"
-    airfoilRBF.test_iter = 29
-    airfoilRBF.test_vals = [-13.474206, -3.771392, -11.646689, 1.4045e+06] #last 4 columns
-    airfoilRBF.su2_exec  = "SU2_CFD"
-    airfoilRBF.timeout   = 1600
-    airfoilRBF.tol       = 0.00001
-    test_list.append(airfoilRBF)
+    # # FSI, 2D airfoil with RBF interpolation
+    # airfoilRBF           = TestCase('airfoil_fsi_rbf')
+    # airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
+    # airfoilRBF.cfg_file  = "config.cfg"
+    # airfoilRBF.test_iter = 50
+    # airfoilRBF.test_vals = [-8.000964, -2.600088, 0.276433, 0.000824] #last 4 columns
+    # airfoilRBF.su2_exec  = "SU2_CFD"
+    # airfoilRBF.timeout   = 1600
+    # airfoilRBF.tol       = 0.00001
+    # test_list.append(airfoilRBF)
    
-    ##########################
-    ### Zonal multiphysics ###
-    ##########################
+    # ##########################
+    # ### Zonal multiphysics ###
+    # ##########################
 
     # CHT incompressible
     cht_incompressible           = TestCase('cht_incompressible')
     cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
     cht_incompressible.cfg_file  = "config.cfg"
     cht_incompressible.test_iter = 10
-    cht_incompressible.test_vals = [0.000000, 0.000000, -8.530925, -3091.634678] #last 4 columns
+    cht_incompressible.test_vals = [ 10, -1.552349, -6.795633, -3.342894] #last 4 columns
     cht_incompressible.su2_exec  = "SU2_CFD"
     cht_incompressible.timeout   = 1600
-    cht_incompressible.tol       = 0.0001
+    cht_incompressible.multizone = True
+    cht_incompressible.tol       = 0.00001
     test_list.append(cht_incompressible)
 
     ######################################
     ### RUN TESTS                      ###
     ######################################  
 
-    pass_list = [ test.run_test() for test in test_list ]
+   pass_list = [ test.run_test() for test in test_list ]
 
     
     ######################################
@@ -974,6 +1312,7 @@ def main():
     contadj_euler_py.timeout   = 1600
     contadj_euler_py.reference_file = "of_grad_cd.dat.ref"
     contadj_euler_py.test_file = "of_grad_cd.dat"
+    contadj_euler_py.new_output = True
     pass_list.append(contadj_euler_py.run_filediff())
     test_list.append(contadj_euler_py)
 
@@ -985,6 +1324,7 @@ def main():
     shape_opt_euler_py.test_vals = [1, 1, 2.134974E-05, 3.829535E-03] #last 4 columns
     shape_opt_euler_py.su2_exec  = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
     shape_opt_euler_py.timeout   = 1600
+    shape_opt_euler_py.new_output = True
     shape_opt_euler_py.tol       = 0.00001
     pass_list.append(shape_opt_euler_py.run_opt())
     test_list.append(shape_opt_euler_py)
@@ -996,6 +1336,7 @@ def main():
     contadj_multi_py.test_iter  = 10
     contadj_multi_py.su2_exec   = "continuous_adjoint.py"
     contadj_multi_py.timeout    = 1600
+    contadj_multi_py.new_output = True
     contadj_multi_py.reference_file = "of_grad_combo.dat.ref"
     contadj_multi_py.test_file  = "of_grad_combo.dat"
     pass_list.append(contadj_multi_py.run_filediff())

From 1d7889ef2d082e4528b5d0bbd673ec45bee73bba Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 12 Apr 2019 17:54:27 +0200
Subject: [PATCH 193/539] Explicitely disabled new singlezone driver for some
 cases

---
 TestCases/serial_regression.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 613829731778..dc3c0aaaaa0d 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -717,6 +717,7 @@ def main():
     harmonic_balance.test_iter = 25
     harmonic_balance.test_vals = [-1.569573, 3.941896, 0.008780, 0.079775] #last 4 columns
     harmonic_balance.su2_exec  = "SU2_CFD"
+    harmonic_balance.new_output = False
     harmonic_balance.timeout   = 1600
     harmonic_balance.tol       = 0.00001
     test_list.append(harmonic_balance)
@@ -728,6 +729,7 @@ def main():
     hb_rans_preconditioning.test_iter = 25
     hb_rans_preconditioning.test_vals = [-1.900982, -5.880438, 0.007758, 0.125934] #last 4 columns
     hb_rans_preconditioning.su2_exec  = "SU2_CFD"
+    hb_rans_preconditioning.new_output= False
     hb_rans_preconditioning.timeout   = 1600
     hb_rans_preconditioning.tol       = 0.00001
     test_list.append(hb_rans_preconditioning)
@@ -868,6 +870,7 @@ def main():
     Jones_tc.test_iter = 5
     Jones_tc.test_vals = [-5.304569, 0.419188, 80.085850, 1.034777] #last 4 columns
     Jones_tc.su2_exec  = "SU2_CFD"
+    Jones_tc.new_output = False
     Jones_tc.timeout   = 1600
     Jones_tc.tol       = 0.00001
     test_list.append(Jones_tc)
@@ -879,6 +882,7 @@ def main():
     Jones_tc_rst.test_iter = 5
     Jones_tc_rst.test_vals = [-4.423322, -1.618510, 82.250600, 2.791319] #last 4 columns
     Jones_tc_rst.su2_exec  = "SU2_CFD"
+    Jones_tc_rst.new_output = False
     Jones_tc_rst.timeout   = 1600
     Jones_tc_rst.tol       = 0.00001
     test_list.append(Jones_tc_rst)
@@ -890,6 +894,7 @@ def main():
     axial_stage2D.test_iter = 20
     axial_stage2D.test_vals = [-1.837052, 5.787185, 73.679900, 0.888919] #last 4 columns
     axial_stage2D.su2_exec  = "SU2_CFD"
+    axial_stage2D.new_output  = False
     axial_stage2D.timeout   = 1600
     axial_stage2D.tol       = 0.00001
     test_list.append(axial_stage2D)
@@ -901,6 +906,7 @@ def main():
     transonic_stator.test_iter = 20
     transonic_stator.test_vals = [-1.114556, 6.120416, 67.101480, 0.070037] #last 4 columns
     transonic_stator.su2_exec  = "SU2_CFD"
+    transonic_stator.new_output  = False
     transonic_stator.timeout   = 1600
     transonic_stator.tol       = 0.00001
     test_list.append(transonic_stator)
@@ -912,6 +918,7 @@ def main():
     transonic_stator_rst.test_iter = 20
     transonic_stator_rst.test_vals = [-0.486965, 4.460638, 6.455770, 0.004009] #last 4 columns
     transonic_stator_rst.su2_exec  = "SU2_CFD"
+    transonic_stator_rst.new_output  = False
     transonic_stator_rst.timeout   = 1600
     transonic_stator_rst.tol       = 0.00001
     test_list.append(transonic_stator_rst)

From 33adc9391a2fb8d65d746bb10603c8170e166ff4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 14:18:21 +0200
Subject: [PATCH 194/539] Added string to int and double routines

---
 Common/include/toolboxes/printing_toolbox.hpp | 14 ++++++++++++++
 Common/src/geometry_structure.cpp             |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 4c3aad3f642d..9218bc630e84 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -169,4 +169,18 @@ inline std::vector<std::string> split(const std::string& s, char delimiter)
   return tokens;
 }
 
+inline int stoi(const std::string s){
+  std::istringstream ss(s);
+  int number;
+  ss >> number;
+  return number;
+}
+
+inline double stod(const std::string s){
+  std::istringstream ss(s);
+  double number;
+  ss >> number;
+  return number;
+}
+
 }
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 1b572cd31856..95f55a83ccf6 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -18349,7 +18349,7 @@ void CPhysicalGeometry::SetGeometryPlanes(CConfig *config) {
 }
 
 void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
-  unsigned short iMarker, icommas;
+  unsigned short iMarker;
   unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
   su2double Sensitivity;
   bool *PointInDomain;
@@ -18466,9 +18466,9 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
      
       vector<string> FieldValues = PrintingToolbox::split(text_line, ',');
       
-      iPoint = std::stoi(FieldValues[0]);
+      iPoint = PrintingToolbox::stoi(FieldValues[0]);
       
-      Sensitivity = std::stod(FieldValues[iField]);
+      Sensitivity = PrintingToolbox::stod(FieldValues[iField]);
       
       if (PointInDomain[iPoint]) {
         

From cb13dfa5411da2385577016037def7622805e18e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 14:18:37 +0200
Subject: [PATCH 195/539] changed branch of tutorials

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 85ae533de159..c7d95702a8a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,7 +86,7 @@ before_script:
     - cp -R ./TestData/* ./TestCases/
 
     # Get the tutorial cases
-    - git clone -b develop https://github.com/su2code/su2code.github.io ./Tutorials
+    - git clone -b feature_input_output https://github.com/su2code/su2code.github.io ./Tutorials
     
     # Enter the SU2/TestCases/ directory, which is now ready to run
     - cd TestCases/

From 91d0ea475b399e41f48436af55dbcee534e3444c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 14:55:49 +0200
Subject: [PATCH 196/539] Small fix

---
 SU2_CFD/include/output_structure.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 17d5f6947772..80aa664d7d88 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -142,7 +142,7 @@ class COutput {
   unsigned long *nPoint_Lin;
   unsigned long *nPoint_Cum;
   
-  std::vector< std::vector<su2double>> Local_Data;
+  std::vector< std::vector<su2double> > Local_Data;
   su2double **Local_Data_Copy;      // Local data copy for cte. lift mode
   su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
   su2double **Parallel_Surf_Data;   // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])

From 50ff29a805ff4cac6aabd147972ae6b238c2ecbf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 15:33:45 +0200
Subject: [PATCH 197/539] Added to_string routine

---
 Common/include/toolboxes/printing_toolbox.hpp | 10 ++++++++++
 SU2_CFD/src/output_driver.cpp                 | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 9218bc630e84..3a94b80fe82b 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -183,4 +183,14 @@ inline double stod(const std::string s){
   return number;
 }
 
+inline std::string to_string(const double number){
+  
+  std::stringstream ss;
+  
+  ss << number;
+  
+  return ss.str();
+  
+}
+
 }
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 393a6f10c821..ca01135ca517 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -124,7 +124,7 @@ void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConf
         for (iVar = 0; iVar < nVar; iVar++){
 
           /*--- Get the unique name for the history data ---*/
-          name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol) + "_VAL" + to_string(iVar);
+          name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol) + "_VAL" + PrintingToolbox::to_string(iVar);
 
           /*--- Set the value of the BGS residual for the variable iVar, solver iSol, zone iZone ---*/
           val = log10(solver[iZone][INST_0][MESH_0][iSol]->GetRes_BGS(iVar));
@@ -137,7 +137,7 @@ void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConf
         }
 
         /*--- Get the unique name for the averaged history data per solver ---*/
-        name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol);
+        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + to_string(iSol);
 
         /*--- Compute the average and set the value for the solver iSol, zone iZone---*/
         avgsol = avgsol / nVar;
@@ -148,7 +148,7 @@ void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConf
     }
 
     /*--- Get an unique name for the averaged history data per zone ---*/
-    name = "ZONE" + to_string(iZone);
+    name = "ZONE" + PrintingToolbox::to_string(iZone);
 
     /*--- Compute the average and set the value for the zone iZone---*/
     avgzone = avgzone / nVar_Zone;
@@ -183,9 +183,9 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
         for (iVar = 0; iVar < solver[iZone][INST_0][MESH_0][iSol]->GetnVar(); iVar++){
 
           /*--- Set an unique name for the history data ---*/
-          name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol) + "_VAL" + to_string(iVar);
+          name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol) + "_VAL" + PrintingToolbox::to_string(iVar);
           /*--- Set an unique name for the history headers ---*/
-          header = "res[" + to_string(iZone) + "][" + to_string(iSol) + "][" + to_string(iVar) + "]";
+          header = "res[" + PrintingToolbox::to_string(iZone) + "][" + PrintingToolbox::to_string(iSol) + "][" + PrintingToolbox::to_string(iVar) + "]";
 
           AddHistoryOutput(name, header, FORMAT_FIXED,  "VAR_RES", TYPE_RESIDUAL);
 
@@ -194,10 +194,10 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
         }
 
         /*--- Set an unique name for the averaged history data per solver ---*/
-        name = "ZONE" + to_string(iZone) + "_SOL" + to_string(iSol);
+        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol);
         /*--- Set an unique name for the history headers of the averaged data per solver ---*/
         header = solver[iZone][INST_0][MESH_0][iSol]->GetSolverName();
-        header += "[" + to_string(iZone) + "]";
+        header += "[" + PrintingToolbox::to_string(iZone) + "]";
 
         /*--- Add the average residual of the current solver to output ---*/
         AddHistoryOutput(name, header, FORMAT_FIXED,  "SOL_AVGRES", TYPE_RESIDUAL);
@@ -209,9 +209,9 @@ void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver
     }
 
     /*--- Set an unique name for the averaged history data ---*/
-    name = "ZONE" + to_string(iZone);
+    name = "ZONE" + PrintingToolbox::to_string(iZone);
     /*--- Set an unique name for the history headers of the averaged data ---*/
-    header = "avgres[" + to_string(iZone) + "]";
+    header = "avgres[" + PrintingToolbox::to_string(iZone) + "]";
 
     AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
   }

From eb625e1414f1841cc68037725653db9089a810df Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 15:33:54 +0200
Subject: [PATCH 198/539] Small fix

---
 Common/src/config_structure.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index aff1f3c5753a..4488887cdd46 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2761,6 +2761,8 @@ void CConfig::SetnZone(){
   
   if (Multizone_Problem == YES){
     
+    SinglezoneDriver  = NO;
+    
     if (Multizone_Mesh){
       
       /*--- Get the number of zones from the mesh file --- */

From 975b0ef610c8052fcd83df8d73e74a1e4d3714f1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 15:48:09 +0200
Subject: [PATCH 199/539] Removed some unused routines/variables

---
 SU2_CFD/include/output_structure.hpp |  74 -------
 SU2_CFD/include/output_structure.inl |   6 -
 SU2_CFD/src/output_structure.cpp     | 290 ---------------------------
 3 files changed, 370 deletions(-)

diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp
index 80aa664d7d88..fc81d5b7536e 100644
--- a/SU2_CFD/include/output_structure.hpp
+++ b/SU2_CFD/include/output_structure.hpp
@@ -157,59 +157,6 @@ class COutput {
   int cgns_base, cgns_zone, cgns_base_results, cgns_zone_results;
   
   su2double Sum_Total_RadialDistortion, Sum_Total_CircumferentialDistortion; // Add all the distortion to compute a run average.
-  bool turbo;
-  unsigned short   nSpanWiseSections,
-		   nMarkerTurboPerf;
-
-  su2double **TotalStaticEfficiency,
-        **TotalTotalEfficiency,
-        **KineticEnergyLoss,
-        **TRadius,
-        **TotalPressureLoss,
-        **MassFlowIn,
-        **MassFlowOut,
-        **FlowAngleIn,
-        **FlowAngleIn_BC,
-        **FlowAngleOut,
-        **EulerianWork,
-        **TotalEnthalpyIn,
-        **TotalEnthalpyIn_BC,
-        **EntropyIn,
-        **EntropyOut,
-        **EntropyIn_BC,
-        **PressureRatio,
-        **TotalTemperatureIn,
-        **EnthalpyOut,
-        ***MachIn,
-        ***MachOut,
-        **VelocityOutIs,
-        **DensityIn,
-        **PressureIn,
-        ***TurboVelocityIn,
-        **DensityOut,
-        **PressureOut,
-        ***TurboVelocityOut,
-        **EnthalpyOutIs,
-        **EntropyGen,
-        **AbsFlowAngleIn,
-        **TotalEnthalpyOut,
-        **RothalpyIn,
-        **RothalpyOut,
-        **TotalEnthalpyOutIs,
-        **AbsFlowAngleOut,
-        **PressureOut_BC,
-        **TemperatureIn,
-        **TemperatureOut,
-        **TotalPressureIn,
-        **TotalPressureOut,
-        **TotalTemperatureOut,
-        **EnthalpyIn,
-        **TurbIntensityIn,
-        **Turb2LamViscRatioIn,
-        **TurbIntensityOut,
-        **Turb2LamViscRatioOut,
-        **NuFactorIn,
-        **NuFactorOut;
 
   unsigned long nMarker_InletFile;       /*!< \brief Counter for total number of inlet boundaries written to inlet profile file. */
   vector<string> Marker_Tags_InletFile;   /*!< \brief Marker tags for the strings of the markers in the inlet profile file. */
@@ -684,27 +631,6 @@ class COutput {
    */
   void ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config);
 
-  /*!
-   * \brief Give the Entropy Generation performance parameters for turbomachinery.
-   * \param[in] iMarkerTP - Marker turbo-performance.
-   * \param[in] iSpan - span section.
-   */
-  su2double GetEntropyGen(unsigned short iMarkerTP, unsigned short iSpan);
-
-  /*!
-   * \brief Give the Entropy Generation performance parameters for turbomachinery.
-   * \param[in] iMarkerTP - Marker turbo-performance.
-   * \param[in] iSpan - span section.
-   */
-  su2double GetFlowAngleOut(unsigned short iMarkerTP, unsigned short iSpan);
-
-  /*!
-   * \brief Give the Entropy Generation performance parameters for turbomachinery.
-   * \param[in] iMarkerTP - Marker turbo-performance.
-   * \param[in] iSpan - span section.
-   */
-  su2double GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan);
-
   /*!
    * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
index 3afd5840a80d..713f78815f1b 100644
--- a/SU2_CFD/include/output_structure.inl
+++ b/SU2_CFD/include/output_structure.inl
@@ -38,12 +38,6 @@
 #pragma once
 #include "output_structure.hpp"
 
-inline su2double COutput::GetEntropyGen(unsigned short iMarkerTP, unsigned short iSpan) { return EntropyGen[iMarkerTP][iSpan]; }
-
-inline su2double COutput::GetFlowAngleOut(unsigned short iMarkerTP, unsigned short iSpan) { return FlowAngleOut[iMarkerTP][iSpan]*180.0/PI_NUMBER; }
-
-inline su2double COutput::GetMassFlowIn(unsigned short iMarkerTP, unsigned short iSpan) { return MassFlowIn[iMarkerTP][iSpan]; }
-
 inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
 
 inline void COutput::SetHistoryOutputFields(CConfig *config){}
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 719c26cf0053..bdffd73db29d 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -158,182 +158,6 @@ COutput::COutput(CConfig *config) {
   
   wrote_Paraview_base = false;
 
-  /*--- Initialize turbo flag ---*/
-  turbo = config->GetBoolTurbomachinery();
-
-  if(turbo){
-    /*--- Initializate quantities for turboperformace ---*/
-    nSpanWiseSections = config->GetnSpanMaxAllZones();
-    nMarkerTurboPerf  = config->GetnMarker_TurboPerformance();
-
-
-    TotalStaticEfficiency         = new su2double*[nMarkerTurboPerf];
-    TotalTotalEfficiency          = new su2double*[nMarkerTurboPerf];
-    KineticEnergyLoss             = new su2double*[nMarkerTurboPerf];
-    TRadius                       = new su2double*[nMarkerTurboPerf];
-    TotalPressureLoss             = new su2double*[nMarkerTurboPerf];
-    MassFlowIn                    = new su2double*[nMarkerTurboPerf];
-    MassFlowOut                   = new su2double*[nMarkerTurboPerf];
-    FlowAngleIn                   = new su2double*[nMarkerTurboPerf];
-    FlowAngleIn_BC                = new su2double*[nMarkerTurboPerf];
-    FlowAngleOut                  = new su2double*[nMarkerTurboPerf];
-    EulerianWork                  = new su2double*[nMarkerTurboPerf];
-    TotalEnthalpyIn               = new su2double*[nMarkerTurboPerf];
-    TotalEnthalpyIn_BC            = new su2double*[nMarkerTurboPerf];
-    EntropyIn                     = new su2double*[nMarkerTurboPerf];
-    EntropyOut                    = new su2double*[nMarkerTurboPerf];
-    EntropyIn_BC                  = new su2double*[nMarkerTurboPerf];
-    PressureRatio                 = new su2double*[nMarkerTurboPerf];
-    TotalTemperatureIn            = new su2double*[nMarkerTurboPerf];
-    EnthalpyOut                   = new su2double*[nMarkerTurboPerf];
-    MachIn                        = new su2double**[nMarkerTurboPerf];
-    MachOut                       = new su2double**[nMarkerTurboPerf];
-    VelocityOutIs                 = new su2double*[nMarkerTurboPerf];
-    DensityIn                     = new su2double*[nMarkerTurboPerf];
-    PressureIn                    = new su2double*[nMarkerTurboPerf];
-    TurboVelocityIn               = new su2double**[nMarkerTurboPerf];
-    DensityOut                    = new su2double*[nMarkerTurboPerf];
-    PressureOut                   = new su2double*[nMarkerTurboPerf];
-    TurboVelocityOut              = new su2double**[nMarkerTurboPerf];
-    EnthalpyOutIs                 = new su2double*[nMarkerTurboPerf];
-    EntropyGen                    = new su2double*[nMarkerTurboPerf];
-    AbsFlowAngleIn                = new su2double*[nMarkerTurboPerf];
-    TotalEnthalpyOut              = new su2double*[nMarkerTurboPerf];
-    TotalEnthalpyOutIs            = new su2double*[nMarkerTurboPerf];
-    RothalpyIn                    = new su2double*[nMarkerTurboPerf];
-    RothalpyOut                   = new su2double*[nMarkerTurboPerf];
-    AbsFlowAngleOut               = new su2double*[nMarkerTurboPerf];
-    PressureOut_BC                = new su2double*[nMarkerTurboPerf];
-    TemperatureIn                 = new su2double*[nMarkerTurboPerf];
-    TemperatureOut                = new su2double*[nMarkerTurboPerf];
-    TotalPressureIn               = new su2double*[nMarkerTurboPerf];
-    TotalPressureOut              = new su2double*[nMarkerTurboPerf];
-    TotalTemperatureOut           = new su2double*[nMarkerTurboPerf];
-    EnthalpyIn                    = new su2double*[nMarkerTurboPerf];
-    TurbIntensityIn               = new su2double*[nMarkerTurboPerf];
-    Turb2LamViscRatioIn           = new su2double*[nMarkerTurboPerf];
-    TurbIntensityOut              = new su2double*[nMarkerTurboPerf];
-    Turb2LamViscRatioOut          = new su2double*[nMarkerTurboPerf];
-    NuFactorIn                    = new su2double*[nMarkerTurboPerf];
-    NuFactorOut                   = new su2double*[nMarkerTurboPerf];
-
-    for (iMarker = 0; iMarker < nMarkerTurboPerf; iMarker++){
-      TotalStaticEfficiency   [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalTotalEfficiency    [iMarker] = new su2double [nSpanWiseSections + 1];
-      KineticEnergyLoss       [iMarker] = new su2double [nSpanWiseSections + 1];
-      TRadius                 [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalPressureLoss       [iMarker] = new su2double [nSpanWiseSections + 1];
-      MassFlowIn              [iMarker] = new su2double [nSpanWiseSections + 1];
-      MassFlowOut             [iMarker] = new su2double [nSpanWiseSections + 1];
-      FlowAngleIn             [iMarker] = new su2double [nSpanWiseSections + 1];
-      FlowAngleIn_BC          [iMarker] = new su2double [nSpanWiseSections + 1];
-      FlowAngleOut            [iMarker] = new su2double [nSpanWiseSections + 1];
-      EulerianWork            [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalEnthalpyIn         [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalEnthalpyIn_BC      [iMarker] = new su2double [nSpanWiseSections + 1];
-      EntropyIn               [iMarker] = new su2double [nSpanWiseSections + 1];
-      EntropyOut              [iMarker] = new su2double [nSpanWiseSections + 1];
-      EntropyIn_BC            [iMarker] = new su2double [nSpanWiseSections + 1];
-      PressureRatio           [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalTemperatureIn      [iMarker] = new su2double [nSpanWiseSections + 1];
-      EnthalpyOut             [iMarker] = new su2double [nSpanWiseSections + 1];
-      MachIn                  [iMarker] = new su2double*[nSpanWiseSections + 1];
-      MachOut                 [iMarker] = new su2double*[nSpanWiseSections + 1];
-      VelocityOutIs           [iMarker] = new su2double [nSpanWiseSections + 1];
-      DensityIn               [iMarker] = new su2double [nSpanWiseSections + 1];
-      PressureIn              [iMarker] = new su2double [nSpanWiseSections + 1];
-      TurboVelocityIn         [iMarker] = new su2double*[nSpanWiseSections + 1];
-      DensityOut              [iMarker] = new su2double [nSpanWiseSections + 1];
-      PressureOut             [iMarker] = new su2double [nSpanWiseSections + 1];
-      TurboVelocityOut        [iMarker] = new su2double*[nSpanWiseSections + 1];
-      EnthalpyOutIs           [iMarker] = new su2double [nSpanWiseSections + 1];
-      EntropyGen              [iMarker] = new su2double [nSpanWiseSections + 1];
-      AbsFlowAngleIn          [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalEnthalpyOut        [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalEnthalpyOutIs      [iMarker] = new su2double [nSpanWiseSections + 1];
-      RothalpyIn              [iMarker] = new su2double [nSpanWiseSections + 1];
-      RothalpyOut             [iMarker] = new su2double [nSpanWiseSections + 1];
-      AbsFlowAngleOut         [iMarker] = new su2double [nSpanWiseSections + 1];
-      PressureOut_BC          [iMarker] = new su2double [nSpanWiseSections + 1];
-      TemperatureIn           [iMarker] = new su2double [nSpanWiseSections + 1];
-      TemperatureOut          [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalPressureIn         [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalPressureOut        [iMarker] = new su2double [nSpanWiseSections + 1];
-      TotalTemperatureOut     [iMarker] = new su2double [nSpanWiseSections + 1];
-      EnthalpyIn              [iMarker] = new su2double [nSpanWiseSections + 1];
-      TurbIntensityIn         [iMarker] = new su2double [nSpanWiseSections + 1];
-      Turb2LamViscRatioIn     [iMarker] = new su2double [nSpanWiseSections + 1];
-      TurbIntensityOut        [iMarker] = new su2double [nSpanWiseSections + 1];
-      Turb2LamViscRatioOut    [iMarker] = new su2double [nSpanWiseSections + 1];
-      NuFactorIn              [iMarker] = new su2double [nSpanWiseSections + 1];
-      NuFactorOut             [iMarker] = new su2double [nSpanWiseSections + 1];
-
-
-      for (iSpan = 0; iSpan < nSpanWiseSections + 1; iSpan++){
-        TotalStaticEfficiency   [iMarker][iSpan] = 0.0;
-        TotalTotalEfficiency    [iMarker][iSpan] = 0.0;
-        KineticEnergyLoss       [iMarker][iSpan] = 0.0;
-        TRadius                 [iMarker][iSpan] = 0.0;
-        TotalPressureLoss       [iMarker][iSpan] = 0.0;
-        MassFlowIn              [iMarker][iSpan] = 0.0;
-        MassFlowOut             [iMarker][iSpan] = 0.0;
-        FlowAngleIn             [iMarker][iSpan] = 0.0;
-        FlowAngleIn_BC          [iMarker][iSpan] = config->GetFlowAngleIn_BC();
-        FlowAngleOut            [iMarker][iSpan] = 0.0;
-        EulerianWork            [iMarker][iSpan] = 0.0;
-        TotalEnthalpyIn         [iMarker][iSpan] = 0.0;
-        TotalEnthalpyIn_BC      [iMarker][iSpan] = 0.0;
-        EntropyIn               [iMarker][iSpan] = 0.0;
-        EntropyOut              [iMarker][iSpan] = 0.0;
-        EntropyIn_BC            [iMarker][iSpan] = 0.0;
-        PressureRatio           [iMarker][iSpan] = 0.0;
-        TotalTemperatureIn      [iMarker][iSpan] = 0.0;
-        EnthalpyOut             [iMarker][iSpan] = 0.0;
-
-
-        VelocityOutIs           [iMarker][iSpan] = 0.0;
-        DensityIn               [iMarker][iSpan] = 0.0;
-        PressureIn              [iMarker][iSpan] = 0.0;
-
-        DensityOut              [iMarker][iSpan] = 0.0;
-        PressureOut             [iMarker][iSpan] = 0.0;
-
-        EnthalpyOutIs           [iMarker][iSpan] = 0.0;
-        EntropyGen              [iMarker][iSpan] = 0.0;
-        AbsFlowAngleIn          [iMarker][iSpan] = 0.0;
-        TotalEnthalpyOut        [iMarker][iSpan] = 0.0;
-        TotalEnthalpyOutIs      [iMarker][iSpan] = 0.0;
-        RothalpyIn              [iMarker][iSpan] = 0.0;
-        RothalpyOut             [iMarker][iSpan] = 0.0;
-        AbsFlowAngleOut         [iMarker][iSpan] = 0.0;
-        PressureOut_BC          [iMarker][iSpan] = config->GetPressureOut_BC();
-
-        TemperatureIn           [iMarker][iSpan] = 0.0;
-        TemperatureOut          [iMarker][iSpan] = 0.0;
-        TotalPressureIn         [iMarker][iSpan] = 0.0;
-        TotalPressureOut        [iMarker][iSpan] = 0.0;
-        TotalTemperatureOut     [iMarker][iSpan] = 0.0;
-        EnthalpyIn              [iMarker][iSpan] = 0.0;
-        TurbIntensityIn         [iMarker][iSpan] = 0.0;
-        Turb2LamViscRatioIn     [iMarker][iSpan] = 0.0;
-        TurbIntensityOut        [iMarker][iSpan] = 0.0;
-        Turb2LamViscRatioOut    [iMarker][iSpan] = 0.0;
-        NuFactorIn              [iMarker][iSpan] = 0.0;
-        NuFactorOut             [iMarker][iSpan] = 0.0;
-        MachIn                  [iMarker][iSpan] = new su2double[4];
-        MachOut                 [iMarker][iSpan] = new su2double[4];
-        TurboVelocityIn         [iMarker][iSpan] = new su2double[4];
-        TurboVelocityOut        [iMarker][iSpan] = new su2double[4];
-
-        for (iDim = 0; iDim < 4; iDim++){
-          MachIn           [iMarker][iSpan][iDim]   = 0.0;
-          MachOut          [iMarker][iSpan][iDim]   = 0.0;
-          TurboVelocityIn  [iMarker][iSpan][iDim]   = 0.0;
-          TurboVelocityOut [iMarker][iSpan][iDim]   = 0.0;
-        }
-      }
-    }
-  }
   
   nRequestedHistoryFields = config->GetnHistoryOutput();
   for (unsigned short iField = 0; iField < nRequestedHistoryFields; iField++){
@@ -367,120 +191,6 @@ COutput::~COutput(void) {
 
   if (RhoRes_Old != NULL) delete [] RhoRes_Old;
 
-  /*--- Delete turboperformance pointers initiliazed at constrction  ---*/
-  unsigned short iMarker, iSpan;
-  if(turbo){
-    for(iMarker = 0; iMarker< nMarkerTurboPerf; iMarker++){
-      for(iSpan=0; iSpan<nSpanWiseSections+1; iSpan++){
-        delete [] MachIn          [iMarker][iSpan];
-        delete [] MachOut         [iMarker][iSpan];
-        delete [] TurboVelocityIn [iMarker][iSpan];
-        delete [] TurboVelocityOut[iMarker][iSpan];
-      }
-    }
-    for(iMarker = 0; iMarker< nMarkerTurboPerf; iMarker++){
-      delete [] TotalStaticEfficiency[iMarker];
-      delete [] TotalTotalEfficiency [iMarker];
-      delete [] KineticEnergyLoss    [iMarker];
-      delete [] TRadius              [iMarker];
-      delete [] TotalPressureLoss    [iMarker];
-      delete [] MassFlowIn           [iMarker];
-      delete [] MassFlowOut          [iMarker];
-      delete [] FlowAngleIn          [iMarker];
-      delete [] FlowAngleOut         [iMarker];
-      delete [] EulerianWork         [iMarker];
-      delete [] TotalEnthalpyIn      [iMarker];
-      delete [] TotalEnthalpyOut     [iMarker];
-      delete [] TotalEnthalpyOutIs   [iMarker];
-      delete [] PressureRatio        [iMarker];
-      delete [] EnthalpyOut          [iMarker];
-      delete [] VelocityOutIs        [iMarker];
-      delete [] TotalTemperatureIn   [iMarker];
-      delete [] FlowAngleIn_BC       [iMarker];
-      delete [] EntropyIn            [iMarker];
-      delete [] EntropyIn_BC         [iMarker];
-      delete [] EntropyOut           [iMarker];
-      delete [] TotalEnthalpyIn_BC   [iMarker];
-      delete [] DensityIn            [iMarker];
-      delete [] PressureIn           [iMarker];
-      delete [] DensityOut           [iMarker];
-      delete [] PressureOut          [iMarker];
-      delete [] EnthalpyOutIs        [iMarker];
-      delete [] EntropyGen           [iMarker];
-      delete [] AbsFlowAngleIn       [iMarker];
-      delete [] RothalpyIn           [iMarker];
-      delete [] RothalpyOut          [iMarker];
-      delete [] AbsFlowAngleOut      [iMarker];
-      delete [] PressureOut_BC       [iMarker];
-      delete [] MachIn               [iMarker];
-      delete [] MachOut              [iMarker];
-      delete [] TurboVelocityIn      [iMarker];
-      delete [] TurboVelocityOut     [iMarker];
-      delete [] TemperatureIn        [iMarker];
-      delete [] TemperatureOut       [iMarker];
-      delete [] TotalPressureIn      [iMarker];
-      delete [] TotalPressureOut     [iMarker];
-      delete [] TotalTemperatureOut  [iMarker];
-      delete [] EnthalpyIn           [iMarker];
-      delete [] TurbIntensityIn      [iMarker];
-      delete [] Turb2LamViscRatioIn  [iMarker];
-      delete [] TurbIntensityOut     [iMarker];
-      delete [] Turb2LamViscRatioOut [iMarker];
-      delete [] NuFactorIn           [iMarker];
-      delete [] NuFactorOut          [iMarker];
-
-
-    }
-    delete [] TotalStaticEfficiency;
-    delete [] TotalTotalEfficiency;
-    delete [] KineticEnergyLoss;
-    delete [] TRadius;
-    delete [] TotalPressureLoss;
-    delete [] MassFlowIn;
-    delete [] MassFlowOut;
-    delete [] FlowAngleIn;
-    delete [] FlowAngleOut;
-    delete [] EulerianWork;
-    delete [] TotalEnthalpyIn;
-    delete [] TotalEnthalpyOut;
-    delete [] TotalEnthalpyOutIs;
-    delete [] PressureRatio;
-    delete [] EnthalpyOut;
-    delete [] VelocityOutIs;
-    delete [] TotalTemperatureIn;
-    delete [] FlowAngleIn_BC;
-    delete [] EntropyIn;
-    delete [] EntropyIn_BC;
-    delete [] EntropyOut;
-    delete [] TotalEnthalpyIn_BC;
-    delete [] DensityIn;
-    delete [] PressureIn;
-    delete [] DensityOut;
-    delete [] PressureOut;
-    delete [] EnthalpyOutIs;
-    delete [] EntropyGen;
-    delete [] AbsFlowAngleIn;
-    delete [] RothalpyIn;
-    delete [] RothalpyOut;
-    delete [] AbsFlowAngleOut;
-    delete [] PressureOut_BC;
-    delete [] MachIn;
-    delete [] MachOut;
-    delete [] TurboVelocityIn;
-    delete [] TurboVelocityOut;
-    delete [] TemperatureIn;
-    delete [] TemperatureOut;
-    delete [] TotalPressureIn;
-    delete [] TotalPressureOut;
-    delete [] TotalTemperatureOut;
-    delete [] EnthalpyIn;
-    delete [] TurbIntensityIn;
-    delete [] Turb2LamViscRatioIn;
-    delete [] TurbIntensityOut;
-    delete [] Turb2LamViscRatioOut;
-    delete [] NuFactorIn;
-    delete [] NuFactorOut;
-  }
   
   /*--- Deallocate the structures holding the linear partitioning ---*/
 

From b6b52ecc7c9b499e38098cc38a23220b3d28d380 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 19:39:14 +0200
Subject: [PATCH 200/539] Restructured output files

---
 SU2_CFD/include/output/output_baseline.hpp    |   4 +
 .../include/{ => output}/output_driver.hpp    |   0
 SU2_CFD/include/output/output_fea.hpp         |   4 +
 SU2_CFD/include/output/output_fea_discadj.hpp |   4 +
 SU2_CFD/include/output/output_flow.hpp        |   4 +
 SU2_CFD/include/output/output_flow_adj.hpp    |   4 +
 .../include/output/output_flow_discadj.hpp    |   4 +
 SU2_CFD/include/output/output_flow_fem.hpp    |   0
 SU2_CFD/include/output/output_flow_inc.hpp    |   4 +
 .../output/output_flow_inc_discadj.hpp        |   4 +
 SU2_CFD/include/output/output_heat.hpp        |   4 +
 SU2_CFD/include/output/output_mesh.hpp        |   4 +
 .../include/{ => output}/output_structure.hpp |   0
 .../{ => output}/output_structure_legacy.hpp  |   0
 .../{ => output}/output_structure_legacy.inl  |   0
 SU2_CFD/include/output_structure.inl          | 145 ------------------
 16 files changed, 40 insertions(+), 145 deletions(-)
 create mode 100644 SU2_CFD/include/output/output_baseline.hpp
 rename SU2_CFD/include/{ => output}/output_driver.hpp (100%)
 create mode 100644 SU2_CFD/include/output/output_fea.hpp
 create mode 100644 SU2_CFD/include/output/output_fea_discadj.hpp
 create mode 100644 SU2_CFD/include/output/output_flow.hpp
 create mode 100644 SU2_CFD/include/output/output_flow_adj.hpp
 create mode 100644 SU2_CFD/include/output/output_flow_discadj.hpp
 create mode 100644 SU2_CFD/include/output/output_flow_fem.hpp
 create mode 100644 SU2_CFD/include/output/output_flow_inc.hpp
 create mode 100644 SU2_CFD/include/output/output_flow_inc_discadj.hpp
 create mode 100644 SU2_CFD/include/output/output_heat.hpp
 create mode 100644 SU2_CFD/include/output/output_mesh.hpp
 rename SU2_CFD/include/{ => output}/output_structure.hpp (100%)
 rename SU2_CFD/include/{ => output}/output_structure_legacy.hpp (100%)
 rename SU2_CFD/include/{ => output}/output_structure_legacy.inl (100%)
 delete mode 100644 SU2_CFD/include/output_structure.inl

diff --git a/SU2_CFD/include/output/output_baseline.hpp b/SU2_CFD/include/output/output_baseline.hpp
new file mode 100644
index 000000000000..5ca55174527f
--- /dev/null
+++ b/SU2_CFD/include/output/output_baseline.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_BASELINE_HPP
+#define OUTPUT_BASELINE_HPP
+
+#endif // OUTPUT_BASELINE_HPP
diff --git a/SU2_CFD/include/output_driver.hpp b/SU2_CFD/include/output/output_driver.hpp
similarity index 100%
rename from SU2_CFD/include/output_driver.hpp
rename to SU2_CFD/include/output/output_driver.hpp
diff --git a/SU2_CFD/include/output/output_fea.hpp b/SU2_CFD/include/output/output_fea.hpp
new file mode 100644
index 000000000000..966ad06ac39a
--- /dev/null
+++ b/SU2_CFD/include/output/output_fea.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FEA_HPP
+#define OUTPUT_FEA_HPP
+
+#endif // OUTPUT_FEA_HPP
diff --git a/SU2_CFD/include/output/output_fea_discadj.hpp b/SU2_CFD/include/output/output_fea_discadj.hpp
new file mode 100644
index 000000000000..c4a0e91e7a15
--- /dev/null
+++ b/SU2_CFD/include/output/output_fea_discadj.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FEA_DISCADJ_HPP
+#define OUTPUT_FEA_DISCADJ_HPP
+
+#endif // OUTPUT_FEA_DISCADJ_HPP
diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
new file mode 100644
index 000000000000..91ebbc5f4867
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_DIRECT_MEAN_HPP
+#define OUTPUT_DIRECT_MEAN_HPP
+
+#endif // OUTPUT_DIRECT_MEAN_HPP
diff --git a/SU2_CFD/include/output/output_flow_adj.hpp b/SU2_CFD/include/output/output_flow_adj.hpp
new file mode 100644
index 000000000000..6aae7e4bcabb
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow_adj.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FLOW_ADJ_HPP
+#define OUTPUT_FLOW_ADJ_HPP
+
+#endif // OUTPUT_FLOW_ADJ_HPP
diff --git a/SU2_CFD/include/output/output_flow_discadj.hpp b/SU2_CFD/include/output/output_flow_discadj.hpp
new file mode 100644
index 000000000000..6415e0c046ab
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow_discadj.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FLOW_DISCADJ_HPP
+#define OUTPUT_FLOW_DISCADJ_HPP
+
+#endif // OUTPUT_FLOW_DISCADJ_HPP
diff --git a/SU2_CFD/include/output/output_flow_fem.hpp b/SU2_CFD/include/output/output_flow_fem.hpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/output_flow_inc.hpp
new file mode 100644
index 000000000000..9a2f38707242
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow_inc.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FLOW_INC_HPP
+#define OUTPUT_FLOW_INC_HPP
+
+#endif // OUTPUT_FLOW_INC_HPP
diff --git a/SU2_CFD/include/output/output_flow_inc_discadj.hpp b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
new file mode 100644
index 000000000000..d80ede047366
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_FLOW_INC_DISCADJ_HPP
+#define OUTPUT_FLOW_INC_DISCADJ_HPP
+
+#endif // OUTPUT_FLOW_INC_DISCADJ_HPP
diff --git a/SU2_CFD/include/output/output_heat.hpp b/SU2_CFD/include/output/output_heat.hpp
new file mode 100644
index 000000000000..604165d233d0
--- /dev/null
+++ b/SU2_CFD/include/output/output_heat.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_HEAT_HPP
+#define OUTPUT_HEAT_HPP
+
+#endif // OUTPUT_HEAT_HPP
diff --git a/SU2_CFD/include/output/output_mesh.hpp b/SU2_CFD/include/output/output_mesh.hpp
new file mode 100644
index 000000000000..7093dabeb42a
--- /dev/null
+++ b/SU2_CFD/include/output/output_mesh.hpp
@@ -0,0 +1,4 @@
+#ifndef OUTPUT_MESH_HPP
+#define OUTPUT_MESH_HPP
+
+#endif // OUTPUT_MESH_HPP
diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output/output_structure.hpp
similarity index 100%
rename from SU2_CFD/include/output_structure.hpp
rename to SU2_CFD/include/output/output_structure.hpp
diff --git a/SU2_CFD/include/output_structure_legacy.hpp b/SU2_CFD/include/output/output_structure_legacy.hpp
similarity index 100%
rename from SU2_CFD/include/output_structure_legacy.hpp
rename to SU2_CFD/include/output/output_structure_legacy.hpp
diff --git a/SU2_CFD/include/output_structure_legacy.inl b/SU2_CFD/include/output/output_structure_legacy.inl
similarity index 100%
rename from SU2_CFD/include/output_structure_legacy.inl
rename to SU2_CFD/include/output/output_structure_legacy.inl
diff --git a/SU2_CFD/include/output_structure.inl b/SU2_CFD/include/output_structure.inl
deleted file mode 100644
index 713f78815f1b..000000000000
--- a/SU2_CFD/include/output_structure.inl
+++ /dev/null
@@ -1,145 +0,0 @@
-/*!
- * \file output_structure.inl
- * \brief In-Line subroutines of the <i>output_structure.hpp</i> file.
- * \author J. Smith
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "output_structure.hpp"
-
-inline bool COutput::PrintOutput(unsigned long iIter, unsigned long iFreq) { return (iIter % iFreq == 0); }
-
-inline void COutput::SetHistoryOutputFields(CConfig *config){}
-
-inline void COutput::SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst) { }
-
-inline void COutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { }
-
-inline void COutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){}
-
-inline void COutput::PrintScreenFixed(stringstream& stream, su2double val) {
-  stream.precision(6); stream.setf(ios::fixed, ios::floatfield); stream.width(field_width);
-  stream << std::right << val;
-  stream.unsetf(ios::fixed);
-}
-
-inline void COutput::PrintScreenScientific(stringstream& stream, su2double val) {
-  stream.precision(4); stream.setf(ios::scientific, ios::floatfield); stream.width(field_width);
-  stream << std::right << val;
-  stream.unsetf(ios::scientific);  
-}
-
-inline void COutput::PrintScreenInteger(stringstream& stream, unsigned long val) {
-  stream.width(field_width);
-  stream << std::right << val;
-}
-
-inline void COutput::PrintScreenHeaderString(stringstream& stream, string header) {
-  if ((unsigned short)header.size() > field_width-1) header.resize(field_width-1);
-  stream << std::right << std::setw(field_width) << header; 
-}
-
-inline void COutput::PrintHistorySep(stringstream& stream){
-  stream << HistorySep;
-}
-
-inline void COutput::AddHistoryOutput(string name, string field_name, unsigned short format, string groupname , unsigned short field_type){
-  HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
-  HistoryOutput_List.push_back(name);
-}
-
-inline void COutput::AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type){
-  if (marker_names.size() != 0){
-    HistoryOutputPerSurface_List.push_back(name);
-    for (unsigned short i = 0; i < marker_names.size(); i++){
-      HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type));
-    }
-  }
-}
-
-inline void COutput::SetHistoryOutputValue(string name, su2double value){
-  if (HistoryOutput_Map.count(name) > 0){
-    HistoryOutput_Map[name].Value = value;
-  } else {
-    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
-  }
-}
-
-inline void COutput::SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker){
-  if (HistoryOutputPerSurface_Map.count(name) > 0){
-    HistoryOutputPerSurface_Map[name][iMarker].Value = value;
-  } else {
-    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
-  }
-}
-
-inline void COutput::AddVolumeOutput(string name, string field_name, string groupname){
-  VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname);
-  VolumeOutput_List.push_back(name);
-}
-
-inline void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
-  if (VolumeOutput_Map.count(name) > 0){
-    if (VolumeOutput_Map[name].Offset != -1){
-      Local_Data[iPoint][VolumeOutput_Map[name].Offset] = value;
-    }
-  } else {
-    SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
-  }
-}
-inline void COutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) {}
-
-inline void COutput::SetVolumeOutputFields(CConfig *config) {}
-
-inline void COutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) {}
-
-inline bool COutput::SetInit_Residuals(CConfig *config) {return false;}
-
-inline bool COutput::SetUpdate_Averages(CConfig *config, bool dualtime) {return false;}
-
-inline COutputLegacy* COutput::GetLegacyOutput() {return output_legacy;}
-
-inline void COutput::SetVolume_Filename(string filename){VolumeFilename = filename;}
-
-inline void COutput::SetSurface_Filename(string filename){SurfaceFilename = filename;}
-
-inline string COutput::GetVolume_Filename(){return VolumeFilename;}
-
-inline string COutput::GetSurface_Filename(){return SurfaceFilename;}
-
-inline void COutput::SetRestart_Filename(string filename){RestartFilename = filename;}
-
-inline string COutput::GetRestart_Filename(){return RestartFilename;}
-

From 0715aa610ffcd5d299a3792b3cc3bbdb1342f0c7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 19:42:13 +0200
Subject: [PATCH 201/539] Splitted header of output_structure and renamed file

---
 .../{output_structure.hpp => output.hpp}      | 979 +++++-------------
 SU2_CFD/include/output/output_baseline.hpp    |  80 +-
 SU2_CFD/include/output/output_driver.hpp      |  15 +-
 SU2_CFD/include/output/output_fea.hpp         | 119 ++-
 SU2_CFD/include/output/output_fea_discadj.hpp | 112 +-
 SU2_CFD/include/output/output_flow.hpp        | 137 ++-
 SU2_CFD/include/output/output_flow_adj.hpp    | 124 ++-
 .../include/output/output_flow_discadj.hpp    | 138 ++-
 SU2_CFD/include/output/output_flow_fem.hpp    | 138 +++
 SU2_CFD/include/output/output_flow_inc.hpp    | 134 ++-
 .../output/output_flow_inc_discadj.hpp        | 139 ++-
 SU2_CFD/include/output/output_heat.hpp        | 119 ++-
 SU2_CFD/include/output/output_mesh.hpp        |  80 +-
 .../output/output_structure_legacy.hpp        |  16 +-
 .../output/output_structure_legacy.inl        |   2 +-
 15 files changed, 1598 insertions(+), 734 deletions(-)
 rename SU2_CFD/include/output/{output_structure.hpp => output.hpp} (65%)

diff --git a/SU2_CFD/include/output/output_structure.hpp b/SU2_CFD/include/output/output.hpp
similarity index 65%
rename from SU2_CFD/include/output/output_structure.hpp
rename to SU2_CFD/include/output/output.hpp
index fc81d5b7536e..70d7650b55a6 100644
--- a/SU2_CFD/include/output/output_structure.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_structure.hpp
+ * \file output.hpp
  * \brief Headers of the main subroutines for generating the file outputs.
  *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
  * \author F. Palacios, T. Economon, M. Colonno
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/mpi_structure.hpp"
 
 #ifdef HAVE_CGNS
   #include "cgnslib.h"
@@ -53,16 +53,16 @@
 #include <iomanip>
 #include <limits>
 
-#include "solver_structure.hpp"
-#include "integration_structure.hpp"
-#include "../../Common/include/geometry_structure.hpp"
-#include "../../Common/include/fem_geometry_structure.hpp"
-#include "../../Common/include/fem_standard_element.hpp"
-#include "../../Common/include/config_structure.hpp"
+#include "../solver_structure.hpp"
+#include "../integration_structure.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
+#include "../../../Common/include/fem_standard_element.hpp"
+#include "../../../Common/include/config_structure.hpp"
+#include "../../../Common/include/toolboxes/printing_toolbox.hpp"
+#include "../../../Common/include/toolboxes/signal_processing_toolbox.hpp"
 
-#include "../../Common/include/toolboxes/printing_toolbox.hpp"
-#include "../../Common/include/toolboxes/signal_processing_toolbox.hpp"
-#include "../include/output_structure_legacy.hpp"
+#include "output_structure_legacy.hpp"
 
 using namespace std;
 
@@ -212,7 +212,7 @@ class COutput {
    */
   struct VolumeOutputField {
     string FieldName;          /*!< \brief The name of the field, i.e. the name that is printed in the file header.*/
-    int    Offset;             /*!< \brief This value identifies the position of the values of this field at each node in the Local_Data array. */
+    int    Offset;             /*!< \brief This value identifies the position of the values of this field at each node in the ::Local_Data array. */
     string OutputGroup;        /*!< \brief The group this field belongs to. */
     VolumeOutputField () {}    /*!< \brief Default constructor. */
     VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
@@ -250,24 +250,141 @@ class COutput {
   
   string VolumeFilename, SurfaceFilename, RestartFilename;
   
+  
+  
+  
 public:
-
+  
+  /*----------------------------- Public member functions ----------------------------*/
+  
   /*! 
    * \brief Constructor of the class. 
    */
   COutput(CConfig *config);
-
+  
   /*! 
    * \brief Destructor of the class. 
    */
-  virtual ~COutput(void);
+  virtual ~COutput(void);  
+
+  /*!
+   * \brief Preprocess the volume output by setting the requested volume output fields.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void PreprocessVolumeOutput(CConfig *config, CGeometry *geometry);   
   
   /*!
-   * \brief Create and write the file with the FSI convergence history.
-   * \param[in] iIter - Current iteration.
-   * \param[in] iFreq - Frequency of output printing.
+   * \brief Load the data from the solvers into the local data array and sort it for the linear partitioning.
+   * 
+   * After calling this method the data is distributed to all processors based on a linear partition 
+   * and is ready to be written in parallel to file using the SetVolume_Output or SetSurface_Output routines.
+   * 
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
+  void Load_Data(CGeometry *geometry, CConfig *config, CSolver **solver_container);
+  
+  /*!
+   * \brief Write the linear partitioned volume data in parallel to file. ::Load_Data() has to be called before!
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] format - The data format of the output files.
+   */
+  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  
+  /*!
+   * \brief Write the linear partitioned surface data in parallel to file. ::Load_Data() has to be called before!
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] format - The data format of the output files.
+   */
+  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
+   */
+  void DeallocateData_Parallel();
+    
+  /*!
+   * \brief Preprocess the history output by setting the history fields and opening the history file.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void PreprocessHistoryOutput(CConfig *config);  
+  
+  /*! 
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
+   */
+  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+                              CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);  
+  
+  /*! 
+   * \brief Returns a pointer to the legacy output class needed for some old driver implementations.
+   * \return - Returns a pointer to the legacy output class.
+   */
+  inline COutputLegacy* GetLegacyOutput(){return output_legacy;}
+
+  /*!
+   * \brief Sets the volume output filename
+   * \param[in] filename - the new filename
+   */
+  inline void SetVolume_Filename(string filename) {VolumeFilename = filename;}
+  
+  /*!
+   * \brief Sets the surface output filename
+   * \param[in] filename - the new filename
+   */
+  inline void SetSurface_Filename(string filename) {SurfaceFilename = filename;}
+  
+  /*!
+   * \brief Returns the current volume filename
+   * \return - The current volume filename
+   */
+  inline string GetVolume_Filename() {return VolumeFilename;}
+  
+  /*!
+   * \brief Returns the current surface filename
+   * \return - The current surface filename
+   */
+  inline string GetSurface_Filename() {return SurfaceFilename;}
+  
+  
+  /*!
+   * \brief Sets the restart filename
+   * \param[in] filename - the new filename
+   */
+  inline void SetRestart_Filename(string filename) {RestartFilename = filename;}
+    
+  /*!
+   * \brief Returns the current restart filename
+   * \return - The current restart filename
+   */
+  inline string GetRestart_Filename() {return RestartFilename;}
+  
+  /*!
+   * \brief Write the history file and the convergence on the screen for serial computations.
+   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
+   * \param[in] iExtIter - Current external (time) iteration.
+   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
+   * \param[in] val_nZone - iZone index.
    */
-  bool PrintOutput(unsigned long iIter, unsigned long iFreq);
+  void SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone);  
+  
+protected:
+  
+  /*----------------------------- Protected member functions ----------------------------*/  
 
   /*!
    * \brief Write a native SU2 restart file.
@@ -424,34 +541,6 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    */
   void WriteSurface_CSV(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Load the data from the solvers into the local data array and sort it for the linear partitioning.
-   * 
-   * After calling this method the data is distributed to all processors based on a linear partition 
-   * and is ready to be written in parallel to file using the SetVolume_Output or SetSurface_Output routines.
-   * 
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - The container holding all solution data.
-   */
-  void Load_Data(CGeometry *geometry, CConfig *config, CSolver **solver_container);
-    
-  /*!
-   * \brief Write the linear partitioned volume data in parallel to file. Load_Data has to be called before!
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] format - The data format of the output files.
-   */
-  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format);
-  
-  /*!
-   * \brief Write the linear partitioned surface data in parallel to file. Load_Data has to be called before!
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] format - The data format of the output files.
-   */
-  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format);
 
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
@@ -579,40 +668,7 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    */
   void DeallocateSolution(CConfig *config, CGeometry *geometry);
-  
-  /*! 
-   * \brief Write the header of the history file.
-   * \param[in] config - Definition of the particular problem.
-   */
-
-  virtual void SetConvHistory_Header(CConfig *config, unsigned short val_iZone, unsigned short val_iInst);
 
-  /*! 
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  virtual void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-                              CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-  
-  /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
-   */
-  void SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone);
-  
   /*!
    * \brief Write the sensitivity (including mesh sensitivity) computed with the discrete adjoint method
    *  on the surface and in the volume to a file.
@@ -622,15 +678,6 @@ class COutput {
    */
   void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone);
 
-  /*!
-   * \brief Compute .
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iExtIter - Current external (time) iteration.
-   */
-  void ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
    * \param[in] config - Definition of the particular problem.
@@ -731,11 +778,6 @@ class COutput {
    */
   void DeallocateConnectivity_Parallel(bool surf_sol);
   
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   */
-  void DeallocateData_Parallel();
-  
   /*!
    * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
    */
@@ -773,16 +815,6 @@ class COutput {
    * \param[in] val_direction - Controls the slice direction (0 for constant x/vertical, 1 for constant y/horizontal.
    */
   void WriteCSV_Slice(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_direction);
-
-  /*!
-   * \brief Load the output data to the containers in each subclass
-   * \param[in] config - Definition of the particular problem.
-   */
-  virtual void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-  virtual void SetHistoryOutputFields(CConfig *config);
-  
   
   /*!
    * \brief Set the history file header
@@ -796,24 +828,6 @@ class COutput {
    */
   void SetHistoryFile_Output(CConfig *config);
 
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  virtual bool WriteScreen_Header(CConfig *config);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
   /*!
    * \brief Write the screen header.
    * \param[in] config - Definition of the particular problem.
@@ -827,625 +841,204 @@ class COutput {
    */
   void SetScreen_Output(CConfig *config);
 
-  void PrintScreenFixed(stringstream &stream, su2double val);
-
-  void PrintScreenScientific(stringstream &stream, su2double val);
-  
-  void PrintScreenInteger(stringstream &stream, unsigned long val);
-  
-  void PrintScreenHeaderString(stringstream &stream, string header);
-  
-  void PrintHistorySep(stringstream& stream);
-  
-  void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, unsigned short field_type = TYPE_DEFAULT );
-  
-  void SetHistoryOutputValue(string name, su2double value);
-  
-  void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type = TYPE_DEFAULT);
-  
-  void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker);
-  
-  void PreprocessHistoryOutput(CConfig *config);  
+  /*!
+   * \brief Add a new field to the history output.
+   * \param[in] name - Name for referencing it (in the config file and in the code).
+   * \param[in] field_name - Header that is printed on screen and in the history file.
+   * \param[in] format - The screen printing format (::ScreenOutputFormat).
+   * \param[in] groupname - The name of the group this field belongs to.
+   * \param[in] field_type - The type of the field (::HistoryFieldType).
+   */
+  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, unsigned short field_type = TYPE_DEFAULT ){
+    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
+    HistoryOutput_List.push_back(name);
+  }
   
-  void PreprocessVolumeOutput(CConfig *config, CGeometry *geometry);  
+  /*!
+   * \brief Set the value of a history output field
+   * \param[in] name - Name of the field.
+   * \param[in] value - The new value of this field.
+   */
+  inline void SetHistoryOutputValue(string name, su2double value){
+    if (HistoryOutput_Map.count(name) > 0){
+      HistoryOutput_Map[name].Value = value;
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+    }
+  }
   
-  void AddVolumeOutput(string name, string field_name, string groupname);
+  /*!
+   * \brief Add a new field per surface marker to the history output.
+   * \param[in] name - Name for referencing it (in the config file and in the code).
+   * \param[in] field_name - Header that is printed on screen and in the history file.
+   * \param[in] format - The screen printing format (::ScreenOutputFormat).
+   * \param[in] groupname - The name of the group this field belongs to.
+   * \param[in] marker_names - A list of markers. For every marker in this list a new field is created with "field_name + _marker_names[i]".
+   * \param[in] field_type - The type of the field (::HistoryFieldType).
+   */
+  inline void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type = TYPE_DEFAULT){
+    if (marker_names.size() != 0){
+      HistoryOutputPerSurface_List.push_back(name);
+      for (unsigned short i = 0; i < marker_names.size(); i++){
+        HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type));
+      }
+    }
+  }
   
-  virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  /*!
+   * \brief Set the value of a history output field for a specific surface marker
+   * \param[in] name - Name of the field.
+   * \param[in] value - The new value of this field.
+   * \param[in] iMarker - The index of the marker.
+   */
+  inline void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker){
+    if (HistoryOutputPerSurface_Map.count(name) > 0){
+      HistoryOutputPerSurface_Map[name][iMarker].Value = value;
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+    }
+  }
   
-  virtual void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
+  /*!
+   * \brief Add a new field to the volume output.
+   * \param[in] name - Name for referencing it (in the config file and in the code).
+   * \param[in] field_name - Header that is printed in the output files.
+   * \param[in] groupname - The name of the group this field belongs to.
+   */
+  inline void AddVolumeOutput(string name, string field_name, string groupname){
+    VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname);
+    VolumeOutput_List.push_back(name);
+  }
   
-  void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
+  /*!
+   * \brief Set the value of a volume output field
+   * \param[in] name - Name of the field.
+   * \param[in] value - The new value of this field.
+   */
+  inline void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
+    if (VolumeOutput_Map.count(name) > 0){
+      if (VolumeOutput_Map[name].Offset != -1){
+        Local_Data[iPoint][VolumeOutput_Map[name].Offset] = value;
+      }
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+    }
+  }
   
+
+  /*!
+   * \brief Load up the values of the requested volume fields into ::Local_Data array. 
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
   void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
       
-  virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  virtual void SetVolumeOutputFields(CConfig *config);
-  
+  /*!
+   * \brief Postprocess_HistoryData
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] dualtime - TODO: REMOVE PARAMETER
+   */
   void Postprocess_HistoryData(CConfig *config, bool dualtime);
 
-  virtual bool SetInit_Residuals(CConfig *config);
-  
-  virtual bool SetUpdate_Averages(CConfig *config, bool dualtime);
-  
+  /*!
+   * \brief Postprocess_HistoryFields
+   * \param[in] config - Definition of the particular problem.
+   */
   void Postprocess_HistoryFields(CConfig *config);
   
-  COutputLegacy* GetLegacyOutput();
-  
-  void SetVolume_Filename(string filename);
-  
-  void SetSurface_Filename(string filename);
-  
-  string GetVolume_Filename();
-  
-  string GetSurface_Filename(); 
-  
-  void SetRestart_Filename(string filename);
-    
-  string GetRestart_Filename();
-  
-};
-
-/*! \class CFlowOutput
- *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez, T. Albring.
- *  \date May 30, 2018.
- */
-class CFlowOutput : public COutput {
-private:
-  
-  unsigned short nVar;
-
-  unsigned short turb_model;
+  /*!
+   * \brief Create and write the file with the FSI convergence history.
+   * \param[in] iIter - Current iteration.
+   * \param[in] iFreq - Frequency of output printing.
+   */
+  inline bool PrintOutput(unsigned long iIter, unsigned long iFreq) {return (iIter % iFreq == 0);} 
   
-  bool grid_movement;
+  /*--------------------------------- Virtual functions ---------------------------------------- */
   
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-
-public:
-
   /*!
-   * \brief Constructor of the class
+   * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
-
+  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  
   /*!
-   * \brief Destructor of the class.
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
    */
-  virtual ~CFlowOutput(void);
-
+  virtual bool WriteScreen_Header(CConfig *config);
+  
   /*!
-   * \brief Set the history file header
+   * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-  
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
-  
-  void SetHistoryOutputFields(CConfig *config);
-  
-  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
-  
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-  
-};
-
-/*! \class CFlowOutput
- *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez, T. Albring.
- *  \date May 30, 2018.
- */
-class CIncFlowOutput : public COutput {
-private:
-
-  unsigned short turb_model;
-  bool heat, weakly_coupled_heat;
-    
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-
-public:
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CIncFlowOutput(void);
-  
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-  void SetHistoryOutputFields(CConfig *config);
-  
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-  
-  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
-
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-  
-};
-
-
-/*! \class CFlowFEMOutput
- *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez, T. Albring.
- *  \date May 30, 2018.
- */
-class CFlowFEMOutput : public COutput {
-private:
-  
-  unsigned short nVar;
-
-  unsigned short turb_model;
-  
-  bool grid_movement;
-  
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-
-public:
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CFlowFEMOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-  
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
-  
-  void SetHistoryOutputFields(CConfig *config);
-
-  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
-  
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-  
-};
-
-/*! \class CFEAOutput
- *  \brief Output class for FEA problems.
- *  \author R. Sanchez, T. Albring.
- *  \date May 24, 2018.
- */
-class CFEAOutput : public COutput {
-private:
-
-protected:
-
-  unsigned short nVar_FEM;
-  bool linear_analysis,
-       nonlinear_analysis,
-       dynamic;
-
-public:
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CFEAOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-  void SetHistoryOutputFields(CConfig *config);
+  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
 
   /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
    */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  inline virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){}
   
   /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
+   * \brief LoadVolumeDataFEM
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iElem
+   * \param index
+   * \param dof
    */
-  bool WriteScreen_Header(CConfig *config);
+  inline virtual void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){}  
   
   /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
    */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-  
-  void SetVolumeOutputFields(CConfig *config);
+  inline virtual bool SetInit_Residuals(CConfig *config) {return false;}
   
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
-};
-
-/*! \class CHeatOutput
- *  \brief Output class for heat problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CHeatOutput : public COutput {
-private:
-  bool multizone;
-
-  char char_histfile[200];
-
-public:
-
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CHeatOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-  
-  void SetHistoryOutputFields(CConfig *config);
-   
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
- 
-};
-
-/*! \class CAdjFlowOutput
- *  \brief Output class for flow continuous adjoint problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CAdjFlowOutput : public COutput {
-private:
-
-  unsigned short nDim, turb_model;
-
-public:
-
-  ofstream HistFile;
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CAdjFlowOutput(void);
-
   /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-  
-  void SetHistoryOutputFields(CConfig *config);
-    
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  inline virtual bool SetUpdate_Averages(CConfig *config, bool dualtime){return false;}
   
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-  
-};
-
-/*! \class CDiscAdjFlowOutput
- *  \brief Output class for flow discrete adjoint problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CDiscAdjFlowOutput : public COutput {
-private:
-
-  unsigned short nDim, turb_model;
-  
-public:
-
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
   /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CDiscAdjFlowOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-
-  void SetHistoryOutputFields(CConfig *config);
+  inline virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){}
   
   /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
+   * \brief SetVolumeOutputFields
+   * \param config
    */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  inline virtual void SetVolumeOutputFields(CConfig *config){}
   
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
   
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-
-};
-
-
-/*! \class CDiscAdjFlowOutput
- *  \brief Output class for flow discrete adjoint problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CDiscAdjFlowIncOutput : public COutput {
-private:
-
-  unsigned short nDim, turb_model;
-  bool heat, weakly_coupled_heat;
-  
-public:
-
-
   /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CDiscAdjFlowIncOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-
-  void SetHistoryOutputFields(CConfig *config);
-  
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
+   * \brief Load the output data to the containers in each subclass
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Header(CConfig *config);
+  inline virtual void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+                                      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {}
 
   /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
+   * \brief SetHistoryOutputFields
+   * \param config
    */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  void SetVolumeOutputFields(CConfig *config);
-  
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-  
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  inline virtual void SetHistoryOutputFields(CConfig *config) {}
   
-  bool SetInit_Residuals(CConfig *config);
-  
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
-
-};
-
-/*! \class CDiscAdjFEAOutput
- *  \brief Output class for elasticity discrete adjoint problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CDiscAdjFEAOutput : public COutput {
-private:
-  unsigned short nVar_FEM, nDim;
-  char char_histfile[200];
-
-public:
-
-  ofstream HistFile;
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CDiscAdjFEAOutput(void);
-
-  void SetHistoryOutputFields(CConfig *config);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
-  void SetVolumeOutputFields(CConfig *config);
-
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
-};
-
-/*! \class CMeshOutput
- *  \brief Output class for mesh solution.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CMeshOutput : public COutput {
-
-public:
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CMeshOutput(void);
-
-  void SetVolumeOutputFields(CConfig *config);
-
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
-};
-
-
-/*! \class CBaselineOutput
- *  \brief Output class for baseline solver output.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CBaselineOutput : public COutput {
-
-public:
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CBaselineOutput(void);
-
-  void SetVolumeOutputFields(CConfig *config);
-
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
 };
 
-#include "output_structure.inl"
diff --git a/SU2_CFD/include/output/output_baseline.hpp b/SU2_CFD/include/output/output_baseline.hpp
index 5ca55174527f..2e21a68d6952 100644
--- a/SU2_CFD/include/output/output_baseline.hpp
+++ b/SU2_CFD/include/output/output_baseline.hpp
@@ -1,4 +1,78 @@
-#ifndef OUTPUT_BASELINE_HPP
-#define OUTPUT_BASELINE_HPP
+/*!
+ * \file output_baseline.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_BASELINE_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CBaselineOutput
+ *  \brief Output class for baseline solver output.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CBaselineOutput : public COutput {
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CBaselineOutput(void);
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
diff --git a/SU2_CFD/include/output/output_driver.hpp b/SU2_CFD/include/output/output_driver.hpp
index d2caffb7d5bb..ea119ddd0156 100644
--- a/SU2_CFD/include/output/output_driver.hpp
+++ b/SU2_CFD/include/output/output_driver.hpp
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <fstream>
 
-#include "output_structure.hpp"
+#include "output.hpp"
 #include "../../Common/include/config_structure.hpp"
 
 using namespace std;
@@ -175,11 +175,22 @@ class CDriverOutput {
     }
   }
 
+  /*! TODO
+   * \brief SetScreen_Header
+   * \param driver_config
+   * \param config
+   */
   void SetScreen_Header(CConfig *driver_config, CConfig **config);
 
+  /*! TODO
+   * \brief SetScreen_Output
+   * \param output
+   * \param driver_config
+   * \param config
+   */
   void SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config);
 
-  /*!
+  /*! 
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
diff --git a/SU2_CFD/include/output/output_fea.hpp b/SU2_CFD/include/output/output_fea.hpp
index 966ad06ac39a..6a9124660aa5 100644
--- a/SU2_CFD/include/output/output_fea.hpp
+++ b/SU2_CFD/include/output/output_fea.hpp
@@ -1,4 +1,117 @@
-#ifndef OUTPUT_FEA_HPP
-#define OUTPUT_FEA_HPP
+/*!
+ * \file output_fea.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FEA_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CFEAOutput
+ *  \brief Output class for FEA problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 24, 2018.
+ */
+class CFEAOutput : public COutput {
+private:
+
+protected:
+
+  unsigned short nVar_FEM;
+  bool linear_analysis,
+       nonlinear_analysis,
+       dynamic;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFEAOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+  
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_fea_discadj.hpp b/SU2_CFD/include/output/output_fea_discadj.hpp
index c4a0e91e7a15..fe5c572e22d7 100644
--- a/SU2_CFD/include/output/output_fea_discadj.hpp
+++ b/SU2_CFD/include/output/output_fea_discadj.hpp
@@ -1,4 +1,110 @@
-#ifndef OUTPUT_FEA_DISCADJ_HPP
-#define OUTPUT_FEA_DISCADJ_HPP
+/*!
+ * \file output_fea_discadj.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FEA_DISCADJ_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CDiscAdjFEAOutput
+ *  \brief Output class for elasticity discrete adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFEAOutput : public COutput {
+private:
+  unsigned short nVar_FEM, nDim;
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFEAOutput(void);
+
+  void SetHistoryOutputFields(CConfig *config);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index 91ebbc5f4867..32199701e08d 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -1,4 +1,135 @@
-#ifndef OUTPUT_DIRECT_MEAN_HPP
-#define OUTPUT_DIRECT_MEAN_HPP
+/*!
+ * \file output_flow.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_DIRECT_MEAN_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CFlowOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 30, 2018.
+ */
+class CFlowOutput : public COutput {
+private:
+  
+  unsigned short nVar;
+
+  unsigned short turb_model;
+  
+  bool grid_movement;
+  
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFlowOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFlowOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
+  
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief GetQ_Criterion
+   * \param config
+   * \param geometry
+   * \param node_flow
+   * \return 
+   */
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_adj.hpp b/SU2_CFD/include/output/output_flow_adj.hpp
index 6aae7e4bcabb..69a93ccf1a06 100644
--- a/SU2_CFD/include/output/output_flow_adj.hpp
+++ b/SU2_CFD/include/output/output_flow_adj.hpp
@@ -1,4 +1,122 @@
-#ifndef OUTPUT_FLOW_ADJ_HPP
-#define OUTPUT_FLOW_ADJ_HPP
+/*!
+ * \file output_flow_adj.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FLOW_ADJ_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CAdjFlowOutput
+ *  \brief Output class for flow continuous adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CAdjFlowOutput : public COutput {
+private:
+
+  unsigned short nDim, turb_model;
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CAdjFlowOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+    
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_discadj.hpp b/SU2_CFD/include/output/output_flow_discadj.hpp
index 6415e0c046ab..b0c1fb78b74b 100644
--- a/SU2_CFD/include/output/output_flow_discadj.hpp
+++ b/SU2_CFD/include/output/output_flow_discadj.hpp
@@ -1,4 +1,136 @@
-#ifndef OUTPUT_FLOW_DISCADJ_HPP
-#define OUTPUT_FLOW_DISCADJ_HPP
+/*!
+ * \file output_flow_discadj.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FLOW_DISCADJ_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CDiscAdjFlowOutput
+ *  \brief Output class for flow discrete adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFlowOutput : public COutput {
+private:
+
+  unsigned short nDim, turb_model;
+  
+public:
+
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFlowOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_fem.hpp b/SU2_CFD/include/output/output_flow_fem.hpp
index e69de29bb2d1..57135ee86dfa 100644
--- a/SU2_CFD/include/output/output_flow_fem.hpp
+++ b/SU2_CFD/include/output/output_flow_fem.hpp
@@ -0,0 +1,138 @@
+/*!
+ * \file output_flow_fem.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "output.hpp"
+
+
+/*! \class CFlowFEMOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 30, 2018.
+ */
+class CFlowFEMOutput : public COutput {
+private:
+  
+  unsigned short nVar;
+
+  unsigned short turb_model;
+  
+  bool grid_movement;
+  
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFlowFEMOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeDataFEM
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iElem
+   * \param index
+   * \param dof
+   */
+  void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
+  
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+
+  /*!
+   * \brief GetQ_Criterion
+   * \param config
+   * \param geometry
+   * \param node_flow
+   * \return 
+   */
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/output_flow_inc.hpp
index 9a2f38707242..77c01a7c79f5 100644
--- a/SU2_CFD/include/output/output_flow_inc.hpp
+++ b/SU2_CFD/include/output/output_flow_inc.hpp
@@ -1,4 +1,132 @@
-#ifndef OUTPUT_FLOW_INC_HPP
-#define OUTPUT_FLOW_INC_HPP
+/*!
+ * \file output_flow_inc.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FLOW_INC_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CIncFlowOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 30, 2018.
+ */
+class CIncFlowOutput : public COutput {
+private:
+
+  unsigned short turb_model;
+  bool heat, weakly_coupled_heat;
+    
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CIncFlowOutput(void);
+  
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  /*!
+   * \brief GetQ_Criterion
+   * \param config
+   * \param geometry
+   * \param node_flow
+   * \return 
+   */
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_inc_discadj.hpp b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
index d80ede047366..f05e3d259728 100644
--- a/SU2_CFD/include/output/output_flow_inc_discadj.hpp
+++ b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
@@ -1,4 +1,137 @@
-#ifndef OUTPUT_FLOW_INC_DISCADJ_HPP
-#define OUTPUT_FLOW_INC_DISCADJ_HPP
+/*!
+ * \file output_flow_inc_discadj.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_FLOW_INC_DISCADJ_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CDiscAdjFlowOutput
+ *  \brief Output class for flow discrete adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CDiscAdjFlowIncOutput : public COutput {
+private:
+
+  unsigned short nDim, turb_model;
+  bool heat, weakly_coupled_heat;
+  
+public:
+
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CDiscAdjFlowIncOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+
+  void SetHistoryOutputFields(CConfig *config);
+  
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
+  
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_heat.hpp b/SU2_CFD/include/output/output_heat.hpp
index 604165d233d0..2b011f0772a1 100644
--- a/SU2_CFD/include/output/output_heat.hpp
+++ b/SU2_CFD/include/output/output_heat.hpp
@@ -1,4 +1,117 @@
-#ifndef OUTPUT_HEAT_HPP
-#define OUTPUT_HEAT_HPP
+/*!
+ * \file output_heat.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_HEAT_HPP
+#pragma once
+
+#include "output.hpp"
+
+
+/*! \class CHeatOutput
+ *  \brief Output class for heat problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CHeatOutput : public COutput {
+private:
+  bool multizone;
+
+  char char_histfile[200];
+
+public:
+
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CHeatOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
+      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+
+
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Header(CConfig *config);
+
+
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
+   
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+  
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+ 
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_mesh.hpp b/SU2_CFD/include/output/output_mesh.hpp
index 7093dabeb42a..48519c41047f 100644
--- a/SU2_CFD/include/output/output_mesh.hpp
+++ b/SU2_CFD/include/output/output_mesh.hpp
@@ -1,4 +1,78 @@
-#ifndef OUTPUT_MESH_HPP
-#define OUTPUT_MESH_HPP
+/*!
+ * \file output_mesh.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#endif // OUTPUT_MESH_HPP
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CMeshOutput
+ *  \brief Output class for mesh solution.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CMeshOutput : public COutput {
+
+public:
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CMeshOutput(void);
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
+
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
diff --git a/SU2_CFD/include/output/output_structure_legacy.hpp b/SU2_CFD/include/output/output_structure_legacy.hpp
index ca76b8d3b13b..25883227a25a 100644
--- a/SU2_CFD/include/output/output_structure_legacy.hpp
+++ b/SU2_CFD/include/output/output_structure_legacy.hpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_structure.hpp
+ * \file output.hpp
  * \brief Headers of the main subroutines for generating the file outputs.
  *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
  * \author F. Palacios, T. Economon, M. Colonno
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/mpi_structure.hpp"
 
 #ifdef HAVE_CGNS
   #include "cgnslib.h"
@@ -51,12 +51,12 @@
 #include <time.h>
 #include <fstream>
 
-#include "solver_structure.hpp"
-#include "integration_structure.hpp"
-#include "../../Common/include/geometry_structure.hpp"
-#include "../../Common/include/fem_geometry_structure.hpp"
-#include "../../Common/include/fem_standard_element.hpp"
-#include "../../Common/include/config_structure.hpp"
+#include "../solver_structure.hpp"
+#include "../integration_structure.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
+#include "../../../Common/include/fem_standard_element.hpp"
+#include "../../../Common/include/config_structure.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/include/output/output_structure_legacy.inl b/SU2_CFD/include/output/output_structure_legacy.inl
index bd53a05dbc47..f9495746c4e4 100644
--- a/SU2_CFD/include/output/output_structure_legacy.inl
+++ b/SU2_CFD/include/output/output_structure_legacy.inl
@@ -1,6 +1,6 @@
 /*!
  * \file output_structure.inl
- * \brief In-Line subroutines of the <i>output_structure.hpp</i> file.
+ * \brief In-Line subroutines of the <i>output.hpp</i> file.
  * \author J. Smith
  * \version 6.1.0 "Falcon"
  *

From aff07ee215c6d4e74441d641eec15324cdab34d6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 19:47:39 +0200
Subject: [PATCH 202/539] Moved PrintScreen routines to PrintingToolbox

---
 Common/include/toolboxes/printing_toolbox.hpp | 27 ++++++++++++++++---
 SU2_CFD/src/output_driver.cpp                 |  6 ++---
 SU2_CFD/src/output_structure.cpp              | 12 ++++-----
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 3a94b80fe82b..7e95b12789d0 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <sstream>
 #include <cmath>
+#include "../datatype_structure.hpp"
 
 namespace PrintingToolbox { 
 
@@ -157,6 +158,26 @@ class CTablePrinter{
   print_header_bottom_line_;   /*< \brief Printing the header bottom line. */
 };
 
+
+
+inline void PrintScreenFixed(std::stringstream &stream, su2double val, unsigned short field_width) {
+  stream.precision(6); stream.setf(std::ios::fixed, std::ios::floatfield); stream.width(field_width);
+  stream << std::right << val;
+  stream.unsetf(std::ios::fixed);
+}
+
+inline void PrintScreenScientific(std::stringstream &stream, su2double val, unsigned short field_width) {
+  stream.precision(4); stream.setf(std::ios::scientific, std::ios::floatfield); stream.width(field_width);
+  stream << std::right << val;
+  stream.unsetf(std::ios::scientific);  
+}
+
+inline void PrintScreenInteger(std::stringstream &stream, unsigned long val, unsigned short field_width){
+  stream.width(field_width);
+  stream << std::right << val;
+}
+
+
 inline std::vector<std::string> split(const std::string& s, char delimiter)
 {
   std::vector<std::string> tokens;
@@ -176,14 +197,14 @@ inline int stoi(const std::string s){
   return number;
 }
 
-inline double stod(const std::string s){
+inline su2double stod(const std::string s){
   std::istringstream ss(s);
-  double number;
+  su2double number;
   ss >> number;
   return number;
 }
 
-inline std::string to_string(const double number){
+inline std::string to_string(const su2double number){
   
   std::stringstream ss;
   
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index ca01135ca517..8cf63896a92b 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -252,13 +252,13 @@ void CDriverOutput::SetScreen_Output(COutput **output, CConfig *driver_config, C
     if (HistoryOutput_Map.count(RequestedField) > 0){
       switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
         case FORMAT_INTEGER:
-          output[ZONE_0]->PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value));
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
           break;
         case FORMAT_FIXED:
-          output[ZONE_0]->PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value);
+          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
           break;
         case FORMAT_SCIENTIFIC:
-          output[ZONE_0]->PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value);
+          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
           break;
       }
     }
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index bdffd73db29d..dcf219ea90e1 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -5330,26 +5330,26 @@ void COutput::SetScreen_Output(CConfig *config) {
     if (HistoryOutput_Map.count(RequestedField) > 0){  
       switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
         case FORMAT_INTEGER:
-          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value));
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
           break;
         case FORMAT_FIXED:
-          PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value);
+          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value);
+          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
           break;      
       }
     }
     if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
       switch (HistoryOutputPerSurface_Map[RequestedField][0].ScreenFormat) {
         case FORMAT_INTEGER:
-          PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value));
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value), field_width);
           break;
         case FORMAT_FIXED:
-          PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value);
+          PrintingToolbox::PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value);
+          PrintingToolbox::PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
           break;   
       }
     }      

From 2dce837ec6efdb423fbd7e12c3b1eafd3f12fac4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 19:49:31 +0200
Subject: [PATCH 203/539] Modifed include paths for output structure

---
 SU2_CFD/include/SU2_CFD.hpp                 |  2 +-
 SU2_CFD/include/definition_structure.hpp    | 18 ++++--------------
 SU2_CFD/include/driver_structure.hpp        | 14 ++++++++++++--
 SU2_CFD/include/iteration_structure.hpp     |  2 +-
 SU2_CFD/obj/Makefile.am                     | 20 +++++++++++++++-----
 SU2_CFD/src/output_adjoint_discrete.cpp     |  2 +-
 SU2_CFD/src/output_adjoint_discrete_inc.cpp |  2 +-
 SU2_CFD/src/output_adjoint_elasticity.cpp   |  2 +-
 SU2_CFD/src/output_adjoint_mean.cpp         |  2 +-
 SU2_CFD/src/output_baseline.cpp             |  2 +-
 SU2_CFD/src/output_cgns.cpp                 |  2 +-
 SU2_CFD/src/output_csv.cpp                  |  2 +-
 SU2_CFD/src/output_direct_elasticity.cpp    |  2 +-
 SU2_CFD/src/output_direct_heat.cpp          |  2 +-
 SU2_CFD/src/output_direct_mean.cpp          |  2 +-
 SU2_CFD/src/output_direct_mean_fem.cpp      |  2 +-
 SU2_CFD/src/output_direct_mean_inc.cpp      |  2 +-
 SU2_CFD/src/output_driver.cpp               |  2 +-
 SU2_CFD/src/output_fieldview.cpp            |  2 +-
 SU2_CFD/src/output_mesh.cpp                 |  4 +++-
 SU2_CFD/src/output_paraview.cpp             |  2 +-
 SU2_CFD/src/output_physics.cpp              |  2 +-
 SU2_CFD/src/output_structure.cpp            |  2 +-
 SU2_CFD/src/output_structure_legacy.cpp     |  2 +-
 SU2_CFD/src/output_su2.cpp                  |  2 +-
 SU2_CFD/src/output_tecplot.cpp              |  2 +-
 SU2_DEF/include/SU2_DEF.hpp                 |  2 +-
 SU2_DOT/include/SU2_DOT.hpp                 |  2 +-
 SU2_SOL/include/SU2_SOL.hpp                 |  2 +-
 29 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/SU2_CFD/include/SU2_CFD.hpp b/SU2_CFD/include/SU2_CFD.hpp
index 9e5b24a8dcbd..ce2cd994c2ac 100644
--- a/SU2_CFD/include/SU2_CFD.hpp
+++ b/SU2_CFD/include/SU2_CFD.hpp
@@ -45,7 +45,7 @@
 #include "driver_structure.hpp"
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output_structure.hpp"
+#include "output/output.hpp"
 #include "numerics_structure.hpp"
 #include "../../Common/include/fem_geometry_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
diff --git a/SU2_CFD/include/definition_structure.hpp b/SU2_CFD/include/definition_structure.hpp
index 10985ca880e6..fcec9e2c20bc 100644
--- a/SU2_CFD/include/definition_structure.hpp
+++ b/SU2_CFD/include/definition_structure.hpp
@@ -38,23 +38,13 @@
 
 #pragma once
 
-#include "../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/mpi_structure.hpp"
 
 #include <ctime>
 
-#include "../../Common/include/gauss_structure.hpp"
-#include "../../Common/include/element_structure.hpp"
-#include "driver_structure.hpp"
-#include "iteration_structure.hpp"
-#include "solver_structure.hpp"
-#include "integration_structure.hpp"
-#include "output_structure.hpp"
-#include "numerics_structure.hpp"
-#include "transfer_structure.hpp"
-#include "../../Common/include/fem_geometry_structure.hpp"
-#include "../../Common/include/geometry_structure.hpp"
-#include "../../Common/include/config_structure.hpp"
-#include "../../Common/include/interpolation_structure.hpp"
+#include "../../../Common/include/config_structure.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
 
 
 
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 02eca5b9cc69..5d3b530c197c 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -42,8 +42,8 @@
 #include "iteration_structure.hpp"
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output_structure.hpp"
-#include "output_driver.hpp"
+#include "output/output.hpp"
+#include "output/output_driver.hpp"
 #include "numerics_structure.hpp"
 #include "transfer_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
@@ -51,6 +51,16 @@
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/interpolation_structure.hpp"
 
+#include "output/output_fea.hpp"
+#include "output/output_fea_discadj.hpp"
+#include "output/output_flow.hpp"
+#include "output/output_flow_adj.hpp"
+#include "output/output_flow_discadj.hpp"
+#include "output/output_flow_fem.hpp"
+#include "output/output_flow_inc.hpp"
+#include "output/output_flow_inc_discadj.hpp"
+#include "output/output_heat.hpp"
+
 using namespace std;
 
 /*! 
diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index dd72384e770f..415595c561cb 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -44,7 +44,7 @@
 
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output_structure.hpp"
+#include "output/output.hpp"
 #include "numerics_structure.hpp"
 #include "transfer_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 270ba7f89f35..cf8bac0461b5 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -69,11 +69,21 @@ libSU2Core_sources = \
   ../include/iteration_structure.hpp \
   ../include/numerics_structure.hpp \
   ../include/numerics_structure.inl \
-  ../include/output_structure.hpp \
-  ../include/output_structure.inl \
-  ../include/output_driver.hpp \
-  ../include/output_structure_legacy.hpp \
-  ../include/output_structure_legacy.inl \
+  ../include/output/output.hpp \
+  ../include/output/output_driver.hpp \
+  ../include/output/output_structure_legacy.hpp \
+  ../include/output/output_structure_legacy.inl \
+  ../include/output/output_baseline.hpp \
+  ../include/output/output_fea.hpp \
+  ../include/output/output_fea_discadj.hpp \
+  ../include/output/output_flow.hpp \
+  ../include/output/output_flow_adj.hpp \
+  ../include/output/output_flow_discadj.hpp \
+  ../include/output/output_flow_fem.hpp \
+  ../include/output/output_flow_inc.hpp \
+  ../include/output/output_flow_inc_discadj.hpp \
+  ../include/output/output_heat.hpp \
+  ../include/output/output_mesh.hpp \
   ../include/sgs_model.hpp \
   ../include/sgs_model.inl \
   ../include/solver_structure.hpp \
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index aa19fda1256d..2801e75b991a 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow_discadj.hpp"
 
 CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index 7b208bb4ce69..c7e6c9e575e7 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow_inc_discadj.hpp"
 
 CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 9c718b360e84..5e8dff01bbd7 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_fea_discadj.hpp"
 
 CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index ac5d053d91e1..274f4779da5f 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow_adj.hpp"
 
 CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_baseline.cpp b/SU2_CFD/src/output_baseline.cpp
index da8de04f8f70..4d376ef3330b 100644
--- a/SU2_CFD/src/output_baseline.cpp
+++ b/SU2_CFD/src/output_baseline.cpp
@@ -1,4 +1,4 @@
-#include "../include/output_structure.hpp"
+#include "../include/output/output_baseline.hpp"
 
 CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_cgns.cpp b/SU2_CFD/src/output_cgns.cpp
index 45a180b66155..3d34281287a0 100644
--- a/SU2_CFD/src/output_cgns.cpp
+++ b/SU2_CFD/src/output_cgns.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short iZone) {
   
diff --git a/SU2_CFD/src/output_csv.cpp b/SU2_CFD/src/output_csv.cpp
index ce51ebe97fd5..27657d73115d 100644
--- a/SU2_CFD/src/output_csv.cpp
+++ b/SU2_CFD/src/output_csv.cpp
@@ -1,4 +1,4 @@
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 3e64474a685c..6e9405819dd3 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_fea.hpp"
 
 CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index f3d25b70caa8..fa007b2365b2 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_heat.hpp"
 
 CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 9f81b1844627..41fd27adcb02 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow.hpp"
 
 CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index fae7e6dfb8e5..4b0d2f466a5d 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow_fem.hpp"
 
 CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index eb1a8a0cb49b..cf40aba549cd 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output_flow_inc.hpp"
 
 CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 8cf63896a92b..9357aa895815 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_driver.hpp"
+#include "../include/output/output_driver.hpp"
 
 CDriverOutput::CDriverOutput(CConfig **config) {
 
diff --git a/SU2_CFD/src/output_fieldview.cpp b/SU2_CFD/src/output_fieldview.cpp
index aae00826f164..f4bdb594d3df 100644
--- a/SU2_CFD/src/output_fieldview.cpp
+++ b/SU2_CFD/src/output_fieldview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 void COutput::SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone) {
   
diff --git a/SU2_CFD/src/output_mesh.cpp b/SU2_CFD/src/output_mesh.cpp
index 0fbe091d8c29..762d17fdeb17 100644
--- a/SU2_CFD/src/output_mesh.cpp
+++ b/SU2_CFD/src/output_mesh.cpp
@@ -1,4 +1,6 @@
-#include "../include/output_structure.hpp"
+
+
+#include "../include/output/output_mesh.hpp"
 
 CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp
index e41292011cd2..baa6a854771c 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output_paraview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 /*--- Subroutine to swap bytes, in case we need to convert to
  big endian, which is expected for ParaView binary legacy format. ---*/
diff --git a/SU2_CFD/src/output_physics.cpp b/SU2_CFD/src/output_physics.cpp
index 35a2f57fbbba..7ef7bb4a3f60 100644
--- a/SU2_CFD/src/output_physics.cpp
+++ b/SU2_CFD/src/output_physics.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure_legacy.hpp"
+#include "../include/output/output_structure_legacy.hpp"
 
 
 void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index dcf219ea90e1..68e1d0845331 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 COutput::COutput(CConfig *config) {
   
diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output_structure_legacy.cpp
index 94e0f42c689a..f5459418dba7 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output_structure_legacy.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure_legacy.hpp"
+#include "../include/output/output_structure_legacy.hpp"
 
 COutputLegacy::COutputLegacy(CConfig *config) {
 
diff --git a/SU2_CFD/src/output_su2.cpp b/SU2_CFD/src/output_su2.cpp
index 0a340f8006bb..ee0e9ebd30ee 100644
--- a/SU2_CFD/src/output_su2.cpp
+++ b/SU2_CFD/src/output_su2.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   
diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output_tecplot.cpp
index 4dbaf399b391..fc7243ada32a 100644
--- a/SU2_CFD/src/output_tecplot.cpp
+++ b/SU2_CFD/src/output_tecplot.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output_structure.hpp"
+#include "../include/output/output.hpp"
 
 void COutput::SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
   
diff --git a/SU2_DEF/include/SU2_DEF.hpp b/SU2_DEF/include/SU2_DEF.hpp
index c265a996a02e..73636bda4ba6 100644
--- a/SU2_DEF/include/SU2_DEF.hpp
+++ b/SU2_DEF/include/SU2_DEF.hpp
@@ -46,7 +46,7 @@
 #include <cmath>
 
 #include "../../SU2_CFD/include/solver_structure.hpp"
-#include "../../SU2_CFD/include/output_structure.hpp"
+#include "../../SU2_CFD/include/output/output_mesh.hpp"
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/grid_movement_structure.hpp"
diff --git a/SU2_DOT/include/SU2_DOT.hpp b/SU2_DOT/include/SU2_DOT.hpp
index 73df104dd88c..5280d6acbeca 100644
--- a/SU2_DOT/include/SU2_DOT.hpp
+++ b/SU2_DOT/include/SU2_DOT.hpp
@@ -48,7 +48,7 @@
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/grid_movement_structure.hpp"
-#include "../../SU2_CFD/include/output_structure.hpp"
+#include "../../SU2_CFD/include/output/output_baseline.hpp"
 
 using namespace std;
 
diff --git a/SU2_SOL/include/SU2_SOL.hpp b/SU2_SOL/include/SU2_SOL.hpp
index 7e81bc94c997..3229596e9034 100644
--- a/SU2_SOL/include/SU2_SOL.hpp
+++ b/SU2_SOL/include/SU2_SOL.hpp
@@ -43,7 +43,7 @@
 #include <ctime>
 
 #include "../../SU2_CFD/include/solver_structure.hpp"
-#include "../../SU2_CFD/include/output_structure.hpp"
+#include "../../SU2_CFD/include/output/output_baseline.hpp"
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 

From 4aa43ea9aa9201f04adc1e6b10a243da57a2dcad Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 19:49:44 +0200
Subject: [PATCH 204/539] Fixed missing legacy call

---
 SU2_CFD/src/driver_structure.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 179ea76ffb72..2dfadcfa1559 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -4991,13 +4991,13 @@ void CDiscAdjTurbomachineryDriver::SetObjFunction(){
 
   switch (config_container[ZONE_0]->GetKind_ObjFunc()){
   case ENTROPY_GENERATION:
-    solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetEntropyGen(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+    solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetLegacyOutput()->GetEntropyGen(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
     break;
   case FLOW_ANGLE_OUT:
-      solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetFlowAngleOut(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+      solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetLegacyOutput()->GetFlowAngleOut(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
       break;
   case MASS_FLOW_IN:
-    solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetMassFlowIn(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
+    solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->AddTotal_ComboObj(output[ZONE_0]->GetLegacyOutput()->GetMassFlowIn(config_container[ZONE_0]->GetnMarker_TurboPerformance() - 1, config_container[ZONE_0]->GetnSpanWiseSections()));
     break;
   default:
     break;

From 79b61f209833eed2dfdddf18d3eaf28b9041b459 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 20:31:50 +0200
Subject: [PATCH 205/539] Fixed missing to_string replacement

---
 SU2_CFD/src/output_driver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 9357aa895815..1c7ce5249d2b 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -137,7 +137,7 @@ void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConf
         }
 
         /*--- Get the unique name for the averaged history data per solver ---*/
-        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + to_string(iSol);
+        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol);
 
         /*--- Compute the average and set the value for the solver iSol, zone iZone---*/
         avgsol = avgsol / nVar;

From 661d187ee623e2b90787343bc7fd505eab3cde21 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 23:01:19 +0200
Subject: [PATCH 206/539] Removed unnecessary arguments

---
 SU2_CFD/include/output/output.hpp             | 16 +++--
 SU2_CFD/include/output/output_fea.hpp         |  7 +--
 SU2_CFD/include/output/output_fea_discadj.hpp |  9 ++-
 SU2_CFD/include/output/output_flow.hpp        |  5 +-
 SU2_CFD/include/output/output_flow_adj.hpp    |  5 +-
 .../include/output/output_flow_discadj.hpp    | 23 +------
 SU2_CFD/include/output/output_flow_fem.hpp    |  5 +-
 SU2_CFD/include/output/output_flow_inc.hpp    |  5 +-
 .../output/output_flow_inc_discadj.hpp        | 24 +-------
 SU2_CFD/include/output/output_heat.hpp        | 23 +------
 SU2_CFD/src/iteration_structure.cpp           | 23 +++----
 SU2_CFD/src/output_adjoint_discrete.cpp       | 60 +++++--------------
 SU2_CFD/src/output_adjoint_discrete_inc.cpp   | 56 ++++-------------
 SU2_CFD/src/output_adjoint_elasticity.cpp     | 43 +++++++------
 SU2_CFD/src/output_adjoint_mean.cpp           | 29 +++++----
 SU2_CFD/src/output_direct_elasticity.cpp      | 27 +++------
 SU2_CFD/src/output_direct_heat.cpp            | 54 ++---------------
 SU2_CFD/src/output_direct_mean.cpp            | 60 +++++++++----------
 SU2_CFD/src/output_direct_mean_fem.cpp        | 23 ++++---
 SU2_CFD/src/output_direct_mean_inc.cpp        | 57 +++++++++---------
 SU2_CFD/src/output_structure.cpp              | 56 ++++++++---------
 21 files changed, 211 insertions(+), 399 deletions(-)

diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 70d7650b55a6..c79c6ceb21d2 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -250,7 +250,7 @@ class COutput {
   
   string VolumeFilename, SurfaceFilename, RestartFilename;
   
-  
+  unsigned long curr_TimeIter, curr_OuterIter, curr_InnerIter;
   
   
 public:
@@ -323,8 +323,7 @@ class COutput {
    * \param[in] timeused - Current number of clock tick in the computation (related with total time).
    * \param[in] val_nZone - iZone index.
    */
-  void SetConvHistory_Body(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-                              CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);  
+  void SetHistoryFile_Body(CGeometry *geometry, CSolver **solver_container, CConfig *config,unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIte);  
   
   /*! 
    * \brief Returns a pointer to the legacy output class needed for some old driver implementations.
@@ -939,7 +938,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem.
    * \param[in] dualtime - TODO: REMOVE PARAMETER
    */
-  void Postprocess_HistoryData(CConfig *config, bool dualtime);
+  void Postprocess_HistoryData(CConfig *config);
 
   /*!
    * \brief Postprocess_HistoryFields
@@ -960,7 +959,7 @@ class COutput {
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  virtual bool WriteHistoryFile_Output(CConfig *config);
   
   /*!
    * \brief Determines if the screen header should be written.
@@ -972,7 +971,7 @@ class COutput {
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  virtual bool WriteScreen_Output(CConfig *config);
 
   /*!
    * \brief LoadVolumeData
@@ -1007,7 +1006,7 @@ class COutput {
    * \param dualtime
    * \return 
    */
-  inline virtual bool SetUpdate_Averages(CConfig *config, bool dualtime){return false;}
+  inline virtual bool SetUpdate_Averages(CConfig *config){return false;}
   
   /*!
    * \brief LoadSurfaceData
@@ -1031,8 +1030,7 @@ class COutput {
    * \brief Load the output data to the containers in each subclass
    * \param[in] config - Definition of the particular problem.
    */
-  inline virtual void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-                                      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {}
+  inline virtual void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {}
 
   /*!
    * \brief SetHistoryOutputFields
diff --git a/SU2_CFD/include/output/output_fea.hpp b/SU2_CFD/include/output/output_fea.hpp
index 6a9124660aa5..8ff411a3c6a4 100644
--- a/SU2_CFD/include/output/output_fea.hpp
+++ b/SU2_CFD/include/output/output_fea.hpp
@@ -72,8 +72,7 @@ class CFEAOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
   /*!
    * \brief SetHistoryOutputFields
@@ -85,7 +84,7 @@ class CFEAOutput : public COutput {
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  bool WriteHistoryFile_Output(CConfig *config);
   
   /*!
    * \brief Determines if the screen header should be written.
@@ -97,7 +96,7 @@ class CFEAOutput : public COutput {
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  bool WriteScreen_Output(CConfig *config);
   
   /*!
    * \brief SetVolumeOutputFields
diff --git a/SU2_CFD/include/output/output_fea_discadj.hpp b/SU2_CFD/include/output/output_fea_discadj.hpp
index fe5c572e22d7..82f98634ab8f 100644
--- a/SU2_CFD/include/output/output_fea_discadj.hpp
+++ b/SU2_CFD/include/output/output_fea_discadj.hpp
@@ -71,14 +71,13 @@ class CDiscAdjFEAOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
+  bool WriteHistoryFile_Output(CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
@@ -90,11 +89,11 @@ class CDiscAdjFEAOutput : public COutput {
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  bool WriteScreen_Output(CConfig *config);
 
   /*!
    * \brief SetVolumeOutputFields
-   * \param config
+   * \param[in] config - Definition of the particular problem.
    */
   void SetVolumeOutputFields(CConfig *config);
 
diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index 32199701e08d..665f366a28bb 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -73,8 +73,7 @@ class CFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryDataa(CConfig *config, CGeometry *geometry, CSolver **solver);
   
   /*!
    * \brief LoadSurfaceData
@@ -130,6 +129,6 @@ class CFlowOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
   
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_adj.hpp b/SU2_CFD/include/output/output_flow_adj.hpp
index 69a93ccf1a06..ed3e9fc02e72 100644
--- a/SU2_CFD/include/output/output_flow_adj.hpp
+++ b/SU2_CFD/include/output/output_flow_adj.hpp
@@ -69,8 +69,7 @@ class CAdjFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
   
   /*!
    * \brief SetHistoryOutputFields
@@ -117,6 +116,6 @@ class CAdjFlowOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
   
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_discadj.hpp b/SU2_CFD/include/output/output_flow_discadj.hpp
index b0c1fb78b74b..b5dad834f3f9 100644
--- a/SU2_CFD/include/output/output_flow_discadj.hpp
+++ b/SU2_CFD/include/output/output_flow_discadj.hpp
@@ -68,30 +68,11 @@ class CDiscAdjFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
 
   void SetHistoryOutputFields(CConfig *config);
   
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
   /*!
    * \brief SetVolumeOutputFields
    * \param config
@@ -131,6 +112,6 @@ class CDiscAdjFlowOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
 
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_fem.hpp b/SU2_CFD/include/output/output_flow_fem.hpp
index 57135ee86dfa..6acf4907fd04 100644
--- a/SU2_CFD/include/output/output_flow_fem.hpp
+++ b/SU2_CFD/include/output/output_flow_fem.hpp
@@ -74,8 +74,7 @@ class CFlowFEMOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
   
   /*!
    * \brief LoadSurfaceData
@@ -133,6 +132,6 @@ class CFlowFEMOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
   
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/output_flow_inc.hpp
index 77c01a7c79f5..250d233b3086 100644
--- a/SU2_CFD/include/output/output_flow_inc.hpp
+++ b/SU2_CFD/include/output/output_flow_inc.hpp
@@ -70,8 +70,7 @@ class CIncFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
   /*!
    * \brief SetHistoryOutputFields
@@ -127,6 +126,6 @@ class CIncFlowOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
   
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_inc_discadj.hpp b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
index f05e3d259728..cbe203ae74d9 100644
--- a/SU2_CFD/include/output/output_flow_inc_discadj.hpp
+++ b/SU2_CFD/include/output/output_flow_inc_discadj.hpp
@@ -69,30 +69,10 @@ class CDiscAdjFlowIncOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
   void SetHistoryOutputFields(CConfig *config);
   
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
-
   /*!
    * \brief SetVolumeOutputFields
    * \param config
@@ -132,6 +112,6 @@ class CDiscAdjFlowIncOutput : public COutput {
    * \param dualtime
    * \return 
    */
-  bool SetUpdate_Averages(CConfig *config, bool dualtime);
+  bool SetUpdate_Averages(CConfig *config);
 
 };
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_heat.hpp b/SU2_CFD/include/output/output_heat.hpp
index 2b011f0772a1..1dd9e971347f 100644
--- a/SU2_CFD/include/output/output_heat.hpp
+++ b/SU2_CFD/include/output/output_heat.hpp
@@ -70,28 +70,7 @@ class CHeatOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst);
-
-
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config, bool write_dualtime);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config, bool write_dualtime);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
   
   /*!
    * \brief SetHistoryOutputFields
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 427516527381..08f06ec8e2e6 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -767,7 +767,7 @@ bool CFluidIteration::Monitor(COutput *output,
   StopCalc = integration_container[val_iZone][INST_0][FLOW_SOL]->GetConvergence();
 
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);    
+    output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
   }
   
   if (config_container[val_iZone]->GetCFL_Adapt() == YES) {
@@ -1403,7 +1403,7 @@ void CHeatIteration::Solve(COutput *output,
         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
     if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);    
+      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), Inner_Iter);
     }
     
     /*--- Output files at intermediate time positions if the problem is single zone ---*/
@@ -1520,7 +1520,7 @@ void CFEAIteration::Iterate(COutput *output,
 
         /*--- Write the convergence history (first, compute Von Mises stress) ---*/
         solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-        output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+        output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
         config_container[val_iZone]->SetInnerIter(IntIter);
         config_container[val_iZone]->SetIntIter(IntIter);
@@ -1555,7 +1555,8 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history headers ---*/
 
-      if (!disc_adj_fem) output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      if (!disc_adj_fem) output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+
 
       /*--- Run the first iteration ---*/
 
@@ -1565,7 +1566,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
       /*--- Run the second iteration ---*/
 
@@ -1578,7 +1579,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
 
       bool meetCriteria;
@@ -1604,7 +1605,7 @@ void CFEAIteration::Iterate(COutput *output,
 
           /*--- Write the convergence history (first, compute Von Mises stress) ---*/
           solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-          output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+          output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
           config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1669,7 +1670,7 @@ void CFEAIteration::Iterate(COutput *output,
 
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+            output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
             config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1684,7 +1685,7 @@ void CFEAIteration::Iterate(COutput *output,
           if (iIncrement < nIncrements - 1){
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+            output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
           }
 
         }
@@ -1850,7 +1851,7 @@ bool CFEAIteration::Monitor(COutput *output,
   solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
 
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-    output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, false, 0.0, val_iZone, val_iInst);
+    output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
   }
 
   return StopCalc;
@@ -2863,7 +2864,7 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
     /*--- Write the convergence history (only screen output) ---*/
 
    if(IntIter != nIntIter-1)
-      output->SetConvHistory_Body(geometry_container, solver_container, config_container, integration_container, true, 0.0, val_iZone, val_iInst);
+     output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
   }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 2801e75b991a..7ed38adb3165 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -184,26 +184,25 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+void CDiscAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
  
-  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
-  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
+  CSolver* adjflow_solver = solver[ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver[ADJTURB_SOL];  
+
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
 
-  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
-  
   SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
-  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+  if (geometry->GetnDim() == 3) {
     SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
   } else {
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+  if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -218,13 +217,13 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
   SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
   SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_Max(2)));
-  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+  if (geometry->GetnDim() == 3) {
     SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_Max(3)));
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(4)));
   } else {
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+  if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -241,7 +240,6 @@ void CDiscAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****so
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
-  SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
 
@@ -417,37 +415,6 @@ void CDiscAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
   
 }
 
-bool CDiscAdjFlowOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
-}
-
-bool CDiscAdjFlowOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = (config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0;
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-  return write_header;
-}
-
-bool CDiscAdjFlowOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
-  
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime ){
-    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetExtIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-  return write_output;
-}
 
 bool CDiscAdjFlowOutput::SetInit_Residuals(CConfig *config){
   
@@ -456,9 +423,10 @@ bool CDiscAdjFlowOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CDiscAdjFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CDiscAdjFlowOutput::SetUpdate_Averages(CConfig *config){
+  return false;
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
 
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index c7e6c9e575e7..cf7f077baaac 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -188,16 +188,15 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+void CDiscAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
   
-  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
-  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
-  CSolver* adjheat_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJHEAT_SOL];
+  CSolver* adjflow_solver = solver[ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver[ADJTURB_SOL];  
+  CSolver* adjheat_solver = solver[ADJHEAT_SOL];
   
-  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter()); 
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
   
   SetHistoryOutputValue("RMS_ADJ_PRESSURE", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_RMS(1)));
@@ -212,7 +211,7 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     if (nDim == 3) SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(4)));
     else           SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(3)));
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+  if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -237,7 +236,7 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
     if (nDim == 3) SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(3)));
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Disc()){  
+  if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -254,7 +253,6 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
-  SetHistoryOutputValue("PHYS_TIME", timeused);
 
 }
 
@@ -441,37 +439,6 @@ void CDiscAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry
   
 }
 
-bool CDiscAdjFlowIncOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
-}
-
-bool CDiscAdjFlowIncOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-  return write_header;
-}
-
-bool CDiscAdjFlowIncOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
-  
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime ){
-    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-  return write_output;
-}
 
 bool CDiscAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
@@ -480,9 +447,10 @@ bool CDiscAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CDiscAdjFlowIncOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CDiscAdjFlowIncOutput::SetUpdate_Averages(CConfig *config){
+  return false;
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
 
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output_adjoint_elasticity.cpp
index 5e8dff01bbd7..665b451f8aef 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output_adjoint_elasticity.cpp
@@ -100,11 +100,11 @@ CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
 
 }
 
-inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true; }
+inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
 
 inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { return true; }
 
-inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) { return true; }
+inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config) { return true; }
 
 void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
@@ -128,35 +128,32 @@ void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-inline void CDiscAdjFEAOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+inline void CDiscAdjFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
-  SetHistoryOutputValue("INT_ITER", config[val_iZone]->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetExtIter());
+  SetHistoryOutputValue("INT_ITER", config->GetIntIter());
+  SetHistoryOutputValue("EXT_ITER", config->GetExtIter());
 
-  SetHistoryOutputValue("TIME_ITER",  config[val_iZone]->GetTimeIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  
-  SetHistoryOutputValue("PHYS_TIME", timeused);
-  
-  SetHistoryOutputValue("ADJOINT_DISP_X", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0)));
-  SetHistoryOutputValue("ADJOINT_DISP_Y", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1)));
+  SetHistoryOutputValue("TIME_ITER",  config->GetTimeIter());
+  SetHistoryOutputValue("OUTER_ITER", config->GetOuterIter());
+  SetHistoryOutputValue("INNER_ITER", config->GetInnerIter());
+    
+  SetHistoryOutputValue("ADJOINT_DISP_X", log10(solver[ADJFEA_SOL]->GetRes_RMS(0)));
+  SetHistoryOutputValue("ADJOINT_DISP_Y", log10(solver[ADJFEA_SOL]->GetRes_RMS(1)));
   if (nVar_FEM == 3){
-    SetHistoryOutputValue("ADJOINT_DISP_Z", log10(solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(2)));    
+    SetHistoryOutputValue("ADJOINT_DISP_Z", log10(solver[ADJFEA_SOL]->GetRes_RMS(2)));    
   }
   su2double Total_SensE = 0.0; su2double Total_SensNu = 0.0;  
-  if (config[val_iZone]->GetnElasticityMod() == 1){
-    Total_SensE = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-    Total_SensNu = solver_container[val_iZone][INST_0][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+  if (config->GetnElasticityMod() == 1){
+    Total_SensE = solver[ADJFEA_SOL]->GetGlobal_Sens_E(0);
+    Total_SensNu = solver[ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
   }
   else{
     // TODO: Update this and change tests
-    for (unsigned short iVar = 0; iVar < config[val_iZone]->GetnElasticityMod(); iVar++){
-      Total_SensE += solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0)
-                    *solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_E(0);
-      Total_SensNu += solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
-                     *solver_container[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
+    for (unsigned short iVar = 0; iVar < config->GetnElasticityMod(); iVar++){
+      Total_SensE += solver[ADJFEA_SOL]->GetGlobal_Sens_E(0)
+                    *solver[ADJFEA_SOL]->GetGlobal_Sens_E(0);
+      Total_SensNu += solver[ADJFEA_SOL]->GetGlobal_Sens_Nu(0)
+                     *solver[ADJFEA_SOL]->GetGlobal_Sens_Nu(0);
     }
   Total_SensE = sqrt(Total_SensE);
   Total_SensNu = sqrt(Total_SensNu);
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output_adjoint_mean.cpp
index 274f4779da5f..9e717ea2024b 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output_adjoint_mean.cpp
@@ -182,26 +182,25 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
 }
 
-inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) { 
+inline void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
 
-  CSolver* adjflow_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL];
-  CSolver* adjturb_solver = solver_container[val_iZone][val_iInst][MESH_0][ADJTURB_SOL];  
+  CSolver* adjflow_solver = solver[ADJFLOW_SOL];
+  CSolver* adjturb_solver = solver[ADJTURB_SOL];  
+
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
 
-  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
-  
   SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
-  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+  if (geometry->GetnDim() == 3) {
     SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
   } else {
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Cont()){  
+  if (!config->GetFrozen_Visc_Cont()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -216,13 +215,13 @@ inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
   SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
   SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_Max(2)));
-  if (geometry[val_iZone][val_iInst][MESH_0]->GetnDim() == 3) {
+  if (geometry->GetnDim() == 3) {
     SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_Max(3)));
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(4)));
   } else {
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
-  if (!config[val_iZone]->GetFrozen_Visc_Cont()){  
+  if (!config->GetFrozen_Visc_Cont()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -239,7 +238,6 @@ inline void CAdjFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
-  SetHistoryOutputValue("PHYS_TIME", timeused);
 }
 
 void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
@@ -411,9 +409,10 @@ bool CAdjFlowOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config){
+  return false;
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
 
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output_direct_elasticity.cpp
index 6e9405819dd3..317f6ed3a4ed 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output_direct_elasticity.cpp
@@ -110,23 +110,14 @@ CFEAOutput::~CFEAOutput(void) {
 
 }
 
-void CFEAOutput::LoadHistoryData(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
-
-  CSolver* fea_solver = solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER",  config[val_iZone]->GetTimeIter());    
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  
-  SetHistoryOutputValue("PHYS_TIME", timeused);
+void CFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
+
+  CSolver* fea_solver = solver[FEA_SOL];
   
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+
   /*--- Residuals: ---*/
   /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
   /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/
@@ -259,7 +250,7 @@ void CFEAOutput::SetVolumeOutputFields(CConfig *config){
   
 }
 
-inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { return true;}
+inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config) { return true;}
 
 inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {  
   
@@ -273,7 +264,7 @@ inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {
   return write_header;
   
 }
-inline bool CFEAOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+inline bool CFEAOutput::WriteScreen_Output(CConfig *config) {
 
   bool write_output = true;
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index fa007b2365b2..31fae09ae5dd 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -88,55 +88,14 @@ CHeatOutput::~CHeatOutput(void) {
 
 }
 
-
-bool CHeatOutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-  return true;
- }
- else {
-   return false;
- }
-}
-
-bool CHeatOutput::WriteScreen_Header(CConfig *config) {  
-  bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
-  }
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
-  return write_header;
-}
-
-bool CHeatOutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
-  bool write_output = false;
+void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) ) 
-      && write_dualtime ){
-    write_output = (config->GetIntIter() % config->GetWrt_Con_Freq_DualTime() == 0);
-  }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = (config->GetInnerIter() % config->GetWrt_Con_Freq() == 0) ;    
-  } 
-
-  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
-}
-
-void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
-  
-  CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];  
-  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());
+  CSolver* heat_solver = solver[HEAT_SOL];  
   
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+
   SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
   SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
   SetHistoryOutputValue("AVG_TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
@@ -144,7 +103,6 @@ void CHeatOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
   SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
   SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
   
-  SetHistoryOutputValue("PHYS_TIME", timeused);
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
   
 }
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index 41fd27adcb02..ca861916ec1b 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -573,16 +573,15 @@ void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver
   }
 }
 
-void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+void CFlowOutput::LoadHistoryDataa(CConfig *config, CGeometry *geometry, CSolver **solver)  {
   
-  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
-  CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];
+  CSolver* flow_solver = solver[FLOW_SOL];
+  CSolver* turb_solver = solver[TURB_SOL];
   
-  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
-  SetHistoryOutputValue("PHYS_TIME", timeused);
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+
   
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
@@ -641,7 +640,7 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
@@ -657,30 +656,30 @@ void CFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_co
       SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
     
     SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
-    if (config[val_iZone]->GetAeroelastic_Simulation()){
-      SetHistoryOutputPerSurfaceValue("PITCH", config[val_iZone]->GetAeroelastic_pitch(iMarker_Monitoring), iMarker_Monitoring);
-      SetHistoryOutputPerSurfaceValue("PLUNGE", config[val_iZone]->GetAeroelastic_plunge(iMarker_Monitoring), iMarker_Monitoring);
+    if (config->GetAeroelastic_Simulation()){
+      SetHistoryOutputPerSurfaceValue("PITCH", config->GetAeroelastic_pitch(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("PLUNGE", config->GetAeroelastic_plunge(iMarker_Monitoring), iMarker_Monitoring);
     }
   }
   
-  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++) {  
-    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW",               config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_MACH",                   config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TEMP",                   config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_PRESS",                  config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",                config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",               config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",              config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("UNIFORMITY",                 config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",         config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",        config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",              config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",             config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",              config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++) {  
+    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW",               config->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MACH",                   config->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TEMP",                   config->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_PRESS",                  config->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",                config->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",               config->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",              config->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("UNIFORMITY",                 config->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",         config->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",        config->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",              config->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",             config->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",              config->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
   }
 }
 
@@ -720,9 +719,10 @@ bool CFlowOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CFlowOutput::SetUpdate_Averages(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+  return false;
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index 4b0d2f466a5d..7509c1976e5d 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -380,16 +380,14 @@ void CFlowFEMOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
 
 }
 
-void CFlowFEMOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+void CFlowFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
-  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER", config[val_iZone]->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());  
-  SetHistoryOutputValue("PHYS_TIME", timeused);
+  CSolver* flow_solver = solver[FLOW_SOL];
   
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
@@ -426,7 +424,7 @@ void CFlowFEMOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
@@ -444,7 +442,7 @@ void CFlowFEMOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver
     SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
   }
   
-  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
 }
@@ -485,9 +483,10 @@ bool CFlowFEMOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CFlowFEMOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CFlowFEMOutput::SetUpdate_Averages(CConfig *config){
+  return false;
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index cf40aba549cd..88b37d40c2a4 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -294,17 +294,16 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
-      CIntegration ****integration, bool DualTime, su2double timeused, unsigned short val_iZone, unsigned short val_iInst) {
+void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
-  CSolver* flow_solver = solver_container[val_iZone][val_iInst][MESH_0][FLOW_SOL];
-  CSolver* turb_solver = solver_container[val_iZone][val_iInst][MESH_0][TURB_SOL];  
-  CSolver* heat_solver = solver_container[val_iZone][val_iInst][MESH_0][HEAT_SOL];
-  
-  SetHistoryOutputValue("INNER_ITER", config[val_iZone]->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config[val_iZone]->GetOuterIter());    
-  //SetHistoryOutputValue("EXT_ITER", config[val_iZone]->GetOuterIter());
+  CSolver* flow_solver = solver[FLOW_SOL];
+  CSolver* turb_solver = solver[TURB_SOL];  
+  CSolver* heat_solver = solver[HEAT_SOL];
   
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+
   SetHistoryOutputValue("RMS_PRESSURE", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
@@ -366,13 +365,12 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
   if (nDim == 3)
     SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   
-  SetHistoryOutputValue("AOA", config[val_iZone]->GetAoA());
+  SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
-  SetHistoryOutputValue("PHYS_TIME", timeused);
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
   
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[val_iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
     SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
     SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
     if (nDim == 3)
@@ -387,22 +385,22 @@ inline void CIncFlowOutput::LoadHistoryData(CGeometry ****geometry, CSolver ****
       SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
   }
   
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[val_iZone]->GetnMarker_Analyze(); iMarker_Analyze++){
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
     
-    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", config[val_iZone]->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_MACH",     config[val_iZone]->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TEMP",     config[val_iZone]->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_PRESS",    config[val_iZone]->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",  config[val_iZone]->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",  config[val_iZone]->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",  config[val_iZone]->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("UNIFORMITY",  config[val_iZone]->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",  config[val_iZone]->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",  config[val_iZone]->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config[val_iZone]->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",  config[val_iZone]->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",  config[val_iZone]->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  config[val_iZone]->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", config->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_MACH",     config->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TEMP",     config->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_PRESS",    config->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",  config->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",  config->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",  config->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("UNIFORMITY",  config->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",  config->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",  config->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",  config->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",  config->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
+    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  config->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
     
     
   }
@@ -715,8 +713,9 @@ bool CIncFlowOutput::SetInit_Residuals(CConfig *config){
   
 }
 
-bool CIncFlowOutput::SetUpdate_Averages(CConfig *config, bool dualtime){
+bool CIncFlowOutput::SetUpdate_Averages(CConfig *config){
+  return false;
   
-  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
       
 }
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 68e1d0845331..a275485e8ae0 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -209,15 +209,16 @@ COutput::~COutput(void) {
 
 
 
-void COutput::SetConvHistory_Body(CGeometry ****geometry,
-                                     CSolver *****solver_container,
-                                     CConfig **config,
-                                     CIntegration ****integration,
-                                     bool DualTime_Iteration,
-                                     su2double timeused,
-                                     unsigned short val_iZone,
-                                     unsigned short val_iInst) {
+void COutput::SetHistoryFile_Body(CGeometry *geometry,
+                                  CSolver **solver_container,
+                                  CConfig *config,
+                                  unsigned long TimeIter,
+                                  unsigned long OuterIter,
+                                  unsigned long InnerIter) {
 
+  curr_TimeIter  = TimeIter;
+  curr_OuterIter = OuterIter;
+  curr_InnerIter = InnerIter;
 
   /*--- Output using only the master node ---*/
 
@@ -227,22 +228,21 @@ void COutput::SetConvHistory_Body(CGeometry ****geometry,
 
     /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
 
-    LoadHistoryData(geometry, solver_container, config, integration, DualTime_Iteration,
-                    timeused, val_iZone, val_iInst);
+    LoadHistoryData(config, geometry, solver_container);
     
-    Postprocess_HistoryData(config[val_iZone], DualTime_Iteration);
+    Postprocess_HistoryData(config);
         
     /*--- Write the history file ---------------------------------------------------------------------------*/
-    write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
-    if (write_history) SetHistoryFile_Output(config[val_iZone]);
+    write_history = WriteHistoryFile_Output(config);
+    if (write_history) SetHistoryFile_Output(config);
 
     /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = WriteScreen_Header(config[val_iZone]);
-    if (write_header) SetScreen_Header(config[val_iZone]);
+    write_header = WriteScreen_Header(config);
+    if (write_header) SetScreen_Header(config);
 
     /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = WriteScreen_Output(config[val_iZone], DualTime_Iteration);
-    if (write_screen) SetScreen_Output(config[val_iZone]);
+    write_screen = WriteScreen_Output(config);
+    if (write_screen) SetScreen_Output(config);
 
   }
 
@@ -5657,7 +5657,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   }
 }
 
-void COutput::Postprocess_HistoryData(CConfig *config, bool dualtime){
+void COutput::Postprocess_HistoryData(CConfig *config){
   
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
@@ -5668,7 +5668,7 @@ void COutput::Postprocess_HistoryData(CConfig *config, bool dualtime){
       SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
-      if(SetUpdate_Averages(config, dualtime)){
+      if(SetUpdate_Averages(config)){
         SetHistoryOutputValue("TAVG_" + HistoryOutput_List[iField], RunningAverages[HistoryOutput_List[iField]].Update(currentField.Value));
       }
       if (config->GetDirectDiff() != NO_DERIVATIVE){
@@ -5697,7 +5697,7 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
 bool COutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
   if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    write_header = ((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && config->GetInnerIter() == 0);
+    write_header = ((curr_InnerIter % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
@@ -5708,7 +5708,7 @@ bool COutput::WriteScreen_Header(CConfig *config) {
   return write_header;
 }
 
-bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
+bool COutput::WriteScreen_Output(CConfig *config) {
   bool write_output = false;
   
   write_output = config->GetnInner_Iter() - 1 == config->GetInnerIter();
@@ -5726,12 +5726,12 @@ bool COutput::WriteScreen_Output(CConfig *config, bool write_dualtime) {
   return write_output;
 }
 
-bool COutput::WriteHistoryFile_Output(CConfig *config, bool write_dualtime) { 
- if (!write_dualtime){
-   return true;
- }
- else {
-   return false;
- }
+bool COutput::WriteHistoryFile_Output(CConfig *config) { 
+// if (!write_dualtime){
+//   return true;
+// }
+// else {
+//   return false;
+// }
 }
 

From b098beb8c472bcf346d8992e5cffa55ed175564c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 23:01:39 +0200
Subject: [PATCH 207/539] Fix indentation

---
 TestCases/serial_regression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index dc3c0aaaaa0d..1dfefd124ee9 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1115,7 +1115,7 @@ def main():
     ### RUN TESTS                      ###
     ######################################  
 
-   pass_list = [ test.run_test() for test in test_list ]
+    pass_list = [ test.run_test() for test in test_list ]
 
     
     ######################################

From c81fedad9b839507fde63db09e5a942156cce9b6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sat, 13 Apr 2019 23:36:02 +0200
Subject: [PATCH 208/539] Again a small fix

---
 SU2_CFD/include/output/output_flow.hpp | 2 +-
 SU2_CFD/src/output_direct_mean.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index 665f366a28bb..f5ed1dccfcea 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -73,7 +73,7 @@ class CFlowOutput : public COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryDataa(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
   
   /*!
    * \brief LoadSurfaceData
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index ca861916ec1b..f28661ff8ef5 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -573,7 +573,7 @@ void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver
   }
 }
 
-void CFlowOutput::LoadHistoryDataa(CConfig *config, CGeometry *geometry, CSolver **solver)  {
+void CFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
   
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];

From 2b2ebc5e0de02085ed56b588b6d70e839abdfba2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Apr 2019 09:37:45 +0200
Subject: [PATCH 209/539] Modifications to the driver output

---
 SU2_CFD/include/output/output.hpp        |  93 +++--
 SU2_CFD/include/output/output_driver.hpp | 116 +------
 SU2_CFD/src/driver_direct_multizone.cpp  |   2 +-
 SU2_CFD/src/driver_structure.cpp         |   4 +-
 SU2_CFD/src/iteration_structure.cpp      |  22 +-
 SU2_CFD/src/output_direct_heat.cpp       |   1 +
 SU2_CFD/src/output_driver.cpp            | 415 ++++++++++++-----------
 SU2_CFD/src/output_structure.cpp         | 333 +++++++++++-------
 8 files changed, 528 insertions(+), 458 deletions(-)

diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index c79c6ceb21d2..ee3c88724beb 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -248,7 +248,7 @@ class COutput {
   
   bool multizone, grid_movement, fem_output;
   
-  string VolumeFilename, SurfaceFilename, RestartFilename;
+  string VolumeFilename, SurfaceFilename, RestartFilename, HistoryFilename;
   
   unsigned long curr_TimeIter, curr_OuterIter, curr_InnerIter;
   
@@ -313,17 +313,26 @@ class COutput {
    */
   void PreprocessHistoryOutput(CConfig *config);  
   
-  /*! 
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
+  /*!
+   * \brief Preprocess the history output by setting the history fields and opening the history file.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
    */
-  void SetHistoryFile_Body(CGeometry *geometry, CSolver **solver_container, CConfig *config,unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIte);  
+  void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config);  
+  
+  
+  /*!
+   * \brief SetHistory_Output
+   * \param geometry
+   * \param solver_container
+   * \param config
+   * \param TimeIter
+   * \param OuterIter
+   * \param InnerIter
+   */
+  void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config,unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter);  
+  
+  
+  void SetMultizoneHistory_Output(COutput** output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter);
   
   /*! 
    * \brief Returns a pointer to the legacy output class needed for some old driver implementations.
@@ -381,19 +390,44 @@ class COutput {
    */
   void SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone);  
   
+  /*!
+   * \brief Set the current iteration indices
+   * \param[in] TimeIter  - Timer iteration index
+   * \param[in] OuterIter - Outer iteration index
+   * \param[in] InnerIter - Inner iteration index
+   */
+  inline void SetIteration(unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter){
+    curr_TimeIter  = TimeIter;
+    curr_OuterIter = OuterIter;
+    curr_InnerIter = InnerIter;
+  }
+  
+  su2double GetHistoryFieldValue(string field){
+    return HistoryOutput_Map[field].Value;
+  }
+  
+  vector<HistoryOutputField> GetHistoryGroup(string groupname){
+    vector<HistoryOutputField> HistoryGroup;  
+    for (unsigned short iField = 0; iField < HistoryOutput_Map.size(); iField++){   
+      if (HistoryOutput_Map[HistoryOutput_List[iField]].OutputGroup == groupname){
+        HistoryGroup.push_back((HistoryOutput_Map[HistoryOutput_List[iField]]));
+      }
+    }
+    return HistoryGroup;
+  }
+  
+  vector<string> GetHistoryOutput_List(){
+    return HistoryOutput_List;
+  }
+  
+  map<string, HistoryOutputField> GetHistoryFields(){
+    return HistoryOutput_Map;
+  }
+  
 protected:
   
   /*----------------------------- Protected member functions ----------------------------*/  
 
-  /*!
-   * \brief Write a native SU2 restart file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - Flow, adjoint or linearized solution.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetRestart(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-
   /*!
    * \brief Write a native SU2 restart file (ASCII) in parallel.
    * \param[in] config - Definition of the particular problem.
@@ -924,6 +958,12 @@ class COutput {
     }
   }
   
+  /*!
+   * \brief CheckHistoryOutput
+   */
+  void CheckHistoryOutput();
+  
+  void PrepareHistoryFile(CConfig *config);
 
   /*!
    * \brief Load up the values of the requested volume fields into ::Local_Data array. 
@@ -1032,11 +1072,26 @@ class COutput {
    */
   inline virtual void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {}
 
+  /*!
+   * \brief Load the output data to the containers in each subclass
+   * \param[in] config - Definition of the particular problem.
+   */
+  inline virtual void LoadMultizoneHistoryData(COutput **output, CConfig **config) {}  
+  
   /*!
    * \brief SetHistoryOutputFields
    * \param config
    */
   inline virtual void SetHistoryOutputFields(CConfig *config) {}
   
+  /*!
+   * \brief SetMultizoneHistoryOutputFields
+   * \param output
+   * \param solver
+   * \param config
+   */
+  inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
+
+  
 };
 
diff --git a/SU2_CFD/include/output/output_driver.hpp b/SU2_CFD/include/output/output_driver.hpp
index ea119ddd0156..664584dea76f 100644
--- a/SU2_CFD/include/output/output_driver.hpp
+++ b/SU2_CFD/include/output/output_driver.hpp
@@ -60,146 +60,50 @@ using namespace std;
  * \brief Class for writing the multizone output.
  * \author R. Sanchez, T. Albring.
  */
-class CDriverOutput {
+class CDriverOutput : public COutput {
 
 protected:
-
-  int rank, 	  /*!< \brief MPI Rank. */
-  size;       	/*!< \brief MPI Size. */
-
   unsigned short nZone;
-
-  unsigned short field_width;         /*!< \brief Width of each column for the screen output (hardcoded for now) */
-
-
-  /** \brief Enum to identify the screen output format. */
-  enum ScreenOutputFormat {
-    FORMAT_INTEGER,         /*!< \brief Integer format. Example: 34 */
-    FORMAT_FIXED,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
-    FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */
-  };
-
-  enum HistoryFieldType {
-    TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
-    TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
-    TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */
-  };
-
-  string HistorySep;                  /*!< \brief Character which separates values in the history file */
-
-  /** \brief Structure to store information for a history output field.
-   *
-   *  The stored information is printed to the history file and to screen.
-   * Each individual instance represents a single field (i.e. column) in the history file or on screen.
-   */
-  struct HistoryOutputField {
-    string              FieldName;    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
-    su2double           Value;        /*!< \brief The value of the field. */
-    unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
-    string              OutputGroup;  /*!< \brief The group this field belongs to. */
-    unsigned short      FieldType;
-    HistoryOutputField() {}           /*!< \brief Default constructor. */
-    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype):
-      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype){}
-  };
-
-  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */
-  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */
-
-  std::vector<string> RequestedHistoryFields;
-  unsigned short nRequestedHistoryFields;
-  std::vector<string> RequestedScreenFields;
-  unsigned short nRequestedScreenFields;
-  char char_histfile[200];
-
-  ofstream HistFile;
-
-  PrintingToolbox::CTablePrinter* OuterConvergenceTable;
-
-  std::string MultiZoneHeaderString;
-
-  std::map<string, su2double> Init_Residuals;
-
-  map<string, Signal_Processing::RunningAverage> RunningAverages;
-
+  
+  string bgs_res_name;
+  bool write_zone;
+  
 public:
 
   /*!
    * \brief Constructor of the class.
    */
-  CDriverOutput(CConfig **config);
+  CDriverOutput(CConfig *driver_config, CConfig** config);
 
   /*!
    * \brief Destructor of the class.
    */
   virtual ~CDriverOutput(void);
 
-  /*!
-   * \brief Write the header of the screen and history file.
-   * \param[in] config - Definition of the particular problem.
-   */
-
-  void SetHeader(COutput **output, CSolver *****solver, CConfig **config);
-
-  /*!
-   * \brief Write the history file and the convergence on the screen for multizone computations.
-   * \param[in] output - Output information of the particular multizone problem.
-   * \param[in] config - Definition of the particular multizone problem.
-   */
-  void SetBody(COutput **output, CSolver *****solver, CConfig *driver_config, CConfig **config);
-
   /*!
    * \brief Load the history file fields for multizone computations.
    * \param[in] output - Output information of the particular multizone problem.
    * \param[in] config - Definition of the particular multizone problem.
    */
-  void LoadHistoryData(COutput **output, CSolver *****solver, CConfig *config);
+  void LoadMultizoneHistoryData(COutput **output, CConfig **config);
 
   /*!
    * \brief Write the history output fields for multizone computations.
    * \param[in] output - Output information of the particular multizone problem.
    * \param[in] config - Definition of the particular multizone problem.
    */
-  void SetHistoryOutputFields(COutput **output, CSolver *****solver, CConfig **config);
-
-  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname , unsigned short field_type = TYPE_DEFAULT){
-    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
-    HistoryOutput_List.push_back(name);
-  }
-
-  inline void SetHistoryOutputValue(string name, su2double value){
-    if (HistoryOutput_Map.count(name) > 0){
-      HistoryOutput_Map[name].Value = value;
-    } else {
-      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
-    }
-  }
-
-  /*! TODO
-   * \brief SetScreen_Header
-   * \param driver_config
-   * \param config
-   */
-  void SetScreen_Header(CConfig *driver_config, CConfig **config);
-
-  /*! TODO
-   * \brief SetScreen_Output
-   * \param output
-   * \param driver_config
-   * \param config
-   */
-  void SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config);
+  void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config);
 
   /*! 
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Header(CConfig *driver_config, CConfig **config);
+  bool WriteScreen_Header(CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Output(CConfig *driver_config, CConfig **config);
+  bool WriteScreen_Output(CConfig *config);
 
 };
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 54ac3d9ef4ff..540a42976d86 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -472,7 +472,7 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
   }
 
   /*--- Print out the convergence data to screen and history file ---*/
-  driver_output->SetBody(output, solver_container, driver_config, config_container);
+  driver_output->SetMultizoneHistory_Output(output, config_container, driver_config->GetTimeIter(), driver_config->GetOuterIter());
 
   if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 2dfadcfa1559..64d6c0c1a02b 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3734,8 +3734,8 @@ void CDriver::Output_Preprocessing(){
   }
 
   if (driver_config->GetMultizone_Problem()){
-    driver_output = new CDriverOutput(config_container);
-    driver_output->SetHistoryOutputFields(output, solver_container, config_container);
+    driver_output = new CDriverOutput(driver_config, config_container);
+    driver_output->PreprocessMultizoneHistoryOutput(output, config_container);
   }
   
 }
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 08f06ec8e2e6..28bea2a96261 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -767,7 +767,7 @@ bool CFluidIteration::Monitor(COutput *output,
   StopCalc = integration_container[val_iZone][INST_0][FLOW_SOL]->GetConvergence();
 
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-    output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
+    output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
   }
   
   if (config_container[val_iZone]->GetCFL_Adapt() == YES) {
@@ -1403,7 +1403,7 @@ void CHeatIteration::Solve(COutput *output,
         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
     if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), Inner_Iter);
+      output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), Inner_Iter);
     }
     
     /*--- Output files at intermediate time positions if the problem is single zone ---*/
@@ -1520,7 +1520,7 @@ void CFEAIteration::Iterate(COutput *output,
 
         /*--- Write the convergence history (first, compute Von Mises stress) ---*/
         solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-        output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+        output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
         config_container[val_iZone]->SetInnerIter(IntIter);
         config_container[val_iZone]->SetIntIter(IntIter);
@@ -1555,7 +1555,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history headers ---*/
 
-      if (!disc_adj_fem) output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+      if (!disc_adj_fem) output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
 
       /*--- Run the first iteration ---*/
@@ -1566,7 +1566,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+      output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
       /*--- Run the second iteration ---*/
 
@@ -1579,7 +1579,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
       solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-      output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+      output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
 
       bool meetCriteria;
@@ -1605,7 +1605,7 @@ void CFEAIteration::Iterate(COutput *output,
 
           /*--- Write the convergence history (first, compute Von Mises stress) ---*/
           solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-          output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+          output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
           config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1670,7 +1670,7 @@ void CFEAIteration::Iterate(COutput *output,
 
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+            output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
             config_container[val_iZone]->SetIntIter(IntIter);
 
@@ -1685,7 +1685,7 @@ void CFEAIteration::Iterate(COutput *output,
           if (iIncrement < nIncrements - 1){
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
             solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
-            output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+            output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
           }
 
         }
@@ -1851,7 +1851,7 @@ bool CFEAIteration::Monitor(COutput *output,
   solver_container[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry_container[val_iZone][val_iInst][MESH_0], solver_container[val_iZone][val_iInst][MESH_0], numerics_container[val_iZone][val_iInst][MESH_0][FEA_SOL], config_container[val_iZone]);
 
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-    output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
+    output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
   }
 
   return StopCalc;
@@ -2864,7 +2864,7 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
     /*--- Write the convergence history (only screen output) ---*/
 
    if(IntIter != nIntIter-1)
-     output->SetHistoryFile_Body(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
+     output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
   }
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 31fae09ae5dd..28cca703ab00 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -110,6 +110,7 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
 
 void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
+  AddHistoryOutput("TIME_ITER",   "Time_Iter",  FORMAT_INTEGER, "ITER");
   AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
   AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
   
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index 1c7ce5249d2b..a808e98207d4 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -37,252 +37,279 @@
 
 #include "../include/output/output_driver.hpp"
 
-CDriverOutput::CDriverOutput(CConfig **config) {
+CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput(driver_config) {
 
-  
+  unsigned short iZone = 0;
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
-  nZone = config[ZONE_0]->GetnZone();
-
-  OuterConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
-
-  nRequestedScreenFields = 0;
-  nRequestedHistoryFields = 0;
+  nZone = driver_config->GetnZone();
 
   field_width = 12;
+  
+  bgs_res_name = "BGS_RES";
+  
+  write_zone = false;
 
-}
-
-CDriverOutput::~CDriverOutput() {
+  /*--- If the zone output is disabled for every zone ---*/
+  for (iZone = 0; iZone < nZone; iZone++){
+    write_zone = config[iZone]->GetWrt_ZoneConv();
+  }
 
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    for (iZone = 0; iZone < nZone; iZone++){
+      RequestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");
+    }
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  
+  
 
+ 
+  MultiZoneHeaderString = "Multizone Summary";
+  
+  HistoryFilename = "multizone_history";
+      
 }
 
-void CDriverOutput::SetHeader(COutput **output, CSolver *****solver, CConfig **config) {
+CDriverOutput::~CDriverOutput() {
 
 
 }
 
-void CDriverOutput::SetBody(COutput **output, CSolver *****solver, CConfig *driver_config, CConfig **config) {
-
-  /*--- Output using only the master node ---*/
-
-  if (rank == MASTER_NODE) {
-
-    bool write_header, write_screen;
-
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-
-    LoadHistoryData(output, solver, driver_config);
-
-    /*--- Write the history file ---------------------------------------------------------------------------*/
-    //write_history = WriteHistoryFile_Output(config[val_iZone], DualTime_Iteration);
-    //if (write_history) SetHistoryFile_Output(config[val_iZone]);
-
-    /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = WriteScreen_Header(driver_config, config);
-    if (write_header) SetScreen_Header(driver_config, config);
 
-    /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = WriteScreen_Output(driver_config, config);
-    if (write_screen) SetScreen_Output(output, driver_config, config);
+void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config) {
 
-  }
-
-
-}
-
-void CDriverOutput::LoadHistoryData(COutput **output, CSolver *****solver, CConfig *driver_config) {
-
-  unsigned short iZone, iSol, iVar;
-  unsigned short nVar, nVar_Zone;
+  unsigned short iZone, iField, nField;
   string name, header;
-  su2double val, avgsol, avgzone;
+  su2double val, avgzone;
 
-  if (driver_config->GetTime_Domain()){
-    SetHistoryOutputValue("TIME_ITER", driver_config->GetTimeIter());
+  if (config[ZONE_0]->GetTime_Domain()){
+    SetHistoryOutputValue("TIME_ITER", curr_TimeIter);
   }
-  SetHistoryOutputValue("OUTER_ITER", driver_config->GetOuterIter());
-
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter);
+  
+  
   for (iZone = 0; iZone < nZone; iZone++){
+    
+    map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
+    vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
+    
+    nField = ZoneHistoryFields.size();
+    
+    
+    /*-- For all the variables per solver --*/
+    for (iField = 0; iField < nField; iField++){
+      
+      if (ZoneHistoryNames[iField] != "TIME_ITER" && ZoneHistoryNames[iField] != "OUTER_ITER"){
+        
+        name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
+        
+        SetHistoryOutputValue(name, ZoneHistoryFields[ZoneHistoryNames[iField]].Value);
 
-    /*--- Initialize values per zone ---*/
-    nVar_Zone = 0;
-    avgzone = 0.0;
-
-    /*--- Accounting for all the solvers ---*/
-    for (iSol = 0; iSol < MAX_SOLS; iSol++){
-      /*-- If the solver position iSol is enabled --*/
-      if (solver[iZone][INST_0][MESH_0][iSol] != NULL){
-
-        /*---Initialize values per solver ---*/
-        nVar = solver[iZone][INST_0][MESH_0][iSol]->GetnVar();
-        avgsol = 0.0;
+      }
+    }
+  }
 
-        /*-- For all the variables per solver --*/
-        for (iVar = 0; iVar < nVar; iVar++){
+//  for (iZone = 0; iZone < nZone; iZone++){
+
+//    /*--- Initialize values per zone ---*/
+//    nVar_Zone = 0;
+//    avgzone = 0.0;
+    
+//    InnerIter = output[iZone]->GetHistoryFieldValue("INNER_ITER");
+    
+//    name = string("INNER_ITER") + "_" + PrintingToolbox::to_string(iZone);
+    
+//    SetHistoryOutputValue(name, InnerIter);
+    
+//    vector<HistoryOutputField> BGSGroup = output[iZone]->GetHistoryGroup("BGS_RES");   
+    
+        
+//    nField = BGSGroup.size();
+    
+//    for (iField = 0; iField < nField; iField++){
+      
+//      name = BGSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
+      
+//      val = BGSGroup[iField].Value;
+      
+//      SetHistoryOutputValue(name, val);
+      
+//      /*--- Add values to averages ---*/
+//      avgzone += val;
+//      nVar_Zone++;
+      
+//    }
+
+//    /*--- Get an unique name for the averaged history data per zone ---*/
+//    name = "ZONE" + PrintingToolbox::to_string(iZone);
+
+//    /*--- Compute the average and set the value for the zone iZone---*/
+//    avgzone = avgzone / nVar_Zone;
+//    SetHistoryOutputValue(name, avgzone);
+    
+//    vector<HistoryOutputField> RMSGroup = output[iZone]->GetHistoryGroup("RMS_RES");        
+        
+//    nField = RMSGroup.size();
+    
+//    for (iField = 0; iField < nField; iField++){
+      
+//      name = RMSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
+      
+//      val = RMSGroup[iField].Value;
+      
+//      SetHistoryOutputValue(name, val);
+      
+//    }
+
+//  }
 
-          /*--- Get the unique name for the history data ---*/
-          name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol) + "_VAL" + PrintingToolbox::to_string(iVar);
 
-          /*--- Set the value of the BGS residual for the variable iVar, solver iSol, zone iZone ---*/
-          val = log10(solver[iZone][INST_0][MESH_0][iSol]->GetRes_BGS(iVar));
-          SetHistoryOutputValue(name, val);
+}
 
-          /*--- Add values to averages ---*/
-          avgsol += val;
-          avgzone += val;
-          nVar_Zone++;
+void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {
+  
+  unsigned short iZone, iField, nField;
+  string name, header, group;
+  
+  if (nRequestedScreenFields == 0){
+    if (config[ZONE_0]->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
+    RequestedScreenFields.push_back("OUTER_ITER");
+    
+    for (iZone = 0; iZone < nZone; iZone++){
+      
+      map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
+      vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
+      nField = ZoneHistoryFields.size();
+      
+      for (iField = 0; iField < nField; iField++){
+        
+        if (ZoneHistoryFields[ZoneHistoryNames[iField]].OutputGroup == bgs_res_name){
+          
+          name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
+          
+          RequestedScreenFields.push_back(name);
+          
+          break;
+          
         }
-
-        /*--- Get the unique name for the averaged history data per solver ---*/
-        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol);
-
-        /*--- Compute the average and set the value for the solver iSol, zone iZone---*/
-        avgsol = avgsol / nVar;
-        SetHistoryOutputValue(name, avgsol);
-
       }
-
     }
-
-    /*--- Get an unique name for the averaged history data per zone ---*/
-    name = "ZONE" + PrintingToolbox::to_string(iZone);
-
-    /*--- Compute the average and set the value for the zone iZone---*/
-    avgzone = avgzone / nVar_Zone;
-    SetHistoryOutputValue(name, avgzone);
-
+    
+    nRequestedScreenFields = RequestedScreenFields.size();
   }
-
-
-}
-
-void CDriverOutput::SetHistoryOutputFields(COutput **output, CSolver *****solver, CConfig **config) {
-
-  unsigned short iZone, iSol, iVar;
-  unsigned short iReqField;
-  string name, header;
   
   if (config[ZONE_0]->GetTime_Domain()){
     AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
-    RequestedScreenFields.push_back("TIME_ITER"); RequestedHistoryFields.push_back("TIME_ITER");
   }
   AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER");
-  RequestedScreenFields.push_back("OUTER_ITER"); RequestedHistoryFields.push_back("OUTER_ITER");
-
+  
+  
   /*--- Set the fields ---*/
   for (iZone = 0; iZone < nZone; iZone++){
-
-    /*--- Accounting for all the solvers ---*/
-    for (iSol = 0; iSol < MAX_SOLS; iSol++){
-      /*-- If the solver position iSol is enabled --*/
-      if (solver[iZone][INST_0][MESH_0][iSol] != NULL){
-        /*-- For all the variables per solver --*/
-        for (iVar = 0; iVar < solver[iZone][INST_0][MESH_0][iSol]->GetnVar(); iVar++){
-
-          /*--- Set an unique name for the history data ---*/
-          name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol) + "_VAL" + PrintingToolbox::to_string(iVar);
-          /*--- Set an unique name for the history headers ---*/
-          header = "res[" + PrintingToolbox::to_string(iZone) + "][" + PrintingToolbox::to_string(iSol) + "][" + PrintingToolbox::to_string(iVar) + "]";
-
-          AddHistoryOutput(name, header, FORMAT_FIXED,  "VAR_RES", TYPE_RESIDUAL);
-
-          /*--- Request the variable residual for history output ---*/
-          RequestedHistoryFields.push_back(name);
-        }
-
-        /*--- Set an unique name for the averaged history data per solver ---*/
-        name = "ZONE" + PrintingToolbox::to_string(iZone) + "_SOL" + PrintingToolbox::to_string(iSol);
-        /*--- Set an unique name for the history headers of the averaged data per solver ---*/
-        header = solver[iZone][INST_0][MESH_0][iSol]->GetSolverName();
-        header += "[" + PrintingToolbox::to_string(iZone) + "]";
-
-        /*--- Add the average residual of the current solver to output ---*/
-        AddHistoryOutput(name, header, FORMAT_FIXED,  "SOL_AVGRES", TYPE_RESIDUAL);
-
-        /*--- Request the average residual for screen output ---*/
-        RequestedScreenFields.push_back(name);
-
+    
+    map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
+    vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
+    
+    nField = ZoneHistoryFields.size();
+    
+    
+    /*-- For all the variables per solver --*/
+    for (iField = 0; iField < nField; iField++){
+      
+      if (ZoneHistoryNames[iField] != "TIME_ITER" && ZoneHistoryNames[iField] != "OUTER_ITER"){
+        
+        name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
+        header = ZoneHistoryFields[ZoneHistoryNames[iField]].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
+        group  = ZoneHistoryFields[ZoneHistoryNames[iField]].OutputGroup + "[" + PrintingToolbox::to_string(iZone) + "]";
+        
+        AddHistoryOutput(name, header, ZoneHistoryFields[ZoneHistoryNames[iField]].ScreenFormat, group, ZoneHistoryFields[ZoneHistoryNames[iField]].FieldType );
       }
     }
-
-    /*--- Set an unique name for the averaged history data ---*/
-    name = "ZONE" + PrintingToolbox::to_string(iZone);
-    /*--- Set an unique name for the history headers of the averaged data ---*/
-    header = "avgres[" + PrintingToolbox::to_string(iZone) + "]";
-
-    AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
-  }
-
-  /*--- Retrieve number of requested fields ---*/
-  nRequestedScreenFields = RequestedScreenFields.size();
-  nRequestedHistoryFields = RequestedHistoryFields.size();
-
-  string RequestedField;
-
-  /*--- Set screen convergence output header ---*/
-  for (iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-    RequestedField = RequestedScreenFields[iReqField];
-    if (HistoryOutput_Map.count(RequestedField) > 0){
-      OuterConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
-    } else {
-      SU2_MPI::Error(string("Requested screen output field not found: ") + RequestedField, CURRENT_FUNCTION);
-    }
   }
 
+//  /*--- Set the fields ---*/
+//  for (iZone = 0; iZone < nZone; iZone++){
+    
+//    InnerIter = output[iZone]->GetHistoryFieldValue("INNER_ITER");
+    
+//    name   = string("INNER_ITER") + "_" + PrintingToolbox::to_string(iZone);
+//    header = string("Inner_Iter") + "[" + PrintingToolbox::to_string(iZone) + "]";
+    
+//    AddHistoryOutput(name, header, FORMAT_INTEGER, "ITER");
+    
+////    RequestedScreenFields.push_back(name);
+    
+//    vector<HistoryOutputField> BGSGroup = output[iZone]->GetHistoryGroup("BGS_RES");        
+    
+//    nField = BGSGroup.size();
+ 
+//    /*-- For all the variables per solver --*/
+//    for (iField = 0; iField < nField; iField++){
+      
+//      /*--- Set an unique name for the history data ---*/
+//      name   = BGSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
+      
+//      header = BGSGroup[iField].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
+
+//      AddHistoryOutput(name, header, FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+      
+//      /*--- Request the variable residual for history output ---*/
+//      RequestedScreenFields.push_back(name);
+//    }
+
+//    vector<HistoryOutputField> RMSGroup = output[iZone]->GetHistoryGroup("RMS_RES");
+//    nField = RMSGroup.size();
+    
+//    /*-- For all the variables per solver --*/
+//    for (iField = 0; iField < nField; iField++){
+      
+//      /*--- Set an unique name for the history data ---*/
+//      name   = RMSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
+      
+//      header = RMSGroup[iField].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
+
+//      AddHistoryOutput(name, header, FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+      
+//      /*--- Request the variable residual for history output ---*/
+////      RequestedScreenFields.push_back(name);
+//    }
+    
+
+    
+ 
+//    /*--- Set an unique name for the averaged history data ---*/
+//    name = "ZONE" + PrintingToolbox::to_string(iZone);
+//    /*--- Set an unique name for the history headers of the averaged data ---*/
+//    header = "avgres[" + PrintingToolbox::to_string(iZone) + "]";
+
+//    AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
+//  }
+  
+//  RequestedHistoryFields.push_back("BGS_RES");
+//  RequestedHistoryFields.push_back("RMS_RES");
+//  RequestedHistoryFields.push_back("ZONE_AVGRES");
+  
+//  /*--- Retrieve number of requested fields ---*/
+//  nRequestedScreenFields = RequestedScreenFields.size();
+//  nRequestedHistoryFields = RequestedHistoryFields.size();
 
-}
-
-void CDriverOutput::SetScreen_Header(CConfig *driver_config, CConfig **config) {
-
-  OuterConvergenceTable->PrintHeader();
-
-}
-
-
-void CDriverOutput::SetScreen_Output(COutput **output, CConfig *driver_config, CConfig **config) {
-
-  string RequestedField;
 
-  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-    stringstream out;
-    RequestedField = RequestedScreenFields[iReqField];
-    if (HistoryOutput_Map.count(RequestedField) > 0){
-      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
-        case FORMAT_INTEGER:
-          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
-          break;
-        case FORMAT_FIXED:
-          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
-          break;
-        case FORMAT_SCIENTIFIC:
-          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
-          break;
-      }
-    }
-    (*OuterConvergenceTable) << out.str();
-  }
 }
 
-inline bool CDriverOutput::WriteScreen_Header(CConfig *driver_config, CConfig **config) {
-
-  unsigned short iZone;
-  bool write_header = true, write_zone = false;
+inline bool CDriverOutput::WriteScreen_Header(CConfig *config) {
 
-  /*--- If the zone output is disabled for every zone ---*/
-  for (iZone = 0; iZone < nZone; iZone++){
-    write_zone = config[iZone]->GetWrt_ZoneConv();
-  }
+  bool write_header = true;
 
   /*--- If the outer iteration is zero ---*/
-  write_header = (write_header && (driver_config->GetOuterIter() == 0)) || write_zone;
+  write_header = (write_header && (curr_OuterIter == 0)) || write_zone;
 
   return write_header;
 
 }
-inline bool CDriverOutput::WriteScreen_Output(CConfig *driver_config, CConfig **config) {
+inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
 
   bool write_output = true;
 
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index a275485e8ae0..4aa59cd412cd 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -57,8 +57,20 @@ COutput::COutput(CConfig *config) {
   SurfaceFilename = "surface";
   VolumeFilename  = "volume";
   RestartFilename = "restart";
-
-  unsigned short iDim, iZone, iSpan, iMarker;
+  
+  /*--- Retrieve the history filename ---*/
+ 
+  HistoryFilename = config->GetConv_FileName();
+  
+  /*--- Append the zone ID ---*/
+ 
+ if(config->GetnZone() > 1){
+   HistoryFilename = config->GetMultizone_HistoryFileName(HistoryFilename, config->GetiZone());
+ }
+ 
+  HistorySep = ","; 
+  
+  unsigned short iZone;
   
   /*--- Initialize point and connectivity counters to zero. ---*/
   
@@ -209,7 +221,7 @@ COutput::~COutput(void) {
 
 
 
-void COutput::SetHistoryFile_Body(CGeometry *geometry,
+void COutput::SetHistory_Output(CGeometry *geometry,
                                   CSolver **solver_container,
                                   CConfig *config,
                                   unsigned long TimeIter,
@@ -247,7 +259,36 @@ void COutput::SetHistoryFile_Body(CGeometry *geometry,
   }
 
 }
+void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter){
+  
+  curr_TimeIter  = TimeIter;
+  curr_OuterIter = OuterIter;
+  
+  /*--- Output using only the master node ---*/
+
+  if (rank == MASTER_NODE) {
+
+    bool write_header, write_screen, write_history;
+
+    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+
+    LoadMultizoneHistoryData(output, config);
+
+    /*--- Write the history file ---------------------------------------------------------------------------*/
+    write_history = WriteHistoryFile_Output(config[ZONE_0]);
+    if (write_history) SetHistoryFile_Output(config[ZONE_0]);
+
+    /*--- Write the screen header---------------------------------------------------------------------------*/
+    write_header = WriteScreen_Header(config[ZONE_0]);
+    if (write_header) SetScreen_Header(config[ZONE_0]);
 
+    /*--- Write the screen output---------------------------------------------------------------------------*/
+    write_screen = WriteScreen_Output(config[ZONE_0]);
+    if (write_screen) SetScreen_Output(config[ZONE_0]);
+
+  }
+  
+}
 void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
   
   su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
@@ -5361,158 +5402,199 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
   
   if (rank == MASTER_NODE){
    
-    HistorySep = ",";
-      
-    char buffer[50];
+    /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
-     /*--- Retrieve the history filename ---*/
+    SetHistoryOutputFields(config);
     
-    string history_filename = config->GetConv_FileName();
+    /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
+   
+    Postprocess_HistoryFields(config);
     
-     /*--- Append the zone ID ---*/
+    /*--- Check for consistency and remove fields that are requested but not available --- */
     
-    if(config->GetnZone() > 1){
-      history_filename = config->GetMultizone_HistoryFileName(history_filename, config->GetiZone());
-    }
-    strcpy (char_histfile, history_filename.data());
-    
-     /*--- Append the restart iteration: if dynamic problem and restart ---*/
-    
-    if (config->GetTime_Domain() && config->GetRestart()) {
-      long iExtIter = config->GetRestart_Iter();
-      if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
-      strcat(char_histfile, buffer);
-    }
+    CheckHistoryOutput();
     
-    /*--- Add the correct file extension depending on the file format ---*/
+    /*--- Open history file and print the header ---*/
     
-    if ((config->GetOutput_FileFormat() == TECPLOT) ||
-        (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
-    else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
-    strcat(char_histfile, buffer);
+    PrepareHistoryFile(config);
+    
+    /*--- Set the multizone screen header ---*/
+
+    if (config->GetMultizone_Problem()){
+      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
+      MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+      MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+    }
     
+  }
+  
+}
+
+void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config){
+  
+  if (rank == MASTER_NODE){
+   
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
-    SetHistoryOutputFields(config);
+    SetMultizoneHistoryOutputFields(output, config);
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    
-    Postprocess_HistoryFields(config);
+    Postprocess_HistoryFields(config[ZONE_0]);
     
-    /*--- Set screen convergence output header and remove unavailable fields ---*/
+    /*--- Check for consistency and remove fields that are requested but not available --- */
     
-    string RequestedField;
-    vector<string> FieldsToRemove;
-    vector<bool> FoundField(nRequestedHistoryFields, false);
+    CheckHistoryOutput();
     
-    for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-      RequestedField = RequestedScreenFields[iReqField];  
-      if (HistoryOutput_Map.count(RequestedField) > 0){ 
-        ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
-      }
-      else if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
-        ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
-      }else {
-        FieldsToRemove.push_back(RequestedField);
-      }
-    }
+    /*--- Open history file and print the header ---*/
     
-    /*--- Remove fields which are not defined --- */
+    PrepareHistoryFile(config[ZONE_0]);
     
-    for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
-      if (rank == MASTER_NODE) {
-        if (iReqField == 0){
-          cout << "  Info: Ignoring the following screen output fields:" << endl;
-          cout << "  ";
-        }        cout << FieldsToRemove[iReqField];
-        if (iReqField != FieldsToRemove.size()-1){
-          cout << ", ";
-        } else {
-          cout << endl;
-        }
-      }
-      RequestedScreenFields.erase(std::find(RequestedScreenFields.begin(), RequestedScreenFields.end(), FieldsToRemove[iReqField]));
+    /*--- Set the multizone screen header ---*/
+
+    if (config[ZONE_0]->GetMultizone_Problem()){
+      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
+      MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+      MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
     }
     
-    nRequestedScreenFields = RequestedScreenFields.size();
-    
-    /*--- Remove unavailable fields from the history file output ---*/
-    
-    FieldsToRemove.clear();
-    
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup){
-          FoundField[iReqField] = true;
-        }
-      }
+  }
+  
+}
+
+void COutput::PrepareHistoryFile(CConfig *config){
+
+  char buffer[50];
+  
+  string history_filename;
+  
+  strcpy (char_histfile, HistoryFilename.data());
+  
+   /*--- Append the restart iteration: if dynamic problem and restart ---*/
+  
+  if (config->GetTime_Domain() && config->GetRestart()) {
+    long iExtIter = config->GetRestart_Iter();
+    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
+    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
+    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    strcat(char_histfile, buffer);
+  }
+  
+  /*--- Add the correct file extension depending on the file format ---*/
+  
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
+  strcat(char_histfile, buffer);
+  
+  /*--- Open the history file ---*/
+  
+  cout << "History filename: " << char_histfile << endl;
+  HistFile.open(char_histfile, ios::out);
+  HistFile.precision(15);
+  
+  /*--- Add the header to the history file. ---*/
+  
+  SetHistoryFile_Header(config);    
+  
+}
+
+void COutput::CheckHistoryOutput(){
+  
+  
+  /*--- Set screen convergence output header and remove unavailable fields ---*/
+  
+  string RequestedField;
+  vector<string> FieldsToRemove;
+  vector<bool> FoundField(nRequestedHistoryFields, false);
+  
+  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+    RequestedField = RequestedScreenFields[iReqField];  
+    if (HistoryOutput_Map.count(RequestedField) > 0){ 
+      ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
     }
-    
-    for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-      for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-        HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
-        for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-          RequestedField = RequestedHistoryFields[iReqField];   
-          if (RequestedField == Field.OutputGroup){
-            FoundField[iReqField] = true;
-          }
-        }
+    else if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
+      ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
+    }else {
+      FieldsToRemove.push_back(RequestedField);
+    }
+  }
+  
+  /*--- Remove fields which are not defined --- */
+  
+  for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
+    if (rank == MASTER_NODE) {
+      if (iReqField == 0){
+        cout << "  Info: Ignoring the following screen output fields:" << endl;
+        cout << "  ";
+      }        cout << FieldsToRemove[iReqField];
+      if (iReqField != FieldsToRemove.size()-1){
+        cout << ", ";
+      } else {
+        cout << endl;
       }
     }
-    
+    RequestedScreenFields.erase(std::find(RequestedScreenFields.begin(), RequestedScreenFields.end(), FieldsToRemove[iReqField]));
+  }
+  
+  nRequestedScreenFields = RequestedScreenFields.size();
+  
+  /*--- Remove unavailable fields from the history file output ---*/
+  
+  FieldsToRemove.clear();
+  FoundField = vector<bool>(nRequestedHistoryFields, false);
+  
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      if (!FoundField[iReqField]){
-        FieldsToRemove.push_back(RequestedHistoryFields[iReqField]);
+      RequestedField = RequestedHistoryFields[iReqField];   
+      if (RequestedField == Field.OutputGroup){
+        FoundField[iReqField] = true;
       }
     }
-    
-    /*--- Remove fields which are not defined --- */    
-    
-    for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
-      if (rank == MASTER_NODE) {
-        if (iReqField == 0){
-          cout << "  Info: Ignoring the following history output fields/groups:" << endl;
-          cout << "  ";
-        }        cout << FieldsToRemove[iReqField];
-        if (iReqField != FieldsToRemove.size()-1){
-          cout << ", ";
-        } else {
-          cout << endl;
+  }
+  
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup){
+          FoundField[iReqField] = true;
         }
       }
-      RequestedHistoryFields.erase(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), FieldsToRemove[iReqField]));
     }
-    
-    nRequestedHistoryFields = RequestedHistoryFields.size();
-        
-    /*--- Open the history file ---*/
-    
-    cout << "History filename: " << char_histfile << endl;
-    HistFile.open(char_histfile, ios::out);
-    HistFile.precision(15);
-    
-    /*--- Add the header to the history file. ---*/
-    
-    SetHistoryFile_Header(config);    
-    
-    /*--- Set the multizone screen header ---*/
-
-    if (config->GetMultizone_Problem()){
-      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
-      MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
-      MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+  }
+  
+  for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+    if (!FoundField[iReqField]){
+      FieldsToRemove.push_back(RequestedHistoryFields[iReqField]);
     }
-    
   }
   
+  /*--- Remove fields which are not defined --- */    
+  
+  for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
+    if (rank == MASTER_NODE) {
+      if (iReqField == 0){
+        cout << "  Info: Ignoring the following history output fields/groups:" << endl;
+        cout << "  ";
+      }        cout << FieldsToRemove[iReqField];
+      if (iReqField != FieldsToRemove.size()-1){
+        cout << ", ";
+      } else {
+        cout << endl;
+      }
+    }
+    RequestedHistoryFields.erase(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), FieldsToRemove[iReqField]));
+  }
+  
+  nRequestedHistoryFields = RequestedHistoryFields.size();
+  
 }
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
@@ -5711,7 +5793,7 @@ bool COutput::WriteScreen_Header(CConfig *config) {
 bool COutput::WriteScreen_Output(CConfig *config) {
   bool write_output = false;
   
-  write_output = config->GetnInner_Iter() - 1 == config->GetInnerIter();
+  write_output = config->GetnInner_Iter() - 1 == curr_InnerIter;
   
   if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) )){
     write_output = write_output || PrintOutput(config->GetInnerIter(), config->GetWrt_Con_Freq_DualTime());
@@ -5733,5 +5815,6 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
 // else {
 //   return false;
 // }
+  return true;
 }
 

From ea1016ff7b7281f5c21a6cba2bc587eb71fabfda Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Apr 2019 09:39:00 +0200
Subject: [PATCH 210/539] Disabled stripping of [] as delimiters

---
 Common/src/config_structure.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 4488887cdd46..5b831cd41fb0 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -6558,7 +6558,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
 bool CConfig::TokenizeString(string & str, string & option_name,
                              vector<string> & option_value) {
-  const string delimiters(" ()[]{}:,\t\n\v\f\r");
+  const string delimiters(" (){}:,\t\n\v\f\r");
   // check for comments or empty string
   string::size_type pos, last_pos;
   pos = str.find_first_of("%");

From 0c84f9fafbf019447e179ca6ef59393a863d9c4f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Apr 2019 09:39:38 +0200
Subject: [PATCH 211/539] added BGS residual to flow output

---
 SU2_CFD/src/output_direct_mean_inc.cpp | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 88b37d40c2a4..2ef96d6bc9a0 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -190,6 +190,33 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   default: break;
   }
   /// END_GROUP
+  
+  // BEGIN_GROUP: BGS_RES, DESCRIPTION: The block-gauss seidel residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Maximum residual of the pressure.
+  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the velocity x-component.   
+  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the velocity y-component.   
+  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the velocity z-component.   
+  if (nDim == 3) AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the temperature.
+  if (heat || weakly_coupled_heat) AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Maximum residual of nu tilde (SA model).
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
+    AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+    break;
+  default: break;
+  }
+  /// END_GROUP
 
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
@@ -334,12 +361,28 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     break;
   }
   
+  SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
+  SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
+  SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
+  if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
+ 
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+    break;  
+  case SST:
+    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+    break;
+  }
+  
   if (weakly_coupled_heat){
     SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
@@ -351,6 +394,9 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
 
+    if (nDim == 3) SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(4)));
+    else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
+
   }
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());

From 41be41376bd20848d9b06c9f413dab2c2d5a63b1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 12:36:37 +0200
Subject: [PATCH 212/539] Added missing BGS residuals

---
 SU2_CFD/src/output_adjoint_discrete.cpp     | 55 ++++++++++++++++++++
 SU2_CFD/src/output_adjoint_discrete_inc.cpp | 57 +++++++++++++++++++++
 SU2_CFD/src/output_direct_heat.cpp          |  3 +-
 SU2_CFD/src/output_direct_mean.cpp          | 51 ++++++++++++++++++
 SU2_CFD/src/output_direct_mean_inc.cpp      | 28 +++++-----
 5 files changed, 180 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output_adjoint_discrete.cpp
index 7ed38adb3165..44bd044c77c5 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete.cpp
@@ -165,6 +165,36 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
     }
   }
   /// END_GROUP
+ 
+  
+  ///  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The Block Gauss Seidel residuals of the SOLUTION variables. 
+  /// DESCRIPTION: BGSimum residual of the adjoint density.
+  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: BGSimum residual of the adjoint momentum x-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the adjoint momentum y-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the adjoint momentum z-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the adjoint energy.
+  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  if (!config->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
+      AddHistoryOutput("BGS_ADJ_KINETIC_ENERGY", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
+      /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+      break;
+    default: break;
+    }
+  }
+  
+  /// END_GROUP
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
@@ -235,6 +265,31 @@ void CDiscAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
     default: break;
     }
   }
+  
+  if (multizone){
+    SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_BGS(2)));
+    if (geometry->GetnDim() == 3) {
+      SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_BGS(3)));
+      SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(4)));
+    } else {
+      SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(3)));    
+    }
+    if (!config->GetFrozen_Visc_Disc()){  
+      switch(turb_model){
+      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+        SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
+        break;  
+      case SST:
+        SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
+        break;
+      default: break;
+      }
+    }
+  }
+  
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
   SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
index cf7f077baaac..9e96f089c70b 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output_adjoint_discrete_inc.cpp
@@ -169,6 +169,34 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
+  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
+  /// DESCRIPTION: BGSimum residual of the adjoint Pressure.
+  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: BGSimum residual of the adjoint Velocity x-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the adjoint Velocity y-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the adjoint Velocity z-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGSimum residual of the temperature.
+  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  if (!config->GetFrozen_Visc_Disc()){  
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);      
+      break;  
+    case SST:
+      /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
+      AddHistoryOutput("BGS_ADJ_KINETIC_ENERGY", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
+      /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+      break;
+    default: break;
+    }
+  }
+  /// END_GROUP
+  
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
@@ -248,6 +276,35 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry
     default: break;
     }
   }
+  
+  if (multizone){
+    SetHistoryOutputValue("BGS_ADJ_PRESSURE", log10(adjflow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_ADJ_VELOCITY-Y", log10(adjflow_solver->GetRes_BGS(2)));
+    if (nDim == 3) {
+      SetHistoryOutputValue("BGS_ADJ_VELOCITY-Z", log10(adjflow_solver->GetRes_BGS(3)));
+    }
+    if (weakly_coupled_heat){
+      SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjheat_solver->GetRes_BGS(0)));
+    }
+    if (heat){
+      if (nDim == 3) SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(4)));
+      else           SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(3)));
+    }
+    if (!config->GetFrozen_Visc_Disc()){  
+      switch(turb_model){
+      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+        SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
+        break;  
+      case SST:
+        SetHistoryOutputValue("BGS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("BGS_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
+        break;
+      default: break;
+      }
+    }
+  }
+  
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
   SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output_direct_heat.cpp
index 28cca703ab00..28e5886ba6bc 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output_direct_heat.cpp
@@ -101,7 +101,8 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
   SetHistoryOutputValue("AVG_TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
   SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
-  SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
+  if (multizone)
+    SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
   
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
   
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index f28661ff8ef5..afb9ae849f31 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -191,6 +191,33 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
+  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
+  /// DESCRIPTION: Maximum residual of the density.
+  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum x-component. 
+  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum y-component. 
+  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the momentum z-component. 
+  if (nDim == 3) AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  /// DESCRIPTION: Maximum residual of the energy.  
+  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  
+  switch(turb_model){
+  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+    /// DESCRIPTION: Maximum residual of nu tilde (SA model).
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    break;  
+  case SST:
+    /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
+    AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+    break;
+  default: break;
+  }
+  /// END_GROUP
+  
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
   AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
@@ -625,6 +652,30 @@ void CFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
   default: break;
   }
   
+  if (multizone){
+    SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
+    if (nDim == 2)
+      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(3)));
+    else {
+      SetHistoryOutputValue("BGS_MOMENTUM-Z", log10(flow_solver->GetRes_BGS(3)));
+      SetHistoryOutputValue("BGS_ENERGY", log10(flow_solver->GetRes_BGS(4)));
+    }
+    
+    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+      break;
+    default: break;
+    }
+  }
+  
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
   if (nDim == 3)
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 2ef96d6bc9a0..9532fc3eaf5c 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -361,19 +361,21 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     break;
   }
   
-  SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
-  SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
-  SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
-  if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
- 
-  switch(turb_model){
-  case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-    SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
-    break;  
-  case SST:
-    SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
-    break;
+  if (multizone){
+    SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
+    if (nDim == 3) SetHistoryOutputValue("BGS_VELOCITY-Z", log10(flow_solver->GetRes_BGS(3)));
+    
+    switch(turb_model){
+    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
+      SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
+      break;  
+    case SST:
+      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
+      break;
+    }
   }
   
   if (weakly_coupled_heat){

From 60ecf08a58df2dc84bc60483c43078e344acf5f3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 17:32:01 +0200
Subject: [PATCH 213/539] Added error if deprecated option EXT_ITER is used

---
 Common/src/config_structure.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 5b831cd41fb0..7448892dcd93 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1323,7 +1323,7 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Reduction factor of the CFL coefficient in the turbulent adjoint problem */
   addDoubleOption("CFL_REDUCTION_ADJTURB", CFLRedCoeff_AdjTurb, 1.0);
   /* DESCRIPTION: Number of total iterations */
-  addUnsignedLongOption("EXT_ITER", nExtIter, 999999);
+  addUnsignedLongOption("EXT_ITER", nExtIter, 0);
   /* DESCRIPTION: External iteration offset due to restart */
   addUnsignedLongOption("EXT_ITER_OFFSET", ExtIter_OffSet, 0);
   // these options share nRKStep as their size, which is not a good idea in general
@@ -3182,6 +3182,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
+  if (nExtIter != 0){
+    SU2_MPI::Error("Option EXT_ITER is deprecated as of v7.0. Please use TIME_ITER, OUTER_ITER or ITER \n"
+                   "to specify the number of time iterations, outer multizone iterations or iterations, respectively.", CURRENT_FUNCTION);
+  }
+  
   if (Unsteady_Simulation == TIME_STEPPING){
     nIter      = 1;
     nInnerIter  = 1;
@@ -3196,8 +3201,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     Delta_DynTime  = Time_Step;
   }
   
-  if (SinglezoneDriver && !Time_Domain){
+  if (!Time_Domain){
     nExtIter = nIter;
+  } else {
+    nExtIter = nTimeIter;
   }
   /*--- Fluid-Structure Interaction problems ---*/
 

From 086e7bcd0df890829285914874f8e59cb8a549e1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 19:17:56 +0200
Subject: [PATCH 214/539] Added average residual output

---
 Common/src/config_structure.cpp   |   6 +-
 SU2_CFD/include/output/output.hpp |   3 +-
 SU2_CFD/src/output_driver.cpp     | 166 ++----------------------------
 SU2_CFD/src/output_structure.cpp  |  28 ++++-
 4 files changed, 44 insertions(+), 159 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 7448892dcd93..f7ddf95168e1 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2576,11 +2576,15 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
 
 void CConfig::SetDefaultFromConfig(CConfig *config){
   
+  map<string, bool> noInheritance = CCreateMap<string, bool>
+      ("SCREEN_OUTPUT", true)
+      ("HISTORY_OUTPUT", true);
+  
   map<string, bool>::iterator iter = all_options.begin(), curr_iter;
   
   while (iter != all_options.end()){
     curr_iter = iter++;   
-    if (config->option_map[curr_iter->first]->GetValue().size() > 0){
+    if (config->option_map[curr_iter->first]->GetValue().size() > 0 && !noInheritance[curr_iter->first]){
       option_map[curr_iter->first]->SetValue(config->option_map[curr_iter->first]->GetValue());
       all_options.erase(curr_iter);      
     }
diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index ee3c88724beb..d2d9ff55659a 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -251,8 +251,7 @@ class COutput {
   string VolumeFilename, SurfaceFilename, RestartFilename, HistoryFilename;
   
   unsigned long curr_TimeIter, curr_OuterIter, curr_InnerIter;
-  
-  
+    
 public:
   
   /*----------------------------- Public member functions ----------------------------*/
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output_driver.cpp
index a808e98207d4..614cb41240c2 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output_driver.cpp
@@ -59,14 +59,21 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput
   if (nRequestedHistoryFields == 0){
     RequestedHistoryFields.push_back("ITER");
     for (iZone = 0; iZone < nZone; iZone++){
-      RequestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");
+      RequestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");      
+      RequestedHistoryFields.push_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
     }
     nRequestedHistoryFields = RequestedHistoryFields.size();
   }
   
+  if (nRequestedScreenFields == 0){
+    if (config[ZONE_0]->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
+    RequestedScreenFields.push_back("OUTER_ITER");
+    for (iZone = 0; iZone < nZone; iZone++){
+      RequestedScreenFields.push_back("AVG_" + bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]"); 
+    }
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
   
-
- 
   MultiZoneHeaderString = "Multizone Summary";
   
   HistoryFilename = "multizone_history";
@@ -111,96 +118,13 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
       }
     }
   }
-
-//  for (iZone = 0; iZone < nZone; iZone++){
-
-//    /*--- Initialize values per zone ---*/
-//    nVar_Zone = 0;
-//    avgzone = 0.0;
-    
-//    InnerIter = output[iZone]->GetHistoryFieldValue("INNER_ITER");
-    
-//    name = string("INNER_ITER") + "_" + PrintingToolbox::to_string(iZone);
-    
-//    SetHistoryOutputValue(name, InnerIter);
-    
-//    vector<HistoryOutputField> BGSGroup = output[iZone]->GetHistoryGroup("BGS_RES");   
-    
-        
-//    nField = BGSGroup.size();
-    
-//    for (iField = 0; iField < nField; iField++){
-      
-//      name = BGSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
-      
-//      val = BGSGroup[iField].Value;
-      
-//      SetHistoryOutputValue(name, val);
-      
-//      /*--- Add values to averages ---*/
-//      avgzone += val;
-//      nVar_Zone++;
-      
-//    }
-
-//    /*--- Get an unique name for the averaged history data per zone ---*/
-//    name = "ZONE" + PrintingToolbox::to_string(iZone);
-
-//    /*--- Compute the average and set the value for the zone iZone---*/
-//    avgzone = avgzone / nVar_Zone;
-//    SetHistoryOutputValue(name, avgzone);
-    
-//    vector<HistoryOutputField> RMSGroup = output[iZone]->GetHistoryGroup("RMS_RES");        
-        
-//    nField = RMSGroup.size();
-    
-//    for (iField = 0; iField < nField; iField++){
-      
-//      name = RMSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
-      
-//      val = RMSGroup[iField].Value;
-      
-//      SetHistoryOutputValue(name, val);
-      
-//    }
-
-//  }
-
-
 }
 
 void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {
   
   unsigned short iZone, iField, nField;
   string name, header, group;
-  
-  if (nRequestedScreenFields == 0){
-    if (config[ZONE_0]->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
-    RequestedScreenFields.push_back("OUTER_ITER");
-    
-    for (iZone = 0; iZone < nZone; iZone++){
-      
-      map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
-      vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
-      nField = ZoneHistoryFields.size();
-      
-      for (iField = 0; iField < nField; iField++){
-        
-        if (ZoneHistoryFields[ZoneHistoryNames[iField]].OutputGroup == bgs_res_name){
-          
-          name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
-          
-          RequestedScreenFields.push_back(name);
-          
-          break;
-          
-        }
-      }
-    }
-    
-    nRequestedScreenFields = RequestedScreenFields.size();
-  }
-  
+
   if (config[ZONE_0]->GetTime_Domain()){
     AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
   }
@@ -229,74 +153,6 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
       }
     }
   }
-
-//  /*--- Set the fields ---*/
-//  for (iZone = 0; iZone < nZone; iZone++){
-    
-//    InnerIter = output[iZone]->GetHistoryFieldValue("INNER_ITER");
-    
-//    name   = string("INNER_ITER") + "_" + PrintingToolbox::to_string(iZone);
-//    header = string("Inner_Iter") + "[" + PrintingToolbox::to_string(iZone) + "]";
-    
-//    AddHistoryOutput(name, header, FORMAT_INTEGER, "ITER");
-    
-////    RequestedScreenFields.push_back(name);
-    
-//    vector<HistoryOutputField> BGSGroup = output[iZone]->GetHistoryGroup("BGS_RES");        
-    
-//    nField = BGSGroup.size();
- 
-//    /*-- For all the variables per solver --*/
-//    for (iField = 0; iField < nField; iField++){
-      
-//      /*--- Set an unique name for the history data ---*/
-//      name   = BGSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
-      
-//      header = BGSGroup[iField].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
-
-//      AddHistoryOutput(name, header, FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-      
-//      /*--- Request the variable residual for history output ---*/
-//      RequestedScreenFields.push_back(name);
-//    }
-
-//    vector<HistoryOutputField> RMSGroup = output[iZone]->GetHistoryGroup("RMS_RES");
-//    nField = RMSGroup.size();
-    
-//    /*-- For all the variables per solver --*/
-//    for (iField = 0; iField < nField; iField++){
-      
-//      /*--- Set an unique name for the history data ---*/
-//      name   = RMSGroup[iField].FieldName + "_" + PrintingToolbox::to_string(iZone);
-      
-//      header = RMSGroup[iField].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
-
-//      AddHistoryOutput(name, header, FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-      
-//      /*--- Request the variable residual for history output ---*/
-////      RequestedScreenFields.push_back(name);
-//    }
-    
-
-    
- 
-//    /*--- Set an unique name for the averaged history data ---*/
-//    name = "ZONE" + PrintingToolbox::to_string(iZone);
-//    /*--- Set an unique name for the history headers of the averaged data ---*/
-//    header = "avgres[" + PrintingToolbox::to_string(iZone) + "]";
-
-//    AddHistoryOutput(name, header, FORMAT_FIXED,  "ZONE_AVGRES", TYPE_RESIDUAL);
-//  }
-  
-//  RequestedHistoryFields.push_back("BGS_RES");
-//  RequestedHistoryFields.push_back("RMS_RES");
-//  RequestedHistoryFields.push_back("ZONE_AVGRES");
-  
-//  /*--- Retrieve number of requested fields ---*/
-//  nRequestedScreenFields = RequestedScreenFields.size();
-//  nRequestedHistoryFields = RequestedHistoryFields.size();
-
-
 }
 
 inline bool CDriverOutput::WriteScreen_Header(CConfig *config) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index 4aa59cd412cd..a20fd7192960 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -5440,7 +5440,7 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    
-    Postprocess_HistoryFields(config[ZONE_0]);
+    //Postprocess_HistoryFields(config[ZONE_0]);
     
     /*--- Check for consistency and remove fields that are requested but not available --- */
     
@@ -5740,6 +5740,9 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 }
 
 void COutput::Postprocess_HistoryData(CConfig *config){
+   
+  map<string, su2double> Average;
+  map<string, int> Count;
   
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
@@ -5748,6 +5751,10 @@ void COutput::Postprocess_HistoryData(CConfig *config){
         Init_Residuals[HistoryOutput_List[iField]] = currentField.Value;
       }
       SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
+      
+      Average[currentField.OutputGroup] += currentField.Value;
+      Count[currentField.OutputGroup]++;
+           
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
       if(SetUpdate_Averages(config)){
@@ -5760,13 +5767,24 @@ void COutput::Postprocess_HistoryData(CConfig *config){
       }
     }
   }
+  
+  map<string, su2double>::iterator it = Average.begin();
+  for (it = Average.begin(); it != Average.end(); it++){
+    SetHistoryOutputValue("AVG_" + it->first, it->second/Count[it->first]);
+  }
+  
 }
 
 void COutput::Postprocess_HistoryFields(CConfig *config){
+  
+  map<string, bool> Average;
+  map<string, string> AverageGroupName =  CCreateMap<string, string>("BGS_RES", "bgs")("RMS_RES","rms")("MAX_RES", "max");
+  
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
       AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup);
+      Average[currentField.OutputGroup] = true;
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
       AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup);
@@ -5774,6 +5792,14 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
       AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup);  
     }
   }
+  
+  
+   map<string, bool>::iterator it = Average.begin();
+   for (it = Average.begin(); it != Average.end(); it++){
+     cout << "AVG_" + it->first << endl;
+     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES");
+   }
+  
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  

From d3d0f23d5abad4fdb04ab59139eedfc4db4a5542 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 19:20:26 +0200
Subject: [PATCH 215/539] Changed EXT_ITER to ITER

---
 QuickStart/inv_NACA0012.cfg                       |  2 +-
 TestCases/TestCase.py                             |  4 +---
 .../wedge/inv_wedge_ROE_multiobj.cfg              |  2 +-
 TestCases/deformation/brick_hex/def_brick_hex.cfg |  2 +-
 .../brick_hex_rans/def_brick_hex_rans.cfg         |  2 +-
 .../deformation/brick_prism/def_brick_prism.cfg   |  2 +-
 .../brick_prism_rans/def_brick_prism_rans.cfg     |  2 +-
 .../deformation/brick_pyra/def_brick_pyra.cfg     |  2 +-
 .../deformation/brick_tets/def_brick_tets.cfg     |  2 +-
 .../cylindrical_ffd/def_cylindrical.cfg           |  2 +-
 TestCases/deformation/naca0012/def_NACA0012.cfg   |  2 +-
 .../naca0012/surface_file_NACA0012.cfg            |  2 +-
 TestCases/deformation/naca4412/def_NACA4412.cfg   |  2 +-
 TestCases/deformation/rae2822/def_RAE2822.cfg     |  2 +-
 .../deformation/spherical_ffd/def_spherical.cfg   |  2 +-
 .../spherical_ffd/def_spherical_bspline.cfg       |  2 +-
 TestCases/harmonic_balance/HB.cfg                 |  4 ++--
 .../hb_rans_preconditioning/davis.cfg             |  2 +-
 .../inv_wedge_ROE_2surf_1obj.cfg                  |  2 +-
 .../inv_wedge_ROE_multiobj.cfg                    |  2 +-
 .../inv_wedge_ROE_multiobj_1surf.cfg              |  2 +-
 .../inv_wedge_ROE_multiobj_combo.cfg              |  2 +-
 .../inv_NACA0012_multipoint.cfg                   |  2 +-
 .../pitching_naca64a010/pitching_NACA64A010.cfg   |  2 +-
 .../pitching_oneram6/pitching_ONERAM6.cfg         |  2 +-
 .../rotating_naca0012/rotating_NACA0012.cfg       |  2 +-
 .../steady_inverse_design/inv_NACA0012.cfg        |  2 +-
 .../steady_naca0012/inv_NACA0012_basic.cfg        |  2 +-
 .../steady_oneram6/inv_ONERAM6_adv.cfg            |  2 +-
 .../steady_oneram6/inv_ONERAM6_basic.cfg          |  2 +-
 .../flatPlate_rigidMotion_Conf.cfg                |  2 +-
 .../unsteady_CHT_FlatPlate_Conf.cfg               |  2 +-
 TestCases/sliding_interface/bars_SST_2D/bars.cfg  |  7 -------
 .../channel_2D/channel_2D_NN.cfg                  |  2 --
 .../channel_2D/channel_2D_WA.cfg                  |  3 ---
 .../channel_3D/channel_3D_NN.cfg                  |  7 ++-----
 .../channel_3D/channel_3D_WA.cfg                  |  3 ---
 .../incompressible_steady/configCircle.cfg        |  1 -
 .../incompressible_steady/configOut.cfg           |  2 +-
 .../incompressible_unsteady/configCircle.cfg      |  1 -
 .../incompressible_unsteady/configOut.cfg         |  1 -
 TestCases/sliding_interface/pipe/pipe_NN.cfg      |  4 ----
 TestCases/sliding_interface/pipe/pipe_WA.cfg      |  4 ----
 .../rotating_cylinders/rot_cylinders_NN.cfg       |  3 ---
 .../rotating_cylinders/rot_cylinders_WA.cfg       | 15 ---------------
 .../single_stage/single_stage_NN.cfg              |  4 ----
 .../single_stage/single_stage_WA.cfg              |  3 ---
 .../sup_vor_shed_NN.cfg                           |  3 ---
 .../sup_vor_shed_WA.cfg                           |  3 ---
 .../sliding_interface/uniform_flow/uniform_NN.cfg |  3 ---
 .../sliding_interface/uniform_flow/uniform_WA.cfg |  2 +-
 .../turbomachinery/APU_turbocharger/Jones.cfg     |  2 +-
 .../turbomachinery/APU_turbocharger/Jones_rst.cfg |  2 +-
 .../axial_stage_2D/Axial_stage2D.cfg              |  2 +-
 .../centrifugal_blade/centrifugal_blade.cfg       |  2 +-
 .../centrifugal_stage/centrifugal_stage.cfg       |  2 +-
 .../transonic_stator_2D/transonic_stator.cfg      |  2 +-
 .../transonic_stator_2D/transonic_stator_rst.cfg  |  2 +-
 58 files changed, 44 insertions(+), 109 deletions(-)

diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index bd6a6ba863ac..d750dd33eeb7 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -98,7 +98,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index 80cb8efb20d0..36293383743b 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -683,10 +683,8 @@ def adjust_iter(self):
             adjust_string = "TIME_ITER"
         elif self.multizone:
             adjust_string = "OUTER_ITER"
-        elif self.new_output:
-            adjust_string = "ITER"
         else:
-            adjust_string = "EXT_ITER"
+            adjust_string = "ITER"
         for line in lines:
             if not line.strip().split("=")[0].strip() == adjust_string:
                 file_out.write(line)
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index f5bfd7180598..6319c3529204 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -100,7 +100,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=1000
+ITER=1000
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index 6a602380329f..50f445f95dac 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index 6579ab25c82a..4bd7ef5fac8e 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 678f3c551b3c..16ec87170148 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 6144071c3f06..25f4f873ffde 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 33b73e30c937..40ecc5ce4152 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index efca78502475..3134a62b6ba3 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -83,7 +83,7 @@ CFL_NUMBER= 4.0
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Linear solver for the implicit formulation (LU_SGS, SYM_GAUSS_SEIDEL, BCGSTAB)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 19c88176bf06..2552fa9ee6d3 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -244,7 +244,7 @@ FFD_AXIS= (0.0, 0.0, 0.0)
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 9aff39c2fcdf..a1c40e52b32d 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -98,7 +98,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 434d3b66b1b1..7b0cf9c9c41d 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -98,7 +98,7 @@ OBJECTIVE_FUNCTION= DRAG
 CFL_NUMBER= 4.0
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 3abd0d9d8a86..f54386ff3c78 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -93,7 +93,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 1000.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Objective function in gradient evaluation  (DRAG, LIFT, SIDEFORCE, MOMENT_X,
 %                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index b01a59272eda..3e51c264abd5 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -89,7 +89,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 2765315b76fb..6778b0d91dcc 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -247,7 +247,7 @@ FFD_AXIS= (0.0, 0.0, 0.0)
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index a073c8685d88..46d90fbcd6c8 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -254,7 +254,7 @@ FFD_AXIS= (0.0, 0.0, 0.0)
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 5
+ITER= 5
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 7477836c7184..98892ae35b59 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -37,7 +37,7 @@ TIME_INSTANCES= 3
 HB_PERIOD= 0.05891103435003335
 %
 % List of frequencies to be resolved for harmonic balance method
-OMEGA_HB = [0,106.69842,-106.69842]
+OMEGA_HB = (0,106.69842,-106.69842)
 %
 % Time Step for dual time stepping simulations (s)
 %UNST_TIMESTEP= 0.0023555025613149587
@@ -115,7 +115,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 70000
+ITER= 70000
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 2f437a8a1744..b633be5696f3 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -113,7 +113,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 70000
+ITER= 70000
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 3111632abba6..078e9c74ed36 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -97,7 +97,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=1
+ITER=1
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 57d97410ad63..0f2f4639d2e7 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -98,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=1
+ITER=1
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 0e8e7ca00a86..f758fd1c2349 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -98,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=1
+ITER=1
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 3a8119a4a679..725ee4453ec7 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -100,7 +100,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER=1
+ITER=1
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= BCGSTAB
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 91e956d97345..01ea60c3db53 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -88,7 +88,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 2500
+ITER= 2500
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index c09920360721..c5099f3ea680 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -138,7 +138,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index 988a0de9f148..076bc7d7ab21 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -139,7 +139,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index 155f6969aadd..c202cc4573c0 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -108,7 +108,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 06584bfcd911..2225600d5bb9 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -95,7 +95,7 @@ OBJECTIVE_FUNCTION= INVERSE_DESIGN_PRESSURE
 CFL_NUMBER= 2.0
 %
 % Number of total iterations
-EXT_ITER= 250
+ITER= 250
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 8351cceab328..dca6f6211148 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -88,7 +88,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 1000
+ITER= 1000
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index 5fcbbf01796e..a436511a3327 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -98,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 1000
+ITER= 1000
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index b925eeb7074b..2c471e2611c5 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -98,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 1000
+ITER= 1000
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index ed6beca8dfb4..bb56adc5677e 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -457,7 +457,7 @@ VISUALIZE_VOLUME_DEF= NO
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 999999
+ITER= 999999
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 37d85d2f1ccc..bbc3562eec5f 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -437,7 +437,7 @@ VISUALIZE_VOLUME_DEF= NO
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 999999
+ITER= 999999
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 5eaa0c65e10f..1155e188cc38 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -12,14 +12,11 @@
 
 MULTIZONE=YES
 
-%CONFIG_LIST = (configFlow.cfg, configFEA.cfg)
-
 TIME_DOMAIN = NO
 TIME_ITER = 3
 TIME_STEP = 0.005
 INNER_ITER= 1
 OUTER_ITER = 100
-%WRT_ZONE_CONV=YES
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES,
@@ -187,10 +184,6 @@ CFL_ADAPT= NO
 %                                        CFL max value )
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 0.3,20.0 )
 %
-% Number of total iterations
-EXT_ITER= 100
-%EXT_ITER= 1
-%
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 4612b334fd79..eadf4015f3a0 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -180,8 +180,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 53a6ea42840a..5ea9524d9b93 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -179,9 +179,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index c73f6de4553f..af61f5b5a715 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -26,10 +26,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 20
 %
 % Inner iterations
-INNER_ITER= 20
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -191,9 +191,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 408933e581ba..fc1a47170339 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -179,9 +179,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 826185c40782..8bf0c97f8a1d 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -66,7 +66,6 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 1e10)
 MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
-EXT_ITER= 200
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index e3c76897b1bb..da554a7367a8 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -76,7 +76,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 1e10)
 MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
-EXT_ITER= 200
+ITER= 200
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index cbdd9feb8d5d..e25a712cfd6b 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -75,7 +75,6 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 1e10)
 MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
-EXT_ITER= 200
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 3b9bf5f6002c..fdc906633e3a 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -85,7 +85,6 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 1e10)
 MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
-EXT_ITER= 200
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index d7882e1c8ee8..c0d9ad48c6bf 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -192,10 +192,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-%
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 7426cef71419..d6eae69b5957 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -193,10 +193,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-%
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 28ab477f6475..519c566d9bdf 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -184,9 +184,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 671085f79dd8..f75aa5ac1605 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -50,17 +50,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-
-RESTART_ITER = 2
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -196,10 +185,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-%
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 570dcb0e247a..4143772bf6b0 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -225,10 +225,6 @@ RELAXATION_FACTOR_TURB= 1.0
 %
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-%
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index ae5d6dc607a1..3edb80a77913 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -225,9 +225,6 @@ RELAXATION_FACTOR_TURB= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 69e7fa1b61a3..7add3a6d1eb1 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -187,9 +187,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 86574f297276..256f6ec87f86 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -185,9 +185,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 9ba3d178e7d4..c9f11c3c30a0 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -181,9 +181,6 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-EXT_ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 7a1cd99bc0cc..ac0a83ad11f1 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -184,7 +184,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 32000
+ITER= 32000
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index eaa4acdf7578..cb5795c5375a 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -284,7 +284,7 @@ RELAXATION_FACTOR_TURB= 0.95
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index a3638fe888e8..40024c64ee0c 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -288,7 +288,7 @@ RELAXATION_FACTOR_TURB= 0.95
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 11
+ITER= 11
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 182d73953c94..2873f3fc5942 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -278,7 +278,7 @@ RELAXATION_FACTOR_TURB= 0.95
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 2001
+ITER= 2001
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 0c5066ae4fca..0c5bc22ac110 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -307,7 +307,7 @@ RELAXATION_FACTOR_TURB= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 12000
+ITER= 12000
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index 247e000d4b08..d07593fe84a2 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -315,7 +315,7 @@ RELAXATION_FACTOR_TURB= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 32000
+ITER= 32000
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 71ce29e8e224..02c597e669ab 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -285,7 +285,7 @@ RELAXATION_FACTOR_TURB= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 2001
+ITER= 2001
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index b933d61ca7d2..eeb15f8aff21 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -290,7 +290,7 @@ RELAXATION_FACTOR_TURB= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 201
+ITER= 201
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL

From 8b409e2f48b0bad0832a7675571b491567ed702f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 19:23:00 +0200
Subject: [PATCH 216/539] Changed INNER_ITER and OUTER_ITER for MZ cases

---
 TestCases/coupled_cht/incompressible/configFlow.cfg        | 1 -
 TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg   | 4 ++--
 TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg   | 4 ++--
 TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg   | 4 ++--
 .../sliding_interface/incompressible_steady/config.cfg     | 5 ++++-
 .../sliding_interface/incompressible_unsteady/config.cfg   | 3 ++-
 TestCases/sliding_interface/pipe/pipe_NN.cfg               | 4 ++--
 TestCases/sliding_interface/pipe/pipe_WA.cfg               | 4 ++--
 .../rotating_cylinders/rot_cylinders_NN.cfg                | 4 ++--
 .../rotating_cylinders/rot_cylinders_WA.cfg                | 7 +++----
 .../supersonic_vortex_shedding/sup_vor_shed_NN.cfg         | 4 ++--
 .../supersonic_vortex_shedding/sup_vor_shed_WA.cfg         | 4 ++--
 TestCases/sliding_interface/uniform_flow/uniform_NN.cfg    | 3 ++-
 TestCases/sliding_interface/uniform_flow/uniform_WA.cfg    | 3 +++
 14 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/TestCases/coupled_cht/incompressible/configFlow.cfg b/TestCases/coupled_cht/incompressible/configFlow.cfg
index 2ad7340f2f02..b9f273c7b69e 100644
--- a/TestCases/coupled_cht/incompressible/configFlow.cfg
+++ b/TestCases/coupled_cht/incompressible/configFlow.cfg
@@ -107,7 +107,6 @@ RELAXATION_FACTOR_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
-EXT_ITER= 1
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 16
 RESIDUAL_MINVAL= -32
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index eadf4015f3a0..c20899b560c7 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -26,10 +26,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 10
+OUTER_ITER = 50
 %
 % Inner iterations
-INNER_ITER= 50
+INNER_ITER= 1
 %
 WRT_ZONE_CONV=YES
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 5ea9524d9b93..804914358582 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -27,10 +27,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 50
 %
 % Inner iterations
-INNER_ITER= 50
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index fc1a47170339..d45c25f23978 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -26,10 +26,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 20
 %
 % Inner iterations
-INNER_ITER= 20
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
diff --git a/TestCases/sliding_interface/incompressible_steady/config.cfg b/TestCases/sliding_interface/incompressible_steady/config.cfg
index c7b120c24795..7dbb71936260 100644
--- a/TestCases/sliding_interface/incompressible_steady/config.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/config.cfg
@@ -19,4 +19,7 @@ MULTIZONE_MESH= NO
 
 TIME_DOMAIN = NO
 
-OUTER_ITER = 20
+OUTER_ITER = 2000
+WRT_ZONE_CONV=NO
+
+INNER_ITER=1
diff --git a/TestCases/sliding_interface/incompressible_unsteady/config.cfg b/TestCases/sliding_interface/incompressible_unsteady/config.cfg
index 574298720b1f..decfb8117c92 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/config.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/config.cfg
@@ -18,7 +18,8 @@ MARKER_ZONE_INTERFACE= (circleOut, circleIn)
 MULTIZONE_MESH=NO
 
 TIME_DOMAIN = YES
-TIME_ITER = 1
+TIME_ITER = 10000
 TIME_STEP = 1.0
 
+INNER_ITER=200
 OUTER_ITER = 20
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index c0d9ad48c6bf..767b7b53bf5d 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -23,9 +23,9 @@ TIME_STEP= 0.1
 %
 TIME_ITER= 10
 %
-OUTER_ITER=1
+OUTER_ITER=200
 %
-INNER_ITER=200
+INNER_ITER=1
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index d6eae69b5957..2ee820d45188 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -22,9 +22,9 @@ TIME_STEP= 0.1
 %
 TIME_ITER= 10
 %
-OUTER_ITER=1
+OUTER_ITER=200
 %
-INNER_ITER=200
+INNER_ITER=1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 519c566d9bdf..dfa8a79c86ed 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -25,10 +25,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 200
 %
 % Inner iterations
-INNER_ITER= 200
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index f75aa5ac1605..ec6d72d3ae3f 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -26,11 +26,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 200
 %
 % Inner iterations
-INNER_ITER= 200
-%
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -120,7 +119,7 @@ CFL_ADAPT_PARAM= ( 0.3, 0.5, 1.0, 1000.0)
 LINEAR_SOLVER= FGMRES
 %
 % Preconditioner of the Krylov linear solver (ILU, LU_SGS, LINELET, JACOBI)
-LINEAR_SOLVER_PREC= LU_SGS
+LINEAR_SOLVER_PREC= ILU
 %
 % Min error of the linear solver for the implicit formulation
 LINEAR_SOLVER_ERROR= 1E-4
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 7add3a6d1eb1..ce86fdfef02b 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -27,10 +27,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 100
 %
 % Inner iterations
-INNER_ITER= 100
+INNER_ITER= 1
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 256f6ec87f86..b3f3ca55fa8a 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -27,10 +27,10 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 1
+OUTER_ITER = 100
 %
 % Inner iterations
-INNER_ITER= 100
+INNER_ITER= 1
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index c9f11c3c30a0..38a4c79a9dca 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -21,7 +21,8 @@ TIME_DOMAIN=YES
 %
 TIME_STEP= 1e-04
 TIME_ITER= 10
-INNER_ITER= 120
+OUTER_ITER= 120
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index ac0a83ad11f1..419e24584788 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -16,6 +16,9 @@ MULTIZONE= YES
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
+OUTER_ITER=1000
+%
+INNER_ITER=1
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         

From 529f5c8bbffea38511e50e5e801c6fa0d097c72e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Apr 2019 19:27:49 +0200
Subject: [PATCH 217/539] Adaption of reg. test values

---
 TestCases/serial_regression.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 1dfefd124ee9..10ece91a3211 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -933,7 +933,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 10
-    uniform_flow.test_vals = [10.000000, 0.000000, 0.432864, -5.596207] #last 4 columns
+    uniform_flow.test_vals = [10.000000, 0.000000, -8.795489, -10.906295] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -946,7 +946,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 4
-    channel_2D.test_vals = [0.000000, 1.497633, 1.199455, 0.904683] #last 4 columns
+    channel_2D.test_vals = [0.000000, -0.092580, -0.311363, -0.422168] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -959,7 +959,7 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 1
-    channel_3D.test_vals = [1.000000, 0.000000, 1.834878, 1.892644, 1.606895] #last 4 columns
+    channel_3D.test_vals = [1.000000, 0.000000, 0.659340, 0.786693, 0.671212] #last 5 columns
     channel_3D.su2_exec  = "SU2_CFD"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
@@ -972,7 +972,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [ -0.341198, -0.045916, 0.800374, 0.699486] #last 4 columns
+    pipe.test_vals = [-10.959248, -9.233598, -7.680970, -6.352204] #last 4 columns
     pipe.su2_exec  = "SU2_CFD"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -985,7 +985,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [0.000000,2.018268, 1.942868, 1.696582] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, -0.193512, -0.680198, -0.879603] #last 4 columns
     rotating_cylinders.su2_exec  = "SU2_CFD"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -998,7 +998,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 2.162202, 2.304635] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 0.384648, 1.092480] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [-0.941341, -0.270420, -1.840081,-1.159466] #last 4 columns
+    bars_SST_2D.test_vals = [13.000000, -0.730922, -1.612375] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1023,7 +1023,7 @@ def main():
     slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
     slinc_steady.cfg_file  = "config.cfg"
     slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [19.000000, -1.766116,  -2.206522] #last 3 columns
+    slinc_steady.test_vals = [19.000000, -1.663771, -2.002700] #last 3 columns
     slinc_steady.su2_exec  = "SU2_CFD"
     slinc_steady.timeout   = 100
     slinc_steady.tol       = 0.00001
@@ -1104,7 +1104,7 @@ def main():
     cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
     cht_incompressible.cfg_file  = "config.cfg"
     cht_incompressible.test_iter = 10
-    cht_incompressible.test_vals = [ 10, -1.552349, -6.795633, -3.342894] #last 4 columns
+    cht_incompressible.test_vals = [10.000000, -2.555933, -3.280592] #last 4 columns
     cht_incompressible.su2_exec  = "SU2_CFD"
     cht_incompressible.timeout   = 1600
     cht_incompressible.multizone = True

From 21b3416d93abce2125728bd3ce24360faddc199a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 12:23:54 +0200
Subject: [PATCH 218/539] Some fixes

---
 Common/src/config_structure.cpp               |  2 +-
 SU2_CFD/src/SU2_CFD.cpp                       |  2 +-
 SU2_CFD/src/driver_structure.cpp              |  3 +-
 SU2_CFD/src/output_direct_mean_inc.cpp        |  7 ++--
 SU2_CFD/src/output_structure.cpp              |  3 +-
 SU2_PY/SU2/io/config.py                       | 10 ++++--
 SU2_PY/compute_polar.py                       |  2 +-
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  6 ++--
 .../spinning_cylinder/spinning_cylinder.cfg   |  2 +-
 .../poiseuille/lam_poiseuille.cfg             |  2 +-
 TestCases/serial_regression.py                |  2 +-
 .../sliding_interface/channel_2D/zone_1.cfg   | 18 +++++++++++
 .../sliding_interface/channel_2D/zone_2.cfg   | 25 +++++++++++++++
 .../sliding_interface/channel_2D/zone_3.cfg   | 24 ++++++++++++++
 TestCases/sliding_interface/pipe/zone_1.cfg   | 17 ++++++++++
 TestCases/sliding_interface/pipe/zone_2.cfg   | 29 +++++++++++++++++
 TestCases/sliding_interface/pipe/zone_3.cfg   | 32 +++++++++++++++++++
 TestCases/sliding_interface/pipe/zone_4.cfg   | 30 +++++++++++++++++
 TestCases/sliding_interface/pipe/zone_5.cfg   | 30 +++++++++++++++++
 .../rotating_cylinders/zone_1.cfg             |  0
 .../rotating_cylinders/zone_2.cfg             | 16 ++++++++++
 .../rotating_cylinders/zone_3.cfg             | 15 +++++++++
 .../sliding_interface/single_stage/zone_1.cfg | 19 +++++++++++
 .../sliding_interface/single_stage/zone_2.cfg | 28 ++++++++++++++++
 .../supersonic_vortex_shedding/zone_1.cfg     | 17 ++++++++++
 .../supersonic_vortex_shedding/zone_2.cfg     | 24 ++++++++++++++
 .../sliding_interface/uniform_flow/zone_1.cfg | 17 ++++++++++
 .../sliding_interface/uniform_flow/zone_2.cfg | 25 +++++++++++++++
 .../turbomachinery/APU_turbocharger/rotor.cfg | 18 +++++++++++
 .../APU_turbocharger/stator.cfg               |  7 ++++
 30 files changed, 416 insertions(+), 16 deletions(-)
 create mode 100644 TestCases/sliding_interface/channel_2D/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/channel_2D/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/channel_2D/zone_3.cfg
 create mode 100644 TestCases/sliding_interface/pipe/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/pipe/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/pipe/zone_3.cfg
 create mode 100644 TestCases/sliding_interface/pipe/zone_4.cfg
 create mode 100644 TestCases/sliding_interface/pipe/zone_5.cfg
 create mode 100644 TestCases/sliding_interface/rotating_cylinders/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/rotating_cylinders/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/rotating_cylinders/zone_3.cfg
 create mode 100644 TestCases/sliding_interface/single_stage/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/single_stage/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/supersonic_vortex_shedding/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/supersonic_vortex_shedding/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/uniform_flow/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/uniform_flow/zone_2.cfg
 create mode 100644 TestCases/turbomachinery/APU_turbocharger/rotor.cfg
 create mode 100644 TestCases/turbomachinery/APU_turbocharger/stator.cfg

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index f7ddf95168e1..4d7954ff1e60 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3056,7 +3056,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   if (Kind_Solver == FEM_ELASTICITY) {
     nMGLevels = 0;
-    if (Dynamic_Analysis == STATIC) nExtIter = 1;
+    if (Dynamic_Analysis == STATIC) nIter = 1;
   }
 
   /*--- Initialize the ofstream ConvHistFile. ---*/
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 792c9f34c145..fad78ab8770e 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
   /*--- First, given the basic information about the number of zones and the
    solver types from the config, instantiate the appropriate driver for the problem
    and perform all the preprocessing. ---*/
-  if (config->GetSinglezone_Driver()) {
+  if (config->GetSinglezone_Driver() && config->GetUnsteady_Simulation() != HARMONIC_BALANCE && !turbo) {
 
     /*--- Single zone problem: instantiate the single zone driver class. ---*/
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 64d6c0c1a02b..6b61fd980794 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3988,7 +3988,8 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   if (!fsi) {
     for (iZone = 0; iZone < nZone; iZone++) {
       for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+        if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver())
+            || config_container[iZone]->GetBoolTurbomachinery() || config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE)
         output[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
             config_container, integration_container, false, UsedTime, iZone, iInst);
     }
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 9532fc3eaf5c..5a6920515d78 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -395,9 +395,10 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     
     if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
-
-    if (nDim == 3) SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(4)));
-    else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
+    if (multizone){
+      if (nDim == 3) SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(4)));
+      else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
+    }
 
   }
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp
index a20fd7192960..e2f533bba5c4 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output_structure.cpp
@@ -40,7 +40,8 @@
 COutput::COutput(CConfig *config) {
   
   
-  if((!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()) || config->GetBoolTurbomachinery()){
+  if((!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()) 
+     || config->GetBoolTurbomachinery() || config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
     output_legacy = new COutputLegacy(config);
   }
   
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 7bba41155092..73fa393ea34a 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -407,10 +407,13 @@ def read_config(filename):
             # int parameters
             if case("NUMBER_PART")            or\
                case("AVAILABLE_PROC")         or\
-               case("EXT_ITER")               or\
+               case("ITER")               or\
                case("TIME_INSTANCES")         or\
                case("UNST_ADJOINT_ITER")      or\
                case("ITER_AVERAGE_OBJ")       or\
+               case("INNER_ITER")             or\
+               case("OUTER_ITER")             or\
+               case("TIME_ITER")             or\
                case("ADAPT_CYCLES")           :
                 data_dict[this_param] = int(this_value)
                 break                
@@ -868,7 +871,10 @@ def write_config(filename,param_dict):
             if case("TIME_INSTANCES")         : pass
             if case("AVAILABLE_PROC")         : pass
             if case("UNST_ADJOINT_ITER")      : pass
-            if case("EXT_ITER")               :
+            if case("ITER")              or\
+               case("TIME_ITER")         or\
+               case("INNER_ITER")        or\
+               case("OUTER_ITER"): 
                 output_file.write("%i" % new_value)
                 break
                         
diff --git a/SU2_PY/compute_polar.py b/SU2_PY/compute_polar.py
index 4b05084284af..872f84384b47 100755
--- a/SU2_PY/compute_polar.py
+++ b/SU2_PY/compute_polar.py
@@ -164,7 +164,7 @@ def main():
     # prepare config
     config.NUMBER_PART = options.partitions
     if options.iterations > 0:
-        config.EXT_ITER = options.iterations
+        config.ITER = options.iterations
     config.NZONES = 1
 
     # find solution files if they exist
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index b4edecbd83ed..8ff5f9345517 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -29,9 +29,9 @@ TIME_DOMAIN=YES
 DYNAMIC_ANALYSIS= YES
 DYN_TIMESTEP= 0.01
 TIME_STEP=0.01
-DYN_TIME= 0.1
-EXT_ITER=2
-TIME_ITER=6
+MAX_TIME= 0.1
+INNER_ITER=2
+TIME_ITER=7
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.2601
 NEWMARK_GAMMA=0.52
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 5378f5ec4f62..364c9eaa330c 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -147,7 +147,7 @@ SENS_REMOVE_SHARP= NO
 LINEAR_SOLVER= FGMRES
 %
 % Preconditioner of the Krylov linear solver (JACOBI, LINELET, LU_SGS)
-LINEAR_SOLVER_PREC= ILU
+LINEAR_SOLVER_PREC= LU_SGS
 %
 % Minimum error of the linear solver for implicit formulations
 LINEAR_SOLVER_ERROR= 1E-4
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 040c10a72b34..d6431846a8c6 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -155,7 +155,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 15.0, 10000.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 10ece91a3211..c3a6619aaa65 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.730922, -1.612375] #last 3 columns
+    bars_SST_2D.test_vals = [13.000000, -0.736160, -1.619596] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
diff --git a/TestCases/sliding_interface/channel_2D/zone_1.cfg b/TestCases/sliding_interface/channel_2D/zone_1.cfg
new file mode 100644
index 000000000000..d8ea6fafbe8d
--- /dev/null
+++ b/TestCases/sliding_interface/channel_2D/zone_1.cfg
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: bars in a 2D channel with interface                        %
+% Author: A. Rubino                                                            %
+% Institution: Delft University of Technology                                  %
+% Date: Feb 27th, 2017                                                         %
+% File Version 6.2.0 "Falcon"                                                   %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= NONE
+
+
+
+
diff --git a/TestCases/sliding_interface/channel_2D/zone_2.cfg b/TestCases/sliding_interface/channel_2D/zone_2.cfg
new file mode 100644
index 000000000000..f8299635858a
--- /dev/null
+++ b/TestCases/sliding_interface/channel_2D/zone_2.cfg
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: bars in a 2D channel with interface                        %
+% Author: A. Rubino                                                            %
+% Institution: Delft University of Technology                                  %
+% Date: Feb 27th, 2017                                                         %
+% File Version 6.2.0 "Falcon"                                                   %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+% Origin of the motion
+MOTION_ORIGIN= 0.0 0.0 0.0
+%
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.0 0.0 0.1 
diff --git a/TestCases/sliding_interface/channel_2D/zone_3.cfg b/TestCases/sliding_interface/channel_2D/zone_3.cfg
new file mode 100644
index 000000000000..155e1c219553
--- /dev/null
+++ b/TestCases/sliding_interface/channel_2D/zone_3.cfg
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: bars in a 2D channel with interface                        %
+% Author: A. Rubino                                                            %
+% Institution: Delft University of Technology                                  %
+% Date: Feb 27th, 2017                                                         %
+% File Version 6.2.0 "Falcon"                                                   %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+% Origin of the motion
+MOTION_ORIGIN= 0.0 0.0 0.0
+%
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE= 0.0 0.0 -0.1
diff --git a/TestCases/sliding_interface/pipe/zone_1.cfg b/TestCases/sliding_interface/pipe/zone_1.cfg
new file mode 100644
index 000000000000..feb2bb33b087
--- /dev/null
+++ b/TestCases/sliding_interface/pipe/zone_1.cfg
@@ -0,0 +1,17 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT=NONE
+
diff --git a/TestCases/sliding_interface/pipe/zone_2.cfg b/TestCases/sliding_interface/pipe/zone_2.cfg
new file mode 100644
index 000000000000..356ae57f46e2
--- /dev/null
+++ b/TestCases/sliding_interface/pipe/zone_2.cfg
@@ -0,0 +1,29 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.1 0.0 0.0
+%
+%
diff --git a/TestCases/sliding_interface/pipe/zone_3.cfg b/TestCases/sliding_interface/pipe/zone_3.cfg
new file mode 100644
index 000000000000..b500431b81fe
--- /dev/null
+++ b/TestCases/sliding_interface/pipe/zone_3.cfg
@@ -0,0 +1,32 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.2 0.0 0.0
+%
+%
+
+
+
diff --git a/TestCases/sliding_interface/pipe/zone_4.cfg b/TestCases/sliding_interface/pipe/zone_4.cfg
new file mode 100644
index 000000000000..2604ae779f5e
--- /dev/null
+++ b/TestCases/sliding_interface/pipe/zone_4.cfg
@@ -0,0 +1,30 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = -0.1 0.0 0.0
+%
+%
+
diff --git a/TestCases/sliding_interface/pipe/zone_5.cfg b/TestCases/sliding_interface/pipe/zone_5.cfg
new file mode 100644
index 000000000000..be99c6a8d1e4
--- /dev/null
+++ b/TestCases/sliding_interface/pipe/zone_5.cfg
@@ -0,0 +1,30 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.1 0.0 0.0
+%
+%
+
diff --git a/TestCases/sliding_interface/rotating_cylinders/zone_1.cfg b/TestCases/sliding_interface/rotating_cylinders/zone_1.cfg
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/TestCases/sliding_interface/rotating_cylinders/zone_2.cfg b/TestCases/sliding_interface/rotating_cylinders/zone_2.cfg
new file mode 100644
index 000000000000..08ca4f7db548
--- /dev/null
+++ b/TestCases/sliding_interface/rotating_cylinders/zone_2.cfg
@@ -0,0 +1,16 @@
+
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.0 0.0 0.1
+
diff --git a/TestCases/sliding_interface/rotating_cylinders/zone_3.cfg b/TestCases/sliding_interface/rotating_cylinders/zone_3.cfg
new file mode 100644
index 000000000000..f3b8e38812a0
--- /dev/null
+++ b/TestCases/sliding_interface/rotating_cylinders/zone_3.cfg
@@ -0,0 +1,15 @@
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.0 0.0 -0.1
+
diff --git a/TestCases/sliding_interface/single_stage/zone_1.cfg b/TestCases/sliding_interface/single_stage/zone_1.cfg
new file mode 100644
index 000000000000..cc49d2cc9f94
--- /dev/null
+++ b/TestCases/sliding_interface/single_stage/zone_1.cfg
@@ -0,0 +1,19 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Dynamic mesh simulation (NO, YES)
+GRID_MOVEMENT= NONE
+%
+
diff --git a/TestCases/sliding_interface/single_stage/zone_2.cfg b/TestCases/sliding_interface/single_stage/zone_2.cfg
new file mode 100644
index 000000000000..136ffadfaffa
--- /dev/null
+++ b/TestCases/sliding_interface/single_stage/zone_2.cfg
@@ -0,0 +1,28 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a pipe with rotating sections     %
+%                   nearest neighbour approach holds at sliding interface      %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.1 0.0 0.0
+
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/zone_1.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/zone_1.cfg
new file mode 100644
index 000000000000..ec16cb31d046
--- /dev/null
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/zone_1.cfg
@@ -0,0 +1,17 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D inviscid, this test case reproduces vortex shedding     %
+%                   after a cylindrical body in a supersonic upstream flow     %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Dynamic mesh simulation (NO, YES)
+GRID_MOVEMENT= NONE
+
+%
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/zone_2.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/zone_2.cfg
new file mode 100644
index 000000000000..d14c032f9e6c
--- /dev/null
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/zone_2.cfg
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D inviscid, this test case reproduces vortex shedding     %
+%                   after a cylindrical body in a supersonic upstream flow     %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.4 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.0 0.0 0.1
diff --git a/TestCases/sliding_interface/uniform_flow/zone_1.cfg b/TestCases/sliding_interface/uniform_flow/zone_1.cfg
new file mode 100644
index 000000000000..7c425dbf8f0d
--- /dev/null
+++ b/TestCases/sliding_interface/uniform_flow/zone_1.cfg
@@ -0,0 +1,17 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D, inviscid flow, this test case is used for debugging    %
+%                   purposes, part of the grid is moving                       %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Dynamic mesh simulation (NO, YES)
+GRID_MOVEMENT= NONE
+%
+
diff --git a/TestCases/sliding_interface/uniform_flow/zone_2.cfg b/TestCases/sliding_interface/uniform_flow/zone_2.cfg
new file mode 100644
index 000000000000..ddd50c65a42e
--- /dev/null
+++ b/TestCases/sliding_interface/uniform_flow/zone_2.cfg
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D, inviscid flow, this test case is used for debugging    %
+%                   purposes, part of the grid is moving                       %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.3 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE = 0.0 0.0 160.0
diff --git a/TestCases/turbomachinery/APU_turbocharger/rotor.cfg b/TestCases/turbomachinery/APU_turbocharger/rotor.cfg
new file mode 100644
index 000000000000..fa77fa7de249
--- /dev/null
+++ b/TestCases/turbomachinery/APU_turbocharger/rotor.cfg
@@ -0,0 +1,18 @@
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= ROTATING_FRAME
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE= 0.0 0.0 7508.3 
+
+% Specify ramp option fr rotating frame (YES, NO) default NO
+RAMP_ROTATING_FRAME= YES
+%
+% Parameters of the rotating frame ramp (starting rotational speed, updating-iteration-frequency, total number of iteration for the ramp)
+RAMP_ROTATING_FRAME_COEFF= (0.0, 39.0, 500)
diff --git a/TestCases/turbomachinery/APU_turbocharger/stator.cfg b/TestCases/turbomachinery/APU_turbocharger/stator.cfg
new file mode 100644
index 000000000000..c0edc115e031
--- /dev/null
+++ b/TestCases/turbomachinery/APU_turbocharger/stator.cfg
@@ -0,0 +1,7 @@
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= NONE
+%
+

From 85b7a7fbb87e9a2d9f4896f72b7fa112b11b5d8d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 14:00:32 +0200
Subject: [PATCH 219/539] Fix SU2_DOT and SU2_DEF for multizone/physics
 problems

---
 SU2_DEF/src/SU2_DEF.cpp | 28 +++++++++++++++++++++++++++-
 SU2_DOT/src/SU2_DOT.cpp |  6 +-----
 SU2_SOL/src/SU2_SOL.cpp |  2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index b5cf82050dc8..3aadeef9fb57 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -67,6 +67,7 @@ int main(int argc, char *argv[]) {
   CSurfaceMovement **surface_movement = NULL;
   CVolumetricMovement **grid_movement = NULL;
   COutput **output                     = NULL;
+  CConfig *driver_config                = NULL;
 
   /*--- Load in the number of zones and spatial dimensions in the mesh file
    (if no config file is specified, default.cfg is used) ---*/
@@ -91,6 +92,8 @@ int main(int argc, char *argv[]) {
   surface_movement   = new CSurfaceMovement*[nZone];
   grid_movement      = new CVolumetricMovement*[nZone];
   output             = new COutput*[nZone];
+  
+  driver_config       = NULL;
 
   for (iZone = 0; iZone < nZone; iZone++) {
     config_container[iZone]       = NULL;
@@ -100,6 +103,12 @@ int main(int argc, char *argv[]) {
     output[iZone]                 = NULL;
   }
   
+  /*--- Initialize the configuration of the driver ---*/
+  driver_config = new CConfig(config_file_name, SU2_DOT, nZone, VERB_NONE);
+
+  /*--- Initialize a char to store the zone filename ---*/
+  char zone_file_name[MAX_STRING_SIZE];
+
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
    differential equation on a single block, unstructured mesh. ---*/
@@ -110,8 +119,25 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
     
-    config_container[iZone] = new CConfig(config_file_name, SU2_DEF, iZone, VERB_HIGH);
+    if (driver_config->GetnConfigFiles() > 0){
+      strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+    }
+    else{
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+    }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
+  }
+  
+  /*--- Set the multizone part of the problem. ---*/
+  if (driver_config->GetMultizone_Problem()){
+    for (iZone = 0; iZone < nZone; iZone++) {
+      /*--- Set the interface markers for multizone ---*/
+      config_container[iZone]->SetMultizone(driver_config, config_container);
+    }
+  }
+  
+  for (iZone = 0; iZone < nZone; iZone++) {
     
     /*--- Definition of the geometry class to store the primal grid in the partitioning process. ---*/
     
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 57e49180baa8..3248f98d1e47 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -47,7 +47,6 @@ int main(int argc, char *argv[]) {
   ofstream Gradient_file;
   bool fem_solver = false;
   bool periodic   = false;
-  bool multizone = false;
   
   su2double** Gradient;
   unsigned short iDV, iDV_Value;
@@ -114,9 +113,6 @@ int main(int argc, char *argv[]) {
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
 
-  /*--- Store a boolean for multizone problems ---*/
-  multizone = (driver_config->GetMultizone_Problem());
-
   /*--- Loop over all zones to initialize the various classes. In most
    cases, nZone is equal to one. This represents the solution of a partial
    differential equation on a single block, unstructured mesh. ---*/
@@ -127,7 +123,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
 
-    if (multizone){
+    if (driver_config->GetnConfigFiles() > 0){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
       config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
     }
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index ffbc23a342c4..6c65adbf3cd7 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) {
      constructor, the input configuration file is parsed and all options are
      read and stored. ---*/
 
-    if (multizone){
+    if (driver_config->GetnConfigFiles() > 0){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
       config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_SOL, iZone, nZone, VERB_HIGH);
     }

From 2da89b8e6400990b5fcb42004a0eefe4ceba9409 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 14:08:26 +0200
Subject: [PATCH 220/539] Added missing config files

---
 .../hb_rans_preconditioning/davis.cfg         |  2 +-
 .../sliding_interface/channel_3D/zone_1.cfg   | 18 +++++++++++++
 .../sliding_interface/channel_3D/zone_2.cfg   | 25 +++++++++++++++++++
 .../sliding_interface/channel_3D/zone_3.cfg   | 24 ++++++++++++++++++
 .../turbomachinery/axial_stage_2D/zone_1.cfg  | 17 +++++++++++++
 .../turbomachinery/axial_stage_2D/zone_2.cfg  | 22 ++++++++++++++++
 6 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 TestCases/sliding_interface/channel_3D/zone_1.cfg
 create mode 100644 TestCases/sliding_interface/channel_3D/zone_2.cfg
 create mode 100644 TestCases/sliding_interface/channel_3D/zone_3.cfg
 create mode 100644 TestCases/turbomachinery/axial_stage_2D/zone_1.cfg
 create mode 100644 TestCases/turbomachinery/axial_stage_2D/zone_2.cfg

diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index b633be5696f3..9617adb2ace0 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -40,7 +40,7 @@ HB_PRECONDITION= YES
 HB_PERIOD= 0.057465
 %
 % List of frequencies to be resolved for harmonic balance method
-OMEGA_HB = [0,109.339, 218.678, 328.017,-109.339, -218.678, -328.017]
+OMEGA_HB = (0,109.339, 218.678, 328.017,-109.339, -218.678, -328.017)
 %
 % Type of mesh motion (NONE, FLUTTER, RIGID_ROTATION, RIGID_PITCHING)
 GRID_MOVEMENT= RIGID_MOTION
diff --git a/TestCases/sliding_interface/channel_3D/zone_1.cfg b/TestCases/sliding_interface/channel_3D/zone_1.cfg
new file mode 100644
index 000000000000..a1f382bb16dc
--- /dev/null
+++ b/TestCases/sliding_interface/channel_3D/zone_1.cfg
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a channel with a partially        %
+%                   moving grid, nearest neighbour approach holds at interface %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Dynamic mesh simulation (NO, YES)
+GRID_MOVEMENT= NONE
+%
+
diff --git a/TestCases/sliding_interface/channel_3D/zone_2.cfg b/TestCases/sliding_interface/channel_3D/zone_2.cfg
new file mode 100644
index 000000000000..ec1aa76bc155
--- /dev/null
+++ b/TestCases/sliding_interface/channel_3D/zone_2.cfg
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a channel with a partially        %
+%                   moving grid, nearest neighbour approach holds at interface %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE= 0.0 0.0 0.1
diff --git a/TestCases/sliding_interface/channel_3D/zone_3.cfg b/TestCases/sliding_interface/channel_3D/zone_3.cfg
new file mode 100644
index 000000000000..59c20711a6d1
--- /dev/null
+++ b/TestCases/sliding_interface/channel_3D/zone_3.cfg
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 3D, inviscid flow inside a channel with a partially        %
+%                   moving grid, nearest neighbour approach holds at interface %
+% Author: G. Gori                                                              %
+% Institution: Politecnico di Milano					       %
+% Date: Oct 5th, 2016                                                          %
+% File Version 4.3.0 "cardinal"                                                %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= RIGID_MOTION 
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+
+MOTION_ORIGIN= 0.0 0.0 0.0
+
+% Angular velocity vector (rad/s) about the motion origi. Example 1250 RPM -> 130.89969389957471 rad/s
+ROTATION_RATE= 0.1 0.0 0.0
diff --git a/TestCases/turbomachinery/axial_stage_2D/zone_1.cfg b/TestCases/turbomachinery/axial_stage_2D/zone_1.cfg
new file mode 100644
index 000000000000..3ddcc043834a
--- /dev/null
+++ b/TestCases/turbomachinery/axial_stage_2D/zone_1.cfg
@@ -0,0 +1,17 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D Axial stage                                             %
+% Author: S. Vitale                                                            %
+% Institution: Delft University of Technology                                  %
+% Date: Feb 28th, 2017                                                         %
+% File Version 5.0.0"cardinal"                                                 %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= NONE
+%
+
diff --git a/TestCases/turbomachinery/axial_stage_2D/zone_2.cfg b/TestCases/turbomachinery/axial_stage_2D/zone_2.cfg
new file mode 100644
index 000000000000..02acc04d9384
--- /dev/null
+++ b/TestCases/turbomachinery/axial_stage_2D/zone_2.cfg
@@ -0,0 +1,22 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: 2D Axial stage                                             %
+% Author: S. Vitale                                                            %
+% Institution: Delft University of Technology                                  %
+% Date: Feb 28th, 2017                                                         %
+% File Version 5.0.0"cardinal"                                                 %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+% Type of dynamic mesh (NONE, ROTATING_FRAME)
+GRID_MOVEMENT= STEADY_TRANSLATION
+%
+% Motion mach number (non-dimensional). Used for intitializing a viscous flow
+% with the Reynolds number and for computing force coeffs. with dynamic meshes.
+MACH_MOTION= 0.35
+%
+%Steady transaltion rate
+TRANSLATION_RATE= 0.0 -150.0 0.0

From 0c084f234ba0e958ee466026eb4e1ba26da84e39 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 15:55:32 +0200
Subject: [PATCH 221/539] Adding flow common output

---
 SU2_CFD/include/output/output_flow.hpp        |   4 +-
 SU2_CFD/include/output/output_flow_common.hpp |  66 ++
 SU2_CFD/include/output/output_flow_fem.hpp    |   4 +-
 SU2_CFD/include/output/output_flow_inc.hpp    |   4 +-
 SU2_CFD/obj/Makefile.am                       |   2 +
 SU2_CFD/src/output_direct_mean.cpp            | 160 +----
 SU2_CFD/src/output_direct_mean_fem.cpp        | 104 +--
 SU2_CFD/src/output_direct_mean_inc.cpp        | 148 +---
 SU2_CFD/src/output_flow_common.cpp            | 660 ++++++++++++++++++
 9 files changed, 781 insertions(+), 371 deletions(-)
 create mode 100644 SU2_CFD/include/output/output_flow_common.hpp
 create mode 100644 SU2_CFD/src/output_flow_common.cpp

diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index f5ed1dccfcea..30f645469909 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -38,14 +38,14 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "output_flow_common.hpp"
 
 /*! \class CFlowOutput
  *  \brief Output class for compressible Flow problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowOutput : public COutput {
+class CFlowOutput : public CFlowCommonOutput {
 private:
   
   unsigned short nVar;
diff --git a/SU2_CFD/include/output/output_flow_common.hpp b/SU2_CFD/include/output/output_flow_common.hpp
new file mode 100644
index 000000000000..5162ab24a0f5
--- /dev/null
+++ b/SU2_CFD/include/output/output_flow_common.hpp
@@ -0,0 +1,66 @@
+/*!
+ * \file output_flow_inc.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "output.hpp"
+
+class CFlowCommonOutput : public COutput{
+  
+  
+public:
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CFlowCommonOutput(CConfig *config);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CFlowCommonOutput(void);
+  
+  void AddAnalyzeSurfaceOutput(CConfig *config);
+  
+  void SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  
+  void AddAerodynamicCoefficients(CConfig *config);
+  
+  void SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver);
+  
+};
diff --git a/SU2_CFD/include/output/output_flow_fem.hpp b/SU2_CFD/include/output/output_flow_fem.hpp
index 6acf4907fd04..dcdccb76fc9f 100644
--- a/SU2_CFD/include/output/output_flow_fem.hpp
+++ b/SU2_CFD/include/output/output_flow_fem.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "output_flow_common.hpp"
 
 
 /*! \class CFlowFEMOutput
@@ -46,7 +46,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowFEMOutput : public COutput {
+class CFlowFEMOutput : public CFlowCommonOutput {
 private:
   
   unsigned short nVar;
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/output_flow_inc.hpp
index 250d233b3086..a6e05b9c180a 100644
--- a/SU2_CFD/include/output/output_flow_inc.hpp
+++ b/SU2_CFD/include/output/output_flow_inc.hpp
@@ -38,14 +38,14 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "output_flow_common.hpp"
 
 /*! \class CIncFlowOutput
  *  \brief Output class for compressible Flow problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CIncFlowOutput : public COutput {
+class CIncFlowOutput : public CFlowCommonOutput {
 private:
 
   unsigned short turb_model;
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index cf8bac0461b5..981f5d5bed0a 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -76,6 +76,7 @@ libSU2Core_sources = \
   ../include/output/output_baseline.hpp \
   ../include/output/output_fea.hpp \
   ../include/output/output_fea_discadj.hpp \
+  ../include/output/output_flow_common.hpp \
   ../include/output/output_flow.hpp \
   ../include/output/output_flow_adj.hpp \
   ../include/output/output_flow_discadj.hpp \
@@ -132,6 +133,7 @@ libSU2Core_sources = \
   ../src/output_csv.cpp \
   ../src/output_mesh.cpp \
   ../src/output_direct_elasticity.cpp \
+  ../src/output_flow_common.cpp \
   ../src/output_direct_mean.cpp \
   ../src/output_direct_mean_fem.cpp \
   ../src/output_direct_mean_inc.cpp \
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output_direct_mean.cpp
index afb9ae849f31..8aa252beae63 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output_direct_mean.cpp
@@ -35,10 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "../include/output/output_flow.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
+CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
   nDim = geometry->GetnDim();  
   
@@ -217,57 +216,11 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   default: break;
   }
   /// END_GROUP
-  
-  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
-  /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
+
   vector<string> Marker_Monitoring;
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
-  /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// END_GROUP 
-  
   /// BEGIN_GROUP: AEROELASTIC, DESCRIPTION: Aeroelastic plunge, pitch
   /// DESCRIPTION: Aeroelastic plunge
   AddHistoryOutputPerSurface("PLUNGE", "plunge", FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
@@ -275,46 +228,10 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutputPerSurface("PITCH",  "pitch",  FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
   /// END_GROUP
    
-  /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
-  
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
-  vector<string> Marker_Analyze;
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
-    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
-  }  
-  /// DESCRIPTION: Average mass flow    
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Mach number      
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Temperature        
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Pressure  
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Density  
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary strength
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total temperature  
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total pressure   
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Pressure drop    
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// END_GROUP
-  
+ 
   /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
   /// DESCRIPTION: Aero CD drag
   AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
@@ -341,6 +258,15 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Nearfield obj. function      
   AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
   /// END_GROUP
+  /// 
+  
+  /*--- Add analyze surface history fields --- */
+  
+  AddAnalyzeSurfaceOutput(config);
+  
+  /*--- Add aerodynamic coefficients fields --- */
+  
+  AddAerodynamicCoefficients(config);  
 
 }
 
@@ -676,62 +602,16 @@ void CFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
     }
   }
   
-  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
-  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
-  if (nDim == 3)
-    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
-  if (nDim == 3){
-    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
-    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
-  }
-  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
-  if (nDim == 3)
-    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
-  SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+ 
+  /*--- Set the analyse surface history values --- */
   
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3){
-      SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-      SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
-    }
-    SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
-    
-    SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
-    if (config->GetAeroelastic_Simulation()){
-      SetHistoryOutputPerSurfaceValue("PITCH", config->GetAeroelastic_pitch(iMarker_Monitoring), iMarker_Monitoring);
-      SetHistoryOutputPerSurfaceValue("PLUNGE", config->GetAeroelastic_plunge(iMarker_Monitoring), iMarker_Monitoring);
-    }
-  }
+  SetAnalyzeSurface(flow_solver, geometry, config, false);
   
-  SetHistoryOutputValue("AOA", config->GetAoA());
-  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  /*--- Set aeroydnamic coefficients --- */
   
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++) {  
-    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW",               config->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_MACH",                   config->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TEMP",                   config->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_PRESS",                  config->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",                config->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",               config->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",              config->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("UNIFORMITY",                 config->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",         config->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",        config->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",              config->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",             config->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",              config->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
-  }
+  SetAerodynamicCoefficients(config, flow_solver);
+
 }
 
 su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output_direct_mean_fem.cpp
index 7509c1976e5d..dbf716d13404 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output_direct_mean_fem.cpp
@@ -38,7 +38,7 @@
 
 #include "../include/output/output_flow_fem.hpp"
 
-CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
+CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
   nDim = geometry->GetnDim();  
   
@@ -169,95 +169,13 @@ void CFlowFEMOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// END_GROUP
   
-  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
-  /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// END_GROUP
+  /*--- Add analyze surface history fields --- */
   
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
-  vector<string> Marker_Monitoring;
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
-    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
-  }  
-  /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// END_GROUP 
-  
-  /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
-  /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
-  
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
-  vector<string> Marker_Analyze;
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
-    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
-  }  
-  /// DESCRIPTION: Average mass flow    
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Mach number      
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Temperature        
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Pressure  
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Density  
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary strength
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total temperature  
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total pressure   
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Pressure drop    
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// END_GROUP
+  AddAnalyzeSurfaceOutput(config);
+  
+  /*--- Add aerodynamic coefficients fields --- */
+  
+  AddAerodynamicCoefficients(config);
 
 }
 
@@ -445,6 +363,14 @@ void CFlowFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   
+  /*--- Set the analyse surface history values --- */
+  
+  SetAnalyzeSurface(flow_solver, geometry, config, false);
+  
+  /*--- Set aeroydnamic coefficients --- */
+  
+  SetAerodynamicCoefficients(config, flow_solver);
+  
 }
 
 su2double CFlowFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output_direct_mean_inc.cpp
index 5a6920515d78..31c2efa75831 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output_direct_mean_inc.cpp
@@ -35,10 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "../include/output/output_flow_inc.hpp"
 
-CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : COutput(config) {
+CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
   nDim = geometry->GetnDim();
   
@@ -218,29 +217,6 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
 
-  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
-  /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
-  /// END_GROUP
- 
   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
   /// DESCRIPTION: Total heatflux
   AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
@@ -250,74 +226,18 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
   /// END_GROUP
   
-  
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
-  vector<string> Marker_Monitoring;
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
-    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
-  }  
-  
-  /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
-  /// END_GROUP 
-  
   /// DESCRIPTION: Angle of attack  
   AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
   
-  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
-  vector<string> Marker_Analyze;
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
-    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
-  }  
-  /// DESCRIPTION: Average mass flow    
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Mach number      
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Temperature        
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Pressure  
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Density  
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary strength
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total temperature  
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Average total pressure   
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// DESCRIPTION: Pressure drop    
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
-  /// END_GROUP
+  /*--- Add analyze surface history fields --- */
+  
+  AddAnalyzeSurfaceOutput(config);
+  
+  /*--- Add aerodynamic coefficients fields --- */
+  
+  AddAerodynamicCoefficients(config);
   
 }
 
@@ -401,58 +321,14 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     }
 
   }
-  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
-  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
-  if (nDim == 3)
-    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
-  SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
-  SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
-  if (nDim == 3)
-    SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
-  if (nDim == 3)
-    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
   
-  SetHistoryOutputValue("AOA", config->GetAoA());
-  SetHistoryOutputValue("EFFICIENCY", HistoryOutput_Map["DRAG"].Value/HistoryOutput_Map["LIFT"].Value);
-  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  /*--- Set the analyse surface history values --- */
   
+  SetAnalyzeSurface(flow_solver, geometry, config, false);
   
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);    
-  }
+  /*--- Set aeroydnamic coefficients --- */
   
-  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
-    
-    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", config->GetSurface_MassFlow(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_MACH",     config->GetSurface_Mach(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TEMP",     config->GetSurface_Temperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_PRESS",    config->GetSurface_Pressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_DENSITY",  config->GetSurface_Density(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY",  config->GetSurface_Enthalpy(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL",  config->GetSurface_NormalVelocity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("UNIFORMITY",  config->GetSurface_Uniformity(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH",  config->GetSurface_SecondaryStrength(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION",  config->GetSurface_MomentumDistortion(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY",  config->GetSurface_SecondOverUniform(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP",  config->GetSurface_TotalTemperature(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS",  config->GetSurface_TotalPressure(iMarker_Analyze), iMarker_Analyze);
-    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  config->GetSurface_PressureDrop(iMarker_Analyze), iMarker_Analyze);
-    
-    
-  }
+  SetAerodynamicCoefficients(config, flow_solver);
 
 }
 
diff --git a/SU2_CFD/src/output_flow_common.cpp b/SU2_CFD/src/output_flow_common.cpp
new file mode 100644
index 000000000000..5b317af5492a
--- /dev/null
+++ b/SU2_CFD/src/output_flow_common.cpp
@@ -0,0 +1,660 @@
+
+
+#include "../include/output/output_flow_common.hpp"
+
+CFlowCommonOutput::CFlowCommonOutput(CConfig *config) : COutput (config){
+  
+}
+
+
+CFlowCommonOutput::~CFlowCommonOutput(void){}
+
+void CFlowCommonOutput::AddAnalyzeSurfaceOutput(CConfig *config){
+  
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
+  vector<string> Marker_Analyze;
+  for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
+    Marker_Analyze.push_back(config->GetMarker_Analyze_TagBound(iMarker_Analyze));
+  }  
+  
+  /// DESCRIPTION: Average mass flow    
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Mach number      
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Temperature        
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Pressure  
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Density  
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Enthalpy  
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average velocity in normal direction of the surface
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Flow uniformity 
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary strength
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Momentum distortion  
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary over uniformity 
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total temperature  
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total pressure   
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Pressure drop    
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  /// END_GROUP
+  
+}
+
+void CFlowCommonOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output){
+  
+  unsigned short iDim, iMarker, iMarker_Analyze;
+  unsigned long iVertex, iPoint;
+  su2double Mach = 0.0, Pressure, Temperature = 0.0, TotalPressure = 0.0, TotalTemperature = 0.0,
+  Enthalpy, Velocity[3], TangVel[3], Velocity2, MassFlow, Density, Area,
+  AxiFactor = 1.0, SoundSpeed, Vn, Vn2, Vtang2, Weight = 1.0;
+
+  su2double Gas_Constant      = config->GetGas_ConstantND();
+  su2double Gamma             = config->GetGamma();
+  unsigned short nMarker      = config->GetnMarker_All();
+  unsigned short nDim         = geometry->GetnDim();
+  unsigned short Kind_Average = config->GetKind_Average();
+
+  bool compressible   = config->GetKind_Regime() == COMPRESSIBLE;
+  bool incompressible = config->GetKind_Regime() == INCOMPRESSIBLE;
+  bool energy         = config->GetEnergy_Equation();
+
+
+  bool axisymmetric               = config->GetAxisymmetric();
+  unsigned short nMarker_Analyze  = config->GetnMarker_Analyze();
+  
+  su2double  *Vector                    = new su2double[nDim];
+  su2double  *Surface_MassFlow          = new su2double[nMarker];
+  su2double  *Surface_Mach              = new su2double[nMarker];
+  su2double  *Surface_Temperature       = new su2double[nMarker];
+  su2double  *Surface_Density           = new su2double[nMarker];
+  su2double  *Surface_Enthalpy          = new su2double[nMarker];
+  su2double  *Surface_NormalVelocity    = new su2double[nMarker];
+  su2double  *Surface_StreamVelocity2   = new su2double[nMarker];
+  su2double  *Surface_TransvVelocity2   = new su2double[nMarker];
+  su2double  *Surface_Pressure          = new su2double[nMarker];
+  su2double  *Surface_TotalTemperature  = new su2double[nMarker];
+  su2double  *Surface_TotalPressure     = new su2double[nMarker];
+  su2double  *Surface_VelocityIdeal     = new su2double[nMarker];
+  su2double  *Surface_Area              = new su2double[nMarker];
+  su2double  *Surface_MassFlow_Abs      = new su2double[nMarker];
+  
+  /*--- Compute the numerical fan face Mach number, and the total area of the inflow ---*/
+  
+  for (iMarker = 0; iMarker < nMarker; iMarker++) {
+    
+    Surface_MassFlow[iMarker]          = 0.0;
+    Surface_Mach[iMarker]              = 0.0;
+    Surface_Temperature[iMarker]       = 0.0;
+    Surface_Density[iMarker]           = 0.0;
+    Surface_Enthalpy[iMarker]          = 0.0;
+    Surface_NormalVelocity[iMarker]    = 0.0;
+    Surface_StreamVelocity2[iMarker]   = 0.0;
+    Surface_TransvVelocity2[iMarker]   = 0.0;
+    Surface_Pressure[iMarker]          = 0.0;
+    Surface_TotalTemperature[iMarker]  = 0.0;
+    Surface_TotalPressure[iMarker]     = 0.0;
+    Surface_VelocityIdeal[iMarker]     = 0.0;
+    Surface_Area[iMarker]              = 0.0;
+    Surface_MassFlow_Abs[iMarker]      = 0.0;
+
+    if (config->GetMarker_All_Analyze(iMarker) == YES) {
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        
+        if (geometry->node[iPoint]->GetDomain()) {
+          
+          geometry->vertex[iMarker][iVertex]->GetNormal(Vector);
+          
+          if (axisymmetric) {
+            if (geometry->node[iPoint]->GetCoord(1) != 0.0)
+              AxiFactor = 2.0*PI_NUMBER*geometry->node[iPoint]->GetCoord(1);
+            else
+              AxiFactor = 1.0;
+          } else {
+            AxiFactor = 1.0;
+          }
+
+          Density = solver->node[iPoint]->GetDensity();
+          Velocity2 = 0.0; Area = 0.0; MassFlow = 0.0; Vn = 0.0; Vtang2 = 0.0;
+
+          for (iDim = 0; iDim < nDim; iDim++) {
+            Area += (Vector[iDim] * AxiFactor) * (Vector[iDim] * AxiFactor);
+            Velocity[iDim] = solver->node[iPoint]->GetVelocity(iDim);
+            Velocity2 += Velocity[iDim] * Velocity[iDim];
+            Vn += Velocity[iDim] * Vector[iDim] * AxiFactor;
+            MassFlow += Vector[iDim] * AxiFactor * Density * Velocity[iDim];
+          }
+          
+          Area       = sqrt (Area);
+          if (AxiFactor == 0.0) Vn = 0.0; else Vn /= Area;
+          Vn2        = Vn * Vn;
+          Pressure   = solver->node[iPoint]->GetPressure();
+          SoundSpeed = solver->node[iPoint]->GetSoundSpeed();
+
+          for (iDim = 0; iDim < nDim; iDim++) {
+            TangVel[iDim] = Velocity[iDim] - Vn*Vector[iDim]*AxiFactor/Area;
+            Vtang2       += TangVel[iDim]*TangVel[iDim];
+          }
+
+          if (incompressible){
+            if (config->GetKind_DensityModel() == VARIABLE) {
+              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
+              sqrt(solver->node[iPoint]->GetSpecificHeatCp()*config->GetPressure_ThermodynamicND()/(solver->node[iPoint]->GetSpecificHeatCv()*solver->node[iPoint]->GetDensity()));
+            } else {
+              Mach = sqrt(solver->node[iPoint]->GetVelocity2())/
+              sqrt(config->GetBulk_Modulus()/(solver->node[iPoint]->GetDensity()));
+            }
+            Temperature       = solver->node[iPoint]->GetTemperature();
+            Enthalpy          = solver->node[iPoint]->GetSpecificHeatCp()*Temperature;
+            TotalTemperature  = Temperature + 0.5*Velocity2/solver->node[iPoint]->GetSpecificHeatCp();
+            TotalPressure     = Pressure + 0.5*Density*Velocity2;
+          }
+          else{
+            Mach              = sqrt(Velocity2)/SoundSpeed;
+            Temperature       = Pressure / (Gas_Constant * Density);
+            Enthalpy          = solver->node[iPoint]->GetEnthalpy();
+            TotalTemperature  = Temperature * (1.0 + Mach * Mach * 0.5 * (Gamma - 1.0));
+            TotalPressure     = Pressure * pow( 1.0 + Mach * Mach * 0.5 * (Gamma - 1.0), Gamma / (Gamma - 1.0));
+          }
+
+          /*--- Compute the mass Surface_MassFlow ---*/
+
+          Surface_Area[iMarker]             += Area;
+          Surface_MassFlow[iMarker]         += MassFlow;
+          Surface_MassFlow_Abs[iMarker]     += abs(MassFlow);
+
+          if (Kind_Average == AVERAGE_MASSFLUX) Weight = abs(MassFlow);
+          else if (Kind_Average == AVERAGE_AREA) Weight = abs(Area);
+          else Weight = 1.0;
+          
+          Surface_Mach[iMarker]             += Mach*Weight;
+          Surface_Temperature[iMarker]      += Temperature*Weight;
+          Surface_Density[iMarker]          += Density*Weight;
+          Surface_Enthalpy[iMarker]         += Enthalpy*Weight;
+          Surface_NormalVelocity[iMarker]   += Vn*Weight;
+          Surface_Pressure[iMarker]         += Pressure*Weight;
+          Surface_TotalTemperature[iMarker] += TotalTemperature*Weight;
+          Surface_TotalPressure[iMarker]    += TotalPressure*Weight;
+
+          /*--- For now, always used the area to weight the uniformities. ---*/
+
+          Weight = abs(Area);
+
+          Surface_StreamVelocity2[iMarker]   += Vn2*Weight;
+          Surface_TransvVelocity2[iMarker]   += Vtang2*Weight;
+
+        }
+      }
+      
+    }
+    
+  }
+  
+  /*--- Copy to the appropriate structure ---*/
+  
+  su2double *Surface_MassFlow_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_Mach_Local              = new su2double [nMarker_Analyze];
+  su2double *Surface_Temperature_Local       = new su2double [nMarker_Analyze];
+  su2double *Surface_Density_Local           = new su2double [nMarker_Analyze];
+  su2double *Surface_Enthalpy_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_NormalVelocity_Local    = new su2double [nMarker_Analyze];
+  su2double *Surface_StreamVelocity2_Local   = new su2double [nMarker_Analyze];
+  su2double *Surface_TransvVelocity2_Local   = new su2double [nMarker_Analyze];
+  su2double *Surface_Pressure_Local          = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalTemperature_Local  = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalPressure_Local     = new su2double [nMarker_Analyze];
+  su2double *Surface_Area_Local              = new su2double [nMarker_Analyze];
+  su2double *Surface_MassFlow_Abs_Local      = new su2double [nMarker_Analyze];
+  
+  su2double *Surface_MassFlow_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_Mach_Total              = new su2double [nMarker_Analyze];
+  su2double *Surface_Temperature_Total       = new su2double [nMarker_Analyze];
+  su2double *Surface_Density_Total           = new su2double [nMarker_Analyze];
+  su2double *Surface_Enthalpy_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_NormalVelocity_Total    = new su2double [nMarker_Analyze];
+  su2double *Surface_StreamVelocity2_Total   = new su2double [nMarker_Analyze];
+  su2double *Surface_TransvVelocity2_Total   = new su2double [nMarker_Analyze];
+  su2double *Surface_Pressure_Total          = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalTemperature_Total  = new su2double [nMarker_Analyze];
+  su2double *Surface_TotalPressure_Total     = new su2double [nMarker_Analyze];
+  su2double *Surface_Area_Total              = new su2double [nMarker_Analyze];
+  su2double *Surface_MassFlow_Abs_Total      = new su2double [nMarker_Analyze];
+
+  su2double *Surface_MomentumDistortion_Total = new su2double [nMarker_Analyze];
+
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    Surface_MassFlow_Local[iMarker_Analyze]          = 0.0;
+    Surface_Mach_Local[iMarker_Analyze]              = 0.0;
+    Surface_Temperature_Local[iMarker_Analyze]       = 0.0;
+    Surface_Density_Local[iMarker_Analyze]           = 0.0;
+    Surface_Enthalpy_Local[iMarker_Analyze]          = 0.0;
+    Surface_NormalVelocity_Local[iMarker_Analyze]    = 0.0;
+    Surface_StreamVelocity2_Local[iMarker_Analyze]   = 0.0;
+    Surface_TransvVelocity2_Local[iMarker_Analyze]   = 0.0;
+    Surface_Pressure_Local[iMarker_Analyze]          = 0.0;
+    Surface_TotalTemperature_Local[iMarker_Analyze]  = 0.0;
+    Surface_TotalPressure_Local[iMarker_Analyze]     = 0.0;
+    Surface_Area_Local[iMarker_Analyze]              = 0.0;
+    Surface_MassFlow_Abs_Local[iMarker_Analyze]      = 0.0;
+    
+    Surface_MassFlow_Total[iMarker_Analyze]          = 0.0;
+    Surface_Mach_Total[iMarker_Analyze]              = 0.0;
+    Surface_Temperature_Total[iMarker_Analyze]       = 0.0;
+    Surface_Density_Total[iMarker_Analyze]           = 0.0;
+    Surface_Enthalpy_Total[iMarker_Analyze]          = 0.0;
+    Surface_NormalVelocity_Total[iMarker_Analyze]    = 0.0;
+    Surface_StreamVelocity2_Total[iMarker_Analyze]   = 0.0;
+    Surface_TransvVelocity2_Total[iMarker_Analyze]   = 0.0;
+    Surface_Pressure_Total[iMarker_Analyze]          = 0.0;
+    Surface_TotalTemperature_Total[iMarker_Analyze]  = 0.0;
+    Surface_TotalPressure_Total[iMarker_Analyze]     = 0.0;
+    Surface_Area_Total[iMarker_Analyze]              = 0.0;
+    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = 0.0;
+
+    Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
+
+  }
+  
+  /*--- Compute the numerical fan face Mach number, mach number, temperature and the total area ---*/
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    
+    if (config->GetMarker_All_Analyze(iMarker) == YES)  {
+      
+      for (iMarker_Analyze= 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+        
+        /*--- Add the Surface_MassFlow, and Surface_Area to the particular boundary ---*/
+        
+        if (config->GetMarker_All_TagBound(iMarker) == config->GetMarker_Analyze_TagBound(iMarker_Analyze)) {
+          Surface_MassFlow_Local[iMarker_Analyze]          += Surface_MassFlow[iMarker];
+          Surface_Mach_Local[iMarker_Analyze]              += Surface_Mach[iMarker];
+          Surface_Temperature_Local[iMarker_Analyze]       += Surface_Temperature[iMarker];
+          Surface_Density_Local[iMarker_Analyze]           += Surface_Density[iMarker];
+          Surface_Enthalpy_Local[iMarker_Analyze]          += Surface_Enthalpy[iMarker];
+          Surface_NormalVelocity_Local[iMarker_Analyze]    += Surface_NormalVelocity[iMarker];
+          Surface_StreamVelocity2_Local[iMarker_Analyze]   += Surface_StreamVelocity2[iMarker];
+          Surface_TransvVelocity2_Local[iMarker_Analyze]   += Surface_TransvVelocity2[iMarker];
+          Surface_Pressure_Local[iMarker_Analyze]          += Surface_Pressure[iMarker];
+          Surface_TotalTemperature_Local[iMarker_Analyze]  += Surface_TotalTemperature[iMarker];
+          Surface_TotalPressure_Local[iMarker_Analyze]     += Surface_TotalPressure[iMarker];
+          Surface_Area_Local[iMarker_Analyze]              += Surface_Area[iMarker];
+          Surface_MassFlow_Abs_Local[iMarker_Analyze]      += Surface_MassFlow_Abs[iMarker];
+        }
+        
+      }
+      
+    }
+    
+  }
+  
+#ifdef HAVE_MPI
+  
+  SU2_MPI::Allreduce(Surface_MassFlow_Local, Surface_MassFlow_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Mach_Local, Surface_Mach_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Temperature_Local, Surface_Temperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Density_Local, Surface_Density_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Enthalpy_Local, Surface_Enthalpy_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_NormalVelocity_Local, Surface_NormalVelocity_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_StreamVelocity2_Local, Surface_StreamVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TransvVelocity2_Local, Surface_TransvVelocity2_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Pressure_Local, Surface_Pressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TotalTemperature_Local, Surface_TotalTemperature_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_TotalPressure_Local, Surface_TotalPressure_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_Area_Local, Surface_Area_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(Surface_MassFlow_Abs_Local, Surface_MassFlow_Abs_Total, nMarker_Analyze, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+
+#else
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    Surface_MassFlow_Total[iMarker_Analyze]          = Surface_MassFlow_Local[iMarker_Analyze];
+    Surface_Mach_Total[iMarker_Analyze]              = Surface_Mach_Local[iMarker_Analyze];
+    Surface_Temperature_Total[iMarker_Analyze]       = Surface_Temperature_Local[iMarker_Analyze];
+    Surface_Density_Total[iMarker_Analyze]           = Surface_Density_Local[iMarker_Analyze];
+    Surface_Enthalpy_Total[iMarker_Analyze]          = Surface_Enthalpy_Local[iMarker_Analyze];
+    Surface_NormalVelocity_Total[iMarker_Analyze]    = Surface_NormalVelocity_Local[iMarker_Analyze];
+    Surface_StreamVelocity2_Total[iMarker_Analyze]   = Surface_StreamVelocity2_Local[iMarker_Analyze];
+    Surface_TransvVelocity2_Total[iMarker_Analyze]   = Surface_TransvVelocity2_Local[iMarker_Analyze];
+    Surface_Pressure_Total[iMarker_Analyze]          = Surface_Pressure_Local[iMarker_Analyze];
+    Surface_TotalTemperature_Total[iMarker_Analyze]  = Surface_TotalTemperature_Local[iMarker_Analyze];
+    Surface_TotalPressure_Total[iMarker_Analyze]     = Surface_TotalPressure_Local[iMarker_Analyze];
+    Surface_Area_Total[iMarker_Analyze]              = Surface_Area_Local[iMarker_Analyze];
+    Surface_MassFlow_Abs_Total[iMarker_Analyze]      = Surface_MassFlow_Abs_Local[iMarker_Analyze];
+  }
+  
+#endif
+  
+  /*--- Compute the value of Surface_Area_Total, and Surface_Pressure_Total, and
+   set the value in the config structure for future use ---*/
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    
+    if (Kind_Average == AVERAGE_MASSFLUX) Weight = Surface_MassFlow_Abs_Total[iMarker_Analyze];
+    else if (Kind_Average == AVERAGE_AREA) Weight = abs(Surface_Area_Total[iMarker_Analyze]);
+    else Weight = 1.0;
+
+    if (Weight != 0.0) {
+      Surface_Mach_Total[iMarker_Analyze]             /= Weight;
+      Surface_Temperature_Total[iMarker_Analyze]      /= Weight;
+      Surface_Density_Total[iMarker_Analyze]          /= Weight;
+      Surface_Enthalpy_Total[iMarker_Analyze]         /= Weight;
+      Surface_NormalVelocity_Total[iMarker_Analyze]   /= Weight;
+      Surface_Pressure_Total[iMarker_Analyze]         /= Weight;
+      Surface_TotalTemperature_Total[iMarker_Analyze] /= Weight;
+      Surface_TotalPressure_Total[iMarker_Analyze]    /= Weight;
+    }
+    else {
+      Surface_Mach_Total[iMarker_Analyze]             = 0.0;
+      Surface_Temperature_Total[iMarker_Analyze]      = 0.0;
+      Surface_Density_Total[iMarker_Analyze]          = 0.0;
+      Surface_Enthalpy_Total[iMarker_Analyze]         = 0.0;
+      Surface_NormalVelocity_Total[iMarker_Analyze]   = 0.0;
+      Surface_Pressure_Total[iMarker_Analyze]         = 0.0;
+      Surface_TotalTemperature_Total[iMarker_Analyze] = 0.0;
+      Surface_TotalPressure_Total[iMarker_Analyze]    = 0.0;
+    }
+
+    /*--- Compute flow uniformity parameters separately (always area for now). ---*/
+
+    Area = fabs(Surface_Area_Total[iMarker_Analyze]);
+
+    if (Area != 0.0) {
+      Surface_MomentumDistortion_Total[iMarker_Analyze] = Surface_StreamVelocity2_Total[iMarker_Analyze]/(Surface_NormalVelocity_Total[iMarker_Analyze]*Surface_NormalVelocity_Total[iMarker_Analyze]*Area) - 1.0;
+      Surface_StreamVelocity2_Total[iMarker_Analyze] /= Area;
+      Surface_TransvVelocity2_Total[iMarker_Analyze] /= Area;
+    }
+    else {
+      Surface_MomentumDistortion_Total[iMarker_Analyze] = 0.0;
+      Surface_StreamVelocity2_Total[iMarker_Analyze]    = 0.0;
+      Surface_TransvVelocity2_Total[iMarker_Analyze]    = 0.0;
+    }
+
+  }
+  
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+        
+    su2double MassFlow = Surface_MassFlow_Total[iMarker_Analyze] * config->GetDensity_Ref() * config->GetVelocity_Ref();
+    if (config->GetSystemMeasurements() == US) MassFlow *= 32.174;
+    SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", MassFlow, iMarker_Analyze);
+    
+    su2double Mach = Surface_Mach_Total[iMarker_Analyze];
+    SetHistoryOutputPerSurfaceValue("AVG_MACH", Mach, iMarker_Analyze);
+    
+    su2double Temperature = Surface_Temperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_TEMP", Temperature, iMarker_Analyze);
+    
+    su2double Pressure = Surface_Pressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_PRESS", Pressure, iMarker_Analyze);
+
+    su2double Density = Surface_Density_Total[iMarker_Analyze] * config->GetDensity_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_DENSITY", Density, iMarker_Analyze);
+    
+    su2double Enthalpy = Surface_Enthalpy_Total[iMarker_Analyze];
+    SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY", Enthalpy, iMarker_Analyze);
+    
+    su2double NormalVelocity = Surface_NormalVelocity_Total[iMarker_Analyze] * config->GetVelocity_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL", NormalVelocity, iMarker_Analyze);
+
+    su2double Uniformity = sqrt(Surface_StreamVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
+    SetHistoryOutputPerSurfaceValue("UNIFORMITY", Uniformity, iMarker_Analyze);
+
+    su2double SecondaryStrength = sqrt(Surface_TransvVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
+    SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH", SecondaryStrength, iMarker_Analyze);
+
+    su2double MomentumDistortion = Surface_MomentumDistortion_Total[iMarker_Analyze];
+    SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION", MomentumDistortion, iMarker_Analyze);
+
+    su2double SecondOverUniform = SecondaryStrength/Uniformity;
+    SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY", SecondOverUniform, iMarker_Analyze);
+
+    su2double TotalTemperature = Surface_TotalTemperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP", TotalTemperature, iMarker_Analyze);
+    
+    su2double TotalPressure = Surface_TotalPressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
+    SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS", TotalPressure, iMarker_Analyze);
+    
+  }
+
+  /*--- Compute the average static pressure drop between two surfaces. Note
+   that this assumes we have two surfaces being analyzed and that the outlet
+   is first followed by the inlet. This is because we may also want to choose
+   outlet values (temperature, uniformity, etc.) for our design problems,
+   which require the outlet to be listed first. This is a simple first version
+   that could be generalized to a different orders/lists/etc. ---*/
+
+  for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+    su2double Pressure_Drop = 0.0;
+    if (nMarker_Analyze == 2) {
+      Pressure_Drop = (Surface_Pressure_Total[1]-Surface_Pressure_Total[0]) * config->GetPressure_Ref();
+      config->SetSurface_PressureDrop(iMarker_Analyze, Pressure_Drop);
+    } 
+    SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  Pressure_Drop, iMarker_Analyze);
+    
+  }
+
+  if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint() && output) {
+    
+    cout.precision(6);
+    cout.setf(ios::scientific, ios::floatfield);
+    cout << endl << "Computing surface mean values." << endl << endl;
+    
+    for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
+      cout << "Surface "<< config->GetMarker_Analyze_TagBound(iMarker_Analyze) << ":" << endl;
+      
+      if (nDim == 3) { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m^2): "; else cout << setw(20) << "Area (ft^2): "; }
+      else { if (config->GetSystemMeasurements() == SI) cout << setw(20) << "Area (m): "; else cout << setw(20) << "Area (ft): "; }
+      
+      if (config->GetSystemMeasurements() == SI)      cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze]);
+      else if (config->GetSystemMeasurements() == US) cout << setw(15) << fabs(Surface_Area_Total[iMarker_Analyze])*12.0*12.0;
+      
+      cout << endl;
+
+      su2double MassFlow = config->GetSurface_MassFlow(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Mf (kg/s): " << setw(15) << MassFlow;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Mf (lbs/s): " << setw(15) << MassFlow;
+      
+      su2double NormalVelocity = config->GetSurface_NormalVelocity(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Vn (m/s): " << setw(15) << NormalVelocity;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Vn (ft/s): " << setw(15) << NormalVelocity;
+      
+      cout << endl;
+
+      su2double Uniformity = config->GetSurface_Uniformity(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Uniformity (m/s): " << setw(15) << Uniformity;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Uniformity (ft/s): " << setw(15) << Uniformity;
+
+      su2double SecondaryStrength = config->GetSurface_SecondaryStrength(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Secondary (m/s): " << setw(15) << SecondaryStrength;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Secondary (ft/s): " << setw(15) << SecondaryStrength;
+
+      cout << endl;
+
+      su2double MomentumDistortion = config->GetSurface_MomentumDistortion(iMarker_Analyze);
+      cout << setw(20) << "Mom. Distortion: " << setw(15) << MomentumDistortion;
+
+      su2double SecondOverUniform = config->GetSurface_SecondOverUniform(iMarker_Analyze);
+      cout << setw(20) << "Second/Uniform: " << setw(15) << SecondOverUniform;
+
+      cout << endl;
+
+      su2double Pressure = config->GetSurface_Pressure(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "P (Pa): " << setw(15) << Pressure;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "P (psf): " << setw(15) << Pressure;
+      
+      su2double TotalPressure = config->GetSurface_TotalPressure(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "PT (Pa): " << setw(15) <<TotalPressure;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "PT (psf): " << setw(15) <<TotalPressure;
+
+      cout << endl;
+
+      su2double Mach = config->GetSurface_Mach(iMarker_Analyze);
+      cout << setw(20) << "Mach: " << setw(15) << Mach;
+
+      su2double Density = config->GetSurface_Density(iMarker_Analyze);
+      if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "Rho (kg/m^3): " << setw(15) << Density;
+      else if (config->GetSystemMeasurements() == US) cout << setw(20) << "Rho (lb/ft^3): " << setw(15) << Density*32.174;
+
+      cout << endl;
+
+      if (compressible || energy) {
+        su2double Temperature = config->GetSurface_Temperature(iMarker_Analyze);
+        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "T (K): " << setw(15) << Temperature;
+        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "T (R): " << setw(15) << Temperature;
+
+        su2double TotalTemperature = config->GetSurface_TotalTemperature(iMarker_Analyze);
+        if (config->GetSystemMeasurements() == SI)      cout << setw(20) << "TT (K): " << setw(15) << TotalTemperature;
+        else if (config->GetSystemMeasurements() == US) cout << setw(20) << "TT (R): " << setw(15) << TotalTemperature;
+
+        cout << endl;
+      }
+
+    }
+    cout.unsetf(ios_base::floatfield);
+    
+  }
+  
+  delete [] Surface_MassFlow_Local;
+  delete [] Surface_Mach_Local;
+  delete [] Surface_Temperature_Local;
+  delete [] Surface_Density_Local;
+  delete [] Surface_Enthalpy_Local;
+  delete [] Surface_NormalVelocity_Local;
+  delete [] Surface_Pressure_Local;
+  delete [] Surface_TotalTemperature_Local;
+  delete [] Surface_TotalPressure_Local;
+  delete [] Surface_Area_Local;
+  delete [] Surface_MassFlow_Abs_Local;
+  
+  delete [] Surface_MassFlow_Total;
+  delete [] Surface_Mach_Total;
+  delete [] Surface_Temperature_Total;
+  delete [] Surface_Density_Total;
+  delete [] Surface_Enthalpy_Total;
+  delete [] Surface_NormalVelocity_Total;
+  delete [] Surface_Pressure_Total;
+  delete [] Surface_TotalTemperature_Total;
+  delete [] Surface_TotalPressure_Total;
+  delete [] Surface_Area_Total;
+  delete [] Surface_MassFlow_Abs_Total;
+  
+  delete [] Surface_MassFlow;
+  delete [] Surface_Mach;
+  delete [] Surface_Temperature;
+  delete [] Surface_Density;
+  delete [] Surface_Enthalpy;
+  delete [] Surface_NormalVelocity;
+  delete [] Surface_Pressure;
+  delete [] Surface_TotalTemperature;
+  delete [] Surface_TotalPressure;
+  delete [] Surface_Area;
+  delete [] Vector;
+  delete [] Surface_VelocityIdeal;
+  delete [] Surface_MassFlow_Abs;
+}
+
+void CFlowCommonOutput::AddAerodynamicCoefficients(CConfig *config){
+  
+  /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
+  /// DESCRIPTION: Drag coefficient 
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient 
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient   
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis    
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis    
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis      
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction    
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction    
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction      
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  /// END_GROUP  
+  
+  /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
+  vector<string> Marker_Monitoring;
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++){
+    Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
+  }  
+  /// DESCRIPTION: Drag coefficient   
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift coefficient   
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Sideforce coefficient     
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the x-axis      
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the y-axis      
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Moment around the z-axis        
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in x direction      
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in y direction      
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Force in z direction        
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// DESCRIPTION: Lift-to-drag ratio  
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  /// END_GROUP 
+
+  /// DESCRIPTION: Angle of attack  
+  AddHistoryOutput("AOA", "AoA", FORMAT_SCIENTIFIC, "AOA");
+}
+
+void CFlowCommonOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
+  
+  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
+  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
+  if (nDim == 3)
+    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
+  if (nDim == 3){
+    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
+    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
+  }
+  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
+  if (nDim == 3)
+    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
+  SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
+  
+  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3){
+      SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
+    }
+    SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
+    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
+    if (nDim == 3)
+      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
+    
+    SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
+    if (config->GetAeroelastic_Simulation()){
+      SetHistoryOutputPerSurfaceValue("PITCH", config->GetAeroelastic_pitch(iMarker_Monitoring), iMarker_Monitoring);
+      SetHistoryOutputPerSurfaceValue("PLUNGE", config->GetAeroelastic_plunge(iMarker_Monitoring), iMarker_Monitoring);
+    }
+  }
+  
+  SetHistoryOutputValue("AOA", config->GetAoA());
+}

From 7a0dea9b61afdff87e368adb1a2bf97d334780f8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 16:28:27 +0200
Subject: [PATCH 222/539] Moved output files to new directory

---
 SU2_CFD/obj/Makefile.am                       | 44 +++++++++----------
 .../{ => output}/output_adjoint_discrete.cpp  |  2 +-
 .../output_adjoint_discrete_inc.cpp           |  2 +-
 .../output_adjoint_elasticity.cpp             |  2 +-
 .../src/{ => output}/output_adjoint_mean.cpp  |  2 +-
 SU2_CFD/src/{ => output}/output_baseline.cpp  |  2 +-
 SU2_CFD/src/{ => output}/output_cgns.cpp      |  2 +-
 SU2_CFD/src/{ => output}/output_csv.cpp       |  2 +-
 .../{ => output}/output_direct_elasticity.cpp |  2 +-
 .../src/{ => output}/output_direct_heat.cpp   |  2 +-
 .../src/{ => output}/output_direct_mean.cpp   |  2 +-
 .../{ => output}/output_direct_mean_fem.cpp   |  2 +-
 .../{ => output}/output_direct_mean_inc.cpp   |  2 +-
 SU2_CFD/src/{ => output}/output_driver.cpp    |  2 +-
 SU2_CFD/src/{ => output}/output_fieldview.cpp |  2 +-
 .../src/{ => output}/output_flow_common.cpp   |  2 +-
 SU2_CFD/src/{ => output}/output_mesh.cpp      |  2 +-
 SU2_CFD/src/{ => output}/output_paraview.cpp  |  2 +-
 SU2_CFD/src/{ => output}/output_physics.cpp   |  2 +-
 SU2_CFD/src/{ => output}/output_structure.cpp |  2 +-
 .../{ => output}/output_structure_legacy.cpp  |  2 +-
 SU2_CFD/src/{ => output}/output_su2.cpp       |  2 +-
 SU2_CFD/src/{ => output}/output_tecplot.cpp   |  2 +-
 23 files changed, 44 insertions(+), 44 deletions(-)
 rename SU2_CFD/src/{ => output}/output_adjoint_discrete.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_adjoint_discrete_inc.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_adjoint_elasticity.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_adjoint_mean.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_baseline.cpp (98%)
 rename SU2_CFD/src/{ => output}/output_cgns.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_csv.cpp (97%)
 rename SU2_CFD/src/{ => output}/output_direct_elasticity.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_direct_heat.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_direct_mean.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_direct_mean_fem.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_direct_mean_inc.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_driver.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_fieldview.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_flow_common.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_mesh.cpp (96%)
 rename SU2_CFD/src/{ => output}/output_paraview.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_physics.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_structure.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_structure_legacy.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_su2.cpp (99%)
 rename SU2_CFD/src/{ => output}/output_tecplot.cpp (99%)

diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 981f5d5bed0a..a46a482cba5c 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -123,28 +123,28 @@ libSU2Core_sources = \
   ../src/numerics_direct_elasticity.cpp \
   ../src/numerics_structure.cpp \
   ../src/numerics_template.cpp \
-  ../src/output_cgns.cpp \
-  ../src/output_structure.cpp \
-  ../src/output_physics.cpp \
-  ../src/output_tecplot.cpp \
-  ../src/output_fieldview.cpp \
-  ../src/output_su2.cpp \
-  ../src/output_paraview.cpp \
-  ../src/output_csv.cpp \
-  ../src/output_mesh.cpp \
-  ../src/output_direct_elasticity.cpp \
-  ../src/output_flow_common.cpp \
-  ../src/output_direct_mean.cpp \
-  ../src/output_direct_mean_fem.cpp \
-  ../src/output_direct_mean_inc.cpp \
-  ../src/output_direct_heat.cpp \
-  ../src/output_baseline.cpp \
-  ../src/output_adjoint_elasticity.cpp \
-  ../src/output_adjoint_discrete.cpp \
-  ../src/output_adjoint_discrete_inc.cpp \
-  ../src/output_adjoint_mean.cpp \
-  ../src/output_driver.cpp \
-  ../src/output_structure_legacy.cpp \
+  ../src/output/output_cgns.cpp \
+  ../src/output/output_structure.cpp \
+  ../src/output/output_physics.cpp \
+  ../src/output/output_tecplot.cpp \
+  ../src/output/output_fieldview.cpp \
+  ../src/output/output_su2.cpp \
+  ../src/output/output_paraview.cpp \
+  ../src/output/output_csv.cpp \
+  ../src/output/output_mesh.cpp \
+  ../src/output/output_direct_elasticity.cpp \
+  ../src/output/output_flow_common.cpp \
+  ../src/output/output_direct_mean.cpp \
+  ../src/output/output_direct_mean_fem.cpp \
+  ../src/output/output_direct_mean_inc.cpp \
+  ../src/output/output_direct_heat.cpp \
+  ../src/output/output_baseline.cpp \
+  ../src/output/output_adjoint_elasticity.cpp \
+  ../src/output/output_adjoint_discrete.cpp \
+  ../src/output/output_adjoint_discrete_inc.cpp \
+  ../src/output/output_adjoint_mean.cpp \
+  ../src/output/output_driver.cpp \
+  ../src/output/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
   ../src/solver_adjoint_turbulent.cpp \
diff --git a/SU2_CFD/src/output_adjoint_discrete.cpp b/SU2_CFD/src/output/output_adjoint_discrete.cpp
similarity index 99%
rename from SU2_CFD/src/output_adjoint_discrete.cpp
rename to SU2_CFD/src/output/output_adjoint_discrete.cpp
index 44bd044c77c5..5ddd823f9bec 100644
--- a/SU2_CFD/src/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output/output_adjoint_discrete.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_flow_discadj.hpp"
+#include "../../include/output/output_flow_discadj.hpp"
 
 CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output/output_adjoint_discrete_inc.cpp
similarity index 99%
rename from SU2_CFD/src/output_adjoint_discrete_inc.cpp
rename to SU2_CFD/src/output/output_adjoint_discrete_inc.cpp
index 9e96f089c70b..cffb021357e9 100644
--- a/SU2_CFD/src/output_adjoint_discrete_inc.cpp
+++ b/SU2_CFD/src/output/output_adjoint_discrete_inc.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_flow_inc_discadj.hpp"
+#include "../../include/output/output_flow_inc_discadj.hpp"
 
 CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output_adjoint_elasticity.cpp b/SU2_CFD/src/output/output_adjoint_elasticity.cpp
similarity index 99%
rename from SU2_CFD/src/output_adjoint_elasticity.cpp
rename to SU2_CFD/src/output/output_adjoint_elasticity.cpp
index 665b451f8aef..fce33df486a2 100644
--- a/SU2_CFD/src/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adjoint_elasticity.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_fea_discadj.hpp"
+#include "../../include/output/output_fea_discadj.hpp"
 
 CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
diff --git a/SU2_CFD/src/output_adjoint_mean.cpp b/SU2_CFD/src/output/output_adjoint_mean.cpp
similarity index 99%
rename from SU2_CFD/src/output_adjoint_mean.cpp
rename to SU2_CFD/src/output/output_adjoint_mean.cpp
index 9e717ea2024b..b2388fb51bca 100644
--- a/SU2_CFD/src/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output/output_adjoint_mean.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_flow_adj.hpp"
+#include "../../include/output/output_flow_adj.hpp"
 
 CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_baseline.cpp b/SU2_CFD/src/output/output_baseline.cpp
similarity index 98%
rename from SU2_CFD/src/output_baseline.cpp
rename to SU2_CFD/src/output/output_baseline.cpp
index 4d376ef3330b..1e2c894aae50 100644
--- a/SU2_CFD/src/output_baseline.cpp
+++ b/SU2_CFD/src/output/output_baseline.cpp
@@ -1,4 +1,4 @@
-#include "../include/output/output_baseline.hpp"
+#include "../../include/output/output_baseline.hpp"
 
 CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_cgns.cpp b/SU2_CFD/src/output/output_cgns.cpp
similarity index 99%
rename from SU2_CFD/src/output_cgns.cpp
rename to SU2_CFD/src/output/output_cgns.cpp
index 3d34281287a0..bf6f366c55de 100644
--- a/SU2_CFD/src/output_cgns.cpp
+++ b/SU2_CFD/src/output/output_cgns.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short iZone) {
   
diff --git a/SU2_CFD/src/output_csv.cpp b/SU2_CFD/src/output/output_csv.cpp
similarity index 97%
rename from SU2_CFD/src/output_csv.cpp
rename to SU2_CFD/src/output/output_csv.cpp
index 27657d73115d..af3cbe24c368 100644
--- a/SU2_CFD/src/output_csv.cpp
+++ b/SU2_CFD/src/output/output_csv.cpp
@@ -1,4 +1,4 @@
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
diff --git a/SU2_CFD/src/output_direct_elasticity.cpp b/SU2_CFD/src/output/output_direct_elasticity.cpp
similarity index 99%
rename from SU2_CFD/src/output_direct_elasticity.cpp
rename to SU2_CFD/src/output/output_direct_elasticity.cpp
index 317f6ed3a4ed..c3e6a0bbcb4f 100644
--- a/SU2_CFD/src/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output/output_direct_elasticity.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_fea.hpp"
+#include "../../include/output/output_fea.hpp"
 
 CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_heat.cpp b/SU2_CFD/src/output/output_direct_heat.cpp
similarity index 99%
rename from SU2_CFD/src/output_direct_heat.cpp
rename to SU2_CFD/src/output/output_direct_heat.cpp
index 28e5886ba6bc..692ee04429e8 100644
--- a/SU2_CFD/src/output_direct_heat.cpp
+++ b/SU2_CFD/src/output/output_direct_heat.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_heat.hpp"
+#include "../../include/output/output_heat.hpp"
 
 CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean.cpp b/SU2_CFD/src/output/output_direct_mean.cpp
similarity index 99%
rename from SU2_CFD/src/output_direct_mean.cpp
rename to SU2_CFD/src/output/output_direct_mean.cpp
index 8aa252beae63..4dbfe6205a0d 100644
--- a/SU2_CFD/src/output_direct_mean.cpp
+++ b/SU2_CFD/src/output/output_direct_mean.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_flow.hpp"
+#include "../../include/output/output_flow.hpp"
 
 CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean_fem.cpp b/SU2_CFD/src/output/output_direct_mean_fem.cpp
similarity index 99%
rename from SU2_CFD/src/output_direct_mean_fem.cpp
rename to SU2_CFD/src/output/output_direct_mean_fem.cpp
index dbf716d13404..d6539f9a772d 100644
--- a/SU2_CFD/src/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output/output_direct_mean_fem.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../include/output/output_flow_fem.hpp"
+#include "../../include/output/output_flow_fem.hpp"
 
 CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
diff --git a/SU2_CFD/src/output_direct_mean_inc.cpp b/SU2_CFD/src/output/output_direct_mean_inc.cpp
similarity index 99%
rename from SU2_CFD/src/output_direct_mean_inc.cpp
rename to SU2_CFD/src/output/output_direct_mean_inc.cpp
index 31c2efa75831..354a1876a89b 100644
--- a/SU2_CFD/src/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output/output_direct_mean_inc.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_flow_inc.hpp"
+#include "../../include/output/output_flow_inc.hpp"
 
 CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
 
diff --git a/SU2_CFD/src/output_driver.cpp b/SU2_CFD/src/output/output_driver.cpp
similarity index 99%
rename from SU2_CFD/src/output_driver.cpp
rename to SU2_CFD/src/output/output_driver.cpp
index 614cb41240c2..dce949bd5886 100644
--- a/SU2_CFD/src/output_driver.cpp
+++ b/SU2_CFD/src/output/output_driver.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_driver.hpp"
+#include "../../include/output/output_driver.hpp"
 
 CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput(driver_config) {
 
diff --git a/SU2_CFD/src/output_fieldview.cpp b/SU2_CFD/src/output/output_fieldview.cpp
similarity index 99%
rename from SU2_CFD/src/output_fieldview.cpp
rename to SU2_CFD/src/output/output_fieldview.cpp
index f4bdb594d3df..0f1a3996593c 100644
--- a/SU2_CFD/src/output_fieldview.cpp
+++ b/SU2_CFD/src/output/output_fieldview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 void COutput::SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone) {
   
diff --git a/SU2_CFD/src/output_flow_common.cpp b/SU2_CFD/src/output/output_flow_common.cpp
similarity index 99%
rename from SU2_CFD/src/output_flow_common.cpp
rename to SU2_CFD/src/output/output_flow_common.cpp
index 5b317af5492a..c278bc2c8e6b 100644
--- a/SU2_CFD/src/output_flow_common.cpp
+++ b/SU2_CFD/src/output/output_flow_common.cpp
@@ -1,6 +1,6 @@
 
 
-#include "../include/output/output_flow_common.hpp"
+#include "../../include/output/output_flow_common.hpp"
 
 CFlowCommonOutput::CFlowCommonOutput(CConfig *config) : COutput (config){
   
diff --git a/SU2_CFD/src/output_mesh.cpp b/SU2_CFD/src/output/output_mesh.cpp
similarity index 96%
rename from SU2_CFD/src/output_mesh.cpp
rename to SU2_CFD/src/output/output_mesh.cpp
index 762d17fdeb17..c1dd5ec1cba2 100644
--- a/SU2_CFD/src/output_mesh.cpp
+++ b/SU2_CFD/src/output/output_mesh.cpp
@@ -1,6 +1,6 @@
 
 
-#include "../include/output/output_mesh.hpp"
+#include "../../include/output/output_mesh.hpp"
 
 CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output/output_paraview.cpp
similarity index 99%
rename from SU2_CFD/src/output_paraview.cpp
rename to SU2_CFD/src/output/output_paraview.cpp
index baa6a854771c..91c31880c413 100644
--- a/SU2_CFD/src/output_paraview.cpp
+++ b/SU2_CFD/src/output/output_paraview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 /*--- Subroutine to swap bytes, in case we need to convert to
  big endian, which is expected for ParaView binary legacy format. ---*/
diff --git a/SU2_CFD/src/output_physics.cpp b/SU2_CFD/src/output/output_physics.cpp
similarity index 99%
rename from SU2_CFD/src/output_physics.cpp
rename to SU2_CFD/src/output/output_physics.cpp
index 7ef7bb4a3f60..e9d897768bcd 100644
--- a/SU2_CFD/src/output_physics.cpp
+++ b/SU2_CFD/src/output/output_physics.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_structure_legacy.hpp"
+#include "../../include/output/output_structure_legacy.hpp"
 
 
 void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
similarity index 99%
rename from SU2_CFD/src/output_structure.cpp
rename to SU2_CFD/src/output/output_structure.cpp
index e2f533bba5c4..78d86910b7fe 100644
--- a/SU2_CFD/src/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 COutput::COutput(CConfig *config) {
   
diff --git a/SU2_CFD/src/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
similarity index 99%
rename from SU2_CFD/src/output_structure_legacy.cpp
rename to SU2_CFD/src/output/output_structure_legacy.cpp
index f5459418dba7..731a4b66f984 100644
--- a/SU2_CFD/src/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_structure_legacy.hpp"
+#include "../../include/output/output_structure_legacy.hpp"
 
 COutputLegacy::COutputLegacy(CConfig *config) {
 
diff --git a/SU2_CFD/src/output_su2.cpp b/SU2_CFD/src/output/output_su2.cpp
similarity index 99%
rename from SU2_CFD/src/output_su2.cpp
rename to SU2_CFD/src/output/output_su2.cpp
index ee0e9ebd30ee..1e13ef4dda7c 100644
--- a/SU2_CFD/src/output_su2.cpp
+++ b/SU2_CFD/src/output/output_su2.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   
diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output/output_tecplot.cpp
similarity index 99%
rename from SU2_CFD/src/output_tecplot.cpp
rename to SU2_CFD/src/output/output_tecplot.cpp
index fc7243ada32a..2f302195d598 100644
--- a/SU2_CFD/src/output_tecplot.cpp
+++ b/SU2_CFD/src/output/output_tecplot.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output.hpp"
+#include "../../include/output/output.hpp"
 
 void COutput::SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
   

From 8fd65eabac06193ad64fb46cac2f9f4c5aa68dda Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 16:56:32 +0200
Subject: [PATCH 223/539] Renaming of classes/files

---
 SU2_CFD/include/driver_structure.hpp          | 12 +--
 .../{output_fea.hpp => output_elasticity.hpp} |  6 +-
 ...cadj.hpp => output_elasticity_discadj.hpp} |  6 +-
 SU2_CFD/include/output/output_flow.hpp        | 84 ++----------------
 ...t_flow_common.hpp => output_flow_comp.hpp} | 88 ++++++++++++++++---
 ..._flow_adj.hpp => output_flow_comp_adj.hpp} |  0
 ...scadj.hpp => output_flow_comp_discadj.hpp} |  0
 ..._flow_fem.hpp => output_flow_comp_fem.hpp} |  8 +-
 SU2_CFD/include/output/output_flow_inc.hpp    |  8 +-
 SU2_CFD/obj/Makefile.am                       | 20 ++---
 SU2_CFD/src/driver_structure.cpp              | 10 +--
 ...t_elasticity.cpp => output_elasticity.cpp} | 20 ++---
 ...city.cpp => output_elasticity_discadj.cpp} | 20 ++---
 ...output_flow_common.cpp => output_flow.cpp} | 14 +--
 ...t_direct_mean.cpp => output_flow_comp.cpp} | 22 ++---
 ...oint_mean.cpp => output_flow_comp_adj.cpp} |  2 +-
 ...crete.cpp => output_flow_comp_discadj.cpp} |  2 +-
 ..._mean_fem.cpp => output_flow_comp_fem.cpp} | 22 ++---
 ...irect_mean_inc.cpp => output_flow_inc.cpp} | 20 ++---
 ...te_inc.cpp => output_flow_inc_discadj.cpp} |  0
 ...output_direct_heat.cpp => output_heat.cpp} |  0
 21 files changed, 182 insertions(+), 182 deletions(-)
 rename SU2_CFD/include/output/{output_fea.hpp => output_elasticity.hpp} (95%)
 rename SU2_CFD/include/output/{output_fea_discadj.hpp => output_elasticity_discadj.hpp} (95%)
 rename SU2_CFD/include/output/{output_flow_common.hpp => output_flow_comp.hpp} (51%)
 rename SU2_CFD/include/output/{output_flow_adj.hpp => output_flow_comp_adj.hpp} (100%)
 rename SU2_CFD/include/output/{output_flow_discadj.hpp => output_flow_comp_discadj.hpp} (100%)
 rename SU2_CFD/include/output/{output_flow_fem.hpp => output_flow_comp_fem.hpp} (94%)
 rename SU2_CFD/src/output/{output_direct_elasticity.cpp => output_elasticity.cpp} (93%)
 rename SU2_CFD/src/output/{output_adjoint_elasticity.cpp => output_elasticity_discadj.cpp} (88%)
 rename SU2_CFD/src/output/{output_flow_common.cpp => output_flow.cpp} (98%)
 rename SU2_CFD/src/output/{output_direct_mean.cpp => output_flow_comp.cpp} (96%)
 rename SU2_CFD/src/output/{output_adjoint_mean.cpp => output_flow_comp_adj.cpp} (99%)
 rename SU2_CFD/src/output/{output_adjoint_discrete.cpp => output_flow_comp_discadj.cpp} (99%)
 rename SU2_CFD/src/output/{output_direct_mean_fem.cpp => output_flow_comp_fem.cpp} (93%)
 rename SU2_CFD/src/output/{output_direct_mean_inc.cpp => output_flow_inc.cpp} (97%)
 rename SU2_CFD/src/output/{output_adjoint_discrete_inc.cpp => output_flow_inc_discadj.cpp} (100%)
 rename SU2_CFD/src/output/{output_direct_heat.cpp => output_heat.cpp} (100%)

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 5d3b530c197c..a6e685f5569f 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -51,12 +51,12 @@
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/interpolation_structure.hpp"
 
-#include "output/output_fea.hpp"
-#include "output/output_fea_discadj.hpp"
-#include "output/output_flow.hpp"
-#include "output/output_flow_adj.hpp"
-#include "output/output_flow_discadj.hpp"
-#include "output/output_flow_fem.hpp"
+#include "output/output_elasticity.hpp"
+#include "output/output_elasticity_discadj.hpp"
+#include "output/output_flow_comp.hpp"
+#include "output/output_flow_comp_adj.hpp"
+#include "output/output_flow_comp_discadj.hpp"
+#include "output/output_flow_comp_fem.hpp"
 #include "output/output_flow_inc.hpp"
 #include "output/output_flow_inc_discadj.hpp"
 #include "output/output_heat.hpp"
diff --git a/SU2_CFD/include/output/output_fea.hpp b/SU2_CFD/include/output/output_elasticity.hpp
similarity index 95%
rename from SU2_CFD/include/output/output_fea.hpp
rename to SU2_CFD/include/output/output_elasticity.hpp
index 8ff411a3c6a4..69cb5db269f7 100644
--- a/SU2_CFD/include/output/output_fea.hpp
+++ b/SU2_CFD/include/output/output_elasticity.hpp
@@ -45,7 +45,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date May 24, 2018.
  */
-class CFEAOutput : public COutput {
+class CElasticityOutput : public COutput {
 private:
 
 protected:
@@ -61,12 +61,12 @@ class CFEAOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFEAOutput(void);
+  virtual ~CElasticityOutput(void);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/output_fea_discadj.hpp b/SU2_CFD/include/output/output_elasticity_discadj.hpp
similarity index 95%
rename from SU2_CFD/include/output/output_fea_discadj.hpp
rename to SU2_CFD/include/output/output_elasticity_discadj.hpp
index 82f98634ab8f..ebfc34579697 100644
--- a/SU2_CFD/include/output/output_fea_discadj.hpp
+++ b/SU2_CFD/include/output/output_elasticity_discadj.hpp
@@ -45,7 +45,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CDiscAdjFEAOutput : public COutput {
+class CDiscAdjElasticityOutput : public COutput {
 private:
   unsigned short nVar_FEM, nDim;
   char char_histfile[200];
@@ -58,12 +58,12 @@ class CDiscAdjFEAOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CDiscAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CDiscAdjFEAOutput(void);
+  virtual ~CDiscAdjElasticityOutput(void);
 
   void SetHistoryOutputFields(CConfig *config);
 
diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index 30f645469909..1bcfdea07b92 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -38,97 +38,29 @@
 
 #pragma once
 
-#include "output_flow_common.hpp"
+#include "output.hpp"
 
-/*! \class CFlowOutput
- *  \brief Output class for compressible Flow problems.
- *  \author R. Sanchez, T. Albring.
- *  \date May 30, 2018.
- */
-class CFlowOutput : public CFlowCommonOutput {
-private:
-  
-  unsigned short nVar;
-
-  unsigned short turb_model;
+class CFlowOutput : public COutput{
   
-  bool grid_movement;
   
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-
 public:
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+  CFlowOutput(CConfig *config);
 
   /*!
    * \brief Destructor of the class.
    */
   virtual ~CFlowOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
-  
-  /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
-   */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  /*!
-   * \brief SetVolumeOutputFields
-   * \param config
-   */
-  void SetVolumeOutputFields(CConfig *config);
   
-  /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
+  void AddAnalyzeSurfaceOutput(CConfig *config);
   
-  /*!
-   * \brief SetHistoryOutputFields
-   * \param config
-   */
-  void SetHistoryOutputFields(CConfig *config);
+  void SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
   
-  /*!
-   * \brief GetQ_Criterion
-   * \param config
-   * \param geometry
-   * \param node_flow
-   * \return 
-   */
-  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
-  
-  /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
-   */
-  bool SetInit_Residuals(CConfig *config);
+  void AddAerodynamicCoefficients(CConfig *config);
   
-  /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
-   */
-  bool SetUpdate_Averages(CConfig *config);
+  void SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver);
   
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/output_flow_common.hpp b/SU2_CFD/include/output/output_flow_comp.hpp
similarity index 51%
rename from SU2_CFD/include/output/output_flow_common.hpp
rename to SU2_CFD/include/output/output_flow_comp.hpp
index 5162ab24a0f5..edfcd108c74c 100644
--- a/SU2_CFD/include/output/output_flow_common.hpp
+++ b/SU2_CFD/include/output/output_flow_comp.hpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_flow_inc.hpp
+ * \file output_flow.hpp
  * \brief Headers of the main subroutines for generating the file outputs.
  *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
  * \author F. Palacios, T. Economon, M. Colonno
@@ -38,29 +38,97 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "output_flow.hpp"
 
-class CFlowCommonOutput : public COutput{
+/*! \class CFlowOutput
+ *  \brief Output class for compressible Flow problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date May 30, 2018.
+ */
+class CFlowCompOutput : public CFlowOutput {
+private:
+  
+  unsigned short nVar;
+
+  unsigned short turb_model;
   
+  bool grid_movement;
   
+  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+
 public:
+
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowCommonOutput(CConfig *config);
+  CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowCommonOutput(void);
+  virtual ~CFlowCompOutput(void);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param config
+   */
+  void SetVolumeOutputFields(CConfig *config);
   
-  void AddAnalyzeSurfaceOutput(CConfig *config);
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
   
-  void SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  /*!
+   * \brief SetHistoryOutputFields
+   * \param config
+   */
+  void SetHistoryOutputFields(CConfig *config);
   
-  void AddAerodynamicCoefficients(CConfig *config);
+  /*!
+   * \brief GetQ_Criterion
+   * \param config
+   * \param geometry
+   * \param node_flow
+   * \return 
+   */
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  
+  /*!
+   * \brief SetInit_Residuals
+   * \param config
+   * \return 
+   */
+  bool SetInit_Residuals(CConfig *config);
   
-  void SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver);
+  /*!
+   * \brief SetUpdate_Averages
+   * \param config
+   * \param dualtime
+   * \return 
+   */
+  bool SetUpdate_Averages(CConfig *config);
   
-};
+};
\ No newline at end of file
diff --git a/SU2_CFD/include/output/output_flow_adj.hpp b/SU2_CFD/include/output/output_flow_comp_adj.hpp
similarity index 100%
rename from SU2_CFD/include/output/output_flow_adj.hpp
rename to SU2_CFD/include/output/output_flow_comp_adj.hpp
diff --git a/SU2_CFD/include/output/output_flow_discadj.hpp b/SU2_CFD/include/output/output_flow_comp_discadj.hpp
similarity index 100%
rename from SU2_CFD/include/output/output_flow_discadj.hpp
rename to SU2_CFD/include/output/output_flow_comp_discadj.hpp
diff --git a/SU2_CFD/include/output/output_flow_fem.hpp b/SU2_CFD/include/output/output_flow_comp_fem.hpp
similarity index 94%
rename from SU2_CFD/include/output/output_flow_fem.hpp
rename to SU2_CFD/include/output/output_flow_comp_fem.hpp
index dcdccb76fc9f..95a5a8179101 100644
--- a/SU2_CFD/include/output/output_flow_fem.hpp
+++ b/SU2_CFD/include/output/output_flow_comp_fem.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output_flow_common.hpp"
+#include "output_flow.hpp"
 
 
 /*! \class CFlowFEMOutput
@@ -46,7 +46,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowFEMOutput : public CFlowCommonOutput {
+class CFlowCompFEMOutput : public CFlowOutput {
 private:
   
   unsigned short nVar;
@@ -63,12 +63,12 @@ class CFlowFEMOutput : public CFlowCommonOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+  CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowFEMOutput(void);
+  virtual ~CFlowCompFEMOutput(void);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/output_flow_inc.hpp
index a6e05b9c180a..3dade89ca82b 100644
--- a/SU2_CFD/include/output/output_flow_inc.hpp
+++ b/SU2_CFD/include/output/output_flow_inc.hpp
@@ -38,14 +38,14 @@
 
 #pragma once
 
-#include "output_flow_common.hpp"
+#include "output_flow.hpp"
 
 /*! \class CIncFlowOutput
  *  \brief Output class for compressible Flow problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CIncFlowOutput : public CFlowCommonOutput {
+class CFlowIncOutput : public CFlowOutput {
 private:
 
   unsigned short turb_model;
@@ -59,12 +59,12 @@ class CIncFlowOutput : public CFlowCommonOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
+  CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CIncFlowOutput(void);
+  virtual ~CFlowIncOutput(void);
   
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index a46a482cba5c..38e492b49df3 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -132,17 +132,17 @@ libSU2Core_sources = \
   ../src/output/output_paraview.cpp \
   ../src/output/output_csv.cpp \
   ../src/output/output_mesh.cpp \
-  ../src/output/output_direct_elasticity.cpp \
-  ../src/output/output_flow_common.cpp \
-  ../src/output/output_direct_mean.cpp \
-  ../src/output/output_direct_mean_fem.cpp \
-  ../src/output/output_direct_mean_inc.cpp \
-  ../src/output/output_direct_heat.cpp \
+  ../src/output/output_elasticity.cpp \
+  ../src/output/output_flow.cpp \
+  ../src/output/output_flow_comp.cpp \
+  ../src/output/output_flow_comp_fem.cpp \
+  ../src/output/output_flow_inc.cpp \
+  ../src/output/output_heat.cpp \
   ../src/output/output_baseline.cpp \
-  ../src/output/output_adjoint_elasticity.cpp \
-  ../src/output/output_adjoint_discrete.cpp \
-  ../src/output/output_adjoint_discrete_inc.cpp \
-  ../src/output/output_adjoint_mean.cpp \
+  ../src/output/output_elasticity_discadj.cpp \
+  ../src/output/output_flow_comp_discadj.cpp \
+  ../src/output/output_flow_inc_discadj.cpp \
+  ../src/output/output_flow_comp_adj.cpp \
   ../src/output/output_driver.cpp \
   ../src/output/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 6b61fd980794..e0f798d45346 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3675,9 +3675,9 @@ void CDriver::Output_Preprocessing(){
       if (rank == MASTER_NODE)
         cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
-        output[iZone] = new CFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CFlowCompOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
-        output[iZone] = new CIncFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case HEAT_EQUATION_FVM:
@@ -3689,7 +3689,7 @@ void CDriver::Output_Preprocessing(){
     case FEM_ELASTICITY:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      output[iZone] = new CFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
 
     case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
@@ -3711,13 +3711,13 @@ void CDriver::Output_Preprocessing(){
     case DISC_ADJ_FEM:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint FEA output structure." << endl;
-      output[iZone] = new CDiscAdjFEAOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CDiscAdjElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
       
     case FEM_EULER: case FEM_LES: case FEM_RANS: case FEM_NAVIER_STOKES:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      output[iZone] = new CFlowFEMOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CFlowCompFEMOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
       break;
       
     default:
diff --git a/SU2_CFD/src/output/output_direct_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
similarity index 93%
rename from SU2_CFD/src/output/output_direct_elasticity.cpp
rename to SU2_CFD/src/output/output_elasticity.cpp
index c3e6a0bbcb4f..880e0f886fe6 100644
--- a/SU2_CFD/src/output/output_direct_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_fea.hpp"
+#include "../../include/output/output_elasticity.hpp"
 
-CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -101,7 +101,7 @@ CFEAOutput::CFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_
 
 }
 
-CFEAOutput::~CFEAOutput(void) {
+CElasticityOutput::~CElasticityOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -110,7 +110,7 @@ CFEAOutput::~CFEAOutput(void) {
 
 }
 
-void CFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
+void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
 
   CSolver* fea_solver = solver[FEA_SOL];
   
@@ -149,7 +149,7 @@ void CFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver *
   
 } 
 
-void CFEAOutput::SetHistoryOutputFields(CConfig *config){
+void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
@@ -180,7 +180,7 @@ void CFEAOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
  
   CVariable* Node_Struc = solver[FEA_SOL]->node[iPoint]; 
   CPoint*    Node_Geo  = geometry->node[iPoint];
@@ -216,7 +216,7 @@ void CFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **
   
 }
 
-void CFEAOutput::SetVolumeOutputFields(CConfig *config){
+void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
@@ -250,9 +250,9 @@ void CFEAOutput::SetVolumeOutputFields(CConfig *config){
   
 }
 
-inline bool CFEAOutput::WriteHistoryFile_Output(CConfig *config) { return true;}
+inline bool CElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true;}
 
-inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {  
+inline bool CElasticityOutput::WriteScreen_Header(CConfig *config) {  
   
   bool write_header;
   if (nonlinear_analysis) write_header = (config->GetIntIter() == 0);
@@ -264,7 +264,7 @@ inline bool CFEAOutput::WriteScreen_Header(CConfig *config) {
   return write_header;
   
 }
-inline bool CFEAOutput::WriteScreen_Output(CConfig *config) {
+inline bool CElasticityOutput::WriteScreen_Output(CConfig *config) {
 
   bool write_output = true;
 
diff --git a/SU2_CFD/src/output/output_adjoint_elasticity.cpp b/SU2_CFD/src/output/output_elasticity_discadj.cpp
similarity index 88%
rename from SU2_CFD/src/output/output_adjoint_elasticity.cpp
rename to SU2_CFD/src/output/output_elasticity_discadj.cpp
index fce33df486a2..8c22a84c2530 100644
--- a/SU2_CFD/src/output/output_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity_discadj.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_fea_discadj.hpp"
+#include "../../include/output/output_elasticity_discadj.hpp"
 
-CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CDiscAdjElasticityOutput::CDiscAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -91,7 +91,7 @@ CDiscAdjFEAOutput::CDiscAdjFEAOutput(CConfig *config, CGeometry *geometry, unsig
   
 }
 
-CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
+CDiscAdjElasticityOutput::~CDiscAdjElasticityOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -100,13 +100,13 @@ CDiscAdjFEAOutput::~CDiscAdjFEAOutput(void) {
 
 }
 
-inline bool CDiscAdjFEAOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
+inline bool CDiscAdjElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
 
-inline bool CDiscAdjFEAOutput::WriteScreen_Header(CConfig *config) { return true; }
+inline bool CDiscAdjElasticityOutput::WriteScreen_Header(CConfig *config) { return true; }
 
-inline bool CDiscAdjFEAOutput::WriteScreen_Output(CConfig *config) { return true; }
+inline bool CDiscAdjElasticityOutput::WriteScreen_Output(CConfig *config) { return true; }
 
-void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
+void CDiscAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER");
@@ -128,7 +128,7 @@ void CDiscAdjFEAOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-inline void CDiscAdjFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
+inline void CDiscAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
   SetHistoryOutputValue("INT_ITER", config->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config->GetExtIter());
@@ -163,7 +163,7 @@ inline void CDiscAdjFEAOutput::LoadHistoryData(CConfig *config, CGeometry *geome
   
 }
 
-void CDiscAdjFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CDiscAdjElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
 
   CVariable* Node_Struc = solver[FEA_SOL]->node[iPoint];
   CPoint*    Node_Geo  = geometry->node[iPoint];
@@ -179,7 +179,7 @@ void CDiscAdjFEAOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSo
 
 }
 
-void CDiscAdjFEAOutput::SetVolumeOutputFields(CConfig *config){
+void CDiscAdjElasticityOutput::SetVolumeOutputFields(CConfig *config){
 
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
diff --git a/SU2_CFD/src/output/output_flow_common.cpp b/SU2_CFD/src/output/output_flow.cpp
similarity index 98%
rename from SU2_CFD/src/output/output_flow_common.cpp
rename to SU2_CFD/src/output/output_flow.cpp
index c278bc2c8e6b..b23805328d08 100644
--- a/SU2_CFD/src/output/output_flow_common.cpp
+++ b/SU2_CFD/src/output/output_flow.cpp
@@ -1,15 +1,15 @@
 
 
-#include "../../include/output/output_flow_common.hpp"
+#include "../../include/output/output_flow.hpp"
 
-CFlowCommonOutput::CFlowCommonOutput(CConfig *config) : COutput (config){
+CFlowOutput::CFlowOutput(CConfig *config) : COutput (config){
   
 }
 
 
-CFlowCommonOutput::~CFlowCommonOutput(void){}
+CFlowOutput::~CFlowOutput(void){}
 
-void CFlowCommonOutput::AddAnalyzeSurfaceOutput(CConfig *config){
+void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   
   /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
   vector<string> Marker_Analyze;
@@ -49,7 +49,7 @@ void CFlowCommonOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   
 }
 
-void CFlowCommonOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output){
+void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output){
   
   unsigned short iDim, iMarker, iMarker_Analyze;
   unsigned long iVertex, iPoint;
@@ -561,7 +561,7 @@ void CFlowCommonOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry,
   delete [] Surface_MassFlow_Abs;
 }
 
-void CFlowCommonOutput::AddAerodynamicCoefficients(CConfig *config){
+void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
   
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
@@ -617,7 +617,7 @@ void CFlowCommonOutput::AddAerodynamicCoefficients(CConfig *config){
   AddHistoryOutput("AOA", "AoA", FORMAT_SCIENTIFIC, "AOA");
 }
 
-void CFlowCommonOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
+void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
   
   SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
   SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
diff --git a/SU2_CFD/src/output/output_direct_mean.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
similarity index 96%
rename from SU2_CFD/src/output/output_direct_mean.cpp
rename to SU2_CFD/src/output/output_flow_comp.cpp
index 4dbfe6205a0d..2dd382891c18 100644
--- a/SU2_CFD/src/output/output_direct_mean.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow.hpp"
+#include "../../include/output/output_flow_comp.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
+CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();  
   
@@ -110,7 +110,7 @@ CFlowOutput::CFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver,
   
 }
 
-CFlowOutput::~CFlowOutput(void) {
+CFlowCompOutput::~CFlowCompOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -122,7 +122,7 @@ CFlowOutput::~CFlowOutput(void) {
 
 
 
-void CFlowOutput::SetHistoryOutputFields(CConfig *config){
+void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
@@ -270,7 +270,7 @@ void CFlowOutput::SetHistoryOutputFields(CConfig *config){
 
 }
 
-void CFlowOutput::SetVolumeOutputFields(CConfig *config){
+void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
@@ -390,7 +390,7 @@ void CFlowOutput::SetVolumeOutputFields(CConfig *config){
   }
 }
 
-void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
   CVariable* Node_Turb = NULL;
@@ -513,7 +513,7 @@ void CFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
   
 }
 
-void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
     SetVolumeOutputValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
@@ -526,7 +526,7 @@ void CFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver
   }
 }
 
-void CFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
+void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
   
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];
@@ -614,7 +614,7 @@ void CFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
 
 }
 
-su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
   unsigned short iDim, jDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
@@ -643,14 +643,14 @@ su2double CFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVar
 }
 
 
-bool CFlowOutput::SetInit_Residuals(CConfig *config){
+bool CFlowCompOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CFlowOutput::SetUpdate_Averages(CConfig *config){
+bool CFlowCompOutput::SetUpdate_Averages(CConfig *config){
   
   return false;
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_adjoint_mean.cpp b/SU2_CFD/src/output/output_flow_comp_adj.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_adjoint_mean.cpp
rename to SU2_CFD/src/output/output_flow_comp_adj.cpp
index b2388fb51bca..dce9c5ea5670 100644
--- a/SU2_CFD/src/output/output_adjoint_mean.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_adj.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_adj.hpp"
+#include "../../include/output/output_flow_comp_adj.hpp"
 
 CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/output_adjoint_discrete.cpp b/SU2_CFD/src/output/output_flow_comp_discadj.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_adjoint_discrete.cpp
rename to SU2_CFD/src/output/output_flow_comp_discadj.cpp
index 5ddd823f9bec..8874c833a1a5 100644
--- a/SU2_CFD/src/output/output_adjoint_discrete.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_discadj.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_discadj.hpp"
+#include "../../include/output/output_flow_comp_discadj.hpp"
 
 CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output/output_direct_mean_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
similarity index 93%
rename from SU2_CFD/src/output/output_direct_mean_fem.cpp
rename to SU2_CFD/src/output/output_flow_comp_fem.cpp
index d6539f9a772d..6267707a5ad2 100644
--- a/SU2_CFD/src/output/output_direct_mean_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -36,9 +36,9 @@
  */
 
 
-#include "../../include/output/output_flow_fem.hpp"
+#include "../../include/output/output_flow_comp_fem.hpp"
 
-CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
+CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();  
   
@@ -117,7 +117,7 @@ CFlowFEMOutput::CFlowFEMOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
 }
 
-CFlowFEMOutput::~CFlowFEMOutput(void) {
+CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -129,7 +129,7 @@ CFlowFEMOutput::~CFlowFEMOutput(void) {
 
 
 
-void CFlowFEMOutput::SetHistoryOutputFields(CConfig *config){
+void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
@@ -179,7 +179,7 @@ void CFlowFEMOutput::SetHistoryOutputFields(CConfig *config){
 
 }
 
-void CFlowFEMOutput::SetVolumeOutputFields(CConfig *config){
+void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
@@ -224,7 +224,7 @@ void CFlowFEMOutput::SetVolumeOutputFields(CConfig *config){
   }
 }
 
-void CFlowFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){
+void CFlowCompFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){
   
   unsigned short iDim;
   
@@ -293,12 +293,12 @@ void CFlowFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSo
   }
 }
 
-void CFlowFEMOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CFlowCompFEMOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
 
 }
 
-void CFlowFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
+void CFlowCompFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
   CSolver* flow_solver = solver[FLOW_SOL];
   
@@ -373,7 +373,7 @@ void CFlowFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   
 }
 
-su2double CFlowFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+su2double CFlowCompFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
   unsigned short iDim, jDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
@@ -402,14 +402,14 @@ su2double CFlowFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
 }
 
 
-bool CFlowFEMOutput::SetInit_Residuals(CConfig *config){
+bool CFlowCompFEMOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CFlowFEMOutput::SetUpdate_Averages(CConfig *config){
+bool CFlowCompFEMOutput::SetUpdate_Averages(CConfig *config){
   return false;
   
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_direct_mean_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
similarity index 97%
rename from SU2_CFD/src/output/output_direct_mean_inc.cpp
rename to SU2_CFD/src/output/output_flow_inc.cpp
index 354a1876a89b..b0f3172306a9 100644
--- a/SU2_CFD/src/output/output_direct_mean_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -37,7 +37,7 @@
 
 #include "../../include/output/output_flow_inc.hpp"
 
-CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowCommonOutput(config) {
+CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();
   
@@ -112,7 +112,7 @@ CIncFlowOutput::CIncFlowOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
 }
 
-CIncFlowOutput::~CIncFlowOutput(void) {
+CFlowIncOutput::~CFlowIncOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -122,7 +122,7 @@ CIncFlowOutput::~CIncFlowOutput(void) {
 }
 
 
-void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
+void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
@@ -241,7 +241,7 @@ void CIncFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
+void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];  
@@ -333,7 +333,7 @@ void CIncFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 }
 
 
-void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
+void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
@@ -459,7 +459,7 @@ void CIncFlowOutput::SetVolumeOutputFields(CConfig *config){
   }
 }
 
-void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
 
   CVariable* Node_Flow = solver[FLOW_SOL]->node[iPoint]; 
   CVariable* Node_Heat = NULL; 
@@ -590,7 +590,7 @@ void CIncFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   }
 }
 
-void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
     SetVolumeOutputValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
@@ -603,7 +603,7 @@ void CIncFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
   }
 }
 
-su2double CIncFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
+su2double CFlowIncOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
   unsigned short iDim, jDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
@@ -631,14 +631,14 @@ su2double CIncFlowOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
   return Q;
 }
 
-bool CIncFlowOutput::SetInit_Residuals(CConfig *config){
+bool CFlowIncOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CIncFlowOutput::SetUpdate_Averages(CConfig *config){
+bool CFlowIncOutput::SetUpdate_Averages(CConfig *config){
   return false;
   
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_adjoint_discrete_inc.cpp b/SU2_CFD/src/output/output_flow_inc_discadj.cpp
similarity index 100%
rename from SU2_CFD/src/output/output_adjoint_discrete_inc.cpp
rename to SU2_CFD/src/output/output_flow_inc_discadj.cpp
diff --git a/SU2_CFD/src/output/output_direct_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
similarity index 100%
rename from SU2_CFD/src/output/output_direct_heat.cpp
rename to SU2_CFD/src/output/output_heat.cpp

From 872c5b34a5a6c27d8d7558fec1bf723e3e20e7e0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 17:07:48 +0200
Subject: [PATCH 224/539] Removed disc adj flow output.

---
 SU2_CFD/include/driver_structure.hpp          |   7 +-
 ..._discadj.hpp => output_adj_elasticity.hpp} |   6 +-
 ...p_discadj.hpp => output_adj_flow_comp.hpp} |   6 +-
 ...nc_discadj.hpp => output_adj_flow_inc.hpp} |   6 +-
 .../include/output/output_flow_comp_adj.hpp   | 121 -----
 SU2_CFD/obj/Makefile.am                       |  20 +-
 SU2_CFD/src/driver_structure.cpp              |  17 +-
 ..._discadj.cpp => output_adj_elasticity.cpp} |  20 +-
 ...p_discadj.cpp => output_adj_flow_comp.cpp} |  20 +-
 ...nc_discadj.cpp => output_adj_flow_inc.cpp} |  20 +-
 SU2_CFD/src/output/output_flow_comp_adj.cpp   | 419 ------------------
 11 files changed, 57 insertions(+), 605 deletions(-)
 rename SU2_CFD/include/output/{output_elasticity_discadj.hpp => output_adj_elasticity.hpp} (95%)
 rename SU2_CFD/include/output/{output_flow_comp_discadj.hpp => output_adj_flow_comp.hpp} (95%)
 rename SU2_CFD/include/output/{output_flow_inc_discadj.hpp => output_adj_flow_inc.hpp} (95%)
 delete mode 100644 SU2_CFD/include/output/output_flow_comp_adj.hpp
 rename SU2_CFD/src/output/{output_elasticity_discadj.cpp => output_adj_elasticity.cpp} (88%)
 rename SU2_CFD/src/output/{output_flow_comp_discadj.cpp => output_adj_flow_comp.cpp} (96%)
 rename SU2_CFD/src/output/{output_flow_inc_discadj.cpp => output_adj_flow_inc.cpp} (96%)
 delete mode 100644 SU2_CFD/src/output/output_flow_comp_adj.cpp

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index a6e685f5569f..f9f63c833272 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -52,13 +52,12 @@
 #include "../../Common/include/interpolation_structure.hpp"
 
 #include "output/output_elasticity.hpp"
-#include "output/output_elasticity_discadj.hpp"
+#include "output/output_adj_elasticity.hpp"
 #include "output/output_flow_comp.hpp"
-#include "output/output_flow_comp_adj.hpp"
-#include "output/output_flow_comp_discadj.hpp"
+#include "output/output_adj_flow_comp.hpp"
 #include "output/output_flow_comp_fem.hpp"
 #include "output/output_flow_inc.hpp"
-#include "output/output_flow_inc_discadj.hpp"
+#include "output/output_adj_flow_inc.hpp"
 #include "output/output_heat.hpp"
 
 using namespace std;
diff --git a/SU2_CFD/include/output/output_elasticity_discadj.hpp b/SU2_CFD/include/output/output_adj_elasticity.hpp
similarity index 95%
rename from SU2_CFD/include/output/output_elasticity_discadj.hpp
rename to SU2_CFD/include/output/output_adj_elasticity.hpp
index ebfc34579697..1b5e7ed52199 100644
--- a/SU2_CFD/include/output/output_elasticity_discadj.hpp
+++ b/SU2_CFD/include/output/output_adj_elasticity.hpp
@@ -45,7 +45,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CDiscAdjElasticityOutput : public COutput {
+class CAdjElasticityOutput : public COutput {
 private:
   unsigned short nVar_FEM, nDim;
   char char_histfile[200];
@@ -58,12 +58,12 @@ class CDiscAdjElasticityOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CDiscAdjElasticityOutput(void);
+  virtual ~CAdjElasticityOutput(void);
 
   void SetHistoryOutputFields(CConfig *config);
 
diff --git a/SU2_CFD/include/output/output_flow_comp_discadj.hpp b/SU2_CFD/include/output/output_adj_flow_comp.hpp
similarity index 95%
rename from SU2_CFD/include/output/output_flow_comp_discadj.hpp
rename to SU2_CFD/include/output/output_adj_flow_comp.hpp
index b5dad834f3f9..fe29606e8539 100644
--- a/SU2_CFD/include/output/output_flow_comp_discadj.hpp
+++ b/SU2_CFD/include/output/output_adj_flow_comp.hpp
@@ -45,7 +45,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CDiscAdjFlowOutput : public COutput {
+class CAdjFlowOutput : public COutput {
 private:
 
   unsigned short nDim, turb_model;
@@ -57,12 +57,12 @@ class CDiscAdjFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CDiscAdjFlowOutput(void);
+  virtual ~CAdjFlowOutput(void);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/output_flow_inc_discadj.hpp b/SU2_CFD/include/output/output_adj_flow_inc.hpp
similarity index 95%
rename from SU2_CFD/include/output/output_flow_inc_discadj.hpp
rename to SU2_CFD/include/output/output_adj_flow_inc.hpp
index cbe203ae74d9..e69b1e050e99 100644
--- a/SU2_CFD/include/output/output_flow_inc_discadj.hpp
+++ b/SU2_CFD/include/output/output_adj_flow_inc.hpp
@@ -45,7 +45,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CDiscAdjFlowIncOutput : public COutput {
+class CAdjFlowIncOutput : public COutput {
 private:
 
   unsigned short nDim, turb_model;
@@ -58,12 +58,12 @@ class CDiscAdjFlowIncOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CDiscAdjFlowIncOutput(void);
+  virtual ~CAdjFlowIncOutput(void);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/output_flow_comp_adj.hpp b/SU2_CFD/include/output/output_flow_comp_adj.hpp
deleted file mode 100644
index ed3e9fc02e72..000000000000
--- a/SU2_CFD/include/output/output_flow_comp_adj.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * \file output_flow_adj.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "output.hpp"
-
-/*! \class CAdjFlowOutput
- *  \brief Output class for flow continuous adjoint problems.
- *  \author R. Sanchez, T. Albring.
- *  \date June 5, 2018.
- */
-class CAdjFlowOutput : public COutput {
-private:
-
-  unsigned short nDim, turb_model;
-
-public:
-
-  ofstream HistFile;
-
-  /*!
-   * \brief Constructor of the class
-   * \param[in] config - Definition of the particular problem.
-   */
-  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  virtual ~CAdjFlowOutput(void);
-
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
-  
-  /*!
-   * \brief SetHistoryOutputFields
-   * \param config
-   */
-  void SetHistoryOutputFields(CConfig *config);
-    
-  /*!
-   * \brief SetVolumeOutputFields
-   * \param config
-   */
-  void SetVolumeOutputFields(CConfig *config);
-  
-  /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-  
-  /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
-   */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
-  
-  /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
-   */
-  bool SetInit_Residuals(CConfig *config);
-  
-  /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
-   */
-  bool SetUpdate_Averages(CConfig *config);
-  
-};
\ No newline at end of file
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 38e492b49df3..423403010c3b 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -74,15 +74,14 @@ libSU2Core_sources = \
   ../include/output/output_structure_legacy.hpp \
   ../include/output/output_structure_legacy.inl \
   ../include/output/output_baseline.hpp \
-  ../include/output/output_fea.hpp \
-  ../include/output/output_fea_discadj.hpp \
-  ../include/output/output_flow_common.hpp \
+  ../include/output/output_elasticity.hpp \
+  ../include/output/output_adj_elasticity.hpp \
   ../include/output/output_flow.hpp \
-  ../include/output/output_flow_adj.hpp \
-  ../include/output/output_flow_discadj.hpp \
-  ../include/output/output_flow_fem.hpp \
+  ../include/output/output_flow_comp.hpp \
+  ../include/output/output_adj_flow.hpp \
+  ../include/output/output_flow_comp_fem.hpp \
   ../include/output/output_flow_inc.hpp \
-  ../include/output/output_flow_inc_discadj.hpp \
+  ../include/output/output_adj_flow_inc.hpp \
   ../include/output/output_heat.hpp \
   ../include/output/output_mesh.hpp \
   ../include/sgs_model.hpp \
@@ -139,10 +138,9 @@ libSU2Core_sources = \
   ../src/output/output_flow_inc.cpp \
   ../src/output/output_heat.cpp \
   ../src/output/output_baseline.cpp \
-  ../src/output/output_elasticity_discadj.cpp \
-  ../src/output/output_flow_comp_discadj.cpp \
-  ../src/output/output_flow_inc_discadj.cpp \
-  ../src/output/output_flow_comp_adj.cpp \
+  ../src/output/output_adj_elasticity.cpp \
+  ../src/output/output_adj_flow_comp.cpp \
+  ../src/output/output_adj_flow_inc.cpp \
   ../src/output/output_driver.cpp \
   ../src/output/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index e0f798d45346..69291783e745 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3691,27 +3691,22 @@ void CDriver::Output_Preprocessing(){
         cout << ": FEM output structure." << endl;
       output[iZone] = new CElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
-
-    case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
-      if (rank == MASTER_NODE)
-        cout << ": adjoint Euler/Navier-Stokes/RANS output structure.." << endl;
-      output[iZone] = new CAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
-      break;
-
+      
     case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+    case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
       if (rank == MASTER_NODE)
-        cout << ": discrete adjoint Euler/Navier-Stokes/RANS output structure." << endl;
+        cout << ": adjoint Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE){      
-        output[iZone] = new CDiscAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       } else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE){
-        output[iZone] = new CDiscAdjFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CAdjFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       }
       break;
 
     case DISC_ADJ_FEM:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint FEA output structure." << endl;
-      output[iZone] = new CDiscAdjElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CAdjElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
       
     case FEM_EULER: case FEM_LES: case FEM_RANS: case FEM_NAVIER_STOKES:
diff --git a/SU2_CFD/src/output/output_elasticity_discadj.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
similarity index 88%
rename from SU2_CFD/src/output/output_elasticity_discadj.cpp
rename to SU2_CFD/src/output/output_adj_elasticity.cpp
index 8c22a84c2530..b2b7cc246430 100644
--- a/SU2_CFD/src/output/output_elasticity_discadj.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_elasticity_discadj.hpp"
+#include "../../include/output/output_adj_elasticity.hpp"
 
-CDiscAdjElasticityOutput::CDiscAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -91,7 +91,7 @@ CDiscAdjElasticityOutput::CDiscAdjElasticityOutput(CConfig *config, CGeometry *g
   
 }
 
-CDiscAdjElasticityOutput::~CDiscAdjElasticityOutput(void) {
+CAdjElasticityOutput::~CAdjElasticityOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -100,13 +100,13 @@ CDiscAdjElasticityOutput::~CDiscAdjElasticityOutput(void) {
 
 }
 
-inline bool CDiscAdjElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
+inline bool CAdjElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
 
-inline bool CDiscAdjElasticityOutput::WriteScreen_Header(CConfig *config) { return true; }
+inline bool CAdjElasticityOutput::WriteScreen_Header(CConfig *config) { return true; }
 
-inline bool CDiscAdjElasticityOutput::WriteScreen_Output(CConfig *config) { return true; }
+inline bool CAdjElasticityOutput::WriteScreen_Output(CConfig *config) { return true; }
 
-void CDiscAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
+void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
   AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER");
@@ -128,7 +128,7 @@ void CDiscAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-inline void CDiscAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
+inline void CAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
   SetHistoryOutputValue("INT_ITER", config->GetIntIter());
   SetHistoryOutputValue("EXT_ITER", config->GetExtIter());
@@ -163,7 +163,7 @@ inline void CDiscAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry
   
 }
 
-void CDiscAdjElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CAdjElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
 
   CVariable* Node_Struc = solver[FEA_SOL]->node[iPoint];
   CPoint*    Node_Geo  = geometry->node[iPoint];
@@ -179,7 +179,7 @@ void CDiscAdjElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geomet
 
 }
 
-void CDiscAdjElasticityOutput::SetVolumeOutputFields(CConfig *config){
+void CAdjElasticityOutput::SetVolumeOutputFields(CConfig *config){
 
   // Grid coordinates
   AddVolumeOutput("COORD-X", "x", "COORDINATES");
diff --git a/SU2_CFD/src/output/output_flow_comp_discadj.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
similarity index 96%
rename from SU2_CFD/src/output/output_flow_comp_discadj.cpp
rename to SU2_CFD/src/output/output_adj_flow_comp.cpp
index 8874c833a1a5..c4472dfa8f6f 100644
--- a/SU2_CFD/src/output/output_flow_comp_discadj.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_comp_discadj.hpp"
+#include "../../include/output/output_adj_flow_comp.hpp"
 
-CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   nDim = geometry->GetnDim();
  
@@ -91,7 +91,7 @@ CDiscAdjFlowOutput::CDiscAdjFlowOutput(CConfig *config, CGeometry *geometry, uns
   
 }
 
-CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
+CAdjFlowOutput::~CAdjFlowOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -99,7 +99,7 @@ CDiscAdjFlowOutput::~CDiscAdjFlowOutput(void) {
 
 }
 
-void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
+void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
@@ -214,7 +214,7 @@ void CDiscAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CDiscAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
+void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
  
   CSolver* adjflow_solver = solver[ADJFLOW_SOL];
   CSolver* adjturb_solver = solver[ADJTURB_SOL];  
@@ -298,7 +298,7 @@ void CDiscAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
 
 }
 
-void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
+void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
   /// DESCRIPTION: x coordinates of the mesh nodes.
@@ -394,7 +394,7 @@ void CDiscAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
  
 }
 
-void CDiscAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
   CVariable* Node_AdjTurb = NULL;
@@ -464,21 +464,21 @@ void CDiscAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CS
   
 }
 
-void CDiscAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
   
 }
 
 
-bool CDiscAdjFlowOutput::SetInit_Residuals(CConfig *config){
+bool CAdjFlowOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CDiscAdjFlowOutput::SetUpdate_Averages(CConfig *config){
+bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config){
   return false;
   
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_flow_inc_discadj.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
similarity index 96%
rename from SU2_CFD/src/output/output_flow_inc_discadj.cpp
rename to SU2_CFD/src/output/output_adj_flow_inc.cpp
index cffb021357e9..b646dbee406f 100644
--- a/SU2_CFD/src/output/output_flow_inc_discadj.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_inc_discadj.hpp"
+#include "../../include/output/output_adj_flow_inc.hpp"
 
-CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   nDim = geometry->GetnDim();
  
@@ -94,7 +94,7 @@ CDiscAdjFlowIncOutput::CDiscAdjFlowIncOutput(CConfig *config, CGeometry *geometr
   RestartFilename = config->GetObjFunc_Extension(RestartFilename);
 }
 
-CDiscAdjFlowIncOutput::~CDiscAdjFlowIncOutput(void) {
+CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -102,7 +102,7 @@ CDiscAdjFlowIncOutput::~CDiscAdjFlowIncOutput(void) {
 
 }
 
-void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
+void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
@@ -216,7 +216,7 @@ void CDiscAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CDiscAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
+void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
   
   CSolver* adjflow_solver = solver[ADJFLOW_SOL];
   CSolver* adjturb_solver = solver[ADJTURB_SOL];  
@@ -313,7 +313,7 @@ void CDiscAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry
 
 }
 
-void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
+void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
   /// DESCRIPTION: x coordinates of the mesh nodes.
@@ -412,7 +412,7 @@ void CDiscAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
  
 }
 
-void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
   CVariable* Node_AdjHeat = NULL;
@@ -490,21 +490,21 @@ void CDiscAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
   
 }
 
-void CDiscAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
   
 }
 
 
-bool CDiscAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
+bool CAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CDiscAdjFlowIncOutput::SetUpdate_Averages(CConfig *config){
+bool CAdjFlowIncOutput::SetUpdate_Averages(CConfig *config){
   return false;
   
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_flow_comp_adj.cpp b/SU2_CFD/src/output/output_flow_comp_adj.cpp
deleted file mode 100644
index dce9c5ea5670..000000000000
--- a/SU2_CFD/src/output/output_flow_comp_adj.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-/*!
- * \file output_adjoint_mean.cpp
- * \brief Main subroutines for flow continuous adjoint output
- * \author R. Sanchez
- * \version 6.0.1 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/output_flow_comp_adj.hpp"
-
-CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  nDim = geometry->GetnDim();
-  
-  turb_model = config->GetKind_Turb_Model();
-  
-  if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITY");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
-  }
-
-  if (nRequestedScreenFields == 0){
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
-    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
-    RequestedScreenFields.push_back("SENS_GEO");
-    RequestedScreenFields.push_back("SENS_AOA");
-    nRequestedScreenFields = RequestedScreenFields.size();
-  }
-  
-  if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");    
-    RequestedVolumeFields.push_back("SENSITIVITY");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
-  }
-  
-  stringstream ss;
-  ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
-  MultiZoneHeaderString = ss.str();
-  
-  /*--- Set the volume filename --- */
-  
-  VolumeFilename = config->GetAdj_FileName();
-  
-  /*--- Set the surface filename --- */
-  
-  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
-  
-  /*--- Set the restart filename --- */
-  
-  RestartFilename = config->GetRestart_AdjFileName();
-  
-  /*--- Add the obj. function extension --- */
-  
-  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
-}
-
-CAdjFlowOutput::~CAdjFlowOutput(void) {
-
-  if (rank == MASTER_NODE){
-    HistFile.close();
-  }
-
-}
-
-
-void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
-
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
-  /// DESCRIPTION: Root-mean square residual of the adjoint density.
-  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-  /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Root-mean square residual of the adjoint energy.
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-  if (!config->GetFrozen_Visc_Cont()){
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
-      break;  
-    case SST:
-      /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-      /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
-      break;
-    default: break;
-    }
-  }
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
-  /// DESCRIPTION: Maximum residual of the adjoint density.
-  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-  /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-  /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-  /// DESCRIPTION: Maximum residual of the adjoint energy.
-  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-  if (!config->GetFrozen_Visc_Cont()){  
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
-      break;  
-    case SST:
-      /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
-      /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
-      break;
-    default: break;
-    }
-  }
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
-  /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
-  /// END_GROUP
-  
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
-
-}
-
-inline void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
-
-  CSolver* adjflow_solver = solver[ADJFLOW_SOL];
-  CSolver* adjturb_solver = solver[ADJTURB_SOL];  
-
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
-
-  SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
-  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
-  SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
-  if (geometry->GetnDim() == 3) {
-    SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_RMS(3)));
-    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(4)));
-  } else {
-    SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
-  }
-  if (!config->GetFrozen_Visc_Cont()){  
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
-      break;  
-    case SST:
-      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
-      SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
-      break;
-    default: break;
-    }
-  }
-  SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_Max(0)));
-  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_Max(1)));
-  SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_Max(2)));
-  if (geometry->GetnDim() == 3) {
-    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_Max(3)));
-    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(4)));
-  } else {
-    SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
-  }
-  if (!config->GetFrozen_Visc_Cont()){  
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
-      break;  
-    case SST:
-      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
-      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
-      break;
-    default: break;
-    }
-  }
-  SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
-  SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
-  SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
-  SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
-}
-
-void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
-  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
-  /// DESCRIPTION: x coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
-  /// DESCRIPTION: y coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
-  if (nDim == 3)
-    /// DESCRIPTION: z coordinates of the mesh nodes.
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
-  /// DESCRIPTION: Adjoint density.
-  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "SOLUTION"); 
-  /// DESCRIPTION: Adjoint momentum x-component.
-  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION"); 
-  /// DESCRIPTION: Adjoint momentum y-component.
-  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION"); 
-  if (nDim == 3)
-    /// DESCRIPTION: Adjoint momentum z-component.
-    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
-  /// DESCRIPTION: Adjoint energy.
-  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");       
-  if (!config->GetFrozen_Visc_Cont()){    
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: Adjoint nu tilde.
-      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
-      break;  
-    case SST:
-      /// DESCRIPTION: Adjoint kinetic energy.
-      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
-      /// DESCRIPTION: Adjoint dissipation.
-      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
-      break;
-    default: break;
-    }
-  }
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
-  if (config->GetGrid_Movement()){
-    /// DESCRIPTION: Grid velocity x-component.
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
-    /// DESCRIPTION: Grid velocity y-component.
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
-    if (nDim == 3)    
-      /// DESCRIPTION: Grid velocity z-component.
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
-  }
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
-  /// DESCRIPTION: Residual of the adjoint density.
-  AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
-  /// DESCRIPTION: Residual of the adjoint momentum x-component.
-  AddVolumeOutput("RES_ADJ_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");  
-  /// DESCRIPTION: Residual of the adjoint momentum y-component.
-  AddVolumeOutput("RES_ADJ_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");  
-  if (nDim == 3)
-    /// DESCRIPTION: Residual of the adjoint momentum z-component.
-    AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
-  /// DESCRIPTION: Residual of the adjoint energy. 
-  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL"); 
-  if (!config->GetFrozen_Visc_Cont()){      
-    switch(turb_model){
-    case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: Residual of the nu tilde. 
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
-      break;  
-    case SST:
-      /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
-      /// DESCRIPTION: Residual of the adjoint dissipation.
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
-      break;
-    default: break;
-    }
-  }
-  /// END_GROUP
-  
-  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.  
-  /// DESCRIPTION: Sensitivity in normal direction.
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
-  /// END_GROUP
-}
-
-void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
-  
-  CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
-  CVariable* Node_AdjTurb = NULL;
-  CPoint*    Node_Geo     = geometry->node[iPoint];
-  
-  if (config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Cont()){
-    Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
-  }
-  
-  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
-  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
-  if (nDim == 3)
-    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
-  
-  SetVolumeOutputValue("ADJ_DENSITY",    iPoint, Node_AdjFlow->GetSolution(0));
-  SetVolumeOutputValue("ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1));
-  SetVolumeOutputValue("ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2));
-  if (nDim == 3){
-    SetVolumeOutputValue("ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3));
-    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(4));
-  } else {
-    SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
-  }
-  
-  // Turbulent 
-  if (!config->GetFrozen_Visc_Cont()){         
-    switch(turb_model){
-    case SST:
-      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
-      SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
-      break;
-    case SA: case SA_COMP: case SA_E: 
-    case SA_E_COMP: case SA_NEG: 
-      SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
-      break;
-    case NONE:
-      break;
-    }
-  }
-  
-  // Residuals
-  SetVolumeOutputValue("RES_ADJ_DENSITY", iPoint, Node_AdjFlow->GetSolution(0) - Node_AdjFlow->GetSolution_Old(0));
-  SetVolumeOutputValue("RES_ADJ_MOMENTUM-X", iPoint, Node_AdjFlow->GetSolution(1) - Node_AdjFlow->GetSolution_Old(1));
-  SetVolumeOutputValue("RES_ADJ_MOMENTUM-Y", iPoint, Node_AdjFlow->GetSolution(2) - Node_AdjFlow->GetSolution_Old(2));
-  if (nDim == 3){
-    SetVolumeOutputValue("RES_ADJ_MOMENTUM-Z", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));
-    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(4) - Node_AdjFlow->GetSolution_Old(4));
-  } else {
-    SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
-  }
-  
-  if (!config->GetFrozen_Visc_Cont()){            
-    switch(config->GetKind_Turb_Model()){
-    case SST:
-      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-      SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
-      break;
-    case SA: case SA_COMP: case SA_E: 
-    case SA_E_COMP: case SA_NEG: 
-      SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-      break;
-    case NONE:
-      break;
-    }
-  }
-
-}
-
-void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
-  
-  SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
-  
-}
-
-bool CAdjFlowOutput::SetInit_Residuals(CConfig *config){
-  
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
-  
-}
-
-bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config){
-  return false;
-  
-//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
-      
-}
-
-

From 6d8dd641d7c36e9a9e35febb358592149afc2eec Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 22:51:52 +0200
Subject: [PATCH 225/539] Fixed missing constructor

---
 SU2_CFD/src/driver_structure.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 1a3669d315e9..1fd8007c3a55 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -4173,6 +4173,7 @@ void CDriver::Output(unsigned long ExtIter) {
 
 CDriver::~CDriver(void) {}
 
+CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, bool val_periodic, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, val_periodic, MPICommunicator) { }
 
 CFluidDriver::~CFluidDriver(void) { }
 

From 32bdf50b62a700c99be67ac93d840399d833836e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Apr 2019 23:30:20 +0200
Subject: [PATCH 226/539] Fixed references to output objects in SOL, DOT, DEF

---
 SU2_DEF/obj/Makefile.am | 18 +++++++++---------
 SU2_DOT/obj/Makefile.am | 36 ++++++++++++++++++------------------
 SU2_SOL/obj/Makefile.am | 18 +++++++++---------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/SU2_DEF/obj/Makefile.am b/SU2_DEF/obj/Makefile.am
index 811d9a7e83ab..fd3fb61ba9f0 100644
--- a/SU2_DEF/obj/Makefile.am
+++ b/SU2_DEF/obj/Makefile.am
@@ -49,15 +49,15 @@ ___bin_SU2_DEF_SOURCES = \
 
 ___bin_SU2_DEF_CXXFLAGS =
 ___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_cgns.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_tecplot.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_mesh.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_csv.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_su2.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_paraview.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_cgns.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_tecplot.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_mesh.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_csv.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_fieldview.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_su2.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_paraview.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure_legacy.o \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o
 
diff --git a/SU2_DOT/obj/Makefile.am b/SU2_DOT/obj/Makefile.am
index 1d5e51debbfb..388421617d3b 100644
--- a/SU2_DOT/obj/Makefile.am
+++ b/SU2_DOT/obj/Makefile.am
@@ -59,15 +59,15 @@ su2_dot_cxx_flags =
 if BUILD_NORMAL
 su2_dot_ldadd += \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_cgns.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_tecplot.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_fieldview.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_csv.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_baseline.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_su2.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_paraview.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_cgns.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_tecplot.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_fieldview.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_csv.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_baseline.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_su2.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_paraview.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure_legacy.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.$(OBJEXT) \
   ../../Common/lib/libSU2.a
 endif
@@ -75,15 +75,15 @@ endif
 if BUILD_REVERSE
 su2_dot_ldadd += \
   ../../SU2_CFD/src/libSU2Core_AD_a-solver_structure.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_structure.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_structure_legacy.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_cgns.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_tecplot.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_csv.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_baseline.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_fieldview.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_su2.$(OBJEXT) \
-  ../../SU2_CFD/src/libSU2Core_AD_a-output_paraview.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_structure.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_structure_legacy.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_cgns.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_tecplot.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_csv.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_baseline.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_fieldview.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_su2.$(OBJEXT) \
+  ../../SU2_CFD/src/output/libSU2Core_AD_a-output_paraview.$(OBJEXT) \
   ../../SU2_CFD/src/libSU2Core_AD_a-variable_structure.$(OBJEXT) \
   ../../Common/lib/libSU2_AD.a
 endif
diff --git a/SU2_SOL/obj/Makefile.am b/SU2_SOL/obj/Makefile.am
index 014b47d1d9c0..8229c0c9b3a3 100644
--- a/SU2_SOL/obj/Makefile.am
+++ b/SU2_SOL/obj/Makefile.am
@@ -49,15 +49,15 @@ ___bin_SU2_SOL_SOURCES = \
 ___bin_SU2_SOL_CXXFLAGS =
 ___bin_SU2_SOL_LDADD = \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_baseline.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_csv.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_cgns.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_tecplot.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_fieldview.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_su2.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_paraview.o \
-  ../../SU2_CFD/src/libSU2Core_a-output_structure_legacy.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_baseline.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_csv.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_cgns.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_tecplot.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_fieldview.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_su2.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_paraview.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-output_structure_legacy.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o \
   ../../Common/lib/libSU2.a
 

From 8c8dda97f1038d4c78e6082da320246401cae596 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 18 Apr 2019 11:22:16 +0200
Subject: [PATCH 227/539] Small fixes

---
 SU2_CFD/src/output/output_adj_flow_comp.cpp | 2 +-
 SU2_CFD/src/output/output_flow_comp_fem.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index c4472dfa8f6f..1658ddbfb545 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -291,7 +291,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   }
   
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
+  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index 6267707a5ad2..78726b475bc3 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -168,7 +168,10 @@ void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Maximum residual of the energy.  
   AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
   /// END_GROUP
-  
+   
+  /// DESCRIPTION: Linear solver iterations   
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+ 
   /*--- Add analyze surface history fields --- */
   
   AddAnalyzeSurfaceOutput(config);

From 2e7b4874fc46138e88b8dc41141c061287fdb83c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 18 Apr 2019 16:19:53 +0200
Subject: [PATCH 228/539] Added disc adj heat output

---
 SU2_CFD/include/driver_structure.hpp       |   1 +
 SU2_CFD/include/output/output_adj_heat.hpp | 103 +++++++++++
 SU2_CFD/obj/Makefile.am                    |   2 +
 SU2_CFD/src/driver_structure.cpp           |   6 +
 SU2_CFD/src/output/output_adj_heat.cpp     | 199 +++++++++++++++++++++
 SU2_CFD/src/output/output_flow_inc.cpp     |   2 +-
 6 files changed, 312 insertions(+), 1 deletion(-)
 create mode 100644 SU2_CFD/include/output/output_adj_heat.hpp
 create mode 100644 SU2_CFD/src/output/output_adj_heat.cpp

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index c90e2ba5ac29..5bc775e609e7 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -59,6 +59,7 @@
 #include "output/output_flow_inc.hpp"
 #include "output/output_adj_flow_inc.hpp"
 #include "output/output_heat.hpp"
+#include "output/output_adj_heat.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/include/output/output_adj_heat.hpp b/SU2_CFD/include/output/output_adj_heat.hpp
new file mode 100644
index 000000000000..cc8618e5eb0a
--- /dev/null
+++ b/SU2_CFD/include/output/output_adj_heat.hpp
@@ -0,0 +1,103 @@
+/*!
+ * \file output_fea_discadj.hpp
+ * \brief Headers of the main subroutines for generating the file outputs.
+ *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \author F. Palacios, T. Economon, M. Colonno
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "output.hpp"
+
+/*! \class CDiscAdjFEAOutput
+ *  \brief Output class for elasticity discrete adjoint problems.
+ *  \author R. Sanchez, T. Albring.
+ *  \date June 5, 2018.
+ */
+class CAdjHeatOutput : public COutput {
+private:
+  unsigned short nDim;
+  char char_histfile[200];
+
+public:
+
+  ofstream HistFile;
+
+  /*!
+   * \brief Constructor of the class
+   * \param[in] config - Definition of the particular problem.
+   */
+  CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  virtual ~CAdjHeatOutput(void);
+
+  void SetHistoryOutputFields(CConfig *config);
+
+  /*!
+   * \brief Set the history file header
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+
+  /*!
+   * \brief LoadSurfaceData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   * \param iMarker
+   * \param iVertex
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);
+
+
+  /*!
+   * \brief SetVolumeOutputFields
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetVolumeOutputFields(CConfig *config);
+
+  /*!
+   * \brief LoadVolumeData
+   * \param config
+   * \param geometry
+   * \param solver
+   * \param iPoint
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+
+};
\ No newline at end of file
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 8c2f2f856762..133f4d10de55 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -79,6 +79,7 @@ libSU2Core_sources = \
   ../include/output/output_flow.hpp \
   ../include/output/output_flow_comp.hpp \
   ../include/output/output_adj_flow.hpp \
+  ../include/output/output_adj_heat.hpp \
   ../include/output/output_flow_comp_fem.hpp \
   ../include/output/output_flow_inc.hpp \
   ../include/output/output_adj_flow_inc.hpp \
@@ -140,6 +141,7 @@ libSU2Core_sources = \
   ../src/output/output_heat.cpp \
   ../src/output/output_baseline.cpp \
   ../src/output/output_adj_elasticity.cpp \
+  ../src/output/output_adj_heat.cpp \
   ../src/output/output_adj_flow_comp.cpp \
   ../src/output/output_adj_flow_inc.cpp \
   ../src/output/output_driver.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 1fd8007c3a55..265b5da8c466 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3709,6 +3709,12 @@ void CDriver::Output_Preprocessing(){
       output[iZone] = new CAdjElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       break;
       
+    case DISC_ADJ_HEAT:
+      if (rank == MASTER_NODE)
+        cout << ": discrete adjoint heat output structure." << endl;
+      output[iZone] = new CAdjHeatOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      break;
+      
     case FEM_EULER: case FEM_LES: case FEM_RANS: case FEM_NAVIER_STOKES:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
new file mode 100644
index 000000000000..119862bafbd7
--- /dev/null
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -0,0 +1,199 @@
+/*!
+ * \file output_adjoint_heat.cpp
+ * \brief Main subroutines for flow discrete adjoint output
+ * \author R. Sanchez
+ * \version 6.0.1 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../include/output/output_adj_heat.hpp"
+
+CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+  
+  nDim = geometry->GetnDim();
+
+  /*--- Set the default history fields if nothing is set in the config file ---*/
+  
+  if (nRequestedHistoryFields == 0){
+    RequestedHistoryFields.push_back("ITER");
+    RequestedHistoryFields.push_back("RMS_RES");
+    RequestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = RequestedHistoryFields.size();
+  }
+  
+  if (nRequestedScreenFields == 0){
+    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
+    RequestedScreenFields.push_back("INNER_ITER");    
+    RequestedScreenFields.push_back("RMS_ADJ_TEMPERATURE");
+    RequestedScreenFields.push_back("SENS_GEO");
+    nRequestedScreenFields = RequestedScreenFields.size();
+  }
+  
+  if (nRequestedVolumeFields == 0){
+    RequestedVolumeFields.push_back("COORDINATES");
+    RequestedVolumeFields.push_back("SOLUTION");
+    RequestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = RequestedVolumeFields.size();
+  }
+  
+  stringstream ss;
+  ss << "Zone " << config->GetiZone() << " (Adj. Heat)";
+  MultiZoneHeaderString = ss.str();
+  
+}
+
+CAdjHeatOutput::~CAdjHeatOutput(void) {
+
+  if (rank == MASTER_NODE){
+    HistFile.close();
+  }
+
+}
+
+void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
+
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The internal iteration index.
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The external iteration index.
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
+  /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
+  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// DESCRIPTION: Maximum residual of the adjoint Pressure.
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+
+  
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
+  /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// END_GROUP
+  
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+  
+}
+
+void CAdjHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
+  
+  CSolver* adjheat_solver = solver[ADJHEAT_SOL];
+  
+  SetHistoryOutputValue("TIME_ITER", config->GetTimeIter());  
+  SetHistoryOutputValue("INNER_ITER", config->GetInnerIter());
+  SetHistoryOutputValue("OUTER_ITER", config->GetOuterIter()); 
+  
+  SetHistoryOutputValue("RMS_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_RMS(0)));
+ 
+  SetHistoryOutputValue("MAX_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_Max(0)));
+ 
+  if (multizone)
+    SetHistoryOutputValue("MAX_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_BGS(0)));
+    
+  SetHistoryOutputValue("SENS_GEO", adjheat_solver->GetTotal_Sens_Geo());
+ 
+
+}
+
+void CAdjHeatOutput::SetVolumeOutputFields(CConfig *config){
+  
+  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
+  /// DESCRIPTION: x coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
+  /// DESCRIPTION: y coordinates of the mesh nodes.
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  if (nDim == 3)
+    /// DESCRIPTION: z coordinates of the mesh nodes.
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
+  /// DESCRIPTION: Adjoint Pressure.
+  AddVolumeOutput("ADJ_TEMPERATURE",    "Adjoint_Temperature",    "SOLUTION");
+  /// END_GROUP
+  
+  
+  /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
+  /// DESCRIPTION: Residual of the adjoint Pressure.
+  AddVolumeOutput("RES_ADJ_TEMPERATURE",    "Residual_Adjoint_Temperature",    "RESIDUAL");
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
+  /// DESCRIPTION: Sensitivity x-component.
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  /// DESCRIPTION: Sensitivity y-component.
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  if (nDim == 3)
+    /// DESCRIPTION: Sensitivity z-component.
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+  /// DESCRIPTION: Sensitivity in normal direction.
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  /// END_GROUP
+ 
+}
+
+void CAdjHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+  
+  CVariable* Node_AdjHeat = solver[ADJHEAT_SOL]->node[iPoint]; 
+  CPoint*    Node_Geo     = geometry->node[iPoint];
+  
+
+  SetVolumeOutputValue("COORD-X", iPoint,  Node_Geo->GetCoord(0));  
+  SetVolumeOutputValue("COORD-Y", iPoint,  Node_Geo->GetCoord(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(2));
+  
+  SetVolumeOutputValue("ADJ_TEMPERATURE",    iPoint, Node_AdjHeat->GetSolution(0));
+  
+  // Residuals
+  SetVolumeOutputValue("RES_ADJ_TEMPERATURE", iPoint, Node_AdjHeat->GetSolution(0) - Node_AdjHeat->GetSolution_Old(0));
+  
+  SetVolumeOutputValue("SENSITIVITY_X", iPoint, Node_AdjHeat->GetSensitivity(0));
+  SetVolumeOutputValue("SENSITIVITY_Y", iPoint, Node_AdjHeat->GetSensitivity(1));
+  if (nDim == 3)
+    SetVolumeOutputValue("SENSITIVITY_Z", iPoint, Node_AdjHeat->GetSensitivity(2));
+  
+}
+
+void CAdjHeatOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+  
+  SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJHEAT_SOL]->GetCSensitivity(iMarker, iVertex));
+  
+}
+
+
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index b0f3172306a9..0724043439ff 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -190,7 +190,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   }
   /// END_GROUP
   
-  // BEGIN_GROUP: BGS_RES, DESCRIPTION: The block-gauss seidel residuals of the SOLUTION variables. 
+  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block-gauss seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
   AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   

From ba227b76623c1956c2556f38d938b823a32a9203 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 18 Apr 2019 18:53:21 +0200
Subject: [PATCH 229/539] Disabled mesh deformation output when running FSI
 cases

---
 Common/include/grid_movement_structure.hpp |  4 ++--
 Common/include/grid_movement_structure.inl |  2 +-
 Common/src/grid_movement_structure.cpp     | 12 ++++++------
 SU2_CFD/src/iteration_structure.cpp        | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Common/include/grid_movement_structure.hpp b/Common/include/grid_movement_structure.hpp
index 7c158635fe4e..838ac0a89518 100644
--- a/Common/include/grid_movement_structure.hpp
+++ b/Common/include/grid_movement_structure.hpp
@@ -1252,7 +1252,7 @@ class CVolumetricMovement : public CGridMovement {
    * \param[in] UpdateGeo - Update geometry.
    * \param[in] Derivative - Compute the derivative (disabled by default). Does not actually deform the grid if enabled.
    */
-  virtual void SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool Derivative = false);
+  virtual void SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool screen_output, bool Derivative = false);
 
   /*!
    * \brief Set the derivatives of the boundary nodes.
@@ -1372,7 +1372,7 @@ class CElasticityMovement : public CVolumetricMovement {
    * \param[in] UpdateGeo - Update geometry.
    * \param[in] Derivative - Compute the derivative (disabled by default). Does not actually deform the grid if enabled.
    */
-  void SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool Derivative = false);
+  void SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool screen_output, bool Derivative = false);
 
   /*!
    * \brief Update the value of the coordinates after the grid movement.
diff --git a/Common/include/grid_movement_structure.inl b/Common/include/grid_movement_structure.inl
index 14034c1a3583..3575cb94cbf7 100644
--- a/Common/include/grid_movement_structure.inl
+++ b/Common/include/grid_movement_structure.inl
@@ -222,7 +222,7 @@ inline void CVolumetricMovement::Set_nIterMesh(unsigned long val_nIterMesh) { nI
 
 inline unsigned long CVolumetricMovement::Get_nIterMesh() { return nIterMesh; }
 
-inline void CVolumetricMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool Derivative) {  }
+inline void CVolumetricMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool screen_output, bool Derivative) {  }
 
 inline void CVolumetricMovement::Boundary_Dependencies(CGeometry **geometry, CConfig *config) {  }
 
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 6e5a15d20413..3b8033173cba 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -9171,7 +9171,7 @@ CElasticityMovement::~CElasticityMovement(void) {
 }
 
 
-void CElasticityMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool Derivative){
+void CElasticityMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfig *config, bool UpdateGeo, bool screen_output, bool Derivative){
 
   unsigned long iNonlinear_Iter, Nonlinear_Iter = 0;
 
@@ -9190,10 +9190,13 @@ void CElasticityMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfi
     LinSysSol.SetValZero();
     LinSysRes.SetValZero();
     StiffMatrix.SetValZero();
+    
+    if ((rank == MASTER_NODE) && (!discrete_adjoint) && screen_output)
+      cout << "Computing volumes of the grid elements." << endl;
 
     /*--- Compute the minimum and maximum area/volume for the mesh. ---*/
     SetMinMaxVolume(geometry, config);
-    if ((rank == MASTER_NODE) && (!discrete_adjoint)) {
+    if ((rank == MASTER_NODE) && (!discrete_adjoint) && screen_output) {
       if (nDim == 2) cout << scientific << "Min. area: "<< MinVolume <<", max. area: " << MaxVolume <<"." << endl;
       else           cout << scientific << "Min. volume: "<< MinVolume <<", max. volume: " << MaxVolume <<"." << endl;
     }
@@ -9233,7 +9236,7 @@ void CElasticityMovement::SetVolume_Deformation_Elas(CGeometry *geometry, CConfi
     /*--- In order to do this, we recompute the minimum and maximum area/volume for the mesh. ---*/
     SetMinMaxVolume(geometry, config);
 
-    if ((rank == MASTER_NODE) && (!discrete_adjoint)) {
+    if ((rank == MASTER_NODE) && (!discrete_adjoint) && screen_output) {
       cout << scientific << "Non-linear iter.: " << iNonlinear_Iter+1 << "/" << Nonlinear_Iter  << ". Linear iter.: " << nIterMesh << ". ";
       if (nDim == 2) cout << "Min. area: " << MinVolume << ". Error: " << valResidual << "." << endl;
       else cout << "Min. volume: " << MinVolume << ". Error: " << valResidual << "." << endl;
@@ -9520,9 +9523,6 @@ void CElasticityMovement::SetMinMaxVolume(CGeometry *geometry, CConfig *config)
 
   su2double ElemVolume;
 
-  if ((rank == MASTER_NODE) && (!discrete_adjoint))
-    cout << "Computing volumes of the grid elements." << endl;
-
   MaxVolume = -1E22; MinVolume = 1E22;
 
   /*--- Loops over all the elements ---*/
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 065c715b4e75..091c383b599d 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -274,7 +274,7 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
     }
   }
   if (config_container[val_iZone]->GetSurface_Movement(FLUID_STRUCTURE)){
-      if (rank == MASTER_NODE)
+      if (rank == MASTER_NODE && Screen_Output)
         cout << endl << "Deforming the grid for Fluid-Structure Interaction applications." << endl;
 
       /*--- Deform the volume grid around the new boundary locations ---*/
@@ -282,7 +282,7 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
       if (rank == MASTER_NODE && Screen_Output)
         cout << "Deforming the volume grid." << endl;
       grid_movement[val_iZone][val_iInst]->SetVolume_Deformation_Elas(geometry_container[val_iZone][val_iInst][MESH_0],
-                                           config_container[val_iZone], true);
+                                           config_container[val_iZone], true, Screen_Output, true);
 
       nIterMesh = grid_movement[val_iZone][val_iInst]->Get_nIterMesh();
       stat_mesh = (nIterMesh == 0);
@@ -305,18 +305,18 @@ void CIteration::SetGrid_Movement(CGeometry ****geometry_container,
   }
   if (config_container[val_iZone]->GetSurface_Movement(FLUID_STRUCTURE_STATIC)){
     
-    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+    if ((rank == MASTER_NODE) && (!discrete_adjoint) && Screen_Output)
       cout << endl << "Deforming the grid for static Fluid-Structure Interaction applications." << endl;
     
     /*--- Deform the volume grid around the new boundary locations ---*/
     
-    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+    if ((rank == MASTER_NODE) && (!discrete_adjoint)&& Screen_Output)
       cout << "Deforming the volume grid." << endl;
     
     grid_movement[val_iZone][val_iInst]->SetVolume_Deformation_Elas(geometry_container[val_iZone][val_iInst][MESH_0],
-                                                                    config_container[val_iZone], true, false);
+                                                                    config_container[val_iZone], true, Screen_Output, false);
     
-    if ((rank == MASTER_NODE) && (!discrete_adjoint))
+    if ((rank == MASTER_NODE) && (!discrete_adjoint)&& Screen_Output)
       cout << "There is no grid velocity." << endl;
     
     /*--- Update the multigrid structure after moving the finest grid,

From 30720baca5d4e0a6423dcf286f2e5523cc19cb0e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 18 Apr 2019 18:53:57 +0200
Subject: [PATCH 230/539] Couple of fixes

---
 Common/src/config_structure.cpp               |  2 +-
 .../include/output/output_adj_flow_comp.hpp   |  1 +
 .../include/output/output_adj_flow_inc.hpp    |  2 ++
 SU2_CFD/src/SU2_CFD.cpp                       |  2 +-
 SU2_CFD/src/output/output_adj_flow_comp.cpp   | 28 ++++++++++---------
 SU2_CFD/src/output/output_adj_flow_inc.cpp    | 14 ++++++----
 SU2_CFD/src/output/output_elasticity.cpp      |  6 ++--
 SU2_CFD/src/output/output_structure.cpp       |  1 -
 TestCases/serial_regression.py                |  2 +-
 9 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 4d7954ff1e60..0dc515931c21 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7314,7 +7314,7 @@ string CConfig::GetFilename(string filename, string ext){
   if (GetnTimeInstances() > 1)
     filename = GetMultiInstance_FileName(filename, GetiInst(), ext);
 
-  if (GetWrt_Unsteady()){
+  if (GetWrt_Unsteady() || GetWrt_Dynamic()){
     filename = GetUnsteady_FileName(filename, GetExtIter(), ext);
   }
   
diff --git a/SU2_CFD/include/output/output_adj_flow_comp.hpp b/SU2_CFD/include/output/output_adj_flow_comp.hpp
index fe29606e8539..e4bb98f8ee5e 100644
--- a/SU2_CFD/include/output/output_adj_flow_comp.hpp
+++ b/SU2_CFD/include/output/output_adj_flow_comp.hpp
@@ -48,6 +48,7 @@
 class CAdjFlowOutput : public COutput {
 private:
 
+  bool cont_adj;
   unsigned short nDim, turb_model;
   
 public:
diff --git a/SU2_CFD/include/output/output_adj_flow_inc.hpp b/SU2_CFD/include/output/output_adj_flow_inc.hpp
index e69b1e050e99..ee687bfefd16 100644
--- a/SU2_CFD/include/output/output_adj_flow_inc.hpp
+++ b/SU2_CFD/include/output/output_adj_flow_inc.hpp
@@ -47,6 +47,8 @@
  */
 class CAdjFlowIncOutput : public COutput {
 private:
+  
+  bool cont_adj;
 
   unsigned short nDim, turb_model;
   bool heat, weakly_coupled_heat;
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 98f3b18bf375..ea6eb1b71ba0 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) {
        driver = new CSinglezoneDriver(config_file_name, nZone, periodic, MPICommunicator);
 
   }
-  else if (config->GetMultizone_Problem()) {
+  else if (config->GetMultizone_Problem() && !turbo) {
 
     /*--- Multizone Driver. ---*/
 
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 1658ddbfb545..6307dafbc9e3 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -43,6 +43,8 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
  
   turb_model = config->GetKind_Turb_Model();
   
+  cont_adj = config->GetContinuous_Adjoint();
+  
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
@@ -121,7 +123,7 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint energy.
   AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
-  if (!config->GetFrozen_Visc_Disc()){
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
@@ -232,7 +234,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   } else {
     SetHistoryOutputValue("RMS_ADJ_ENERGY", log10(adjflow_solver->GetRes_RMS(3)));    
   }
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -253,7 +255,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   } else {
     SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_Max(3)));    
   }
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -267,23 +269,23 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   }
   
   if (multizone){
-    SetHistoryOutputValue("MAX_ADJ_DENSITY", log10(adjflow_solver->GetRes_BGS(0)));
-    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_BGS(1)));
-    SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_BGS(2)));
+    SetHistoryOutputValue("BGS_ADJ_DENSITY", log10(adjflow_solver->GetRes_BGS(0)));
+    SetHistoryOutputValue("BGS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_BGS(1)));
+    SetHistoryOutputValue("BGS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_BGS(2)));
     if (geometry->GetnDim() == 3) {
-      SetHistoryOutputValue("MAX_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_BGS(3)));
-      SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(4)));
+      SetHistoryOutputValue("BGS_ADJ_MOMENTUM-Z", log10(adjflow_solver->GetRes_BGS(3)));
+      SetHistoryOutputValue("BGS_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(4)));
     } else {
-      SetHistoryOutputValue("MAX_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(3)));    
+      SetHistoryOutputValue("BGS_ADJ_ENERGY", log10(adjflow_solver->GetRes_BGS(3)));    
     }
-    if (!config->GetFrozen_Visc_Disc()){  
+    if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
       switch(turb_model){
       case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-        SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
         break;  
       case SST:
-        SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
-        SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
+        SetHistoryOutputValue("BGS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("BGS_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
         break;
       default: break;
       }
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index b646dbee406f..e1c32c572ebf 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -39,6 +39,8 @@
 
 CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
+  cont_adj = config->GetContinuous_Adjoint();
+  
   nDim = geometry->GetnDim();
  
   turb_model = config->GetKind_Turb_Model();
@@ -124,7 +126,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  if (!config->GetFrozen_Visc_Disc()){
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
@@ -152,7 +154,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
@@ -180,7 +182,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the temperature.
   AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
@@ -239,7 +241,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     if (nDim == 3) SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(4)));
     else           SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(3)));
   }
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -264,7 +266,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     if (nDim == 3) SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(3)));
   }
-  if (!config->GetFrozen_Visc_Disc()){  
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -291,7 +293,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       if (nDim == 3) SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(4)));
       else           SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(3)));
     }
-    if (!config->GetFrozen_Visc_Disc()){  
+    if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
       switch(turb_model){
       case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
         SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
index 880e0f886fe6..6919f2d08a30 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -126,13 +126,13 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   if (linear_analysis){
     SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_RMS(1)));
-    if (nVar_FEM == 3){
+    if (nDim == 3){
       SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_RMS(2)));
     }
   } else if (nonlinear_analysis){
     SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
     SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
-    if (nVar_FEM == 3){
+    if (nDim == 3){
       SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));
     }
   }
@@ -140,7 +140,7 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   if (multizone){
     SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
-    if (nVar_FEM == 3) SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));
+    if (nDim == 3) SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));
   }
   
   SetHistoryOutputValue("VMS", fea_solver->GetTotal_CFEA());
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 78d86910b7fe..5c72f71dd188 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5797,7 +5797,6 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
    map<string, bool>::iterator it = Average.begin();
    for (it = Average.begin(); it != Average.end(); it++){
-     cout << "AVG_" + it->first << endl;
      AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES");
    }
   
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index d4a9c9f09146..463befc9fd34 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -933,7 +933,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 10
-    uniform_flow.test_vals = [10.000000, 0.000000, -8.795489, -10.906295] #last 4 columns
+    uniform_flow.test_vals = [10.000000, 0.000000, -8.795489, -10.906320] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001

From cb14ff378db334e5ae239717f84b982179f3d2c3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 18 Apr 2019 19:18:21 +0200
Subject: [PATCH 231/539] Fixing warnings

---
 Common/src/config_structure.cpp           |  2 +-
 Common/src/fem_geometry_structure.cpp     |  1 -
 Common/src/grid_movement_structure.cpp    | 29 ++++-------------------
 SU2_CFD/src/driver_adjoint_singlezone.cpp |  1 -
 SU2_CFD/src/driver_direct_multizone.cpp   | 15 ------------
 SU2_CFD/src/integration_structure.cpp     |  2 +-
 SU2_CFD/src/iteration_structure.cpp       |  7 +-----
 SU2_CFD/src/output/output_driver.cpp      |  1 -
 SU2_CFD/src/solver_direct_elasticity.cpp  |  2 +-
 SU2_CFD/src/solver_direct_heat.cpp        |  4 ++--
 SU2_CFD/src/solver_direct_mean.cpp        |  4 ++--
 SU2_CFD/src/solver_direct_mean_inc.cpp    |  4 ++--
 SU2_CFD/src/solver_structure.cpp          |  3 ---
 SU2_CFD/src/variable_direct_heat.cpp      |  1 -
 SU2_CFD/src/variable_direct_mean.cpp      |  4 ----
 SU2_CFD/src/variable_direct_mean_inc.cpp  |  4 ----
 SU2_SOL/src/SU2_SOL.cpp                   | 10 ++++----
 17 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 0dc515931c21..efc2c61a8c36 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2806,7 +2806,7 @@ void CConfig::SetnZone(){
 
 void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_izone, unsigned short val_nDim) {
   
-  unsigned short iZone, iCFL, iMarker;
+  unsigned short iCFL, iMarker;
   bool ideal_gas = ((Kind_FluidModel == STANDARD_AIR) ||
                     (Kind_FluidModel == IDEAL_GAS) ||
                     (Kind_FluidModel == INC_IDEAL_GAS) ||
diff --git a/Common/src/fem_geometry_structure.cpp b/Common/src/fem_geometry_structure.cpp
index eb0789919631..6cd85ae766b5 100644
--- a/Common/src/fem_geometry_structure.cpp
+++ b/Common/src/fem_geometry_structure.cpp
@@ -6873,7 +6873,6 @@ void CMeshFEM_DG::InitStaticMeshMovement(CConfig              *config,
           
           /* Determine the prescribed translation velocity, rotation rate
                and rotation center. */
-          const unsigned short jMarker = config->GetMarker_Moving(boundaries[i].markerTag);
           const su2double Center[] = {config->GetMotion_Origin()[0],
                                       config->GetMotion_Origin()[1],
                                       config->GetMotion_Origin()[2]};
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 3b8033173cba..779b08eabb09 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -1907,11 +1907,6 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
 	dt   = config->GetDelta_UnstTimeND();
 	Lref = config->GetLength_Ref();
 
-  /*--- For harmonic balance, motion is the same in each zone (at each instance).
-   *    This is used for calls to the config container ---*/
-  if (harmonic_balance)
-	  iZone = ZONE_0;
-  
   /*--- For the unsteady adjoint, use reverse time ---*/
   if (adjoint) {
     /*--- Set the first adjoint mesh position to the final direct one ---*/
@@ -2073,11 +2068,6 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
   /*--- Retrieve values from the config file ---*/
   deltaT = config->GetDelta_UnstTimeND(); 
   Lref   = config->GetLength_Ref();
-
-  /*--- For harmonic balance, motion is the same in each zone (at each instance). ---*/
-  if (harmonic_balance) {
-	  iZone = ZONE_0;
-  }
   
   /*--- Pitching origin, frequency, and amplitude from config. ---*/	
   
@@ -2213,8 +2203,8 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
 void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, unsigned short iZone, unsigned long iter) {
   
   /*--- Local variables ---*/
-  su2double deltaX[3], newCoord[3], Center[3], *Coord, Omega[3], Ampl[3], Lref;
-  su2double *GridVel, newGridVel[3], xDot[3];
+  su2double deltaX[3], newCoord[3], Center[3], *Coord, Omega[3], Ampl[3];
+  su2double *GridVel, newGridVel[3] = {0.0, 0.0, 0.0}, xDot[3];
   su2double deltaT, time_new, time_old;
   unsigned short iDim, nDim = geometry->GetnDim();
   unsigned long iPoint;
@@ -2224,13 +2214,6 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
   
   /*--- Retrieve values from the config file ---*/
   deltaT = config->GetDelta_UnstTimeND();
-  Lref   = config->GetLength_Ref();
-  
-  /*--- For harmonic balance, motion is the same in each zone (at each instance). ---*/
-  if (harmonic_balance) {
-	  iZone = ZONE_0;
-  }
-  
   
   for (iDim = 0; iDim < 3; iDim++){
     Center[iDim] = config->GetMotion_Origin()[iDim];
@@ -2362,10 +2345,6 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
   /*--- Retrieve values from the config file ---*/
   deltaT = config->GetDelta_UnstTimeND();
   
-  /*--- For harmonic balance, motion is the same in each zone (at each instance). ---*/
-  if (harmonic_balance) {
-	  iZone = ZONE_0;
-  }
   /*--- Get motion center and translation rates from config ---*/
   
   for (iDim = 0; iDim < 3; iDim++){
@@ -5686,7 +5665,7 @@ void CSurfaceMovement::Surface_Translating(CGeometry *geometry, CConfig *config,
   unsigned short iMarker, jMarker, Moving;
   unsigned long iVertex;
   string Marker_Tag, Moving_Tag;
-  unsigned short nDim = geometry->GetnDim(), iDim;
+  unsigned short iDim;
 	
   /*--- Initialize the delta variation in coordinates ---*/
   VarCoord[0] = 0.0; VarCoord[1] = 0.0; VarCoord[2] = 0.0;
@@ -5789,7 +5768,7 @@ void CSurfaceMovement::Surface_Plunging(CGeometry *geometry, CConfig *config,
                                            unsigned long iter, unsigned short iZone) {
   
 	su2double deltaT, time_new, time_old, Lref;
-  su2double Center[3], VarCoord[3], Omega[3], Ampl[3];
+  su2double Center[3] = {0.0, 0.0, 0.0}, VarCoord[3], Omega[3], Ampl[3];
   su2double DEG2RAD = PI_NUMBER/180.0;
   unsigned short iMarker, jMarker, Moving;
   unsigned long iVertex;
diff --git a/SU2_CFD/src/driver_adjoint_singlezone.cpp b/SU2_CFD/src/driver_adjoint_singlezone.cpp
index d3f60c4e41f6..9b10d1f360b0 100644
--- a/SU2_CFD/src/driver_adjoint_singlezone.cpp
+++ b/SU2_CFD/src/driver_adjoint_singlezone.cpp
@@ -320,7 +320,6 @@ void CDiscAdjSinglezoneDriver::SetAdj_ObjFunction(){
 
 void CDiscAdjSinglezoneDriver::SetObjFunction(){
 
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
   bool heat         = (config->GetWeakly_Coupled_Heat());
   bool turbo        = (config->GetBoolTurbomachinery());
 
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 540a42976d86..9cd905007e3e 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -476,21 +476,6 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
 
   if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
 
-  /*-----------------------------------------------------------------*/
-  /*-------------------- Output FSI history -------------------------*/
-  /*-----------------------------------------------------------------*/
-  if (fsi){
-    bool ZONE_FLOW=0, ZONE_FEA=1;
-    /*--- This is a hack to test it works. ---*/
-    for (iZone = 0; iZone < nZone; iZone++){
-      if (config_container[iZone]->GetKind_Solver() == FEM_ELASTICITY) ZONE_FEA = iZone;
-      if (config_container[iZone]->GetKind_Solver() == NAVIER_STOKES) ZONE_FLOW = iZone;
-    }
- //   output->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
- //       config_container, integration_container, 0,
- //       ZONE_FLOW, ZONE_FEA, false);
-  }
-
   return Convergence;
 
 }
diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp
index 0f43d64ef5dd..2c9adaa0f666 100644
--- a/SU2_CFD/src/integration_structure.cpp
+++ b/SU2_CFD/src/integration_structure.cpp
@@ -228,7 +228,7 @@ void CIntegration::Space_Integration_FEM(CGeometry *geometry,
     unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
 
     bool restart = config->GetRestart();                                  // Restart solution
-    bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetRestart_Iter());  // Restart iteration
+    bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) ==  SU2_TYPE::Int(config->GetRestart_Iter()));  // Restart iteration
 
     /*--- Compute Mass Matrix ---*/
     /*--- The mass matrix is computed only once, at the beginning of the calculation, no matter whether the ---*/
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 091c383b599d..a39fcc47a962 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1490,8 +1490,6 @@ void CFEAIteration::Iterate(COutput *output,
   bool disc_adj_fem = false;
   if (config_container[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM) disc_adj_fem = true;
 
-  bool write_output = true;
-
   bool incremental_load = config_container[val_iZone]->GetIncrementalLoad();              // If an incremental load is applied
 
   ofstream ConvHist_file;
@@ -1913,14 +1911,12 @@ void CFEAIteration::Solve(COutput *output,
                                 unsigned short val_iInst
                                 ) {
 
-  bool Convergence = false;
-
   /*------------------ Structural subiteration ----------------------*/
   Iterate(output, integration_container, geometry_container,
       solver_container, numerics_container, config_container,
       surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
-  Convergence = Monitor(output, integration_container, geometry_container,
+  Monitor(output, integration_container, geometry_container,
                         solver_container, numerics_container, config_container,
                         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
@@ -2770,7 +2766,6 @@ void CDiscAdjFEAIteration::Preprocess(COutput *output,
   config_container[ZONE_0]->SetIntIter(IntIter);
   unsigned short ExtIter = config_container[val_iZone]->GetExtIter();
   bool dynamic = (config_container[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
-  bool nonlinear_analysis = (config_container[val_iZone]->GetGeometricConditions() == LARGE_DEFORMATIONS);   // Nonlinear analysis.
 
   int Direct_Iter;
 
diff --git a/SU2_CFD/src/output/output_driver.cpp b/SU2_CFD/src/output/output_driver.cpp
index dce949bd5886..a1bbe76330cc 100644
--- a/SU2_CFD/src/output/output_driver.cpp
+++ b/SU2_CFD/src/output/output_driver.cpp
@@ -90,7 +90,6 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
 
   unsigned short iZone, iField, nField;
   string name, header;
-  su2double val, avgzone;
 
   if (config[ZONE_0]->GetTime_Domain()){
     SetHistoryOutputValue("TIME_ITER", curr_TimeIter);
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index dd621e8aba2f..e468ee18557d 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -1416,7 +1416,7 @@ void CFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
   bool restart = config->GetRestart();                        // Restart analysis
-  bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) == config->GetRestart_Iter()); // Initial calculation for restart
+  bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) ==SU2_TYPE::Int(config->GetRestart_Iter())); // Initial calculation for restart
   
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);     // Discrete adjoint FEM solver
   
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 419e4c776796..e0c53a9fec8f 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -2063,7 +2063,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
 
   /*--- The value of the solution for the first iteration of the dual time ---*/
 
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
 
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -2075,7 +2075,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
       }
     }
 
-    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
+    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
 
       /*--- Load an additional restart file for a 2nd-order restart ---*/
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index c6f444d3a1c3..3fea984dd480 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -4188,7 +4188,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
   /*--- Make sure that the solution is well initialized for unsteady
    calculations with dual time-stepping (load additional restarts for 2nd-order). ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -4204,7 +4204,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
       }
     }
     
-    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
+    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 5e2ed1b2d45c..a91ff4ad0b28 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -2428,7 +2428,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   
   /*--- The value of the solution for the first iteration of the dual time ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == config->GetRestart_Iter()))) {
+  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -2444,7 +2444,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
       }
     }
     
-    if ((restart && (long)ExtIter == config->GetRestart_Iter()) &&
+    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index a5c935339a33..db0b36942ea2 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3975,11 +3975,8 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   string UnstExt, text_line, AdjExt;
   ifstream solution_file;
   unsigned short iDim, iVar;
-  unsigned long iExtIter = config->GetExtIter();
   bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool adjoint = ( config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint() ); 
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
   unsigned short iInst = config->GetiInst();
   bool grid_movement  = config->GetGrid_Movement();
   bool steady_restart = config->GetSteadyRestart();
diff --git a/SU2_CFD/src/variable_direct_heat.cpp b/SU2_CFD/src/variable_direct_heat.cpp
index f8ba92bb8c52..1f80b0dd823a 100644
--- a/SU2_CFD/src/variable_direct_heat.cpp
+++ b/SU2_CFD/src/variable_direct_heat.cpp
@@ -53,7 +53,6 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
   bool low_fidelity = false;
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool multizone = config->GetMultizone_Problem();
 
   Undivided_Laplacian = NULL;
 
diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp
index ef447a28750a..ee82a850c0a0 100644
--- a/SU2_CFD/src/variable_direct_mean.cpp
+++ b/SU2_CFD/src/variable_direct_mean.cpp
@@ -75,8 +75,6 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
   bool viscous = config->GetViscous();
   bool windgust = config->GetWind_Gust();
   bool classical_rk4 = (config->GetKind_TimeIntScheme_Flow() == CLASSICAL_RK4_EXPLICIT);
-  bool fsi = config->GetFSI_Simulation();
-  bool multizone = config->GetMultizone_Problem();
 
   /*--- Array initialization ---*/
   
@@ -240,8 +238,6 @@ CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim,
   bool viscous = config->GetViscous();
   bool windgust = config->GetWind_Gust();
   bool classical_rk4 = (config->GetKind_TimeIntScheme_Flow() == CLASSICAL_RK4_EXPLICIT);
-  bool fsi = config->GetFSI_Simulation();
-  bool multizone = config->GetMultizone_Problem();
 
   /*--- Array initialization ---*/
   
diff --git a/SU2_CFD/src/variable_direct_mean_inc.cpp b/SU2_CFD/src/variable_direct_mean_inc.cpp
index 9cf6efa816f3..f9975a1cda1d 100644
--- a/SU2_CFD/src/variable_direct_mean_inc.cpp
+++ b/SU2_CFD/src/variable_direct_mean_inc.cpp
@@ -65,8 +65,6 @@ CIncEulerVariable::CIncEulerVariable(su2double val_pressure, su2double *val_velo
                        (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool viscous      = config->GetViscous();
   bool axisymmetric = config->GetAxisymmetric();
-  bool fsi          = config->GetFSI_Simulation();
-  bool multizone = config->GetMultizone_Problem();
 
   /*--- Array initialization ---*/
   
@@ -183,8 +181,6 @@ CIncEulerVariable::CIncEulerVariable(su2double *val_solution, unsigned short val
                       (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool viscous      = config->GetViscous();
   bool axisymmetric = config->GetAxisymmetric();
-  bool fsi = config->GetFSI_Simulation();
-  bool multizone = config->GetMultizone_Problem();
 
   /*--- Array initialization ---*/
   
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 6c65adbf3cd7..d6da8045ac3b 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -433,7 +433,7 @@ int main(int argc, char *argv[]) {
         /*--- For the fluid zone (ZONE_0) ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFlow == false &&
-            (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetRestart_Iter())) ||
+            (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
                                iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
@@ -449,7 +449,7 @@ int main(int argc, char *argv[]) {
         /*--- Either instantiate the solution class or load a restart file. ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFEM == false &&
-            (iExtIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_1]->GetRestart_Iter())) ||
+            (iExtIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(iExtIter) == SU2_TYPE::Int(config_container[ZONE_1]->GetRestart_Iter()))) ||
                                iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_1]->GetnExtIter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
@@ -524,7 +524,7 @@ int main(int argc, char *argv[]) {
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
                     (iExtIter == 0 ||
-                     (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetRestart_Iter() ||
+                     (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
 
@@ -605,7 +605,7 @@ int main(int argc, char *argv[]) {
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
-                    (iExtIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == config_container[ZONE_0]->GetRestart_Iter() ||
+                    (iExtIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)iExtIter ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
@@ -724,7 +724,7 @@ int main(int argc, char *argv[]) {
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated == false &&
-                    (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == config_container[ZONE_0]->GetRestart_Iter())) ||
+                    (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
                                        iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                        iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);

From 65611f73932f2f612d0e63dd004a79b39981c5c2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Apr 2019 19:10:58 +0200
Subject: [PATCH 232/539] Fix calling of InitStaticMeshMovement

---
 SU2_CFD/src/driver_structure.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 265b5da8c466..c9139e157b07 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -456,9 +456,14 @@ CDriver::CDriver(char* confFile,
        Not for the FEM solver, because this is handled later, because
        the integration points must be known. ---*/
   if( !fem_solver ) {
-    Kind_Grid_Movement = config_container[ZONE_0]->GetKind_GridMovement();
-    initStaticMovement = (config_container[ZONE_0]->GetGrid_Movement() && (config_container[ZONE_0]->GetSurface_Movement(MOVING_WALL)
-                          || Kind_Grid_Movement == ROTATING_FRAME || Kind_Grid_Movement == STEADY_TRANSLATION));
+    
+    initStaticMovement = false;
+    
+    for (iZone = 0; iZone < nZone; iZone ++){
+      Kind_Grid_Movement = config_container[iZone]->GetKind_GridMovement();
+      initStaticMovement = (config_container[iZone]->GetGrid_Movement() && (config_container[iZone]->GetSurface_Movement(MOVING_WALL)
+                            || Kind_Grid_Movement == ROTATING_FRAME || Kind_Grid_Movement == STEADY_TRANSLATION));
+    }
 
 
     if(initStaticMovement){
@@ -3634,6 +3639,9 @@ void CDriver::InitStaticMeshMovement(){
 
 
       break;
+      
+      default:
+        break;
     }
 
     if (config_container[iZone]->GetnMarker_Moving() > 0){

From edc02fded948216e6d894777e01198f998f250f6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Apr 2019 19:33:39 +0200
Subject: [PATCH 233/539] Further fixes to make regressions pass

---
 SU2_DEF/src/SU2_DEF.cpp        | 6 +++---
 TestCases/serial_regression.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 3aadeef9fb57..a7cdc43263e8 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
   }
   
   /*--- Initialize the configuration of the driver ---*/
-  driver_config = new CConfig(config_file_name, SU2_DOT, nZone, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_DEF, nZone, VERB_NONE);
 
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
@@ -121,10 +121,10 @@ int main(int argc, char *argv[]) {
     
     if (driver_config->GetnConfigFiles() > 0){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DEF, iZone, nZone, VERB_HIGH);
     }
     else{
-      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DEF, iZone, nZone, VERB_HIGH);
     }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
   }
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 463befc9fd34..1a42d61d9fa2 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1065,7 +1065,7 @@ def main():
     dynbeam2d.unsteady  = True
     dynbeam2d.new_output= True
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66299.000000] #last 4 columns
+    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66127.000000] #last 4 columns
     dynbeam2d.su2_exec  = "SU2_CFD"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001
@@ -1076,7 +1076,7 @@ def main():
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [4.000000, 0.000000, -3.578187, -5.758338] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.731033, -5.527944] #last 4 columns
     fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
     fsi2d.multizone = True
@@ -1156,7 +1156,7 @@ def main():
     naca0012_def_file.cfg_file  = "surface_file_NACA0012.cfg"
     naca0012_def_file.test_iter = 10
     naca0012_def_file.test_vals = [0.00344658] #residual
-    naca0012_def_file.su2_exec  = "mpirun -n 2 SU2_DEF"
+    naca0012_def_file.su2_exec  = "SU2_DEF"
     naca0012_def_file.timeout   = 1600
     naca0012_def_file.tol       = 1e-8
     

From c977e92ce161dd63b0011b1668d6cc116412a2a5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 09:59:51 +0200
Subject: [PATCH 234/539] Removed MARKER_INTERFACE option.

MARKER_INTERFACE was not used anymore. The flag INTERFACE_BOUNDARY is
now used to initialize boundaries set with MARKER_ZONE_INTERFACE. Their
specific kind of BC will be set during the Interface_Preprocessing() in
the driver. This removes the necessity of using MARKER_CHT_INTERFACE or
MARKER_FLUID_INTERFACE in addition to MARKER_ZONE_INTERFACE.
---
 Common/include/config_structure.hpp   |  10 +-
 Common/include/config_structure.inl   |   2 -
 Common/include/geometry_structure.hpp |   6 -
 Common/src/config_structure.cpp       |  21 +-
 Common/src/geometry_structure.cpp     | 202 +--------------
 SU2_CFD/include/solver_structure.hpp  |  33 +--
 SU2_CFD/include/solver_structure.inl  |   4 +-
 SU2_CFD/src/driver_structure.cpp      |   6 +-
 SU2_CFD/src/solver_adjoint_mean.cpp   | 309 ----------------------
 SU2_CFD/src/solver_direct_mean.cpp    | 359 ++------------------------
 10 files changed, 43 insertions(+), 909 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index c7f9c06926ad..4589f80c0b80 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -203,7 +203,6 @@ class CConfig {
   nMarker_Shroud,/*!< \brief Number of shroud markers to set grid velocity to 0.*/
   nMarker_NearFieldBound,				/*!< \brief Number of near field boundary markers. */
   nMarker_ActDiskInlet, nMarker_ActDiskOutlet,
-  nMarker_InterfaceBound,				/*!< \brief Number of interface boundary markers. */
   nMarker_Fluid_InterfaceBound,				/*!< \brief Number of fluid interface markers. */
   nMarker_CHTInterface,     /*!< \brief Number of conjugate heat transfer interface markers. */
   nMarker_Dirichlet,				/*!< \brief Number of interface boundary markers. */
@@ -246,7 +245,6 @@ class CConfig {
   *Marker_TurboBoundIn,				/*!< \brief Turbomachinery performance boundary markers. */
   *Marker_TurboBoundOut,				/*!< \brief Turbomachinery performance boundary donor markers. */
   *Marker_NearFieldBound,				/*!< \brief Near Field boundaries markers. */
-  *Marker_InterfaceBound,				/*!< \brief Interface boundaries markers. */
   *Marker_Fluid_InterfaceBound,				/*!< \brief Fluid interface markers. */
   *Marker_CHTInterface,         /*!< \brief Conjugate heat transfer interface markers. */
   *Marker_ActDiskInlet,
@@ -2952,13 +2950,7 @@ class CConfig {
    * \return Total number of boundary markers.
    */
   unsigned short GetnMarker_NearFieldBound(void);
-  
-  /*!
-   * \brief Get the total number of boundary markers.
-   * \return Total number of boundary markers.
-   */
-  unsigned short GetnMarker_InterfaceBound(void);
-  
+
   /*!
    * \brief Get the total number of boundary markers.
    * \return Total number of boundary markers.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 19ee6c4ea922..bcf76ce1d9ca 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1417,8 +1417,6 @@ inline unsigned short CConfig::GetnMarker_EngineInflow(void) {	return nMarker_En
 
 inline unsigned short CConfig::GetnMarker_EngineExhaust(void) { return nMarker_EngineExhaust; }
 
-inline unsigned short CConfig::GetnMarker_InterfaceBound(void) { return nMarker_InterfaceBound; }
-
 inline unsigned short CConfig::GetnMarker_Fluid_InterfaceBound(void) { return nMarker_Fluid_InterfaceBound; }
 
 inline unsigned short CConfig::GetnMarker_Monitoring(void) { return nMarker_Monitoring; }
diff --git a/Common/include/geometry_structure.hpp b/Common/include/geometry_structure.hpp
index 7a546284b32e..a23f93e8eb73 100644
--- a/Common/include/geometry_structure.hpp
+++ b/Common/include/geometry_structure.hpp
@@ -1981,12 +1981,6 @@ void UpdateTurboVertex(CConfig *config,unsigned short val_iZone, unsigned short
 	 */
 	void MatchActuator_Disk(CConfig *config);
 
-	/*! 
-	 * \brief Mach the interface boundary condition.
-	 * \param[in] config - Definition of the particular problem.
-	 */
-	void MatchInterface(CConfig *config);
-
 	/*! 
 	 * \brief Set boundary vertex structure of the control volume.
 	 * \param[in] config - Definition of the particular problem.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index efc2c61a8c36..ed10066c2c41 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -477,7 +477,7 @@ void CConfig::SetPointersNull(void) {
 
   Marker_Euler                = NULL;    Marker_FarField         = NULL;    Marker_Custom         = NULL;
   Marker_SymWall              = NULL;    Marker_PerBound       = NULL;
-  Marker_PerDonor             = NULL;    Marker_NearFieldBound   = NULL;    Marker_InterfaceBound = NULL;
+  Marker_PerDonor             = NULL;    Marker_NearFieldBound   = NULL;    
   Marker_Dirichlet            = NULL;    Marker_Inlet            = NULL;    
   Marker_Supersonic_Inlet     = NULL;    Marker_Outlet           = NULL;
   Marker_Isothermal           = NULL;    Marker_HeatFlux         = NULL;    Marker_EngineInflow   = NULL;
@@ -1088,8 +1088,6 @@ void CConfig::SetConfig_Options() {
   addStringListOption("MARKER_NEARFIELD", nMarker_NearFieldBound, Marker_NearFieldBound);
   /*!\brief MARKER_FLUID_INTERFACE\n DESCRIPTION: Fluid interface boundary marker(s) \ingroup Config*/
   addStringListOption("MARKER_FLUID_INTERFACE", nMarker_Fluid_InterfaceBound, Marker_Fluid_InterfaceBound);
-  /*!\brief MARKER_INTERFACE\n DESCRIPTION: Zone interface boundary marker(s) \ingroup Config*/
-  addStringListOption("MARKER_INTERFACE", nMarker_InterfaceBound, Marker_InterfaceBound);
   /*!\brief MARKER_FSI_INTERFACE \n DESCRIPTION: ZONE interface boundary marker(s) \ingroup Config*/
   addStringListOption("MARKER_ZONE_INTERFACE", nMarker_ZoneInterface, Marker_ZoneInterface);
   /*!\brief MARKER_CHT_INTERFACE \n DESCRIPTION: CHT interface boundary marker(s) \ingroup Config*/
@@ -4401,8 +4399,7 @@ void CConfig::SetMarkers(unsigned short val_software) {
   /*--- Compute the total number of markers in the config file ---*/
   
   nMarker_CfgFile = nMarker_Euler + nMarker_FarField + nMarker_SymWall +
-  nMarker_PerBound + nMarker_NearFieldBound + nMarker_Fluid_InterfaceBound +
-  nMarker_InterfaceBound + nMarker_CHTInterface + nMarker_Dirichlet + nMarker_Neumann + nMarker_Inlet + nMarker_Riemann +
+  nMarker_PerBound + nMarker_NearFieldBound + nMarker_Fluid_InterfaceBound + nMarker_CHTInterface + nMarker_Dirichlet + nMarker_Neumann + nMarker_Inlet + nMarker_Riemann +
   nMarker_Giles + nMarker_Outlet + nMarker_Isothermal + nMarker_HeatFlux +
   nMarker_EngineInflow + nMarker_EngineExhaust + nMarker_Internal +
   nMarker_Supersonic_Inlet + nMarker_Supersonic_Outlet + nMarker_Displacement + nMarker_Load +
@@ -4660,8 +4657,8 @@ void CConfig::SetMarkers(unsigned short val_software) {
     iMarker_CfgFile++;
   }
 
-  for (iMarker_InterfaceBound = 0; iMarker_InterfaceBound < nMarker_InterfaceBound; iMarker_InterfaceBound++) {
-    Marker_CfgFile_TagBound[iMarker_CfgFile] = Marker_InterfaceBound[iMarker_InterfaceBound];
+  for (iMarker_InterfaceBound = 0; iMarker_InterfaceBound < nMarker_ZoneInterface; iMarker_InterfaceBound++) {
+    Marker_CfgFile_TagBound[iMarker_CfgFile] = Marker_ZoneInterface[iMarker_InterfaceBound];
     Marker_CfgFile_KindBC[iMarker_CfgFile] = INTERFACE_BOUNDARY;
     iMarker_CfgFile++;
   }
@@ -6322,15 +6319,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     BoundaryTable.PrintFooter();
   }
   
-  if (nMarker_InterfaceBound != 0) {
-    BoundaryTable << "Interface boundary";
-    for (iMarker_InterfaceBound = 0; iMarker_InterfaceBound < nMarker_InterfaceBound; iMarker_InterfaceBound++) {
-      BoundaryTable << Marker_InterfaceBound[iMarker_InterfaceBound];
-      if (iMarker_InterfaceBound < nMarker_InterfaceBound-1)  BoundaryTable << " ";
-    }
-    BoundaryTable.PrintFooter();
-  }
-  
   if (nMarker_Fluid_InterfaceBound != 0) {
     BoundaryTable << "Fluid interface boundary";
     for (iMarker_Fluid_InterfaceBound = 0; iMarker_Fluid_InterfaceBound < nMarker_Fluid_InterfaceBound; iMarker_Fluid_InterfaceBound++) {
@@ -7200,7 +7188,6 @@ CConfig::~CConfig(void) {
   if (Marker_PerBound != NULL )           delete[] Marker_PerBound;
   if (Marker_PerDonor != NULL )           delete[] Marker_PerDonor;
   if (Marker_NearFieldBound != NULL )     delete[] Marker_NearFieldBound;
-  if (Marker_InterfaceBound != NULL )     delete[] Marker_InterfaceBound;
   if (Marker_Fluid_InterfaceBound != NULL )     delete[] Marker_Fluid_InterfaceBound;
   if (Marker_Dirichlet != NULL )          delete[] Marker_Dirichlet;
   if (Marker_Inlet != NULL )              delete[] Marker_Inlet;
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 95f55a83ccf6..ee8365b1038c 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -12953,7 +12953,7 @@ void CPhysicalGeometry::ComputeWall_Distance(CConfig *config) {
     /* Check for a viscous wall. */
     if( (config->GetMarker_All_KindBC(iMarker) == HEAT_FLUX) ||
       (config->GetMarker_All_KindBC(iMarker) == ISOTHERMAL)  ||
-      (config->GetMarker_All_KindBC(iMarker) == CHT_WALL_INTERFACE)) {
+      (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY)) {
 
       /* Loop over the surface elements of this marker. */
       for(unsigned long iElem=0; iElem < nElem_Bound[iMarker]; iElem++) {
@@ -15442,205 +15442,6 @@ void CPhysicalGeometry::SetMaxLength(CConfig* config) {
   Set_MPI_MaxLength(config);
 }
 
-void CPhysicalGeometry::MatchInterface(CConfig *config) {
-  
-  su2double epsilon = 1e-1;
-  
-  unsigned short nMarker_InterfaceBound = config->GetnMarker_InterfaceBound();
-  
-  if (nMarker_InterfaceBound != 0) {
-    
-    unsigned short iMarker, iDim, jMarker, pMarker = 0;
-    unsigned long iVertex, iPoint, pVertex = 0, pPoint = 0, jVertex, jPoint, iPointGlobal, jPointGlobal, jVertex_, pPointGlobal = 0;
-    su2double *Coord_i, Coord_j[3], dist = 0.0, mindist, maxdist_local, maxdist_global;
-    int iProcessor, pProcessor = 0;
-    unsigned long nLocalVertex_Interface = 0, MaxLocalVertex_Interface = 0;
-    int nProcessor = size;
-
-    unsigned long *Buffer_Send_nVertex = new unsigned long [1];
-    unsigned long *Buffer_Receive_nVertex = new unsigned long [nProcessor];
-    
-    if (rank == MASTER_NODE) cout << "Set Interface boundary conditions (if any)." << endl;
-    
-    /*--- Compute the number of vertex that have interfase boundary condition
-     without including the ghost nodes ---*/
-    
-    nLocalVertex_Interface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY)
-        for (iVertex = 0; iVertex < GetnVertex(iMarker); iVertex++) {
-          iPoint = vertex[iMarker][iVertex]->GetNode();
-          if (node[iPoint]->GetDomain()) nLocalVertex_Interface ++;
-        }
-    
-    Buffer_Send_nVertex[0] = nLocalVertex_Interface;
-    
-    /*--- Send Interface vertex information --*/
-    
-#ifndef HAVE_MPI
-    MaxLocalVertex_Interface = nLocalVertex_Interface;
-    Buffer_Receive_nVertex[0] = Buffer_Send_nVertex[0];
-#else
-    SU2_MPI::Allreduce(&nLocalVertex_Interface, &MaxLocalVertex_Interface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-    SU2_MPI::Allgather(Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Receive_nVertex, 1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#endif
-    
-    su2double *Buffer_Send_Coord = new su2double [MaxLocalVertex_Interface*nDim];
-    unsigned long *Buffer_Send_Point = new unsigned long [MaxLocalVertex_Interface];
-    unsigned long *Buffer_Send_GlobalIndex  = new unsigned long [MaxLocalVertex_Interface];
-    unsigned long *Buffer_Send_Vertex  = new unsigned long [MaxLocalVertex_Interface];
-    unsigned long *Buffer_Send_Marker  = new unsigned long [MaxLocalVertex_Interface];
-    
-    su2double *Buffer_Receive_Coord = new su2double [nProcessor*MaxLocalVertex_Interface*nDim];
-    unsigned long *Buffer_Receive_Point = new unsigned long [nProcessor*MaxLocalVertex_Interface];
-    unsigned long *Buffer_Receive_GlobalIndex = new unsigned long [nProcessor*MaxLocalVertex_Interface];
-    unsigned long *Buffer_Receive_Vertex = new unsigned long [nProcessor*MaxLocalVertex_Interface];
-    unsigned long *Buffer_Receive_Marker = new unsigned long [nProcessor*MaxLocalVertex_Interface];
-    
-    unsigned long nBuffer_Coord = MaxLocalVertex_Interface*nDim;
-    unsigned long nBuffer_Point = MaxLocalVertex_Interface;
-    unsigned long nBuffer_GlobalIndex = MaxLocalVertex_Interface;
-    unsigned long nBuffer_Vertex = MaxLocalVertex_Interface;
-    unsigned long nBuffer_Marker = MaxLocalVertex_Interface;
-    
-    for (iVertex = 0; iVertex < MaxLocalVertex_Interface; iVertex++) {
-      Buffer_Send_Point[iVertex] = 0;
-      Buffer_Send_GlobalIndex[iVertex] = 0;
-      Buffer_Send_Vertex[iVertex] = 0;
-      Buffer_Send_Marker[iVertex] = 0;
-      for (iDim = 0; iDim < nDim; iDim++)
-        Buffer_Send_Coord[iVertex*nDim+iDim] = 0.0;
-    }
-    
-    /*--- Copy coordinates and point to the auxiliar vector --*/
-    
-    nLocalVertex_Interface = 0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY)
-        for (iVertex = 0; iVertex < GetnVertex(iMarker); iVertex++) {
-          iPoint = vertex[iMarker][iVertex]->GetNode();
-          iPointGlobal = node[iPoint]->GetGlobalIndex();
-          if (node[iPoint]->GetDomain()) {
-            Buffer_Send_Point[nLocalVertex_Interface] = iPoint;
-            Buffer_Send_GlobalIndex[nLocalVertex_Interface] = iPointGlobal;
-            Buffer_Send_Vertex[nLocalVertex_Interface] = iVertex;
-            Buffer_Send_Marker[nLocalVertex_Interface] = iMarker;
-            for (iDim = 0; iDim < nDim; iDim++)
-              Buffer_Send_Coord[nLocalVertex_Interface*nDim+iDim] = node[iPoint]->GetCoord(iDim);
-            nLocalVertex_Interface++;
-          }
-        }
-    
-#ifndef HAVE_MPI
-    for (unsigned long iBuffer_Coord = 0; iBuffer_Coord < nBuffer_Coord; iBuffer_Coord++)
-      Buffer_Receive_Coord[iBuffer_Coord] = Buffer_Send_Coord[iBuffer_Coord];
-    for (unsigned long iBuffer_Point = 0; iBuffer_Point < nBuffer_Point; iBuffer_Point++)
-      Buffer_Receive_Point[iBuffer_Point] = Buffer_Send_Point[iBuffer_Point];
-    for (unsigned long iBuffer_GlobalIndex = 0; iBuffer_GlobalIndex < nBuffer_GlobalIndex; iBuffer_GlobalIndex++)
-      Buffer_Receive_GlobalIndex[iBuffer_GlobalIndex] = Buffer_Send_GlobalIndex[iBuffer_GlobalIndex];
-    for (unsigned long iBuffer_Vertex = 0; iBuffer_Vertex < nBuffer_Vertex; iBuffer_Vertex++)
-      Buffer_Receive_Vertex[iBuffer_Vertex] = Buffer_Send_Vertex[iBuffer_Vertex];
-    for (unsigned long iBuffer_Marker = 0; iBuffer_Marker < nBuffer_Marker; iBuffer_Marker++)
-      Buffer_Receive_Marker[iBuffer_Marker] = Buffer_Send_Marker[iBuffer_Marker];
-#else
-    SU2_MPI::Allgather(Buffer_Send_Coord, nBuffer_Coord, MPI_DOUBLE, Buffer_Receive_Coord, nBuffer_Coord, MPI_DOUBLE, MPI_COMM_WORLD);
-    SU2_MPI::Allgather(Buffer_Send_Point, nBuffer_Point, MPI_UNSIGNED_LONG, Buffer_Receive_Point, nBuffer_Point, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-    SU2_MPI::Allgather(Buffer_Send_GlobalIndex, nBuffer_GlobalIndex, MPI_UNSIGNED_LONG, Buffer_Receive_GlobalIndex, nBuffer_GlobalIndex, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-    SU2_MPI::Allgather(Buffer_Send_Vertex, nBuffer_Vertex, MPI_UNSIGNED_LONG, Buffer_Receive_Vertex, nBuffer_Vertex, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-    SU2_MPI::Allgather(Buffer_Send_Marker, nBuffer_Marker, MPI_UNSIGNED_LONG, Buffer_Receive_Marker, nBuffer_Marker, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#endif
-    
-    
-    /*--- Compute the closest point to a Near-Field boundary point ---*/
-    
-    maxdist_local = 0.0;
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY) {
-        
-        for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
-          iPoint = vertex[iMarker][iVertex]->GetNode();
-          iPointGlobal = node[iPoint]->GetGlobalIndex();
-          
-          if (node[iPoint]->GetDomain()) {
-            
-            /*--- Coordinates of the boundary point ---*/
-            
-            Coord_i = node[iPoint]->GetCoord(); mindist = 1E6; pProcessor = 0; pPoint = 0;
-            
-            /*--- Loop over all the boundaries to find the pair ---*/
-            for (iProcessor = 0; iProcessor < nProcessor; iProcessor++)
-              for (jVertex = 0; jVertex < Buffer_Receive_nVertex[iProcessor]; jVertex++) {
-                jPoint = Buffer_Receive_Point[iProcessor*MaxLocalVertex_Interface+jVertex];
-                jPointGlobal = Buffer_Receive_GlobalIndex[iProcessor*MaxLocalVertex_Interface+jVertex];
-                jVertex_ = Buffer_Receive_Vertex[iProcessor*MaxLocalVertex_Interface+jVertex];
-                jMarker = Buffer_Receive_Marker[iProcessor*MaxLocalVertex_Interface+jVertex];
-                
-                if (jPointGlobal != iPointGlobal) {
-                  
-                  /*--- Compute the distance ---*/
-                  
-                  dist = 0.0; for (iDim = 0; iDim < nDim; iDim++) {
-                    Coord_j[iDim] = Buffer_Receive_Coord[(iProcessor*MaxLocalVertex_Interface+jVertex)*nDim+iDim];
-                    dist += pow(Coord_j[iDim]-Coord_i[iDim],2.0);
-                  } dist = sqrt(dist);
-                  
-                  if (((dist < mindist) && (iProcessor != rank)) ||
-                      ((dist < mindist) && (iProcessor == rank) && (jPoint != iPoint))) {
-                    mindist = dist; pProcessor = iProcessor; pPoint = jPoint; pPointGlobal = jPointGlobal;
-                    pVertex = jVertex_; pMarker = jMarker;
-                    if (dist == 0.0) break;
-                  }
-                }
-              }
-            
-            /*--- Store the value of the pair ---*/
-            
-            maxdist_local = max(maxdist_local, mindist);
-            vertex[iMarker][iVertex]->SetDonorPoint(pPoint, pPointGlobal, pVertex, pMarker, pProcessor);
-            
-            if (mindist > epsilon) {
-              cout.precision(10);
-              cout << endl;
-              cout << "   Bad match for point " << iPoint << ".\tNearest";
-              cout << " donor distance: " << scientific << mindist << ".";
-              vertex[iMarker][iVertex]->SetDonorPoint(iPoint, iPointGlobal, pVertex, pMarker, pProcessor);
-              maxdist_local = min(maxdist_local, 0.0);
-            }
-            
-          }
-        }
-      }
-    }
-    
-#ifndef HAVE_MPI
-    maxdist_global = maxdist_local;
-#else
-    SU2_MPI::Reduce(&maxdist_local, &maxdist_global, 1, MPI_DOUBLE, MPI_MAX, MASTER_NODE, MPI_COMM_WORLD);
-#endif
-    
-    if (rank == MASTER_NODE) cout <<"The max distance between points is: " << maxdist_global <<"."<< endl;
-    
-    delete[] Buffer_Send_Coord;
-    delete[] Buffer_Send_Point;
-    
-    delete[] Buffer_Receive_Coord;
-    delete[] Buffer_Receive_Point;
-    
-    delete[] Buffer_Send_nVertex;
-    delete[] Buffer_Receive_nVertex;
-
-    delete [] Buffer_Send_GlobalIndex;
-    delete [] Buffer_Send_Vertex;
-    delete [] Buffer_Send_Marker;
-
-    delete [] Buffer_Receive_GlobalIndex;
-    delete [] Buffer_Receive_Vertex;
-    delete [] Buffer_Receive_Marker;
-    
-  }
-  
-}
-
 void CPhysicalGeometry::MatchNearField(CConfig *config) {
   
   su2double epsilon = 1e-1;
@@ -18211,7 +18012,6 @@ void CPhysicalGeometry::FindNormal_Neighbor(CConfig *config) {
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     
     if (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE &&
-        config->GetMarker_All_KindBC(iMarker) != INTERFACE_BOUNDARY &&
         config->GetMarker_All_KindBC(iMarker) != NEARFIELD_BOUNDARY ) {
       
       for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 7ba14ca5c256..2e104a8ed051 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -768,13 +768,6 @@ class CSolver {
     */
   virtual void Set_MPI_Nearfield(CGeometry *geometry, CConfig *config);
   
-  /*!
-   * \brief A virtual member.
-    * \param[in] geometry - Geometrical definition of the problem.
-    * \param[in] config - Definition of the particular problem.
-    */
-  virtual void Set_MPI_Interface(CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -1303,6 +1296,12 @@ class CSolver {
    */
   virtual void SetnSlidingStates(unsigned short val_marker, unsigned long val_vertex, int value);
 
+  /*!
+   * \brief Allocate the sliding state arrays.
+   * \param[in] config - Definition of the particular problem.
+   */
+  virtual void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
+  
   /*!
    * \brief Set the conjugate heat variables.
    * \param[in] val_marker        - marker index
@@ -5118,13 +5117,6 @@ class CEulerSolver : public CSolver {
    */
   void Set_MPI_Nearfield(CGeometry *geometry, CConfig *config);
   
-  /*!
-   * \brief Parallelization of Undivided Laplacian.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void Set_MPI_Interface(CGeometry *geometry, CConfig *config);
-
   /*!
    * \author H. Kline
    * \brief Compute weighted-sum "combo" objective output
@@ -5486,6 +5478,12 @@ class CEulerSolver : public CSolver {
   */
   su2double GetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index);
 
+  /*!
+   * \brief Allocate the sliding state arrays.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
+  
   /*!
    * \brief Provide the non dimensional lift coefficient (inviscid contribution).
    * \param val_marker Surface where the coefficient is going to be computed.
@@ -10370,13 +10368,6 @@ class CAdjEulerSolver : public CSolver {
    */
   void Set_MPI_Nearfield(CGeometry *geometry, CConfig *config);
   
-  /*!
-   * \brief Parallelization of Undivided Laplacian.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void Set_MPI_Interface(CGeometry *geometry, CConfig *config);
-
   /*!
    * \brief Parallelization of Undivided Laplacian.
    * \param[in] geometry - Geometrical definition of the problem.
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index c9d1f9b3003c..dc2d1fa49516 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -862,8 +862,6 @@ inline void CSolver::Set_MPI_ActDisk(CSolver **solver_container, CGeometry *geom
 
 inline void CSolver::Set_MPI_Nearfield(CGeometry *geometry, CConfig *config) { }
 
-inline void CSolver::Set_MPI_Interface(CGeometry *geometry, CConfig *config) { }
-
 inline void CSolver::SetMax_Eigenvalue(CGeometry *geometry, CConfig *config) { }
 
 inline void CSolver::Set_MPI_MaxEigenvalue(CGeometry *geometry, CConfig *config) { }
@@ -2380,6 +2378,8 @@ inline void CIncEulerSolver::SetSlidingState(unsigned short val_marker, unsigned
   SlidingState[val_marker][val_vertex][val_state][donor_index] = component;
 }
 
+inline void CSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker) {}
+
 inline void CSolver::SetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index, su2double component){ }
 
 inline su2double CEulerSolver::GetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index) { return SlidingState[val_marker][val_vertex][val_state][donor_index]; }
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index c9139e157b07..e80631c97a6e 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -186,7 +186,6 @@ CDriver::CDriver(char* confFile,
 
       for (iMesh = 0; iMesh <= config_container[iZone]->GetnMGLevels(); iMesh++) {
         geometry_container[iZone][iInst][iMesh]->MatchNearField(config_container[iZone]);
-        geometry_container[iZone][iInst][iMesh]->MatchInterface(config_container[iZone]);
         geometry_container[iZone][iInst][iMesh]->MatchActuator_Disk(config_container[iZone]);
       }
 
@@ -3536,6 +3535,8 @@ void CDriver::Interface_Preprocessing() {
         nVar = solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->GetnPrimVar();
         transfer_container[donorZone][targetZone] = new CTransfer_SlidingInterface(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "sliding interface. " << endl;
+        config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);
+        solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
       }
       else if (fluid_donor && heat_target) {
         nVarTransfer = 0;
@@ -3547,6 +3548,8 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
+        
+        config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
       }
       else if (heat_donor && fluid_target) {
         nVarTransfer = 0;
@@ -3558,6 +3561,7 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
+        config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);        
       }
       else if (heat_donor && heat_target) {
         SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 42557843f7bf..31dcc03609fc 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -1701,315 +1701,6 @@ void CAdjEulerSolver::Set_MPI_Nearfield(CGeometry *geometry, CConfig *config) {
   
 }
 
-void CAdjEulerSolver::Set_MPI_Interface(CGeometry *geometry, CConfig *config) {
-  
-  unsigned long iter,  iPoint, iVertex, jVertex, iPointTotal,
-  Buffer_Send_nPointTotal = 0, iGlobalIndex, iGlobal;
-  unsigned short iVar, iMarker, jMarker;
-  long nDomain = 0, iDomain, jDomain;
-
-#ifdef HAVE_MPI
-
-  /*--- MPI status and request arrays for non-blocking communications ---*/
-  
-  SU2_MPI::Status status, status_;
-  
-
-#endif
-  
-  /*--- Define buffer vector interior domain ---*/
-  
-  su2double        *Buffer_Send_AdjVar          = NULL;
-  su2double        *iAdjVar          = new su2double [nVar];
-  
-  unsigned long *nPointTotal_s = new unsigned long[size];
-  unsigned long *nPointTotal_r = new unsigned long[size];
-  
-  unsigned long Buffer_Size_AdjVar          = 0;
-  unsigned long PointTotal_Counter = 0;
-  
-  /*--- Allocate the memory that we only need if we have MPI support ---*/
-  
-  su2double        *Buffer_Receive_AdjVar          = NULL;
-  
-  /*--- Basic dimensionalization ---*/
-  
-  nDomain = size;
-  
-  /*--- This loop gets the array sizes of points for each
-   rank to send to each other rank. ---*/
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- Loop over the markers to perform the dimensionalizaton
-     of the domain variables ---*/
-    
-    Buffer_Send_nPointTotal = 0;
-    
-    /*--- Loop over all of the markers and count the number of each
-     type of point and element that needs to be sent. ---*/
-    
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          jDomain = geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
-          if ((iDomain == jDomain) && (geometry->node[iPoint]->GetDomain())) {
-            Buffer_Send_nPointTotal++;
-          }
-        }
-      }
-    }
-    
-    /*--- Store the counts on a partition by partition basis. ---*/
-    
-    nPointTotal_s[iDomain] = Buffer_Send_nPointTotal;
-    
-    /*--- Total counts for allocating send buffers below ---*/
-    
-    Buffer_Size_AdjVar          += nPointTotal_s[iDomain]*(nVar+3);
-    
-  }
-  
-  /*--- Allocate the buffer vectors in the appropiate domain (master, iDomain) ---*/
-  
-  Buffer_Send_AdjVar          = new su2double[Buffer_Size_AdjVar];
-  
-  /*--- Now that we know the sizes of the point, we can
-   allocate and send the information in large chunks to all processors. ---*/
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- A rank does not communicate with itself through MPI ---*/
-    
-    if (rank != iDomain) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Communicate the counts to iDomain with non-blocking sends ---*/
-      
-      SU2_MPI::Bsend(&nPointTotal_s[iDomain], 1, MPI_UNSIGNED_LONG, iDomain, iDomain, MPI_COMM_WORLD);
-      
-#endif
-      
-    } else {
-      
-      /*--- If iDomain = rank, we simply copy values into place in memory ---*/
-      
-      nPointTotal_r[iDomain] = nPointTotal_s[iDomain];
-      
-    }
-    
-    /*--- Receive the counts. All processors are sending their counters to
-     iDomain up above, so only iDomain needs to perform the recv here from
-     all other ranks. ---*/
-    
-    if (rank == iDomain) {
-      
-      for (jDomain = 0; jDomain < size; jDomain++) {
-        
-        /*--- A rank does not communicate with itself through MPI ---*/
-        
-        if (rank != jDomain) {
-          
-#ifdef HAVE_MPI
-          
-          /*--- Recv the data by probing for the current sender, jDomain,
-           first and then receiving the values from it. ---*/
-          
-          SU2_MPI::Probe(jDomain, rank, MPI_COMM_WORLD, &status);
-          SU2_MPI::Recv(&nPointTotal_r[jDomain], 1, MPI_UNSIGNED_LONG, jDomain, rank, MPI_COMM_WORLD, &status);
-          
-#endif
-          
-        }
-      }
-      
-    }
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-  
-#endif
-  
-  /*--- Initialize the counters for the larger send buffers (by domain) ---*/
-  
-  PointTotal_Counter  = 0;
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- Set the value of the interior geometry. Initialize counters. ---*/
-    
-    iPointTotal = 0;
-    
-    /*--- Load up the actual values into the buffers for sending. ---*/
-    
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY) {
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          jDomain = geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
-          if ((iDomain == jDomain) && (geometry->node[iPoint]->GetDomain())) {
-            
-            iGlobalIndex = geometry->node[iPoint]->GetGlobalIndex();
-            jVertex = geometry->vertex[iMarker][iVertex]->GetDonorVertex();
-            jMarker = geometry->vertex[iMarker][iVertex]->GetDonorMarker();
-            
-            for (iVar = 0; iVar < nVar; iVar++) {
-              Buffer_Send_AdjVar[(nVar+3)*(PointTotal_Counter+iPointTotal)+iVar] = node[iPoint]->GetSolution(iVar);
-            }
-            Buffer_Send_AdjVar[(nVar+3)*(PointTotal_Counter+iPointTotal)+(nVar+0)]  = su2double(iGlobalIndex);
-            Buffer_Send_AdjVar[(nVar+3)*(PointTotal_Counter+iPointTotal)+(nVar+1)] = su2double(jVertex);
-            Buffer_Send_AdjVar[(nVar+3)*(PointTotal_Counter+iPointTotal)+(nVar+2)]  = su2double(jMarker);
-            
-            iPointTotal++;
-            
-          }
-          
-        }
-        
-      }
-      
-    }
-    
-    /*--- Send the buffers with the geometrical information ---*/
-    
-    if (iDomain != rank) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Communicate the coordinates, global index, colors, and element
-       date to iDomain with non-blocking sends. ---*/
-      
-      SU2_MPI::Bsend(&Buffer_Send_AdjVar[PointTotal_Counter*(nVar+3)],
-                     nPointTotal_s[iDomain]*(nVar+3), MPI_DOUBLE, iDomain,
-                     iDomain,  MPI_COMM_WORLD);
-      
-#endif
-      
-    }
-    
-    else {
-      
-      /*--- Allocate local memory for the local recv of the elements ---*/
-      
-      Buffer_Receive_AdjVar            = new su2double[nPointTotal_s[iDomain]*(nVar+3)];
-      
-      for (iter = 0; iter < nPointTotal_s[iDomain]*(nVar+3); iter++)
-        Buffer_Receive_AdjVar[iter] = Buffer_Send_AdjVar[PointTotal_Counter*(nVar+3)+iter];
-      
-      /*--- Recv the point data from ourselves (same procedure as above) ---*/
-      
-      for (iPoint = 0; iPoint < nPointTotal_r[iDomain]; iPoint++) {
-        
-        iGlobal       =  SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+0)]);
-        iVertex      = SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+1)]);
-        iMarker      = SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+2)]);
-        for (iVar = 0; iVar < nVar; iVar++)
-          iAdjVar[iVar] = Buffer_Receive_AdjVar[iPoint*(nVar+3)+iVar];
-        
-        for (iVar = 0; iVar < nVar; iVar++)
-          SetDonorAdjVar(iMarker, iVertex, iVar, iAdjVar[iVar]);
-        
-        SetDonorGlobalIndex(iMarker, iVertex, iGlobal);
-        
-      }
-      
-      /*--- Delete memory for recv the point stuff ---*/
-      
-      delete [] Buffer_Receive_AdjVar;
-      
-    }
-    
-    /*--- Increment the counters for the send buffers (iDomain loop) ---*/
-    
-    PointTotal_Counter += iPointTotal;
-    
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-  
-#endif
-  
-  /*--- The next section begins the recv of all data for the interior
-   points/elements in the mesh. First, create the domain structures for
-   the points on this rank. First, we recv all of the point data ---*/
-  
-  for (iDomain = 0; iDomain < size; iDomain++) {
-    
-    if (rank != iDomain) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Allocate the receive buffer vector. Send the colors so that we
-       know whether what we recv is an owned or halo node. ---*/
-      
-      Buffer_Receive_AdjVar            = new su2double [nPointTotal_r[iDomain]*(nVar+3)];
-      
-      /*--- Receive the buffers with the coords, global index, and colors ---*/
-      
-      SU2_MPI::Recv(Buffer_Receive_AdjVar, nPointTotal_r[iDomain]*(nVar+3) , MPI_DOUBLE,
-                    iDomain, rank, MPI_COMM_WORLD, &status_);
-      
-      
-      /*--- Loop over all of the points that we have recv'd and store the
-       coords, global index vertex and markers ---*/
-      
-      for (iPoint = 0; iPoint < nPointTotal_r[iDomain]; iPoint++) {
-        
-        iGlobal      = SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+0)]);
-        iVertex      = SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+1)]);
-        iMarker      = SU2_TYPE::Int(Buffer_Receive_AdjVar[iPoint*(nVar+3)+(nVar+2)]);
-        for (iVar = 0; iVar < nVar; iVar++)
-          iAdjVar[iVar] = Buffer_Receive_AdjVar[iPoint*(nVar+3)+iVar];
-        
-        for (iVar = 0; iVar < nVar; iVar++)
-          SetDonorAdjVar(iMarker, iVertex, iVar, iAdjVar[iVar]);
-        
-        SetDonorGlobalIndex(iMarker, iVertex, iGlobal);
-        
-      }
-      
-      /*--- Delete memory for recv the point stuff ---*/
-      
-      delete [] Buffer_Receive_AdjVar;
-      
-#endif
-      
-    }
-    
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-  
-#endif
-  
-  /*--- Free all of the memory used for communicating points and elements ---*/
-  
-  delete[] Buffer_Send_AdjVar;
-  
-  /*--- Release all of the temporary memory ---*/
-  
-  delete [] nPointTotal_s;
-  delete [] nPointTotal_r;
-  delete [] iAdjVar;
-  
-}
-
 void CAdjEulerSolver::SetForceProj_Vector(CGeometry *geometry, CSolver **solver_container, CConfig *config) {
   
   su2double *ForceProj_Vector, x = 0.0, y = 0.0, z = 0.0, *Normal, CD, CL, Cp, CpTarget,
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 3fea984dd480..e4ae20e46879 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -771,21 +771,6 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   for (iMarker = 0; iMarker < nMarker; iMarker++){
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
-
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
-
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*--- Initialize the solution to the far-field state everywhere. ---*/
@@ -3171,322 +3156,6 @@ void CEulerSolver::Set_MPI_Nearfield(CGeometry *geometry, CConfig *config) {
   
 }
 
-void CEulerSolver::Set_MPI_Interface(CGeometry *geometry, CConfig *config) {
-  
-  unsigned long iter,  iPoint, iVertex, jVertex, iPointTotal,
-  Buffer_Send_nPointTotal = 0, iGlobalIndex, iGlobal;
-  unsigned short iVar, iMarker, jMarker;
-  long nDomain = 0, iDomain, jDomain;
-  
-#ifdef HAVE_MPI
-  
-  /*--- MPI status and request arrays for non-blocking communications ---*/
-  
-  SU2_MPI::Status status, status_;
-  
-
-#endif
-  
-  /*--- Define buffer vector interior domain ---*/
-  
-  su2double        *Buffer_Send_PrimVar          = NULL;
-  su2double        *iPrimVar          = new su2double [nPrimVar];
-  
-  unsigned long *nPointTotal_s = new unsigned long[size];
-  unsigned long *nPointTotal_r = new unsigned long[size];
-  
-  unsigned long Buffer_Size_PrimVar          = 0;
-  unsigned long PointTotal_Counter = 0;
-  
-  /*--- Allocate the memory that we only need if we have MPI support ---*/
-  
-  su2double        *Buffer_Receive_PrimVar          = NULL;
-  
-  /*--- Basic dimensionalization ---*/
-  
-  nDomain = size;
-  
-  /*--- This loop gets the array sizes of points for each
-   rank to send to each other rank. ---*/
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- Loop over the markers to perform the dimensionalizaton
-     of the domain variables ---*/
-    
-    Buffer_Send_nPointTotal = 0;
-    
-    /*--- Loop over all of the markers and count the number of each
-     type of point and element that needs to be sent. ---*/
-    
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY) {
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          jDomain = geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
-          if ((iDomain == jDomain) && (geometry->node[iPoint]->GetDomain())) {
-            Buffer_Send_nPointTotal++;
-          }
-        }
-      }
-    }
-    
-    /*--- Store the counts on a partition by partition basis. ---*/
-    
-    nPointTotal_s[iDomain] = Buffer_Send_nPointTotal;
-    
-    /*--- Total counts for allocating send buffers below ---*/
-    
-    Buffer_Size_PrimVar          += nPointTotal_s[iDomain]*(nPrimVar+3);
-    
-  }
-  
-  /*--- Allocate the buffer vectors in the appropiate domain (master, iDomain) ---*/
-  
-  Buffer_Send_PrimVar          = new su2double[Buffer_Size_PrimVar];
-  
-  /*--- Now that we know the sizes of the point, we can
-   allocate and send the information in large chunks to all processors. ---*/
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- A rank does not communicate with itself through MPI ---*/
-    
-    if (rank != iDomain) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Communicate the counts to iDomain with non-blocking sends ---*/
-      
-      SU2_MPI::Bsend(&nPointTotal_s[iDomain], 1, MPI_UNSIGNED_LONG, iDomain, iDomain, MPI_COMM_WORLD);
-      
-#endif
-      
-    } else {
-      
-      /*--- If iDomain = rank, we simply copy values into place in memory ---*/
-      
-      nPointTotal_r[iDomain] = nPointTotal_s[iDomain];
-      
-    }
-    
-    /*--- Receive the counts. All processors are sending their counters to
-     iDomain up above, so only iDomain needs to perform the recv here from
-     all other ranks. ---*/
-    
-    if (rank == iDomain) {
-      
-      for (jDomain = 0; jDomain < size; jDomain++) {
-        
-        /*--- A rank does not communicate with itself through MPI ---*/
-        
-        if (rank != jDomain) {
-          
-#ifdef HAVE_MPI
-          
-          /*--- Recv the data by probing for the current sender, jDomain,
-           first and then receiving the values from it. ---*/
-          
-          SU2_MPI::Recv(&nPointTotal_r[jDomain], 1, MPI_UNSIGNED_LONG, jDomain, rank, MPI_COMM_WORLD, &status);
-          
-#endif
-          
-        }
-      }
-      
-    }
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-  
-#endif
-  
-  /*--- Initialize the counters for the larger send buffers (by domain) ---*/
-  
-  PointTotal_Counter  = 0;
-  
-  for (iDomain = 0; iDomain < nDomain; iDomain++) {
-    
-    /*--- Set the value of the interior geometry. Initialize counters. ---*/
-    
-    iPointTotal = 0;
-    
-    /*--- Load up the actual values into the buffers for sending. ---*/
-    
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      
-      if (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY) {
-        
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          jDomain = geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
-          
-          if ((iDomain == jDomain) && (geometry->node[iPoint]->GetDomain())) {
-            
-            iGlobalIndex = geometry->node[iPoint]->GetGlobalIndex();
-            jVertex = geometry->vertex[iMarker][iVertex]->GetDonorVertex();
-            jMarker = geometry->vertex[iMarker][iVertex]->GetDonorMarker();
-            
-            for (iVar = 0; iVar < nPrimVar; iVar++) {
-              Buffer_Send_PrimVar[(nPrimVar+3)*(PointTotal_Counter+iPointTotal)+iVar] = node[iPoint]->GetPrimitive(iVar);
-            }
-            Buffer_Send_PrimVar[(nPrimVar+3)*(PointTotal_Counter+iPointTotal)+(nPrimVar+0)]  = su2double(iGlobalIndex);
-            Buffer_Send_PrimVar[(nPrimVar+3)*(PointTotal_Counter+iPointTotal)+(nPrimVar+1)] = su2double(jVertex);
-            Buffer_Send_PrimVar[(nPrimVar+3)*(PointTotal_Counter+iPointTotal)+(nPrimVar+2)]  = su2double(jMarker);
-            
-            iPointTotal++;
-            
-          }
-          
-        }
-        
-      }
-      
-    }
-    
-    /*--- Send the buffers with the geometrical information ---*/
-    
-    if (iDomain != rank) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Communicate the coordinates, global index, colors, and element
-       date to iDomain with non-blocking sends. ---*/
-      
-      SU2_MPI::Bsend(&Buffer_Send_PrimVar[PointTotal_Counter*(nPrimVar+3)],
-                     nPointTotal_s[iDomain]*(nPrimVar+3), MPI_DOUBLE, iDomain,
-                     iDomain,  MPI_COMM_WORLD);
-      
-#endif
-      
-    }
-    
-    else {
-      
-      /*--- Allocate local memory for the local recv of the elements ---*/
-      
-      Buffer_Receive_PrimVar            = new su2double[nPointTotal_s[iDomain]*(nPrimVar+3)];
-      
-      for (iter = 0; iter < nPointTotal_s[iDomain]*(nPrimVar+3); iter++)
-        Buffer_Receive_PrimVar[iter] = Buffer_Send_PrimVar[PointTotal_Counter*(nPrimVar+3)+iter];
-      
-      /*--- Recv the point data from ourselves (same procedure as above) ---*/
-      
-      for (iPoint = 0; iPoint < nPointTotal_r[iDomain]; iPoint++) {
-        
-        iGlobal       =  SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+0)]);
-        iVertex      = SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+1)]);
-        iMarker      = SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+2)]);
-        for (iVar = 0; iVar < nPrimVar; iVar++)
-          iPrimVar[iVar] = Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+iVar];
-        
-        if (iVertex < 0.0) cout <<" Negative iVertex (receive)" << endl;
-        if (iMarker < 0.0) cout <<" Negative iMarker (receive)" << endl;
-        
-        for (iVar = 0; iVar < nPrimVar; iVar++)
-          SetDonorPrimVar(iMarker, iVertex, iVar, iPrimVar[iVar]);
-        
-        SetDonorGlobalIndex(iMarker, iVertex, iGlobal);
-        
-      }
-      
-      /*--- Delete memory for recv the point stuff ---*/
-      
-      delete [] Buffer_Receive_PrimVar;
-      
-    }
-    
-    /*--- Increment the counters for the send buffers (iDomain loop) ---*/
-    
-    PointTotal_Counter += iPointTotal;
-    
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  
-  /*--- The next section begins the recv of all data for the interior
-   points/elements in the mesh. First, create the domain structures for
-   the points on this rank. First, we recv all of the point data ---*/
-  
-  for (iDomain = 0; iDomain < size; iDomain++) {
-    
-    if (rank != iDomain) {
-      
-#ifdef HAVE_MPI
-      
-      /*--- Allocate the receive buffer vector. Send the colors so that we
-       know whether what we recv is an owned or halo node. ---*/
-      
-      Buffer_Receive_PrimVar            = new su2double [nPointTotal_r[iDomain]*(nPrimVar+3)];
-      
-      /*--- Receive the buffers with the coords, global index, and colors ---*/
-      
-      SU2_MPI::Recv(Buffer_Receive_PrimVar, nPointTotal_r[iDomain]*(nPrimVar+3) , MPI_DOUBLE,
-                    iDomain, rank, MPI_COMM_WORLD, &status_);
-      
-      /*--- Loop over all of the points that we have recv'd and store the
-       coords, global index vertex and markers ---*/
-      
-      for (iPoint = 0; iPoint < nPointTotal_r[iDomain]; iPoint++) {
-        
-        iGlobal      = SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+0)]);
-        iVertex      = SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+1)]);
-        iMarker      = SU2_TYPE::Int(Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+(nPrimVar+2)]);
-        for (iVar = 0; iVar < nPrimVar; iVar++)
-          iPrimVar[iVar] = Buffer_Receive_PrimVar[iPoint*(nPrimVar+3)+iVar];
-        
-        if (iVertex < 0.0) cout <<" Negative iVertex (receive)" << endl;
-        if (iMarker < 0.0) cout <<" Negative iMarker (receive)" << endl;
-        
-        if (iMarker > nMarker) cout << "ERROR" <<  endl;
-        if (iVertex > geometry->nVertex[iMarker]) cout << "ERROR" <<  endl;
-        
-        for (iVar = 0; iVar < nPrimVar; iVar++)
-          SetDonorPrimVar(iMarker, iVertex, iVar, iPrimVar[iVar]);
-        
-        SetDonorGlobalIndex(iMarker, iVertex, iGlobal);
-        
-      }
-      
-      /*--- Delete memory for recv the point stuff ---*/
-      
-      delete [] Buffer_Receive_PrimVar;
-      
-#endif
-      
-    }
-    
-  }
-  
-  /*--- Wait for the non-blocking sends to complete. ---*/
-  
-#ifdef HAVE_MPI
-  
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-  
-#endif
-  
-  /*--- Free all of the memory used for communicating points and elements ---*/
-  
-  delete[] Buffer_Send_PrimVar;
-  
-  /*--- Release all of the temporary memory ---*/
-  
-  delete [] nPointTotal_s;
-  delete [] nPointTotal_r;
-  delete [] iPrimVar;
-  
-}
-
 void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMesh) {
   
   su2double Temperature_FreeStream = 0.0, Mach2Vel_FreeStream = 0.0, ModVel_FreeStream = 0.0,
@@ -4245,7 +3914,6 @@ void CEulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   bool engine           = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
   bool actuator_disk    = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
   bool nearfield        = (config->GetnMarker_NearFieldBound() != 0);
-  bool interface        = (config->GetnMarker_InterfaceBound() != 0);
   bool fixed_cl         = config->GetFixed_CL_Mode();
   bool van_albada       = config->GetKind_SlopeLimit_Flow() == VAN_ALBADA_EDGE;
   unsigned short kind_row_dissipation = config->GetKind_RoeLowDiss();
@@ -4274,10 +3942,6 @@ void CEulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
     SetActDisk_BCThrust(geometry, solver_container, config, iMesh, Output);
   }
 
-  /*--- Compute Interface MPI ---*/
-
-  if (interface) { Set_MPI_Interface(geometry, config); }
-
   /*--- Compute NearField MPI ---*/
 
   if (nearfield) { Set_MPI_Nearfield(geometry, config); }
@@ -15019,6 +14683,24 @@ void CEulerSolver::GatherInOutAverageValues(CConfig *config, CGeometry *geometry
   }
 }
 
+void CEulerSolver::InitSlidingState(CConfig* config, CGeometry* geometry, unsigned short iMarker){
+  
+  
+  unsigned long iPoint;
+  unsigned short iVar;
+
+  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+  
+  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+    
+    SlidingStateNodes[iMarker][iPoint] = 0;
+    for (iVar = 0; iVar < nPrimVar+1; iVar++)
+      SlidingState[iMarker][iPoint][iVar] = NULL;
+  }
+}
+
 CNSSolver::CNSSolver(void) : CEulerSolver() {
   
   /*--- Basic array initialization ---*/
@@ -15903,7 +15585,6 @@ void CNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, C
   bool engine               = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
   bool actuator_disk        = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
   bool nearfield            = (config->GetnMarker_NearFieldBound() != 0);
-  bool interface            = (config->GetnMarker_InterfaceBound() != 0);
   bool van_albada           = config->GetKind_SlopeLimit_Flow() == VAN_ALBADA_EDGE;
   unsigned short kind_row_dissipation = config->GetKind_RoeLowDiss();
   bool roe_low_dissipation  = (kind_row_dissipation != NO_ROELOWDISS) &&
@@ -15931,10 +15612,6 @@ void CNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, C
     SetActDisk_BCThrust(geometry, solver_container, config, iMesh, Output);
   }
 
-  /*--- Compute Interface MPI ---*/
-
-  if (interface) { Set_MPI_Interface(geometry, config); }
-
   /*--- Compute NearField MPI ---*/
 
   if (nearfield) { Set_MPI_Nearfield(geometry, config); }

From 165793245575dcfd0bdc0715e650f85df29e09cf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 10:04:20 +0200
Subject: [PATCH 235/539] Some of the history preprocessing routines are now
 called by all procs

---
 SU2_CFD/src/output/output_structure.cpp | 97 +++++++++++++------------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 5c72f71dd188..10b5d7d61f3c 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -232,31 +232,31 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   curr_TimeIter  = TimeIter;
   curr_OuterIter = OuterIter;
   curr_InnerIter = InnerIter;
-
+  
+  bool write_header, write_history, write_screen;
+  
+  /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+  
+  LoadHistoryData(config, geometry, solver_container);
+  
+  Postprocess_HistoryData(config);
+  
   /*--- Output using only the master node ---*/
-
+  
   if (rank == MASTER_NODE) {
-
-    bool write_header, write_history, write_screen;
-
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-
-    LoadHistoryData(config, geometry, solver_container);
     
-    Postprocess_HistoryData(config);
-        
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config);
     if (write_history) SetHistoryFile_Output(config);
-
+    
     /*--- Write the screen header---------------------------------------------------------------------------*/
     write_header = WriteScreen_Header(config);
     if (write_header) SetScreen_Header(config);
-
+    
     /*--- Write the screen output---------------------------------------------------------------------------*/
     write_screen = WriteScreen_Output(config);
     if (write_screen) SetScreen_Output(config);
-
+    
   }
 
 }
@@ -265,28 +265,29 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, uns
   curr_TimeIter  = TimeIter;
   curr_OuterIter = OuterIter;
   
-  /*--- Output using only the master node ---*/
 
+  bool write_header, write_screen, write_history;
+  
+  /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+  
+  LoadMultizoneHistoryData(output, config);
+  
+  /*--- Output using only the master node ---*/
+  
   if (rank == MASTER_NODE) {
-
-    bool write_header, write_screen, write_history;
-
-    /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
-
-    LoadMultizoneHistoryData(output, config);
-
+    
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config[ZONE_0]);
     if (write_history) SetHistoryFile_Output(config[ZONE_0]);
-
+    
     /*--- Write the screen header---------------------------------------------------------------------------*/
     write_header = WriteScreen_Header(config[ZONE_0]);
     if (write_header) SetScreen_Header(config[ZONE_0]);
-
+    
     /*--- Write the screen output---------------------------------------------------------------------------*/
     write_screen = WriteScreen_Output(config[ZONE_0]);
     if (write_screen) SetScreen_Output(config[ZONE_0]);
-
+    
   }
   
 }
@@ -5401,43 +5402,45 @@ void COutput::SetScreen_Output(CConfig *config) {
 
 void COutput::PreprocessHistoryOutput(CConfig *config){
   
-  if (rank == MASTER_NODE){
-   
+
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
     SetHistoryOutputFields(config);
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
-   
-    Postprocess_HistoryFields(config);
-    
-    /*--- Check for consistency and remove fields that are requested but not available --- */
     
-    CheckHistoryOutput();
-    
-    /*--- Open history file and print the header ---*/
-    
-    PrepareHistoryFile(config);
+    Postprocess_HistoryFields(config);
     
-    /*--- Set the multizone screen header ---*/
-
-    if (config->GetMultizone_Problem()){
-      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
-      MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
-      MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+    if (rank == MASTER_NODE){
+      
+      /*--- Check for consistency and remove fields that are requested but not available --- */
+      
+      CheckHistoryOutput();
+      
+      /*--- Open history file and print the header ---*/
+      
+      PrepareHistoryFile(config);
+      
+      /*--- Set the multizone screen header ---*/
+      
+      if (config->GetMultizone_Problem()){
+        MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
+        MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+        MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+      }
+      
     }
     
-  }
-  
 }
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config){
   
+  
+  /*--- Set the History output fields using a virtual function call to the child implementation ---*/
+  
+  SetMultizoneHistoryOutputFields(output, config);
+  
   if (rank == MASTER_NODE){
-   
-    /*--- Set the History output fields using a virtual function call to the child implementation ---*/
-    
-    SetMultizoneHistoryOutputFields(output, config);
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    

From 1ae8b531a14acff7ea57979fd8f43b39222f3bac Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 14:15:15 +0200
Subject: [PATCH 236/539] Added a routine to update boundaries after changing
 the kind of BC

---
 Common/include/config_structure.hpp   | 15 ++++++++++
 Common/include/geometry_structure.hpp |  5 ++++
 Common/src/config_structure.cpp       | 23 +++++++++++++++
 Common/src/geometry_structure.cpp     | 41 +++++++++++++++++++++++++--
 SU2_CFD/src/driver_structure.cpp      | 10 ++++++-
 5 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 4589f80c0b80..fc85819fbc81 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -6128,6 +6128,21 @@ class CConfig {
    */
   unsigned short GetnMarker_ZoneInterface(void);
 
+  
+  /*!
+   * \brief Determines whether a marker with index iMarker is a solid boundary.
+   * \param iMarker
+   * \return <TRUE> it marker with index iMarker is a solid boundary.
+   */
+  bool GetSolid_Wall(unsigned short iMarker);
+  
+  /*!
+   * \brief Determines whether a marker with index iMarker is a viscous no-slip boundary.
+   * \param iMarker
+   * \return <TRUE> it marker with index iMarker is a viscous no-slip boundary.
+   */
+  bool GetViscous_Wall(unsigned short iMarker);
+
   /*!
    * \brief Determines if problem is adjoint
    * \return true if Adjoint
diff --git a/Common/include/geometry_structure.hpp b/Common/include/geometry_structure.hpp
index a23f93e8eb73..2829799f7c76 100644
--- a/Common/include/geometry_structure.hpp
+++ b/Common/include/geometry_structure.hpp
@@ -1570,6 +1570,11 @@ class CGeometry {
    */
   void SetElemVolume(CConfig *config);
 
+  /*!
+   * \brief Compute and store the volume of the elements.
+   * \param[in] config - Problem configuration.
+   */
+  void UpdateBoundaries(CConfig *config);
 };
 
 /*!
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index ed10066c2c41..10578dd0f9c7 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -6833,6 +6833,29 @@ int CConfig::GetMarker_ZoneInterface(string val_marker) {
 }
 
 
+bool CConfig::GetSolid_Wall(unsigned short iMarker){
+  
+  if (Marker_All_KindBC[iMarker] == HEAT_FLUX  ||
+      Marker_All_KindBC[iMarker] == ISOTHERMAL ||
+      Marker_All_KindBC[iMarker] == CHT_WALL_INTERFACE ||
+      Marker_All_KindBC[iMarker] == EULER_WALL){
+    return true;
+  }
+  
+  return false;
+}
+
+bool CConfig::GetViscous_Wall(unsigned short iMarker){
+  
+  if (Marker_All_KindBC[iMarker] == HEAT_FLUX  ||
+      Marker_All_KindBC[iMarker] == ISOTHERMAL ||
+      Marker_All_KindBC[iMarker] == CHT_WALL_INTERFACE){
+    return true;
+  }
+  
+  return false;
+}
+
 CConfig::~CConfig(void) {
 	
   unsigned long iDV, iMarker, iPeriodic, iFFD;
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index ee8365b1038c..069a82bfdf14 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -2206,6 +2206,42 @@ void CGeometry::SetElemVolume(CConfig *config)
   }
 }
 
+void CGeometry::UpdateBoundaries(CConfig *config){
+  
+  unsigned short iMarker;
+  unsigned long iElem_Surface, iNode_Surface, Point_Surface;
+  
+  for (iMarker = 0; iMarker <config->GetnMarker_All(); iMarker++){
+    for (iElem_Surface = 0; iElem_Surface < nElem_Bound[iMarker]; iElem_Surface++) {
+      for (iNode_Surface = 0; iNode_Surface < bound[iMarker][iElem_Surface]->GetnNodes(); iNode_Surface++) {
+        
+        Point_Surface = bound[iMarker][iElem_Surface]->GetNode(iNode_Surface);
+        
+        node[Point_Surface]->SetPhysicalBoundary(false);
+        node[Point_Surface]->SetSolidBoundary(false);
+        
+        if (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE &&
+            config->GetMarker_All_KindBC(iMarker) != INTERFACE_BOUNDARY &&
+            config->GetMarker_All_KindBC(iMarker) != NEARFIELD_BOUNDARY &&
+            config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY)
+          node[Point_Surface]->SetPhysicalBoundary(true);
+        
+        if (config->GetSolid_Wall(iMarker))
+          node[Point_Surface]->SetSolidBoundary(true);
+      }
+    }
+  }
+  
+  /*--- Update the normal neighbors ---*/
+  
+  FindNormal_Neighbor(config);
+  
+  /*--- Compute wall distance ---- */
+  
+  ComputeWall_Distance(config);
+    
+}
+
 CPhysicalGeometry::CPhysicalGeometry() : CGeometry() {
   
   size = SU2_MPI::GetSize();
@@ -12951,9 +12987,7 @@ void CPhysicalGeometry::ComputeWall_Distance(CConfig *config) {
 
 
     /* Check for a viscous wall. */
-    if( (config->GetMarker_All_KindBC(iMarker) == HEAT_FLUX) ||
-      (config->GetMarker_All_KindBC(iMarker) == ISOTHERMAL)  ||
-      (config->GetMarker_All_KindBC(iMarker) == INTERFACE_BOUNDARY)) {
+    if( config->GetViscous_Wall(iMarker)) {
 
       /* Loop over the surface elements of this marker. */
       for(unsigned long iElem=0; iElem < nElem_Bound[iMarker]; iElem++) {
@@ -18012,6 +18046,7 @@ void CPhysicalGeometry::FindNormal_Neighbor(CConfig *config) {
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     
     if (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE &&
+        config->GetMarker_All_KindBC(iMarker) != INTERFACE_BOUNDARY &&
         config->GetMarker_All_KindBC(iMarker) != NEARFIELD_BOUNDARY ) {
       
       for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index e80631c97a6e..ef922d9be714 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3593,7 +3593,15 @@ void CDriver::Interface_Preprocessing() {
   if (rank == MASTER_NODE) 
   delete [] Buffer_Recv_mark;
 #endif
-
+  
+  /*--- Update boundary condition information since some
+   *  kind of BCs have changed during the setup of the interfaces --- */
+  
+  for (iZone = 0; iZone < nZone; iZone ++){
+    if (config_container[iZone]->GetMarker_n_ZoneInterface() != 0)  
+      for (unsigned short iMGlevel = 0; iMGlevel <= config_container[iZone]->GetnMGLevels(); iMGlevel++)
+        geometry_container[iZone][INST_0][iMGlevel]->UpdateBoundaries(config_container[iZone]);
+  }
 }
 
 void CDriver::InitStaticMeshMovement(){

From 12d0e033ee97e2b8202ce10fc316315234fdb830 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 14:15:57 +0200
Subject: [PATCH 237/539] Added InitSlidingState to incomp. and turb. solvers

---
 SU2_CFD/include/solver_structure.hpp    | 12 +++++++
 SU2_CFD/src/driver_structure.cpp        |  3 ++
 SU2_CFD/src/solver_direct_mean.cpp      | 14 --------
 SU2_CFD/src/solver_direct_mean_inc.cpp  | 46 +++++++++----------------
 SU2_CFD/src/solver_direct_turbulent.cpp | 44 +++++++++--------------
 5 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 2e104a8ed051..9bf770338dff 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -8352,6 +8352,12 @@ class CIncEulerSolver : public CSolver {
    */
   int GetnSlidingStates(unsigned short val_marker, unsigned long val_vertex);
 
+  /*!
+   * \brief Allocate the sliding state arrays.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
+  
   /*!
    * \brief Get the outer state for fluid interface nodes.
    * \param[in] val_marker - marker index
@@ -9524,6 +9530,12 @@ class CTurbSolver : public CSolver {
    */
   int GetnSlidingStates(unsigned short val_marker, unsigned long val_vertex);
 
+  /*!
+   * \brief Allocate the sliding state arrays.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
+  
   /*!
    * \brief Set custom turbulence variables at the vertex of an inlet.
    * \param[in] iMarker - Marker identifier.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index ef922d9be714..0b41df8a9d3a 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3537,6 +3537,9 @@ void CDriver::Interface_Preprocessing() {
         if (rank == MASTER_NODE) cout << "sliding interface. " << endl;
         config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);
         solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
+        if (config_container[donorZone]->GetKind_Turb_Model() != NONE){
+          solver_container[donorZone][INST_0][MESH_0][TURB_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);               
+        }
       }
       else if (fluid_donor && heat_target) {
         nVarTransfer = 0;
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index e4ae20e46879..47b9c4e47261 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -15397,20 +15397,6 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
     
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
-
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*--- Initialize the solution to the far-field state everywhere. ---*/
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index a91ff4ad0b28..6475a9d1e760 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -527,21 +527,6 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   for (iMarker = 0; iMarker < nMarker; iMarker++){
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
-
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
-
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*--- Initialize the cauchy critera array for fixed CL mode ---*/
@@ -7250,6 +7235,23 @@ void CIncEulerSolver::SetFreeStream_Solution(CConfig *config){
   }
 }
 
+void CIncEulerSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker){
+  
+  unsigned long iPoint;
+  unsigned short iVar;
+
+  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+  
+  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+    
+    SlidingStateNodes[iMarker][iPoint] = 0;
+    for (iVar = 0; iVar < nPrimVar+1; iVar++)
+      SlidingState[iMarker][iPoint][iVar] = NULL;
+  }
+}
+
 CIncNSSolver::CIncNSSolver(void) : CIncEulerSolver() {
   
   /*--- Basic array initialization ---*/
@@ -7768,21 +7770,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
-    
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
 
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*--- Initialize the cauchy critera array for fixed CL mode ---*/
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index 07aa0f0c968d..aaea322c61f3 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -1088,6 +1088,22 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
   
 }
 
+void CTurbSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker){
+  
+  unsigned long iPoint;
+  unsigned short iVar;
+
+  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+  
+  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+    
+    SlidingStateNodes[iMarker][iPoint] = 0;
+    for (iVar = 0; iVar < nPrimVar+1; iVar++)
+      SlidingState[iMarker][iPoint][iVar] = NULL;
+  }
+}
 
 void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
 
@@ -1420,20 +1436,6 @@ CTurbSASolver::CTurbSASolver(CGeometry *geometry, CConfig *config, unsigned shor
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
     
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
-
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*-- Allocation of inlets has to happen in derived classes (not CTurbSolver),
@@ -3755,21 +3757,7 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh
 
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
-    
-    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
 
-      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-
-      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-
-        SlidingStateNodes[iMarker][iPoint] = 0;
-        for (iVar = 0; iVar < nPrimVar+1; iVar++)
-          SlidingState[iMarker][iPoint][iVar] = NULL;
-      }
-
-    }
   }
 
   /*-- Allocation of inlets has to happen in derived classes (not CTurbSolver),

From 7d52848c5778e994ca5ea4b41d70e6ea3e4783da Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 14:16:28 +0200
Subject: [PATCH 238/539] Added an error if number of markers in
 MARKER_ZONE_INTERFACE is not a multiple of 2

---
 Common/src/config_structure.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 10578dd0f9c7..44b33b9db095 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2763,6 +2763,10 @@ void CConfig::SetnZone(){
   
   if (Multizone_Problem == YES){
     
+    if (nMarker_ZoneInterface % 2 != 0){
+      SU2_MPI::Error("Number of markers in MARKER_ZONE_INTERFACE must be a multiple of 2", CURRENT_FUNCTION);
+    }
+    
     SinglezoneDriver  = NO;
     
     if (Multizone_Mesh){

From f777ac51bab58ac0180384a25f9bdab180b09b81 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 20:02:00 +0200
Subject: [PATCH 239/539] Added some checks for settings which must be the same
 in all  zones

---
 Common/src/config_structure.cpp  | 67 ++++++++++----------------------
 SU2_CFD/src/driver_structure.cpp |  3 ++
 2 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 44b33b9db095..ba2f34ab4476 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -4984,7 +4984,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
   unsigned short iMarker_Euler, iMarker_Custom, iMarker_FarField,
   iMarker_SymWall, iMarker_PerBound, iMarker_NearFieldBound,
-  iMarker_InterfaceBound, iMarker_Fluid_InterfaceBound, iMarker_Dirichlet, iMarker_Inlet, iMarker_Riemann,
+  iMarker_Fluid_InterfaceBound, iMarker_Dirichlet, iMarker_Inlet, iMarker_Riemann,
   iMarker_Giles, iMarker_Outlet, iMarker_Isothermal, iMarker_HeatFlux,
   iMarker_EngineInflow, iMarker_EngineExhaust, iMarker_Displacement, iMarker_Damper,
   iMarker_Load, iMarker_FlowLoad,  iMarker_Neumann, iMarker_Internal, iMarker_Monitoring,
@@ -5002,16 +5002,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 	   cout << "Fluid-Structure Interaction." << endl;
 	}
 
-  if (nConfig_Files != 0) {
-    cout << "List of config files: ";
-    for (unsigned short iConfig = 0; iConfig < nConfig_Files; iConfig++) {
-      cout << Config_Filenames[iConfig];
-      if (iConfig < nConfig_Files-1) cout << ", ";
-      else cout <<".";
-    }
-    cout<< endl;
-  }
-
   if (DiscreteAdjoint) {
      cout <<"Discrete Adjoint equations using Algorithmic Differentiation " << endl;
      cout <<"based on the physical case: ";
@@ -9189,44 +9179,27 @@ void CConfig::SetFreeStreamTurboNormal(su2double* turboNormal){
 }
 
 void CConfig::SetMultizone(CConfig *driver_config, CConfig **config_container){
-
-  unsigned short iMarker_CfgFile, iMarker_ZoneInterface;
-
-  /*--- If the command MARKER_ZONE_INTERFACE is not in the config file, nMarker_ZoneInterface will be 0 ---*/
-  if (nMarker_ZoneInterface == 0){
-
-    /*--- Copy the marker interface from the driver configuration file ---*/
-
-    nMarker_ZoneInterface = driver_config->GetnMarker_ZoneInterface();
-    Marker_ZoneInterface = new string[nMarker_ZoneInterface];
-
-    /*--- Set the Markers at the interface from the main config file ---*/
-    for (iMarker_ZoneInterface = 0; iMarker_ZoneInterface < nMarker_ZoneInterface; iMarker_ZoneInterface++){
-      Marker_ZoneInterface[iMarker_ZoneInterface] = driver_config->GetMarkerTag_ZoneInterface(iMarker_ZoneInterface);
+  
+  for (unsigned short iZone = 0; iZone < nZone; iZone++){
+    
+    if (config_container[iZone]->GetTime_Domain() != GetTime_Domain()){
+      SU2_MPI::Error("Option TIME_DOMAIN must be the same in all zones.", CURRENT_FUNCTION);
     }
-
-    /*--- Identification of Multizone markers ---*/
-    if (rank == MASTER_NODE) cout << endl << "-------------------- Interface Boundary Information ---------------------" << endl;
-    if (rank == MASTER_NODE) cout << "The interface markers are: ";
-
-    unsigned short indexOutput = 0;
-    for (iMarker_CfgFile = 0; iMarker_CfgFile < nMarker_CfgFile; iMarker_CfgFile++) {
-      unsigned short indexMarker = 0;
-      Marker_CfgFile_ZoneInterface[iMarker_CfgFile] = NO;
-      for (iMarker_ZoneInterface = 0; iMarker_ZoneInterface < nMarker_ZoneInterface; iMarker_ZoneInterface++){
-        if (Marker_CfgFile_TagBound[iMarker_CfgFile] == Marker_ZoneInterface[iMarker_ZoneInterface]){
-          indexMarker = (int)(iMarker_ZoneInterface/2+1);
-          indexOutput++;
-          if (rank == MASTER_NODE) cout << Marker_CfgFile_TagBound[iMarker_CfgFile];
-        }
-      }
-      Marker_CfgFile_ZoneInterface[iMarker_CfgFile] = indexMarker;
-      if (rank == MASTER_NODE){
-        if (indexMarker > 0 && (indexOutput < (nMarker_ZoneInterface/2))) cout << ", ";
-        else if (indexMarker > 0 && (indexOutput == (nMarker_ZoneInterface/2))) cout << ".";
-      }
+    if (config_container[iZone]->GetnTime_Iter() != GetnTime_Iter()){
+      SU2_MPI::Error("Option TIME_ITER must be the same in all zones.", CURRENT_FUNCTION);
+    }
+    if (config_container[iZone]->GetnOuter_Iter() != GetnOuter_Iter()){
+      SU2_MPI::Error("Option OUTER_ITER must be the same in all zones.", CURRENT_FUNCTION);
+    }
+    if (config_container[iZone]->GetTime_Step() != GetTime_Step()){
+      SU2_MPI::Error("Option TIME_STEP must be the same in all zones.", CURRENT_FUNCTION);
+    }
+    if (config_container[iZone]->GetMultizone_Problem() != GetMultizone_Problem()){
+      SU2_MPI::Error("Option MULTIZONE must be the same in all zones.", CURRENT_FUNCTION);
+    }
+    if (config_container[iZone]->GetMultizone_Mesh() != GetMultizone_Mesh()){
+      SU2_MPI::Error("Option MULTIZONE_MESH must be the same in all zones.", CURRENT_FUNCTION);
     }
-    if (rank == MASTER_NODE) cout << endl;
   }
 
   /*--- Set the Restart iter for time dependent problems ---*/
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 0b41df8a9d3a..05abbd64edad 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -827,6 +827,9 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
      read and stored. ---*/
 
     if (driver_config->GetnConfigFiles() > 0){
+      if (rank == MASTER_NODE){
+        cout  << endl << "Parsing sub-config file for zone " << iZone << endl;
+      }
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
       config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_CFD, iZone, nZone, VERB_HIGH);
     }

From 8713a3c0b0139513bf697324bb16f83153ac886d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 20:40:46 +0200
Subject: [PATCH 240/539] Unified config options for file naming.

All special config options for different physical problems have been
removed/renamed. For volume/restart/solution/surface exist now

VOLUME_FILENAME
RESTART_FILENAME
SOLUTION_FILENAME
SURFACE_FILENAME
---
 Common/include/config_structure.hpp           | 109 ++----------------
 Common/include/config_structure.inl           |  34 +-----
 Common/src/config_structure.cpp               |  96 ++++-----------
 Common/src/grid_adaptation_structure.cpp      |   4 +-
 SU2_CFD/src/output/output_adj_elasticity.cpp  |   4 +-
 SU2_CFD/src/output/output_adj_heat.cpp        |  15 +++
 SU2_CFD/src/output/output_cgns.cpp            |  12 +-
 SU2_CFD/src/output/output_elasticity.cpp      |   6 +-
 SU2_CFD/src/output/output_fieldview.cpp       |  20 ++--
 SU2_CFD/src/output/output_flow_comp.cpp       |   6 +-
 SU2_CFD/src/output/output_flow_comp_fem.cpp   |   6 +-
 SU2_CFD/src/output/output_flow_inc.cpp        |   6 +-
 SU2_CFD/src/output/output_heat.cpp            |   7 +-
 SU2_CFD/src/output/output_paraview.cpp        |  92 +++++++--------
 .../src/output/output_structure_legacy.cpp    |  62 +++++-----
 SU2_CFD/src/output/output_tecplot.cpp         |  56 ++++-----
 SU2_CFD/src/solver_adjoint_elasticity.cpp     |   2 +-
 SU2_CFD/src/solver_direct_elasticity.cpp      |  42 +------
 SU2_CFD/src/solver_direct_heat.cpp            |   2 +-
 SU2_CFD/src/solver_direct_mean.cpp            |   6 +-
 SU2_CFD/src/solver_direct_mean_fem.cpp        |   2 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp        |   8 +-
 SU2_CFD/src/solver_direct_transition.cpp      |   2 +-
 SU2_CFD/src/solver_direct_turbulent.cpp       |   2 +-
 SU2_CFD/src/solver_structure.cpp              |  21 +---
 SU2_MSH/src/SU2_MSH.cpp                       |   2 +-
 .../aeroelastic/aeroelastic_NACA64A010.cfg    |   8 +-
 .../cont_adj_euler/naca0012/inv_NACA0012.cfg  |   8 +-
 .../naca0012/inv_NACA0012_FD.cfg              |   8 +-
 .../naca0012/inv_NACA0012_discadj.cfg         |   8 +-
 .../cont_adj_euler/oneram6/inv_ONERAM6.cfg    |   8 +-
 .../cont_adj_euler/wedge/inv_wedge_ROE.cfg    |   8 +-
 .../wedge/inv_wedge_ROE_multiobj.cfg          |   8 +-
 .../cylinder/lam_cylinder.cfg                 |   8 +-
 .../naca0012_sub/lam_NACA0012.cfg             |   8 +-
 .../naca0012_trans/lam_NACA0012.cfg           |   8 +-
 .../cont_adj_rans/naca0012/turb_nasa.cfg      |   8 +-
 .../naca0012/turb_nasa_binary.cfg             |   8 +-
 .../cont_adj_rans/oneram6/turb_ONERAM6.cfg    |   8 +-
 .../cont_adj_rans/rae2822/turb_SA_RAE2822.cfg |   8 +-
 .../control_surface/inv_ONERAM6_moving.cfg    |   8 +-
 .../control_surface/inv_ONERAM6_setting.cfg   |   8 +-
 .../coupled_cht/incompressible/configFlow.cfg |  13 +--
 .../incompressible/configSolid.cfg            |   6 +-
 .../coupled_cht_incompressible.cfg            |   8 +-
 TestCases/ddes/flatplate/ddes_flatplate.cfg   |   8 +-
 .../deformation/brick_hex/def_brick_hex.cfg   |   8 +-
 .../brick_hex_rans/def_brick_hex_rans.cfg     |   8 +-
 .../brick_prism/def_brick_prism.cfg           |   8 +-
 .../brick_prism_rans/def_brick_prism_rans.cfg |   8 +-
 .../deformation/brick_pyra/def_brick_pyra.cfg |   8 +-
 .../deformation/brick_tets/def_brick_tets.cfg |   8 +-
 .../cylindrical_ffd/def_cylindrical.cfg       |   8 +-
 .../deformation/naca0012/def_NACA0012.cfg     |   8 +-
 .../naca0012/surface_file_NACA0012.cfg        |   8 +-
 .../deformation/naca4412/def_NACA4412.cfg     |   8 +-
 TestCases/deformation/rae2822/def_RAE2822.cfg |   8 +-
 .../spherical_ffd/def_spherical.cfg           |   8 +-
 .../spherical_ffd/def_spherical_bspline.cfg   |   8 +-
 .../disc_adj_euler/arina2k/Arina2KRS.cfg      |   8 +-
 .../cylinder3D/inv_cylinder3D.cfg             |   8 +-
 .../disc_adj_euler/oneram6/inv_ONERAM6.cfg    |   8 +-
 TestCases/disc_adj_fsi/Airfoil_2d/config.cfg  |   8 +-
 TestCases/disc_adj_fsi/configAD_fsi.cfg       |   6 +-
 TestCases/disc_adj_heat/disc_adj_heat.cfg     |   8 +-
 .../naca0012/incomp_NACA0012_disc.cfg         |   8 +-
 .../cylinder/heated_cylinder.cfg              |   8 +-
 .../naca0012/turb_naca0012_sa.cfg             |   8 +-
 .../naca0012/turb_naca0012_sst.cfg            |   8 +-
 TestCases/disc_adj_rans/cylinder/cylinder.cfg |   8 +-
 .../cylinder_DT_1ST/cylinder.cfg              |   8 +-
 .../naca0012/turb_NACA0012_sa.cfg             |   8 +-
 .../naca0012/turb_NACA0012_sst.cfg            |   8 +-
 .../transonic_stator_2D/transonic_stator.cfg  |   8 +-
 TestCases/euler/CRM/inv_CRM_JST.cfg           |   8 +-
 TestCases/euler/biparabolic/BIPARABOLIC.cfg   |   8 +-
 TestCases/euler/bluntbody/blunt.cfg           |   8 +-
 TestCases/euler/channel/inv_channel.cfg       |   8 +-
 TestCases/euler/channel/inv_channel_RK.cfg    |   8 +-
 TestCases/euler/naca0012/inv_NACA0012.cfg     |   8 +-
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg |   8 +-
 TestCases/euler/oneram6/inv_ONERAM6.cfg       |   8 +-
 TestCases/euler/wedge/inv_wedge_HLLC.cfg      |   8 +-
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg   |   8 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg  |   8 +-
 TestCases/fea_fsi/Airfoil_RBF/settings.cfg    |   8 +-
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg   |   6 +-
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |   6 +-
 .../fea_fsi/WallChannel_2d/configFlow.cfg     |   6 +-
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg  |   8 +-
 .../naca0012/inv_NACA0012_ContAdj.cfg         |   8 +-
 TestCases/gust/inv_gust_NACA0012.cfg          |   8 +-
 TestCases/harmonic_balance/HB.cfg             |   8 +-
 .../hb_rans_preconditioning/davis.cfg         |   8 +-
 .../2D/Quad32X32_nPoly4/InviscidVortex.cfg    |  10 +-
 .../3D/nPoly2_Tets/InviscidVortex.cfg         |  10 +-
 .../3D/nPoly4_Tets/InviscidVortex.cfg         |  10 +-
 .../fem_NACA0012.cfg                          |   8 +-
 .../NACA0012_5thOrder/fem_NACA0012.cfg        |  10 +-
 .../NACA0012_5thOrder/fem_NACA0012_reg.cfg    |   8 +-
 .../Ringleb/Quad100X50_nPoly3/Ringleb.cfg     |   8 +-
 .../Quad100X50_nPoly3/Ringleb_WallBC.cfg      |   8 +-
 .../Ringleb/Quad100X50_nPoly4/Ringleb.cfg     |   8 +-
 .../Quad100X50_nPoly4/Ringleb_WallBC.cfg      |   8 +-
 .../Ringleb/Quad200X100_nPoly4/Ringleb.cfg    |   8 +-
 .../Quad200X100_nPoly4/Ringleb_WallBC.cfg     |   8 +-
 .../Quad50X50_HalfGeom_nPoly4/Ringleb.cfg     |   8 +-
 .../Ringleb_WallBC.cfg                        |   8 +-
 .../Ringleb.cfg                               |   8 +-
 .../Ringleb_WallBC.cfg                        |   8 +-
 .../Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg |   8 +-
 .../Ringleb_WallBC.cfg                        |   8 +-
 .../Sphere_4thOrder_Hexa/fem_Sphere.cfg       |   8 +-
 .../Sphere_4thOrder_Tet/fem_Sphere.cfg        |  10 +-
 .../nPoly1/fem_SubsonicChannel.cfg            |   8 +-
 .../nPoly1/fem_SubsonicChannel_Farfield.cfg   |   8 +-
 .../nPoly2/fem_SubsonicChannel.cfg            |   8 +-
 .../nPoly2/fem_SubsonicChannel_Farfield.cfg   |   8 +-
 .../nPoly4/fem_SubsonicChannel.cfg            |   8 +-
 .../nPoly4/fem_SubsonicChannel_Farfield.cfg   |   8 +-
 .../nPoly3/fem_Cylinder_reg.cfg               |   8 +-
 .../FlatPlate/nPoly4/lam_flatplate_reg.cfg    |   8 +-
 .../nPoly3_QuadDominant/fem_Sphere_reg.cfg    |  10 +-
 .../fem_Sphere_reg_ADER.cfg                   |   8 +-
 .../nPoly4/fem_unst_cylinder.cfg              |   8 +-
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |   8 +-
 .../incomp_euler/naca0012/incomp_NACA0012.cfg |   8 +-
 TestCases/incomp_euler/nozzle/inv_nozzle.cfg  |   8 +-
 .../buoyancy_cavity/lam_buoyancy_cavity.cfg   |   8 +-
 .../cylinder/incomp_cylinder.cfg              |   8 +-
 .../cylinder/poly_cylinder.cfg                |   8 +-
 .../incomp_rans/AhmedBody/turb_ahmed.cfg      |   8 +-
 TestCases/incomp_rans/naca0012/naca0012.cfg   |   8 +-
 TestCases/moving_wall/cavity/lam_cavity.cfg   |   8 +-
 .../spinning_cylinder/spinning_cylinder.cfg   |   8 +-
 .../naca0012/inv_NACA0012_ffd.cfg             |   8 +-
 .../cylinder/cylinder_lowmach.cfg             |   8 +-
 .../navierstokes/cylinder/lam_cylinder.cfg    |   8 +-
 .../navierstokes/flatplate/lam_flatplate.cfg  |   8 +-
 .../navierstokes/naca0012/lam_NACA0012.cfg    |   8 +-
 .../poiseuille/lam_poiseuille.cfg             |   8 +-
 .../poiseuille/profile_poiseuille.cfg         |   8 +-
 TestCases/nicf/LS89/turb_SA_PR.cfg            |   8 +-
 TestCases/nicf/LS89/turb_SST_PR.cfg           |   8 +-
 TestCases/nicf/edge/edge_PPR.cfg              |   8 +-
 TestCases/nicf/edge/edge_VW.cfg               |   8 +-
 .../inv_wedge_ROE_2surf_1obj.cfg              |   8 +-
 .../inv_wedge_ROE_multiobj.cfg                |   8 +-
 .../inv_wedge_ROE_multiobj_1surf.cfg          |   8 +-
 .../inv_wedge_ROE_multiobj_combo.cfg          |   8 +-
 .../inv_NACA0012_multipoint.cfg               |   8 +-
 .../pitching_NACA64A010.cfg                   |   8 +-
 .../pitching_oneram6/pitching_ONERAM6.cfg     |   8 +-
 .../rotating_naca0012/rotating_NACA0012.cfg   |   8 +-
 .../steady_inverse_design/inv_NACA0012.cfg    |   8 +-
 .../steady_naca0012/inv_NACA0012_adv.cfg      |   8 +-
 .../steady_naca0012/inv_NACA0012_basic.cfg    |   8 +-
 .../steady_oneram6/inv_ONERAM6_adv.cfg        |   8 +-
 .../steady_oneram6/inv_ONERAM6_basic.cfg      |   8 +-
 .../pitching_naca64a010/turb_NACA64A010.cfg   |   8 +-
 .../pitching_oneram6/turb_ONERAM6.cfg         |   8 +-
 .../steady_oneram6/turb_ONERAM6.cfg           |   8 +-
 .../steady_rae2822/turb_SA_RAE2822.cfg        |   8 +-
 TestCases/polar/naca0012/inv_NACA0012.cfg     |   8 +-
 .../flatPlate_rigidMotion_Conf.cfg            |   8 +-
 .../unsteady_CHT_FlatPlate_Conf.cfg           |   8 +-
 .../rans/flatplate/turb_SA_flatplate.cfg      |   8 +-
 .../rans/flatplate/turb_SST_flatplate.cfg     |   8 +-
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg  |   8 +-
 .../rans/naca0012/turb_NACA0012_sa_binary.cfg |   8 +-
 .../rans/naca0012/turb_NACA0012_sa_neg.cfg    |   8 +-
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg |   8 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |   8 +-
 TestCases/rans/oneram6/turb_ONERAM6.cfg       |   8 +-
 TestCases/rans/propeller/propeller.cfg        |   8 +-
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg    |   8 +-
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg   |   8 +-
 TestCases/rans/s809/trans_s809.cfg            |   8 +-
 TestCases/rans/s809/turb_S809.cfg             |   8 +-
 TestCases/rans/vki_turbine/turb_vki.cfg       |   8 +-
 .../rans_uq/naca0012/turb_NACA0012_uq.cfg     |   8 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg  |   8 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg  |   8 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg  |   8 +-
 .../naca0012/turb_NACA0012_uq_p1c1.cfg        |   8 +-
 .../naca0012/turb_NACA0012_uq_p1c2.cfg        |   8 +-
 .../caradonna_tung/rot_caradonna_tung.cfg     |   8 +-
 TestCases/rotating/naca0012/rot_NACA0012.cfg  |   8 +-
 .../sliding_interface/bars_SST_2D/bars.cfg    |   8 +-
 .../channel_2D/channel_2D_NN.cfg              |   8 +-
 .../channel_2D/channel_2D_WA.cfg              |   8 +-
 .../channel_3D/channel_3D_NN.cfg              |   8 +-
 .../channel_3D/channel_3D_WA.cfg              |   8 +-
 .../incompressible_steady/configCircle.cfg    |   8 +-
 .../incompressible_steady/configOut.cfg       |   8 +-
 .../incompressible_unsteady/configCircle.cfg  |   8 +-
 .../incompressible_unsteady/configOut.cfg     |   8 +-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |  10 +-
 TestCases/sliding_interface/pipe/pipe_WA.cfg  |   8 +-
 .../rotating_cylinders/rot_cylinders_NN.cfg   |   8 +-
 .../rotating_cylinders/rot_cylinders_WA.cfg   |   8 +-
 .../single_stage/single_stage_NN.cfg          |   8 +-
 .../single_stage/single_stage_WA.cfg          |   8 +-
 .../sup_vor_shed_NN.cfg                       |   8 +-
 .../sup_vor_shed_WA.cfg                       |   8 +-
 .../uniform_flow/uniform_NN.cfg               |   8 +-
 .../uniform_flow/uniform_WA.cfg               |   8 +-
 .../transitional_BC_model_ConfigFile.cfg      |   8 +-
 .../transitional_BC_model_ConfigFile.cfg      |   8 +-
 .../transitional_BC_model_ConfigFile.cfg      |   8 +-
 .../turbomachinery/APU_turbocharger/Jones.cfg |   8 +-
 .../APU_turbocharger/Jones_rst.cfg            |   8 +-
 .../axial_stage_2D/Axial_stage2D.cfg          |   8 +-
 .../centrifugal_blade/centrifugal_blade.cfg   |   8 +-
 .../centrifugal_stage/centrifugal_stage.cfg   |   8 +-
 .../transonic_stator_2D/transonic_stator.cfg  |   8 +-
 .../transonic_stator_rst.cfg                  |   8 +-
 .../pitching_NACA64A010.cfg                   |   8 +-
 .../turb_NACA64A010.cfg                       |   8 +-
 .../plunging_naca0012/plunging_NACA0012.cfg   |   8 +-
 .../unsteady/square_cylinder/turb_square.cfg  |   8 +-
 221 files changed, 995 insertions(+), 1198 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index fc85819fbc81..d202075cf05a 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -119,7 +119,6 @@ class CConfig {
   su2double FFD_Tol;  	/*!< \brief Tolerance in the point inversion problem. */
   su2double Opt_RelaxFactor;  	/*!< \brief Scale factor for the line search. */
   su2double Opt_LineSearch_Bound;  	/*!< \brief Bounds for the line search. */
-  bool Write_Conv_FSI;			/*!< \brief Write convergence file for FSI problems. */
   bool ContinuousAdjoint,			/*!< \brief Flag to know if the code is solving an adjoint problem. */
   Viscous,                /*!< \brief Flag to know if the code is solving a viscous problem. */
   EquivArea,				/*!< \brief Flag to know if the code is going to compute and plot the equivalent area. */
@@ -724,31 +723,19 @@ class CConfig {
   nRefOriginMoment_Z;           /*!< \brief Number of Z-coordinate moment computation origins. */
   string Mesh_FileName,			/*!< \brief Mesh input file. */
   Mesh_Out_FileName,				/*!< \brief Mesh output file. */
-  Solution_FlowFileName,			/*!< \brief Flow solution input file. */
+  Solution_FileName,			/*!< \brief Flow solution input file. */
   Solution_LinFileName,			/*!< \brief Linearized flow solution input file. */
   Solution_AdjFileName,			/*!< \brief Adjoint solution input file for drag functional. */
-  Solution_FEMFileName,			/*!< \brief Solution input file for structural problem. */
-  Solution_AdjFEMFileName,     /*!< \brief Adjoint solution input file for structural problem. */
-  Flow_FileName,					/*!< \brief Flow variables output file. */
-  Structure_FileName,					/*!< \brief Structure variables output file. */
-  SurfStructure_FileName,					/*!< \brief Surface structure variables output file. */
-  AdjStructure_FileName,         /*!< \brief Structure variables output file. */
-  AdjSurfStructure_FileName,         /*!< \brief Surface structure variables output file. */
-  SurfHeat_FileName,					/*!< \brief Surface structure variables output file. */
-  Heat_FileName,					/*!< \brief Heat variables output file. */
+  Volume_FileName,					/*!< \brief Flow variables output file. */
   Residual_FileName,				/*!< \brief Residual variables output file. */
   Conv_FileName,					/*!< \brief Convergence history output file. */
   Breakdown_FileName,			    /*!< \brief Breakdown output file. */
-  Conv_FileName_FSI,					/*!< \brief Convergence history output file. */
-  Restart_FlowFileName,			/*!< \brief Restart file for flow variables. */
-  Restart_HeatFileName,			/*!< \brief Restart file for heat variables. */
+  Restart_FileName,			/*!< \brief Restart file for flow variables. */
   Restart_AdjFileName,			/*!< \brief Restart file for adjoint variables, drag functional. */
-  Restart_FEMFileName,			/*!< \brief Restart file for FEM elasticity. */
-  Restart_AdjFEMFileName,      /*!< \brief Restart file for FEM elasticity. */
   Adj_FileName,					/*!< \brief Output file with the adjoint variables. */
   ObjFunc_Grad_FileName,			/*!< \brief Gradient of the objective function. */
   ObjFunc_Value_FileName,			/*!< \brief Objective function. */
-  SurfFlowCoeff_FileName,			/*!< \brief Output file with the flow variables on the surface. */
+  SurfCoeff_FileName,			/*!< \brief Output file with the flow variables on the surface. */
   SurfAdjCoeff_FileName,			/*!< \brief Output file with the adjoint variables on the surface. */
   New_SU2_FileName,       		/*!< \brief Output SU2 mesh file converted from CGNS format. */
   SurfSens_FileName,			/*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
@@ -4692,12 +4679,6 @@ class CConfig {
    */
   bool GetFrozen_Limiter_Disc(void);
   
-  /*!
-   * \brief Write convergence file for FSI problems
-   * \return <code>FALSE</code> means no file is written.
-   */
-  bool GetWrite_Conv_FSI(void);
-  
   /*!
    * \brief Provides information about if the sharp edges are going to be removed from the sensitivity.
    * \return <code>FALSE</code> means that the sharp edges will be removed from the sensitivity.
@@ -5335,7 +5316,7 @@ class CConfig {
    * \brief Get the name of the file with the solution of the flow problem.
    * \return Name of the file with the solution of the flow problem.
    */
-  string GetSolution_FlowFileName(void);
+  string GetSolution_FileName(void);
   
   /*!
    * \brief Get the name of the file with the solution of the adjoint flow problem
@@ -5344,19 +5325,7 @@ class CConfig {
    *         drag objective function.
    */
   string GetSolution_AdjFileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the solution of the structural problem.
-   * \return Name of the file with the solution of the structural problem.
-   */
-  string GetSolution_FEMFileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the solution of the adjoint structural problem.
-   * \return Name of the file with the solution of the structural problem.
-   */
-  string GetSolution_AdjFEMFileName(void);
-  
+
   /*!
    * \brief Get the name of the file with the residual of the problem.
    * \return Name of the file with the residual of the problem.
@@ -5386,13 +5355,7 @@ class CConfig {
    * \return Name of the file with convergence history of the problem.
    */
   string GetConv_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the convergence history of the problem for FSI applications.
-   * \return Name of the file with convergence history of the problem.
-   */
-  string GetConv_FileName_FSI(void);
-  
+
   /*!
    * \brief Get the name of the file with the forces breakdown of the problem.
    * \return Name of the file with forces breakdown of the problem.
@@ -5403,44 +5366,8 @@ class CConfig {
    * \brief Get the name of the file with the flow variables.
    * \return Name of the file with the primitive variables.
    */
-  string GetFlow_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the structure variables.
-   * \return Name of the file with the structure variables.
-   */
-  string GetStructure_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the structure variables.
-   * \return Name of the file with the structure variables.
-   */
-  string GetSurfStructure_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the adjoint structure variables.
-   * \return Name of the file with the adjoint structure variables.
-   */
-  string GetAdjStructure_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the adjoint structure variables.
-   * \return Name of the file with the adjoint structure variables.
-   */
-  string GetAdjSurfStructure_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the structure variables.
-   * \return Name of the file with the structure variables.
-   */
-  string GetSurfHeat_FileName(void);
-  
-  /*!
-   * \brief Get the name of the file with the wave variables.
-   * \return Name of the file with the wave variables.
-   */
-  string GetHeat_FileName(void);
-  
+  string GetVolume_FileName(void);
+
   /*!
    * \brief Get the name of the restart file for the heat variables.
    * \return Name of the restart file for the flow variables.
@@ -5484,26 +5411,14 @@ class CConfig {
    * \brief Get the name of the restart file for the flow variables.
    * \return Name of the restart file for the flow variables.
    */
-  string GetRestart_FlowFileName(void);
+  string GetRestart_FileName(void);
   
   /*!
    * \brief Get the name of the restart file for the adjoint variables (drag objective function).
    * \return Name of the restart file for the adjoint variables (drag objective function).
    */
   string GetRestart_AdjFileName(void);
-  
-  /*!
-   * \brief Get the name of the restart file for the structural variables.
-   * \return Name of the restart file for the structural variables.
-   */
-  string GetRestart_FEMFileName(void);
-  
-  /*!
-   * \brief Get the name of the restart file for the structural adjoint variables.
-   * \return Name of the restart file for the structural adjoint variables.
-   */
-  string GetRestart_AdjFEMFileName(void);
-  
+
   /*!
    * \brief Get the name of the file with the adjoint variables.
    * \return Name of the file with the adjoint variables.
@@ -5526,7 +5441,7 @@ class CConfig {
    * \brief Get the name of the file with the surface information for the flow problem.
    * \return Name of the file with the surface information for the flow problem.
    */
-  string GetSurfFlowCoeff_FileName(void);
+  string GetSurfCoeff_FileName(void);
   
   /*!
    * \brief Get the name of the file with the surface information for the adjoint problem.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index bcf76ce1d9ca..76d0d054f518 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1455,49 +1455,25 @@ inline unsigned short CConfig::GetActDisk_Jump(void) { return ActDisk_Jump; }
 
 inline string CConfig::GetConv_FileName(void) { return Conv_FileName; }
 
-inline string CConfig::GetConv_FileName_FSI(void) { return Conv_FileName_FSI; }
-
 inline string CConfig::GetBreakdown_FileName(void) { return Breakdown_FileName; }
 
-inline string CConfig::GetSolution_FlowFileName(void) { return Solution_FlowFileName; }
+inline string CConfig::GetSolution_FileName(void) { return Solution_FileName; }
 
 inline string CConfig::GetSolution_AdjFileName(void) { return Solution_AdjFileName; }
 
-inline string CConfig::GetSolution_FEMFileName(void) { return Solution_FEMFileName; }
-
-inline string CConfig::GetSolution_AdjFEMFileName(void) { return Solution_AdjFEMFileName; }
-
-inline string CConfig::GetFlow_FileName(void) { return Flow_FileName; }
-
-inline string CConfig::GetStructure_FileName(void) { return Structure_FileName; }
-
-inline string CConfig::GetSurfStructure_FileName(void) { return SurfStructure_FileName; }
-
-inline string CConfig::GetAdjStructure_FileName(void) { return Structure_FileName; }
-
-inline string CConfig::GetAdjSurfStructure_FileName(void) { return SurfStructure_FileName; }
+inline string CConfig::GetVolume_FileName(void) { return Volume_FileName; }
 
-inline string CConfig::GetSurfHeat_FileName(void) { return SurfHeat_FileName; }
-
-inline string CConfig::GetHeat_FileName(void) { return Heat_FileName; }
-
-inline string CConfig::GetRestart_FlowFileName(void) { return Restart_FlowFileName; }
-
-inline string CConfig::GetRestart_HeatFileName(void) { return Restart_HeatFileName; }
+inline string CConfig::GetRestart_FileName(void) { return Restart_FileName; }
 
 inline string CConfig::GetRestart_AdjFileName(void) { return Restart_AdjFileName; }
 
-inline string CConfig::GetRestart_FEMFileName(void) { return Restart_FEMFileName; }
-
-inline string CConfig::GetRestart_AdjFEMFileName(void) { return Restart_AdjFEMFileName; }
-
 inline string CConfig::GetAdj_FileName(void) { return Adj_FileName; }
 
 inline string CConfig::GetObjFunc_Grad_FileName(void) { return ObjFunc_Grad_FileName; }
 
 inline string CConfig::GetObjFunc_Value_FileName(void) { return ObjFunc_Value_FileName; }
 
-inline string CConfig::GetSurfFlowCoeff_FileName(void) { return SurfFlowCoeff_FileName; }
+inline string CConfig::GetSurfCoeff_FileName(void) { return SurfCoeff_FileName; }
 
 inline string CConfig::GetSurfAdjCoeff_FileName(void) { return SurfAdjCoeff_FileName; }
 
@@ -1633,8 +1609,6 @@ inline bool CConfig::GetInconsistent_Disc(void){ return Inconsistent_Disc; }
 
 inline bool CConfig::GetSens_Remove_Sharp(void) { return Sens_Remove_Sharp; }
 
-inline bool CConfig::GetWrite_Conv_FSI(void) { return Write_Conv_FSI; }
-
 inline bool CConfig::GetHold_GridFixed(void) { return Hold_GridFixed; }
 
 inline unsigned short CConfig::GetnPeriodicIndex(void) { return nPeriodic_Index; }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index ba2f34ab4476..5309cdabab39 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1667,46 +1667,16 @@ void CConfig::SetConfig_Options() {
   addStringOption("CONV_FILENAME", Conv_FileName, string("history"));
   /*!\brief BREAKDOWN_FILENAME \n DESCRIPTION: Output file forces breakdown \ingroup Config*/
   addStringOption("BREAKDOWN_FILENAME", Breakdown_FileName, string("forces_breakdown.dat"));
-  /*!\brief CONV_FILENAME \n DESCRIPTION: Output file convergence history (w/o extension) \n DEFAULT: history \ingroup Config*/
-  addStringOption("CONV_FILENAME_FSI", Conv_FileName_FSI, string("historyFSI.csv"));
-  /* DESCRIPTION: Viscous limiter turbulent equations */
-  addBoolOption("WRITE_CONV_FILENAME_FSI", Write_Conv_FSI, false);
   /*!\brief SOLUTION_FLOW_FILENAME \n DESCRIPTION: Restart flow input file (the file output under the filename set by RESTART_FLOW_FILENAME) \n DEFAULT: solution_flow.dat \ingroup Config */
-  addStringOption("SOLUTION_FLOW_FILENAME", Solution_FlowFileName, string("solution_flow.dat"));
+  addStringOption("SOLUTION_FILENAME", Solution_FileName, string("solution.dat"));
   /*!\brief SOLUTION_ADJ_FILENAME\n DESCRIPTION: Restart adjoint input file. Objective function abbreviation is expected. \ingroup Config*/
   addStringOption("SOLUTION_ADJ_FILENAME", Solution_AdjFileName, string("solution_adj.dat"));
-  /*!\brief SOLUTION_FLOW_FILENAME \n DESCRIPTION: Restart structure input file (the file output under the filename set by RESTART_FLOW_FILENAME) \n Default: solution_flow.dat \ingroup Config */
-  addStringOption("SOLUTION_STRUCTURE_FILENAME", Solution_FEMFileName, string("solution_structure.dat"));
-  /*!\brief SOLUTION_FLOW_FILENAME \n DESCRIPTION: Restart structure input file (the file output under the filename set by RESTART_FLOW_FILENAME) \n Default: solution_flow.dat \ingroup Config */
-  addStringOption("SOLUTION_ADJ_STRUCTURE_FILENAME", Solution_AdjFEMFileName, string("solution_adjoint_structure.dat"));
   /*!\brief RESTART_FLOW_FILENAME \n DESCRIPTION: Output file restart flow \ingroup Config*/
-  addStringOption("RESTART_FLOW_FILENAME", Restart_FlowFileName, string("restart_flow.dat"));
+  addStringOption("RESTART_FILENAME", Restart_FileName, string("restart.dat"));
   /*!\brief RESTART_ADJ_FILENAME  \n DESCRIPTION: Output file restart adjoint. Objective function abbreviation will be appended. \ingroup Config*/
   addStringOption("RESTART_ADJ_FILENAME", Restart_AdjFileName, string("restart_adj.dat"));
-  /*!\brief RESTART_STRUCTURE_FILENAME \n DESCRIPTION: Output file restart structure \ingroup Config*/
-  addStringOption("RESTART_STRUCTURE_FILENAME", Restart_FEMFileName, string("restart_structure.dat"));
-  /*!\brief RESTART_ADJ_STRUCTURE_FILENAME \n DESCRIPTION: Output file restart structure \ingroup Config*/
-  addStringOption("RESTART_ADJ_STRUCTURE_FILENAME", Restart_AdjFEMFileName, string("restart_adjoint_structure.dat"));
   /*!\brief VOLUME_FLOW_FILENAME  \n DESCRIPTION: Output file flow (w/o extension) variables \ingroup Config */
-  addStringOption("VOLUME_FLOW_FILENAME", Flow_FileName, string("flow"));
-  /*!\brief VOLUME_STRUCTURE_FILENAME
-   * \n  DESCRIPTION: Output file structure (w/o extension) variables \ingroup Config*/
-  addStringOption("VOLUME_STRUCTURE_FILENAME", Structure_FileName, string("structure"));
-  /*!\brief VOLUME_ADJ_STRUCTURE_FILENAME
-   * \n  DESCRIPTION: Output file structure (w/o extension) variables \ingroup Config*/
-  addStringOption("VOLUME_ADJ_STRUCTURE_FILENAME", AdjStructure_FileName, string("adj_structure"));
-  /*!\brief SURFACE_STRUCTURE_FILENAME
-   *  \n DESCRIPTION: Output file structure (w/o extension) variables \ingroup Config*/
-  addStringOption("SURFACE_STRUCTURE_FILENAME", SurfStructure_FileName, string("surface_structure"));
-  /*!\brief SURFACE_STRUCTURE_FILENAME
-   *  \n DESCRIPTION: Output file structure (w/o extension) variables \ingroup Config*/
-  addStringOption("SURFACE_ADJ_STRUCTURE_FILENAME", AdjSurfStructure_FileName, string("adj_surface_structure"));
-  /*!\brief SURFACE_HEAT_FILENAME
-   *  \n DESCRIPTION: Output file structure (w/o extension) variables \ingroup Config */
-  addStringOption("SURFACE_HEAT_FILENAME", SurfHeat_FileName, string("surface_heat"));
-  /*!\brief VOLUME_HEAT_FILENAME
-   *  \n DESCRIPTION: Output file wave (w/o extension) variables  \ingroup Config*/
-  addStringOption("VOLUME_HEAT_FILENAME", Heat_FileName, string("heat"));
+  addStringOption("VOLUME_FILENAME", Volume_FileName, string("flow"));
   /*!\brief VOLUME_ADJ_FILENAME
    *  \n DESCRIPTION: Output file adjoint (w/o extension) variables  \ingroup Config*/
   addStringOption("VOLUME_ADJ_FILENAME", Adj_FileName, string("adjoint"));
@@ -1718,7 +1688,7 @@ void CConfig::SetConfig_Options() {
   addStringOption("VALUE_OBJFUNC_FILENAME", ObjFunc_Value_FileName, string("of_func.dat"));
   /*!\brief SURFACE_FLOW_FILENAME
    *  \n DESCRIPTION: Output file surface flow coefficient (w/o extension)  \ingroup Config*/
-  addStringOption("SURFACE_FLOW_FILENAME", SurfFlowCoeff_FileName, string("surface_flow"));
+  addStringOption("SURFACE_FILENAME", SurfCoeff_FileName, string("surface"));
   /*!\brief SURFACE_ADJ_FILENAME
    *  \n DESCRIPTION: Output file surface adjoint coefficient (w/o extension)  \ingroup Config*/
   addStringOption("SURFACE_ADJ_FILENAME", SurfAdjCoeff_FileName, string("surface_adjoint"));
@@ -2763,6 +2733,8 @@ void CConfig::SetnZone(){
   
   if (Multizone_Problem == YES){
     
+    /*--- Some basic multizone checks ---*/
+    
     if (nMarker_ZoneInterface % 2 != 0){
       SU2_MPI::Error("Number of markers in MARKER_ZONE_INTERFACE must be a multiple of 2", CURRENT_FUNCTION);
     }
@@ -5117,12 +5089,8 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     if (Restart) {
       if (Read_Binary_Restart) cout << "Reading and writing binary SU2 native restart files." << endl;
       else cout << "Reading and writing ASCII SU2 native restart files." << endl;
-      if (!ContinuousAdjoint && Kind_Solver != FEM_ELASTICITY) cout << "Read flow solution from: " << Solution_FlowFileName << "." << endl;
+      if (!ContinuousAdjoint && Kind_Solver != FEM_ELASTICITY) cout << "Read flow solution from: " << Solution_FileName << "." << endl;
       if (ContinuousAdjoint) cout << "Read adjoint solution from: " << Solution_AdjFileName << "." << endl;
-      if (Kind_Solver == FEM_ELASTICITY) cout << "Read structural solution from: " << Solution_FEMFileName << "." << endl;
-      if (Kind_Solver == DISC_ADJ_FEM){
-        cout << "Read structural adjoint solution from: " << Solution_AdjFEMFileName << "." << endl;
-      }
     }
     else {
         if (fea) cout << "No restart solution, initialize from undeformed configuration." << endl;
@@ -5130,7 +5098,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     }
 
     if (ContinuousAdjoint)
-      cout << "Read flow solution from: " << Solution_FlowFileName << "." << endl;
+      cout << "Read flow solution from: " << Solution_FileName << "." << endl;
   
     if (!fea){
       if (Kind_Regime == COMPRESSIBLE) {
@@ -5284,13 +5252,13 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 		case FULL: case WAKE: case FULL_FLOW: case FULL_ADJOINT: case SMOOTHING: case SUPERSONIC_SHOCK:
 			break;
 		case GRAD_FLOW:
-			cout << "Read flow solution from: " << Solution_FlowFileName << "." << endl;
+			cout << "Read flow solution from: " << Solution_FileName << "." << endl;
 			break;
 		case GRAD_ADJOINT:
 			cout << "Read adjoint flow solution from: " << Solution_AdjFileName << "." << endl;
 			break;
 		case GRAD_FLOW_ADJ: case COMPUTABLE: case REMAINING:
-			cout << "Read flow solution from: " << Solution_FlowFileName << "." << endl;
+			cout << "Read flow solution from: " << Solution_FileName << "." << endl;
 			cout << "Read adjoint flow solution from: " << Solution_AdjFileName << "." << endl;
 			break;
 		}
@@ -6170,36 +6138,18 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
     cout << "Forces breakdown file name: " << Breakdown_FileName << "." << endl;
 
-    if ((!fea)) {
-      if (!ContinuousAdjoint && !DiscreteAdjoint) {
-        cout << "Surface flow coefficients file name: " << SurfFlowCoeff_FileName << "." << endl;
-        cout << "Flow variables file name: " << Flow_FileName << "." << endl;
-        cout << "Restart flow file name: " << Restart_FlowFileName << "." << endl;
-      }
-
-      if (ContinuousAdjoint || DiscreteAdjoint) {
-        cout << "Adjoint solution file name: " << Solution_AdjFileName << "." << endl;
-        cout << "Restart adjoint file name: " << Restart_AdjFileName << "." << endl;
-        cout << "Adjoint variables file name: " << Adj_FileName << "." << endl;
-        cout << "Surface adjoint coefficients file name: " << SurfAdjCoeff_FileName << "." << endl;
-      }
-    }
-    else if (fea){
-      if (!ContinuousAdjoint && !DiscreteAdjoint) {
-        Wrt_Srf_Sol = false;
-        cout << "Structure variables file name: " << Structure_FileName << "." << endl;
-        cout << "Restart structure file name: " << Restart_FEMFileName << "." << endl;
-      }
-      if (ContinuousAdjoint || DiscreteAdjoint) {
-        Wrt_Srf_Sol = false;
-        cout << "Structure variables file name: " << AdjStructure_FileName << "." << endl;
-        cout << "Restart structure file name: " << Restart_AdjFEMFileName << "." << endl;
-      }
+  
+    if (!ContinuousAdjoint && !DiscreteAdjoint) {
+      cout << "Surface coefficients file name: " << SurfCoeff_FileName << "." << endl;
+      cout << "Volume file name: " << Volume_FileName << "." << endl;
+      cout << "Restart file name: " << Restart_FileName << "." << endl;
     }
-    else{
-      cout << "Surface coefficients file name: " << SurfFlowCoeff_FileName << "." << endl;
-      cout << "Variables file name: " << Flow_FileName << "." << endl;
-      cout << "Restart file name: " << Restart_FlowFileName << "." << endl;
+    
+    if (ContinuousAdjoint || DiscreteAdjoint) {
+      cout << "Adjoint solution file name: " << Solution_AdjFileName << "." << endl;
+      cout << "Restart adjoint file name: " << Restart_AdjFileName << "." << endl;
+      cout << "Adjoint variables file name: " << Adj_FileName << "." << endl;
+      cout << "Surface adjoint coefficients file name: " << SurfAdjCoeff_FileName << "." << endl;
     }
 
   }
@@ -6215,7 +6165,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       case FIELDVIEW_BINARY: cout << "The output file format is FieldView binary (.uns)." << endl; break;
       case CGNS_SOL: cout << "The output file format is CGNS (.cgns)." << endl; break;
     }
-    cout << "Flow variables file name: " << Flow_FileName << "." << endl;
+    cout << "Flow variables file name: " << Volume_FileName << "." << endl;
   }
 
   if (val_software == SU2_DEF) {
@@ -6250,7 +6200,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
   if (val_software == SU2_MSH) {
     cout << "Output mesh file name: " << Mesh_Out_FileName << ". " << endl;
-    cout << "Restart flow file name: " << Restart_FlowFileName << "." << endl;
+    cout << "Restart flow file name: " << Restart_FileName << "." << endl;
     if ((Kind_Adaptation == FULL_ADJOINT) || (Kind_Adaptation == GRAD_ADJOINT) || (Kind_Adaptation == GRAD_FLOW_ADJ) ||
         (Kind_Adaptation == COMPUTABLE) || (Kind_Adaptation == REMAINING)) {
       if (Kind_ObjFunc[0] == DRAG_COEFFICIENT) cout << "Restart adjoint file name: " << Restart_AdjFileName << "." << endl;
diff --git a/Common/src/grid_adaptation_structure.cpp b/Common/src/grid_adaptation_structure.cpp
index 51145213bc52..ccd8cf353647 100644
--- a/Common/src/grid_adaptation_structure.cpp
+++ b/Common/src/grid_adaptation_structure.cpp
@@ -123,7 +123,7 @@ void CGridAdaptation::GetFlowSolution(CGeometry *geometry, CConfig *config) {
 
 	string text_line;
 		
-	string mesh_filename = config->GetSolution_FlowFileName();
+	string mesh_filename = config->GetSolution_FileName();
 	ifstream restart_file;
 
 	char *cstr = new char [mesh_filename.size()+1];
@@ -160,7 +160,7 @@ void CGridAdaptation::GetFlowResidual(CGeometry *geometry, CConfig *config) {
 	su2double dummy;
 	string text_line;
 	
-	string mesh_filename = config->GetSolution_FlowFileName();
+	string mesh_filename = config->GetSolution_FileName();
 	ifstream restart_file;
 	
 	char *cstr = new char [mesh_filename.size()+1];
diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
index b2b7cc246430..2ce4d3b61ec8 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -83,11 +83,11 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry,
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfStructure_FileName();
+  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_AdjFEMFileName();
+  RestartFilename = config->GetRestart_FileName();
   
 }
 
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
index 119862bafbd7..ac3e5e61ebc4 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -69,6 +69,21 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned sh
   ss << "Zone " << config->GetiZone() << " (Adj. Heat)";
   MultiZoneHeaderString = ss.str();
   
+  /*--- Set the volume filename --- */
+  
+  VolumeFilename = config->GetAdj_FileName();
+  
+  /*--- Set the surface filename --- */
+  
+  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  
+  /*--- Set the restart filename --- */
+  
+  RestartFilename = config->GetRestart_AdjFileName();
+  
+  /*--- Add the obj. function extension --- */
+  
+  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
 }
 
 CAdjHeatOutput::~CAdjHeatOutput(void) {
diff --git a/SU2_CFD/src/output/output_cgns.cpp b/SU2_CFD/src/output/output_cgns.cpp
index bf6f366c55de..9898b6f92cb6 100644
--- a/SU2_CFD/src/output/output_cgns.cpp
+++ b/SU2_CFD/src/output/output_cgns.cpp
@@ -50,7 +50,7 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned
   cgsize_t isize[3][1];
   
   /*--- Create CGNS base file name ---*/
-  base_file = config->GetFlow_FileName();
+  base_file = config->GetVolume_FileName();
   
   /*--- Add CGNS extension. ---*/
   base_file = base_file.append(".cgns");
@@ -58,7 +58,7 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned
   /*--- Create CGNS results file name ---*/
   if (unsteady) {
     
-    buffer = config->GetFlow_FileName();
+    buffer = config->GetVolume_FileName();
     
     results_file.str(string()); results_file << buffer;
     if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
@@ -189,7 +189,7 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne
   cgsize_t isize[3][1], elem_start, elem_end;
   
   /*--- Create CGNS base file name ---*/
-  base_file = config->GetFlow_FileName();
+  base_file = config->GetVolume_FileName();
   
   /*--- Add CGNS extension. ---*/
   base_file = base_file.append(".cgns");
@@ -197,7 +197,7 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne
   /*--- Create CGNS results file name ---*/
   if (unsteady) {
     
-    buffer = config->GetFlow_FileName();
+    buffer = config->GetVolume_FileName();
     
     results_file.str(string()); results_file << buffer;
     if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
@@ -337,7 +337,7 @@ void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned sh
   bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
   
   /*--- Create CGNS base file name ---*/
-  base_file = config->GetFlow_FileName();
+  base_file = config->GetVolume_FileName();
   
   /*--- Add CGNS extension. ---*/
   base_file = base_file.append(".cgns");
@@ -345,7 +345,7 @@ void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned sh
   /*--- Create CGNS results file name ---*/
   if (unsteady) {
     
-    buffer = config->GetFlow_FileName();
+    buffer = config->GetVolume_FileName();
     
     results_file.str(string()); results_file << buffer;
     if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
index 6919f2d08a30..db65eab361c5 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -89,15 +89,15 @@ CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsig
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetStructure_FileName();
+  VolumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfStructure_FileName();
+  SurfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FEMFileName();
+  RestartFilename = config->GetRestart_FileName();
 
 }
 
diff --git a/SU2_CFD/src/output/output_fieldview.cpp b/SU2_CFD/src/output/output_fieldview.cpp
index 0f1a3996593c..0b836d77865f 100644
--- a/SU2_CFD/src/output/output_fieldview.cpp
+++ b/SU2_CFD/src/output/output_fieldview.cpp
@@ -54,13 +54,13 @@ void COutput::SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned s
   /*--- Write file name with extension ---*/
   
   if (adjoint) filename = config->GetAdj_FileName();
-  else filename = config->GetFlow_FileName();
+  else filename = config->GetVolume_FileName();
   
-  if (Kind_Solver == FEM_ELASTICITY)
-    filename = config->GetStructure_FileName().c_str();
+//  if (Kind_Solver == FEM_ELASTICITY)
+//    filename = config->GetStructure_FileName().c_str();
   
-  if (Kind_Solver == HEAT_EQUATION_FVM)
-    filename = config->GetHeat_FileName().c_str();
+//  if (Kind_Solver == HEAT_EQUATION_FVM)
+//    filename = config->GetHeat_FileName().c_str();
   
 
   if (config->GetKind_SU2() == SU2_DOT) {
@@ -495,13 +495,13 @@ void COutput::SetFieldViewBinary(CConfig *config, CGeometry *geometry, unsigned
   /*--- Write file name with extension ---*/
   
   if (adjoint) filename = config->GetAdj_FileName();
-  else filename = config->GetFlow_FileName();
+  else filename = config->GetVolume_FileName();
   
-  if (Kind_Solver == FEM_ELASTICITY)
-    filename = config->GetStructure_FileName().c_str();
+//  if (Kind_Solver == FEM_ELASTICITY)
+//    filename = config->GetStructure_FileName().c_str();
   
-  if (Kind_Solver == HEAT_EQUATION_FVM)
-    filename = config->GetHeat_FileName().c_str();
+//  if (Kind_Solver == HEAT_EQUATION_FVM)
+//    filename = config->GetHeat_FileName().c_str();
   
   
   strcpy (cstr, filename.c_str());
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index 2dd382891c18..78f1d0376ca1 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -98,15 +98,15 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver *
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetFlow_FileName();
+  VolumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  SurfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FlowFileName();
+  RestartFilename = config->GetRestart_FileName();
   
 }
 
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index 78726b475bc3..d4345e2f2ec6 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -105,15 +105,15 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSo
     
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetFlow_FileName();
+  VolumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  SurfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FlowFileName();
+  RestartFilename = config->GetRestart_FileName();
   
 }
 
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index 0724043439ff..7f9fcddac8aa 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -100,15 +100,15 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **s
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetFlow_FileName(); 
+  VolumeFilename = config->GetVolume_FileName(); 
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfFlowCoeff_FileName();
+  SurfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FlowFileName();
+  RestartFilename = config->GetRestart_FileName();
   
 }
 
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
index 692ee04429e8..8730df066f40 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/output_heat.cpp
@@ -68,16 +68,15 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetHeat_FileName();
+  VolumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfHeat_FileName();
+  SurfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_HeatFileName();
-  
+  RestartFilename = config->GetRestart_FileName();
 }
 
 CHeatOutput::~CHeatOutput(void) {
diff --git a/SU2_CFD/src/output/output_paraview.cpp b/SU2_CFD/src/output/output_paraview.cpp
index 91c31880c413..a43331de2801 100644
--- a/SU2_CFD/src/output/output_paraview.cpp
+++ b/SU2_CFD/src/output/output_paraview.cpp
@@ -91,26 +91,26 @@ string GetVTKFilename(CConfig *config, unsigned short val_iZone,
     if (adjoint || disc_adj)
       fileroot = config->GetSurfAdjCoeff_FileName();
     else
-      fileroot = config->GetSurfFlowCoeff_FileName();
+      fileroot = config->GetSurfCoeff_FileName();
   }
   else {
     if (adjoint || disc_adj)
       fileroot = config->GetAdj_FileName();
     else
-      fileroot = config->GetFlow_FileName();
+      fileroot = config->GetVolume_FileName();
   }
   
-  if (Kind_Solver == FEM_ELASTICITY) {
-    if (surf_sol)
-      fileroot = config->GetSurfStructure_FileName().c_str();
-    else
-      fileroot = config->GetStructure_FileName().c_str();
-  }
+//  if (Kind_Solver == FEM_ELASTICITY) {
+//    if (surf_sol)
+//      fileroot = config->GetSurfStructure_FileName().c_str();
+//    else
+//      fileroot = config->GetStructure_FileName().c_str();
+//  }
   
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    if (surf_sol) fileroot = config->GetSurfHeat_FileName().c_str();
-    else fileroot = config->GetHeat_FileName().c_str();
-  }
+//  if (Kind_Solver == HEAT_EQUATION_FVM) {
+//    if (surf_sol) fileroot = config->GetSurfHeat_FileName().c_str();
+//    else fileroot = config->GetHeat_FileName().c_str();
+//  }
   
   if (config->GetKind_SU2() == SU2_DOT) {
     if (surf_sol)
@@ -191,33 +191,33 @@ void COutput::SetParaview_ASCII(CConfig *config, CGeometry *geometry, unsigned s
     if ((adjoint || disc_adj) && (!disc_adj_fem))
       filename = config->GetSurfAdjCoeff_FileName();
     else
-      filename = config->GetSurfFlowCoeff_FileName();
+      filename = config->GetSurfCoeff_FileName();
   }
   else {
     if ((adjoint || disc_adj) && (!disc_adj_fem))
       filename = config->GetAdj_FileName();
     else
-      filename = config->GetFlow_FileName();
+      filename = config->GetVolume_FileName();
   }
   
-  if (Kind_Solver == FEM_ELASTICITY) {
-    if (surf_sol)
-      filename = config->GetSurfStructure_FileName().c_str();
-    else
-      filename = config->GetStructure_FileName().c_str();
-  }
+//  if (Kind_Solver == FEM_ELASTICITY) {
+//    if (surf_sol)
+//      filename = config->GetSurfStructure_FileName().c_str();
+//    else
+//      filename = config->GetStructure_FileName().c_str();
+//  }
 
-  if (Kind_Solver == DISC_ADJ_FEM) {
-    if (surf_sol)
-      filename = config->GetAdjSurfStructure_FileName().c_str();
-    else
-      filename = config->GetAdjStructure_FileName().c_str();
-  }
+//  if (Kind_Solver == DISC_ADJ_FEM) {
+//    if (surf_sol)
+//      filename = config->GetAdjSurfStructure_FileName().c_str();
+//    else
+//      filename = config->GetAdjStructure_FileName().c_str();
+//  }
 
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-    else filename = config->GetHeat_FileName().c_str();
-  }
+//  if (Kind_Solver == HEAT_EQUATION_FVM) {
+//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
+//    else filename = config->GetHeat_FileName().c_str();
+//  }
   
   if (config->GetKind_SU2() == SU2_DOT) {
     if (surf_sol)
@@ -1168,13 +1168,13 @@ void COutput::SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsign
     if (adjoint)
       filename = config->GetSurfAdjCoeff_FileName();
     else
-      filename = config->GetSurfFlowCoeff_FileName();
+      filename = config->GetSurfCoeff_FileName();
   }
   else {
     if (adjoint)
       filename = config->GetAdj_FileName();
     else
-      filename = config->GetFlow_FileName();
+      filename = config->GetVolume_FileName();
   }
   if (config->GetKind_SU2() == SU2_DEF) {
     if (new_file) {
@@ -1187,22 +1187,22 @@ void COutput::SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsign
     }
   }
   
-  if (Kind_Solver == FEM_ELASTICITY) {
-    if (surf_sol)
-      filename = config->GetSurfStructure_FileName().c_str();
-    else {
-      filename = config->GetStructure_FileName().c_str();
-      if (!new_file) {
-        filename = filename + "_def";
-      }
-    }
-  }
+//  if (Kind_Solver == FEM_ELASTICITY) {
+//    if (surf_sol)
+//      filename = config->GetSurfStructure_FileName().c_str();
+//    else {
+//      filename = config->GetStructure_FileName().c_str();
+//      if (!new_file) {
+//        filename = filename + "_def";
+//      }
+//    }
+//  }
   
   
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-    else filename = config->GetHeat_FileName().c_str();
-  }
+//  if (Kind_Solver == HEAT_EQUATION_FVM) {
+//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
+//    else filename = config->GetHeat_FileName().c_str();
+//  }
   
   strcpy (cstr, filename.c_str());
   
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 3eb9dcb5f6be..17ab01b7a38a 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -679,7 +679,7 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
     
     /*--- Write file name with extension if unsteady ---*/
     char buffer[50];
-    string filename = config->GetSurfFlowCoeff_FileName();
+    string filename = config->GetSurfCoeff_FileName();
     ofstream SurfFlow_file;
     
     /*--- Write file name with extension if unsteady ---*/
@@ -4045,16 +4045,16 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   
   /*--- Retrieve filename from config ---*/
   
-  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
+//  if (((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) && ((config->GetKind_Solver() != DISC_ADJ_FEM)))  {
+//    filename = config->GetRestart_AdjFileName();
+//    filename = config->GetObjFunc_Extension(filename);
+//  } else if (fem) {
+//    filename = config->GetRestart_FEMFileName();
+//  } else if (disc_adj_fem){
+//    filename = config->GetRestart_AdjFEMFileName();
+//  } else {
+//    filename = config->GetRestart_FileName();
+//  }
   
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
@@ -11270,8 +11270,8 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
     unsigned short direct_diff = config[ZONE_FLOW]->GetDirectDiff();
 
     /*--- Write file name with extension ---*/
-    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
-    strcpy (cstr, filename.data());
+//    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
+//    strcpy (cstr, filename.data());
 
     if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
       long iExtIter = config[ZONE_FLOW]->GetRestart_Iter();
@@ -17572,16 +17572,16 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
 
   /*--- Retrieve filename from config ---*/
   
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else if (disc_adj_fem){
-    filename = config->GetRestart_AdjFEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
+//  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+//    filename = config->GetRestart_AdjFileName();
+//    filename = config->GetObjFunc_Extension(filename);
+//  } else if (fem) {
+//    filename = config->GetRestart_FEMFileName();
+//  } else if (disc_adj_fem){
+//    filename = config->GetRestart_AdjFEMFileName();
+//  } else {
+//    filename = config->GetRestart_FileName();
+//  }
   
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
@@ -17702,14 +17702,14 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
 
   /*--- Retrieve filename from config ---*/
 
-  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
-    filename = config->GetRestart_AdjFileName();
-    filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetRestart_FEMFileName();
-  } else {
-    filename = config->GetRestart_FlowFileName();
-  }
+//  if ((config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint())) {
+//    filename = config->GetRestart_AdjFileName();
+//    filename = config->GetObjFunc_Extension(filename);
+//  } else if (fem) {
+//    filename = config->GetRestart_FEMFileName();
+//  } else {
+//    filename = config->GetRestart_FileName();
+//  }
 
   /*--- Append the zone number if multizone problems ---*/
   if (nZone > 1)
diff --git a/SU2_CFD/src/output/output_tecplot.cpp b/SU2_CFD/src/output/output_tecplot.cpp
index 2f302195d598..c71561f28217 100644
--- a/SU2_CFD/src/output/output_tecplot.cpp
+++ b/SU2_CFD/src/output/output_tecplot.cpp
@@ -57,23 +57,23 @@ void COutput::SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **so
   
   if (surf_sol) {
     if (adjoint) filename = config->GetSurfAdjCoeff_FileName();
-    else filename = config->GetSurfFlowCoeff_FileName();
+    else filename = config->GetSurfCoeff_FileName();
   }
   else {
     if (adjoint)
     filename = config->GetAdj_FileName();
-    else filename = config->GetFlow_FileName();
+    else filename = config->GetVolume_FileName();
   }
   
-  if (Kind_Solver == FEM_ELASTICITY) {
-    if (surf_sol) filename = config->GetSurfStructure_FileName().c_str();
-    else filename = config->GetStructure_FileName().c_str();
-  }
+//  if (Kind_Solver == FEM_ELASTICITY) {
+//    if (surf_sol) filename = config->GetSurfStructure_FileName().c_str();
+//    else filename = config->GetStructure_FileName().c_str();
+//  }
   
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-    else filename = config->GetHeat_FileName().c_str();
-  }
+//  if (Kind_Solver == HEAT_EQUATION_FVM) {
+//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
+//    else filename = config->GetHeat_FileName().c_str();
+//  }
   
   if (config->GetKind_SU2() == SU2_DOT) {
     if (surf_sol) filename = config->GetSurfSens_FileName();
@@ -1718,7 +1718,7 @@ void COutput::SetTecplotBinary_DomainMesh(CConfig *config, CGeometry *geometry,
 
     if (adjoint)
       buffer = config->GetAdj_FileName();
-    else buffer = config->GetFlow_FileName();
+    else buffer = config->GetVolume_FileName();
 
     if (config->GetKind_SU2() == SU2_DOT) {
       buffer = config->GetVolSens_FileName();
@@ -1733,7 +1733,7 @@ void COutput::SetTecplotBinary_DomainMesh(CConfig *config, CGeometry *geometry,
     else cout << "Error: wrong number of dimensions: " << dims << endl;
     
     /*--- Open Tecplot file ---*/
-    err = TECINI142((char *)config->GetFlow_FileName().c_str(),
+    err = TECINI142((char *)config->GetVolume_FileName().c_str(),
                     (char *)variables.c_str(),
                     (char *)file.str().c_str(),
                     (char *)".",
@@ -2144,15 +2144,15 @@ void COutput::SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geomet
   
   if (adjoint)
     buffer = config->GetAdj_FileName();
-  else buffer = config->GetFlow_FileName();
+  else buffer = config->GetVolume_FileName();
   
-  if (Kind_Solver == FEM_ELASTICITY) {
-    buffer = config->GetStructure_FileName().c_str();
-  }
+//  if (Kind_Solver == FEM_ELASTICITY) {
+//    buffer = config->GetStructure_FileName().c_str();
+//  }
   
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    buffer = config->GetHeat_FileName().c_str();
-  }
+//  if (Kind_Solver == HEAT_EQUATION_FVM) {
+//    buffer = config->GetHeat_FileName().c_str();
+//  }
   
   if (config->GetKind_SU2() == SU2_DOT) {
     buffer = config->GetVolSens_FileName();
@@ -2177,7 +2177,7 @@ void COutput::SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geomet
   }
 
   /*--- Open Tecplot file ---*/
-  err = TECINI142((char *)config->GetFlow_FileName().c_str(),
+  err = TECINI142((char *)config->GetVolume_FileName().c_str(),
                   (char *)variables.c_str(),
                   (char *)file.str().c_str(),
                   (char *)".",
@@ -2725,7 +2725,7 @@ void COutput::SetTecplotBinary_SurfaceMesh(CConfig *config, CGeometry *geometry,
   if (!wrote_surf_file) {
     
     file.str(string());
-    buffer = config->GetSurfFlowCoeff_FileName();
+    buffer = config->GetSurfCoeff_FileName();
     if (config->GetKind_SU2() == SU2_DOT) {
       buffer = config->GetSurfSens_FileName();
     }
@@ -2810,7 +2810,7 @@ void COutput::SetTecplotBinary_SurfaceMesh(CConfig *config, CGeometry *geometry,
     ShareConnectivityFromZone  = 0;
     
     /*--- Open Tecplot file ---*/
-    err = TECINI142((char *)config->GetSurfFlowCoeff_FileName().c_str(),
+    err = TECINI142((char *)config->GetSurfCoeff_FileName().c_str(),
                     (char *)variables.c_str(),
                     (char *)file.str().c_str(),
                     (char *)".",
@@ -3038,15 +3038,7 @@ void COutput::SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geome
   /*--- Write file name with extension ---*/
   
   if (adjoint) buffer = config->GetSurfAdjCoeff_FileName();
-  else buffer = config->GetSurfFlowCoeff_FileName();
-  
-  if (Kind_Solver == FEM_ELASTICITY) {
-    buffer = config->GetSurfStructure_FileName().c_str();
-  }
-  
-  if (Kind_Solver == HEAT_EQUATION_FVM) {
-    buffer = config->GetSurfHeat_FileName().c_str();
-  }
+  else buffer = config->GetSurfCoeff_FileName();
   
   if (config->GetKind_SU2() == SU2_DOT) {
     buffer = config->GetSurfSens_FileName();
@@ -3168,7 +3160,7 @@ void COutput::SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geome
   
   
   /*--- Open Tecplot file ---*/
-  err = TECINI142((char *)config->GetFlow_FileName().c_str(),
+  err = TECINI142((char *)config->GetVolume_FileName().c_str(),
                   (char *)variables.c_str(),
                   (char *)file.str().c_str(),
                   (char *)".",
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index bb843d1d4728..f63ec9badb81 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -233,7 +233,7 @@ CDiscAdjFEASolver::CDiscAdjFEASolver(CGeometry *geometry, CConfig *config, CSolv
   else {
 
     /*--- Restart the solution from file information ---*/
-    mesh_filename = config->GetSolution_AdjFEMFileName();
+    mesh_filename = config->GetSolution_AdjFileName();
     filename = config->GetObjFunc_Extension(mesh_filename);
 
     restart_file.open(filename.data(), ios::in);
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index e468ee18557d..0c44aa826c7f 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -4306,49 +4306,29 @@ void CFEASolver::ComputeAitken_Coefficient(CGeometry **fea_geometry, CConfig *fe
   su2double *dispPred, *dispCalc, *dispPred_Old, *dispCalc_Old;
   su2double deltaU[3] = {0.0, 0.0, 0.0}, deltaU_p1[3] = {0.0, 0.0, 0.0};
   su2double delta_deltaU[3] = {0.0, 0.0, 0.0};
-  su2double CurrentTime=fea_config->GetCurrent_DynTime();
   su2double WAitkDyn_tn1, WAitkDyn_Max, WAitkDyn_Min, WAitkDyn;
   
   unsigned short RelaxMethod_FSI = fea_config->GetRelaxation_Method_FSI();
   
-  ofstream historyFile_FSI;
-  bool writeHistFSI = fea_config->GetWrite_Conv_FSI();
-  if (writeHistFSI && (rank == MASTER_NODE)) {
-    char cstrFSI[200];
-    string filenameHistFSI = fea_config->GetConv_FileName_FSI();
-    strcpy (cstrFSI, filenameHistFSI.data());
-    historyFile_FSI.open (cstrFSI, std::ios_base::app);
-  }
-  
   
   /*--- Only when there is movement, and a dynamic coefficient is requested, it makes sense to compute the Aitken's coefficient ---*/
   
     
     if (RelaxMethod_FSI == NO_RELAXATION) {
       
-      if (writeHistFSI && (rank == MASTER_NODE)) {
+      if (rank == MASTER_NODE) {
         
         SetWAitken_Dyn(1.0);
         
-        if (iOuterIter == 0) historyFile_FSI << " " << endl ;
-        historyFile_FSI << setiosflags(ios::fixed) << setprecision(4) << CurrentTime << "," ;
-        historyFile_FSI << setiosflags(ios::fixed) << setprecision(1) << iOuterIter << "," ;
-        if (iOuterIter == 0) historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << 1.0 ;
-        else historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << 1.0 << "," ;
       }
       
     }
     else if (RelaxMethod_FSI == FIXED_PARAMETER) {
       
-      if (writeHistFSI && (rank == MASTER_NODE)) {
+      if (rank == MASTER_NODE) {
         
         SetWAitken_Dyn(fea_config->GetAitkenStatRelax());
         
-        if (iOuterIter == 0) historyFile_FSI << " " << endl ;
-        historyFile_FSI << setiosflags(ios::fixed) << setprecision(4) << CurrentTime << "," ;
-        historyFile_FSI << setiosflags(ios::fixed) << setprecision(1) << iOuterIter << "," ;
-        if (iOuterIter == 0) historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << fea_config->GetAitkenStatRelax() ;
-        else historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << fea_config->GetAitkenStatRelax() << "," ;
       }
       
     }
@@ -4364,12 +4344,6 @@ void CFEASolver::ComputeAitken_Coefficient(CGeometry **fea_geometry, CConfig *fe
         WAitkDyn = max(WAitkDyn, WAitkDyn_Min);
         
         SetWAitken_Dyn(WAitkDyn);
-        if (writeHistFSI && (rank == MASTER_NODE)) {
-          if (iOuterIter == 0) historyFile_FSI << " " << endl ;
-          historyFile_FSI << setiosflags(ios::fixed) << setprecision(4) << CurrentTime << "," ;
-          historyFile_FSI << setiosflags(ios::fixed) << setprecision(1) << iOuterIter << "," ;
-          historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << WAitkDyn ;
-        }
         
       }
       else {
@@ -4417,21 +4391,13 @@ void CFEASolver::ComputeAitken_Coefficient(CGeometry **fea_geometry, CConfig *fe
         
         SetWAitken_Dyn(WAitkDyn);
         
-        if (writeHistFSI && (rank == MASTER_NODE)) {
-          historyFile_FSI << setiosflags(ios::fixed) << setprecision(4) << CurrentTime << "," ;
-          historyFile_FSI << setiosflags(ios::fixed) << setprecision(1) << iOuterIter << "," ;
-          historyFile_FSI << setiosflags(ios::scientific) << setprecision(4) << WAitkDyn << "," ;
-        }
-        
       }
       
     }
     else {
       if (rank == MASTER_NODE) cout << "No relaxation method used. " << endl;
     }
-  
-  if (writeHistFSI && (rank == MASTER_NODE)) {historyFile_FSI.close();}
-  
+    
 }
 
 void CFEASolver::SetAitken_Relaxation(CGeometry **fea_geometry,
@@ -4938,7 +4904,7 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetSolution_FEMFileName();
+  filename = config->GetSolution_FileName();
 
   /*--- If multizone, append zone name ---*/
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index e0c53a9fec8f..3e2191aa52f1 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -297,7 +297,7 @@ void CHeatSolverFVM::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = config->GetnZone();
 
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 47b9c4e47261..0334f5eac9e2 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -190,7 +190,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
   bool fsi     = config->GetFSI_Simulation();
   bool multizone = config->GetMultizone_Problem();
-  string filename_ = config->GetSolution_FlowFileName();
+  string filename_ = config->GetSolution_FileName();
 
   /*--- Check for a restart file to evaluate if there is a change in the angle of attack
    before computing all the non-dimesional quantities. ---*/
@@ -13337,7 +13337,7 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = config->GetnZone();
 
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -14756,7 +14756,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
   bool low_mach_prec = config->Low_Mach_Preconditioning();
   
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
-  string filename_ = config->GetSolution_FlowFileName();
+  string filename_ = config->GetSolution_FileName();
 
   unsigned short direct_diff = config->GetDirectDiff();
   bool rans = ((config->GetKind_Solver() == RANS )|| (config->GetKind_Solver() == DISC_ADJ_RANS));
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index ba6e170afba5..ec4b5e524109 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -9481,7 +9481,7 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C
 
   const bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
 
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   int counter = 0;
   long iPoint_Local = 0; unsigned long iPoint_Global = 0;
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 6475a9d1e760..afca98258ceb 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -104,7 +104,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   ifstream restart_file;
   unsigned short nZone = geometry->GetnZone();
   bool restart   = (config->GetRestart() || config->GetRestart_Flow());
-  string filename = config->GetSolution_FlowFileName();
+  string filename = config->GetSolution_FileName();
   int Unst_RestartIter;
   unsigned short iZone = config->GetiZone();
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
@@ -113,7 +113,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
   bool fsi     = config->GetFSI_Simulation();
   bool multizone = config->GetMultizone_Problem();
-  string filename_ = config->GetSolution_FlowFileName();
+  string filename_ = config->GetSolution_FileName();
 
   unsigned short direct_diff = config->GetDirectDiff();
 
@@ -6988,7 +6988,7 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = config->GetnZone();
 
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -7292,7 +7292,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
-  string filename_ = config->GetSolution_FlowFileName();
+  string filename_ = config->GetSolution_FileName();
 
   unsigned short direct_diff = config->GetDirectDiff();
 
diff --git a/SU2_CFD/src/solver_direct_transition.cpp b/SU2_CFD/src/solver_direct_transition.cpp
index 045de28d0a26..fce9a25638b9 100644
--- a/SU2_CFD/src/solver_direct_transition.cpp
+++ b/SU2_CFD/src/solver_direct_transition.cpp
@@ -164,7 +164,7 @@ CTransLMSolver::CTransLMSolver(CGeometry *geometry, CConfig *config, unsigned sh
     cout << "No LM restart yet!!" << endl; // TODO, Aniket
     int j;
     cin >> j;
-    string mesh_filename = config->GetSolution_FlowFileName();
+    string mesh_filename = config->GetSolution_FileName();
     cstr = new char [mesh_filename.size()+1];
     strcpy (cstr, mesh_filename.c_str());
     restart_file.open(cstr, ios::in);
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index aaea322c61f3..555b2bc5fa0d 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -1120,7 +1120,7 @@ void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
 
   string UnstExt, text_line;
   ifstream restart_file;
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   /*--- Modify file name for multizone problems ---*/
   if (nZone >1)
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index db0b36942ea2..10a8363661b0 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -2025,7 +2025,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   ifstream restart_file_n;
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
-  string filename = config->GetSolution_FlowFileName();
+  string filename = config->GetSolution_FileName();
   string filename_n;
 
   /*--- Auxiliary vector for storing the coordinates ---*/
@@ -3538,7 +3538,6 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
 
   string Tag, text_line, AdjExt, UnstExt;
   unsigned long iExtIter = config->GetExtIter();
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
 
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
@@ -3551,10 +3550,8 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   if (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint()) {
     filename = config->GetSolution_AdjFileName();
     filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetSolution_FEMFileName();
   } else {
-    filename = config->GetSolution_FlowFileName();
+    filename = config->GetSolution_FileName();
   }
 
   /*--- Multizone problems require the number of the zone to be appended. ---*/
@@ -3975,7 +3972,6 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   string UnstExt, text_line, AdjExt;
   ifstream solution_file;
   unsigned short iDim, iVar;
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool adjoint = ( config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint() ); 
   unsigned short iInst = config->GetiInst();
   bool grid_movement  = config->GetGrid_Movement();
@@ -3995,10 +3991,8 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   if (adjoint) {
     filename = config->GetSolution_AdjFileName();
     filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetSolution_FEMFileName();
   } else {
-    filename = config->GetSolution_FlowFileName();
+    filename = config->GetSolution_FileName();
   }
 
   filename = config->GetFilename(filename, ".dat");
@@ -4114,7 +4108,6 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
   ifstream solution_file;
   unsigned short iVar;
   unsigned long iExtIter = config->GetExtIter();
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
@@ -4123,10 +4116,8 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
   if (adjoint) {
     filename = config->GetSolution_AdjFileName();
     filename = config->GetObjFunc_Extension(filename);
-  } else if (fem) {
-    filename = config->GetSolution_FEMFileName();
   } else {
-    filename = config->GetSolution_FlowFileName();
+    filename = config->GetSolution_FileName();
   }
 
   /*--- Multizone problems require the number of the zone to be appended. ---*/
@@ -4261,7 +4252,7 @@ void CBaselineSolver_FEM::SetOutputVariables(CGeometry *geometry, CConfig *confi
 
   /*--- Retrieve filename from config ---*/
 
-  filename = config->GetSolution_FlowFileName();
+  filename = config->GetSolution_FileName();
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
 
@@ -4483,7 +4474,7 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   string UnstExt, text_line;
   ifstream restart_file;
 
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   if (config->GetWrt_Unsteady()) {
     restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), ".dat");
diff --git a/SU2_MSH/src/SU2_MSH.cpp b/SU2_MSH/src/SU2_MSH.cpp
index 2d07222927d0..0d0d74736db4 100644
--- a/SU2_MSH/src/SU2_MSH.cpp
+++ b/SU2_MSH/src/SU2_MSH.cpp
@@ -282,7 +282,7 @@ int main(int argc, char *argv[]) {
 		if ((config_container[ZONE_0]->GetKind_Adaptation() != SMOOTHING) && (config_container[ZONE_0]->GetKind_Adaptation() != FULL) &&
 				(config_container[ZONE_0]->GetKind_Adaptation() != WAKE) &&
 				(config_container[ZONE_0]->GetKind_Adaptation() != SUPERSONIC_SHOCK))
-			grid_adaptation->SetRestart_FlowSolution(config_container[ZONE_0], geo_adapt, config_container[ZONE_0]->GetRestart_FlowFileName());
+			grid_adaptation->SetRestart_FlowSolution(config_container[ZONE_0], geo_adapt, config_container[ZONE_0]->GetRestart_FileName());
 		
 		if ((config_container[ZONE_0]->GetKind_Adaptation() == GRAD_FLOW_ADJ) || (config_container[ZONE_0]->GetKind_Adaptation() == GRAD_ADJOINT)
 				|| (config_container[ZONE_0]->GetKind_Adaptation() == FULL_ADJOINT) || (config_container[ZONE_0]->GetKind_Adaptation() == COMPUTABLE) ||
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 67d411bcc9e9..5bba0e8b633f 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -295,7 +295,7 @@ MESH_FILENAME= mesh_NACA64A010_hybrid_inv.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
@@ -305,13 +305,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 1000
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index a922bdd68e2a..bdf415d732cd 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -285,7 +285,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -297,13 +297,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -312,7 +312,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index d36933dfd50b..e99157d47bae 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -279,7 +279,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -291,13 +291,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -306,7 +306,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 3057481eb607..8ac1be76ab3c 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -236,7 +236,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -248,13 +248,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -263,7 +263,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index a38da0939f25..0f5c7af68fa7 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -237,7 +237,7 @@ MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -252,13 +252,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -267,7 +267,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index bc807a2d4c47..94aadc9933b6 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -229,7 +229,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -241,13 +241,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -256,7 +256,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 6319c3529204..35ff812e18d5 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -242,7 +242,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -254,13 +254,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -269,7 +269,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 7ece8894018e..d3eeb63d8189 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -250,7 +250,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -262,13 +262,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -277,7 +277,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index daedc55ebbf2..2cf80dbde37b 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -235,7 +235,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -247,13 +247,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -262,7 +262,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index 9f50b0b274e7..7f1d0224371c 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -246,7 +246,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -258,13 +258,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -273,7 +273,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 3474204418bd..a3ad8674f3df 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -307,7 +307,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -319,13 +319,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -334,7 +334,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index b343fe8a3a79..ee716f4efc08 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -307,7 +307,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= bin_solution_flow.dat
+SOLUTION_FILENAME= bin_solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= bin_solution_adj.dat
@@ -319,13 +319,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -334,7 +334,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index 72e5d60ad74d..65029abb589f 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -304,7 +304,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -316,13 +316,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -331,7 +331,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index a57654db905b..ff2fc9ddcc7e 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -221,7 +221,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -233,13 +233,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -248,7 +248,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 14823448eb45..ae380487036d 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -220,7 +220,7 @@ MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -235,13 +235,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -250,7 +250,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 35761f14627e..c69c6dee74fc 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -220,7 +220,7 @@ MESH_FILENAME= mesh_ONERAM6_inv.su2
 MESH_OUT_FILENAME= mesh_ONERAM6_inv_FFD.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -235,13 +235,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -250,7 +250,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incompressible/configFlow.cfg b/TestCases/coupled_cht/incompressible/configFlow.cfg
index b9f273c7b69e..6f40829c5c44 100644
--- a/TestCases/coupled_cht/incompressible/configFlow.cfg
+++ b/TestCases/coupled_cht/incompressible/configFlow.cfg
@@ -119,18 +119,13 @@ CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 MESH_FILENAME= coupled_cht_cylinder2d.su2
 MESH_FORMAT= SU2
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
-RESTART_FLOW_FILENAME= solution_flow.dat
-VOLUME_FLOW_FILENAME= flow
-SURFACE_FLOW_FILENAME= surface_flow
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_RESIDUALS= YES
+RESTART_FILENAME= solution_flow.dat
+VOLUME_FILENAME= flow
+SURFACE_FILENAME= surface_flow
 WRT_LIMITERS= NO
 WRT_SHARPEDGES= NO
 LOW_MEMORY_OUTPUT= NO
diff --git a/TestCases/coupled_cht/incompressible/configSolid.cfg b/TestCases/coupled_cht/incompressible/configSolid.cfg
index 925958895d54..f7844c3a2ae7 100644
--- a/TestCases/coupled_cht/incompressible/configSolid.cfg
+++ b/TestCases/coupled_cht/incompressible/configSolid.cfg
@@ -78,12 +78,12 @@ TIME_DISCRE_HEAT= EULER_IMPLICIT
 
 MESH_FILENAME= coupled_cht_cylinder2d.su2
 MESH_FORMAT= SU2
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
-RESTART_FLOW_FILENAME= solution_flow.dat
-VOLUME_FLOW_FILENAME= flow
+RESTART_FILENAME= solution_flow.dat
+VOLUME_FILENAME= flow
 WRT_SOL_FREQ= 100
 WRT_SOL_FREQ_DUALTIME= 1
 WRT_CON_FREQ= 100
diff --git a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
index a4ffaf6e90f0..681c87b30ff9 100644
--- a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
+++ b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
@@ -176,7 +176,7 @@ MESH_FORMAT= SU2
 
 MESH_OUT_FILENAME= Mesh_Out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
@@ -186,11 +186,11 @@ CONV_FILENAME= history
 
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 
 VOLUME_ADJ_FILENAME= adjoint
 
@@ -198,7 +198,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 
 SURFACE_ADJ_FILENAME= surface_adjoint
 
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 9ace1cea84dd..67358726b301 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -204,7 +204,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -216,13 +216,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -231,7 +231,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index 50f445f95dac..e61ed8e9cf92 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index 4bd7ef5fac8e..4adfdd41626b 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 16ec87170148..421fbcc8e300 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 25f4f873ffde..23ea14d72bd9 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 40ecc5ce4152..417ecc5b9c0e 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 3134a62b6ba3..0e5f0777ff62 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 2552fa9ee6d3..dd9aa79d135a 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -271,7 +271,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -287,13 +287,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -305,7 +305,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index a1c40e52b32d..2ef040a81a20 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -275,7 +275,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -287,13 +287,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -302,7 +302,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 7b0cf9c9c41d..032edd8b9b02 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -286,7 +286,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -298,13 +298,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -313,7 +313,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index f54386ff3c78..21de8eadd155 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -255,7 +255,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -267,13 +267,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -282,7 +282,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 3e51c264abd5..d0c00270fe1d 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -228,7 +228,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -240,13 +240,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -255,7 +255,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 6778b0d91dcc..65612a8e8f3d 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -274,7 +274,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -290,13 +290,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -308,7 +308,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index 46d90fbcd6c8..34a58a08a5bf 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -281,7 +281,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -297,13 +297,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -315,7 +315,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index 142528de8101..dd950efb4ee3 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -587,7 +587,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= MESHOUT_Arina2Kmesh.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -603,13 +603,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -621,7 +621,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index cf03194efd0f..d7f7765d3ad3 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -295,7 +295,7 @@ MESH_FORMAT= CGNS
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -311,13 +311,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -329,7 +329,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 1ed0a776c76c..600355e8d14a 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -215,7 +215,7 @@ MESH_FILENAME= mesh_ONERAM6_inv.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -230,13 +230,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -245,7 +245,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
index f49c81e89555..41c22041ba36 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
@@ -129,20 +129,20 @@ MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
 %
 RESTART_SOL= NO
-SOLUTION_FLOW_FILENAME= solution_fluid.dat
+SOLUTION_FILENAME= solution_fluid.dat
 SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
 SOLUTION_ADJ_FILENAME= adjoint_fluid.dat
 SOLUTION_ADJ_STRUCTURE_FILENAME= adjoint_solid.dat
 WRT_SOL_FREQ= 999999
-RESTART_FLOW_FILENAME= solution_fluid.dat
+RESTART_FILENAME= solution_fluid.dat
 RESTART_STRUCTURE_FILENAME= solution_solid.dat
 RESTART_ADJ_FILENAME= adjoint_fluid.dat
 RESTART_ADJ_STRUCTURE_FILENAME= adjoint_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
-VOLUME_FLOW_FILENAME= fluid
+VOLUME_FILENAME= fluid
 VOLUME_ADJ_FILENAME= adjoint_fluid
-SURFACE_FLOW_FILENAME= surface_fluid
+SURFACE_FILENAME= surface_fluid
 SURFACE_ADJ_FILENAME= adjoint_surface_fluid
 %
 VOLUME_STRUCTURE_FILENAME= solid
diff --git a/TestCases/disc_adj_fsi/configAD_fsi.cfg b/TestCases/disc_adj_fsi/configAD_fsi.cfg
index b0e12dae8e09..d1a52a977cc4 100644
--- a/TestCases/disc_adj_fsi/configAD_fsi.cfg
+++ b/TestCases/disc_adj_fsi/configAD_fsi.cfg
@@ -94,17 +94,17 @@ MARKER_FAR = ( Farfield )
 MARKER_PLOTTING= ( UpperWall, LowerWall, Wall)
 MARKER_MONITORING= ( UpperWall, LowerWall, Wall)
 
-VOLUME_FLOW_FILENAME= results_flow
+VOLUME_FILENAME= results_flow
 VOLUME_STRUCTURE_FILENAME= results_beam
 
 CONV_FILENAME= history
 
 BREAKDOWN_FILENAME= forces_breakdown.dat
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 RESTART_STRUCTURE_FILENAME= restart_beam.dat
 
 SOLUTION_ADJ_FILENAME= solution_flow_adj.dat
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 20bfefd5b655..53b942c7478c 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -203,7 +203,7 @@ MESH_FORMAT= SU2
 
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
@@ -213,11 +213,11 @@ CONV_FILENAME= history
 
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 
 VOLUME_ADJ_FILENAME= adjoint
 
@@ -225,7 +225,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 
 SURFACE_ADJ_FILENAME= surface_adjoint
 
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index b531ad1df11e..bd35c1b38e7e 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -206,7 +206,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -218,13 +218,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -233,7 +233,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 6ed4d856c9d1..4f3dac68c792 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -279,7 +279,7 @@ MESH_FILENAME= mesh_cylinder_lam_ffd.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -295,13 +295,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -313,7 +313,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 6a545cf2e1ab..2ce8a01eedb6 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -261,7 +261,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sa.dat
+SOLUTION_FILENAME= solution_flow_sa.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -273,13 +273,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -288,7 +288,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index de6c6f3643e5..e72f63c64038 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -261,7 +261,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst.dat
+SOLUTION_FILENAME= solution_flow_sst.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -273,13 +273,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -288,7 +288,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index b6dc5acff552..ab35172630c1 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -238,7 +238,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -250,13 +250,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -265,7 +265,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 5b9d06f74b0f..56e55b7a73dd 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -244,7 +244,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -256,13 +256,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= solution_flow.dat
+RESTART_FILENAME= solution_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= solution_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -271,7 +271,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 980ad5aae39d..af80b3c9ccb2 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -226,7 +226,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sa.dat
+SOLUTION_FILENAME= solution_flow_sa.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -238,13 +238,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -253,7 +253,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index e24476ce7c6c..44443a50af48 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -225,7 +225,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst.dat
+SOLUTION_FILENAME= solution_flow_sst.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -237,13 +237,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -252,7 +252,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index aedebe957646..9724905b86f6 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -401,7 +401,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per_optimal.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -413,13 +413,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -428,7 +428,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index 752e69a1d49c..db1bd0863efb 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -212,7 +212,7 @@ MESH_FILENAME= grid_crm_dpw4_MB-structured.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -227,13 +227,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -242,7 +242,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 1a00ce317d91..bc6a7230f3cc 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -250,7 +250,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -262,13 +262,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= volume_flow
+VOLUME_FILENAME= volume_flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= volume_adjoint
@@ -277,7 +277,7 @@ VOLUME_ADJ_FILENAME= volume_adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 2b7894ee0df7..e3167039dbe3 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -174,7 +174,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -186,13 +186,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -201,7 +201,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 693f5683c996..6bcddfed89e1 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -194,7 +194,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -206,13 +206,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -221,7 +221,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index d04915368ce1..910c11ec7459 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -190,7 +190,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -202,13 +202,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -217,7 +217,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index 7f5f2b1c111f..96b636997fe1 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -267,7 +267,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -279,13 +279,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -294,7 +294,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index f3d8912b3cd2..a80f564f4ae7 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -181,7 +181,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -193,13 +193,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -208,7 +208,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index c091ce17315a..23c962686b26 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -239,7 +239,7 @@ MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -254,13 +254,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -269,7 +269,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 9cce5a87572b..2083ca8e7789 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -189,7 +189,7 @@ MESH_FORMAT= CGNS
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -201,13 +201,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -216,7 +216,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 24cec8dc70e4..e9cfb6c5608d 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -75,15 +75,15 @@ MESH_FORMAT= SU2
 MULTIZONE_MESH = NO
 %
 RESTART_SOL= YES
-SOLUTION_FLOW_FILENAME= solution_fluid.dat
+SOLUTION_FILENAME= solution_fluid.dat
 SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
-RESTART_FLOW_FILENAME= restart_fluid.dat
+RESTART_FILENAME= restart_fluid.dat
 RESTART_STRUCTURE_FILENAME= restart_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
-VOLUME_FLOW_FILENAME= fluid
-SURFACE_FLOW_FILENAME= surface_fluid
+VOLUME_FILENAME= fluid
+SURFACE_FILENAME= surface_fluid
 VOLUME_STRUCTURE_FILENAME= solid
 %
 WRT_CON_FREQ= 10
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 8ce7f488bdd3..1357f999b644 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -111,15 +111,15 @@ MESH_FILENAME= meshFlow.su2
 MESH_FORMAT= SU2
 %
 RESTART_SOL= YES
-SOLUTION_FLOW_FILENAME= solution_fluid.dat
+SOLUTION_FILENAME= solution_fluid.dat
 SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
-RESTART_FLOW_FILENAME= restart_fluid.dat
+RESTART_FILENAME= restart_fluid.dat
 RESTART_STRUCTURE_FILENAME= restart_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
-VOLUME_FLOW_FILENAME= fluid
-SURFACE_FLOW_FILENAME= surface_fluid
+VOLUME_FILENAME= fluid
+SURFACE_FILENAME= surface_fluid
 VOLUME_STRUCTURE_FILENAME= solid
 %
 WRT_CON_FREQ= 10
diff --git a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
index a5e8a2501354..983bfc377cfd 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
@@ -157,15 +157,15 @@ MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
 %
 RESTART_SOL= YES
-SOLUTION_FLOW_FILENAME= solution_fluid.dat
+SOLUTION_FILENAME= solution_fluid.dat
 SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
-RESTART_FLOW_FILENAME= restart_fluid.dat
+RESTART_FILENAME= restart_fluid.dat
 RESTART_STRUCTURE_FILENAME= restart_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
-VOLUME_FLOW_FILENAME= fluid
-SURFACE_FLOW_FILENAME= surface_fluid
+VOLUME_FILENAME= fluid
+SURFACE_FILENAME= surface_fluid
 VOLUME_STRUCTURE_FILENAME= solid
 %
 WRT_CON_FREQ= 10
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 3786fae60b1f..088c6c049278 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -237,7 +237,7 @@ MARKER_MONITORING= ( UpperBeam, RightBeam, LowerBeam)
 OUTPUT_FORMAT= PARAVIEW
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= results_flow
+VOLUME_FILENAME= results_flow
 %
 % Output file name (PARAVIEW, TECPLOT)
 VOLUME_STRUCTURE_FILENAME= results_beam
@@ -249,13 +249,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file name (PARAVIEW, TECPLOT)
 SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart flow
 RESTART_STRUCTURE_FILENAME= restart_beam.dat
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index dde8d68f635f..81d1886cd5eb 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -109,9 +109,9 @@ WRT_CON_FREQ= 100
 WRT_CON_FREQ_DUALTIME= 100
 WRT_SOL_FREQ= 100
 WRT_SOL_FREQ_DUALTIME= 100
-VOLUME_FLOW_FILENAME= results_flow
-RESTART_FLOW_FILENAME= restart_flow.dat
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+VOLUME_FILENAME= results_flow
+RESTART_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 VOLUME_STRUCTURE_FILENAME= results_wall
 RESTART_STRUCTURE_FILENAME= restart_wall.dat
 SOLUTION_STRUCTURE_FILENAME= solution_wall.dat
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index f75bf5f25f2f..ebbf33d4af43 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -84,9 +84,9 @@ WRT_CON_FREQ_DUALTIME= 1
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 
-VOLUME_FLOW_FILENAME= results_flow
-RESTART_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+VOLUME_FILENAME= results_flow
+RESTART_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 3968e8aab517..5680a4b3b492 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -280,7 +280,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -292,13 +292,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -307,7 +307,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 74eb6db9846c..815f8b315cf3 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -285,7 +285,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -297,13 +297,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -312,7 +312,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index 1c67f15a40a5..57babe120f01 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -254,7 +254,7 @@ MESH_FILENAME= mesh_NACA0012_inv.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
@@ -267,13 +267,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 1000
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 98892ae35b59..6bd06050111d 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -288,7 +288,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -300,13 +300,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -315,7 +315,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 9617adb2ace0..3dc3c780d555 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -230,7 +230,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT)
 OUTPUT_FORMAT= PARAVIEW
@@ -239,13 +239,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 500
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index bad095923bef..ae5be4d4768f 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -152,8 +152,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= SolInterpolFrom3rdOrder.dat
+%SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -166,13 +166,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -181,7 +181,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 4811f2be12bd..31e79266de31 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -151,8 +151,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= SolInterpolFrom3rdOrder.dat
+%SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -165,13 +165,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -180,7 +180,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 03cf021cd87f..bbc95e49c00d 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -151,8 +151,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= SolInterpolFrom3rdOrder.dat
+%SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -165,13 +165,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -180,7 +180,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index c005996accd4..797ee6573c2d 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -149,7 +149,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -161,13 +161,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -176,7 +176,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index d4aaa8767f60..ae0fdec76baa 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -155,8 +155,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= solution_flow.dat_FullyConverged
+%SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat_FullyConverged
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -168,13 +168,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -183,7 +183,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 1d0baccf6382..89b4bdfc5be8 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -160,7 +160,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_naca0012.dat
+SOLUTION_FILENAME= solution_flow_naca0012.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -172,13 +172,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -187,7 +187,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index 0f8ba5ec4346..5a5e09082d7a 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index 9a4a53e1bc24..9e88cba24451 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index 665008fcde7d..bbbcb98c652e 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index ca4c6ec09305..cf41b319f05c 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index 3203db960ae4..f4dd3c2f6b7c 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index 339775b61872..53d3c52e2d17 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index dff3835bdcf0..355e496ade8b 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 8a22969bac88..adbdabba16f4 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 04f8b4a7d0ea..c801b9f0c2f2 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 0a5571b309ac..babf7cc0a777 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index cb3a45b70164..28aab3b68ebc 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index f66f6dc6f665..4c039852eba4 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,7 +146,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -158,13 +158,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -173,7 +173,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index d371c965be0e..34cbc8d7b661 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -149,7 +149,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -161,13 +161,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -176,7 +176,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index a5b1f15dd926..83569837c92f 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -152,8 +152,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
-SOLUTION_FLOW_FILENAME= SolInterpolFrom3rdOrder.dat
+%SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -165,13 +165,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -180,7 +180,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index d53065fcd028..3f9ec479b481 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -159,7 +159,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -171,13 +171,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -186,7 +186,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index 05f248aed683..5d9323691fa3 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -152,7 +152,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -164,13 +164,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -179,7 +179,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index 41d986764a1a..319b2a1635e3 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -159,7 +159,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -171,13 +171,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -186,7 +186,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index 645a36ba4577..fe7eac85cde9 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -152,7 +152,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -164,13 +164,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -179,7 +179,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 2c6579e765d8..066328b7c230 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -159,7 +159,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -171,13 +171,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -186,7 +186,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index 05932641bffc..f9c3c8998789 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -152,7 +152,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -164,13 +164,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -179,7 +179,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index b4fc683633f6..cd4607f837bd 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -153,7 +153,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -165,13 +165,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -180,7 +180,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index d55a61b95060..6bddd2213a74 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -162,7 +162,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -174,13 +174,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -189,7 +189,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 754f64fc2da4..557cef41626a 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -153,8 +153,8 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
-%SOLUTION_FLOW_FILENAME= InterpolFromNPoly1.dat
+SOLUTION_FILENAME= restart_flow.dat
+%SOLUTION_FILENAME= InterpolFromNPoly1.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -166,13 +166,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -181,7 +181,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index 2138a6629e06..31acf0c4540f 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -177,7 +177,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -189,13 +189,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -204,7 +204,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 02ef3309c681..f7d01a16a2b4 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -169,7 +169,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -181,13 +181,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -196,7 +196,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 9524c3fdb0af..0ba6c6e652a6 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -182,7 +182,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -194,13 +194,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -209,7 +209,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index 878db26f8767..be49a3d1cbb4 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -200,7 +200,7 @@ MESH_FILENAME= mesh_NACA0012_5deg_6814.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT)
 OUTPUT_FORMAT= TECPLOT
@@ -209,13 +209,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 200
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index 8745d709244f..da119f7215c2 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -197,7 +197,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
@@ -210,13 +210,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 2b74b4654dbb..eb1f202a2453 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -237,7 +237,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -249,13 +249,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -264,7 +264,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 4dcdf1dc6888..1dc023bc9039 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -196,7 +196,7 @@ MESH_FILENAME= mesh_cylinder_lam.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT)
 OUTPUT_FORMAT= TECPLOT
@@ -205,13 +205,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 100
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 22035c2f386f..26b6e533aca9 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -263,7 +263,7 @@ MESH_FILENAME= mesh_cylinder_lam.su2
 MESH_FORMAT= SU2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -279,13 +279,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -297,7 +297,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 0edfdf1a8310..9916daae47e3 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -336,7 +336,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -348,13 +348,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -366,7 +366,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 809a285bfbd3..400fd450353f 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -221,7 +221,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -233,13 +233,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -248,7 +248,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index e8194fc1cd11..701f1c70ea9f 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -201,7 +201,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -213,13 +213,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -228,7 +228,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 364c9eaa330c..de342317c96b 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -234,7 +234,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -246,13 +246,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -261,7 +261,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index ba0765fda94d..6f595c883fdd 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -294,7 +294,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -306,13 +306,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -321,7 +321,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 1d2c822df356..06ac7e526fa8 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -193,7 +193,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -205,13 +205,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -220,7 +220,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index 1a9d40a05882..80f93616e253 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -188,7 +188,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -200,13 +200,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -215,7 +215,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index bdb6d9fc97c2..f60de891952a 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -205,7 +205,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -217,13 +217,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -232,7 +232,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index be599281cf9c..9e8e6164f916 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -180,7 +180,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -192,13 +192,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -207,7 +207,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index d6431846a8c6..ee2b52681b0b 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index 681d0dc2ceef..76a284c14af4 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -263,7 +263,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_profile.dat
+SOLUTION_FILENAME= solution_flow_profile.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -275,13 +275,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -290,7 +290,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index d0a03c24e48f..79284b97064c 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -298,7 +298,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -310,13 +310,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -325,7 +325,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 1617a838f99c..e35343501a57 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -297,7 +297,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -309,13 +309,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -324,7 +324,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 51e456d2f32a..d8d9889478b2 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -209,7 +209,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -221,13 +221,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -236,7 +236,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 45b29bb6c251..0d39972bf6a4 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -209,7 +209,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -221,13 +221,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -236,7 +236,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 078e9c74ed36..531eb0b3b28c 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -239,7 +239,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -251,13 +251,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -266,7 +266,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 0f2f4639d2e7..7742afbf7673 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -240,7 +240,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -252,13 +252,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -267,7 +267,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index f758fd1c2349..3b218cafe20d 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -240,7 +240,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -252,13 +252,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -267,7 +267,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 725ee4453ec7..0d339e8dbc3c 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -242,7 +242,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -254,13 +254,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -269,7 +269,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 01ea60c3db53..cd31df8b5b3e 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -249,7 +249,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -261,13 +261,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -276,7 +276,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index c5099f3ea680..680a579fd518 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -305,7 +305,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -317,13 +317,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -332,7 +332,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index 076bc7d7ab21..e6fdc97886da 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -281,7 +281,7 @@ MESH_FILENAME= mesh_ONERAM6_inv.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -296,13 +296,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -311,7 +311,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index c202cc4573c0..d1cb327124c1 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -274,7 +274,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -286,13 +286,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -301,7 +301,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 2225600d5bb9..625fd293dc0f 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -263,7 +263,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -275,13 +275,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -290,7 +290,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index 861a8839ce8d..5331a618f024 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -276,7 +276,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -288,13 +288,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -303,7 +303,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index dca6f6211148..9add49160e39 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -258,7 +258,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -270,13 +270,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -285,7 +285,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index a436511a3327..7f91060f8ec1 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -239,7 +239,7 @@ MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -254,13 +254,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -269,7 +269,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 2c471e2611c5..ff39732ca03d 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -239,7 +239,7 @@ MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -254,13 +254,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -269,7 +269,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index cf289b972fb9..b2cd3c77212a 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -321,7 +321,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= restart_adj.dat
@@ -333,13 +333,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -348,7 +348,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index 79fa0755557e..0d1989b1aa0f 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -344,7 +344,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -356,13 +356,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -371,7 +371,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index 002fddcd11fa..145579bf3ba6 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -291,7 +291,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -303,13 +303,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -318,7 +318,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 28591773e027..3338962bd3ed 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -236,7 +236,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -248,13 +248,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -263,7 +263,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index adace5c59eb5..741461168839 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -281,7 +281,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -293,13 +293,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -308,7 +308,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index bb56adc5677e..872a96848cce 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -496,7 +496,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -512,13 +512,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -530,7 +530,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index bbc3562eec5f..ea4be0292236 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -476,7 +476,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -492,13 +492,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -510,7 +510,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index efab6ddf6e78..ad4720801cc7 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -214,7 +214,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -226,13 +226,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -241,7 +241,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index b207cadf988c..f9ea4795f576 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -211,7 +211,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -223,13 +223,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -238,7 +238,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 7e31259fda09..675fef6bf0fa 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -225,7 +225,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sa.dat
+SOLUTION_FILENAME= solution_flow_sa.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -237,13 +237,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -252,7 +252,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index affeee8c2d2c..033ea169d2c9 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sa_bin.dat
+SOLUTION_FILENAME= solution_flow_sa_bin.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index 2c20dd607ddc..f8ec16d235d1 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -216,7 +216,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sa.dat
+SOLUTION_FILENAME= solution_flow_sa.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -228,13 +228,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -243,7 +243,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index dfd1eaa20f8b..a5f0a4eef5b8 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -224,7 +224,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst.dat
+SOLUTION_FILENAME= solution_flow_sst.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -236,13 +236,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -251,7 +251,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 6c7276806897..e27936c154d5 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -393,7 +393,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst_restart.dat
+SOLUTION_FILENAME= solution_flow_sst_restart.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -405,13 +405,13 @@ OUTPUT_FORMAT= TECPLOT_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -423,7 +423,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index fe3a7cee55de..cdfeb76ccb6a 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -252,7 +252,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -264,13 +264,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -279,7 +279,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index fa7ba43f8e18..97ca0eb06c9b 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -234,7 +234,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -250,13 +250,13 @@ CONV_FILENAME= history
 BREAKDOWN_FILENAME= forces_breakdown.dat
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -268,7 +268,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index 6aea95c73d76..a8d85d9455a1 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -229,7 +229,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -241,13 +241,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -256,7 +256,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 3d7c59045b3c..37cc850af4f9 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -206,7 +206,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -218,13 +218,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -233,7 +233,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index 21ac8c5b80cc..9f5ea3e8c3be 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -197,7 +197,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= trans_mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= trans_solution_flow.dat
+SOLUTION_FILENAME= trans_solution_flow.dat
 %
 % Restart linear flow input file
 SOLUTION_LIN_FILENAME= trans_solution_lin.dat
@@ -212,7 +212,7 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= trans_history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= trans_restart_flow.dat
+RESTART_FILENAME= trans_restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= trans_restart_adj.dat
@@ -221,7 +221,7 @@ RESTART_ADJ_FILENAME= trans_restart_adj.dat
 RESTART_LIN_FILENAME= trans_restart_lin.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= trans_flow
+VOLUME_FILENAME= trans_flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= trans_adjoint
@@ -230,7 +230,7 @@ VOLUME_ADJ_FILENAME= trans_adjoint
 GRAD_OBJFUNC_FILENAME= trans_of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= trans_surface_flow
+SURFACE_FILENAME= trans_surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= trans_surface_adjoint
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index be13e3d39d9e..e32a6910f3c7 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -211,7 +211,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -223,13 +223,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -238,7 +238,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index c6ffca7e3995..41ae2e997cae 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -227,7 +227,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -239,13 +239,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -254,7 +254,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index d8b06d80efa1..bd100743ab49 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -212,7 +212,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst.dat
+SOLUTION_FILENAME= solution_flow_sst.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -224,13 +224,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -239,7 +239,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index ae8d8b409bd7..d2c222e80412 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index b7f37a0e00b8..587050c4a3b7 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 14adaabedee3..761d8aa6f89b 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index ffd794e7d331..29953c9e89df 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index a15a245d54d3..2f7fbc680aec 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 50b003182b0d..7b26cebcda5f 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -199,7 +199,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_caradonna_tung_periodic.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -211,13 +211,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -226,7 +226,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 079cb123913f..f23604bf7bee 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -295,7 +295,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -307,13 +307,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -322,7 +322,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 1155e188cc38..fbf1e1f9f7d0 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -320,7 +320,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -332,13 +332,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -347,7 +347,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index c20899b560c7..c51853884b3e 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -218,7 +218,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -227,13 +227,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 804914358582..bce9d956aaa6 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -216,7 +216,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -225,13 +225,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index af61f5b5a715..210dfb9a0244 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -228,7 +228,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -237,13 +237,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index d45c25f23978..0b651810a986 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -216,7 +216,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -225,13 +225,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 8bf0c97f8a1d..6224930ba354 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -118,21 +118,21 @@ MESH_FILENAME= meshCircle.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
 OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history_converge
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 VOLUME_ADJ_FILENAME= adjoint
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
 WRT_SOL_FREQ= 1000
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index da554a7367a8..ed22bdf80ff2 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -125,21 +125,21 @@ MESH_FILENAME= meshOut.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
 OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 VOLUME_ADJ_FILENAME= adjoint
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
 WRT_SOL_FREQ= 1000
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index e25a712cfd6b..40e30ce38d6c 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -123,21 +123,21 @@ MESH_FILENAME= meshCircle.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
 OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 VOLUME_ADJ_FILENAME= adjoint
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
 WRT_SOL_FREQ= 1
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index fdc906633e3a..b06713942bd3 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -133,21 +133,21 @@ MESH_FILENAME= meshOut.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
 OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 VOLUME_ADJ_FILENAME= adjoint
 
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
 WRT_SOL_FREQ= 1
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 767b7b53bf5d..4424c2c509fb 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -91,7 +91,7 @@ MARKER_EULER= ( intake_sidewall, component_sidewall_1, component_sidewall_2, com
 MARKER_RIEMANN= (intake_upper_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0, 0.0, intake_lower_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 1.5, 0.0, 0.0, outlet_interface_4  STATIC_PRESSURE, 95750.0, 0.0, 0.0, 0.0, 0.0 )
 %
 % Zone interaction boundary definition
-MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4, outlet_interface_4 )
+MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
 MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 
@@ -230,7 +230,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -239,13 +239,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 2ee820d45188..3dd7e3bd1fb4 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -240,13 +240,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index dfa8a79c86ed..cab687ea39cb 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -221,7 +221,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -230,13 +230,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index ec6d72d3ae3f..f5dfd9a4bd3c 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -221,7 +221,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -230,13 +230,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 4143772bf6b0..b07c9193ab8a 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -265,7 +265,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -274,13 +274,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 3edb80a77913..d78b1e1df277 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -265,7 +265,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -274,13 +274,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index ce86fdfef02b..182f34941015 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -224,7 +224,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -233,13 +233,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index b3f3ca55fa8a..85b7ee97c1f2 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -222,7 +222,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW	
@@ -231,13 +231,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 38a4c79a9dca..ef463d174cef 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -219,7 +219,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW
@@ -228,13 +228,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 419e24584788..788d436059a1 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -226,7 +226,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= PARAVIEW
@@ -235,13 +235,13 @@ OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 50
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index fcf0f797bb50..fb38e02c2e71 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -213,7 +213,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -225,13 +225,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -240,7 +240,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 53ec130dc774..37955219f7f3 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -249,7 +249,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -261,13 +261,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -276,7 +276,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index 77f0eee97379..e4b14d2d18e2 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -232,7 +232,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -244,13 +244,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -259,7 +259,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index cb5795c5375a..624b6fb6523d 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -323,7 +323,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= meshout.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -335,13 +335,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -350,7 +350,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 40024c64ee0c..ea9a77da731d 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -327,7 +327,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= meshout.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -339,13 +339,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -354,7 +354,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 2873f3fc5942..50c5d615a8f2 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -317,7 +317,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= meshout.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -329,13 +329,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -344,7 +344,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 0c5bc22ac110..8a10d08f7bd6 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -348,7 +348,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= TECPLOT
@@ -357,13 +357,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 500
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index d07593fe84a2..18e21ad6611d 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -356,7 +356,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
 OUTPUT_FORMAT= TECPLOT
@@ -365,13 +365,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
 WRT_SOL_FREQ= 500
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 02c597e669ab..9f5738d7c467 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -324,7 +324,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -336,13 +336,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -351,7 +351,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index eeb15f8aff21..a010588169a1 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -329,7 +329,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= su2mesh_per.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -341,13 +341,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -356,7 +356,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index fac28232c1f6..d621f517abc7 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -297,7 +297,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -309,13 +309,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -324,7 +324,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 40a6fbcb69cb..18bd9a9e0d47 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -321,7 +321,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= restart_adj.dat
@@ -333,13 +333,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -348,7 +348,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index d6f784e5c188..2270c147eac9 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -219,7 +219,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -231,13 +231,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -246,7 +246,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 554f70ca1e8c..1302352b38d8 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -234,7 +234,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -246,13 +246,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -261,7 +261,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint

From 0813fc0131e3049175af85eaed0491de0ee95c86 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 21 Apr 2019 21:08:18 +0200
Subject: [PATCH 241/539] Small fix

---
 SU2_CFD/src/output/output_structure_legacy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 17ab01b7a38a..51555facd44f 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -464,7 +464,7 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
   ofstream SurfFlow_file;
   
   /*--- Write file name with extension if unsteady ---*/
-  strcpy (cstr, config->GetSurfFlowCoeff_FileName().c_str());
+  strcpy (cstr, config->GetSurfCoeff_FileName().c_str());
   
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));

From ebe9dd64d0673e8dfdb929d4f5938cf09d9026d1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Apr 2019 15:48:20 +0200
Subject: [PATCH 242/539] Added a SetTransferType routine to determine
 appropriate BCs for zone interfaces

---
 Common/include/config_structure.hpp  |   8 +
 Common/src/config_structure.cpp      |  44 ++--
 SU2_CFD/include/driver_structure.hpp |   3 +
 SU2_CFD/src/driver_structure.cpp     | 359 ++++++++++++++++++++++-----
 4 files changed, 339 insertions(+), 75 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index d202075cf05a..eb9dd49d3e21 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5618,6 +5618,14 @@ class CConfig {
    */
   bool GetSurface_Movement(unsigned short kind_movement);
   
+  /*!
+   * \brief Set a surface movement marker.
+   * \param[in] iMarker - Moving marker.
+   * \param[in] kind_movement - Kind of surface movement.
+   * \return <code>TRUE</code> at least one surface of kind_movement moving; otherwise <code>FALSE</code>.
+   */
+  void SetSurface_Movement(unsigned short iMarker, unsigned short kind_movement);
+  
   /*!
    * \brief Get the type of dynamic mesh motion. Each zone gets a config file.
    * \return Type of dynamic mesh motion.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 5309cdabab39..07a1e303d817 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3184,24 +3184,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   } else {
     nExtIter = nTimeIter;
   }
-  /*--- Fluid-Structure Interaction problems ---*/
 
-  if (FSI_Problem) {
-    unsigned short* new_surface_movement = new unsigned short[nMarker_Moving + 1];
-    for (unsigned short iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++){
-      new_surface_movement[iMarker_Moving] = Kind_SurfaceMovement[iMarker_Moving];
-    }
-    if (nKind_SurfaceMovement != 0) delete [] Kind_SurfaceMovement;
-    Kind_SurfaceMovement = new_surface_movement;
-    nKind_SurfaceMovement++;
-    if ((Dynamic_Analysis == STATIC) && (Unsteady_Simulation == STEADY)) {
-      Kind_SurfaceMovement[nMarker_Moving] = FLUID_STRUCTURE_STATIC;
-    }
-    else{
-      Kind_SurfaceMovement[nMarker_Moving] = FLUID_STRUCTURE;
-    }
-  }
-  
   /*--- If we're solving a purely steady problem with no prescribed grid
    movement (both rotating frame and moving walls can be steady), make sure that
    there is no grid motion ---*/
@@ -6800,6 +6783,33 @@ bool CConfig::GetViscous_Wall(unsigned short iMarker){
   return false;
 }
 
+void CConfig::SetSurface_Movement(unsigned short iMarker, unsigned short kind_movement){
+  
+  unsigned short* new_surface_movement = new unsigned short[nMarker_Moving + 1];
+  string* new_marker_moving = new string[nMarker_Moving+1];
+  
+  for (unsigned short iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++){
+    new_surface_movement[iMarker_Moving] = Kind_SurfaceMovement[iMarker_Moving];
+    new_marker_moving[iMarker_Moving] = Marker_Moving[iMarker_Moving];
+  }
+  
+  if (nKind_SurfaceMovement > 0){
+    delete [] Marker_Moving;
+    delete [] Kind_SurfaceMovement;
+  }
+  
+  Kind_SurfaceMovement = new_surface_movement;
+  Marker_Moving        = new_marker_moving;
+  
+  Kind_SurfaceMovement[nMarker_Moving] = kind_movement;
+  cout << "SETTING BOUNDMARKER " << Marker_All_TagBound[iMarker] <<  endl;
+  Marker_Moving[nMarker_Moving] = Marker_All_TagBound[iMarker];
+  
+  nMarker_Moving++;
+  nKind_SurfaceMovement++;
+  
+}
+
 CConfig::~CConfig(void) {
 	
   unsigned long iDV, iMarker, iPeriodic, iFFD;
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 5bc775e609e7..00f445f1db74 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -212,6 +212,9 @@ class CDriver {
    */
   void Interface_Preprocessing();
 
+  
+  void SetTransferTypes();
+  
   /*!
    * \brief Definition and allocation of all solver classes.
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 05abbd64edad..b4591db3c74f 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -850,7 +850,12 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
       config_container[iZone]->SetMultizone(driver_config, config_container);
     }
   }
+  
+  /*--- Definition of the geometry class to store the primal grid in the
+ partitioning process. ---*/
 
+  CGeometry **geometry_aux = new CGeometry*[nZone];
+  
   for (iZone = 0; iZone < nZone; iZone++) {
 
     /*--- Determine whether or not the FEM solver is used, which decides the
@@ -869,82 +874,93 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
 
     geometry_container[iZone] = new CGeometry** [nInst[iZone]];
 
-    for (iInst = 0; iInst < nInst[iZone]; iInst++){
 
-      config_container[iZone]->SetiInst(iInst);
+    /*--- All ranks process the grid and call ParMETIS for partitioning ---*/
 
-      /*--- Definition of the geometry class to store the primal grid in the
-     partitioning process. ---*/
+    geometry_aux[iZone] = new CPhysicalGeometry(config_container[iZone], iZone, nZone);
+    
+    nDim = geometry_aux[iZone]->GetnDim();
+    
+    /*--- For the FEM solver with time-accurate local time-stepping, use
+     a dummy solver class to retrieve the initial flow state. ---*/
 
-      CGeometry *geometry_aux = NULL;
+    CSolver *solver_aux = NULL;
+    if (fem_solver) solver_aux = new CFEM_DG_EulerSolver(config_container[iZone], nDim, MESH_0);      
 
-      /*--- All ranks process the grid and call ParMETIS for partitioning ---*/
+    /*--- Color the initial grid and set the send-receive domains (ParMETIS) ---*/
 
-      geometry_aux = new CPhysicalGeometry(config_container[iZone], iZone, nZone);
+    if ( fem_solver ) geometry_aux[iZone]->SetColorFEMGrid_Parallel(config_container[iZone]);
+    else              geometry_aux[iZone]->SetColorGrid_Parallel(config_container[iZone]);
+
+    for (iInst = 0; iInst < nInst[iZone]; iInst++){
+      
+      config_container[iZone]->SetiInst(iInst);
       
-      nDim = geometry_aux->GetnDim();
       
-      /*--- For the FEM solver with time-accurate local time-stepping, use
-       a dummy solver class to retrieve the initial flow state. ---*/
-
-      CSolver *solver_aux = NULL;
-      if (fem_solver) solver_aux = new CFEM_DG_EulerSolver(config_container[iZone], nDim, MESH_0);      
-
-      /*--- Color the initial grid and set the send-receive domains (ParMETIS) ---*/
-
-      if ( fem_solver ) geometry_aux->SetColorFEMGrid_Parallel(config_container[iZone]);
-      else              geometry_aux->SetColorGrid_Parallel(config_container[iZone]);
-
       /*--- Allocate the memory of the current domain, and divide the grid
      between the ranks. ---*/
-
+      
       geometry_container[iZone][iInst] = NULL;
       geometry_container[iZone][iInst] = new CGeometry *[config_container[iZone]->GetnMGLevels()+1];
+      
+    }
+    
+    /*--- Deallocate the memory of geometry_aux and solver_aux ---*/
+    
+    if (solver_aux != NULL) delete solver_aux;
+  }
 
-
+  SetTransferTypes();   
+  
+  for (iZone = 0; iZone < nZone; iZone++) {
+        
+    for (iInst = 0; iInst < nInst[iZone]; iInst++){
+      
+      config_container[iZone]->SetiInst(iInst);
+      
       if( fem_solver ) {
         switch( config_container[iZone]->GetKind_FEM_Flow() ) {
-          case DG: {
-            geometry_container[iZone][iInst][MESH_0] = new CMeshFEM_DG(geometry_aux, config_container[iZone]);
-            break;
-          }
-
-          default: {
-            SU2_MPI::Error("Unknown FEM flow solver.", CURRENT_FUNCTION);
-            break;
-          }
+        case DG: {
+          geometry_container[iZone][iInst][MESH_0] = new CMeshFEM_DG(geometry_aux[iZone], config_container[iZone]);
+          break;
+        }
+          
+        default: {
+          SU2_MPI::Error("Unknown FEM flow solver.", CURRENT_FUNCTION);
+          break;
+        }
         }
       }
       else {
-
+        
         /*--- Until we finish the new periodic BC implementation, use the old
          partitioning routines for cases with periodic BCs. The old routines 
          will be entirely removed eventually in favor of the new methods. ---*/
-
+        
         if (val_periodic) {
-          geometry_container[iZone][iInst][MESH_0] = new CPhysicalGeometry(geometry_aux, config_container[iZone]);
+          geometry_container[iZone][iInst][MESH_0] = new CPhysicalGeometry(geometry_aux[iZone], config_container[iZone]);
         } else {
-          geometry_container[iZone][iInst][MESH_0] = new CPhysicalGeometry(geometry_aux, config_container[iZone], val_periodic);
+          geometry_container[iZone][iInst][MESH_0] = new CPhysicalGeometry(geometry_aux[iZone], config_container[iZone], val_periodic);
         }
       }
+      
 
-      /*--- Deallocate the memory of geometry_aux and solver_aux ---*/
-
-      delete geometry_aux;
-      if (solver_aux != NULL) delete solver_aux;
-
+      
       /*--- Add the Send/Receive boundaries ---*/
       geometry_container[iZone][iInst][MESH_0]->SetSendReceive(config_container[iZone]);
-
+      
       /*--- Add the Send/Receive boundaries ---*/
       geometry_container[iZone][iInst][MESH_0]->SetBoundaries(config_container[iZone]);
-
+      
     }
-
+    
+    delete geometry_aux[iZone];
+    
   }
-
+ 
 }
 
+
 void CDriver::Geometrical_Preprocessing() {
 
   unsigned short iMGlevel;
@@ -3198,6 +3214,240 @@ void CDriver::Numerics_Postprocessing(CNumerics *****numerics_container,
 
 }
 
+void CDriver::SetTransferTypes(){
+  
+  unsigned short donorZone, targetZone;
+  unsigned short nVar, nVarTransfer;
+
+  unsigned short nMarkerTarget, iMarkerTarget, nMarkerDonor, iMarkerDonor;
+
+  /*--- Initialize some useful booleans ---*/
+  bool fluid_donor, structural_donor, heat_donor;
+  bool fluid_target, structural_target, heat_target;
+
+  bool discrete_adjoint = config_container[ZONE_0]->GetDiscrete_Adjoint();
+
+  int markDonor, markTarget, Donor_check, Target_check, iMarkerInt, nMarkerInt;
+
+#ifdef HAVE_MPI
+  int *Buffer_Recv_mark = NULL, iRank, nProcessor = size;
+
+  if (rank == MASTER_NODE)
+    Buffer_Recv_mark = new int[nProcessor];
+#endif
+  
+  /*--- Coupling between zones ---*/
+  // There's a limit here, the interface boundary must connect only 2 zones
+  
+  /*--- Loops over all target and donor zones to find which ones are connected through an interface boundary (fsi or sliding mesh) ---*/
+  for (targetZone = 0; targetZone < nZone; targetZone++) {
+    for (donorZone = 0; donorZone < nZone; donorZone++) {
+      
+      
+      transfer_types[donorZone][targetZone] = NO_TRANSFER;
+      
+      if ( donorZone == targetZone ) {
+        transfer_types[donorZone][targetZone] = ZONES_ARE_EQUAL;
+        // We're processing the same zone, so skip the following
+        continue;
+      }
+      
+      nMarkerInt = (int) ( config_container[donorZone]->GetMarker_n_ZoneInterface() / 2 );
+      
+      /*--- Loops on Interface markers to find if the 2 zones are sharing the boundary and to determine donor and target marker tag ---*/
+      for (iMarkerInt = 1; iMarkerInt <= nMarkerInt; iMarkerInt++) {
+        
+        markDonor  = -1;
+        markTarget = -1;
+        
+        /*--- On the donor side ---*/
+        nMarkerDonor = config_container[donorZone]->GetnMarker_All();
+        
+        for (iMarkerDonor = 0; iMarkerDonor < nMarkerDonor; iMarkerDonor++) {
+          /*--- If the tag GetMarker_All_ZoneInterface(iMarker) equals the index we are looping at ---*/
+          if ( config_container[donorZone]->GetMarker_All_ZoneInterface(iMarkerDonor) == iMarkerInt ) {
+            /*--- We have identified the identifier for the interface marker ---*/
+            markDonor = iMarkerDonor;
+            
+            break;
+          }
+        }
+        
+        /*--- On the target side ---*/
+        nMarkerTarget = config_container[targetZone]->GetnMarker_All();
+        
+        for (iMarkerTarget = 0; iMarkerTarget < nMarkerTarget; iMarkerTarget++) {
+          
+          /*--- If the tag GetMarker_All_ZoneInterface(iMarker) equals the index we are looping at ---*/
+          if ( config_container[targetZone]->GetMarker_All_ZoneInterface(iMarkerTarget) == iMarkerInt ) {
+            /*--- We have identified the identifier for the interface marker ---*/
+            markTarget = iMarkerTarget;
+            
+            break;
+          } 
+        }
+        
+        cout << markTarget << " " << markDonor << endl;
+        
+#ifdef HAVE_MPI
+        
+        Donor_check  = -1;
+        Target_check = -1;
+        
+        /*--- We gather a vector in MASTER_NODE that determines if the boundary is not on the processor because of the partition or because the zone does not include it ---*/
+        
+        SU2_MPI::Gather(&markDonor , 1, MPI_INT, Buffer_Recv_mark, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
+        
+        if (rank == MASTER_NODE) {
+          for (iRank = 0; iRank < nProcessor; iRank++) {
+            if( Buffer_Recv_mark[iRank] != -1 ) {
+              Donor_check = Buffer_Recv_mark[iRank];
+              
+              break;
+            }
+          }
+        }
+        
+        SU2_MPI::Bcast(&Donor_check , 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
+        
+        SU2_MPI::Gather(&markTarget, 1, MPI_INT, Buffer_Recv_mark, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
+        
+        if (rank == MASTER_NODE){
+          for (iRank = 0; iRank < nProcessor; iRank++){
+            if( Buffer_Recv_mark[iRank] != -1 ){
+              Target_check = Buffer_Recv_mark[iRank];
+              
+              break;
+            }
+          }
+        }
+        
+        SU2_MPI::Bcast(&Target_check, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
+        
+#else
+        Donor_check  = markDonor;
+        Target_check = markTarget;  
+#endif
+        
+        /* --- Check ifzones are actually sharing the interface boundary, if not skip ---*/        
+        if(Target_check == -1 || Donor_check == -1) {
+          transfer_types[donorZone][targetZone] = NO_COMMON_INTERFACE;
+          continue;
+        }
+        
+        /*--- Set some boolean to properly allocate data structure later ---*/
+        fluid_target      = false; 
+        structural_target = false;
+        
+        fluid_donor       = false; 
+        structural_donor  = false;
+        
+        heat_donor        = false;
+        heat_target       = false;
+        
+        switch ( config_container[targetZone]->GetKind_Solver() ) {
+        
+        case EULER : case NAVIER_STOKES: case RANS: 
+        case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+          fluid_target  = true;   
+          break;
+          
+        case FEM_ELASTICITY: case DISC_ADJ_FEM:
+          structural_target = true;   
+          break;
+          
+        case HEAT_EQUATION_FVM: case DISC_ADJ_HEAT:
+          heat_target = true;
+          break;
+        }
+        
+        switch ( config_container[donorZone]->GetKind_Solver() ) {
+        
+        case EULER : case NAVIER_STOKES: case RANS:
+        case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+          fluid_donor  = true;
+          break;
+          
+        case FEM_ELASTICITY: case DISC_ADJ_FEM:
+          structural_donor = true;
+          break;
+          
+        case HEAT_EQUATION_FVM : case DISC_ADJ_HEAT:
+          heat_donor = true;
+          break;
+        }
+        
+        /*--- Initialize the appropriate transfer strategy ---*/
+        if (rank == MASTER_NODE) cout << "Transferring ";
+        
+        if (fluid_donor && structural_target && (!discrete_adjoint)) {
+          transfer_types[donorZone][targetZone] = FLOW_TRACTION;
+          if (markDonor != -1){
+            config_container[donorZone]->SetSurface_Movement(markDonor, FLUID_STRUCTURE);
+          }
+        }
+        else if (structural_donor && fluid_target && (!discrete_adjoint)) {
+          transfer_types[donorZone][targetZone] = STRUCTURAL_DISPLACEMENTS;
+        }
+        else if (fluid_donor && structural_target && discrete_adjoint) {
+          transfer_types[donorZone][targetZone] = FLOW_TRACTION;
+          if (markDonor != -1){
+            config_container[donorZone]->SetSurface_Movement(markDonor, FLUID_STRUCTURE);
+          }
+        }
+        else if (structural_donor && fluid_target && discrete_adjoint){
+          transfer_types[donorZone][targetZone] = STRUCTURAL_DISPLACEMENTS_DISC_ADJ;
+        }
+        else if (fluid_donor && fluid_target) {
+          transfer_types[donorZone][targetZone] = SLIDING_INTERFACE;
+          if (markDonor != -1 ){
+            config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);
+          }
+        }
+        else if (fluid_donor && heat_target) {
+          nVarTransfer = 0;
+          nVar = 4;
+          if(config_container[donorZone]->GetEnergy_Equation())
+            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_FS;
+          else if (config_container[donorZone]->GetWeakly_Coupled_Heat())
+            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_FS;
+          else { }
+          if (markDonor != -1 ){
+            config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
+          }
+        }
+        else if (heat_donor && fluid_target) {
+          if(config_container[targetZone]->GetEnergy_Equation())
+            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_SF;
+          else if (config_container[targetZone]->GetWeakly_Coupled_Heat())
+            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_SF;
+          else { }
+          if (markDonor != -1 ){
+            config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
+          }
+        }
+        else if (heat_donor && heat_target) {
+          SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
+        }
+        else {
+          transfer_types[donorZone][targetZone] = CONSERVATIVE_VARIABLES;
+        }
+        
+        break;
+        
+      }
+      
+      if (config_container[donorZone]->GetBoolMixingPlaneInterface()){
+        transfer_types[donorZone][targetZone] = MIXING_PLANE;
+      }
+    }
+  }
+#ifdef HAVE_MPI
+      if (rank == MASTER_NODE) 
+        delete [] Buffer_Recv_mark;
+#endif
+}
+
 void CDriver::Iteration_Preprocessing() {
 
   for (iInst = 0; iInst < nInst[iZone]; iInst++)  {
@@ -3538,10 +3788,11 @@ void CDriver::Interface_Preprocessing() {
         nVar = solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->GetnPrimVar();
         transfer_container[donorZone][targetZone] = new CTransfer_SlidingInterface(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "sliding interface. " << endl;
-        config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);
-        solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
-        if (config_container[donorZone]->GetKind_Turb_Model() != NONE){
-          solver_container[donorZone][INST_0][MESH_0][TURB_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);               
+        if (markDonor != -1 ){
+          solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
+          if (config_container[donorZone]->GetKind_Turb_Model() != NONE){
+            solver_container[donorZone][INST_0][MESH_0][TURB_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);               
+          }
         }
       }
       else if (fluid_donor && heat_target) {
@@ -3554,8 +3805,6 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
-        
-        config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
       }
       else if (heat_donor && fluid_target) {
         nVarTransfer = 0;
@@ -3567,7 +3816,9 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
-        config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);        
+        if (markDonor != -1 ){
+          config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
+        }
       }
       else if (heat_donor && heat_target) {
         SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
@@ -3600,14 +3851,6 @@ void CDriver::Interface_Preprocessing() {
   delete [] Buffer_Recv_mark;
 #endif
   
-  /*--- Update boundary condition information since some
-   *  kind of BCs have changed during the setup of the interfaces --- */
-  
-  for (iZone = 0; iZone < nZone; iZone ++){
-    if (config_container[iZone]->GetMarker_n_ZoneInterface() != 0)  
-      for (unsigned short iMGlevel = 0; iMGlevel <= config_container[iZone]->GetnMGLevels(); iMGlevel++)
-        geometry_container[iZone][INST_0][iMGlevel]->UpdateBoundaries(config_container[iZone]);
-  }
 }
 
 void CDriver::InitStaticMeshMovement(){

From dc87f481ccd702436990677c649769ec674d66cd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Apr 2019 15:49:09 +0200
Subject: [PATCH 243/539] Fixed computation of BGS residual

---
 SU2_CFD/include/output/output.hpp           | 12 ++++
 SU2_CFD/include/output/output_flow_comp.hpp |  4 +-
 SU2_CFD/src/driver_direct_multizone.cpp     | 69 ++++-----------------
 SU2_CFD/src/output/output_structure.cpp     | 12 ++++
 SU2_CFD/src/solver_direct_elasticity.cpp    |  4 +-
 SU2_CFD/src/solver_direct_heat.cpp          |  4 +-
 SU2_CFD/src/solver_direct_mean.cpp          |  8 +--
 SU2_CFD/src/solver_direct_mean_inc.cpp      |  4 +-
 SU2_CFD/src/variable_adjoint_discrete.cpp   |  3 +
 SU2_CFD/src/variable_adjoint_elasticity.cpp |  5 +-
 SU2_CFD/src/variable_adjoint_mean.cpp       |  4 ++
 SU2_CFD/src/variable_adjoint_turbulent.cpp  |  4 +-
 SU2_CFD/src/variable_direct_elasticity.cpp  |  3 +-
 SU2_CFD/src/variable_direct_heat.cpp        |  5 +-
 SU2_CFD/src/variable_direct_mean.cpp        |  8 ++-
 SU2_CFD/src/variable_direct_mean_inc.cpp    |  5 +-
 SU2_CFD/src/variable_direct_transition.cpp  |  2 +
 SU2_CFD/src/variable_direct_turbulent.cpp   |  4 +-
 18 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index d2d9ff55659a..24866828abd1 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -331,6 +331,18 @@ class COutput {
   void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config,unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter);  
   
   
+  /*!
+   * \brief SetHistory_Output
+   * \param geometry
+   * \param solver_container
+   * \param config
+   * \param TimeIter
+   * \param OuterIter
+   * \param InnerIter
+   */
+  void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config);  
+  
+  
   void SetMultizoneHistory_Output(COutput** output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter);
   
   /*! 
diff --git a/SU2_CFD/include/output/output_flow_comp.hpp b/SU2_CFD/include/output/output_flow_comp.hpp
index edfcd108c74c..02e8f868e4e4 100644
--- a/SU2_CFD/include/output/output_flow_comp.hpp
+++ b/SU2_CFD/include/output/output_flow_comp.hpp
@@ -51,9 +51,7 @@ class CFlowCompOutput : public CFlowOutput {
   unsigned short nVar;
 
   unsigned short turb_model;
-  
-  bool grid_movement;
-  
+    
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
 
 public:
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 9cd905007e3e..0ec86d608893 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -398,68 +398,25 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   MPI_Comm_size(MPI_COMM_WORLD, &size);
 #endif
-
-  unsigned short iRes, iVar;
-  unsigned short nVarSol;
-
-  /*--- Compute the residual for the all the zones ---*/
+  
+  /*--- Update the residual for the all the zones ---*/
+  
   for (iZone = 0; iZone < nZone; iZone++){
-    iVar = 0; // Initialize the variable index for each zone
-
+    
     /*--- Account for all the solvers ---*/
+    
     for (unsigned short iSol = 0; iSol < MAX_SOLS; iSol++){
-      /*-- If the solver position iSol is enabled --*/
-      if (solver_container[iZone][INST_0][MESH_0][iSol] != NULL){
-        nVarSol = solver_container[iZone][INST_0][MESH_0][iSol]->GetnVar();
-
-        /*--- Compute the block residual on each solver ---*/
-        solver_container[iZone][INST_0][MESH_0][iSol]->ComputeResidual_Multizone(geometry_container[iZone][INST_0][MESH_0],
-            config_container[iZone]);
-
-        /*--- Loop over all the variables in the solver ---*/
-        for (iRes = 0; iRes < nVarSol; iRes++){
-          /*--- Store the log10 of the residual value ---*/
-          residual[iZone][iVar] = log10(solver_container[iZone][INST_0][MESH_0][iSol]->GetRes_BGS(iRes));
-          /*--- If it is the first iteration, the init_res is the current residual ---*/
-          if (OuterIter == 0) init_res[iZone][iVar] = residual[iZone][iVar];
-          /*--- residual_rel checks the difference in order of magnitude between the current and the initial residual ---*/
-          residual_rel[iZone][iVar] = fabs(residual[iZone][iRes] - init_res[iZone][iRes]);
-          /*--- Move the position of the container ---*/
-          iVar++;
-        }
+      if (solver_container[iZone][INST_0][MESH_0][iSol] != NULL){    
+        solver_container[iZone][INST_0][MESH_0][iSol]->ComputeResidual_Multizone(geometry_container[iZone][INST_0][MESH_0], config_container[iZone]);
       }
     }
+    
+    /*--- make sure that everything is loaded into the output container ---*/
+    
+    output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0][MESH_0],solver_container[iZone][INST_0][MESH_0], config_container[iZone]);
+    
   }
-
-  /*--- This still has to be generalised ---*/
-//  if (fsi){
-
-//    /*--- This should be possible to change dinamically in the config ---*/
-//    if (rank == MASTER_NODE){
-
-//      cout << endl << "-------------------------------------------------------------------------" << endl;
-//      cout << endl;
-//      cout << "Convergence summary for BGS iteration ";
-//      cout << OuterIter << endl;
-//      cout << endl;
-//      /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
-//      cout << "Iter[ID]" << "    BGSRes[Rho]" << "   BGSRes[RhoE]" << "     BGSRes[Ux]" << "     BGSRes[Uy]" << endl;
-//      cout.precision(6); cout.setf(ios::fixed, ios::floatfield);
-//      cout.width(8); cout << OuterIter*1000;
-//      cout.width(15); cout << residual[ZONE_0][0];
-//      cout.width(15); cout << residual[ZONE_0][3];
-//      cout.width(15); cout << residual[ZONE_1][0];
-//      cout.width(15); cout << residual[ZONE_1][1];
-//      cout << endl;
-//    }
-//    for (iZone = 0; iZone < nZone; iZone++){
-//      if (config_container[iZone]->GetKind_Solver() == FEM_ELASTICITY){
-//        integration_container[iZone][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[iZone][INST_0][MESH_0], config_container[iZone], solver_container[iZone][INST_0][MESH_0][FEA_SOL], OuterIter);
-//        Convergence = integration_container[iZone][INST_0][FEA_SOL]->GetConvergence_FSI();
-//      }
-//    }
-//  }
-
+  
   /*--- Update the residual for the all the zones ---*/
   for (iZone = 0; iZone < nZone; iZone++){
     /*--- Accounting for all the solvers ---*/
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 10b5d7d61f3c..66c1aaada1aa 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -259,6 +259,18 @@ void COutput::SetHistory_Output(CGeometry *geometry,
     
   }
 
+}
+
+void COutput::SetHistory_Output(CGeometry *geometry,
+                                CSolver **solver_container,
+                                CConfig *config) {
+  
+  /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
+  
+  LoadHistoryData(config, geometry, solver_container);
+  
+  Postprocess_HistoryData(config);
+
 }
 void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter){
   
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 0c44aa826c7f..773f5e8553eb 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -445,8 +445,8 @@ CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
     RelaxCoeff        = 1.0;
     ForceCoeff        = 1.0;
 
-    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 0.0;
-    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 0.0;
+    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 1.0;
+    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 1.0;
 
     /*--- Define some structures for locating max residuals ---*/
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 3e2191aa52f1..7c7293d7e8c3 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -221,8 +221,8 @@ CHeatSolverFVM::CHeatSolverFVM(CGeometry *geometry, CConfig *config, unsigned sh
 
   if (multizone){
     /*--- Initialize the BGS residuals. ---*/
-    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 0.0;
-    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 0.0;
+    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 1.0;
+    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 1.0;
 
     /*--- Define some structures for locating max residuals ---*/
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 0334f5eac9e2..b58c2873b57d 100755
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -812,8 +812,8 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
   /*--- Initialize the BGS residuals in FSI problems. ---*/
   if (fsi || multizone){
-    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 0.0;
-    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 0.0;
+    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 1.0;
+    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 1.0;
 
     /*--- Define some structures for locating max residuals ---*/
 
@@ -15450,8 +15450,8 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
   /*--- Initialize the BGS residuals in FSI problems. ---*/
   if (config->GetMultizone_Residual()){
-    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_RMS[iVar]  = 0.0;
-    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 0.0;
+    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_BGS[iVar]  = 1.0;
+    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 1.0;
 
     /*--- Define some structures for locating max residuals ---*/
 
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index afca98258ceb..8f12328e0e7d 100755
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -541,8 +541,8 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
   /*--- Initialize the BGS residuals in FSI problems. ---*/
   if (fsi || multizone){
-    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_RMS[iVar]  = 0.0;
-    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 0.0;
+    Residual_BGS      = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_RMS[iVar]  = 1.0;
+    Residual_Max_BGS  = new su2double[nVar];         for (iVar = 0; iVar < nVar; iVar++) Residual_Max_BGS[iVar]  = 1.0;
 
     /*--- Define some structures for locating max residuals ---*/
 
diff --git a/SU2_CFD/src/variable_adjoint_discrete.cpp b/SU2_CFD/src/variable_adjoint_discrete.cpp
index 2f98230cf8c1..baf039ae6423 100644
--- a/SU2_CFD/src/variable_adjoint_discrete.cpp
+++ b/SU2_CFD/src/variable_adjoint_discrete.cpp
@@ -123,6 +123,9 @@ CDiscAdjVariable::CDiscAdjVariable(su2double* val_solution, unsigned short val_n
       Solution_BGS[iVar]          = 0.0;
     }
   }
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 
 }
 
diff --git a/SU2_CFD/src/variable_adjoint_elasticity.cpp b/SU2_CFD/src/variable_adjoint_elasticity.cpp
index 8f5ab94ac84b..d34d1f043b64 100644
--- a/SU2_CFD/src/variable_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/variable_adjoint_elasticity.cpp
@@ -122,7 +122,10 @@ CDiscAdjFEAVariable::CDiscAdjFEAVariable(su2double* val_solution, unsigned short
       Solution_BGS_k[iDim]        = 0.0;
     }
   }
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
+  
 }
 
 CDiscAdjFEAVariable::CDiscAdjFEAVariable(su2double* val_solution, su2double* val_solution_accel, su2double* val_solution_vel, unsigned short val_ndim,
diff --git a/SU2_CFD/src/variable_adjoint_mean.cpp b/SU2_CFD/src/variable_adjoint_mean.cpp
index 43f33b81d95a..561607ed0fc5 100644
--- a/SU2_CFD/src/variable_adjoint_mean.cpp
+++ b/SU2_CFD/src/variable_adjoint_mean.cpp
@@ -135,6 +135,8 @@ CAdjEulerVariable::CAdjEulerVariable(su2double val_psirho, su2double *val_phi, s
       HB_Source[iVar] = 0.0;
   }
   
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CAdjEulerVariable::CAdjEulerVariable(su2double *val_solution, unsigned short val_nDim,
@@ -219,6 +221,8 @@ CAdjEulerVariable::CAdjEulerVariable(su2double *val_solution, unsigned short val
       HB_Source[iVar] = 0.0;
   }
   
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CAdjEulerVariable::~CAdjEulerVariable(void) {
diff --git a/SU2_CFD/src/variable_adjoint_turbulent.cpp b/SU2_CFD/src/variable_adjoint_turbulent.cpp
index cad0cfde38e2..c0b390012ef9 100644
--- a/SU2_CFD/src/variable_adjoint_turbulent.cpp
+++ b/SU2_CFD/src/variable_adjoint_turbulent.cpp
@@ -74,7 +74,9 @@ CAdjTurbVariable::CAdjTurbVariable(su2double val_psinu_inf, unsigned short val_n
   Limiter = new su2double [nVar];
   for (iVar = 0; iVar < nVar; iVar++)
     Limiter[iVar] = 0.0;
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CAdjTurbVariable::~CAdjTurbVariable(void) {
diff --git a/SU2_CFD/src/variable_direct_elasticity.cpp b/SU2_CFD/src/variable_direct_elasticity.cpp
index 925df302930d..499e070102ce 100644
--- a/SU2_CFD/src/variable_direct_elasticity.cpp
+++ b/SU2_CFD/src/variable_direct_elasticity.cpp
@@ -140,7 +140,8 @@ CFEAVariable::CFEAVariable(su2double *val_fea, unsigned short val_nDim, unsigned
   Prestretch = NULL;
   if (prestretch_fem)  Prestretch = new su2double [nVar];
   
-  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CFEAVariable::~CFEAVariable(void) {
diff --git a/SU2_CFD/src/variable_direct_heat.cpp b/SU2_CFD/src/variable_direct_heat.cpp
index 1f80b0dd823a..562803354391 100644
--- a/SU2_CFD/src/variable_direct_heat.cpp
+++ b/SU2_CFD/src/variable_direct_heat.cpp
@@ -86,7 +86,10 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
   if (config->GetKind_ConvNumScheme_Heat() == SPACE_CENTERED) {
     Undivided_Laplacian = new su2double [nVar];
   }
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
+  
 }
 
 CHeatFVMVariable::~CHeatFVMVariable(void) {  }
diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp
index ee82a850c0a0..1b4c1caea68f 100644
--- a/SU2_CFD/src/variable_direct_mean.cpp
+++ b/SU2_CFD/src/variable_direct_mean.cpp
@@ -227,7 +227,9 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
     for (iDim = 0; iDim < nDim; iDim++)
       Gradient_Secondary[iVar][iDim] = 0.0;
   }
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim, unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
@@ -383,7 +385,9 @@ CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim,
     for (iDim = 0; iDim < nDim; iDim++)
       Gradient_Secondary[iVar][iDim] = 0.0;
   }
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CEulerVariable::~CEulerVariable(void) {
diff --git a/SU2_CFD/src/variable_direct_mean_inc.cpp b/SU2_CFD/src/variable_direct_mean_inc.cpp
index f9975a1cda1d..b0784b3b126f 100644
--- a/SU2_CFD/src/variable_direct_mean_inc.cpp
+++ b/SU2_CFD/src/variable_direct_mean_inc.cpp
@@ -280,7 +280,10 @@ CIncEulerVariable::CIncEulerVariable(su2double *val_solution, unsigned short val
 
   if (axisymmetric && viscous)
     Grad_AuxVar = new su2double[nDim];
-
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
+  
 }
 
 CIncEulerVariable::~CIncEulerVariable(void) {
diff --git a/SU2_CFD/src/variable_direct_transition.cpp b/SU2_CFD/src/variable_direct_transition.cpp
index 702fd48f299e..52ef09b221bb 100644
--- a/SU2_CFD/src/variable_direct_transition.cpp
+++ b/SU2_CFD/src/variable_direct_transition.cpp
@@ -46,6 +46,8 @@ CTransLMVariable::CTransLMVariable(su2double val_nu_tilde, su2double val_intermi
   Solution[0] = val_intermittency; Solution_Old[0] = val_intermittency;
   Solution[1] = val_REth;          Solution_Old[1] = val_REth;
   
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CTransLMVariable::~CTransLMVariable(void) { }
diff --git a/SU2_CFD/src/variable_direct_turbulent.cpp b/SU2_CFD/src/variable_direct_turbulent.cpp
index 689e7ac57924..6b23acfd7a32 100644
--- a/SU2_CFD/src/variable_direct_turbulent.cpp
+++ b/SU2_CFD/src/variable_direct_turbulent.cpp
@@ -190,7 +190,9 @@ CTurbSSTVariable::CTurbSSTVariable(su2double val_kine, su2double val_omega, su2d
     Solution_time_n[0]  = val_kine; Solution_time_n[1]  = val_omega;
     Solution_time_n1[0]  = val_kine; Solution_time_n1[1]  = val_omega;
   }
-    
+  
+  if (config->GetMultizone_Problem())
+    Set_BGSSolution_k();
 }
 
 CTurbSSTVariable::~CTurbSSTVariable(void) {

From eeeb42895c4ea9ba5c111b4d7b100a71de80b6b4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Apr 2019 17:06:40 +0200
Subject: [PATCH 244/539] Again some fixes

---
 Common/src/geometry_structure.cpp             |  4 +--
 SU2_CFD/src/driver_structure.cpp              | 28 +++++++++----------
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  6 ++--
 .../fea_fsi/StatBeam_3d/configBeam_3d.cfg     |  4 +--
 .../fea_fsi/WallChannel_2d/configFEA.cfg      |  7 ++---
 5 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 069a82bfdf14..4928a62956fc 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -8917,9 +8917,7 @@ void CPhysicalGeometry::SetBoundaries(CConfig *config) {
             config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY)
           node[Point_Surface]->SetPhysicalBoundary(true);
         
-        if (config->GetMarker_All_KindBC(iMarker) == EULER_WALL &&
-            config->GetMarker_All_KindBC(iMarker) == HEAT_FLUX &&
-            config->GetMarker_All_KindBC(iMarker) == ISOTHERMAL)
+        if (config->GetSolid_Wall(iMarker))
           node[Point_Surface]->SetSolidBoundary(true);
       }
     }
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index b4591db3c74f..7b9ebb646e71 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3286,9 +3286,7 @@ void CDriver::SetTransferTypes(){
             break;
           } 
         }
-        
-        cout << markTarget << " " << markDonor << endl;
-        
+                
 #ifdef HAVE_MPI
         
         Donor_check  = -1;
@@ -3377,9 +3375,6 @@ void CDriver::SetTransferTypes(){
           break;
         }
         
-        /*--- Initialize the appropriate transfer strategy ---*/
-        if (rank == MASTER_NODE) cout << "Transferring ";
-        
         if (fluid_donor && structural_target && (!discrete_adjoint)) {
           transfer_types[donorZone][targetZone] = FLOW_TRACTION;
           if (markDonor != -1){
@@ -3400,9 +3395,6 @@ void CDriver::SetTransferTypes(){
         }
         else if (fluid_donor && fluid_target) {
           transfer_types[donorZone][targetZone] = SLIDING_INTERFACE;
-          if (markDonor != -1 ){
-            config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);
-          }
         }
         else if (fluid_donor && heat_target) {
           nVarTransfer = 0;
@@ -3412,9 +3404,6 @@ void CDriver::SetTransferTypes(){
           else if (config_container[donorZone]->GetWeakly_Coupled_Heat())
             transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_FS;
           else { }
-          if (markDonor != -1 ){
-            config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
-          }
         }
         else if (heat_donor && fluid_target) {
           if(config_container[targetZone]->GetEnergy_Equation())
@@ -3422,9 +3411,6 @@ void CDriver::SetTransferTypes(){
           else if (config_container[targetZone]->GetWeakly_Coupled_Heat())
             transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_SF;
           else { }
-          if (markDonor != -1 ){
-            config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
-          }
         }
         else if (heat_donor && heat_target) {
           SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
@@ -3789,6 +3775,7 @@ void CDriver::Interface_Preprocessing() {
         transfer_container[donorZone][targetZone] = new CTransfer_SlidingInterface(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "sliding interface. " << endl;
         if (markDonor != -1 ){
+          config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);          
           solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
           if (config_container[donorZone]->GetKind_Turb_Model() != NONE){
             solver_container[donorZone][INST_0][MESH_0][TURB_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);               
@@ -3805,6 +3792,9 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
+        if (markDonor != -1 ){
+          config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
+        }
       }
       else if (heat_donor && fluid_target) {
         nVarTransfer = 0;
@@ -3851,6 +3841,14 @@ void CDriver::Interface_Preprocessing() {
   delete [] Buffer_Recv_mark;
 #endif
   
+  /*--- Update boundary information since some kind BCs have changed ---*/
+  
+  for (iZone = 0; iZone < nZone; iZone++){
+    for (unsigned short iMesh = 0; iMesh <= config_container[iZone]->GetnMGLevels(); iMesh++){
+      geometry_container[iZone][INST_0][iMesh]->UpdateBoundaries(config_container[iZone]);
+    }
+  }
+  
 }
 
 void CDriver::InitStaticMeshMovement(){
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index 8ff5f9345517..ceff3ec353c9 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -45,9 +45,9 @@ LINEAR_SOLVER_ITER= 1000
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 WRT_SRF_SOL = NO
-VOLUME_STRUCTURE_FILENAME= beam
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
-SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
+VOLUME_FILENAME= beam
+RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam.dat
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 WRT_CON_FREQ= 1
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index 254f09a92016..8940611a0d2f 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -28,8 +28,8 @@ MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 WRT_SRF_SOL = NO
 CONV_FILENAME= history_beam
-VOLUME_STRUCTURE_FILENAME= beam
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
+VOLUME_FILENAME= beam
+RESTART_FILENAME= restart_beam.dat
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 WRT_CON_FREQ= 1
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index ce742b1ba0b0..1b7fb93dfe52 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -52,16 +52,15 @@ MULTIZONE_MESH= NO
 MESH_FILENAME= meshFEA.su2
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
 
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 
-VOLUME_STRUCTURE_FILENAME= results_wall
-RESTART_STRUCTURE_FILENAME= solution_wall.dat
-SOLUTION_STRUCTURE_FILENAME= solution_wall.dat
+VOLUME_FILENAME= results_wall
+RESTART_FILENAME= solution_wall.dat
+SOLUTION_FILENAME= solution_wall.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO

From f315caeb8850c2c39d7c96f5a57000e20eb0aab4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Apr 2019 17:31:37 +0200
Subject: [PATCH 245/539] Adapted test cases

---
 TestCases/serial_regression.py                | 20 +++++++++----------
 .../sliding_interface/bars_SST_2D/bars.cfg    |  1 -
 .../channel_2D/channel_2D_NN.cfg              |  1 -
 .../channel_2D/channel_2D_WA.cfg              |  1 -
 .../channel_3D/channel_3D_NN.cfg              |  1 -
 .../channel_3D/channel_3D_WA.cfg              |  1 -
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |  3 +--
 TestCases/sliding_interface/pipe/pipe_WA.cfg  |  3 +--
 .../rotating_cylinders/rot_cylinders_NN.cfg   |  3 +--
 .../rotating_cylinders/rot_cylinders_WA.cfg   |  3 +--
 .../sup_vor_shed_NN.cfg                       |  3 +--
 .../sup_vor_shed_WA.cfg                       |  3 +--
 .../uniform_flow/uniform_NN.cfg               |  1 -
 .../uniform_flow/uniform_WA.cfg               |  1 -
 14 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 1a42d61d9fa2..815a6aea9d08 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -932,8 +932,8 @@ def main():
     uniform_flow         = TestCase('uniform_flow')
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
-    uniform_flow.test_iter = 10
-    uniform_flow.test_vals = [10.000000, 0.000000, -8.795489, -10.906320] #last 4 columns
+    uniform_flow.test_iter = 2
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.118432] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -945,8 +945,8 @@ def main():
     channel_2D           = TestCase('channel_2D')
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
-    channel_2D.test_iter = 4
-    channel_2D.test_vals = [0.000000, -0.092580, -0.311363, -0.422168] #last 4 columns
+    channel_2D.test_iter = 2
+    channel_2D.test_vals = [2.000000, 0.000000, 0.396634, 0.320019, 0.403674] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -959,7 +959,7 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 1
-    channel_3D.test_vals = [1.000000, 0.000000, 0.659340, 0.786693, 0.671212] #last 5 columns
+    channel_3D.test_vals = [1.000000, 0.000000, 0.649093, 0.797702, 0.718414] #last 5 columns
     channel_3D.su2_exec  = "SU2_CFD"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
@@ -972,7 +972,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [-10.959248, -9.233598, -7.680970, -6.352204] #last 4 columns
+    pipe.test_vals = [0.457554, 0.542877, 0.781840, 0.944999] #last 4 columns
     pipe.su2_exec  = "SU2_CFD"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -985,7 +985,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [3.000000, 0.000000, -0.193512, -0.680198, -0.879603] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.715494, 1.096497, 1.126065] #last 4 columns
     rotating_cylinders.su2_exec  = "SU2_CFD"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -998,7 +998,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 0.384648, 1.092480] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208747, 1.128612] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.736160, -1.619596] #last 3 columns
+    bars_SST_2D.test_vals = [13.000000, -0.720453, -1.603019] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1104,7 +1104,7 @@ def main():
     cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
     cht_incompressible.cfg_file  = "config.cfg"
     cht_incompressible.test_iter = 10
-    cht_incompressible.test_vals = [10.000000, -2.555933, -3.280592] #last 4 columns
+    cht_incompressible.test_vals = [10.000000, -2.601006, -3.342894] #last 4 columns
     cht_incompressible.su2_exec  = "SU2_CFD"
     cht_incompressible.timeout   = 1600
     cht_incompressible.multizone = True
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index fbf1e1f9f7d0..67aaa94d24be 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -134,7 +134,6 @@ KT_CONSTANT= 0.028085
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
 MARKER_ZONE_INTERFACE= (outflow_bars, inflow_channel)
-MARKER_FLUID_INTERFACE= (outflow_bars, inflow_channel)
 
 %Dynamic Mesh simulation(Yes, No)
 % Navier-Stokes wall boundary marker(s) (NONE = no marker)
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index c51853884b3e..52a06cfe362f 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -89,7 +89,6 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
-MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 %
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index bce9d956aaa6..780ac06fb4b7 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -88,7 +88,6 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
-MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 210dfb9a0244..eb3dde9a6f88 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -97,7 +97,6 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
-MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 %KIND_INTERPOLATION= ISOPARAMETRIC
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 0b651810a986..b61f9ceed1ea 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -86,7 +86,6 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
-MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 4424c2c509fb..6015e3951a09 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -23,7 +23,7 @@ TIME_STEP= 0.1
 %
 TIME_ITER= 10
 %
-OUTER_ITER=200
+OUTER_ITER=10
 %
 INNER_ITER=1
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
@@ -93,7 +93,6 @@ MARKER_RIEMANN= (intake_upper_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15,
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
-MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 
 
 %KIND_INTERPOLATION= ISOPARAMETRIC
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 3dd7e3bd1fb4..01b1e803120a 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -91,9 +91,8 @@ MARKER_EULER= ( intake_sidewall, component_sidewall_1, component_sidewall_2, com
 MARKER_RIEMANN= (intake_upper_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0, 0.0, intake_lower_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 1.5, 0.0, 0.0, outlet_interface_4  STATIC_PRESSURE, 95750.0, 0.0, 0.0, 0.0, 0.0 )
 %
 % Zone interaction boundary definition
-MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4, outlet_interface_4 )
+MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
-MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
 
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index cab687ea39cb..28a9a673f90d 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -25,7 +25,7 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 200
+OUTER_ITER = 10
 %
 % Inner iterations
 INNER_ITER= 1
@@ -87,7 +87,6 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
-MARKER_FLUID_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index f5dfd9a4bd3c..58d0b46ba5d5 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -26,7 +26,7 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 200
+OUTER_ITER = 10
 %
 % Inner iterations
 INNER_ITER= 1
@@ -87,7 +87,6 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
-MARKER_FLUID_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 182f34941015..90249a78e2fd 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -27,7 +27,7 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 100
+OUTER_ITER = 5
 %
 % Inner iterations
 INNER_ITER= 1
@@ -88,7 +88,6 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
-MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 85b7ee97c1f2..9bb73e5fb65d 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -27,7 +27,7 @@ TIME_ITER = 32000
 TIME_STEP = 0.1
 %
 % Number of outer iterations (Block-Gauss-Seidel)
-OUTER_ITER = 100
+OUTER_ITER = 5
 %
 % Inner iterations
 INNER_ITER= 1
@@ -88,7 +88,6 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
-MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index ef463d174cef..67a6c4b1d0d5 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -81,7 +81,6 @@ MARKER_EULER= (outlet)
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
-MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 788d436059a1..fdb3d97427d0 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -87,7 +87,6 @@ MARKER_EULER= (outlet)
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
-MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE

From b8f6e6d004301b985e33d75b1f589744b3b67ca0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Apr 2019 18:58:44 +0200
Subject: [PATCH 246/539] More fixes for regression tests

---
 Common/src/config_structure.cpp               |  2 +-
 SU2_CFD/src/output/output_adj_flow_comp.cpp   | 56 +++++++++--------
 SU2_PY/SU2/io/state.py                        |  2 +-
 SU2_PY/SU2/io/tools.py                        |  4 +-
 SU2_PY/SU2/run/adjoint.py                     |  2 +-
 SU2_PY/SU2/run/direct.py                      |  6 +-
 SU2_PY/compute_polar.py                       | 10 +--
 SU2_PY/compute_uncertainty.py                 | 12 ++--
 SU2_PY/parallel_computation.py                |  2 +-
 SU2_PY/parallel_computation_fsi.py            |  6 +-
 .../fea_fsi/StatBeam_3d/configBeam_3d.cfg     |  1 +
 TestCases/parallel_regression.py              | 61 +++++++++++--------
 .../incompressible_steady/configCircle.cfg    |  1 -
 .../incompressible_steady/configOut.cfg       |  1 -
 14 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 07a1e303d817..081a34a638a3 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2665,7 +2665,7 @@ void CConfig::SetHeader(unsigned short val_software){
    the two lines below that use the dt variable. ---*/
   //time_t now = time(0);
   //string dt = ctime(&now); dt[24] = '.';
-  if (iZone == 0){
+  if ((iZone == 0) && (rank == MASTER_NODE)){
     cout << endl << "-------------------------------------------------------------------------" << endl;
     cout << "|    ___ _   _ ___                                                      |" << endl;
     cout << "|   / __| | | |_  )   Release 6.2.0  \"Falcon\"                           |" << endl;
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 6307dafbc9e3..dd1e1d39e6fa 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -324,7 +324,7 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
   /// DESCRIPTION: Adjoint energy.
   AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");           
-  if (!config->GetFrozen_Visc_Disc()){    
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Adjoint nu tilde.
@@ -402,7 +402,9 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   CVariable* Node_AdjTurb = NULL;
   CPoint*    Node_Geo     = geometry->node[iPoint];
   
-  if (config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Disc()){
+  if (config->GetKind_Turb_Model() != NONE && 
+      ((!config->GetFrozen_Visc_Disc() && !cont_adj) || 
+       (!config->GetFrozen_Visc_Cont() && cont_adj))){
     Node_AdjTurb = solver[ADJTURB_SOL]->node[iPoint]; 
   }
   
@@ -421,18 +423,20 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     SetVolumeOutputValue("ADJ_ENERGY",     iPoint, Node_AdjFlow->GetSolution(3));    
   }
   
-  // Turbulent 
-  switch(turb_model){
-  case SST:
-    SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
-    SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
-    break;
-  case NONE:
-    break;
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+    // Turbulent 
+    switch(turb_model){
+    case SST:
+      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+      SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0));
+      break;
+    case NONE:
+      break;
+    }
   }
   
   // Residuals
@@ -446,17 +450,19 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     SetVolumeOutputValue("RES_ADJ_ENERGY", iPoint, Node_AdjFlow->GetSolution(3) - Node_AdjFlow->GetSolution_Old(3));   
   }
   
-  switch(config->GetKind_Turb_Model()){
-  case SST:
-    SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-    SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
-    break;
-  case NONE:
-    break;
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){  
+    switch(config->GetKind_Turb_Model()){
+    case SST:
+      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
+      break;
+    case SA: case SA_COMP: case SA_E: 
+    case SA_E_COMP: case SA_NEG: 
+      SetVolumeOutputValue("RES_ADJ_NU_TILDE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      break;
+    case NONE:
+      break;
+    }
   }
   
   SetVolumeOutputValue("SENSITIVITY_X", iPoint, Node_AdjFlow->GetSensitivity(0));
diff --git a/SU2_PY/SU2/io/state.py b/SU2_PY/SU2/io/state.py
index 849289257863..0262bdd095b7 100644
--- a/SU2_PY/SU2/io/state.py
+++ b/SU2_PY/SU2/io/state.py
@@ -229,7 +229,7 @@ def find_files(self,config):
         files = self.FILES
         
         mesh_name     = config.MESH_FILENAME
-        direct_name   = config.SOLUTION_FLOW_FILENAME
+        direct_name   = config.SOLUTION_FILENAME
         adjoint_name  = config.SOLUTION_ADJ_FILENAME
         targetea_name = 'TargetEA.dat'
         targetcp_name = 'TargetCp.dat'
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index ab2991cb489d..fb90446bfba5 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -1153,8 +1153,8 @@ def restart2solution(config,state={}):
 
     # direct solution
     if config.MATH_PROBLEM == 'DIRECT':
-        restart  = config.RESTART_FLOW_FILENAME
-        solution = config.SOLUTION_FLOW_FILENAME
+        restart  = config.RESTART_FILENAME
+        solution = config.SOLUTION_FILENAME
         
         # expand zones
         restarts  = expand_zones(restart,config)
diff --git a/SU2_PY/SU2/run/adjoint.py b/SU2_PY/SU2/run/adjoint.py
index 0a1631284100..8071d61d1b6a 100644
--- a/SU2_PY/SU2/run/adjoint.py
+++ b/SU2_PY/SU2/run/adjoint.py
@@ -111,7 +111,7 @@ def adjoint( config ):
             objective="COMBO"
     adj_title    = 'ADJOINT_' + objective
     suffix       = su2io.get_adjointSuffix(objective)
-    restart_name = konfig['RESTART_FLOW_FILENAME']
+    restart_name = konfig['RESTART_FILENAME']
     restart_name = su2io.add_suffix(restart_name,suffix)
     
     # info out
diff --git a/SU2_PY/SU2/run/direct.py b/SU2_PY/SU2/run/direct.py
index ea89ee04f7ab..eb4ae7e74898 100644
--- a/SU2_PY/SU2/run/direct.py
+++ b/SU2_PY/SU2/run/direct.py
@@ -90,9 +90,9 @@ def direct ( config ):
     multizone_cases = su2io.get_multizone(konfig)
 
     # merge
-    konfig['SOLUTION_FLOW_FILENAME'] = konfig['RESTART_FLOW_FILENAME']
+    konfig['SOLUTION_FILENAME'] = konfig['RESTART_FILENAME']
     if 'FLUID_STRUCTURE_INTERACTION' in multizone_cases:
-        konfig['SOLUTION_STRUCTURE_FILENAME'] = konfig['RESTART_STRUCTURE_FILENAME']
+        konfig['SOLUTION_FILENAME'] = konfig['RESTART_FILENAME']
     su2merge(konfig)
     
     # filenames
@@ -114,7 +114,7 @@ def direct ( config ):
     # info out
     info = su2io.State()
     info.FUNCTIONS.update( aerodynamics )
-    info.FILES.DIRECT = konfig['RESTART_FLOW_FILENAME']
+    info.FILES.DIRECT = konfig['RESTART_FILENAME']
     if 'EQUIV_AREA' in special_cases:
         info.FILES.WEIGHT_NF = 'WeightNF.dat'
     if 'INV_DESIGN_CP' in special_cases:
diff --git a/SU2_PY/compute_polar.py b/SU2_PY/compute_polar.py
index 872f84384b47..cd58bedee4db 100755
--- a/SU2_PY/compute_polar.py
+++ b/SU2_PY/compute_polar.py
@@ -396,7 +396,7 @@ def main():
                 # if caseName exists copy the restart file from it for run continuation
                 # Continue from previous sweep point if this is not he first
                 if os.path.isdir(caseName):
-                    command = 'cp '+caseName+'/'+config.SOLUTION_FLOW_FILENAME+' .'
+                    command = 'cp '+caseName+'/'+config.SOLUTION_FILENAME+' .'
                     if options.verbose:
                         print(command)
                     os.system(command)
@@ -407,7 +407,7 @@ def main():
             else:
                 konfig.RESTART_SOL = 'YES'
             if  konfig.RESTART_SOL == 'YES':
-                ztate.FILES.DIRECT = config.SOLUTION_FLOW_FILENAME
+                ztate.FILES.DIRECT = config.SOLUTION_FILENAME
             # run su2
             if options.Wind:
                 drag = SU2.eval.func('DRAG', konfig, ztate)
@@ -464,7 +464,7 @@ def main():
             # save data
             SU2.io.save_data('results.pkl', results)
             os.system('cp results.pkl  DIRECT/.')
-            os.system('cp '+config.SOLUTION_FLOW_FILENAME+' DIRECT/.')
+            os.system('cp '+config.SOLUTION_FILENAME+' DIRECT/.')
 
             if os.path.isdir(caseName):
                 command = 'cat '+caseName+\
@@ -484,8 +484,8 @@ def main():
     f.close()
     if os.path.isdir('DIRECT'):
         os.system('rm -R DIRECT')
-    if os.path.isfile(config.SOLUTION_FLOW_FILENAME):
-        os.system('rm '+config.SOLUTION_FLOW_FILENAME)
+    if os.path.isfile(config.SOLUTION_FILENAME):
+        os.system('rm '+config.SOLUTION_FILENAME)
     if os.path.isfile('results.pkl'):
         os.system('rm results.pkl')
     print('Post sweep cleanup completed')
diff --git a/SU2_PY/compute_uncertainty.py b/SU2_PY/compute_uncertainty.py
index a9ec5d698223..4aac6b2d74cf 100755
--- a/SU2_PY/compute_uncertainty.py
+++ b/SU2_PY/compute_uncertainty.py
@@ -98,7 +98,7 @@ def main():
         ztate.update(info)
 	
 	# Solution merging
-    	konfig.SOLUTION_FLOW_FILENAME = konfig.RESTART_FLOW_FILENAME
+    	konfig.SOLUTION_FILENAME = konfig.RESTART_FILENAME
     	info = SU2.run.merge(konfig)
     	ztate.update(info)
 
@@ -125,7 +125,7 @@ def main():
     ztate.update(info)
     
     # Solution merging
-    konfig.SOLUTION_FLOW_FILENAME = konfig.RESTART_FLOW_FILENAME
+    konfig.SOLUTION_FILENAME = konfig.RESTART_FILENAME
     info = SU2.run.merge(konfig)
     state.update(info)
 
@@ -151,16 +151,16 @@ def main():
     ztate.update(info)
 
     # Solution merging
-    konfig.SOLUTION_FLOW_FILENAME = konfig.RESTART_FLOW_FILENAME
+    konfig.SOLUTION_FILENAME = konfig.RESTART_FILENAME
     info = SU2.run.merge(konfig)
     ztate.update(info)
 
 def sendOutputFiles( config, folderName = ''):
     config.CONV_FILENAME = folderName + config.CONV_FILENAME
     #config.BREAKDOWN_FILENAME = folderName + config.BREAKDOWN_FILENAME
-    config.RESTART_FLOW_FILENAME = folderName + config.RESTART_FLOW_FILENAME
-    config.VOLUME_FLOW_FILENAME = folderName + config.VOLUME_FLOW_FILENAME
-    config.SURFACE_FLOW_FILENAME = folderName + config.SURFACE_FLOW_FILENAME
+    config.RESTART_FILENAME = folderName + config.RESTART_FILENAME
+    config.VOLUME_FILENAME = folderName + config.VOLUME_FILENAME
+    config.SURFACE_FILENAME = folderName + config.SURFACE_FILENAME
 
 
 if __name__ == "__main__":
diff --git a/SU2_PY/parallel_computation.py b/SU2_PY/parallel_computation.py
index a538298b0574..79678aa00ba9 100755
--- a/SU2_PY/parallel_computation.py
+++ b/SU2_PY/parallel_computation.py
@@ -96,7 +96,7 @@ def parallel_computation( filename           ,
 
     # Solution merging
     if config.MATH_PROBLEM == 'DIRECT':
-        config.SOLUTION_FLOW_FILENAME = config.RESTART_FLOW_FILENAME
+        config.SOLUTION_FILENAME = config.RESTART_FILENAME
     elif config.MATH_PROBLEM in ['CONTINUOUS_ADJOINT', 'DISCRETE_ADJOINT']:
         config.SOLUTION_ADJ_FILENAME = config.RESTART_ADJ_FILENAME
     info = SU2.run.merge(config)
diff --git a/SU2_PY/parallel_computation_fsi.py b/SU2_PY/parallel_computation_fsi.py
index 7003d0ce8bb1..9c5c4dab2eae 100755
--- a/SU2_PY/parallel_computation_fsi.py
+++ b/SU2_PY/parallel_computation_fsi.py
@@ -96,10 +96,10 @@ def parallel_computation( filename           ,
 
     # Solution merging
     if config.PHYSICAL_PROBLEM == 'FEM_ELASTICITY':
-        config.SOLUTION_STRUCTURE_FILENAME = config.RESTART_STRUCTURE_FILENAME 
+        config.SOLUTION_FILENAME = config.RESTART_FILENAME 
     elif config.PHYSICAL_PROBLEM == 'FLUID_STRUCTURE_INTERACTION':
-        config.SOLUTION_FLOW_FILENAME = config.RESTART_FLOW_FILENAME
-        config.SOLUTION_STRUCTURE_FILENAME = config.RESTART_STRUCTURE_FILENAME  
+        config.SOLUTION_FILENAME = config.RESTART_FILENAME
+        config.SOLUTION_FILENAME = config.RESTART_FILENAME  
 
     info = SU2.run.merge(config)
     state.update(info)
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index 8940611a0d2f..7cc74b00c6b2 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -30,6 +30,7 @@ WRT_SRF_SOL = NO
 CONV_FILENAME= history_beam
 VOLUME_FILENAME= beam
 RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= restart_beam.dat
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 WRT_CON_FREQ= 1
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 4a00a2414d78..addf0e5abcd2 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -442,7 +442,7 @@ def main():
     fem_ns_unsteady_cylinder           = TestCase('fem_ns_unsteady_cylinder')
     fem_ns_unsteady_cylinder.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder.cfg_file  = "fem_unst_cylinder.cfg"
-    fem_ns_unsteady_cylinder.test_iter = 10
+    fem_ns_unsteady_cylinder.test_iter = 11
     fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
     fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
     fem_ns_unsteady_cylinder.timeout   = 1600
@@ -453,7 +453,7 @@ def main():
     fem_ns_unsteady_cylinder_ader           = TestCase('fem_ns_unsteady_cylinder_ader')
     fem_ns_unsteady_cylinder_ader.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
     fem_ns_unsteady_cylinder_ader.cfg_file  = "fem_unst_cylinder_ADER.cfg"
-    fem_ns_unsteady_cylinder_ader.test_iter = 10
+    fem_ns_unsteady_cylinder_ader.test_iter = 11
     fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
     fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
     fem_ns_unsteady_cylinder_ader.timeout   = 1600
@@ -579,7 +579,7 @@ def main():
     contadj_rans_naca0012_bin           = TestCase('contadj_rans_naca0012_bin')
     contadj_rans_naca0012_bin.cfg_dir   = "cont_adj_rans/naca0012"
     contadj_rans_naca0012_bin.cfg_file  = "turb_nasa_binary.cfg"
-    contadj_rans_naca0012_bin.test_iter = 20
+    contadj_rans_naca0012_bin.test_iter = 18
     contadj_rans_naca0012_bin.test_vals = [-0.794169, -5.761671, 19.214000, -0.000000] #last 4 columns
     contadj_rans_naca0012_bin.su2_exec  = "parallel_computation.py -f"
     contadj_rans_naca0012_bin.timeout   = 1600
@@ -853,24 +853,26 @@ def main():
     uniform_flow         = TestCase('uniform_flow')
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
-    uniform_flow.test_iter = 50
-    uniform_flow.test_vals = [-0.368877, 5.156053, 0.000000, 0.000000] #last 4 columns
+    uniform_flow.test_iter = 5
+    uniform_flow.test_vals = [5.000000, 1.000000,  -0.188747, -10.629606] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
     uniform_flow.unsteady  = True
+    uniform_flow.multizone = True
     test_list.append(uniform_flow) 
 
     # Channel_2D
     channel_2D           = TestCase('channel_2D')
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
-    channel_2D.test_iter = 4
-    channel_2D.test_vals = [-1.656863, 4.263134, 0.000000, 0.000000] #last 4 columns
+    channel_2D.test_iter = 2
+    channel_2D.test_vals = [2.000000, 0.000000, 0.396756, 0.320050, 0.403711] #last 4 columns
     channel_2D.su2_exec  = "parallel_computation.py -f"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
     channel_2D.unsteady  = True
+    channel_2D.multizone = True
     test_list.append(channel_2D)
 
     # Channel_3D
@@ -878,11 +880,12 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 2
-    channel_3D.test_vals = [-1.999171, 3.956649, 0.000000, 0.000000] #last 4 columns
+    channel_3D.test_vals = [2.000000, 0.000000, 0.626497, 0.511330, 0.422653] #last 4 columns
     channel_3D.su2_exec  = "parallel_computation.py -f"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
     channel_3D.unsteady  = True
+    channel_3D.multizone = True
     test_list.append(channel_3D)
 
     # Pipe
@@ -890,11 +893,12 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [-3.503708, 3.194241, 0.000000, 0.000000] #last 4 columns
+    pipe.test_vals = [ 0.112190, 0.457550, 0.542875, 0.781838, 0.944998] #last 4 columns
     pipe.su2_exec  = "parallel_computation.py -f"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
     pipe.unsteady  = True
+    pipe.multizone = True
     test_list.append(pipe)
 
     # Rotating cylinders
@@ -902,11 +906,12 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [1.219987, 7.729743, 0.000000, 0.000000] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.715495, 1.096497, 1.126070] #last 4 columns
     rotating_cylinders.su2_exec  = "parallel_computation.py -f"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
     rotating_cylinders.unsteady  = True
+    rotating_cylinders.multizone  = True
     test_list.append(rotating_cylinders)
 
     # Supersonic vortex shedding
@@ -914,11 +919,12 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [-1.124318, 4.605281, 0.000000, 0.000000] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208747, 1.128610] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "parallel_computation.py -f"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
     supersonic_vortex_shedding.unsteady  = True
+    supersonic_vortex_shedding.multizone  = True
     test_list.append(supersonic_vortex_shedding)
 
     # Bars_SST_2D
@@ -926,10 +932,11 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [-2.133553, 1.644733, -0.000831, 0.117497] #last 4 columns
+    bars_SST_2D.test_vals = [13.000000, -0.717707, -1.605264] #last 4 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
+    bars_SST_2D.multizone = True
     test_list.append(bars_SST_2D)
     
     # Sliding mesh with incompressible flows (steady)
@@ -937,10 +944,11 @@ def main():
     slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
     slinc_steady.cfg_file  = "config.cfg"
     slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [-4.214657, 1.265231, 0.000000, 0.000000] #last 4 columns
+    slinc_steady.test_vals = [19.000000,  -1.766116, -2.206522] #last 4 columns
     slinc_steady.su2_exec  = "SU2_CFD"
     slinc_steady.timeout   = 100
     slinc_steady.tol       = 0.00002
+    slinc_steady.multizone = True
     test_list.append(slinc_steady)
     
     # Sliding mesh with incompressible flows (unsteady)
@@ -975,22 +983,22 @@ def main():
     dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
     dynbeam2d.cfg_file  = "configBeam_2d.cfg"
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [-9.420641, -5.365871, -12.430382, 6.5210e+04] #last 4 columns
+    dynbeam2d.test_vals = [6.000000, 1.000000, 0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "parallel_computation_fsi.py -f"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001
     test_list.append(dynbeam2d)
 
-    # FSI, 2d
-    fsi2d           = TestCase('fsi2d')
-    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
-    fsi2d.cfg_file  = "configFSI.cfg"
-    fsi2d.test_iter = 4
-    fsi2d.test_vals = [2.000000, 0.500000, -7.780230, -1.142095] #last 4 columns
-    fsi2d.su2_exec  = "parallel_computation_fsi.py -f"
-    fsi2d.timeout   = 1600
-    fsi2d.tol       = 0.00001
-    test_list.append(fsi2d)
+#    # FSI, 2d
+#    fsi2d           = TestCase('fsi2d')
+#    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
+#    fsi2d.cfg_file  = "configFSI.cfg"
+#    fsi2d.test_iter = 4
+#    fsi2d.test_vals = [2.000000, 0.500000, -7.780230, -1.142095] #last 4 columns
+#    fsi2d.su2_exec  = "parallel_computation_fsi.py -f"
+#    fsi2d.timeout   = 1600
+#    fsi2d.tol       = 0.00001
+#    test_list.append(fsi2d)
 
     ##########################
     ### Zonal multiphysics ###
@@ -1001,9 +1009,10 @@ def main():
     cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
     cht_incompressible.cfg_file  = "config.cfg"
     cht_incompressible.test_iter = 10
-    cht_incompressible.test_vals = [0.000000, 0.000000, -7.813888, -2543.238968] #last 4 columns
-    cht_incompressible.su2_exec  = "parallel_computation.py -f"
+    cht_incompressible.test_vals = [10.000000, -2.601006, -3.342894] #last 4 columns
+    cht_incompressible.su2_exec  = "SU2_CFD"
     cht_incompressible.timeout   = 1600
+    cht_incompressible.multizone = True
     cht_incompressible.tol       = 0.00001
     test_list.append(cht_incompressible)
 
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 6224930ba354..06ca16ec414d 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -53,7 +53,6 @@ REF_AREA= 1.0
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 
-MARKER_FLUID_INTERFACE= (circleIn)
 
 MARKER_PLOTTING= ( NONE )
 MARKER_MONITORING= ( NONE )
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index ed22bdf80ff2..8b8b4565172a 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -58,7 +58,6 @@ MARKER_HEATFLUX = ( upper, -1000.0, lower, 1000.0 )
 INC_OUTLET_TYPE = PRESSURE_OUTLET
 MARKER_OUTLET= ( outlet, 0.0 )
 
-MARKER_FLUID_INTERFACE= (circleOut)
 
 INC_INLET_TYPE= VELOCITY_INLET
 SPECIFIED_INLET_PROFILE= YES

From 33af59007871dd2a2aeea7ba222d9670b2b5cb8d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Apr 2019 11:51:41 +0200
Subject: [PATCH 247/539] More fixes for regression tests

---
 Common/src/grid_movement_structure.cpp                 |  3 ++-
 SU2_PY/SU2_CFD.py                                      |  2 +-
 .../launch_flatPlate_rigidMotion.py                    | 10 ++++------
 .../unsteady_CHT_FlatPlate_Conf.cfg                    |  1 +
 TestCases/serial_regression.py                         |  8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 779b08eabb09..5599d4f0684b 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -9342,7 +9342,8 @@ void CElasticityMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     if (((config->GetMarker_All_KindBC(iMarker) != SYMMETRY_PLANE) &&
          (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE) &&
-         (config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY))) {
+         (config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY))
+        && !config->GetMarker_All_Moving(iMarker)) {
 
       /*--- We must note that the FSI surfaces are not clamped ---*/
       if (config->GetMarker_All_ZoneInterface(iMarker) == 0){
diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
index 5fb57f905f94..61730eae9276 100755
--- a/SU2_PY/SU2_CFD.py
+++ b/SU2_PY/SU2_CFD.py
@@ -99,7 +99,7 @@ def main():
     elif (options.nZone == 2) and (options.fsi):
       SU2Driver = pysu2.CMultizoneDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
index ab650b57f386..7b7a93b43297 100755
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
@@ -101,13 +101,13 @@ def main():
   # Initialize the corresponding driver of SU2, this includes solver preprocessing
   try:
     if (options.nZone == 1) and ( options.fem or options.poisson_equation or options.wave_equation or options.heat_equation ):
-      SU2Driver = pysu2.CGeneralDriver(options.filename, options.nZone, options.periodic, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, options.periodic, comm);
     elif options.harmonic_balance:
       SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, options.periodic, comm);
     elif (options.nZone == 2) and (options.fsi):
       SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, options.periodic, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, options.periodic, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, options.periodic, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
@@ -161,8 +161,6 @@ def main():
     comm.Barrier()
 
   while (TimeIter < nTimeIter):
-    # Time iteration preprocessing
-    SU2Driver.PreprocessExtIter(TimeIter)
     # Define the rigid body displacement and set the new coords of each node on the marker
     d_y = 0.0175*sin(2*pi*time)
     for iVertex in range(nVertex_MovingMarker):
@@ -172,8 +170,8 @@ def main():
       SU2Driver.SetVertexCoordY(MovingMarkerID, iVertex, newCoordY)
       SU2Driver.SetVertexCoordZ(MovingMarkerID, iVertex, 0.0)
       SU2Driver.SetVertexVarCoord(MovingMarkerID, iVertex)
-    # Tell the SU2 driver to update the mesh (dynamic mesh motion)
-    SU2Driver.DynamicMeshUpdate(TimeIter)
+    # Time iteration preprocessing
+    SU2Driver.Preprocess(TimeIter)
     # Run one time iteration (e.g. dual-time)
     SU2Driver.Run()
     # Update the solver for the next time iteration
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index ea4be0292236..e06838b85c03 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -47,6 +47,7 @@ DISCARD_INFILES= NO
 %                                       Speed = ft/s, Equiv. Area = ft^2 )
 SYSTEM_MEASUREMENTS= SI
 
+SINGLEZONE_DRIVER=NO
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 815a6aea9d08..a3add0b03c00 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -933,7 +933,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 2
-    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.118432] #last 4 columns
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.117827] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.720453, -1.603019] #last 3 columns
+    bars_SST_2D.test_vals = [13.000000, -0.722945, -1.612486] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1023,7 +1023,7 @@ def main():
     slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
     slinc_steady.cfg_file  = "config.cfg"
     slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [19.000000, -1.663771, -2.002700] #last 3 columns
+    slinc_steady.test_vals = [19.000000, -1.766116, -2.206522] #last 3 columns
     slinc_steady.su2_exec  = "SU2_CFD"
     slinc_steady.timeout   = 100
     slinc_steady.tol       = 0.00001
@@ -1488,7 +1488,7 @@ def main():
     pywrapper_rigidMotion.cfg_dir       = "py_wrapper/flatPlate_rigidMotion"
     pywrapper_rigidMotion.cfg_file      = "flatPlate_rigidMotion_Conf.cfg"
     pywrapper_rigidMotion.test_iter     = 5
-    pywrapper_rigidMotion.test_vals     = [-1.598116, 2.259671, -0.040621, 0.144134] #last 4 columns
+    pywrapper_rigidMotion.test_vals     = [-4.691612, -2.206047, -2.288896, 0.777467] #last 4 columns
     pywrapper_rigidMotion.su2_exec      = "python launch_flatPlate_rigidMotion.py -f"
     pywrapper_rigidMotion.new_output      = True
     pywrapper_rigidMotion.timeout       = 1600

From 655abf338027140897343f3614122a671fa134f1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Apr 2019 14:16:30 +0200
Subject: [PATCH 248/539] More fixes for regression tests

---
 SU2_CFD/src/output/output_structure.cpp       |  8 ++-
 SU2_CFD/src/python_wrapper_structure.cpp      |  2 +-
 SU2_CFD/src/solver_structure.cpp              | 50 +++++++++++++++++--
 SU2_SOL/src/SU2_SOL.cpp                       |  4 +-
 TestCases/parallel_regression.py              | 11 +++-
 .../flatPlate_rigidMotion_Conf.cfg            |  8 +--
 6 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 66c1aaada1aa..789f6268afaa 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5819,8 +5819,14 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
 
 bool COutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY || config->GetUnsteady_Simulation() == TIME_STEPPING) {
+  if (config->GetUnsteady_Simulation() == STEADY) {
     write_header = ((curr_InnerIter % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);
+  } else if  (config->GetUnsteady_Simulation() == TIME_STEPPING) {
+    if (!config->GetRestart())
+      write_header = ((curr_TimeIter % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);    
+    else {
+      write_header = (((curr_TimeIter - config->GetRestart_Iter()) % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);    
+    }
   } else {
     write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
   }
diff --git a/SU2_CFD/src/python_wrapper_structure.cpp b/SU2_CFD/src/python_wrapper_structure.cpp
index 52dda2820a6f..ada90696d71e 100644
--- a/SU2_CFD/src/python_wrapper_structure.cpp
+++ b/SU2_CFD/src/python_wrapper_structure.cpp
@@ -291,7 +291,7 @@ unsigned long CDriver::GetExtIter(){
 
 su2double CDriver::GetUnsteady_TimeStep(){
 
-  return config_container[ZONE_0]->GetDelta_UnstTime();
+  return config_container[ZONE_0]->GetTime_Step();
 }
 
 su2double CDriver::GetVertexCoordX(unsigned short iMarker, unsigned short iVertex) {
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 10a8363661b0..c931ffc4a8e8 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3612,13 +3612,22 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     /*--- Close the file. ---*/
 
     fclose(fhw);
+    
+    /*--- Set the number of variables, one per field in the
+     restart file (without including the PointID) ---*/
 
+    nVar = var_buf[1];
 #else
 
     /*--- Parallel binary input using MPI I/O. ---*/
 
     MPI_File fhw;
     int ierr;
+    MPI_Offset disp;
+    unsigned short iVar;
+    unsigned long index, iChar;
+    string field_buf;
+    char str_buf[CGNS_STRING_SIZE];
     
     /*--- All ranks open the file using MPI. ---*/
 
@@ -3652,17 +3661,48 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
                      string("possible with the WRT_BINARY_RESTART / READ_BINARY_RESTART options."), CURRENT_FUNCTION);
     }
 
-    /*--- All ranks close the file after writing. ---*/
-    
-    MPI_File_close(&fhw);
 
-#endif
 
     /*--- Set the number of variables, one per field in the
      restart file (without including the PointID) ---*/
 
     nVar = var_buf[1];
-
+    
+    /*--- Read the variable names from the file. Note that we are adopting a
+     fixed length of 33 for the string length to match with CGNS. This is
+     needed for when we read the strings later. ---*/
+  
+    char *mpi_str_buf = new char[nVar*CGNS_STRING_SIZE];
+    if (rank == MASTER_NODE) {
+      disp = nVar_Buf*sizeof(int);
+      MPI_File_read_at(fhw, disp, mpi_str_buf, nVar*CGNS_STRING_SIZE,
+                       MPI_CHAR, MPI_STATUS_IGNORE);
+    }
+    
+    /*--- Broadcast the string names of the variables. ---*/
+  
+    SU2_MPI::Bcast(mpi_str_buf, nVar*CGNS_STRING_SIZE, MPI_CHAR,
+                   MASTER_NODE, MPI_COMM_WORLD);
+    
+    fields.push_back("Point_ID");
+    
+    for (iVar = 0; iVar < nVar; iVar++) {
+      index = iVar*CGNS_STRING_SIZE;
+      field_buf.append("\"");
+      for (iChar = 0; iChar < (unsigned long)CGNS_STRING_SIZE; iChar++) {
+        str_buf[iChar] = mpi_str_buf[index + iChar];
+      }
+      field_buf.append(str_buf);
+      field_buf.append("\"");
+      fields.push_back(field_buf.c_str());
+      field_buf.clear();
+    }
+    
+    /*--- All ranks close the file after writing. ---*/
+    
+    MPI_File_close(&fhw);
+    
+#endif
   } else {
 
     /*--- First, check that this is not a binary restart file. ---*/
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index d6da8045ac3b..d7830a735a0d 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -655,8 +655,8 @@ int main(int argc, char *argv[]) {
           /*--- Either instantiate the solution class or load a restart file. ---*/
           solver_container[iZone][iInst] = new CBaselineSolver(geometry_container[iZone][iInst], config_container[iZone]);
           solver_container[iZone][iInst]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
-          solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
-          output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+          output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][iInst], solver_container[iZone][iInst], iZone);          
+          output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][iInst]);
 
           /*--- Print progress in solution writing to the screen. ---*/
           if (rank == MASTER_NODE) {
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index addf0e5abcd2..131c882d9bb9 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -446,6 +446,7 @@ def main():
     fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
     fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
     fem_ns_unsteady_cylinder.timeout   = 1600
+    fem_ns_unsteady_cylinder.unsteady  = True
     fem_ns_unsteady_cylinder.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder)
 
@@ -457,6 +458,7 @@ def main():
     fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
     fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
     fem_ns_unsteady_cylinder_ader.timeout   = 1600
+    fem_ns_unsteady_cylinder_ader.unsteady  = True
     fem_ns_unsteady_cylinder_ader.tol       = 0.00001
     test_list.append(fem_ns_unsteady_cylinder_ader)
 
@@ -798,6 +800,7 @@ def main():
     Jones_tc.test_vals = [-5.294362, 0.429473, 80.085570, 1.034776] #last 4 columns
     Jones_tc.su2_exec  = "parallel_computation.py -f"
     Jones_tc.timeout   = 1600
+    Jones_tc.new_output = False
     Jones_tc.tol       = 0.00001
     test_list.append(Jones_tc)
 
@@ -809,6 +812,7 @@ def main():
     Jones_tc_rst.test_vals = [-4.411257, -1.606960, 82.250600, 2.791316] #last 4 columns
     Jones_tc_rst.su2_exec  = "parallel_computation.py -f"
     Jones_tc_rst.timeout   = 1600
+    Jones_tc_rst.new_output = False
     Jones_tc_rst.tol       = 0.00001
     test_list.append(Jones_tc_rst)
 
@@ -820,6 +824,7 @@ def main():
     axial_stage2D.test_vals = [-1.835157, 5.788771, 73.679900, 0.888920] #last 4 columns
     axial_stage2D.su2_exec  = "parallel_computation.py -f"
     axial_stage2D.timeout   = 1600
+    axial_stage2D.new_output = False
     axial_stage2D.tol       = 0.00001
     test_list.append(axial_stage2D)
     
@@ -831,6 +836,7 @@ def main():
     transonic_stator.test_vals = [-1.106713, 6.115842, 67.308610, 0.071854] #last 4 columns
     transonic_stator.su2_exec  = "parallel_computation.py -f"
     transonic_stator.timeout   = 1600
+    transonic_stator.new_output = False
     transonic_stator.tol       = 0.00001
     test_list.append(transonic_stator)
     
@@ -842,6 +848,7 @@ def main():
     transonic_stator_rst.test_vals = [-0.484635, 4.462656, 6.460177, 0.004009] #last 4 columns
     transonic_stator_rst.su2_exec  = "parallel_computation.py -f"
     transonic_stator_rst.timeout   = 1600
+    transonic_stator_rst.new_output = False
     transonic_stator_rst.tol       = 0.00001
     test_list.append(transonic_stator_rst)
 
@@ -854,7 +861,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 5
-    uniform_flow.test_vals = [5.000000, 1.000000,  -0.188747, -10.629606] #last 4 columns
+    uniform_flow.test_vals = [5.000000, 0.000000 ,-0.188747,-10.629606] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -1087,6 +1094,7 @@ def main():
     pywrapper_unsteadyCHT.timeout       = 1600
     pywrapper_unsteadyCHT.tol           = 0.00001
     pywrapper_unsteadyCHT.unsteady      = True
+    pywrapper_unsteadyCHT.new_output    = False
     test_list.append(pywrapper_unsteadyCHT)
 
     # Rigid motion
@@ -1198,7 +1206,6 @@ def main():
     tutorial_turb_oneram6.su2_exec   = "mpirun -np 2 SU2_CFD"
     tutorial_turb_oneram6.timeout    = 1600
     tutorial_turb_oneram6.tol        = 0.00001
-    tutorial_turb_oneram6.no_restart = True
     test_list.append(tutorial_turb_oneram6)
 
     # Inviscid NACA 0012 Design
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 872a96848cce..e45ac50ef765 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -159,25 +159,27 @@ KT_CONSTANT= 0.0257
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 0.003
+TIME_STEP= 0.003
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 1.0
+MAX_TIME= 1.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 10
+INNER_ITER= 10
 %
 % Iteration number to begin unsteady restarts
 RESTART_ITER= 0
 
+TIME_ITER=9999
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
 %                       MOVING_WALL, STEADY_TRANSLATION, FLUID_STRUCTURE,

From 9fcf32d1986e4836a03845bd614352e8a15e94b1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 25 Apr 2019 09:59:54 +0200
Subject: [PATCH 249/539] Added Inverse design CP routine

---
 SU2_CFD/include/output/output_flow.hpp  |   4 +
 SU2_CFD/src/output/output_flow.cpp      | 147 ++++++++++++++++++++++++
 SU2_CFD/src/output/output_flow_comp.cpp |  11 +-
 3 files changed, 160 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/output_flow.hpp
index 1bcfdea07b92..1e3fa31803b1 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/output_flow.hpp
@@ -63,4 +63,8 @@ class CFlowOutput : public COutput{
   
   void SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver);
   
+  void Add_CpInverseDesignOutput(CConfig *config);
+  
+  void Set_CpInverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config);
+  
 };
diff --git a/SU2_CFD/src/output/output_flow.cpp b/SU2_CFD/src/output/output_flow.cpp
index b23805328d08..74aa88c5d889 100644
--- a/SU2_CFD/src/output/output_flow.cpp
+++ b/SU2_CFD/src/output/output_flow.cpp
@@ -658,3 +658,150 @@ void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solv
   
   SetHistoryOutputValue("AOA", config->GetAoA());
 }
+
+
+void CFlowOutput::Add_CpInverseDesignOutput(CConfig *config){
+  
+  AddHistoryOutput("CP_DIFF", "Cp_Diff", FORMAT_FIXED, "CP_DIFF");
+  
+}
+
+void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config){
+  
+  unsigned short iMarker, icommas, Boundary, iDim;
+  unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
+  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff;
+  bool *PointInDomain;
+  string text_line, surfCp_filename;
+  ifstream Surface_file;
+  char buffer[50], cstr[200];
+  
+  
+  nPointLocal = geometry->GetnPoint();
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nPointGlobal = nPointLocal;
+#endif
+  
+  Point2Vertex = new unsigned long[nPointGlobal][2];
+  PointInDomain = new bool[nPointGlobal];
+  
+  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
+    PointInDomain[iPoint] = false;
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        /*--- The Pressure file uses the global numbering ---*/
+        
+#ifndef HAVE_MPI
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+#else
+        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
+#endif
+        
+        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
+          Point2Vertex[iPoint][0] = iMarker;
+          Point2Vertex[iPoint][1] = iVertex;
+          PointInDomain[iPoint] = true;
+          solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Prepare to read the surface pressure files (CSV) ---*/
+  
+  surfCp_filename = "TargetCp";
+  
+  surfCp_filename = config->GetUnsteady_FileName(surfCp_filename, curr_TimeIter, ".dat");
+  
+  strcpy (cstr, surfCp_filename.c_str());
+    
+  /*--- Read the surface pressure file ---*/
+  
+  string::size_type position;
+  
+  Surface_file.open(cstr, ios::in);
+  
+  if (!(Surface_file.fail())) {
+    
+    getline(Surface_file, text_line);
+    
+    while (getline(Surface_file, text_line)) {
+      for (icommas = 0; icommas < 50; icommas++) {
+        position = text_line.find( ",", 0 );
+        if (position!=string::npos) text_line.erase (position,1);
+      }
+      stringstream  point_line(text_line);
+      
+      if (geometry->GetnDim() == 2) point_line >> iPoint >> XCoord >> YCoord >> Pressure >> PressureCoeff;
+      if (geometry->GetnDim() == 3) point_line >> iPoint >> XCoord >> YCoord >> ZCoord >> Pressure >> PressureCoeff;
+      
+      if (PointInDomain[iPoint]) {
+        
+        /*--- Find the vertex for the Point and Marker ---*/
+        
+        iMarker = Point2Vertex[iPoint][0];
+        iVertex = Point2Vertex[iPoint][1];
+        
+        solver_container->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
+        
+      }
+      
+    }
+    
+    Surface_file.close();
+    
+  }
+  
+  /*--- Compute the pressure difference ---*/
+  
+  PressDiff = 0.0;
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    
+    if ((Boundary == EULER_WALL             ) ||
+        (Boundary == HEAT_FLUX              ) ||
+        (Boundary == ISOTHERMAL             ) ||
+        (Boundary == NEARFIELD_BOUNDARY)) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+        
+        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+        
+        Cp = solver_container->GetCPressure(iMarker, iVertex);
+        CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
+        
+        Area = 0.0;
+        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
+          Area += Normal[iDim]*Normal[iDim];
+        Area = sqrt(Area);
+        
+        PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
+      }
+      
+    }
+  }
+  
+#ifdef HAVE_MPI
+  su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
+  SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Update the total Cp difference coeffient ---*/
+  
+  solver_container->SetTotal_CpDiff(PressDiff);
+  
+  SetHistoryOutputValue("CP_DIFF", PressDiff);
+  
+  delete [] Point2Vertex;
+  delete [] PointInDomain;
+}
\ No newline at end of file
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index 78f1d0376ca1..c6bc27709739 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -266,8 +266,11 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /*--- Add aerodynamic coefficients fields --- */
   
-  AddAerodynamicCoefficients(config);  
-
+  AddAerodynamicCoefficients(config); 
+  
+  /*--- Add Cp diff fields ---*/
+  
+  Add_CpInverseDesignOutput(config);
 }
 
 void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
@@ -612,6 +615,10 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   
   SetAerodynamicCoefficients(config, flow_solver);
 
+  /*--- Set Cp diff fields ---*/
+  
+  Set_CpInverseDesign(flow_solver, geometry, config);
+  
 }
 
 su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){

From dfc8e1fb0ac685c18492416cceb6ef8a8af04596 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 25 Apr 2019 10:01:51 +0200
Subject: [PATCH 250/539] Adapting some disc. adj. test cases

---
 .../naca0012/inv_NACA0012_discadj.cfg         |  9 +--
 .../naca0012/turb_nasa_binary.cfg             |  2 +-
 .../disc_adj_euler/arina2k/Arina2KRS.cfg      | 81 +------------------
 .../cylinder3D/inv_cylinder3D.cfg             | 10 +--
 .../disc_adj_euler/oneram6/inv_ONERAM6.cfg    |  2 -
 TestCases/disc_adj_heat/disc_adj_heat.cfg     |  1 -
 .../naca0012/turb_NACA0012_sa.cfg             |  9 ++-
 .../naca0012/turb_NACA0012_sst.cfg            |  9 ++-
 8 files changed, 24 insertions(+), 99 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 8ac1be76ab3c..2d8fe45d79e7 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -28,9 +28,6 @@ WRT_BINARY_RESTART= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-
-ITER = 101
-
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -100,7 +97,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 150
+ITER= 150
 
 % -------------------------- MULTIGRID PARAMETERS -----------------------------%
 %
@@ -273,7 +270,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
 %    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index ee716f4efc08..5ec9e7c0db0c 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -98,7 +98,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-ITER= 100
+ITER= 22
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index dd950efb4ee3..e628d46e7728 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -48,9 +48,6 @@ DISCARD_INFILES= NO
 %                                       Speed = ft/s, Equiv. Area = ft^2 )
 SYSTEM_MEASUREMENTS= SI
 
-SINGLEZONE_DRIVER = YES
-ITER = 21
-
 % -------------------- COMPRESSIBLE FREE-STREAM 
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -117,76 +114,6 @@ CRITICAL_PRESSURE= 4599200.0
 % Acentric factor (0.035 (air))
 ACENTRIC_FACTOR= 0.01142
 %
-% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
-%
-% Dynamic mesh simulation (NO, YES)
-GRID_MOVEMENT= NO
-%
-% Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
-%                       MOVING_WALL, STEADY_TRANSLATION, FLUID_STRUCTURE,
-%                       AEROELASTIC, ELASTICITY, EXTERNAL,
-%                       AEROELASTIC_RIGID_MOTION, GUST)
-GRID_MOVEMENT_KIND= DEFORMING
-%
-% Motion mach number (non-dimensional). Used for initializing a viscous flow
-% with the Reynolds number and for computing force coeffs. with dynamic meshes.
-MACH_MOTION= 0.8
-%
-% Moving wall boundary marker(s) (NONE = no marker, ignored for RIGID_MOTION)
-MARKER_MOVING= ( NONE )
-%
-% Coordinates of the motion origin
-MOTION_ORIGIN_X= 0.25
-MOTION_ORIGIN_Y= 0.0
-MOTION_ORIGIN_Z= 0.0
-%
-% Angular velocity vector (rad/s) about the motion origin
-ROTATION_RATE_X = 0.0
-ROTATION_RATE_Y = 0.0
-ROTATION_RATE_Z = 0.0
-%
-% Pitching angular freq. (rad/s) about the motion origin
-PITCHING_OMEGA_X= 0.0
-PITCHING_OMEGA_Y= 0.0
-PITCHING_OMEGA_Z= 106.69842
-%
-% Pitching amplitude (degrees) about the motion origin
-PITCHING_AMPL_X= 0.0
-PITCHING_AMPL_Y= 0.0
-PITCHING_AMPL_Z= 1.01
-%
-% Pitching phase offset (degrees) about the motion origin
-PITCHING_PHASE_X= 0.0
-PITCHING_PHASE_Y= 0.0
-PITCHING_PHASE_Z= 0.0
-%
-% Translational velocity (m/s or ft/s) in the x, y, & z directions
-TRANSLATION_RATE_X = 0.0
-TRANSLATION_RATE_Y = 0.0
-TRANSLATION_RATE_Z = 0.0
-%
-% Plunging angular freq. (rad/s) in x, y, & z directions
-PLUNGING_OMEGA_X= 0.0
-PLUNGING_OMEGA_Y= 0.0
-PLUNGING_OMEGA_Z= 0.0
-%
-% Plunging amplitude (m or ft) in x, y, & z directions
-PLUNGING_AMPL_X= 0.0
-PLUNGING_AMPL_Y= 0.0
-PLUNGING_AMPL_Z= 0.0
-%
-% Move Motion Origin for marker moving (1 or 0)
-MOVE_MOTION_ORIGIN = 0
-
-WIND_GUST = NO
-GUST_TYPE = NONE
-GUST_DIR = Y_DIR
-GUST_WAVELENGTH= 10.0
-GUST_PERIODS= 1.0
-GUST_AMPL= 10.0
-GUST_BEGIN_TIME= 0.0
-GUST_BEGIN_LOC= 0.0
-
 % ------------------------ SUPERSONIC SIMULATION ------------------------------%
 % Evaluate equivalent area on the Near-Field (NO, YES)
 EQUIV_AREA= NO
@@ -211,9 +138,6 @@ MARKER_INTERNAL= ( NONE )
 % Near-Field boundary marker(s) (NONE = no marker)
 MARKER_NEARFIELD= ( NONE )
 %
-% Zone interface boundary marker(s) (NONE = no marker)
-MARKER_INTERFACE= ( NONE )
-%
 % Inlet boundary type (TOTAL_CONDITIONS, MASS_FLOW)
 INLET_TYPE= TOTAL_CONDITIONS
 %
@@ -548,7 +472,7 @@ DEFORM_LIMIT = 0.3
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 12000
+ITER= 12000
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -664,6 +588,9 @@ READ_BINARY_RESTART= YES
 %
 % Reorient elements based on potential negative volumes (YES/NO)
 REORIENT_ELEMENTS= YES
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index d7f7765d3ad3..3d0382a80b76 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -43,10 +43,7 @@ SYSTEM_MEASUREMENTS= SI
 %
 % Reorient elements based on potential negative volumes (YES/NO)
 REORIENT_ELEMENTS= NO 
-
-SINGLEZONE_DRIVER = YES
-ITER = 6
-
+HISTORY_OUTPUT= (ITER, RMS_RES, SENSITIVITY)
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -256,7 +253,7 @@ CFL_REDUCTION_ADJFLOW= 0.8
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 100
+ITER= 100
 %
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
@@ -369,3 +366,6 @@ WRT_BINARY_RESTART= YES
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
+%  
+%Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 600355e8d14a..8a16bd422b8d 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -113,8 +113,6 @@ OBJECTIVE_FUNCTION= DRAG
 % Courant-Friedrichs-Lewy condition of the finest grid
 CFL_NUMBER= 7.5
 %
-% Number of total iterations
-EXT_ITER= 5
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 53b942c7478c..037da02c3383 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -143,7 +143,6 @@ TIME_DISCRE_HEAT= EULER_IMPLICIT
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
-EXT_ITER= 11
 
 CONV_CRITERIA= RESIDUAL
 
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index af80b3c9ccb2..5e98761482f2 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -36,9 +36,6 @@ READ_BINARY_RESTART= NO
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
 
-SINGLEZONE_DRIVER = YES
-ITER = 11
-
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -106,7 +103,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -263,3 +260,7 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA)
+
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 44443a50af48..d2faf58c1e33 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -36,9 +36,6 @@ READ_BINARY_RESTART= NO
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
 
-SINGLEZONE_DRIVER = YES
-ITER = 11
-
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -106,7 +103,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 10000
+ITER= 10000
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -262,3 +259,7 @@ WRT_SOL_FREQ= 1000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_KINETIC_ENERGY, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_AOA)
+

From 71fd70d070e7f64aa4acfd4073b75a70b90e2ab6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 26 Apr 2019 11:28:07 +0200
Subject: [PATCH 251/539] Fixing include

---
 SU2_CFD/src/output/output_adj_heat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
index ac3e5e61ebc4..0233de0b3345 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/output/output_adj_heat.hpp"
+#include "../../include/output/output_adj_heat.hpp"
 
 CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   

From 439a71c0c77b7a01583428c87ce3a59ae51cf8f3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 26 Apr 2019 16:42:28 +0200
Subject: [PATCH 252/539] Small fixes

---
 Common/src/config_structure.cpp               |  7 +++++--
 .../include/output/output_adj_elasticity.hpp  | 18 ----------------
 SU2_CFD/include/output/output_driver.hpp      |  4 ++--
 SU2_CFD/src/driver_adjoint_singlezone.cpp     | 10 +++++++--
 SU2_CFD/src/iteration_structure.cpp           | 19 ++++++++++++-----
 SU2_CFD/src/output/output_adj_elasticity.cpp  |  6 ------
 SU2_CFD/src/output/output_adj_flow_comp.cpp   |  3 ++-
 SU2_CFD/src/output/output_adj_flow_inc.cpp    |  9 +++++++-
 SU2_CFD/src/output/output_flow_inc.cpp        |  2 +-
 SU2_CFD/src/output/output_structure.cpp       |  2 +-
 SU2_CFD/src/output/output_su2.cpp             | 21 -------------------
 11 files changed, 41 insertions(+), 60 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 2486b6cd98ea..aed527ae1bd0 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3014,7 +3014,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   if (Kind_Solver == FEM_ELASTICITY) {
     nMGLevels = 0;
-    if (Dynamic_Analysis == STATIC) nIter = 1;
+    if (Dynamic_Analysis == STATIC) nTimeIter = 1;
   }
 
   /*--- Initialize the ofstream ConvHistFile. ---*/
@@ -7870,7 +7870,10 @@ bool CConfig::GetVolumetric_Movement(){
     volumetric_movement = true;
   }
   
-  if (Kind_SU2 == SU2_DEF || Kind_SU2 == SU2_DOT){ volumetric_movement = true;}
+  if (Kind_SU2 == SU2_DEF || 
+      Kind_SU2 == SU2_DOT || 
+      DirectDiff)
+  { volumetric_movement = true;}
   return volumetric_movement;
 }
 
diff --git a/SU2_CFD/include/output/output_adj_elasticity.hpp b/SU2_CFD/include/output/output_adj_elasticity.hpp
index 1b5e7ed52199..f772bdd9385c 100644
--- a/SU2_CFD/include/output/output_adj_elasticity.hpp
+++ b/SU2_CFD/include/output/output_adj_elasticity.hpp
@@ -73,24 +73,6 @@ class CAdjElasticityOutput : public COutput {
    */
   void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
 
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config);
-
   /*!
    * \brief SetVolumeOutputFields
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/output_driver.hpp b/SU2_CFD/include/output/output_driver.hpp
index 664584dea76f..9f84808902e1 100644
--- a/SU2_CFD/include/output/output_driver.hpp
+++ b/SU2_CFD/include/output/output_driver.hpp
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include "../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/mpi_structure.hpp"
 
 #ifdef HAVE_CGNS
   #include "cgnslib.h"
@@ -51,7 +51,7 @@
 #include <fstream>
 
 #include "output.hpp"
-#include "../../Common/include/config_structure.hpp"
+#include "../../../Common/include/config_structure.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/src/driver_adjoint_singlezone.cpp b/SU2_CFD/src/driver_adjoint_singlezone.cpp
index 0c0903b48a08..36ada70a2424 100644
--- a/SU2_CFD/src/driver_adjoint_singlezone.cpp
+++ b/SU2_CFD/src/driver_adjoint_singlezone.cpp
@@ -49,7 +49,11 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
 
 
   /*--- Store the number of internal iterations that will be run by the adjoint solver ---*/
-  nAdjoint_Iter = config_container[ZONE_0]->GetnIter();
+  if (!config_container[ZONE_0]->GetTime_Domain())
+    nAdjoint_Iter = config_container[ZONE_0]->GetnIter();
+  else {
+    nAdjoint_Iter = config_container[ZONE_0]->GetnInner_Iter();
+  }
 
   /*--- Store the pointers ---*/
   config      = config_container[ZONE_0];
@@ -115,6 +119,8 @@ void CDiscAdjSinglezoneDriver::Preprocess(unsigned long TimeIter) {
   /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
 
   config_container[ZONE_0]->SetExtIter(TimeIter);
+  
+  config_container[ZONE_0]->SetTimeIter(TimeIter);
 
   /*--- NOTE: Inv Design Routines moved to CDiscAdjFluidIteration::Preprocess ---*/
 
@@ -146,7 +152,7 @@ void CDiscAdjSinglezoneDriver::Run() {
      *--- of the previous iteration. The values are passed to the AD tool.
      *--- Issues with iteration number should be dealt with once the output structure is in place. ---*/
 
-    config->SetIntIter(Adjoint_Iter);
+    config->SetInnerIter(Adjoint_Iter);
     if(!config->GetTime_Domain() && (MainVariables == FLOW_CONS_VARS))
       config->SetExtIter(Adjoint_Iter);
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 8ec0f4c3d984..0664ab3e22c6 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -2900,10 +2900,6 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
   integration_container[val_iZone][val_iInst][ADJFEA_SOL]->Convergence_Monitoring(geometry_container[val_iZone][val_iInst][MESH_0],config_container[val_iZone],
                                                                                   IntIter,log10(solver_container[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)), MESH_0);
 
-  /*--- Write the convergence history (only screen output) ---*/
-
-  if(IntIter != nIntIter-1)
-     output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), IntIter);
 
 
   if (dynamic){
@@ -3204,7 +3200,20 @@ bool CDiscAdjFEAIteration::Monitor(COutput *output,
     CVolumetricMovement ***grid_movement,
     CFreeFormDefBox*** FFDBox,
     unsigned short val_iZone,
-    unsigned short val_iInst)     { return false; }
+    unsigned short val_iInst)     { 
+
+  /*--- Write the convergence history (only screen output) ---*/
+  
+  output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], 
+                            solver_container[val_iZone][INST_0][MESH_0],
+                            config_container[val_iZone], 
+                            config_container[val_iZone]->GetTimeIter(), 
+                            config_container[val_iZone]->GetOuterIter(),
+                            config_container[val_iZone]->GetInnerIter());
+  
+  return false;
+  
+}
 void CDiscAdjFEAIteration::Postprocess(COutput *output,
     CIntegration ****integration_container,
     CGeometry ****geometry_container,
diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
index 2ce4d3b61ec8..3040248fd6f6 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -100,12 +100,6 @@ CAdjElasticityOutput::~CAdjElasticityOutput(void) {
 
 }
 
-inline bool CAdjElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true; }
-
-inline bool CAdjElasticityOutput::WriteScreen_Header(CConfig *config) { return true; }
-
-inline bool CAdjElasticityOutput::WriteScreen_Output(CConfig *config) { return true; }
-
 void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Iteration numbers
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index dd1e1d39e6fa..2a3d2ca5395c 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -55,6 +55,7 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   }
 
   if (nRequestedScreenFields == 0){
+    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
     if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");
     RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
@@ -262,7 +263,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
       break;  
     case SST:
       SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
-      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
+      SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
       break;
     default: break;
     }
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index e1c32c572ebf..f2fc5f8f13b3 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -59,6 +59,7 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsig
   }
   
   if (nRequestedScreenFields == 0){
+    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
     if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
     RequestedScreenFields.push_back("INNER_ITER");    
     RequestedScreenFields.push_back("RMS_ADJ_PRESSURE");
@@ -211,6 +212,10 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
   AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the inlet velocity.
+  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  /// DESCRIPTION: Sensitivity of the objective function with respect to the outlet pressure.
+  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
   /// DESCRIPTION: Currently used wall-clock time.
@@ -273,7 +278,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       break;  
     case SST:
       SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
-      SetHistoryOutputValue("MAX_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
+      SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
       break;
     default: break;
     }
@@ -312,6 +317,8 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
+  SetHistoryOutputValue("SENS_VEL_IN", adjflow_solver->GetTotal_Sens_ModVel());
+  SetHistoryOutputValue("SENS_PRESS_OUT", adjflow_solver->GetTotal_Sens_BPress());
 
 }
 
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index 7f9fcddac8aa..a19334d8377a 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -304,7 +304,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
+    if (multizone) SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 789f6268afaa..f54a2f770e1b 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5828,7 +5828,7 @@ bool COutput::WriteScreen_Header(CConfig *config) {
       write_header = (((curr_TimeIter - config->GetRestart_Iter()) % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);    
     }
   } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetIntIter() == 0;
+    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetInnerIter() == 0;
   }
 
   /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
diff --git a/SU2_CFD/src/output/output_su2.cpp b/SU2_CFD/src/output/output_su2.cpp
index 1e13ef4dda7c..f41155f43059 100644
--- a/SU2_CFD/src/output/output_su2.cpp
+++ b/SU2_CFD/src/output/output_su2.cpp
@@ -295,27 +295,6 @@ void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
     
 //    remove(str.c_str());
     
-    /*--- Get the total number of periodic transformations ---*/
-    
-    nPeriodic = config->GetnPeriodicIndex();
-    output_file << "NPERIODIC= " << nPeriodic << endl;
-    
-    /*--- From iPeriodic obtain the iMarker ---*/
-    
-    for (iPeriodic = 0; iPeriodic < nPeriodic; iPeriodic++) {
-      
-      /*--- Retrieve the supplied periodic information. ---*/
-      
-      center = config->GetPeriodicCenter(iPeriodic);
-      angles = config->GetPeriodicRotation(iPeriodic);
-      transl = config->GetPeriodicTranslate(iPeriodic);
-      
-      output_file << "PERIODIC_INDEX= " << iPeriodic << endl;
-      output_file << center[0] << "\t" << center[1] << "\t" << center[2] << endl;
-      output_file << angles[0] << "\t" << angles[1] << "\t" << angles[2] << endl;
-      output_file << transl[0] << "\t" << transl[1] << "\t" << transl[2] << endl;
-      
-    }
     output_file.close();
   }
 

From 43304c660bcedf43b727811c96c153eb160963f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 26 Apr 2019 16:43:40 +0200
Subject: [PATCH 253/539] Added direct output to adjoint driver

---
 SU2_CFD/include/driver_structure.hpp      |  2 +-
 SU2_CFD/include/output/output.hpp         |  6 ++++--
 SU2_CFD/src/driver_adjoint_singlezone.cpp | 11 +++++++++++
 SU2_CFD/src/output/output_structure.cpp   |  8 ++++----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 78f9e6093df8..aef39f1275f5 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -1439,7 +1439,7 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
   CIntegration **integration;                   /*!< \brief Container vector with all the integration methods. */
   CGeometry *geometry;                          /*!< \brief Geometrical definition of the problem. */
   CSolver **solver;                             /*!< \brief Container vector with all the solutions. */
-
+  COutput *direct_output;
 
 public:
 
diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 24866828abd1..00c862c7bdd5 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -309,14 +309,16 @@ class COutput {
   /*!
    * \brief Preprocess the history output by setting the history fields and opening the history file.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] wrt - If <TRUE> prepares history file for writing.
    */
-  void PreprocessHistoryOutput(CConfig *config);  
+  void PreprocessHistoryOutput(CConfig *config, bool wrt = true);  
   
   /*!
    * \brief Preprocess the history output by setting the history fields and opening the history file.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] wrt - If <TRUE> prepares history file for writing.
    */
-  void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config);  
+  void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt = true);  
   
   
   /*!
diff --git a/SU2_CFD/src/driver_adjoint_singlezone.cpp b/SU2_CFD/src/driver_adjoint_singlezone.cpp
index 36ada70a2424..dfde26f393e4 100644
--- a/SU2_CFD/src/driver_adjoint_singlezone.cpp
+++ b/SU2_CFD/src/driver_adjoint_singlezone.cpp
@@ -67,6 +67,8 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
 
   /*--- Determine if the problem is a turbomachinery problem ---*/
   bool turbo = config->GetBoolTurbomachinery();
+  
+  bool compressible = config->GetKind_Regime() == COMPRESSIBLE;
 
   /*--- Initialize the direct iteration ---*/
 
@@ -77,6 +79,8 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
       cout << "Direct iteration: Euler/Navier-Stokes/RANS equation." << endl;
     if (turbo) direct_iteration = new CTurboIteration(config);
     else       direct_iteration = new CFluidIteration(config);
+    if (compressible) direct_output = new CFlowCompOutput(config, geometry, solver, ZONE_0);
+    else direct_output = new CFlowIncOutput(config, geometry, solver, ZONE_0);
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
@@ -85,6 +89,7 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: Euler/Navier-Stokes/RANS equation." << endl;
     direct_iteration = new CFEMFluidIteration(config);
+    direct_output = new CFlowCompFEMOutput(config, geometry, solver, ZONE_0);
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
@@ -93,6 +98,7 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: elasticity equation." << endl;
     direct_iteration = new CFEAIteration(config);
+    direct_output = new CElasticityOutput(config, geometry, ZONE_0);
     MainVariables = FEA_DISP_VARS;
     SecondaryVariables = NONE;
     break;
@@ -101,11 +107,14 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: heat equation." << endl;
     direct_iteration = new CHeatIteration(config);
+    direct_output = new CHeatOutput(config, geometry, ZONE_0);    
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
 
   }
+  
+ direct_output->PreprocessHistoryOutput(config, false);
 
 }
 
@@ -308,6 +317,8 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
   bool turbo        = (config->GetBoolTurbomachinery());
 
   ObjFunc = 0.0;
+  
+  direct_output->SetHistory_Output(geometry, solver, config);
 
   /*--- Specific scalar objective functions ---*/
 
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index f54a2f770e1b..ddf83c4e129a 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5412,7 +5412,7 @@ void COutput::SetScreen_Output(CConfig *config) {
   }
 }
 
-void COutput::PreprocessHistoryOutput(CConfig *config){
+void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
 
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
@@ -5423,7 +5423,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     
     Postprocess_HistoryFields(config);
     
-    if (rank == MASTER_NODE){
+    if (rank == MASTER_NODE && wrt){
       
       /*--- Check for consistency and remove fields that are requested but not available --- */
       
@@ -5445,14 +5445,14 @@ void COutput::PreprocessHistoryOutput(CConfig *config){
     
 }
 
-void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config){
+void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
   
   
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
-  if (rank == MASTER_NODE){
+  if (rank == MASTER_NODE && wrt){
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    

From 58e5394b16d5aa95228c14cf60960b4db5b67b43 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 26 Apr 2019 16:55:36 +0200
Subject: [PATCH 254/539] adapted tools.py for new direct diff header names

---
 SU2_PY/SU2/io/tools.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index fb90446bfba5..5750085e1162 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -222,16 +222,16 @@ def get_headerMap(nZones = 1):
                  "ComboObj"        : "COMBO"                   ,
                  "Time(min)"       : "TIME"                    ,
                  'Time(min)"\n'    : "TIME"                    , # TDE hack for paraview
-                 "D(CL)"           : "D_LIFT"                  ,
-                 "D(CD)"           : "D_DRAG"                  ,
-                 "D(CSF)"          : "D_SIDEFORCE"             ,
-                 "D(CMx)"          : "D_MOMENT_X"              ,
-                 "D(CMy)"          : "D_MOMENT_Y"              ,
-                 "D(CMz)"          : "D_MOMENT_Z"              ,
-                 "D(CFx)"          : "D_FORCE_X"               ,
-                 "D(CFy)"          : "D_FORCE_Y"               ,
-                 "D(CFz)"          : "D_FORCE_Z"               ,
-                 "D(CL/CD)"        : "D_EFFICIENCY"            ,
+                 "d[CL]"           : "D_LIFT"                  ,
+                 "d[CD]"           : "D_DRAG"                  ,
+                 "d[CSF]"          : "D_SIDEFORCE"             ,
+                 "d[CMx]"          : "D_MOMENT_X"              ,
+                 "d[CMy]"          : "D_MOMENT_Y"              ,
+                 "d[CMz]"          : "D_MOMENT_Z"              ,
+                 "d[CFx]"          : "D_FORCE_X"               ,
+                 "d[CFy]"          : "D_FORCE_Y"               ,
+                 "d[CFz]"          : "D_FORCE_Z"               ,
+                 "d[CEff]"        : "D_EFFICIENCY"            ,
                  "D(Custom_ObjFunc)" : "D_CUSTOM_OBJFUNC"      ,
                  "D(HeatFlux_Total)" : "D_HEAT"                ,
                  "D(HeatFlux_Maximum)" : "D_HEAT_MAX"          ,

From 1749ec91230e67746e32eb3e95ed438bdb1088ec Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 26 Apr 2019 16:56:25 +0200
Subject: [PATCH 255/539] Adapted AD test cases

---
 .../naca0012/inv_NACA0012_FD.cfg               |  5 ++++-
 TestCases/disc_adj_fea/configAD_fem.cfg        |  7 +++----
 TestCases/disc_adj_heat/disc_adj_heat.cfg      |  3 +++
 .../naca0012/incomp_NACA0012_disc.cfg          |  9 ++++-----
 .../cylinder/heated_cylinder.cfg               |  9 ++++-----
 .../naca0012/turb_naca0012_sa.cfg              |  9 ++++-----
 .../naca0012/turb_naca0012_sst.cfg             |  9 ++++-----
 TestCases/disc_adj_rans/cylinder/cylinder.cfg  | 15 ++++++---------
 .../disc_adj_rans/cylinder_DT_1ST/cylinder.cfg | 14 ++++++--------
 .../multiple_ffd/naca0012/inv_NACA0012_ffd.cfg |  5 ++---
 TestCases/serial_regression_AD.py              | 18 +++++++++---------
 11 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index e99157d47bae..ba2c4dcdd7ad 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -103,7 +103,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 10
+ITER= 10
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -316,6 +316,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% History output
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, D_AERO_COEFF)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index e593def3ad13..2f9c97bd7223 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -51,12 +51,11 @@ RESIDUAL_FEM_ETOL = -9.0
 RESIDUAL_CRITERIA_FEM = ABSOLUTE
 
 CONV_FILENAME= history
-VOLUME_STRUCTURE_FILENAME= beam
-WRITE_CONV_FILENAME_FSI = NO
+VOLUME_FILENAME= beam
 BREAKDOWN_FILENAME= forces_breakdown.dat
 
-SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam.dat
+RESTART_FILENAME= restart_beam.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 037da02c3383..8e83f8b2c7f7 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -249,3 +249,6 @@ CONSOLE_OUTPUT_VERBOSITY= HIGH
 %WRT_BINARY_RESTART= NO
 
 %READ_BINARY_RESTART= NO
+
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_NU_TILDE, RMS_ADJ_HEAT, SENS_VEL_IN, SENS_PRESS_OUT)
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index bd35c1b38e7e..bbe01a7874c2 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -30,9 +30,6 @@ READ_BINARY_RESTART= NO
 % Regime type (COMPRESSIBLE, INCOMPRESSIBLE, FREESURFACE)
 REGIME_TYPE= INCOMPRESSIBLE
 
-SINGLEZONE_DRIVER = YES
-ITER = 21
-
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
 % Initial density for incompressible flows
@@ -88,7 +85,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 501
+ITER= 501
 %
 % Objective function in gradient evaluation   (DRAG, LIFT, SIDEFORCE, MOMENT_X,
 %                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
@@ -243,7 +240,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_VELOCITY-X, SENS_PRESS, SENS_AOA)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % List of design variables (Design variables are separated by semicolons)
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 4f3dac68c792..c5a9b53650ac 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -27,9 +27,6 @@ MATH_PROBLEM= DISCRETE_ADJOINT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 
-SINGLEZONE_DRIVER = YES
-ITER = 21
-
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
 % Density model within the incompressible flow solver.
@@ -142,7 +139,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 10.0, 10000.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 1000
+ITER= 1000
 %
 % Objective function in gradient evaluation   (DRAG, LIFT, SIDEFORCE, MOMENT_X,
 %                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
@@ -323,7 +320,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output 
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_HEAT, SENS_PRESS, SENS_AOA)
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
 % Kind of deformation (NO_DEFORMATION, TRANSLATION, ROTATION, SCALE,
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 2ce8a01eedb6..ae550f34aacb 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -27,10 +27,6 @@ REGIME_TYPE= INCOMPRESSIBLE
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
-SINGLEZONE_DRIVER = YES
-ITER = 11
-
 % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------%
 %
 % Free-stream density (1.2886 Kg/m^3 (air), 998.2 Kg/m^3 (water))
@@ -99,7 +95,7 @@ MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Objective function in gradient evaluation   (DRAG, LIFT, SIDEFORCE, MOMENT_X,
 %                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
@@ -298,6 +294,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index e72f63c64038..07f74311d721 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -28,9 +28,6 @@ REGIME_TYPE= INCOMPRESSIBLE
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 
-SINGLEZONE_DRIVER = YES
-ITER = 11
-
 % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------%
 %
 % Free-stream density (1.2886 Kg/m^3 (air), 998.2 Kg/m^3 (water))
@@ -99,7 +96,7 @@ MAX_DELTA_TIME= 1E6
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Objective function in gradient evaluation   (DRAG, LIFT, SIDEFORCE, MOMENT_X,
 %                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
@@ -298,7 +295,9 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_KINETIC_ENERGY, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_GEO)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % List of design variables (Design variables are separated by semicolons)
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index ab35172630c1..3ccbed2e0ee8 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -31,10 +31,8 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 
-SINGLEZONE_DRIVER = YES
 TIME_DOMAIN = YES
 TIME_ITER = 10
-ITER = 30
 %
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
@@ -43,16 +41,16 @@ ITER = 30
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0015
+TIME_STEP= 0.0015
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 3.75
+MAX_TIME= 3.75
 % 2500 iterations - 3.75
 % 3500 iterations - 5.25
 % 5000 iterations - 7.50
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 30
+INNER_ITER= 30
 %
 % Direct iteration to start the adjoint solver
 UNST_ADJOINT_ITER= 10
@@ -126,9 +124,6 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
-% Number of total iterations
-EXT_ITER= 10
-%
 % Objective function
 OBJECTIVE_FUNCTION=DRAG
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
@@ -281,6 +276,9 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 1
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
@@ -332,7 +330,6 @@ DEFORM_NONLINEAR_ITER= 1
 DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 % Print the residuals during mesh deformation to the console (YES, NO)
-MARKER_MOVING=(Cylinder)
 DEFORM_CONSOLE_OUTPUT= YES
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 56e55b7a73dd..d2718643a875 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -40,7 +40,6 @@ WRT_SRF_SOL= NO
 SINGLEZONE_DRIVER = YES
 TIME_DOMAIN = YES
 TIME_ITER = 10
-ITER = 30
 %
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
@@ -49,16 +48,16 @@ ITER = 30
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-1ST_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0015
+TIME_STEP= 0.0015
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 3.75
+MAX_TIME= 3.75
 % 2500 iterations - 3.75
 % 3500 iterations - 5.25
 % 5000 iterations - 7.50
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 30
+INNER_ITER= 30
 %
 % Direct iteration to start the adjoint solver
 UNST_ADJOINT_ITER= 10
@@ -132,8 +131,6 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
-% Number of total iterations
-EXT_ITER= 10
 %
 % Objective function
 OBJECTIVE_FUNCTION=DRAG
@@ -287,7 +284,9 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 1
-
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
 % Kind of deformation (TRANSLATION, ROTATION, SCALE,
@@ -338,7 +337,6 @@ DEFORM_NONLINEAR_ITER= 1
 DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 % Print the residuals during mesh deformation to the console (YES, NO)
-MARKER_MOVING=(Cylinder)
 DEFORM_CONSOLE_OUTPUT= YES
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 6f595c883fdd..20a67102e658 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -28,7 +28,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 
-ITER = 10
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -96,7 +95,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 10
+ITER= 10
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
@@ -340,7 +339,7 @@ WRT_CON_FREQ_DUALTIME= 10
 %
 % Output rind layers in the solution files
 WRT_HALO= NO
-
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, D_AERO_COEFF)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
 %    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 394518c89357..5bd0bc652cc7 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -234,15 +234,15 @@ def main():
     ###################################
    
     # Structural model
-    discadj_fsi           = TestCase('discadj_fsi')
-    discadj_fsi.cfg_dir   = "disc_adj_fsi"
-    discadj_fsi.cfg_file  = "configAD_fsi.cfg" 
-    discadj_fsi.test_iter = 3000
-    discadj_fsi.test_vals = [0.958848,-0.157183,0.658415,1.302076] #last 4 columns
-    discadj_fsi.su2_exec  = "SU2_CFD_AD"
-    discadj_fsi.timeout   = 1600
-    discadj_fsi.tol       = 0.00001
-    test_list.append(discadj_fsi)      
+#    discadj_fsi           = TestCase('discadj_fsi')
+#    discadj_fsi.cfg_dir   = "disc_adj_fsi"
+#    discadj_fsi.cfg_file  = "configAD_fsi.cfg" 
+#    discadj_fsi.test_iter = 3000
+#    discadj_fsi.test_vals = [0.958848,-0.157183,0.658415,1.302076] #last 4 columns
+#    discadj_fsi.su2_exec  = "SU2_CFD_AD"
+#    discadj_fsi.timeout   = 1600
+#    discadj_fsi.tol       = 0.00001
+#    test_list.append(discadj_fsi)      
 
     ######################################
     ### RUN TESTS                      ###

From 7263f43dfb507df7bb0b2ba9156afc9d775b5578 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 29 Apr 2019 12:08:55 +0200
Subject: [PATCH 256/539] Some bugfixes [skip travis]

---
 Common/src/config_structure.cpp              |  4 +-
 SU2_CFD/src/driver_direct_multizone.cpp      |  1 -
 SU2_CFD/src/driver_structure.cpp             |  4 --
 SU2_CFD/src/output/output_adj_elasticity.cpp |  4 +-
 SU2_CFD/src/output/output_adj_flow_comp.cpp  |  4 +-
 SU2_CFD/src/output/output_adj_flow_inc.cpp   |  4 +-
 SU2_CFD/src/output/output_adj_heat.cpp       |  4 +-
 SU2_CFD/src/output/output_baseline.cpp       | 38 +++++++++++++++++++
 SU2_CFD/src/output/output_driver.cpp         |  2 +-
 SU2_CFD/src/output/output_elasticity.cpp     |  4 +-
 SU2_CFD/src/output/output_flow.cpp           | 39 +++++++++++++++++++-
 SU2_CFD/src/output/output_flow_comp.cpp      |  4 +-
 SU2_CFD/src/output/output_flow_comp_fem.cpp  |  4 +-
 SU2_CFD/src/output/output_flow_inc.cpp       |  2 +-
 SU2_CFD/src/output/output_heat.cpp           |  4 +-
 SU2_CFD/src/output/output_mesh.cpp           | 37 ++++++++++++++++++-
 SU2_CFD/src/output/output_su2.cpp            |  3 +-
 SU2_DOT/src/SU2_DOT.cpp                      |  6 +--
 18 files changed, 135 insertions(+), 33 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index aed527ae1bd0..0e32f300a953 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1658,10 +1658,10 @@ void CConfig::SetConfig_Options() {
   /*!\brief RESTART_ADJ_FILENAME  \n DESCRIPTION: Output file restart adjoint. Objective function abbreviation will be appended. \ingroup Config*/
   addStringOption("RESTART_ADJ_FILENAME", Restart_AdjFileName, string("restart_adj.dat"));
   /*!\brief VOLUME_FLOW_FILENAME  \n DESCRIPTION: Output file flow (w/o extension) variables \ingroup Config */
-  addStringOption("VOLUME_FILENAME", Volume_FileName, string("flow"));
+  addStringOption("VOLUME_FILENAME", Volume_FileName, string("vol_solution"));
   /*!\brief VOLUME_ADJ_FILENAME
    *  \n DESCRIPTION: Output file adjoint (w/o extension) variables  \ingroup Config*/
-  addStringOption("VOLUME_ADJ_FILENAME", Adj_FileName, string("adjoint"));
+  addStringOption("VOLUME_ADJ_FILENAME", Adj_FileName, string("adj_vol_solution"));
   /*!\brief GRAD_OBJFUNC_FILENAME
    *  \n DESCRIPTION: Output objective function gradient  \ingroup Config*/
   addStringOption("GRAD_OBJFUNC_FILENAME", ObjFunc_Grad_FileName, string("of_grad.dat"));
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index a9e445e1c9ef..0ec86d608893 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -142,7 +142,6 @@ CMultizoneDriver::~CMultizoneDriver(void) {
   delete [] init_res;
   delete [] residual;
   delete [] residual_rel;
-  delete [] nVarZone;
 
   delete [] prefixed_motion;
 
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 8b6d7559a891..a267e5d1839f 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3257,8 +3257,6 @@ void CDriver::Numerics_Postprocessing(CNumerics *****numerics_container,
 void CDriver::SetTransferTypes(){
   
   unsigned short donorZone, targetZone;
-  unsigned short nVar, nVarTransfer;
-
   unsigned short nMarkerTarget, iMarkerTarget, nMarkerDonor, iMarkerDonor;
 
   /*--- Initialize some useful booleans ---*/
@@ -3437,8 +3435,6 @@ void CDriver::SetTransferTypes(){
           transfer_types[donorZone][targetZone] = SLIDING_INTERFACE;
         }
         else if (fluid_donor && heat_target) {
-          nVarTransfer = 0;
-          nVar = 4;
           if(config_container[donorZone]->GetEnergy_Equation())
             transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_FS;
           else if (config_container[donorZone]->GetWeakly_Coupled_Heat())
diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
index 3040248fd6f6..7e115a02dcd8 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_adjoint_mean.cpp
+ * \file output_adj_elasticity.cpp
  * \brief Main subroutines for elasticity discrete adjoint output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 2a3d2ca5395c..035bc5f2d037 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_adjoint_mean.cpp
+ * \file output_adj_flow_comp.cpp
  * \brief Main subroutines for flow discrete adjoint output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index f2fc5f8f13b3..f73c28a733c6 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_adjoint_mean.cpp
+ * \file output_adj_flow_inc.cpp
  * \brief Main subroutines for flow discrete adjoint output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
index 0233de0b3345..fa749f4e8560 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_adjoint_heat.cpp
+ * \file output_adj_heat.cpp
  * \brief Main subroutines for flow discrete adjoint output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_baseline.cpp b/SU2_CFD/src/output/output_baseline.cpp
index 1e2c894aae50..720d4ed336d9 100644
--- a/SU2_CFD/src/output/output_baseline.cpp
+++ b/SU2_CFD/src/output/output_baseline.cpp
@@ -1,3 +1,41 @@
+/*!
+ * \file output_baseline.cpp
+ * \brief Main subroutines for flow discrete adjoint output
+ * \author R. Sanchez
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "../../include/output/output_baseline.hpp"
 
 CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
diff --git a/SU2_CFD/src/output/output_driver.cpp b/SU2_CFD/src/output/output_driver.cpp
index a1bbe76330cc..b4e7f3306f49 100644
--- a/SU2_CFD/src/output/output_driver.cpp
+++ b/SU2_CFD/src/output/output_driver.cpp
@@ -2,7 +2,7 @@
  * \file output_driver.cpp
  * \brief Main subroutines for multizone output
  * \author R. Sanchez, T. Albring
- * \version 6.1.0 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
index db65eab361c5..4632c305f785 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_direct_elasticity.cpp
+ * \file output_elasticity.cpp
  * \brief Main subroutines for FEA output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_flow.cpp b/SU2_CFD/src/output/output_flow.cpp
index 74aa88c5d889..c25f7ef831a7 100644
--- a/SU2_CFD/src/output/output_flow.cpp
+++ b/SU2_CFD/src/output/output_flow.cpp
@@ -1,4 +1,39 @@
-
+/*!
+ * \file output_flow.cpp
+ * \brief Main subroutines for compressible flow output
+ * \author R. Sanchez
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "../../include/output/output_flow.hpp"
 
@@ -674,7 +709,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   bool *PointInDomain;
   string text_line, surfCp_filename;
   ifstream Surface_file;
-  char buffer[50], cstr[200];
+  char cstr[200];
   
   
   nPointLocal = geometry->GetnPoint();
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index c6bc27709739..f79420a91748 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_direct_mean.cpp
+ * \file output_flow_comp.cpp
  * \brief Main subroutines for compressible flow output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index d4345e2f2ec6..3cac6610d7e1 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_direct_mean.cpp
+ * \file output_flow_comp_fem.cpp
  * \brief Main subroutines for compressible flow output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index a19334d8377a..2fdb89fa3e79 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_direct_mean_inc.cpp
+ * \file output_flow_inc.cpp
  * \brief Main subroutines for incompressible flow output
  * \author R. Sanchez
  * \version 6.0.1 "Falcon"
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
index 8730df066f40..2c3f4f58ccaf 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/output_heat.cpp
@@ -1,8 +1,8 @@
 /*!
- * \file output_direct_heat.cpp
+ * \file output_heat.cpp
  * \brief Main subroutines for the heat solver output
  * \author R. Sanchez
- * \version 6.0.1 "Falcon"
+ * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
diff --git a/SU2_CFD/src/output/output_mesh.cpp b/SU2_CFD/src/output/output_mesh.cpp
index c1dd5ec1cba2..f771401b0df9 100644
--- a/SU2_CFD/src/output/output_mesh.cpp
+++ b/SU2_CFD/src/output/output_mesh.cpp
@@ -1,4 +1,39 @@
-
+/*!
+ * \file output_mesh.cpp
+ * \brief Main subroutines for the heat solver output
+ * \author R. Sanchez
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "../../include/output/output_mesh.hpp"
 
diff --git a/SU2_CFD/src/output/output_su2.cpp b/SU2_CFD/src/output/output_su2.cpp
index f41155f43059..dd07c96d564f 100644
--- a/SU2_CFD/src/output/output_su2.cpp
+++ b/SU2_CFD/src/output/output_su2.cpp
@@ -40,9 +40,8 @@
 void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   
   unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
-  unsigned short iMarker, iDim, nDim = geometry->GetnDim(), iChar, iPeriodic, nPeriodic = 0, VTK_Type, nMarker_;
+  unsigned short iMarker, iDim, nDim = geometry->GetnDim(), iChar, VTK_Type, nMarker_;
   short SendTo;
-  su2double *center, *angles, *transl;
   ifstream input_file;
   string filename, Grid_Marker, text_line, Marker_Tag, str;
   string::size_type position;
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 502f42d7dcad..b852271d596c 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
   }
   
   /*--- Initialize the configuration of the driver ---*/
-  driver_config = new CConfig(config_file_name, SU2_DOT, nZone, VERB_NONE);
+  driver_config = new CConfig(config_file_name, SU2_DOT, nZone, false);
 
   /*--- Initialize a char to store the zone filename ---*/
   char zone_file_name[MAX_STRING_SIZE];
@@ -124,10 +124,10 @@ int main(int argc, char *argv[]) {
 
     if (driver_config->GetnConfigFiles() > 0){
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_DOT, iZone, nZone, true);
     }
     else{
-      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DOT, iZone, nZone, VERB_HIGH);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_DOT, iZone, nZone, true);
     }
     config_container[iZone]->SetMPICommunicator(MPICommunicator);
 

From ea435edab5a94e3179c116ca78508d93e1261929 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 29 Apr 2019 19:15:59 +0200
Subject: [PATCH 257/539] A couple of fixes and renaming of history fields

---
 SU2_CFD/include/output/output.hpp             |  2 +
 SU2_CFD/src/iteration_structure.cpp           |  1 -
 SU2_CFD/src/output/output_adj_flow_comp.cpp   | 24 ++++----
 SU2_CFD/src/output/output_adj_flow_inc.cpp    | 20 +++----
 SU2_CFD/src/output/output_flow_comp.cpp       | 56 +++++++++----------
 SU2_CFD/src/output/output_flow_comp_fem.cpp   |  4 +-
 SU2_CFD/src/output/output_flow_inc.cpp        | 56 +++++++++----------
 SU2_CFD/src/output/output_heat.cpp            |  2 +-
 SU2_CFD/src/output/output_structure.cpp       | 24 ++++++--
 SU2_CFD/src/output/output_tecplot.cpp         |  2 -
 .../naca0012/turb_naca0012_sst.cfg            |  2 +-
 .../naca0012/turb_NACA0012_sst.cfg            |  2 +-
 TestCases/nicf/LS89/turb_SST_PR.cfg           |  2 +-
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg |  2 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |  2 +-
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg   |  2 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg  |  2 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg  |  2 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg  |  2 +-
 .../naca0012/turb_NACA0012_uq_p1c1.cfg        |  2 +-
 .../naca0012/turb_NACA0012_uq_p1c2.cfg        |  2 +-
 TestCases/serial_regression_AD.py             | 10 ++--
 .../unsteady/square_cylinder/turb_square.cfg  |  2 +-
 23 files changed, 119 insertions(+), 106 deletions(-)

diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 00c862c7bdd5..7c5be9a50165 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -164,6 +164,8 @@ class COutput {
   unsigned long *nRowCum_InletFile;      /*!< \brief Counters for the number of points per marker in cumulative storage format in the inlet profile file. */
   su2double **InletCoords;  /*!< \brief Data structure for holding the merged inlet boundary coordinates from all ranks. */
 
+  bool no_writing;
+
 protected:
 
   int rank, 	  /*!< \brief MPI Rank. */
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 0664ab3e22c6..3f4e04cef933 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -2884,7 +2884,6 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
 
   bool dynamic = (config_container[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
 
-  unsigned long nIntIter = config_container[val_iZone]->GetnIter();
   unsigned long IntIter  = config_container[val_iZone]->GetIntIter();
 
   /*--- Extract the adjoints of the conservative input variables and store them for the next iteration ---*/
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 035bc5f2d037..6c79fd987b22 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -132,7 +132,7 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
       AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
       break;
@@ -160,7 +160,7 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
       AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
       break;
@@ -189,7 +189,7 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_KINETIC_ENERGY", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
       /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
       AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
       break;
@@ -241,7 +241,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+      SetHistoryOutputValue("RMS_ADJ_TKE", log10(adjturb_solver->GetRes_RMS(0)));
       SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
       break;
     default: break;
@@ -262,7 +262,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+      SetHistoryOutputValue("MAX_ADJ_TKE", log10(adjturb_solver->GetRes_Max(0)));
       SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
       break;
     default: break;
@@ -285,7 +285,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
         SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
         break;  
       case SST:
-        SetHistoryOutputValue("BGS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("BGS_ADJ_TKE", log10(adjturb_solver->GetRes_BGS(0)));
         SetHistoryOutputValue("BGS_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
         break;
       default: break;
@@ -333,7 +333,7 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Adjoint kinetic energy.
-      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
+      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION");
       /// DESCRIPTION: Adjoint dissipation.
       AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
       break;
@@ -366,7 +366,7 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
   /// DESCRIPTION: Residual of the adjoint energy. 
   AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
-  if (!config->GetFrozen_Visc_Disc()){      
+  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Residual of the nu tilde. 
@@ -374,9 +374,9 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");
       /// DESCRIPTION: Residual of the adjoint dissipation.
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
       break;
     default: break;
     }
@@ -428,7 +428,7 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     // Turbulent 
     switch(turb_model){
     case SST:
-      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+      SetVolumeOutputValue("ADJ_TKE", iPoint, Node_AdjTurb->GetSolution(0));
       SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
       break;
     case SA: case SA_COMP: case SA_E: 
@@ -454,7 +454,7 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){  
     switch(config->GetKind_Turb_Model()){
     case SST:
-      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      SetVolumeOutputValue("RES_ADJ_TKE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
       SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
       break;
     case SA: case SA_COMP: case SA_E: 
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index f73c28a733c6..fc804ba50bb0 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -135,7 +135,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_KINETIC_ENERGY", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
       AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
       break;
@@ -163,7 +163,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_KINETIC_ENERGY", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
       AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
       break;
@@ -191,7 +191,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_KINETIC_ENERGY", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
       /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
       AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
       break;
@@ -252,7 +252,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("RMS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_RMS(0)));
+      SetHistoryOutputValue("RMS_ADJ_TKE", log10(adjturb_solver->GetRes_RMS(0)));
       SetHistoryOutputValue("RMS_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_RMS(1)));
       break;
     default: break;
@@ -277,7 +277,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("MAX_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_Max(0)));
+      SetHistoryOutputValue("MAX_ADJ_TKE", log10(adjturb_solver->GetRes_Max(0)));
       SetHistoryOutputValue("MAX_ADJ_DISSIPATION",    log10(adjturb_solver->GetRes_Max(1)));
       break;
     default: break;
@@ -304,7 +304,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
         SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
         break;  
       case SST:
-        SetHistoryOutputValue("BGS_ADJ_KINETIC_ENERGY", log10(adjturb_solver->GetRes_BGS(0)));
+        SetHistoryOutputValue("BGS_ADJ_TKE", log10(adjturb_solver->GetRes_BGS(0)));
         SetHistoryOutputValue("BGS_ADJOINT_DISSIPATION",    log10(adjturb_solver->GetRes_BGS(1)));
         break;
       default: break;
@@ -357,7 +357,7 @@ void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
       break;  
     case SST:
       /// DESCRIPTION: Adjoint kinetic energy.
-      AddVolumeOutput("ADJ_KINETIC_ENERGY", "Adjoint_TKE", "SOLUTION"); 
+      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION"); 
       /// DESCRIPTION: Adjoint dissipation.
       AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
       break;
@@ -400,7 +400,7 @@ void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
       /// DESCRIPTION: Residual of the adjoint kinetic energy. 
       AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
       /// DESCRIPTION: Residual of the adjoint dissipation.
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Omega", "RESIDUAL");    
+      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
       break;
     default: break;
     }
@@ -458,7 +458,7 @@ void CAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSo
   if (!config->GetFrozen_Visc_Disc()){         
     switch(turb_model){
     case SST:
-      SetVolumeOutputValue("ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0));
+      SetVolumeOutputValue("ADJ_TKE", iPoint, Node_AdjTurb->GetSolution(0));
       SetVolumeOutputValue("ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1));
       break;
     case SA: case SA_COMP: case SA_E: 
@@ -480,7 +480,7 @@ void CAdjFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSo
   if (!config->GetFrozen_Visc_Disc()){            
     switch(config->GetKind_Turb_Model()){
     case SST:
-      SetVolumeOutputValue("RES_ADJ_KINETIC_ENERGY", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
+      SetVolumeOutputValue("RES_ADJ_TKE", iPoint, Node_AdjTurb->GetSolution(0) - Node_AdjTurb->GetSolution_Old(0));
       SetVolumeOutputValue("RES_ADJ_DISSIPATION", iPoint, Node_AdjTurb->GetSolution(1) - Node_AdjTurb->GetSolution_Old(1));
       break;
     case SA: case SA_COMP: case SA_E: 
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index f79420a91748..c5d19ef4adea 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -155,7 +155,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
     AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;
@@ -182,7 +182,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
     AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
     break;
@@ -209,7 +209,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
     AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
     break;
@@ -292,8 +292,8 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "TKE", "SOLUTION");
-    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
+    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
+    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -331,21 +331,21 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   }
 
   //Residuals
-  AddVolumeOutput("RESIDUAL_DENSITY", "Residual_Density", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_MOMENTUM-X", "Residual_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_MOMENTUM-Y", "Residual_Momentum_y", "RESIDUAL");
+  AddVolumeOutput("RES_DENSITY", "Residual_Density", "RESIDUAL");
+  AddVolumeOutput("RES_MOMENTUM-X", "Residual_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RES_MOMENTUM-Y", "Residual_Momentum_y", "RESIDUAL");
   if (nDim == 3)
-    AddVolumeOutput("RESIDUAL_MOMENTUM-Z", "Residual_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_ENERGY", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RES_MOMENTUM-Z", "Residual_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RES_ENERGY", "Residual_Energy", "RESIDUAL");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutput("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
@@ -362,7 +362,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   switch(config->GetKind_Turb_Model()){
   case SST:
     AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutput("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -423,7 +423,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   switch(config->GetKind_Turb_Model()){
   case SST:
     SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
-    SetVolumeOutputValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    SetVolumeOutputValue("DISSIPATION", iPoint, Node_Turb->GetSolution(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -450,24 +450,24 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
     SetVolumeOutputValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
   }
   
-  SetVolumeOutputValue("RESIDUAL_DENSITY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
-  SetVolumeOutputValue("RESIDUAL_MOMENTUM-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
-  SetVolumeOutputValue("RESIDUAL_MOMENTUM-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  SetVolumeOutputValue("RES_DENSITY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RES_MOMENTUM-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputValue("RES_MOMENTUM-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
   if (nDim == 3){
-    SetVolumeOutputValue("RESIDUAL_MOMENTUM-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
-    SetVolumeOutputValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+    SetVolumeOutputValue("RES_MOMENTUM-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputValue("RES_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
   } else {
-    SetVolumeOutputValue("RESIDUAL_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+    SetVolumeOutputValue("RES_ENERGY", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    SetVolumeOutputValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    SetVolumeOutputValue("RES_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RES_DISSIPATION", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RES_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     break;
   case NONE:
     break;
@@ -486,7 +486,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   switch(config->GetKind_Turb_Model()){
   case SST:
     SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
-    SetVolumeOutputValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    SetVolumeOutputValue("LIMITER_DISSIPATION", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -554,7 +554,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
     SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("RMS_KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_TKE", log10(turb_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   default: break;
@@ -575,7 +575,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
     SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("MAX_KINETIC_ENERGY", log10(turb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_TKE", log10(turb_solver->GetRes_Max(0)));
     SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
     break;
   default: break;
@@ -598,7 +598,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
       SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_TKE", log10(turb_solver->GetRes_BGS(0)));
       SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
       break;
     default: break;
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index 3cac6610d7e1..7e3232e41752 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -201,8 +201,8 @@ void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "TKE", "SOLUTION");
-    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
+    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
+    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index 2fdb89fa3e79..d1fd4cd07273 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -155,7 +155,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_KINETIC_ENERGY", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
     AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
     break;
@@ -182,7 +182,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_KINETIC_ENERGY", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
     AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
     break;
@@ -209,7 +209,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_KINETIC_ENERGY", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
     AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
     break;
@@ -261,7 +261,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("RMS_KINETIC_ENERGY", log10(turb_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("RMS_TKE", log10(turb_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
   }
@@ -276,7 +276,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
     break;  
   case SST:
-    SetHistoryOutputValue("MAX_KINETIC_ENERGY", log10(turb_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("MAX_TKE", log10(turb_solver->GetRes_Max(0)));
     SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
     break;
   }
@@ -292,7 +292,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
       SetHistoryOutputValue("BGS_NU_TILDE", log10(turb_solver->GetRes_BGS(0)));
       break;  
     case SST:
-      SetHistoryOutputValue("BGS_KINETIC_ENERGY", log10(turb_solver->GetRes_BGS(0)));
+      SetHistoryOutputValue("BGS_TKE", log10(turb_solver->GetRes_BGS(0)));
       SetHistoryOutputValue("BGS_DISSIPATION",    log10(turb_solver->GetRes_BGS(1)));
       break;
     }
@@ -352,8 +352,8 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "TKE", "SOLUTION");
-    AddVolumeOutput("OMEGA", "Omega", "SOLUTION");
+    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
+    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -397,21 +397,21 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   }
 
   //Residuals
-  AddVolumeOutput("RESIDUAL_PRESSURE", "Residual_Density", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_VELOCITY-X", "Residual_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_VELOCITY-Y", "Residual_Momentum_y", "RESIDUAL");
+  AddVolumeOutput("RES_PRESSURE", "Residual_Density", "RESIDUAL");
+  AddVolumeOutput("RES_VELOCITY-X", "Residual_Momentum_x", "RESIDUAL");
+  AddVolumeOutput("RES_VELOCITY-Y", "Residual_Momentum_y", "RESIDUAL");
   if (nDim == 3)
-    AddVolumeOutput("RESIDUAL_VELOCITY-Z", "Residual_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RESIDUAL_TEMPERATURE", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RES_VELOCITY-Z", "Residual_Momentum_z", "RESIDUAL");
+  AddVolumeOutput("RES_TEMPERATURE", "Residual_Energy", "RESIDUAL");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("RESIDUAL_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutput("RESIDUAL_OMEGA", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL");
+    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("RESIDUAL_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
     break;
   case NONE:
     break;
@@ -428,7 +428,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   switch(config->GetKind_Turb_Model()){
   case SST:
     AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutput("LIMITER_OMEGA", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "RESIDUAL");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -493,7 +493,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   switch(config->GetKind_Turb_Model()){
   case SST:
     SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
-    SetVolumeOutputValue("OMEGA", iPoint, Node_Turb->GetSolution(1));
+    SetVolumeOutputValue("DISSIPATION", iPoint, Node_Turb->GetSolution(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
@@ -525,24 +525,24 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     SetVolumeOutputValue("INTERMITTENCY", iPoint, Node_Turb->GetGammaBC());
   }
   
-  SetVolumeOutputValue("RESIDUAL_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
-  SetVolumeOutputValue("RESIDUAL_VELOCITY-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
-  SetVolumeOutputValue("RESIDUAL_VELOCITY-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
+  SetVolumeOutputValue("RES_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RES_VELOCITY-X", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 1));
+  SetVolumeOutputValue("RES_VELOCITY-Y", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 2));
   if (nDim == 3){
-    SetVolumeOutputValue("RESIDUAL_VELOCITY-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
-    SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
+    SetVolumeOutputValue("RES_VELOCITY-Z", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
+    SetVolumeOutputValue("RES_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 4));
   } else {
-    SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));   
+    SetVolumeOutputValue("RES_TEMPERATURE", iPoint, solver[FLOW_SOL]->LinSysRes.GetBlock(iPoint, 3));
   }
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    SetVolumeOutputValue("RESIDUAL_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
-    SetVolumeOutputValue("RESIDUAL_OMEGA", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
+    SetVolumeOutputValue("RES_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RES_DISSIPATION", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    SetVolumeOutputValue("RESIDUAL_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
+    SetVolumeOutputValue("RES_NU_TILDE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     break;
   case NONE:
     break;
@@ -561,7 +561,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   switch(config->GetKind_Turb_Model()){
   case SST:
     SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
-    SetVolumeOutputValue("LIMITER_OMEGA", iPoint, Node_Turb->GetLimiter_Primitive(1));
+    SetVolumeOutputValue("LIMITER_DISSIPATION", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
index 2c3f4f58ccaf..8119eb16156e 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/output_heat.cpp
@@ -162,7 +162,7 @@ void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
   SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(0));
   
   // Residuals    
-  SetVolumeOutputValue("RESIDUAL_TEMPERATURE", iPoint, solver[HEAT_SOL]->LinSysRes.GetBlock(iPoint, 0));
+  SetVolumeOutputValue("RES_TEMPERATURE", iPoint, solver[HEAT_SOL]->LinSysRes.GetBlock(iPoint, 0));
   
 }
 
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index ddf83c4e129a..d8048965f4d7 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -194,6 +194,18 @@ COutput::COutput(CConfig *config) {
   /*--- Default is not to use the FEM output merging --- */
   
   fem_output = false;
+
+  /*--- Default is to write history to file and screen --- */
+
+  no_writing = false;
+
+  Cauchy_Serie = new su2double[config->GetCauchy_Elems()];
+
+  Conv_Field = config->GetConv_Field();
+
+  Cauchy_Value = 0.0;
+  for (unsigned short iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
+    Cauchy_Serie[iCounter] = 0.0;
   
 }
 
@@ -243,7 +255,7 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   
   /*--- Output using only the master node ---*/
   
-  if (rank == MASTER_NODE) {
+  if (rank == MASTER_NODE && !no_writing) {
     
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config);
@@ -286,7 +298,7 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, uns
   
   /*--- Output using only the master node ---*/
   
-  if (rank == MASTER_NODE) {
+  if (rank == MASTER_NODE && !no_writing) {
     
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config[ZONE_0]);
@@ -5414,6 +5426,7 @@ void COutput::SetScreen_Output(CConfig *config) {
 
 void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
+    no_writing = !wrt;
 
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
@@ -5423,7 +5436,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
     
     Postprocess_HistoryFields(config);
     
-    if (rank == MASTER_NODE && wrt){
+    if (rank == MASTER_NODE && !no_writing){
       
       /*--- Check for consistency and remove fields that are requested but not available --- */
       
@@ -5447,12 +5460,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
   
-  
+  no_writing = !wrt;
+
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
-  if (rank == MASTER_NODE && wrt){
+  if (rank == MASTER_NODE && !no_writing){
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    
diff --git a/SU2_CFD/src/output/output_tecplot.cpp b/SU2_CFD/src/output/output_tecplot.cpp
index 22c07eb6d59d..c2c113331816 100644
--- a/SU2_CFD/src/output/output_tecplot.cpp
+++ b/SU2_CFD/src/output/output_tecplot.cpp
@@ -2128,7 +2128,6 @@ void COutput::SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geomet
   enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
   
   bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  unsigned short Kind_Solver = config->GetKind_Solver();
 
   /*--- Consistent data for Tecplot zones ---*/
   Debug            = 0;
@@ -3039,7 +3038,6 @@ void COutput::SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geome
   enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
   
   bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  unsigned short Kind_Solver = config->GetKind_Solver();
   
   file.str(string());
   
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index 07f74311d721..32861e22ccee 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -297,7 +297,7 @@ WRT_SOL_FREQ= 250
 WRT_CON_FREQ= 1
 %
 % Screen output
-SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_KINETIC_ENERGY, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_GEO)
+SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_AOA)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % List of design variables (Design variables are separated by semicolons)
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index d2faf58c1e33..39620df45a8d 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -261,5 +261,5 @@ WRT_SOL_FREQ= 1000
 WRT_CON_FREQ= 1
 %
 % Screen output
-SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_KINETIC_ENERGY, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_AOA)
+SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_AOA)
 
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 24d78d20f088..4bc38f0567aa 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -328,4 +328,4 @@ WRT_CON_FREQ= 1
 
 % 
 % Screen output
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index a5f0a4eef5b8..9a1fc78dcbe2 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -263,5 +263,5 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output fields
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
 
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index e27936c154d5..a675d5b817b1 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -453,4 +453,4 @@ WRT_LIMITERS= NO
 WRT_CSV_SOL= NO
 %
 % Screen output fields
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 37cc850af4f9..2964094c8532 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -244,5 +244,5 @@ WRT_SOL_FREQ= 250
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
 % Screen output fields
-SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
 
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index d2c222e80412..69e910770101 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -270,5 +270,5 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output 
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
 
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 587050c4a3b7..d63aa5ef7dea 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -270,4 +270,4 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output 
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 761d8aa6f89b..9fd5ad8b8b54 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -270,4 +270,4 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output 
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 29953c9e89df..0d9bfc931125 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -270,4 +270,4 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output 
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index 2f7fbc680aec..e9f82a545bf6 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -270,4 +270,4 @@ WRT_SOL_FREQ= 10000
 WRT_CON_FREQ= 1
 %
 % Screen output 
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 5bd0bc652cc7..2d708f6845e5 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [-0.776022, -0.795092, 319.800000, 0.000000] #last 4 columns
+    discadj_arina2k.test_vals    = [-0.776047, -0.795108, 3.1979e+02, 0.0000e+00] #last 4 columns
     discadj_arina2k.su2_exec     = "SU2_CFD_AD"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001
@@ -105,7 +105,7 @@ def main():
     discadj_rans_naca0012_sst.cfg_dir   = "disc_adj_rans/naca0012"
     discadj_rans_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
     discadj_rans_naca0012_sst.test_iter = 10
-    discadj_rans_naca0012_sst.test_vals = [-1.654903, -0.491485, 0.109157, 0.000011] #last 4 columns
+    discadj_rans_naca0012_sst.test_vals = [-0.491485, -7.124034, 0.109160, 0.000011] #last 4 columns
     discadj_rans_naca0012_sst.su2_exec  = "SU2_CFD_AD"
     discadj_rans_naca0012_sst.timeout   = 1600
     discadj_rans_naca0012_sst.tol       = 0.00001
@@ -161,7 +161,7 @@ def main():
     discadj_incomp_turb_NACA0012_sst.cfg_dir   = "disc_adj_incomp_rans/naca0012"
     discadj_incomp_turb_NACA0012_sst.cfg_file  = "turb_naca0012_sst.cfg"
     discadj_incomp_turb_NACA0012_sst.test_iter = 10
-    discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845759, -2.416668, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_turb_NACA0012_sst.test_vals = [-2.416670, -8.430657,  0.0000e+00, 0.0000e+00] #last 4 columns
     discadj_incomp_turb_NACA0012_sst.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_turb_NACA0012_sst.timeout   = 1600
     discadj_incomp_turb_NACA0012_sst.tol       = 0.00001
@@ -208,7 +208,7 @@ def main():
     discadj_fea.cfg_dir   = "disc_adj_fea"
     discadj_fea.cfg_file  = "configAD_fem.cfg" 
     discadj_fea.test_iter = 9
-    discadj_fea.test_vals = [-6.282767, -6.361594, -3.6413e-04, -8.7087e+00] #last 4 columns
+    discadj_fea.test_vals = [-6.282767, -6.361594, -0.000364, -8.708681] #last 4 columns
     discadj_fea.su2_exec  = "SU2_CFD_AD"
     discadj_fea.timeout   = 1600
     discadj_fea.tol       = 0.00001
@@ -223,7 +223,7 @@ def main():
     discadj_heat.cfg_dir   = "disc_adj_heat"
     discadj_heat.cfg_file  = "disc_adj_heat.cfg"
     discadj_heat.test_iter = 10
-    discadj_heat.test_vals = [3.139355, 1.144919, -1040.637744, -2464.935518] #last 4 columns
+    discadj_heat.test_vals = [3.139355, 1.144919, -1040.600000, -2464.900000] #last 4 columns
     discadj_heat.su2_exec  = "SU2_CFD_AD"
     discadj_heat.timeout   = 1600
     discadj_heat.tol       = 0.00001
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 1302352b38d8..650ee0586701 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -279,4 +279,4 @@ WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
 % 
 % Screen output 
-SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_KINETIC_ENERGY, RMS_DISSIPATION, LIFT, DRAG)
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)

From 9542d83d4cc9d1828bfe3809f76b53a33f61e85a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 29 Apr 2019 19:17:06 +0200
Subject: [PATCH 258/539] First implementation of new convergence monitoring

---
 Common/include/config_structure.hpp          |   6 +
 Common/include/config_structure.inl          |   2 +
 Common/src/config_structure.cpp              |   2 +
 SU2_CFD/include/output/output.hpp            |  14 +++
 SU2_CFD/src/driver_adjoint_singlezone.cpp    |   5 +-
 SU2_CFD/src/iteration_structure.cpp          |  12 +-
 SU2_CFD/src/output/output_adj_elasticity.cpp |   4 +
 SU2_CFD/src/output/output_adj_flow_comp.cpp  |   4 +
 SU2_CFD/src/output/output_adj_flow_inc.cpp   |   5 +
 SU2_CFD/src/output/output_adj_heat.cpp       |   5 +
 SU2_CFD/src/output/output_driver.cpp         |   6 +-
 SU2_CFD/src/output/output_elasticity.cpp     |   4 +
 SU2_CFD/src/output/output_flow_comp.cpp      |  13 ++-
 SU2_CFD/src/output/output_flow_comp_fem.cpp  |   7 +-
 SU2_CFD/src/output/output_flow_inc.cpp       |   7 +-
 SU2_CFD/src/output/output_heat.cpp           |   8 +-
 SU2_CFD/src/output/output_structure.cpp      | 111 ++++++++++++++++++-
 17 files changed, 201 insertions(+), 14 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 1ee6e300dbeb..dd3889b64491 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -101,6 +101,7 @@ class CConfig {
   su2double* EA_IntLimit; /*!< \brief Integration limits of the Equivalent Area computation */
   su2double AdjointLimit; /*!< \brief Adjoint variable limit */
   su2double* Obj_ChainRuleCoeff; /*!< \brief Array defining objective function for adjoint problem based on chain rule in terms of gradient w.r.t. density, velocity, pressure */
+  string ConvField;
   bool MG_AdjointFlow; /*!< \brief MG with the adjoint flow problem */
   su2double* SubsonicEngine_Cyl; /*!< \brief Coordinates of the box subsonic region */
   su2double* SubsonicEngine_Values; /*!< \brief Values of the box subsonic region */
@@ -9112,6 +9113,11 @@ class CConfig {
   */
   string GetVolumeOutput_Field(unsigned short iField);
 
+  /*
+  * \brief Get the convergence field for monitoring
+  */
+  string GetConv_Field();
+
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 6d08b99c7cb9..41399131f439 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2055,3 +2055,5 @@ inline unsigned short CConfig::GetEig_Val_Comp(void) {return eig_val_comp; }
 inline su2double CConfig::GetUQ_URLX(void) {return uq_urlx; }
 
 inline bool CConfig::GetUQ_Permute(void) { return uq_permute; }
+
+inline string CConfig::GetConv_Field(){ return ConvField; }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 0e32f300a953..e2b0660d5142 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1456,6 +1456,8 @@ void CConfig::SetConfig_Options() {
   /*!\brief CAUCHY_FUNC_ADJFLOW\n DESCRIPTION: Adjoint functional for the Cauchy criteria.\n OPTIONS: See \link Sens_Map \endlink. \n DEFAULT: SENS_GEOMETRY \ingroup Config*/
   addEnumOption("CAUCHY_FUNC_ADJFLOW", Cauchy_Func_AdjFlow, Sens_Map, SENS_GEOMETRY);
 
+  addStringOption("CONV_FIELD", ConvField, "");
+
   /*!\par CONFIG_CATEGORY: Multi-grid \ingroup Config*/
   /*--- Options related to Multi-grid ---*/
 
diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 7c5be9a50165..908118e0e730 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -186,6 +186,7 @@ class COutput {
   
   enum HistoryFieldType {           
     TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
+    TYPE_REL_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
     TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
     TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
   };
@@ -254,6 +255,17 @@ class COutput {
   
   unsigned long curr_TimeIter, curr_OuterIter, curr_InnerIter;
     
+  su2double Cauchy_Value,  /*!< \brief Summed value of the convergence indicator. */
+  Cauchy_Func;      /*!< \brief Current value of the convergence indicator at one iteration. */
+  unsigned short Cauchy_Counter;  /*!< \brief Number of elements of the Cauchy serial. */
+  su2double *Cauchy_Serie;      /*!< \brief Complete Cauchy serial. */
+  su2double Old_Func,  /*!< \brief Old value of the objective function (the function which is monitored). */
+  New_Func;      /*!< \brief Current value of the objective function (the function which is monitored). */
+  bool Convergence,    /*!< \brief To indicate if the flow solver (direct, adjoint, or linearized) has converged or not. */
+  Convergence_FSI,    /*!< \brief To indicate if the FSI problem has converged or not. */
+  Convergence_FullMG;    /*!< \brief To indicate if the Full Multigrid has converged and it is necessary to add a new level. */
+  su2double InitResidual;  /*!< \brief Initial value of the residual to evaluate the convergence level. */
+  string Conv_Field;
 public:
   
   /*----------------------------- Public member functions ----------------------------*/
@@ -439,6 +451,8 @@ class COutput {
     return HistoryOutput_Map;
   }
   
+  bool Convergence_Monitoring(CConfig *config, unsigned long Iteration);
+
 protected:
   
   /*----------------------------- Protected member functions ----------------------------*/  
diff --git a/SU2_CFD/src/driver_adjoint_singlezone.cpp b/SU2_CFD/src/driver_adjoint_singlezone.cpp
index dfde26f393e4..d1b98a1fffee 100644
--- a/SU2_CFD/src/driver_adjoint_singlezone.cpp
+++ b/SU2_CFD/src/driver_adjoint_singlezone.cpp
@@ -318,7 +318,10 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
 
   ObjFunc = 0.0;
   
-  direct_output->SetHistory_Output(geometry, solver, config);
+  direct_output->SetHistory_Output(geometry, solver, config,
+                                   config->GetTimeIter(),
+                                   config->GetOuterIter(),
+                                   config->GetInnerIter());
 
   /*--- Specific scalar objective functions ---*/
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 3f4e04cef933..444d60dfb62a 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -763,11 +763,14 @@ bool CFluidIteration::Monitor(COutput *output,
 #endif
   UsedTime = StopTime - StartTime;
 
-  /*--- If convergence was reached --*/
-  StopCalc = integration_container[val_iZone][INST_0][FLOW_SOL]->GetConvergence();
 
   if (config_container[val_iZone]->GetMultizone_Problem() || config_container[val_iZone]->GetSinglezone_Driver()){
-    output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0], solver_container[val_iZone][INST_0][MESH_0], config_container[val_iZone], config_container[val_iZone]->GetTimeIter(), config_container[val_iZone]->GetOuterIter(), config_container[val_iZone]->GetInnerIter());
+    output->SetHistory_Output(geometry_container[val_iZone][INST_0][MESH_0],
+                              solver_container[val_iZone][INST_0][MESH_0],
+                              config_container[val_iZone],
+                              config_container[val_iZone]->GetTimeIter(),
+                              config_container[val_iZone]->GetOuterIter(),
+                              config_container[val_iZone]->GetInnerIter());
   }
   
   if (config_container[val_iZone]->GetCFL_Adapt() == YES) {
@@ -775,6 +778,9 @@ bool CFluidIteration::Monitor(COutput *output,
         output->SetCFL_Number(solver_container, config_container, val_iZone);
   }
 
+  /*--- If convergence was reached --*/
+  StopCalc =  output->Convergence_Monitoring(config_container[val_iZone], config_container[val_iZone]->GetInnerIter());
+
   return StopCalc;
 
 
diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
index 7e115a02dcd8..73730be941a5 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -88,6 +88,10 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry,
   /*--- Set the restart filename --- */
   
   RestartFilename = config->GetRestart_FileName();
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "ADJOINT_DISP_X";
   
 }
 
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 6c79fd987b22..74c2ad923938 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -91,6 +91,10 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   /*--- Add the obj. function extension --- */
   
   RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_DENSITY";
   
 }
 
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index fc804ba50bb0..10ae29e52bff 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -95,6 +95,11 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsig
   /*--- Add the obj. function extension --- */
   
   RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_PRESSURE";
+
 }
 
 CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
index fa749f4e8560..4a280ce47207 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -84,6 +84,11 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned sh
   /*--- Add the obj. function extension --- */
   
   RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_TEMPERATURE";
+
 }
 
 CAdjHeatOutput::~CAdjHeatOutput(void) {
diff --git a/SU2_CFD/src/output/output_driver.cpp b/SU2_CFD/src/output/output_driver.cpp
index b4e7f3306f49..a4828bedc38c 100644
--- a/SU2_CFD/src/output/output_driver.cpp
+++ b/SU2_CFD/src/output/output_driver.cpp
@@ -77,7 +77,11 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput
   MultiZoneHeaderString = "Multizone Summary";
   
   HistoryFilename = "multizone_history";
-      
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "AVG_BGS_RES[0]";
+
 }
 
 CDriverOutput::~CDriverOutput() {
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
index 4632c305f785..5bba4208de99 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -99,6 +99,10 @@ CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsig
   
   RestartFilename = config->GetRestart_FileName();
 
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DISP_X";
+
 }
 
 CElasticityOutput::~CElasticityOutput(void) {
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index c5d19ef4adea..3c9a1a11d2a4 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -107,6 +107,12 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver *
   /*--- Set the restart filename --- */
   
   RestartFilename = config->GetRestart_FileName();
+
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DENSITY";
+
   
 }
 
@@ -652,15 +658,14 @@ su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry,
 
 bool CFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))||
+        (config->GetUnsteady_Simulation() == STEADY && (curr_InnerIter < 2));
   
 }
 
 bool CFlowCompOutput::SetUpdate_Averages(CConfig *config){
   
-  return false;
-//  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
+  return (config->GetUnsteady_Simulation() != STEADY && curr_InnerIter == 0);
       
 }
 
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index 7e3232e41752..ec7765a5acca 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -114,7 +114,12 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSo
   /*--- Set the restart filename --- */
   
   RestartFilename = config->GetRestart_FileName();
-  
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DENSITY";
+
+
 }
 
 CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index d1fd4cd07273..4a7392a56ff9 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -109,7 +109,12 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **s
   /*--- Set the restart filename --- */
   
   RestartFilename = config->GetRestart_FileName();
-  
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_PRESSURE";
+
+
 }
 
 CFlowIncOutput::~CFlowIncOutput(void) {
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
index 8119eb16156e..6b55e1d6a063 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/output_heat.cpp
@@ -77,6 +77,12 @@ CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short va
   /*--- Set the restart filename --- */
   
   RestartFilename = config->GetRestart_FileName();
+
+  /*--- Set the default convergence field --- */
+
+  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_TEMPERATURE";
+
+
 }
 
 CHeatOutput::~CHeatOutput(void) {
@@ -141,7 +147,7 @@ void CHeatOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION");
 
   // Residuals  
-  AddVolumeOutput("RESIDUAL_TEMPERATURE", "Residual_Temperature", "RESIDUAL");
+  AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL");
   
 }
 
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index d8048965f4d7..db7a51466659 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -229,6 +229,8 @@ COutput::~COutput(void) {
   
   delete ConvergenceTable;
   delete MultiZoneHeaderTable;
+
+  delete [] Cauchy_Serie;
   
 }
 
@@ -649,6 +651,98 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
 }
 
 
+bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
+
+  unsigned short iCounter;
+
+  bool Already_Converged = Convergence;
+
+  su2double monitor = HistoryOutput_Map[Conv_Field].Value;
+
+  /*--- Cauchy based convergence criteria ---*/
+
+  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT) {
+
+      Old_Func = New_Func;
+      New_Func = monitor;
+      Cauchy_Func = fabs(New_Func - Old_Func);
+
+      Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
+      Cauchy_Value = 1;
+      if (Iteration  >= config->GetCauchy_Elems()) {
+          Cauchy_Value = 0;
+          for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
+            Cauchy_Value += Cauchy_Serie[iCounter];
+      }
+
+      if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
+      else { Convergence = true; Convergence_FullMG = true; }
+
+  }
+
+  /*--- Residual based convergence criteria ---*/
+
+  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_RESIDUAL || HistoryOutput_Map[Conv_Field].FieldType == TYPE_REL_RESIDUAL) {
+
+      /*--- Check the convergence ---*/
+
+      if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
+      else { Convergence = false; Convergence_FullMG = false; }
+
+  }
+
+  /*--- Do not apply any convergence criteria of the number
+     of iterations is less than a particular value ---*/
+
+  if (Iteration < config->GetStartConv_Iter()) {
+      Convergence = false;
+      Convergence_FullMG = false;
+  }
+
+  if (Already_Converged) { Convergence = true; Convergence_FullMG = true; }
+
+
+  /*--- Apply the same convergence criteria to all the processors ---*/
+
+#ifdef HAVE_MPI
+
+  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
+  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
+  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
+
+  /*--- Convergence criteria ---*/
+
+  sbuf_conv[0] = Convergence;
+  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+
+  /*-- Compute global convergence criteria in the master node --*/
+
+  sbuf_conv[0] = 0;
+  if (rank == MASTER_NODE) {
+      if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
+      else sbuf_conv[0] = 0;
+  }
+
+  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+
+  if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
+  else { Convergence = false; Convergence_FullMG = false; }
+
+  delete [] sbuf_conv;
+  delete [] rbuf_conv;
+
+#endif
+
+  /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
+
+  if (monitor != monitor) {
+      SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+  }
+
+
+  return Convergence;
+}
+
 
 void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort) {
 
@@ -5625,6 +5719,11 @@ void COutput::CheckHistoryOutput(){
   
   nRequestedHistoryFields = RequestedHistoryFields.size();
   
+  /*--- Check that the requested convergence monitoring field is available ---*/
+
+  if (HistoryOutput_Map.count(Conv_Field) == 0){
+    SU2_MPI::Error(string("Convergence monitoring field ") + Conv_Field + string(" not available"), CURRENT_FUNCTION);
+  }
 }
 
 void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
@@ -5777,7 +5876,7 @@ void COutput::Postprocess_HistoryData(CConfig *config){
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
-      if ( SetInit_Residuals(config) ) {
+      if ( SetInit_Residuals(config) || (currentField.Value > Init_Residuals[HistoryOutput_List[iField]]) ) {
         Init_Residuals[HistoryOutput_List[iField]] = currentField.Value;
       }
       SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
@@ -5797,6 +5896,11 @@ void COutput::Postprocess_HistoryData(CConfig *config){
       }
     }
   }
+
+  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
+    SetHistoryOutputValue("CAUCHY", Cauchy_Value);
+  }
+
   
   map<string, su2double>::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
@@ -5813,7 +5917,7 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup);
+      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, TYPE_REL_RESIDUAL);
       Average[currentField.OutputGroup] = true;
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
@@ -5823,6 +5927,9 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     }
   }
   
+  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
+    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "RESIDUAL");
+  }
   
    map<string, bool>::iterator it = Average.begin();
    for (it = Average.begin(); it != Average.end(); it++){

From 0da50c60345b04a9ae01de11a34d7b30c22b085f Mon Sep 17 00:00:00 2001
From: "Thomas D. Economon" <thomas.economon@us.bosch.com>
Date: Tue, 30 Apr 2019 15:40:23 -0700
Subject: [PATCH 259/539] Updated surface CSV writer, warning fixes, memory
 leak fixes, intializations, Xcode project update, include fixes.

---
 Common/src/config_structure.cpp               |   4 +-
 Common/src/grid_movement_structure.cpp        |   4 +-
 .../toolboxes/signal_processing_toolbox.cpp   |   4 +-
 QuickStart/inv_NACA0012.cfg                   |   8 +-
 SU2_CFD/include/definition_structure.hpp      |   8 +-
 .../include/output/output_adj_elasticity.hpp  |   3 +-
 SU2_CFD/include/output/output_adj_heat.hpp    |   3 +-
 SU2_CFD/include/output/output_flow_comp.hpp   |   4 +-
 SU2_CFD/include/output/output_heat.hpp        |   4 +-
 SU2_CFD/src/driver_structure.cpp              |   2 +
 SU2_CFD/src/output/output_csv.cpp             | 144 ++++++++++++----
 SU2_CFD/src/output/output_flow.cpp            |  13 +-
 SU2_CFD/src/output/output_structure.cpp       |  19 ++-
 .../src/output/output_structure_legacy.cpp    |   2 +-
 SU2_DOT/src/SU2_DOT.cpp                       |   1 -
 .../Xcode/SU2_CFD.xcodeproj/project.pbxproj   | 160 ++++++++++++++----
 16 files changed, 288 insertions(+), 95 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index e2b0660d5142..9349bb1018ea 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * \file config_structure.cpp
  * \brief Main file for managing the config file
  * \author F. Palacios, T. Economon, B. Tracey, H. Kline
@@ -7292,7 +7292,7 @@ string CConfig::GetFilename(string filename, string ext){
     filename = GetMultiInstance_FileName(filename, GetiInst(), ext);
 
   if (GetWrt_Unsteady() || GetWrt_Dynamic()){
-    filename = GetUnsteady_FileName(filename, GetExtIter(), ext);
+    filename = GetUnsteady_FileName(filename, (int)GetExtIter(), ext);
   }
   
   return filename;
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 04a57b89c1ab..7395d7b481aa 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -6328,7 +6328,7 @@ void CSurfaceMovement::SetBoundary_Flutter3D(CGeometry *geometry, CConfig *confi
   su2double Omega[3], Ampl[3];
   su2double DEG2RAD = PI_NUMBER/180.0;
   bool adjoint = config->GetContinuous_Adjoint();
-  unsigned short iDim = 0, nDim = 3;
+  unsigned short iDim = 0;
   
   /*--- Retrieve values from the config file ---*/
   
@@ -9506,8 +9506,6 @@ void CElasticityMovement::SetMinMaxVolume(CGeometry *geometry, CConfig *config)
   su2double val_Coord;
   int EL_KIND = 0;
 
-  bool discrete_adjoint = config->GetDiscrete_Adjoint();
-
   bool RightVol = true;
 
   su2double ElemVolume;
diff --git a/Common/src/toolboxes/signal_processing_toolbox.cpp b/Common/src/toolboxes/signal_processing_toolbox.cpp
index 2858aa011a5c..84cf990037e3 100644
--- a/Common/src/toolboxes/signal_processing_toolbox.cpp
+++ b/Common/src/toolboxes/signal_processing_toolbox.cpp
@@ -1,4 +1,4 @@
-#include "../include/toolboxes/signal_processing_toolbox.hpp"
+#include "../../include/toolboxes/signal_processing_toolbox.hpp"
 
 
 su2double Signal_Processing::Average(std::vector<su2double> &data){
@@ -7,4 +7,4 @@ su2double Signal_Processing::Average(std::vector<su2double> &data){
     avg += (*it);
   }
   return avg/=data.size();
-}
\ No newline at end of file
+}
diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index d750dd33eeb7..affda18c8993 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -272,7 +272,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -284,13 +284,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -299,7 +299,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/SU2_CFD/include/definition_structure.hpp b/SU2_CFD/include/definition_structure.hpp
index fcec9e2c20bc..246daff772cd 100644
--- a/SU2_CFD/include/definition_structure.hpp
+++ b/SU2_CFD/include/definition_structure.hpp
@@ -38,13 +38,13 @@
 
 #pragma once
 
-#include "../../../Common/include/mpi_structure.hpp"
+#include "../../Common/include/mpi_structure.hpp"
 
 #include <ctime>
 
-#include "../../../Common/include/config_structure.hpp"
-#include "../../../Common/include/geometry_structure.hpp"
-#include "../../../Common/include/fem_geometry_structure.hpp"
+#include "../../Common/include/config_structure.hpp"
+#include "../../Common/include/geometry_structure.hpp"
+#include "../../Common/include/fem_geometry_structure.hpp"
 
 
 
diff --git a/SU2_CFD/include/output/output_adj_elasticity.hpp b/SU2_CFD/include/output/output_adj_elasticity.hpp
index f772bdd9385c..a0dd2c1017bf 100644
--- a/SU2_CFD/include/output/output_adj_elasticity.hpp
+++ b/SU2_CFD/include/output/output_adj_elasticity.hpp
@@ -48,7 +48,6 @@
 class CAdjElasticityOutput : public COutput {
 private:
   unsigned short nVar_FEM, nDim;
-  char char_histfile[200];
 
 public:
 
@@ -88,4 +87,4 @@ class CAdjElasticityOutput : public COutput {
    */
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/output_adj_heat.hpp b/SU2_CFD/include/output/output_adj_heat.hpp
index cc8618e5eb0a..47ddd9e18bc7 100644
--- a/SU2_CFD/include/output/output_adj_heat.hpp
+++ b/SU2_CFD/include/output/output_adj_heat.hpp
@@ -48,7 +48,6 @@
 class CAdjHeatOutput : public COutput {
 private:
   unsigned short nDim;
-  char char_histfile[200];
 
 public:
 
@@ -100,4 +99,4 @@ class CAdjHeatOutput : public COutput {
    */
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/output_flow_comp.hpp b/SU2_CFD/include/output/output_flow_comp.hpp
index 02e8f868e4e4..2c4fc5c626b3 100644
--- a/SU2_CFD/include/output/output_flow_comp.hpp
+++ b/SU2_CFD/include/output/output_flow_comp.hpp
@@ -48,8 +48,6 @@
 class CFlowCompOutput : public CFlowOutput {
 private:
   
-  unsigned short nVar;
-
   unsigned short turb_model;
     
   su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
@@ -129,4 +127,4 @@ class CFlowCompOutput : public CFlowOutput {
    */
   bool SetUpdate_Averages(CConfig *config);
   
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/output_heat.hpp b/SU2_CFD/include/output/output_heat.hpp
index 1dd9e971347f..d04ec8d698f7 100644
--- a/SU2_CFD/include/output/output_heat.hpp
+++ b/SU2_CFD/include/output/output_heat.hpp
@@ -50,8 +50,6 @@ class CHeatOutput : public COutput {
 private:
   bool multizone;
 
-  char char_histfile[200];
-
 public:
 
 
@@ -93,4 +91,4 @@ class CHeatOutput : public COutput {
    */
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
  
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index a267e5d1839f..d1c3d65c45f2 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -977,6 +977,8 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
     
   }
  
+  delete [] geometry_aux;
+  
 }
 
 
diff --git a/SU2_CFD/src/output/output_csv.cpp b/SU2_CFD/src/output/output_csv.cpp
index af3cbe24c368..93873e7e4f0a 100644
--- a/SU2_CFD/src/output/output_csv.cpp
+++ b/SU2_CFD/src/output/output_csv.cpp
@@ -2,58 +2,142 @@
 
 void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
-  unsigned short iVar;  
-  unsigned long iPoint, index, offset, myPoint;
-  ofstream Surf_file;
+  /*--- Routine to write the surface CSV files (ASCII). We
+   assume here that, as an ASCII file, it is safer to merge the
+   surface data onto the master rank for writing for 2 reasons:
+   (a) as a surface file, the amount of data should be much less
+   than the volume solution, and (b) writing ASCII files in parallel
+   requires serializing the IO calls with barriers, which ruins
+   the performance at moderate to high rank counts. ---*/
+  
+  unsigned short iVar;
   
-  int iProcessor;
+  int iProcessor, nProcessor = size;
   
-  string filename;
+  unsigned long iPoint, index;
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long nLocalVertex_Surface = 0, MaxLocalVertex_Surface = 0;
   
-  filename = config->GetFilename(SurfaceFilename, ".csv");
+  string filename = config->GetFilename(SurfaceFilename, ".csv");
   
+  ofstream Surf_file;
   Surf_file.precision(15);
   
+  /*--- Find the max number of surface vertices among all
+   partitions so we can set up buffers. The master node will handle
+   the writing of the CSV file after gathering all of the data. ---*/
   
-  if (rank == MASTER_NODE) {
-    Surf_file.open(filename.c_str(), ios::out);
-    Surf_file << "\"Point\",";
+  nLocalVertex_Surface   = nSurf_Poin_Par;
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long[nProcessor];
+  
+  /*--- Communicate the number of local vertices on each partition
+   to the master node with collective calls. ---*/
+  
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1,
+                     MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nVertex,  1, MPI_UNSIGNED_LONG,
+                  MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Allocate buffers for send/recv of the data and global IDs. ---*/
+  
+  su2double *bufD_Send = new su2double[MaxLocalVertex_Surface*GlobalField_Counter];
+  su2double *bufD_Recv = NULL;
+  
+  unsigned long *bufL_Send = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *bufL_Recv = NULL;
+  
+  /*--- Load send buffers with the local data on this rank. ---*/
+  
+  index = 0;
+  for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
     
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      Surf_file << "\"" << Variable_Names[iVar] << "\",";
+    /*--- Global index values. ---*/
+    
+    bufL_Send[iPoint] = Renumber2Global[iPoint];
+    
+    /*--- Solution data. ---*/
+    
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++){
+      bufD_Send[index] = Parallel_Surf_Data[iVar][iPoint];
+      index++;
     }
-    Surf_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    Surf_file.close();
+    
+  }
+  
+  /*--- Only the master rank allocates buffers for the recv. ---*/
+  
+  if (rank == MASTER_NODE) {
+    bufD_Recv = new su2double[nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
+    bufL_Recv = new unsigned long[nProcessor*MaxLocalVertex_Surface];
   }
   
-  /*--- Open file on every processor ---*/
+  /*--- Collective comms of the solution data and global IDs. ---*/
   
-  Surf_file.open(filename.c_str(), ios::out| ios::app);
+  SU2_MPI::Gather(bufD_Send, (int)MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE,
+                  bufD_Recv, (int)MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
   
-  /*--- Write surface and volumetric solution data. ---*/
+  SU2_MPI::Gather(bufL_Send, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG,
+                  bufL_Recv, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
   
-  offset = 0; myPoint = 0;
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
+  /*--- The master rank alone writes the surface CSV file. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Open the CSV file and write the header with variable names. ---*/
+    
+    Surf_file.open(filename.c_str(), ios::out);
+    Surf_file << "\"Point\",";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
+      Surf_file << "\"" << Variable_Names[iVar] << "\",";
+    }
+    Surf_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
+    
+    /*--- Loop through all of the collected data and write each node's values ---*/
+    
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nVertex[iProcessor]; iPoint++) {
+        
+        /*--- Current index position for global index access. ---*/
         
-        index = iPoint + offset;
+        index  = iProcessor*MaxLocalVertex_Surface + iPoint;
         
-        Surf_file << Renumber2Global[index+1] << ", ";
+        /*--- Write global index values. ---*/
+        
+        Surf_file << bufL_Recv[index] << ", ";
+        
+        /*--- Reset index for solution data access. ---*/
+        
+        index  = (iProcessor*MaxLocalVertex_Surface*GlobalField_Counter +
+                  iPoint*GlobalField_Counter);
+        
+        /*--- Write the solution data for each field variable. ---*/
         
         for (iVar = 0; iVar < GlobalField_Counter; iVar++){
-          Surf_file << scientific << Parallel_Surf_Data[iVar][iPoint];
+          Surf_file << scientific << bufD_Recv[index + iVar];
           if (iVar != GlobalField_Counter -1) Surf_file << ", ";
         }
         Surf_file << endl;
         
-        myPoint++;
       }
     }
-    Surf_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);    
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
+    
+    /*--- Close the file. ---*/
+    
+    Surf_file.close();
+    
+  }
+  
+  /*--- Free temporary memory. ---*/
+  
+  if (rank == MASTER_NODE) {
+    delete [] bufL_Recv;
+    delete [] bufD_Recv;
+    delete [] Buffer_Recv_nVertex;
   }
-}
\ No newline at end of file
+  delete [] bufL_Send;
+  delete [] bufD_Send;
+  
+}
diff --git a/SU2_CFD/src/output/output_flow.cpp b/SU2_CFD/src/output/output_flow.cpp
index c25f7ef831a7..539aade293ac 100644
--- a/SU2_CFD/src/output/output_flow.cpp
+++ b/SU2_CFD/src/output/output_flow.cpp
@@ -563,6 +563,8 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
   delete [] Surface_Density_Local;
   delete [] Surface_Enthalpy_Local;
   delete [] Surface_NormalVelocity_Local;
+  delete [] Surface_StreamVelocity2_Local;
+  delete [] Surface_TransvVelocity2_Local;
   delete [] Surface_Pressure_Local;
   delete [] Surface_TotalTemperature_Local;
   delete [] Surface_TotalPressure_Local;
@@ -575,18 +577,23 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
   delete [] Surface_Density_Total;
   delete [] Surface_Enthalpy_Total;
   delete [] Surface_NormalVelocity_Total;
+  delete [] Surface_StreamVelocity2_Total;
+  delete [] Surface_TransvVelocity2_Total;
   delete [] Surface_Pressure_Total;
   delete [] Surface_TotalTemperature_Total;
   delete [] Surface_TotalPressure_Total;
   delete [] Surface_Area_Total;
   delete [] Surface_MassFlow_Abs_Total;
-  
+  delete [] Surface_MomentumDistortion_Total;
+
   delete [] Surface_MassFlow;
   delete [] Surface_Mach;
   delete [] Surface_Temperature;
   delete [] Surface_Density;
   delete [] Surface_Enthalpy;
   delete [] Surface_NormalVelocity;
+  delete [] Surface_StreamVelocity2;
+  delete [] Surface_TransvVelocity2;
   delete [] Surface_Pressure;
   delete [] Surface_TotalTemperature;
   delete [] Surface_TotalPressure;
@@ -757,7 +764,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   surfCp_filename = "TargetCp";
   
-  surfCp_filename = config->GetUnsteady_FileName(surfCp_filename, curr_TimeIter, ".dat");
+  surfCp_filename = config->GetUnsteady_FileName(surfCp_filename, (int)curr_TimeIter, ".dat");
   
   strcpy (cstr, surfCp_filename.c_str());
     
@@ -839,4 +846,4 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   delete [] Point2Vertex;
   delete [] PointInDomain;
-}
\ No newline at end of file
+}
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index db7a51466659..d2b382d3fa49 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -207,6 +207,12 @@ COutput::COutput(CConfig *config) {
   for (unsigned short iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
     Cauchy_Serie[iCounter] = 0.0;
   
+  /*--- Initialize all convergence flags to false. ---*/
+  
+  Convergence        = false;
+  Convergence_FSI    = false;
+  Convergence_FullMG = false;
+  
 }
 
 COutput::~COutput(void) {
@@ -2859,7 +2865,15 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   nSurf_Poin_Par = 0;
   for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
     if (surfPoint[iPoint] != -1) {
+      
+      /*--- Save the global index values for CSV output. ---*/
+      
+      Renumber2Global[nSurf_Poin_Par] = surfPoint[iPoint];
+      
+      /*--- Increment total number of surface points found locally. ---*/
+      
       nSurf_Poin_Par++;
+
     }
   }
   
@@ -3366,7 +3380,6 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   map<unsigned long,unsigned long> Global2Renumber;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
     Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
-    Renumber2Global[renumbRecv[ii] + 1] = globalRecv[ii];
   }
   
   
@@ -3728,7 +3741,6 @@ void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
   
   for (int ii = 0; ii < nElem_Send[size]; ii++) {
     Global2Renumber[outliers[ii]] = idSend[ii] + 1;
-    Renumber2Global[idSend[ii] + 1] = outliers[ii];
   }
   
   /*--- We can now overwrite the local connectivity for our surface elems
@@ -4061,7 +4073,7 @@ void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry)
 
     for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
       disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
-      strcpy(str_buf, Variable_Names[iVar].c_str());
+      strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
       MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
       file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
     }
@@ -4442,6 +4454,7 @@ void COutput::DeallocateSurfaceData_Parallel() {
     
     Global2Renumber.clear();
     Renumber2Global.clear();
+    
     /*--- Deallocate memory for surface solution data ---*/
     
     for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index f6c4e9460631..b84e3cf6e6a8 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -8685,7 +8685,7 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
     
     bool Wrt_Vol = config[iZone]->GetVisualize_Volume_Def();
     bool Wrt_Srf = config[iZone]->GetVisualize_Surface_Def();
-    bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
+    //bool Wrt_Crd = config[iZone]->GetWrt_Crd_Sol();
     
     /*--- Merge the node coordinates and connectivity if necessary. This
      is only performed if a volume solution file is requested, and it
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index b852271d596c..bd726c8a0834 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -46,7 +46,6 @@ int main(int argc, char *argv[]) {
   char config_file_name[MAX_STRING_SIZE], *cstr = NULL;
   ofstream Gradient_file;
   bool fem_solver = false;
-  bool periodic   = false;
   
   su2double** Gradient;
   unsigned short iDV, iDV_Value;
diff --git a/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.pbxproj
index 303d78fbe7ce..9f30aa47c89e 100644
--- a/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.pbxproj
+++ b/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.pbxproj
@@ -7,12 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0506980A1AA6179100FF4F07 /* output_fieldview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 050698091AA6179100FF4F07 /* output_fieldview.cpp */; };
 		0530E56A17FDF7AC00733CE8 /* solver_direct_elasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0530E56917FDF7AC00733CE8 /* solver_direct_elasticity.cpp */; };
 		0530E56E17FDF7C600733CE8 /* variable_direct_elasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0530E56D17FDF7C600733CE8 /* variable_direct_elasticity.cpp */; };
 		0530E57017FDF7D300733CE8 /* numerics_direct_elasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0530E56F17FDF7D300733CE8 /* numerics_direct_elasticity.cpp */; };
-		05755F0A1A54AC4500600019 /* output_su2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05755F091A54AC4500600019 /* output_su2.cpp */; };
-		05812D7B1F2787540086FCB0 /* output_physics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05812D7A1F2787540086FCB0 /* output_physics.cpp */; };
 		05AF9F201BE1E1830062E1F1 /* element_linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05AF9F1D1BE1E1830062E1F1 /* element_linear.cpp */; };
 		05AF9F211BE1E1830062E1F1 /* element_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05AF9F1E1BE1E1830062E1F1 /* element_structure.cpp */; };
 		05AF9F221BE1E1830062E1F1 /* gauss_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05AF9F1F1BE1E1830062E1F1 /* gauss_structure.cpp */; };
@@ -37,10 +34,6 @@
 		05E6DC1417EB62A100FA1F7E /* numerics_direct_turbulent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBCF17EB62A100FA1F7E /* numerics_direct_turbulent.cpp */; };
 		05E6DC1817EB62A100FA1F7E /* numerics_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD317EB62A100FA1F7E /* numerics_structure.cpp */; };
 		05E6DC1917EB62A100FA1F7E /* numerics_template.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD417EB62A100FA1F7E /* numerics_template.cpp */; };
-		05E6DC1A17EB62A100FA1F7E /* output_cgns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD517EB62A100FA1F7E /* output_cgns.cpp */; };
-		05E6DC1B17EB62A100FA1F7E /* output_paraview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD617EB62A100FA1F7E /* output_paraview.cpp */; };
-		05E6DC1C17EB62A100FA1F7E /* output_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD717EB62A100FA1F7E /* output_structure.cpp */; };
-		05E6DC1D17EB62A100FA1F7E /* output_tecplot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBD817EB62A100FA1F7E /* output_tecplot.cpp */; };
 		05E6DC1F17EB62A100FA1F7E /* solver_adjoint_mean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBDA17EB62A100FA1F7E /* solver_adjoint_mean.cpp */; };
 		05E6DC2217EB62A100FA1F7E /* solver_adjoint_turbulent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBDD17EB62A100FA1F7E /* solver_adjoint_turbulent.cpp */; };
 		05E6DC2517EB62A100FA1F7E /* solver_direct_heat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DBE017EB62A100FA1F7E /* solver_direct_heat.cpp */; };
@@ -92,6 +85,30 @@
 		E9D9CE861C62A1A7004119E9 /* interpolation_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D9CE851C62A1A7004119E9 /* interpolation_structure.cpp */; };
 		E9D9CE891C62A1C8004119E9 /* transfer_physics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D9CE871C62A1C8004119E9 /* transfer_physics.cpp */; };
 		E9D9CE8A1C62A1C8004119E9 /* transfer_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D9CE881C62A1C8004119E9 /* transfer_structure.cpp */; };
+		E9ECD5B42277E46600BD519E /* output_physics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD59E2277E46400BD519E /* output_physics.cpp */; };
+		E9ECD5B52277E46600BD519E /* output_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD59F2277E46400BD519E /* output_structure.cpp */; };
+		E9ECD5B62277E46600BD519E /* output_su2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A02277E46400BD519E /* output_su2.cpp */; };
+		E9ECD5B72277E46600BD519E /* output_baseline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A12277E46400BD519E /* output_baseline.cpp */; };
+		E9ECD5B82277E46600BD519E /* output_flow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A22277E46400BD519E /* output_flow.cpp */; };
+		E9ECD5B92277E46600BD519E /* output_adj_flow_comp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A32277E46400BD519E /* output_adj_flow_comp.cpp */; };
+		E9ECD5BA2277E46600BD519E /* output_heat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A42277E46400BD519E /* output_heat.cpp */; };
+		E9ECD5BB2277E46600BD519E /* output_paraview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A52277E46400BD519E /* output_paraview.cpp */; };
+		E9ECD5BC2277E46600BD519E /* output_adj_elasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A62277E46400BD519E /* output_adj_elasticity.cpp */; };
+		E9ECD5BD2277E46600BD519E /* output_mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A72277E46400BD519E /* output_mesh.cpp */; };
+		E9ECD5BE2277E46600BD519E /* output_cgns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A82277E46500BD519E /* output_cgns.cpp */; };
+		E9ECD5BF2277E46600BD519E /* output_flow_comp_fem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5A92277E46500BD519E /* output_flow_comp_fem.cpp */; };
+		E9ECD5C02277E46600BD519E /* output_fieldview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AA2277E46500BD519E /* output_fieldview.cpp */; };
+		E9ECD5C12277E46600BD519E /* output_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AB2277E46500BD519E /* output_driver.cpp */; };
+		E9ECD5C22277E46600BD519E /* output_adj_flow_inc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AC2277E46500BD519E /* output_adj_flow_inc.cpp */; };
+		E9ECD5C32277E46600BD519E /* output_adj_heat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AD2277E46500BD519E /* output_adj_heat.cpp */; };
+		E9ECD5C42277E46600BD519E /* output_csv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AE2277E46500BD519E /* output_csv.cpp */; };
+		E9ECD5C52277E46600BD519E /* output_tecplot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5AF2277E46500BD519E /* output_tecplot.cpp */; };
+		E9ECD5C62277E46600BD519E /* output_elasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5B02277E46500BD519E /* output_elasticity.cpp */; };
+		E9ECD5C72277E46600BD519E /* output_flow_comp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5B12277E46500BD519E /* output_flow_comp.cpp */; };
+		E9ECD5C82277E46600BD519E /* output_flow_inc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5B22277E46600BD519E /* output_flow_inc.cpp */; };
+		E9ECD5C92277E46600BD519E /* output_structure_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5B32277E46600BD519E /* output_structure_legacy.cpp */; };
+		E9ECD5CB2277E47C00BD519E /* signal_processing_toolbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5CA2277E47B00BD519E /* signal_processing_toolbox.cpp */; };
+		E9ECD5CD2277E48900BD519E /* driver_adjoint_singlezone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9ECD5CC2277E48900BD519E /* driver_adjoint_singlezone.cpp */; };
 		E9F130CC1D513DA300EC8963 /* numerics_direct_mean_inc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9F130C61D513DA300EC8963 /* numerics_direct_mean_inc.cpp */; };
 		E9F130CE1D513DA300EC8963 /* solver_direct_mean_inc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9F130C81D513DA300EC8963 /* solver_direct_mean_inc.cpp */; };
 		E9F130D01D513DA300EC8963 /* variable_direct_mean_inc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9F130CA1D513DA300EC8963 /* variable_direct_mean_inc.cpp */; };
@@ -113,14 +130,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		050698091AA6179100FF4F07 /* output_fieldview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_fieldview.cpp; path = ../../SU2_CFD/src/output_fieldview.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0530E56917FDF7AC00733CE8 /* solver_direct_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_direct_elasticity.cpp; path = ../../SU2_CFD/src/solver_direct_elasticity.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0530E56D17FDF7C600733CE8 /* variable_direct_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = variable_direct_elasticity.cpp; path = ../../SU2_CFD/src/variable_direct_elasticity.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0530E56F17FDF7D300733CE8 /* numerics_direct_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_direct_elasticity.cpp; path = ../../SU2_CFD/src/numerics_direct_elasticity.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0541ABEE1370F5A6002D668B /* SU2_CFD */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_CFD; sourceTree = BUILT_PRODUCTS_DIR; };
-		05755F091A54AC4500600019 /* output_su2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_su2.cpp; path = ../../SU2_CFD/src/output_su2.cpp; sourceTree = "<group>"; };
-		05812D7A1F2787540086FCB0 /* output_physics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_physics.cpp; path = ../../SU2_CFD/src/output_physics.cpp; sourceTree = "<group>"; };
-		05812D7C1F2787B60086FCB0 /* output_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = output_structure.inl; path = ../../SU2_CFD/include/output_structure.inl; sourceTree = "<group>"; };
 		05AF9F1D1BE1E1830062E1F1 /* element_linear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = element_linear.cpp; path = ../../Common/src/element_linear.cpp; sourceTree = "<group>"; };
 		05AF9F1E1BE1E1830062E1F1 /* element_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = element_structure.cpp; path = ../../Common/src/element_structure.cpp; sourceTree = "<group>"; };
 		05AF9F1F1BE1E1830062E1F1 /* gauss_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = gauss_structure.cpp; path = ../../Common/src/gauss_structure.cpp; sourceTree = "<group>"; };
@@ -160,7 +173,6 @@
 		05E6DBB517EB627400FA1F7E /* integration_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = integration_structure.hpp; path = ../../SU2_CFD/include/integration_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBB617EB627400FA1F7E /* iteration_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = iteration_structure.hpp; path = ../../SU2_CFD/include/iteration_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBB717EB627400FA1F7E /* numerics_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = numerics_structure.hpp; path = ../../SU2_CFD/include/numerics_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBB817EB627400FA1F7E /* output_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = output_structure.hpp; path = ../../SU2_CFD/include/output_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBB917EB627400FA1F7E /* solver_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = solver_structure.hpp; path = ../../SU2_CFD/include/solver_structure.hpp; sourceTree = "<group>"; };
 		05E6DBBA17EB627400FA1F7E /* SU2_CFD.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = SU2_CFD.hpp; path = ../../SU2_CFD/include/SU2_CFD.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBBB17EB627400FA1F7E /* variable_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = variable_structure.hpp; path = ../../SU2_CFD/include/variable_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
@@ -176,10 +188,6 @@
 		05E6DBCF17EB62A100FA1F7E /* numerics_direct_turbulent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_direct_turbulent.cpp; path = ../../SU2_CFD/src/numerics_direct_turbulent.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBD317EB62A100FA1F7E /* numerics_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_structure.cpp; path = ../../SU2_CFD/src/numerics_structure.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBD417EB62A100FA1F7E /* numerics_template.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_template.cpp; path = ../../SU2_CFD/src/numerics_template.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBD517EB62A100FA1F7E /* output_cgns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_cgns.cpp; path = ../../SU2_CFD/src/output_cgns.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBD617EB62A100FA1F7E /* output_paraview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_paraview.cpp; path = ../../SU2_CFD/src/output_paraview.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBD717EB62A100FA1F7E /* output_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_structure.cpp; path = ../../SU2_CFD/src/output_structure.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBD817EB62A100FA1F7E /* output_tecplot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_tecplot.cpp; path = ../../SU2_CFD/src/output_tecplot.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBDA17EB62A100FA1F7E /* solver_adjoint_mean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_adjoint_mean.cpp; path = ../../SU2_CFD/src/solver_adjoint_mean.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBDD17EB62A100FA1F7E /* solver_adjoint_turbulent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_adjoint_turbulent.cpp; path = ../../SU2_CFD/src/solver_adjoint_turbulent.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBE017EB62A100FA1F7E /* solver_direct_heat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_direct_heat.cpp; path = ../../SU2_CFD/src/solver_direct_heat.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
@@ -273,6 +281,46 @@
 		E9D9CE951C62A272004119E9 /* transfer_structure.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = transfer_structure.hpp; path = ../../SU2_CFD/include/transfer_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E9D9CE961C62A272004119E9 /* transfer_structure.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = transfer_structure.inl; path = ../../SU2_CFD/include/transfer_structure.inl; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E9D9CE971C62A2A7004119E9 /* interpolation_structure.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = interpolation_structure.hpp; path = ../../Common/include/interpolation_structure.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		E9ECD59E2277E46400BD519E /* output_physics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_physics.cpp; path = ../../SU2_CFD/src/output/output_physics.cpp; sourceTree = "<group>"; };
+		E9ECD59F2277E46400BD519E /* output_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_structure.cpp; path = ../../SU2_CFD/src/output/output_structure.cpp; sourceTree = "<group>"; };
+		E9ECD5A02277E46400BD519E /* output_su2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_su2.cpp; path = ../../SU2_CFD/src/output/output_su2.cpp; sourceTree = "<group>"; };
+		E9ECD5A12277E46400BD519E /* output_baseline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_baseline.cpp; path = ../../SU2_CFD/src/output/output_baseline.cpp; sourceTree = "<group>"; };
+		E9ECD5A22277E46400BD519E /* output_flow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_flow.cpp; path = ../../SU2_CFD/src/output/output_flow.cpp; sourceTree = "<group>"; };
+		E9ECD5A32277E46400BD519E /* output_adj_flow_comp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_adj_flow_comp.cpp; path = ../../SU2_CFD/src/output/output_adj_flow_comp.cpp; sourceTree = "<group>"; };
+		E9ECD5A42277E46400BD519E /* output_heat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_heat.cpp; path = ../../SU2_CFD/src/output/output_heat.cpp; sourceTree = "<group>"; };
+		E9ECD5A52277E46400BD519E /* output_paraview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_paraview.cpp; path = ../../SU2_CFD/src/output/output_paraview.cpp; sourceTree = "<group>"; };
+		E9ECD5A62277E46400BD519E /* output_adj_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_adj_elasticity.cpp; path = ../../SU2_CFD/src/output/output_adj_elasticity.cpp; sourceTree = "<group>"; };
+		E9ECD5A72277E46400BD519E /* output_mesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_mesh.cpp; path = ../../SU2_CFD/src/output/output_mesh.cpp; sourceTree = "<group>"; };
+		E9ECD5A82277E46500BD519E /* output_cgns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_cgns.cpp; path = ../../SU2_CFD/src/output/output_cgns.cpp; sourceTree = "<group>"; };
+		E9ECD5A92277E46500BD519E /* output_flow_comp_fem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_flow_comp_fem.cpp; path = ../../SU2_CFD/src/output/output_flow_comp_fem.cpp; sourceTree = "<group>"; };
+		E9ECD5AA2277E46500BD519E /* output_fieldview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_fieldview.cpp; path = ../../SU2_CFD/src/output/output_fieldview.cpp; sourceTree = "<group>"; };
+		E9ECD5AB2277E46500BD519E /* output_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_driver.cpp; path = ../../SU2_CFD/src/output/output_driver.cpp; sourceTree = "<group>"; };
+		E9ECD5AC2277E46500BD519E /* output_adj_flow_inc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_adj_flow_inc.cpp; path = ../../SU2_CFD/src/output/output_adj_flow_inc.cpp; sourceTree = "<group>"; };
+		E9ECD5AD2277E46500BD519E /* output_adj_heat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_adj_heat.cpp; path = ../../SU2_CFD/src/output/output_adj_heat.cpp; sourceTree = "<group>"; };
+		E9ECD5AE2277E46500BD519E /* output_csv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_csv.cpp; path = ../../SU2_CFD/src/output/output_csv.cpp; sourceTree = "<group>"; };
+		E9ECD5AF2277E46500BD519E /* output_tecplot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_tecplot.cpp; path = ../../SU2_CFD/src/output/output_tecplot.cpp; sourceTree = "<group>"; };
+		E9ECD5B02277E46500BD519E /* output_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_elasticity.cpp; path = ../../SU2_CFD/src/output/output_elasticity.cpp; sourceTree = "<group>"; };
+		E9ECD5B12277E46500BD519E /* output_flow_comp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_flow_comp.cpp; path = ../../SU2_CFD/src/output/output_flow_comp.cpp; sourceTree = "<group>"; };
+		E9ECD5B22277E46600BD519E /* output_flow_inc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_flow_inc.cpp; path = ../../SU2_CFD/src/output/output_flow_inc.cpp; sourceTree = "<group>"; };
+		E9ECD5B32277E46600BD519E /* output_structure_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_structure_legacy.cpp; path = ../../SU2_CFD/src/output/output_structure_legacy.cpp; sourceTree = "<group>"; };
+		E9ECD5CA2277E47B00BD519E /* signal_processing_toolbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = signal_processing_toolbox.cpp; path = ../../Common/src/toolboxes/signal_processing_toolbox.cpp; sourceTree = "<group>"; };
+		E9ECD5CC2277E48900BD519E /* driver_adjoint_singlezone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = driver_adjoint_singlezone.cpp; path = ../../SU2_CFD/src/driver_adjoint_singlezone.cpp; sourceTree = "<group>"; };
+		E9ECD5CE2277E4C600BD519E /* output_adj_flow_inc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_adj_flow_inc.hpp; path = ../../SU2_CFD/include/output/output_adj_flow_inc.hpp; sourceTree = "<group>"; };
+		E9ECD5CF2277E4C600BD519E /* output_adj_flow_comp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_adj_flow_comp.hpp; path = ../../SU2_CFD/include/output/output_adj_flow_comp.hpp; sourceTree = "<group>"; };
+		E9ECD5D02277E4C600BD519E /* output_flow_comp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_flow_comp.hpp; path = ../../SU2_CFD/include/output/output_flow_comp.hpp; sourceTree = "<group>"; };
+		E9ECD5D12277E4C600BD519E /* output_structure_legacy.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = output_structure_legacy.inl; path = ../../SU2_CFD/include/output/output_structure_legacy.inl; sourceTree = "<group>"; };
+		E9ECD5D22277E4C600BD519E /* output.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output.hpp; path = ../../SU2_CFD/include/output/output.hpp; sourceTree = "<group>"; };
+		E9ECD5D32277E4C700BD519E /* output_flow_comp_fem.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_flow_comp_fem.hpp; path = ../../SU2_CFD/include/output/output_flow_comp_fem.hpp; sourceTree = "<group>"; };
+		E9ECD5D42277E4C700BD519E /* output_driver.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_driver.hpp; path = ../../SU2_CFD/include/output/output_driver.hpp; sourceTree = "<group>"; };
+		E9ECD5D52277E4C700BD519E /* output_flow_inc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_flow_inc.hpp; path = ../../SU2_CFD/include/output/output_flow_inc.hpp; sourceTree = "<group>"; };
+		E9ECD5D62277E4C700BD519E /* output_flow.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_flow.hpp; path = ../../SU2_CFD/include/output/output_flow.hpp; sourceTree = "<group>"; };
+		E9ECD5D72277E4C700BD519E /* output_structure_legacy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_structure_legacy.hpp; path = ../../SU2_CFD/include/output/output_structure_legacy.hpp; sourceTree = "<group>"; };
+		E9ECD5D82277E4C700BD519E /* output_elasticity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_elasticity.hpp; path = ../../SU2_CFD/include/output/output_elasticity.hpp; sourceTree = "<group>"; };
+		E9ECD5D92277E4C700BD519E /* output_heat.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_heat.hpp; path = ../../SU2_CFD/include/output/output_heat.hpp; sourceTree = "<group>"; };
+		E9ECD5DA2277E4C700BD519E /* output_mesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_mesh.hpp; path = ../../SU2_CFD/include/output/output_mesh.hpp; sourceTree = "<group>"; };
+		E9ECD5DB2277E4C700BD519E /* output_adj_heat.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_adj_heat.hpp; path = ../../SU2_CFD/include/output/output_adj_heat.hpp; sourceTree = "<group>"; };
+		E9ECD5DC2277E4C700BD519E /* output_adj_elasticity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_adj_elasticity.hpp; path = ../../SU2_CFD/include/output/output_adj_elasticity.hpp; sourceTree = "<group>"; };
+		E9ECD5DD2277E4C800BD519E /* output_baseline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = output_baseline.hpp; path = ../../SU2_CFD/include/output/output_baseline.hpp; sourceTree = "<group>"; };
 		E9F130C61D513DA300EC8963 /* numerics_direct_mean_inc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_direct_mean_inc.cpp; path = ../../SU2_CFD/src/numerics_direct_mean_inc.cpp; sourceTree = "<group>"; };
 		E9F130C81D513DA300EC8963 /* solver_direct_mean_inc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_direct_mean_inc.cpp; path = ../../SU2_CFD/src/solver_direct_mean_inc.cpp; sourceTree = "<group>"; };
 		E9F130CA1D513DA300EC8963 /* variable_direct_mean_inc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = variable_direct_mean_inc.cpp; path = ../../SU2_CFD/src/variable_direct_mean_inc.cpp; sourceTree = "<group>"; };
@@ -345,13 +393,28 @@
 		052D51AB17A22E24003BE8B2 /* Output */ = {
 			isa = PBXGroup;
 			children = (
-				05E6DBD517EB62A100FA1F7E /* output_cgns.cpp */,
-				05812D7A1F2787540086FCB0 /* output_physics.cpp */,
-				05E6DBD617EB62A100FA1F7E /* output_paraview.cpp */,
-				05E6DBD717EB62A100FA1F7E /* output_structure.cpp */,
-				05E6DBD817EB62A100FA1F7E /* output_tecplot.cpp */,
-				050698091AA6179100FF4F07 /* output_fieldview.cpp */,
-				05755F091A54AC4500600019 /* output_su2.cpp */,
+				E9ECD5A62277E46400BD519E /* output_adj_elasticity.cpp */,
+				E9ECD5A32277E46400BD519E /* output_adj_flow_comp.cpp */,
+				E9ECD5AC2277E46500BD519E /* output_adj_flow_inc.cpp */,
+				E9ECD5AD2277E46500BD519E /* output_adj_heat.cpp */,
+				E9ECD5A12277E46400BD519E /* output_baseline.cpp */,
+				E9ECD5A82277E46500BD519E /* output_cgns.cpp */,
+				E9ECD5AE2277E46500BD519E /* output_csv.cpp */,
+				E9ECD5AB2277E46500BD519E /* output_driver.cpp */,
+				E9ECD5B02277E46500BD519E /* output_elasticity.cpp */,
+				E9ECD5AA2277E46500BD519E /* output_fieldview.cpp */,
+				E9ECD5A92277E46500BD519E /* output_flow_comp_fem.cpp */,
+				E9ECD5B12277E46500BD519E /* output_flow_comp.cpp */,
+				E9ECD5B22277E46600BD519E /* output_flow_inc.cpp */,
+				E9ECD5A22277E46400BD519E /* output_flow.cpp */,
+				E9ECD5A42277E46400BD519E /* output_heat.cpp */,
+				E9ECD5A72277E46400BD519E /* output_mesh.cpp */,
+				E9ECD5A52277E46400BD519E /* output_paraview.cpp */,
+				E9ECD59E2277E46400BD519E /* output_physics.cpp */,
+				E9ECD5B32277E46600BD519E /* output_structure_legacy.cpp */,
+				E9ECD59F2277E46400BD519E /* output_structure.cpp */,
+				E9ECD5A02277E46400BD519E /* output_su2.cpp */,
+				E9ECD5AF2277E46500BD519E /* output_tecplot.cpp */,
 				400CEC2D21FA81A10019B790 /* printing_toolbox.cpp */,
 			);
 			name = Output;
@@ -411,7 +474,7 @@
 				05E6DAA517EB603F00FA1F7E /* matrix_structure.inl */,
 				E941BBA61B71D1AB005C6C06 /* mpi_structure.inl */,
 				05E6DBB117EB624700FA1F7E /* numerics_structure.inl */,
-				05812D7C1F2787B60086FCB0 /* output_structure.inl */,
+				E9ECD5D12277E4C600BD519E /* output_structure_legacy.inl */,
 				05E6DAA617EB603F00FA1F7E /* primal_grid_structure.inl */,
 				355D2C9D2172BDE100C10535 /* sgs_model.inl */,
 				05E6DBB217EB624700FA1F7E /* solver_structure.inl */,
@@ -456,7 +519,21 @@
 				E941BBA51B71D1AB005C6C06 /* mpi_structure.hpp */,
 				05E6DBB717EB627400FA1F7E /* numerics_structure.hpp */,
 				05E6DACC17EB608000FA1F7E /* option_structure.hpp */,
-				05E6DBB817EB627400FA1F7E /* output_structure.hpp */,
+				E9ECD5DC2277E4C700BD519E /* output_adj_elasticity.hpp */,
+				E9ECD5CF2277E4C600BD519E /* output_adj_flow_comp.hpp */,
+				E9ECD5CE2277E4C600BD519E /* output_adj_flow_inc.hpp */,
+				E9ECD5DB2277E4C700BD519E /* output_adj_heat.hpp */,
+				E9ECD5DD2277E4C800BD519E /* output_baseline.hpp */,
+				E9ECD5D42277E4C700BD519E /* output_driver.hpp */,
+				E9ECD5D82277E4C700BD519E /* output_elasticity.hpp */,
+				E9ECD5D32277E4C700BD519E /* output_flow_comp_fem.hpp */,
+				E9ECD5D02277E4C600BD519E /* output_flow_comp.hpp */,
+				E9ECD5D52277E4C700BD519E /* output_flow_inc.hpp */,
+				E9ECD5D62277E4C700BD519E /* output_flow.hpp */,
+				E9ECD5D92277E4C700BD519E /* output_heat.hpp */,
+				E9ECD5DA2277E4C700BD519E /* output_mesh.hpp */,
+				E9ECD5D72277E4C700BD519E /* output_structure_legacy.hpp */,
+				E9ECD5D22277E4C600BD519E /* output.hpp */,
 				05E6DACD17EB608000FA1F7E /* primal_grid_structure.hpp */,
 				400CEC2F21FA81B60019B790 /* printing_toolbox.hpp */,
 				355D2C9E2172BDE100C10535 /* sgs_model.hpp */,
@@ -550,6 +627,7 @@
 				05E6DB8917EB61E600FA1F7E /* config_structure.cpp */,
 				E96FAF172189FF0A0046BF5D /* data_manufactured_solutions.cpp */,
 				05E6DBBC17EB62A000FA1F7E /* definition_structure.cpp */,
+				E9ECD5CC2277E48900BD519E /* driver_adjoint_singlezone.cpp */,
 				400CEC2921FA80180019B790 /* driver_direct_multizone.cpp */,
 				400CEC2A21FA80180019B790 /* driver_direct_singlezone.cpp */,
 				E9AA98A61BB3436900B7FE37 /* driver_structure.cpp */,
@@ -564,6 +642,7 @@
 				05D28619178BCA1200DD76AE /* Numerics */,
 				052D51AB17A22E24003BE8B2 /* Output */,
 				05F8F2662008A1AA000FEA01 /* Python */,
+				E9ECD5CA2277E47B00BD519E /* signal_processing_toolbox.cpp */,
 				052D517F17A21FAC003BE8B2 /* Solver */,
 				05E6DBEC17EB62A100FA1F7E /* SU2_CFD.cpp */,
 				05F108A21978D2E500F2F288 /* TransportModel */,
@@ -670,31 +749,40 @@
 			files = (
 				E9D9CE8A1C62A1C8004119E9 /* transfer_structure.cpp in Sources */,
 				05E6DB9217EB61E600FA1F7E /* config_structure.cpp in Sources */,
-				05755F0A1A54AC4500600019 /* output_su2.cpp in Sources */,
 				E96FAF142189FECA0046BF5D /* graph_coloring_structure.cpp in Sources */,
+				E9ECD5C72277E46600BD519E /* output_flow_comp.cpp in Sources */,
 				05E6DB9317EB61E600FA1F7E /* dual_grid_structure.cpp in Sources */,
+				E9ECD5C12277E46600BD519E /* output_driver.cpp in Sources */,
 				E96FAF152189FECA0046BF5D /* fem_gauss_jacobi_quadrature.cpp in Sources */,
 				05E6DB9417EB61E600FA1F7E /* geometry_structure.cpp in Sources */,
 				05E6DB9517EB61E600FA1F7E /* grid_adaptation_structure.cpp in Sources */,
 				05AF9F221BE1E1830062E1F1 /* gauss_structure.cpp in Sources */,
 				0530E57017FDF7D300733CE8 /* numerics_direct_elasticity.cpp in Sources */,
+				E9ECD5B92277E46600BD519E /* output_adj_flow_comp.cpp in Sources */,
 				0530E56A17FDF7AC00733CE8 /* solver_direct_elasticity.cpp in Sources */,
 				05E6DB9617EB61E600FA1F7E /* grid_movement_structure.cpp in Sources */,
 				05E6DB9717EB61E600FA1F7E /* linear_solvers_structure.cpp in Sources */,
 				05E6DB9817EB61E600FA1F7E /* matrix_structure.cpp in Sources */,
+				E9ECD5BE2277E46600BD519E /* output_cgns.cpp in Sources */,
+				E9ECD5C92277E46600BD519E /* output_structure_legacy.cpp in Sources */,
 				05E6DB9917EB61E600FA1F7E /* primal_grid_structure.cpp in Sources */,
 				05AF9F201BE1E1830062E1F1 /* element_linear.cpp in Sources */,
 				05E6DB9A17EB61E600FA1F7E /* vector_structure.cpp in Sources */,
 				05F8F2682008A1C8000FEA01 /* python_wrapper_structure.cpp in Sources */,
+				E9ECD5C52277E46600BD519E /* output_tecplot.cpp in Sources */,
 				E9225F761FCBC36D002F3682 /* solver_adjoint_elasticity.cpp in Sources */,
+				E9ECD5B52277E46600BD519E /* output_structure.cpp in Sources */,
+				E9ECD5B62277E46600BD519E /* output_su2.cpp in Sources */,
 				05E6DC0117EB62A100FA1F7E /* definition_structure.cpp in Sources */,
 				05E6DC0317EB62A100FA1F7E /* integration_structure.cpp in Sources */,
 				E941BBAE1B71D564005C6C06 /* variable_adjoint_discrete.cpp in Sources */,
+				E9ECD5B72277E46600BD519E /* output_baseline.cpp in Sources */,
 				E9F512C81CB2FD6B004D5089 /* numerics_direct_elasticity_linear.cpp in Sources */,
+				E9ECD5C22277E46600BD519E /* output_adj_flow_inc.cpp in Sources */,
 				05E6DC0417EB62A100FA1F7E /* integration_time.cpp in Sources */,
 				05F1089B1978D2AE00F2F288 /* fluid_model_ppr.cpp in Sources */,
-				05812D7B1F2787540086FCB0 /* output_physics.cpp in Sources */,
 				E941BB8E1B71D0D0005C6C06 /* solver_adjoint_discrete.cpp in Sources */,
+				E9ECD5C32277E46600BD519E /* output_adj_heat.cpp in Sources */,
 				05E6DC0517EB62A100FA1F7E /* iteration_structure.cpp in Sources */,
 				05E6DC0817EB62A100FA1F7E /* numerics_adjoint_mean.cpp in Sources */,
 				05AF9F211BE1E1830062E1F1 /* element_structure.cpp in Sources */,
@@ -702,6 +790,7 @@
 				E9AA98A71BB3436900B7FE37 /* driver_structure.cpp in Sources */,
 				05E6DC0B17EB62A100FA1F7E /* numerics_adjoint_turbulent.cpp in Sources */,
 				05F108A41978D2F200F2F288 /* transport_model.cpp in Sources */,
+				E9ECD5C42277E46600BD519E /* output_csv.cpp in Sources */,
 				E9FDF6EA1D2DD0560066E49C /* adt_structure.cpp in Sources */,
 				05E6DC0E17EB62A100FA1F7E /* numerics_direct_heat.cpp in Sources */,
 				E90D35F7203F9C5800A3290D /* fluid_model_inc.cpp in Sources */,
@@ -711,25 +800,25 @@
 				0530E56E17FDF7C600733CE8 /* variable_direct_elasticity.cpp in Sources */,
 				05F1089D1978D2AE00F2F288 /* fluid_model.cpp in Sources */,
 				E9C830812061E60E004417A9 /* fem_standard_element.cpp in Sources */,
+				E9ECD5B82277E46600BD519E /* output_flow.cpp in Sources */,
 				05E6DC1317EB62A100FA1F7E /* numerics_direct_transition.cpp in Sources */,
-				0506980A1AA6179100FF4F07 /* output_fieldview.cpp in Sources */,
 				05E6DC1417EB62A100FA1F7E /* numerics_direct_turbulent.cpp in Sources */,
 				400CEC2B21FA80180019B790 /* driver_direct_multizone.cpp in Sources */,
 				E96FAF102189FE9C0046BF5D /* blas_structure.cpp in Sources */,
 				05E6DC1817EB62A100FA1F7E /* numerics_structure.cpp in Sources */,
 				05E6DC1917EB62A100FA1F7E /* numerics_template.cpp in Sources */,
 				E9C830822061E60E004417A9 /* fem_wall_distance.cpp in Sources */,
-				05E6DC1A17EB62A100FA1F7E /* output_cgns.cpp in Sources */,
 				E9C8307F2061E60E004417A9 /* fem_geometry_structure.cpp in Sources */,
 				E96FAF162189FECA0046BF5D /* fem_cgns_elements.cpp in Sources */,
-				05E6DC1B17EB62A100FA1F7E /* output_paraview.cpp in Sources */,
-				05E6DC1C17EB62A100FA1F7E /* output_structure.cpp in Sources */,
 				E96FAF182189FF0A0046BF5D /* data_manufactured_solutions.cpp in Sources */,
+				E9ECD5C82277E46600BD519E /* output_flow_inc.cpp in Sources */,
 				3599C5D32121FAC9003AAF05 /* wall_model.cpp in Sources */,
-				05E6DC1D17EB62A100FA1F7E /* output_tecplot.cpp in Sources */,
+				E9ECD5BD2277E46600BD519E /* output_mesh.cpp in Sources */,
 				E9D9CE861C62A1A7004119E9 /* interpolation_structure.cpp in Sources */,
 				05F1089C1978D2AE00F2F288 /* fluid_model_pvdw.cpp in Sources */,
+				E9ECD5BC2277E46600BD519E /* output_adj_elasticity.cpp in Sources */,
 				05E6DC1F17EB62A100FA1F7E /* solver_adjoint_mean.cpp in Sources */,
+				E9ECD5CB2277E47C00BD519E /* signal_processing_toolbox.cpp in Sources */,
 				E9F130D01D513DA300EC8963 /* variable_direct_mean_inc.cpp in Sources */,
 				05E6DC2217EB62A100FA1F7E /* solver_adjoint_turbulent.cpp in Sources */,
 				05E6DC2517EB62A100FA1F7E /* solver_direct_heat.cpp in Sources */,
@@ -737,6 +826,7 @@
 				E9F512C91CB2FD6B004D5089 /* numerics_direct_elasticity_nonlinear.cpp in Sources */,
 				05E6DC2A17EB62A100FA1F7E /* solver_direct_transition.cpp in Sources */,
 				400CEC2C21FA80180019B790 /* driver_direct_singlezone.cpp in Sources */,
+				E9ECD5B42277E46600BD519E /* output_physics.cpp in Sources */,
 				E9F130CC1D513DA300EC8963 /* numerics_direct_mean_inc.cpp in Sources */,
 				E9C830852061E60E004417A9 /* geometry_structure_fem_part.cpp in Sources */,
 				05E6DC2B17EB62A100FA1F7E /* solver_direct_turbulent.cpp in Sources */,
@@ -748,16 +838,22 @@
 				400CEC2E21FA81A10019B790 /* printing_toolbox.cpp in Sources */,
 				05E6DC3717EB62A100FA1F7E /* variable_adjoint_turbulent.cpp in Sources */,
 				05E6DC3A17EB62A100FA1F7E /* variable_direct_heat.cpp in Sources */,
+				E9ECD5CD2277E48900BD519E /* driver_adjoint_singlezone.cpp in Sources */,
 				05E6DC3C17EB62A100FA1F7E /* variable_direct_mean.cpp in Sources */,
+				E9ECD5C62277E46600BD519E /* output_elasticity.cpp in Sources */,
 				05E6DC3F17EB62A100FA1F7E /* variable_direct_transition.cpp in Sources */,
 				E9C830932061E799004417A9 /* solver_direct_mean_fem.cpp in Sources */,
 				E9C830832061E60E004417A9 /* fem_work_estimate_metis.cpp in Sources */,
+				E9ECD5BF2277E46600BD519E /* output_flow_comp_fem.cpp in Sources */,
+				E9ECD5BB2277E46600BD519E /* output_paraview.cpp in Sources */,
 				05E6DC4017EB62A100FA1F7E /* variable_direct_turbulent.cpp in Sources */,
 				E9F130CE1D513DA300EC8963 /* solver_direct_mean_inc.cpp in Sources */,
 				E9D9CE891C62A1C8004119E9 /* transfer_physics.cpp in Sources */,
+				E9ECD5C02277E46600BD519E /* output_fieldview.cpp in Sources */,
 				E941BB931B71D124005C6C06 /* linear_solvers_structure_b.cpp in Sources */,
 				05E6DC4417EB62A100FA1F7E /* variable_structure.cpp in Sources */,
 				E9C830802061E60E004417A9 /* fem_integration_rules.cpp in Sources */,
+				E9ECD5BA2277E46600BD519E /* output_heat.cpp in Sources */,
 				05E6DC4517EB62A100FA1F7E /* variable_template.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

From 2f1508ea81b6028391c530ffc29355ee9b99d5aa Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 17 May 2019 11:34:25 +0200
Subject: [PATCH 260/539] Added phys. time value to config

---
 Common/include/config_structure.hpp      |   5 +
 Common/include/config_structure.inl      |   4 +
 SU2_CFD/include/driver_structure.hpp     |   4 +
 SU2_CFD/include/output/output.hpp        |   4 +
 SU2_CFD/src/driver_direct_singlezone.cpp |  60 +++++++++++-
 SU2_CFD/src/driver_structure.cpp         |   4 +
 SU2_CFD/src/iteration_structure.cpp      |   2 +-
 SU2_CFD/src/output/output_structure.cpp  | 119 +++++++++++++----------
 8 files changed, 145 insertions(+), 57 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index dd3889b64491..3ff2ecf71ced 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -120,6 +120,7 @@ class CConfig {
   su2double FFD_Tol;  	/*!< \brief Tolerance in the point inversion problem. */
   su2double Opt_RelaxFactor;  	/*!< \brief Scale factor for the line search. */
   su2double Opt_LineSearch_Bound;  	/*!< \brief Bounds for the line search. */
+  su2double StartTime;
   bool ContinuousAdjoint,			/*!< \brief Flag to know if the code is solving an adjoint problem. */
   Viscous,                /*!< \brief Flag to know if the code is solving a viscous problem. */
   EquivArea,				/*!< \brief Flag to know if the code is going to compute and plot the equivalent area. */
@@ -9117,6 +9118,10 @@ class CConfig {
   * \brief Get the convergence field for monitoring
   */
   string GetConv_Field();
+  
+  void Set_StartTime(su2double starttime);
+  
+  su2double Get_StartTime();
 
 };
 
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 41399131f439..59c601094b1f 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2057,3 +2057,7 @@ inline su2double CConfig::GetUQ_URLX(void) {return uq_urlx; }
 inline bool CConfig::GetUQ_Permute(void) { return uq_permute; }
 
 inline string CConfig::GetConv_Field(){ return ConvField; }
+
+inline void  CConfig::Set_StartTime(su2double starttime){StartTime = starttime;}
+
+inline su2double  CConfig::Get_StartTime() {return StartTime;}
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index aef39f1275f5..4bf1465a3a49 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -1415,6 +1415,10 @@ class CSinglezoneDriver : public CDriver {
    */
   void DynamicMeshUpdate(unsigned long ExtIter);
 
+  /*!
+   * \brief Monitor the computation.
+   */
+  bool Monitor(unsigned long ExtIter);
 
 };
 
diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 908118e0e730..1cb4f8d213ad 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -453,6 +453,10 @@ class COutput {
   
   bool Convergence_Monitoring(CConfig *config, unsigned long Iteration);
 
+  bool GetConvergence() {return Convergence;}
+
+  void SetConvergence(bool conv) {Convergence = conv;}
+
 protected:
   
   /*----------------------------- Protected member functions ----------------------------*/  
diff --git a/SU2_CFD/src/driver_direct_singlezone.cpp b/SU2_CFD/src/driver_direct_singlezone.cpp
index d203d8270854..5983898e3cae 100644
--- a/SU2_CFD/src/driver_direct_singlezone.cpp
+++ b/SU2_CFD/src/driver_direct_singlezone.cpp
@@ -296,14 +296,16 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
     UsedTimeOutput += StopTime-StartTime;
     OutputCount++;
     BandwidthSum = config_container[ZONE_0]->GetRestart_Bandwidth_Agg();
+
+  }
+  
 #ifndef HAVE_MPI
-    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
-    StartTime = MPI_Wtime();
+  StartTime = MPI_Wtime();
 #endif
-
-  }
-
+  config_container[ZONE_0]->Set_StartTime(StartTime);
+  
 }
 
 void CSinglezoneDriver::DynamicMeshUpdate(unsigned long ExtIter) {
@@ -315,3 +317,51 @@ void CSinglezoneDriver::DynamicMeshUpdate(unsigned long ExtIter) {
 
 }
 
+bool CSinglezoneDriver::Monitor(unsigned long ExtIter){
+
+  unsigned long nInnerIter, InnerIter, TimeIter, nTimeIter;
+  su2double MaxTime, CurTime;
+  bool TimeDomain, InnerConvergence;
+  
+  nInnerIter = config_container[ZONE_0]->GetnInner_Iter();
+  InnerIter  = config_container[ZONE_0]->GetInnerIter();
+  TimeIter   = config_container[ZONE_0]->GetTimeIter();
+  nTimeIter  = config_container[ZONE_0]->GetnTime_Iter();
+  MaxTime    = config_container[ZONE_0]->GetMax_Time();
+  CurTime    = TimeIter*config_container[ZONE_0]->GetTime_Step();
+  
+  TimeDomain = config_container[ZONE_0]->GetTime_Domain();
+  
+  InnerConvergence = output[ZONE_0]->GetConvergence();
+  
+  /*--- Check whether the inner solver has converged --- */
+
+  if (TimeDomain == NO){
+    if (((InnerIter+1 >= nInnerIter) || InnerConvergence) && (rank == MASTER_NODE)) {
+      cout << endl << "----------------------------- Solver Exit -------------------------------";
+      if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
+      else cout << endl << "Maximum number of iterations reached (ITER)." << endl;
+      cout << "-------------------------------------------------------------------------" << endl;
+    }
+  }
+
+  /*--- Check whether the outer time integration has reached the final time ---*/
+
+  StopCalc = CurTime >= MaxTime;
+
+  if (TimeDomain == YES) {
+    if ((StopCalc || TimeIter+1 >= nTimeIter) && (rank == MASTER_NODE)){
+      cout << endl << "----------------------------- Solver Exit -------------------------------";
+      if (StopCalc) cout << endl << "Maximum time reached." << endl;
+      else cout << endl << "Maximum number of time iterations reached (TIME_ITER)." << endl;
+      cout << "-------------------------------------------------------------------------" << endl;      
+    }
+  }
+
+  /*--- Reset the inner convergence --- */
+  
+  output[ZONE_0]->SetConvergence(false);
+
+  return StopCalc;
+}
+
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index d1c3d65c45f2..11e8723958ee 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -585,6 +585,10 @@ CDriver::CDriver(char* confFile,
   StartTime = MPI_Wtime();
 #endif
 
+  for (iZone = 0; iZone < nZone; iZone++) {
+    config_container[iZone]->Set_StartTime(StartTime);
+  }  
+ 
 }
 
 void CDriver::Postprocessing() {
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 444d60dfb62a..5c5cab6a436e 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -779,7 +779,7 @@ bool CFluidIteration::Monitor(COutput *output,
   }
 
   /*--- If convergence was reached --*/
-  StopCalc =  output->Convergence_Monitoring(config_container[val_iZone], config_container[val_iZone]->GetInnerIter());
+  StopCalc =  output->GetConvergence();
 
   return StopCalc;
 
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index d2b382d3fa49..54a0d91f6379 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -257,8 +257,12 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   
   /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
   
+  LoadCommonHistoryData(config);
+  
   LoadHistoryData(config, geometry, solver_container);
   
+  Convergence_Monitoring(config, curr_InnerIter);
+  
   Postprocess_HistoryData(config);
   
   /*--- Output using only the master node ---*/
@@ -287,8 +291,12 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   
   /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
   
+  LoadCommonHistoryData(config);
+  
   LoadHistoryData(config, geometry, solver_container);
   
+  Convergence_Monitoring(config, curr_InnerIter);  
+  
   Postprocess_HistoryData(config);
 
 }
@@ -660,92 +668,101 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
 bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
   unsigned short iCounter;
-
+  
   bool Already_Converged = Convergence;
-
+  
   su2double monitor = HistoryOutput_Map[Conv_Field].Value;
-
+  
   /*--- Cauchy based convergence criteria ---*/
-
+  
   if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT) {
-
-      Old_Func = New_Func;
-      New_Func = monitor;
-      Cauchy_Func = fabs(New_Func - Old_Func);
-
-      Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
-      Cauchy_Value = 1;
-      if (Iteration  >= config->GetCauchy_Elems()) {
-          Cauchy_Value = 0;
-          for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-            Cauchy_Value += Cauchy_Serie[iCounter];
+    
+    if (Iteration == 0){
+      for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
+        Cauchy_Serie[iCounter] = 0.0;
       }
-
-      if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
-      else { Convergence = true; Convergence_FullMG = true; }
-
+      New_Func = monitor;
+    }
+    
+    Old_Func = New_Func;
+    New_Func = monitor;
+    Cauchy_Func = fabs(New_Func - Old_Func);
+    
+    Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
+    Cauchy_Value = 1.0;
+    if (Iteration >= config->GetCauchy_Elems()){     
+      Cauchy_Value = 0.0;
+      for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
+        Cauchy_Value += Cauchy_Serie[iCounter];
+    }
+    
+    if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
+    else { Convergence = true; Convergence_FullMG = true; New_Func = 0.0;}
+    
+    SetHistoryOutputValue("CAUCHY", Cauchy_Value);
+ 
   }
-
+  
   /*--- Residual based convergence criteria ---*/
-
+  
   if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_RESIDUAL || HistoryOutput_Map[Conv_Field].FieldType == TYPE_REL_RESIDUAL) {
-
-      /*--- Check the convergence ---*/
-
-      if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
-      else { Convergence = false; Convergence_FullMG = false; }
-
+    
+    /*--- Check the convergence ---*/
+    
+    if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
+    else { Convergence = false; Convergence_FullMG = false; }
+    
   }
-
+  
   /*--- Do not apply any convergence criteria of the number
      of iterations is less than a particular value ---*/
-
+  
   if (Iteration < config->GetStartConv_Iter()) {
-      Convergence = false;
-      Convergence_FullMG = false;
+    Convergence = false;
+    Convergence_FullMG = false;
   }
-
+  
   if (Already_Converged) { Convergence = true; Convergence_FullMG = true; }
-
-
+  
+  
   /*--- Apply the same convergence criteria to all the processors ---*/
-
+  
 #ifdef HAVE_MPI
-
+  
   unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
   sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
   rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-
+  
   /*--- Convergence criteria ---*/
-
+  
   sbuf_conv[0] = Convergence;
   SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-
+  
   /*-- Compute global convergence criteria in the master node --*/
-
+  
   sbuf_conv[0] = 0;
   if (rank == MASTER_NODE) {
-      if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-      else sbuf_conv[0] = 0;
+    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
+    else sbuf_conv[0] = 0;
   }
-
+  
   SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-
+  
   if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
   else { Convergence = false; Convergence_FullMG = false; }
-
+  
   delete [] sbuf_conv;
   delete [] rbuf_conv;
-
+  
 #endif
-
+  
   /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
-
+  
   if (monitor != monitor) {
-      SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+    SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
   }
-
-
+  
+  
   return Convergence;
 }
 

From e683c406b2d3c34113a6715aa3af9a3dafa8dcbd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 17 May 2019 11:35:24 +0200
Subject: [PATCH 261/539] Added routine to set common history fields

---
 SU2_CFD/include/output/output.hpp       |  2 +
 SU2_CFD/src/output/output_flow_comp.cpp | 11 -----
 SU2_CFD/src/output/output_structure.cpp | 55 ++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/output.hpp
index 1cb4f8d213ad..0865dcdb77cf 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/output.hpp
@@ -1125,6 +1125,8 @@ class COutput {
    */
   inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
 
+  inline void SetCommonHistoryFields(CConfig *config);
   
+  inline void LoadCommonHistoryData(CConfig *config);
 };
 
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/output_flow_comp.cpp
index 3c9a1a11d2a4..fd32893b5e1f 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_flow_comp.cpp
@@ -130,17 +130,6 @@ CFlowCompOutput::~CFlowCompOutput(void) {
 
 void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The outer iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The inner iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
-  
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 54a0d91f6379..17fa932bfa8d 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -206,6 +206,8 @@ COutput::COutput(CConfig *config) {
   Cauchy_Value = 0.0;
   for (unsigned short iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
     Cauchy_Serie[iCounter] = 0.0;
+
+  Convergence = false;
   
   /*--- Initialize all convergence flags to false. ---*/
   
@@ -5552,6 +5554,10 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
     no_writing = !wrt;
 
+    /*--- Set the common output fields ---*/
+    
+    SetCommonHistoryFields(config);
+    
     /*--- Set the History output fields using a virtual function call to the child implementation ---*/
     
     SetHistoryOutputFields(config);
@@ -5927,11 +5933,6 @@ void COutput::Postprocess_HistoryData(CConfig *config){
     }
   }
 
-  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
-    SetHistoryOutputValue("CAUCHY", Cauchy_Value);
-  }
-
-  
   map<string, su2double>::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
     SetHistoryOutputValue("AVG_" + it->first, it->second/Count[it->first]);
@@ -6016,3 +6017,47 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
   return true;
 }
 
+void COutput::SetCommonHistoryFields(CConfig *config){
+  
+  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
+  /// DESCRIPTION: The time iteration index.
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The outer iteration index.
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  /// DESCRIPTION: The inner iteration index.
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  /// END_GROUP
+  
+  /// BEGIN_GROUP: TIME_DOMAIN, DESCRIPTION: Time integration information
+  /// Description: The current time
+  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_FIXED, "TIME_DOMAIN");
+  /// Description: The current time step
+  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_FIXED, "TIME_DOMAIN");
+ 
+  /// DESCRIPTION: Currently used wall-clock time.
+  AddHistoryOutput("PHYS_TIME",   "Time(sec)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+  
+}
+
+void COutput::LoadCommonHistoryData(CConfig *config){
+  
+  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+  
+  SetHistoryOutputValue("CUR_TIME",  curr_TimeIter*config->GetTime_Step());
+  SetHistoryOutputValue("TIME_STEP", config->GetTime_Step());
+  
+  su2double StopTime, UsedTime;
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  
+  UsedTime = (StopTime - config->Get_StartTime())/((curr_OuterIter + 1) * (curr_InnerIter+1));
+  
+  SetHistoryOutputValue("PHYS_TIME", UsedTime);
+  
+}
+

From 35e731ff247ca3ab3233d50d7bb7789fb34479e4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 17 May 2019 15:20:56 +0200
Subject: [PATCH 262/539] Removing output fields which are now defined in
 common routine

---
 SU2_CFD/src/output/output_adj_elasticity.cpp |  8 -----
 SU2_CFD/src/output/output_adj_flow_comp.cpp  | 12 --------
 SU2_CFD/src/output/output_adj_flow_inc.cpp   | 12 --------
 SU2_CFD/src/output/output_adj_heat.cpp       | 12 --------
 SU2_CFD/src/output/output_elasticity.cpp     |  4 ---
 SU2_CFD/src/output/output_flow_comp_fem.cpp  | 12 --------
 SU2_CFD/src/output/output_flow_inc.cpp       | 12 --------
 SU2_CFD/src/output/output_heat.cpp           |  4 ---
 SU2_CFD/src/output/output_structure.cpp      | 32 ++++++++++++++++++--
 9 files changed, 30 insertions(+), 78 deletions(-)

diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/output_adj_elasticity.cpp
index 73730be941a5..e8839df85b0e 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/output_adj_elasticity.cpp
@@ -106,14 +106,6 @@ CAdjElasticityOutput::~CAdjElasticityOutput(void) {
 
 void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
-  // Iteration numbers
-  AddHistoryOutput("INT_ITER",   "Int_Iter",  FORMAT_INTEGER, "ITER");
-  AddHistoryOutput("EXT_ITER",   "Ext_Iter",  FORMAT_INTEGER, "ITER");
-  // Temporarily add both
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER");
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
-  
   // Residuals
   AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
   AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS");
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/output_adj_flow_comp.cpp
index 74c2ad923938..b40651fbde26 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_comp.cpp
@@ -108,15 +108,6 @@ CAdjFlowOutput::~CAdjFlowOutput(void) {
 
 void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
 
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
-  
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
   AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
@@ -216,9 +207,6 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
-  
 }
 
 void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/output_adj_flow_inc.cpp
index 10ae29e52bff..955f6331dc79 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_adj_flow_inc.cpp
@@ -111,15 +111,6 @@ CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {
 }
 
 void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
-
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
@@ -223,9 +214,6 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
-  
 }
 
 void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/output_adj_heat.cpp
index 4a280ce47207..39868b68fdaf 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/output_adj_heat.cpp
@@ -100,15 +100,6 @@ CAdjHeatOutput::~CAdjHeatOutput(void) {
 }
 
 void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
-
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
@@ -125,9 +116,6 @@ void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
   /// END_GROUP
   
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
-  
 }
 
 void CAdjHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/output_elasticity.cpp
index 5bba4208de99..fd65b77e0e42 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/output_elasticity.cpp
@@ -117,10 +117,6 @@ CElasticityOutput::~CElasticityOutput(void) {
 void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
 
   CSolver* fea_solver = solver[FEA_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
 
   /*--- Residuals: ---*/
   /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/output_flow_comp_fem.cpp
index ec7765a5acca..21c037246375 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/output_flow_comp_fem.cpp
@@ -135,18 +135,6 @@ CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {
 
 
 void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
-  
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The outer iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The inner iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
-  
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/output_flow_inc.cpp
index 4a7392a56ff9..53ae9efa03c1 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/output_flow_inc.cpp
@@ -128,19 +128,7 @@ CFlowIncOutput::~CFlowIncOutput(void) {
 
 
 void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
-  
-  /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
-  /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The internal iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
-  /// DESCRIPTION: The external iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
-  /// END_GROUP
 
-  /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
-  
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the pressure.
   AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/output_heat.cpp
index 6b55e1d6a063..1346ab4e1523 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/output_heat.cpp
@@ -96,10 +96,6 @@ CHeatOutput::~CHeatOutput(void) {
 void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
   CSolver* heat_solver = solver[HEAT_SOL];  
-  
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
 
   SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
   SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 17fa932bfa8d..438382157f2b 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5653,7 +5653,6 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   /*--- Open the history file ---*/
   
-  cout << "History filename: " << char_histfile << endl;
   HistFile.open(char_histfile, ios::out);
   HistFile.precision(15);
   
@@ -5703,6 +5702,16 @@ void COutput::CheckHistoryOutput(){
   
   nRequestedScreenFields = RequestedScreenFields.size();
   
+  if (rank == MASTER_NODE){
+    cout <<"Screen output fields: ";
+    for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+      RequestedField = RequestedScreenFields[iReqField];            
+      cout << RequestedScreenFields[iReqField];
+      if (iReqField != nRequestedScreenFields - 1) cout << ", ";
+    }
+    cout << endl;
+  }
+  
   /*--- Remove unavailable fields from the history file output ---*/
   
   FieldsToRemove.clear();
@@ -5741,7 +5750,7 @@ void COutput::CheckHistoryOutput(){
   for (unsigned short iReqField = 0; iReqField < FieldsToRemove.size(); iReqField++){
     if (rank == MASTER_NODE) {
       if (iReqField == 0){
-        cout << "  Info: Ignoring the following history output fields/groups:" << endl;
+        cout << "  Info: Ignoring the following history output groups:" << endl;
         cout << "  ";
       }        cout << FieldsToRemove[iReqField];
       if (iReqField != FieldsToRemove.size()-1){
@@ -5755,6 +5764,16 @@ void COutput::CheckHistoryOutput(){
   
   nRequestedHistoryFields = RequestedHistoryFields.size();
   
+  if (rank == MASTER_NODE){
+    cout <<"History output groups: ";
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      RequestedField = RequestedHistoryFields[iReqField];            
+      cout << RequestedHistoryFields[iReqField];
+      if (iReqField != nRequestedHistoryFields - 1) cout << ", ";
+    }
+    cout << endl;
+  }
+  
   /*--- Check that the requested convergence monitoring field is available ---*/
 
   if (HistoryOutput_Map.count(Conv_Field) == 0){
@@ -5832,6 +5851,15 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     RequestedVolumeFields.erase(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), FieldsToRemove[iReqField]));
   }
   
+  if (rank == MASTER_NODE){
+    cout <<"Volume output fields: ";
+    for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
+      RequestedField = RequestedVolumeFields[iReqField];            
+      cout << RequestedVolumeFields[iReqField];
+      if (iReqField != nRequestedVolumeFields - 1) cout << ", ";
+    }
+    cout << endl;
+  }
   
   /*--- First, prepare the offsets needed throughout below. ---*/    
   

From a03e46511ae616e48bb932660a7325db085f24c6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 17 May 2019 15:21:08 +0200
Subject: [PATCH 263/539] Commented some old output routines.

---
 SU2_CFD/src/output/output_structure_legacy.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index ad61023a6a24..1a6a3df065f7 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -20600,7 +20600,7 @@ void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry
 
               if (rank == MASTER_NODE) cout << "ParaView binary volume files not available in this mode." << endl;
               if (rank == MASTER_NODE) cout << " Writing ParaView ASCII volume solution file instead." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, false);
+//              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, false);
               DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
               break;
 
@@ -20647,7 +20647,7 @@ void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry
 
               if (rank == MASTER_NODE) cout << "ParaView binary surface files not available in this mode." << endl;
               if (rank == MASTER_NODE) cout << " Writing ParaView ASCII surface solution file instead." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, true);
+//              SetParaview_ASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone, true);
               DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], true);
               break;
 
@@ -20777,7 +20777,7 @@ void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***
 
               if (rank == MASTER_NODE) cout << "ParaView binary (volume grid) files not available in this mode." << endl;
               if (rank == MASTER_NODE) cout << " Writing ParaView ASCII file instead." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
+//              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, false);
               DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
               break;
 
@@ -20824,7 +20824,7 @@ void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***
 
               if (rank == MASTER_NODE) cout << "ParaView binary (surface grid) files not available in this mode." << endl;
               if (rank == MASTER_NODE) cout << " Writing ParaView ASCII file instead." << endl;
-              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
+//              SetParaview_ASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone, true);
               DeallocateConnectivity(config[iZone], geometry[iZone][iInst], true);
               break;
 

From c36f64d33b8cbf4e09a2633e0cf962c84764a049 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 17 May 2019 16:08:15 +0200
Subject: [PATCH 264/539] Adding parallel output routines for FEM

---
 SU2_CFD/src/output/output_structure.cpp | 492 +++++++++++++++++++++++-
 1 file changed, 491 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/output_structure.cpp
index 438382157f2b..07fdd26c0180 100644
--- a/SU2_CFD/src/output/output_structure.cpp
+++ b/SU2_CFD/src/output/output_structure.cpp
@@ -5073,11 +5073,247 @@ void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, bool su
 }
 
 void COutput::SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  /* Determine the number of nodes for this element type. */
+  unsigned short NODES_PER_ELEMENT = 0;
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
 
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+        geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  const CFEMStandardElement *standardElementsSol = DGGeometry->GetStandardElementsSol();
+
+  /*--- Determine the number of sub-elements on this rank. ---*/
+  unsigned long nSubElem_Local = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+
+    /* Determine the necessary data from the corresponding standard elem. */
+    const unsigned short ind       = volElem[i].indStandardElement;
+    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
+    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
+
+     /* Only store the linear sub elements if they are of
+        the current type that we are storing. */
+     if(Elem_Type == VTK_Type1) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType1();
+     if(Elem_Type == VTK_Type2) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType2();
+  }
+
+  /* Allocate the memory to store the connectivity if the size is
+     larger than zero. */
+  int *Conn_SubElem = NULL;
+  if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
+
+  /*--- Loop again over the local volume elements and store the global
+        connectivities of the sub-elements. Note one is added to the
+        index value, because visualization softwares typically use
+        1-based indexing. ---*/
+  unsigned long kNode = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+
+    /* Determine the necessary data from the corresponding standard elem. */
+    const unsigned short ind       = volElem[i].indStandardElement;
+    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
+    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
+
+    /* Check if the first sub-element is of the required type. */
+    if(Elem_Type == VTK_Type1) {
+
+      /* Get the number of sub-elements and the local connectivity of
+         the sub-elements. */
+      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType1();
+      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType1();
+
+      /* Store the global connectivities. */
+      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
+      for(unsigned short k=0; k<kk; ++k, ++kNode)
+        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
+    }
+
+    /* Check if the second sub-element is of the required type. */
+    if(Elem_Type == VTK_Type2) {
+
+      /* Get the number of sub-elements and the local connectivity of
+         the sub-elements. */
+      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType2();
+      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType2();
+
+      /* Store the global connectivities. */
+      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
+      for(unsigned short k=0; k<kk; ++k, ++kNode)
+        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
+    }
+  }
+
+  /*--- Store the particular global element count in the class data,
+        and set the class data pointer to the connectivity array. ---*/
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nParallel_Tria = nSubElem_Local;
+      Conn_Tria_Par = Conn_SubElem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nSubElem_Local;
+      Conn_Quad_Par = Conn_SubElem;
+      break;
+    case TETRAHEDRON:
+      nParallel_Tetr = nSubElem_Local;
+      Conn_Tetr_Par = Conn_SubElem;
+      break;
+    case HEXAHEDRON:
+      nParallel_Hexa = nSubElem_Local;
+      Conn_Hexa_Par = Conn_SubElem;
+      break;
+    case PRISM:
+      nParallel_Pris = nSubElem_Local;
+      Conn_Pris_Par = Conn_SubElem;
+      break;
+    case PYRAMID:
+      nParallel_Pyra = nSubElem_Local;
+      Conn_Pyra_Par = Conn_SubElem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
 }
 
 void COutput::SortSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-
+  
+  /* Determine the number of nodes for this element type. */
+    unsigned short NODES_PER_ELEMENT = 0;
+    switch (Elem_Type) {
+      case LINE:
+        NODES_PER_ELEMENT = N_POINTS_LINE;
+        break;
+      case TRIANGLE:
+        NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+        break;
+      case QUADRILATERAL:
+        NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+    }
+    
+    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+          geometrical information for the FEM DG solver. ---*/
+    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  
+    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+  
+    const CBoundaryFEM *boundaries = DGGeometry->GetBoundaries();
+    const CFEMStandardBoundaryFace *standardBoundaryFacesSol = DGGeometry->GetStandardBoundaryFacesSol();
+  
+    /*--- Create the map from the global DOF ID to the local index.
+          Note one is added to the index value, because visualization
+          softwares typically use 1-based indexing. ---*/
+    vector<unsigned long> globalID;
+    for(unsigned long l=0; l<nVolElemOwned; ++l) {
+      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+        const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j + 1;
+        globalID.push_back(globalIndex);
+      }
+    }
+  
+    /*--- Determine the number of sub-elements on this rank by looping
+          over the surface elements of the boundary markers that must
+          be plotted. ---*/
+    unsigned long nSubElem_Local = 0;
+    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
+      if( !boundaries[iMarker].periodicBoundary ) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
+          for(unsigned long i=0; i<surfElem.size(); ++i) {
+            const unsigned short ind      = surfElem[i].indStandardElement;
+            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
+            if(Elem_Type == VTK_Type) nSubElem_Local += standardBoundaryFacesSol[ind].GetNSubFaces();
+          }
+        }
+      }
+    }
+  
+    /* Allocate the memory to store the connectivity if the size is
+       larger than zero. */
+    int *Conn_SubElem = NULL;
+    if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
+  
+    /*--- Repeat the loop over the surface elements of the boundary markers
+          that must be plotted, but now store the connectivity. ---*/
+    unsigned long kNode = 0;
+    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
+      if( !boundaries[iMarker].periodicBoundary ) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
+  
+          /* Loop over the surface elements of this boundary marker. */
+          for(unsigned long i=0; i<surfElem.size(); ++i) {
+  
+            /* Check if this is the element type to be stored. */
+            const unsigned short ind      = surfElem[i].indStandardElement;
+            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
+            if(Elem_Type == VTK_Type) {
+  
+              /* Get the number of sub-elements and the local connectivity of
+                 the sub-elements. */
+              const unsigned short nSubFaces     = standardBoundaryFacesSol[ind].GetNSubFaces();
+              const unsigned short *connSubFaces = standardBoundaryFacesSol[ind].GetSubFaceConn();
+  
+              /* Store the global connectivities. */
+              const unsigned short kk = NODES_PER_ELEMENT*nSubFaces;
+              for(unsigned short k=0; k<kk; ++k, ++kNode)
+                Conn_SubElem[kNode] = globalID[surfElem[i].DOFsSolFace[connSubFaces[k]]];
+            }
+          }
+        }
+      }
+    }
+  
+    /*--- Store the particular global element count in the class data,
+          and set the class data pointer to the connectivity array. ---*/
+    switch (Elem_Type) {
+      case LINE:
+        nParallel_Line = nSubElem_Local;
+        Conn_BoundLine_Par = Conn_SubElem;
+        break;
+      case TRIANGLE:
+        nParallel_BoundTria = nSubElem_Local;
+        Conn_BoundTria_Par = Conn_SubElem;
+        break;
+      case QUADRILATERAL:
+        nParallel_BoundQuad = nSubElem_Local;
+        Conn_BoundQuad_Par = Conn_SubElem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
+    }
+    
 }
 
 void COutput::SortOutputData_FEM(CConfig *config, CGeometry *geometry) {
@@ -5415,7 +5651,261 @@ void COutput::SortOutputData_FEM(CConfig *config, CGeometry *geometry) {
 }
 
 void COutput::SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry) {
+  
+  const int VARS_PER_POINT = GlobalField_Counter;
+
+  /*---------------------------------------------------*/
+  /*--- Step 1: Determine the global DOF ID's of the   */
+  /*---         locally stored surface connectivities. */
+  /*---------------------------------------------------*/
+
+  /* Loop over the surface connectivities and store global
+     DOF ID's in a vector. Subtract 1, because the stored
+     connectivities are 1 based. */
+  std::vector<unsigned long> globalSurfaceDOFIDs;
+  globalSurfaceDOFIDs.reserve(nParallel_Line*N_POINTS_LINE +
+                              nParallel_BoundTria*N_POINTS_TRIANGLE +
+                              nParallel_BoundQuad*N_POINTS_QUADRILATERAL);
+
+  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i) {
+    const unsigned long globalID = Conn_BoundLine_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  for(unsigned long i=0; i<(nParallel_BoundTria*N_POINTS_TRIANGLE); ++i) {
+    const unsigned long globalID = Conn_BoundTria_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  for(unsigned long i=0; i<(nParallel_BoundQuad*N_POINTS_QUADRILATERAL); ++i) {
+    const unsigned long globalID = Conn_BoundQuad_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  /* Sort globalSurfaceDOFIDs in increasing order and remove the
+     multiple entries. */
+  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  vector<unsigned long>::iterator lastEntry;
+  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 2: Communicate the information of globalSurfaceDOFIDs  ---*/
+  /*---         to the ranks, which actually store this information ---*/
+  /*---         in Parallel_Data.                                   ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Allocate the memory for the first index of the communication buffers. */
+  vector<vector<unsigned long> > sendBuf(size, vector<unsigned long>(0));
+
+  /* Loop over the entries of globalSurfaceDOFIDs and fill the
+     communication buffers accordingly. */
+  for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
+
+    /* Search for the processor that owns this point. */
+    unsigned long iProcessor = globalSurfaceDOFIDs[i]/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor])
+      while(globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor+1]) ++iProcessor;
+    else
+      while(globalSurfaceDOFIDs[i] <  nPoint_Cum[iProcessor])   --iProcessor;
+
+    /* Store the global ID in the send buffer for iProcessor. */
+    sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
+  }
+
+  /* Determine the number of DOFs to be sent to each processor. */
+  int nRankSend = 0;
+  vector<unsigned long> nDOFSend(size);
+  for(int i=0; i<size; ++i) {
+    nDOFSend[i] = sendBuf[i].size();
+    if(nDOFSend[i] && (i != rank)) ++nRankSend;
+  }
+
+  /* Communicate nDOFSend using Alltoall. */
+  vector<unsigned long> nDOFRecv(size);
+
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(nDOFSend.data(), 1, MPI_UNSIGNED_LONG,
+                    nDOFRecv.data(), 1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  nDOFRecv[rank] = nDOFSend[rank];
+#endif
+
+  /* Determine the number of messages this rank will receive. */
+  int nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) ++nRankRecv;
+  }
+
+  /* Define the receive buffers. */
+  vector<vector<unsigned long> > recvBuf(size, vector<unsigned long>(0));
+
+#ifdef HAVE_MPI
+  /* Launch the non-blocking sends. Do not send anything to myself. */
+  vector<SU2_MPI::Request> sendReq(nRankSend);
+  nRankSend = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFSend[i] && (i != rank)) {
+      SU2_MPI::Isend(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
+                     i, rank, MPI_COMM_WORLD, &sendReq[nRankSend]);
+      ++nRankSend;
+    }
+  }
+
+  /* Launch the non-blocking receives. Do not receive anything from myself. */
+  vector<SU2_MPI::Request> recvReq(nRankRecv);
+  nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) {
+      recvBuf[i].resize(nDOFRecv[i]);
+      SU2_MPI::Irecv(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
+                     i, i, MPI_COMM_WORLD, &recvReq[nRankRecv]);
+      ++nRankRecv;
+    }
+  }
+
+#endif
+
+  /* Copy my own data. */
+  recvBuf[rank] = sendBuf[rank];
+
+#ifdef HAVE_MPI
+  /* Complete the non-blocking communication. */
+  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
+  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
+#endif
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 2: Determine the number of locally stored surface DOFs ---*/
+  /*---         and store the data in Parallel_Surf_Data.           ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Store all received surface ID in one vector and sort it. */
+  globalSurfaceDOFIDs.resize(0);
+  for(int i=0; i<size; ++i) {
+    if( nDOFRecv[i] )
+      globalSurfaceDOFIDs.insert(globalSurfaceDOFIDs.end(),
+                                  recvBuf[i].begin(), recvBuf[i].end());
+  }
+
+  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
+
+  /* Allocate the memory for Parallel_Surf_Data. */
+  nSurf_Poin_Par = globalSurfaceDOFIDs.size();
+
+  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
+  for(int jj=0; jj<VARS_PER_POINT; jj++)
+    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
+
+  /* Determine the local index of the global surface DOFs and
+     copy the data into Parallel_Surf_Data. */
+  for(unsigned long i=0; i<nSurf_Poin_Par; ++i) {
+    const unsigned long ii = globalSurfaceDOFIDs[i] - nPoint_Cum[rank];
+
+    for(int jj=0; jj<VARS_PER_POINT; jj++)
+      Parallel_Surf_Data[jj][i] = Parallel_Data[jj][ii];
+  }
+
+  /*--- Reduce the total number of surf points we have. This will be
+        needed for writing the surface solution files later. ---*/
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nGlobal_Surf_Poin = nSurf_Poin_Par;
+#endif
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 3: Modify the surface connectivities, such that only   ---*/
+  /*---         the data of surface DOFs needs to be written.       ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Determine the offset for my surface DOFs. */
+  unsigned long offsetSurfaceDOFs = 0;
+#ifdef HAVE_MPI
+  vector<unsigned long> nSurfaceDOFsRanks(size);
+
+  SU2_MPI::Allgather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG,
+                     nSurfaceDOFsRanks.data(), 1, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+
+  for(int i=0; i<rank; ++i) offsetSurfaceDOFs += nSurfaceDOFsRanks[i];
+#endif
+
+  /* Create the map from the global volume numbering to the new global
+     surface numbering. */
+  map<unsigned long, unsigned long> mapGlobalVol2Surf;
+  for(unsigned long i=0; i<nSurf_Poin_Par; ++i)
+    mapGlobalVol2Surf[globalSurfaceDOFIDs[i]] = offsetSurfaceDOFs + i;
+
+  /* Fill the receive buffers with the modified global surface DOF numbers,
+     such that this information can be returned to the original ranks. */
+  for(int i=0; i<size; ++i) {
+    for(unsigned long j=0; j<nDOFRecv[i]; ++j)
+      recvBuf[i][j] = mapGlobalVol2Surf.find(recvBuf[i][j])->second;
+  }
+
+  /* Copy the original send buffers, because that information is
+     still needed. */
+  vector<vector<unsigned long> > originalSendBuf = sendBuf;
+
+#ifdef HAVE_MPI
+  /* Launch the non-blocking sends for the reverse communication, where the
+     receive buffers must be used for sending. Do not send anything to myself. */
+  nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) {
+      SU2_MPI::Isend(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
+                     i, rank+1, MPI_COMM_WORLD, &recvReq[nRankRecv]);
+      ++nRankRecv;
+    }
+  }
+
+  /* Launch the non-blocking receives for the reverse communication, where the
+     send buffers must be used for receiving.  Do not receive anything from myself. */
+  nRankSend = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFSend[i] && (i != rank)) {
+      SU2_MPI::Irecv(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
+                     i, i+1, MPI_COMM_WORLD, &sendReq[nRankSend]);
+      ++nRankSend;
+    }
+  }
+
+#endif
+
+  /* Copy my own data. */
+  sendBuf[rank] = recvBuf[rank];
+
+#ifdef HAVE_MPI
+  /* Complete the non-blocking communication. */
+  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
+  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
+#endif
+
+  /* Clear the map mapGlobalVol2Surf and fill it with the data
+     needed to modify the surface connectivity. Note that 1 is added,
+     because the visualization softwares typically use 1 based indexing. */
+  mapGlobalVol2Surf.clear();
+
+  for(int i=0; i<size; ++i) {
+    for(unsigned long j=0; j<nDOFSend[i]; ++j)
+      mapGlobalVol2Surf[originalSendBuf[i][j]+1] = sendBuf[i][j]+1;
+  }
+
+  /* Modify the locally stored surface connectivities. */
+  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i)
+    Conn_BoundLine_Par[i] = mapGlobalVol2Surf.find(Conn_BoundLine_Par[i])->second;
+
+  for(unsigned long i=0; i<(nParallel_BoundTria*N_POINTS_TRIANGLE); ++i)
+    Conn_BoundTria_Par[i] = mapGlobalVol2Surf.find(Conn_BoundTria_Par[i])->second;
 
+  for(unsigned long i=0; i<(nParallel_BoundQuad*N_POINTS_QUADRILATERAL); ++i)
+    Conn_BoundQuad_Par[i] = mapGlobalVol2Surf.find(Conn_BoundQuad_Par[i])->second;
 }
 
 void COutput::SetHistoryFile_Header(CConfig *config) { 

From bc153bc4d1f2dc904a457fbd3968f0cb927095ba Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 20 May 2019 19:27:42 +0200
Subject: [PATCH 265/539] Adding meson files

---
 Common/src/meson.build                  | 53 ++++++++++++++++
 SU2_CFD/src/meson.build                 | 77 +++++++++++++++++++++++
 SU2_DOT/src/meson.build                 | 19 ++++++
 SU2_PY/meson.build                      | 19 ++++++
 externals/cgns/meson.build              | 15 +++++
 externals/metis/GKlib/meson.build       | 31 ++++++++++
 externals/metis/libmetis/meson.build    | 41 +++++++++++++
 externals/metis/meson.build             | 10 +++
 externals/parmetis/meson.build          | 45 ++++++++++++++
 externals/tecio/teciompisrc/meson.build | 82 +++++++++++++++++++++++++
 externals/tecio/teciosrc/meson.build    | 82 +++++++++++++++++++++++++
 meson.build                             | 66 ++++++++++++++++++++
 meson_options.txt                       |  4 ++
 13 files changed, 544 insertions(+)
 create mode 100644 Common/src/meson.build
 create mode 100644 SU2_CFD/src/meson.build
 create mode 100644 SU2_DOT/src/meson.build
 create mode 100644 SU2_PY/meson.build
 create mode 100644 externals/cgns/meson.build
 create mode 100644 externals/metis/GKlib/meson.build
 create mode 100644 externals/metis/libmetis/meson.build
 create mode 100644 externals/metis/meson.build
 create mode 100644 externals/parmetis/meson.build
 create mode 100644 externals/tecio/teciompisrc/meson.build
 create mode 100644 externals/tecio/teciosrc/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt

diff --git a/Common/src/meson.build b/Common/src/meson.build
new file mode 100644
index 000000000000..b42aba60f0eb
--- /dev/null
+++ b/Common/src/meson.build
@@ -0,0 +1,53 @@
+common_include = include_directories('./')
+common_src = ['geometry_structure_fem_part.cpp',
+           'primal_grid_structure.cpp',
+           'linear_solvers_structure.cpp',
+           'graph_coloring_structure.cpp',
+           'fem_geometry_structure.cpp',
+           'linear_solvers_structure_b.cpp',
+           'fem_integration_rules.cpp',
+           'config_structure.cpp',
+           'dual_grid_structure.cpp',
+           'element_structure.cpp',
+           'geometry_structure.cpp',
+           'blas_structure.cpp',
+           'ad_structure.cpp',
+           'grid_movement_structure.cpp',
+           'fem_work_estimate_metis.cpp',
+           'fem_standard_element.cpp',
+           'fem_wall_distance.cpp',
+           'grid_adaptation_structure.cpp',
+           'element_linear.cpp',
+           'vector_structure.cpp',
+           'fem_gauss_jacobi_quadrature.cpp',
+           'gauss_structure.cpp',
+           'wall_model.cpp',
+           'adt_structure.cpp',
+           'interpolation_structure.cpp',
+           'mpi_structure.cpp',
+           'fem_cgns_elements.cpp',
+           'matrix_structure.cpp',
+	   'toolboxes/printing_toolbox.cpp']
+
+common     = static_library('SU2Common', 
+                            common_src,
+                            install : false, 
+			    dependencies : su2_deps, 
+			    cpp_args: su2_cpp_args)
+
+common_dep = declare_dependency(link_with: common,
+                                include_directories : common_include)
+
+if get_option('enable-autodiff')
+  
+  commonAD = static_library('SU2CommonAD',
+                            common_src,
+                            install : false, 
+			    dependencies : [su2_deps, codi_dep], 
+			    cpp_args: [su2_cpp_args, codi_rev_args])
+
+  commonAD_dep = declare_dependency(link_with: commonAD, 
+                                    include_directories : common_include)
+
+endif
+
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
new file mode 100644
index 000000000000..57ed8d8cc6f6
--- /dev/null
+++ b/SU2_CFD/src/meson.build
@@ -0,0 +1,77 @@
+su2_cfd_src = ['output_paraview.cpp',
+           'solver_direct_transition.cpp',
+           'solver_adjoint_turbulent.cpp',
+           'integration_structure.cpp',
+           'solver_direct_mean_fem.cpp',
+           'numerics_adjoint_mean.cpp',
+           'transport_model.cpp',
+           'variable_direct_turbulent.cpp',
+           'numerics_adjoint_turbulent.cpp',
+           'variable_direct_transition.cpp',
+           'output_tecplot.cpp',
+           'fluid_model_pvdw.cpp',
+           'variable_direct_elasticity.cpp',
+           'integration_time.cpp',
+           'fluid_model_pig.cpp',
+           'solver_direct_mean.cpp',
+           'iteration_structure.cpp',
+           'variable_template.cpp',
+           'fluid_model_inc.cpp',
+           'solver_adjoint_mean.cpp',
+           'driver_structure.cpp',
+           'variable_adjoint_turbulent.cpp',
+           'variable_adjoint_discrete.cpp',
+           'variable_structure.cpp',
+           'driver_direct_multizone.cpp',
+           'solver_adjoint_elasticity.cpp',
+           'solver_structure.cpp',
+           'numerics_direct_transition.cpp',
+           'solver_template.cpp',
+           'variable_direct_mean_inc.cpp',
+           'solver_direct_elasticity.cpp',
+           'definition_structure.cpp',
+           'output_structure.cpp',
+           'output_cgns.cpp',
+           'numerics_direct_mean_inc.cpp',
+           'transfer_physics.cpp',
+           'data_manufactured_solutions.cpp',
+           'variable_adjoint_mean.cpp',
+           'solver_direct_turbulent.cpp',
+           'output_physics.cpp',
+           'fluid_model.cpp',
+           'solver_direct_mean_inc.cpp',
+           'numerics_direct_mean.cpp',
+           'solver_direct_heat.cpp',
+           'variable_direct_heat.cpp',
+           'numerics_direct_heat.cpp',
+           'fluid_model_ppr.cpp',
+           'numerics_direct_elasticity.cpp',
+           'variable_direct_mean.cpp',
+           'driver_direct_singlezone.cpp',
+           'numerics_direct_turbulent.cpp',
+           'numerics_direct_elasticity_linear.cpp',
+           'python_wrapper_structure.cpp',
+           'numerics_structure.cpp',
+           'numerics_template.cpp',
+           'output_su2.cpp',
+           'transfer_structure.cpp',
+           'output_fieldview.cpp',
+           'solver_adjoint_discrete.cpp',
+           'numerics_direct_elasticity_nonlinear.cpp',
+           'variable_adjoint_elasticity.cpp',
+           'SU2_CFD.cpp']
+
+su2_cfd = executable('SU2_CFD',
+                     su2_cfd_src, 
+		     install : true, 
+		     dependencies : [su2_deps, common_dep], 
+		     cpp_args: su2_cpp_args)
+
+if get_option('enable-autodiff')
+  su2_cfd_ad = executable('SU2_CFD_AD',
+                          su2_cfd_src,
+			  install : true, 
+			  dependencies : [su2_deps, codi_dep, commonAD_dep], 
+			  cpp_args: [su2_cpp_args, codi_rev_args])
+endif
+
diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
new file mode 100644
index 000000000000..68d8680679f8
--- /dev/null
+++ b/SU2_DOT/src/meson.build
@@ -0,0 +1,19 @@
+
+su2_dot_src = ['SU2_DOT.cpp']
+su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
+                                       'output_structure.cpp',
+				       'output_cgns.cpp',
+				       'output_tecplot.cpp',
+				       'output_fieldview.cpp',
+				       'output_su2.cpp',
+				       'output_paraview.cpp',
+				       'variable_structure.cpp'])
+
+
+su2_dot = executable('SU2_DOT',
+                     su2_dot_src, 
+                     install: true,
+		     dependencies: [su2_deps, common_dep], 
+		     objects : su2_cfd_obj,
+		     cpp_args : su2_cpp_args)
+
diff --git a/SU2_PY/meson.build b/SU2_PY/meson.build
new file mode 100644
index 000000000000..920ac15504bd
--- /dev/null
+++ b/SU2_PY/meson.build
@@ -0,0 +1,19 @@
+install_data(['continuous_adjoint.py',
+             'compute_uncertainty.py',
+	     'finite_differences.py',
+	     'mesh_deformation.py',
+	     'parallel_computation.py',
+	     'parallel_computation_fsi.py',
+	     'package_tests.py',
+	     'patient_designspace.py',
+	     'shape_optimization.py',
+	     'merge_solution.py',
+	     'set_ffd_design_var.py',
+	     'compute_polar.py',
+	     'compute_multipoint.py',
+	     'discrete_adjoint.py',
+	     'direct_differentiation.py',
+	     'fsi_computation.py',
+	     'SU2_CFD.py'], 
+	     install_dir: join_paths(get_option('bindir')))
+
diff --git a/externals/cgns/meson.build b/externals/cgns/meson.build
new file mode 100644
index 000000000000..0910a8d47eac
--- /dev/null
+++ b/externals/cgns/meson.build
@@ -0,0 +1,15 @@
+
+cgns_include = include_directories('adf', './')
+
+lib_cgns = static_library('cgns',
+                          'cgns_internals.c',
+			  'cgns_error.c',
+			  'cgnslib.c', 
+			  'cgns_io.c',
+			  'adf/ADF_interface.c',
+			  'adf/ADF_internals.c',
+                          install : false)
+
+cgns_dep = declare_dependency(link_with: lib_cgns, 
+                              include_directories: cgns_include)
+
diff --git a/externals/metis/GKlib/meson.build b/externals/metis/GKlib/meson.build
new file mode 100644
index 000000000000..24b78305667b
--- /dev/null
+++ b/externals/metis/GKlib/meson.build
@@ -0,0 +1,31 @@
+gklib = static_library('GKlib',
+           'pqueue.c',
+           'blas.c',
+           'fkvkselect.c',
+           'csr.c',
+           'b64.c',
+           'memory.c',
+           'rw.c',
+           'util.c',
+           'timers.c',
+           'pdb.c',
+           'random.c',
+           'fs.c',
+           'gkregex.c',
+           'getopt.c',
+           'htable.c',
+           'mcore.c',
+           'sort.c',
+           'tokenizer.c',
+           'string.c',
+           'io.c',
+           'evaluate.c',
+           'seq.c',
+           'omp.c',
+           'itemsets.c',
+           'graph.c',
+           'error.c',
+           install : false)
+
+gklib_dep = declare_dependency(link_with: gklib, 
+                               include_directories: include_directories('.'))
diff --git a/externals/metis/libmetis/meson.build b/externals/metis/libmetis/meson.build
new file mode 100644
index 000000000000..1d1b2547daf8
--- /dev/null
+++ b/externals/metis/libmetis/meson.build
@@ -0,0 +1,41 @@
+
+metis_include = include_directories('../GKlib')
+metis_src = ['frename.c',
+           'timing.c',
+           'meshpart.c',
+           'minconn.c',
+           'mesh.c',
+           'kwayfm.c',
+           'bucketsort.c',
+           'balance.c',
+           'contig.c',
+           'mmd.c',
+           'fm.c',
+           'util.c',
+           'refine.c',
+           'checkgraph.c',
+           'compress.c',
+           'parmetis.c',
+           'pmetis.c',
+           'stat.c',
+           'options.c',
+           'srefine.c',
+           'kwayrefine.c',
+           'sfm.c',
+           'separator.c',
+           'coarsen.c',
+           'kmetis.c',
+           'fortran.c',
+           'graph.c',
+           'mincover.c',
+           'auxapi.c',
+           'wspace.c',
+           'initpart.c',
+           'mcutil.c',
+           'debug.c',
+           'ometis.c',
+           'gklib.c']
+
+libmetis = static_library('lmetis', 
+                          metis_src, 
+                          include_directories: metis_include)
diff --git a/externals/metis/meson.build b/externals/metis/meson.build
new file mode 100644
index 000000000000..7897d035b2ad
--- /dev/null
+++ b/externals/metis/meson.build
@@ -0,0 +1,10 @@
+subdir('libmetis')
+subdir('GKlib')
+
+metis_include = include_directories('include')
+metis_lib     = static_library('metis', 
+                               link_with: [libmetis, gklib])
+
+metis_dep = declare_dependency(link_with : metis_lib, 
+                               include_directories : metis_include)
+
diff --git a/externals/parmetis/meson.build b/externals/parmetis/meson.build
new file mode 100644
index 000000000000..71d74c71ada5
--- /dev/null
+++ b/externals/parmetis/meson.build
@@ -0,0 +1,45 @@
+parmetis_include = include_directories(['include','libparmetis'])
+parmetis = static_library('parmetis',
+           'libparmetis/frename.c',
+           'libparmetis/comm.c',
+           'libparmetis/mesh.c',
+           'libparmetis/pspases.c',
+           'libparmetis/ctrl.c',
+           'libparmetis/wave.c',
+           'libparmetis/balancemylink.c',
+           'libparmetis/redomylink.c',
+           'libparmetis/util.c',
+           'libparmetis/remap.c',
+           'libparmetis/node_refine.c',
+           'libparmetis/timer.c',
+           'libparmetis/rmetis.c',
+           'libparmetis/xyzpart.c',
+           'libparmetis/stat.c',
+           'libparmetis/gkmpi.c',
+           'libparmetis/akwayfm.c',
+           'libparmetis/selectq.c',
+           'libparmetis/msetup.c',
+           'libparmetis/mdiffusion.c',
+           'libparmetis/kwayrefine.c',
+           'libparmetis/serial.c',
+           'libparmetis/initmsection.c',
+           'libparmetis/kmetis.c',
+           'libparmetis/renumber.c',
+           'libparmetis/csrmatch.c',
+           'libparmetis/graph.c',
+           'libparmetis/ametis.c',
+           'libparmetis/initbalance.c',
+           'libparmetis/gkmetis.c',
+           'libparmetis/weird.c',
+           'libparmetis/wspace.c',
+           'libparmetis/move.c',
+           'libparmetis/diffutil.c',
+           'libparmetis/initpart.c',
+           'libparmetis/debug.c',
+           'libparmetis/ometis.c',
+           'libparmetis/match.c',
+           'libparmetis/mmetis.c',
+           install : false, include_directories: parmetis_include,
+	   dependencies: [mpi_dep, metis_dep, gklib_dep])
+
+parmetis_dep = declare_dependency(link_with: parmetis, include_directories: parmetis_include)
diff --git a/externals/tecio/teciompisrc/meson.build b/externals/tecio/teciompisrc/meson.build
new file mode 100644
index 000000000000..916c562f09ec
--- /dev/null
+++ b/externals/tecio/teciompisrc/meson.build
@@ -0,0 +1,82 @@
+tec_cxx_flags = ['-DUSEENUM','-DTECIOMPI', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS', '-DLINUX', '-DLINUX64', '-DTP_PROJECT_USES_BOOST', '-DBOOST_ALL_NO_LIB']
+
+teciompi_include = include_directories(['../', './'])
+
+teciompi = static_library('teciompi',
+           'ClassicZoneWriterAbstract.cpp',
+           'SZLOrderedPartitionedZoneWriterMPI.cpp',
+           'szcombine.cpp',
+           'FileSystem.cpp',
+           'MPIUtil.cpp',
+           'SZLOrderedZoneHeaderWriter.cpp',
+           'ZoneWriterFactory.cpp',
+           'importSzPltFile.cpp',
+           'FaceNeighborGeneratorAbstract.cpp',
+           'PartitionTecUtilDecorator.cpp',
+           'ZoneWriterFactoryMPI.cpp',
+           'tecio.cpp',
+           'TecioData.cpp',
+           'MPIFileIOStream.cpp',
+           'checkPercentDone.cpp',
+           'Zone_s.cpp',
+           'DataSetWriter.cpp',
+           'ClassicZoneVariableWriter.cpp',
+           'ClassicZoneFaceNeighborWriter.cpp',
+           'UnicodeStringUtils.cpp',
+           'ClassicZoneHeaderWriter.cpp',
+           'SZLOrderedPartitionedZoneWriter.cpp',
+           'SZLFEPartitionedZoneWriter.cpp',
+           'MPICommunicator.cpp',
+           'writeValueArray.cpp',
+           'FECellSubzoneCompressor.cpp',
+           'fileStuff.cpp',
+           'MPICommunicationCache.cpp',
+           'FileStreamReader.cpp',
+           'SZLFEPartitionedZoneWriterMPI.cpp',
+           'SZLOrderedPartitionWriter.cpp',
+           'MPIFileWriter.cpp',
+           'ZoneHeaderWriterAbstract.cpp',
+           'TecioTecUtil.cpp',
+           'ZoneWriterAbstract.cpp',
+           'NodeToElemMap_s.cpp',
+           'DataSetWriterMPI.cpp',
+           'FileIOStream.cpp',
+           'SZLFEPartitionedZoneHeaderWriter.cpp',
+           'MPIFileReader.cpp',
+           'ClassicFEZoneConnectivityWriter.cpp',
+           'MinMaxTree.cpp',
+           'FieldData.cpp',
+           'SZLOrderedPartitionedZoneHeaderWriter.cpp',
+           'AsciiOutputInfo.cpp',
+           'FieldData_s.cpp',
+           'IntervalTree.cpp',
+           'ClassicFEZoneFaceNeighborGenerator.cpp',
+           'mpiDatatype.cpp',
+           'ClassicOrderedZoneFaceNeighborGenerator.cpp',
+           'OrthogonalBisection.cpp',
+           'ORBFESubzonePartitioner.cpp',
+           'IJKZoneInfo.cpp',
+           'IJKSubzoneInfo.cpp',
+           'Scanner.cpp',
+           'ClassicFEZoneWriter.cpp',
+           'NodeMap.cpp',
+           'SZLOrderedZoneWriter.cpp',
+           'SZLFEPartitionWriter.cpp',
+           'SZLFEZoneWriter.cpp',
+           'ZoneVarMetadata.cpp',
+           'MPINonBlockingCommunicationCollection.cpp',
+           'SZLFEZoneHeaderWriter.cpp',
+           'FileStreamWriter.cpp',
+           'ClassicOrderedZoneWriter.cpp',
+           'ZoneInfoCache.cpp',
+           'readValueArray.cpp',
+           'TecioSZL.cpp',
+           'exportSubzonePlt.cpp',
+           install : false,
+	   dependencies: [mpi_dep], 
+	   cpp_args: tec_cxx_flags,
+	   include_directories: 
+	   teciompi_include)
+
+teciompi_dep = declare_dependency(link_with: teciompi,
+                                  include_directories: teciompi_include)
diff --git a/externals/tecio/teciosrc/meson.build b/externals/tecio/teciosrc/meson.build
new file mode 100644
index 000000000000..2ff8610c91ff
--- /dev/null
+++ b/externals/tecio/teciosrc/meson.build
@@ -0,0 +1,82 @@
+tecio_cpp_flags = ['-fpermissive','-DLINUX64', '-DLINUX', '-DUSEENUM', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS']
+tecio_include = include_directories('../', './')
+tecio = static_library('tecio',
+           'ClassicZoneWriterAbstract.cpp',
+           'szcombine.cpp',
+           'FileSystem.cpp',
+           'SZLOrderedZoneHeaderWriter.cpp',
+           'ZoneWriterFactory.cpp',
+           'importSzPltFile.cpp',
+           'FaceNeighborGeneratorAbstract.cpp',
+           'TranslatedString.cpp',
+           'PartitionTecUtilDecorator.cpp',
+           'tecio.cpp',
+           'TecioData.cpp',
+           'checkPercentDone.cpp',
+           'Zone_s.cpp',
+           'dataio4.cpp',
+           'DataSetWriter.cpp',
+           'ClassicZoneVariableWriter.cpp',
+           'ClassicZoneFaceNeighborWriter.cpp',
+           'UnicodeStringUtils.cpp',
+           'ClassicZoneHeaderWriter.cpp',
+           'SZLOrderedPartitionedZoneWriter.cpp',
+           'SZLFEPartitionedZoneWriter.cpp',
+           'writeValueArray.cpp',
+           'TecioPLT.cpp',
+           'FECellSubzoneCompressor.cpp',
+           'fileStuff.cpp',
+           'FileStreamReader.cpp',
+           'strlist.cpp',
+           'SZLOrderedPartitionWriter.cpp',
+           'ZoneHeaderWriterAbstract.cpp',
+           'TecioTecUtil.cpp',
+           'ZoneWriterAbstract.cpp',
+           'geom2.cpp',
+           'NodeToElemMap_s.cpp',
+           'FileIOStream.cpp',
+           'SZLFEPartitionedZoneHeaderWriter.cpp',
+           'ClassicFEZoneConnectivityWriter.cpp',
+           'strutil.cpp',
+           'q_msg.cpp',
+           'auxdata.cpp',
+           'MinMaxTree.cpp',
+           'FieldData.cpp',
+           'set.cpp',
+           'SZLOrderedPartitionedZoneHeaderWriter.cpp',
+           'AsciiOutputInfo.cpp',
+           'FieldData_s.cpp',
+           'dataio.cpp',
+           'IntervalTree.cpp',
+           'ClassicFEZoneFaceNeighborGenerator.cpp',
+           'ClassicOrderedZoneFaceNeighborGenerator.cpp',
+           'OrthogonalBisection.cpp',
+           'ORBFESubzonePartitioner.cpp',
+           'datautil.cpp',
+           'IJKZoneInfo.cpp',
+           'IJKSubzoneInfo.cpp',
+           'Scanner.cpp',
+           'ClassicFEZoneWriter.cpp',
+           'NodeMap.cpp',
+           'filestream.cpp',
+           'SZLOrderedZoneWriter.cpp',
+           'SZLFEPartitionWriter.cpp',
+           'Geom_s.cpp',
+           'SZLFEZoneWriter.cpp',
+           'ZoneVarMetadata.cpp',
+           'dataset.cpp',
+           'SZLFEZoneHeaderWriter.cpp',
+           'FileStreamWriter.cpp',
+           'ClassicOrderedZoneWriter.cpp',
+           'ZoneInfoCache.cpp',
+           'arrlist.cpp',
+           'dataset0.cpp',
+           'readValueArray.cpp',
+           'TecioSZL.cpp',
+           'exportSubzonePlt.cpp',
+           install : false, 
+	   cpp_args: tecio_cpp_flags,
+	   include_directories: tecio_include)
+
+tecio_dep = declare_dependency(link_with: tecio,
+                               include_directories: tecio_include)
diff --git a/meson.build b/meson.build
new file mode 100644
index 000000000000..a1acdbb70d08
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,66 @@
+project('SU2', 'c', 'cpp', version: '6.2.0', default_options: ['buildtype=debugoptimized', 'optimization=2'])
+
+su2_cpp_args = []
+su2_deps     = []
+
+# external dependencies 
+mpi_dep = [dependency('mpi', language:'c', required: false), 
+           dependency('mpi', language:'cpp', required: false)]
+
+codi_dep = [declare_dependency(include_directories: 'externals/codi/include')]
+codi_rev_args = '-DCODI_REVERSE_TYPE'
+codi_for_args = '-DCODI_FORWARD_TYPE'
+
+
+
+# Add cgns library
+if get_option('enable-cgns')
+  subdir('externals/cgns')
+  su2_deps     += cgns_dep
+  su2_cpp_args += '-DHAVE_CGNS'
+endif
+
+# check if MPI dependencies are found and add them
+if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
+
+  # add MPI dependency 
+  su2_deps += mpi_dep
+  su2_cpp_args += '-DHAVE_MPI'
+  
+  # compile metis
+  subdir('externals/metis')
+
+  # compile parmetis
+  subdir('externals/parmetis')
+  
+  # add parmetis dependency
+  su2_deps     += parmetis_dep
+  
+  if get_option('enable-tecio')
+    subdir('externals/tecio/teciompisrc')
+    su2_deps += teciompi_dep
+    su2_cpp_args += ['-DHAVE_TECIO', '-DTECIOMPI']
+  endif
+  
+  # add medi dependency
+  if get_option('enable-autodiff')
+    codi_dep += declare_dependency(include_directories: ['externals/medi/include', 'externals/medi/src'])
+  endif
+
+else
+  if get_option('enable-tecio')
+    subdir('externals/tecio/teciosrc')
+    pthread_dep = dependency('threads')
+    su2_deps += [tecio_dep, pthread_dep]
+    su2_cpp_args += '-DHAVE_TECIO'
+  endif
+endif
+
+# compile common library
+subdir('Common/src')
+# compile SU2_CFD executable
+subdir('SU2_CFD/src')
+# compile SU2_DOT
+subdir('SU2_DOT/src')
+subdir('SU2_PY')
+
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 000000000000..65026df5d0d1
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,4 @@
+option('enable-mpi',   type : 'boolean', value : true, description: 'enable MPI support')
+option('enable-tecio', type : 'boolean', value : true, description: 'enable TECIO support')
+option('enable-cgns',  type : 'boolean', value : true, description: 'enable CGNS support')
+option('enable-autodiff',  type : 'boolean', value : false, description: 'enable AD support')

From 357f8f122bba08821a9ea86cdd1c9eecfc82b562 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 21 May 2019 15:59:42 +0200
Subject: [PATCH 266/539] Finished build with meson (python wrapper missing)

---
 SU2_DEF/src/meson.build              | 18 +++++++
 SU2_GEO/src/meson.build              |  8 ++++
 SU2_MSH/src/meson.build              |  8 ++++
 SU2_PY/meson.build                   | 66 ++++++++++++++++++++++++++
 SU2_SOL/src/meson.build              | 18 +++++++
 externals/metis/GKlib/meson.build    | 31 ------------
 externals/metis/libmetis/meson.build | 41 ----------------
 externals/metis/meson.build          | 70 ++++++++++++++++++++++++++--
 externals/parmetis/meson.build       |  2 +-
 meson.build                          | 21 +++++++--
 10 files changed, 201 insertions(+), 82 deletions(-)
 create mode 100644 SU2_DEF/src/meson.build
 create mode 100644 SU2_GEO/src/meson.build
 create mode 100644 SU2_MSH/src/meson.build
 create mode 100644 SU2_SOL/src/meson.build
 delete mode 100644 externals/metis/GKlib/meson.build
 delete mode 100644 externals/metis/libmetis/meson.build

diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
new file mode 100644
index 000000000000..b5d8c48dfcba
--- /dev/null
+++ b/SU2_DEF/src/meson.build
@@ -0,0 +1,18 @@
+su2_def_src = ['SU2_DEF.cpp']
+su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
+                                       'output_structure.cpp',
+				       'output_cgns.cpp',
+				       'output_tecplot.cpp',
+				       'output_fieldview.cpp',
+				       'output_su2.cpp',
+				       'output_paraview.cpp',
+				       'variable_structure.cpp'])
+
+
+su2_def = executable('SU2_DEF',
+                     su2_def_src, 
+                     install: true,
+		     dependencies: [su2_deps, common_dep], 
+		     objects : su2_cfd_obj,
+		     cpp_args : su2_cpp_args)
+
diff --git a/SU2_GEO/src/meson.build b/SU2_GEO/src/meson.build
new file mode 100644
index 000000000000..112168f1f84c
--- /dev/null
+++ b/SU2_GEO/src/meson.build
@@ -0,0 +1,8 @@
+su2_geo_src = ['SU2_GEO.cpp']
+
+su2_geo = executable('SU2_GEO',
+                     su2_geo_src, 
+                     install: true,
+		     dependencies: [su2_deps, common_dep], 
+		     cpp_args : su2_cpp_args)
+
diff --git a/SU2_MSH/src/meson.build b/SU2_MSH/src/meson.build
new file mode 100644
index 000000000000..bcf48f065716
--- /dev/null
+++ b/SU2_MSH/src/meson.build
@@ -0,0 +1,8 @@
+su2_msh_src = ['SU2_MSH.cpp']
+
+su2_msh = executable('SU2_MSH',
+                     su2_msh_src, 
+                     install: true,
+		     dependencies: [su2_deps, common_dep], 
+		     cpp_args : su2_cpp_args)
+
diff --git a/SU2_PY/meson.build b/SU2_PY/meson.build
index 920ac15504bd..34b88a394382 100644
--- a/SU2_PY/meson.build
+++ b/SU2_PY/meson.build
@@ -17,3 +17,69 @@ install_data(['continuous_adjoint.py',
 	     'SU2_CFD.py'], 
 	     install_dir: join_paths(get_option('bindir')))
 
+install_data(['SU2/__init__.py'], install_dir: join_paths(get_option('bindir'), 'SU2/'))
+
+install_data(['SU2/eval/design.py',
+    	      'SU2/eval/functions.py',
+    	      'SU2/eval/gradients.py',
+    	      'SU2/eval/__init__.py'], 
+	      install_dir: join_paths(get_option('bindir'), 'SU2/eval'))
+
+install_data(['SU2/io/config.py',
+              'SU2/io/config_options.py',
+              'SU2/io/data.py',
+              'SU2/io/filelock.py',
+              'SU2/io/redirect.py',
+              'SU2/io/state.py',
+              'SU2/io/tools.py',
+              'SU2/io/__init__.py'], 
+	      install_dir: join_paths(get_option('bindir'), 'SU2/io'))
+
+install_data(['SU2/mesh/adapt.py',
+              'SU2/mesh/tools.py',
+              'SU2/mesh/__init__.py'], 
+	      install_dir: join_paths(get_option('bindir'), 'SU2/mesh'))
+
+install_data(['SU2/opt/project.py',
+              'SU2/opt/scipy_tools.py',
+              'SU2/opt/server.py',
+              'SU2/opt/__init__.py'], 
+	      install_dir: join_paths(get_option('bindir'), 'SU2/opt'))
+
+install_data(['SU2/run/adaptation.py',
+              'SU2/run/adjoint.py',
+              'SU2/run/deform.py',
+              'SU2/run/direct.py',
+              'SU2/run/interface.py',
+              'SU2/run/merge.py',
+              'SU2/run/geometry.py',
+              'SU2/run/projection.py',
+              'SU2/run/__init__.py'],
+	      install_dir: join_paths(get_option('bindir'), 'SU2/run'))
+
+install_data(['SU2/util/bunch.py',
+              'SU2/util/filter_adjoint.py',
+              'SU2/util/lhc_unif.py',
+              'SU2/util/misc.py',
+              'SU2/util/mp_eval.py',
+              'SU2/util/ordered_bunch.py',
+              'SU2/util/ordered_dict.py',
+              'SU2/util/plot.py',
+              'SU2/util/polarSweepLib.py',
+              'SU2/util/pyCppTap.py',
+              'SU2/util/which.py',
+              'SU2/util/switch.py',
+              'SU2/util/__init__.py'],
+	      install_dir: join_paths(get_option('bindir'), 'SU2/util'))
+
+install_data(['FSI/__init__.py',
+              'FSI/FSIInterface.py',
+              'FSI/PitchPlungeAirfoilStructuralTester.py',
+              'FSI/io/__init__.py',
+              'FSI/io/FSI_config.py',
+              'FSI/util/__init__.py',
+              'FSI/util/switch.py'],
+	      install_dir: join_paths(get_option('bindir'), 'FSI'))
+
+
+
diff --git a/SU2_SOL/src/meson.build b/SU2_SOL/src/meson.build
new file mode 100644
index 000000000000..00c559f91d7a
--- /dev/null
+++ b/SU2_SOL/src/meson.build
@@ -0,0 +1,18 @@
+su2_sol_src = ['SU2_SOL.cpp']
+su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
+                                       'output_structure.cpp',
+				       'output_cgns.cpp',
+				       'output_tecplot.cpp',
+				       'output_fieldview.cpp',
+				       'output_su2.cpp',
+				       'output_paraview.cpp',
+				       'variable_structure.cpp'])
+
+
+su2_sol = executable('SU2_SOL',
+                     su2_sol_src, 
+                     install: true,
+		     dependencies: [su2_deps, common_dep], 
+		     objects : su2_cfd_obj,
+		     cpp_args : su2_cpp_args)
+
diff --git a/externals/metis/GKlib/meson.build b/externals/metis/GKlib/meson.build
deleted file mode 100644
index 24b78305667b..000000000000
--- a/externals/metis/GKlib/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-gklib = static_library('GKlib',
-           'pqueue.c',
-           'blas.c',
-           'fkvkselect.c',
-           'csr.c',
-           'b64.c',
-           'memory.c',
-           'rw.c',
-           'util.c',
-           'timers.c',
-           'pdb.c',
-           'random.c',
-           'fs.c',
-           'gkregex.c',
-           'getopt.c',
-           'htable.c',
-           'mcore.c',
-           'sort.c',
-           'tokenizer.c',
-           'string.c',
-           'io.c',
-           'evaluate.c',
-           'seq.c',
-           'omp.c',
-           'itemsets.c',
-           'graph.c',
-           'error.c',
-           install : false)
-
-gklib_dep = declare_dependency(link_with: gklib, 
-                               include_directories: include_directories('.'))
diff --git a/externals/metis/libmetis/meson.build b/externals/metis/libmetis/meson.build
deleted file mode 100644
index 1d1b2547daf8..000000000000
--- a/externals/metis/libmetis/meson.build
+++ /dev/null
@@ -1,41 +0,0 @@
-
-metis_include = include_directories('../GKlib')
-metis_src = ['frename.c',
-           'timing.c',
-           'meshpart.c',
-           'minconn.c',
-           'mesh.c',
-           'kwayfm.c',
-           'bucketsort.c',
-           'balance.c',
-           'contig.c',
-           'mmd.c',
-           'fm.c',
-           'util.c',
-           'refine.c',
-           'checkgraph.c',
-           'compress.c',
-           'parmetis.c',
-           'pmetis.c',
-           'stat.c',
-           'options.c',
-           'srefine.c',
-           'kwayrefine.c',
-           'sfm.c',
-           'separator.c',
-           'coarsen.c',
-           'kmetis.c',
-           'fortran.c',
-           'graph.c',
-           'mincover.c',
-           'auxapi.c',
-           'wspace.c',
-           'initpart.c',
-           'mcutil.c',
-           'debug.c',
-           'ometis.c',
-           'gklib.c']
-
-libmetis = static_library('lmetis', 
-                          metis_src, 
-                          include_directories: metis_include)
diff --git a/externals/metis/meson.build b/externals/metis/meson.build
index 7897d035b2ad..c1c9fcf2b06e 100644
--- a/externals/metis/meson.build
+++ b/externals/metis/meson.build
@@ -1,9 +1,71 @@
-subdir('libmetis')
-subdir('GKlib')
+metis_cpp_args = ['-D_FILE_OFFSET_BITS=64', '-DNDEBUG', '-DNDEBUG2', '-DHAVE_EXECINFO_H', '-DHAVE_GETLINE']
+metis_src = ['GKlib/pqueue.c',
+           'GKlib/blas.c',
+           'GKlib/fkvkselect.c',
+           'GKlib/csr.c',
+           'GKlib/b64.c',
+           'GKlib/memory.c',
+           'GKlib/rw.c',
+           'GKlib/util.c',
+           'GKlib/timers.c',
+           'GKlib/pdb.c',
+           'GKlib/random.c',
+           'GKlib/fs.c',
+           'GKlib/gkregex.c',
+           'GKlib/getopt.c',
+           'GKlib/htable.c',
+           'GKlib/mcore.c',
+           'GKlib/sort.c',
+           'GKlib/tokenizer.c',
+           'GKlib/string.c',
+           'GKlib/io.c',
+           'GKlib/evaluate.c',
+           'GKlib/seq.c',
+           'GKlib/omp.c',
+           'GKlib/itemsets.c',
+           'GKlib/graph.c',
+           'GKlib/error.c',
+           'libmetis/frename.c',
+           'libmetis/timing.c',
+           'libmetis/meshpart.c',
+           'libmetis/minconn.c',
+           'libmetis/mesh.c',
+           'libmetis/kwayfm.c',
+           'libmetis/bucketsort.c',
+           'libmetis/balance.c',
+           'libmetis/contig.c',
+           'libmetis/mmd.c',
+           'libmetis/fm.c',
+           'libmetis/util.c',
+           'libmetis/refine.c',
+           'libmetis/checkgraph.c',
+           'libmetis/compress.c',
+           'libmetis/parmetis.c',
+           'libmetis/pmetis.c',
+           'libmetis/stat.c',
+           'libmetis/options.c',
+           'libmetis/srefine.c',
+           'libmetis/kwayrefine.c',
+           'libmetis/sfm.c',
+           'libmetis/separator.c',
+           'libmetis/coarsen.c',
+           'libmetis/kmetis.c',
+           'libmetis/fortran.c',
+           'libmetis/graph.c',
+           'libmetis/mincover.c',
+           'libmetis/auxapi.c',
+           'libmetis/wspace.c',
+           'libmetis/initpart.c',
+           'libmetis/mcutil.c',
+           'libmetis/debug.c',
+           'libmetis/ometis.c',
+           'libmetis/gklib.c']
 
-metis_include = include_directories('include')
+metis_include = include_directories(['include','GKlib','libmetis'])
 metis_lib     = static_library('metis', 
-                               link_with: [libmetis, gklib])
+                               metis_src,
+			       include_directories : metis_include,
+			       cpp_args: metis_cpp_args)
 
 metis_dep = declare_dependency(link_with : metis_lib, 
                                include_directories : metis_include)
diff --git a/externals/parmetis/meson.build b/externals/parmetis/meson.build
index 71d74c71ada5..ba4f100d0844 100644
--- a/externals/parmetis/meson.build
+++ b/externals/parmetis/meson.build
@@ -40,6 +40,6 @@ parmetis = static_library('parmetis',
            'libparmetis/match.c',
            'libparmetis/mmetis.c',
            install : false, include_directories: parmetis_include,
-	   dependencies: [mpi_dep, metis_dep, gklib_dep])
+	   dependencies: [mpi_dep, metis_dep])
 
 parmetis_dep = declare_dependency(link_with: parmetis, include_directories: parmetis_include)
diff --git a/meson.build b/meson.build
index a1acdbb70d08..721bed0abc03 100644
--- a/meson.build
+++ b/meson.build
@@ -11,8 +11,6 @@ codi_dep = [declare_dependency(include_directories: 'externals/codi/include')]
 codi_rev_args = '-DCODI_REVERSE_TYPE'
 codi_for_args = '-DCODI_FORWARD_TYPE'
 
-
-
 # Add cgns library
 if get_option('enable-cgns')
   subdir('externals/cgns')
@@ -29,13 +27,17 @@ if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
   
   # compile metis
   subdir('externals/metis')
-
+  
+  # add metis dependency
+  su2_deps     += metis_dep
+  su2_cpp_args += '-DHAVE_METIS' 
+  
   # compile parmetis
   subdir('externals/parmetis')
   
   # add parmetis dependency
   su2_deps     += parmetis_dep
-  
+  su2_cpp_args += '-DHAVE_PARMETIS' 
   if get_option('enable-tecio')
     subdir('externals/tecio/teciompisrc')
     su2_deps += teciompi_dep
@@ -60,7 +62,16 @@ endif
 subdir('Common/src')
 # compile SU2_CFD executable
 subdir('SU2_CFD/src')
-# compile SU2_DOT
+# compile SU2_DOT executable
 subdir('SU2_DOT/src')
+# compile SU2_DEF executable
+subdir('SU2_DEF/src')
+# compile SU2_GEO executable
+subdir('SU2_GEO/src')
+# compile SU2_MSH executable
+subdir('SU2_MSH/src')
+# compile SU2_SOL executable
+subdir('SU2_SOL/src')
+# install python scripts
 subdir('SU2_PY')
 

From 172eabb897acb342ff031ff37f35d0943b9e1917 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 22 May 2019 13:53:30 +0200
Subject: [PATCH 267/539] Some changes to meson build files

---
 Common/src/meson.build                  | 19 ++++++++++++++++---
 SU2_CFD/src/meson.build                 |  7 +++++++
 externals/tecio/meson.build             |  8 ++++++++
 externals/tecio/teciompisrc/meson.build | 10 +++++++++-
 externals/tecio/teciosrc/meson.build    | 12 +++++++++++-
 meson.build                             |  9 +++++++--
 meson_options.txt                       |  3 ++-
 7 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 externals/tecio/meson.build

diff --git a/Common/src/meson.build b/Common/src/meson.build
index b42aba60f0eb..0fb116a681c7 100644
--- a/Common/src/meson.build
+++ b/Common/src/meson.build
@@ -1,5 +1,5 @@
 common_include = include_directories('./')
-common_src = ['geometry_structure_fem_part.cpp',
+common_src =files(['geometry_structure_fem_part.cpp',
            'primal_grid_structure.cpp',
            'linear_solvers_structure.cpp',
            'graph_coloring_structure.cpp',
@@ -26,8 +26,9 @@ common_src = ['geometry_structure_fem_part.cpp',
            'interpolation_structure.cpp',
            'mpi_structure.cpp',
            'fem_cgns_elements.cpp',
-           'matrix_structure.cpp',
-	   'toolboxes/printing_toolbox.cpp']
+           'matrix_structure.cpp'])
+
+subdir('toolboxes')
 
 common     = static_library('SU2Common', 
                             common_src,
@@ -51,3 +52,15 @@ if get_option('enable-autodiff')
 
 endif
 
+if get_option('enable-directdiff')
+  
+  commonDD = static_library('SU2CommonDD',
+                            common_src,
+                            install : false, 
+			    dependencies : [su2_deps, codi_dep], 
+			    cpp_args: [su2_cpp_args, codi_for_args])
+
+  commonDD_dep = declare_dependency(link_with: commonDD, 
+                                    include_directories : common_include)
+
+endif
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 57ed8d8cc6f6..207c41de699d 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -75,3 +75,10 @@ if get_option('enable-autodiff')
 			  cpp_args: [su2_cpp_args, codi_rev_args])
 endif
 
+if get_option('enable-directdiff')
+  su2_cfd_dd = executable('SU2_CFD_DD',
+                          su2_cfd_src,
+			  install : true, 
+			  dependencies : [su2_deps, codi_dep, commonDD_dep], 
+			  cpp_args: [su2_cpp_args, codi_for_args])
+endif
diff --git a/externals/tecio/meson.build b/externals/tecio/meson.build
new file mode 100644
index 000000000000..019f4ec317a3
--- /dev/null
+++ b/externals/tecio/meson.build
@@ -0,0 +1,8 @@
+check_dir = run_command('test', '-d', 'boost')
+if check_dir.returncode() != 0
+  message('Extracting boost ...')
+  extract_boost = run_command('tar', '-xzf', 'boost.tar.gz', '-C', './')
+else
+  message('Boost sources found.')
+endif
+
diff --git a/externals/tecio/teciompisrc/meson.build b/externals/tecio/teciompisrc/meson.build
index 916c562f09ec..ab51bf8da0f4 100644
--- a/externals/tecio/teciompisrc/meson.build
+++ b/externals/tecio/teciompisrc/meson.build
@@ -1,4 +1,12 @@
-tec_cxx_flags = ['-DUSEENUM','-DTECIOMPI', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS', '-DLINUX', '-DLINUX64', '-DTP_PROJECT_USES_BOOST', '-DBOOST_ALL_NO_LIB']
+tec_cxx_flags = ['-DUSEENUM','-DTECIOMPI', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS', '-DTP_PROJECT_USES_BOOST', '-DBOOST_ALL_NO_LIB']
+
+if (build_machine.system() == 'darwin')
+  tec_cxx_flags += ['-DDARWIN', '-DMAC64']
+endif
+
+if (build_machine.system() == 'linux')
+  tec_cxx_flags += ['-DLINUX', '-DLINUX64']
+endif
 
 teciompi_include = include_directories(['../', './'])
 
diff --git a/externals/tecio/teciosrc/meson.build b/externals/tecio/teciosrc/meson.build
index 2ff8610c91ff..89c63fc6b1ab 100644
--- a/externals/tecio/teciosrc/meson.build
+++ b/externals/tecio/teciosrc/meson.build
@@ -1,4 +1,14 @@
-tecio_cpp_flags = ['-fpermissive','-DLINUX64', '-DLINUX', '-DUSEENUM', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS']
+tecio_cpp_flags = ['-fpermissive', '-DUSEENUM', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS']
+
+if (build_machine.system() == 'darwin')
+  tec_cxx_flags += ['-DDARWIN', '-DMAC64']
+endif
+
+if (build_machine.system() == 'linux')
+  tec_cxx_flags += ['-DLINUX', '-DLINUX64']
+endif
+
+
 tecio_include = include_directories('../', './')
 tecio = static_library('tecio',
            'ClassicZoneWriterAbstract.cpp',
diff --git a/meson.build b/meson.build
index 721bed0abc03..7757f7c9a0d6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,7 @@
-project('SU2', 'c', 'cpp', version: '6.2.0', default_options: ['buildtype=debugoptimized', 'optimization=2'])
+project('SU2', 'c', 'cpp', 
+        version: '6.2.0', 
+	license: 'LGPL2',
+	default_options: ['buildtype=debugoptimized', 'optimization=2'])
 
 su2_cpp_args = []
 su2_deps     = []
@@ -34,7 +37,9 @@ if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
   
   # compile parmetis
   subdir('externals/parmetis')
-  
+ 
+  subdir('externals/tecio')
+
   # add parmetis dependency
   su2_deps     += parmetis_dep
   su2_cpp_args += '-DHAVE_PARMETIS' 
diff --git a/meson_options.txt b/meson_options.txt
index 65026df5d0d1..bb61675a1000 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,5 @@
 option('enable-mpi',   type : 'boolean', value : true, description: 'enable MPI support')
 option('enable-tecio', type : 'boolean', value : true, description: 'enable TECIO support')
 option('enable-cgns',  type : 'boolean', value : true, description: 'enable CGNS support')
-option('enable-autodiff',  type : 'boolean', value : false, description: 'enable AD support')
+option('enable-autodiff',  type : 'boolean', value : false, description: 'enable AD (reverse) support')
+option('enable-directdiff',  type : 'boolean', value : false, description: 'enable AD (forward) support')

From 98a65953faad5684446235d9fb536b8c1844d270 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 22 May 2019 13:54:32 +0200
Subject: [PATCH 268/539] Added missing meson file

---
 Common/src/toolboxes/meson.build | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Common/src/toolboxes/meson.build

diff --git a/Common/src/toolboxes/meson.build b/Common/src/toolboxes/meson.build
new file mode 100644
index 000000000000..757787505f0c
--- /dev/null
+++ b/Common/src/toolboxes/meson.build
@@ -0,0 +1 @@
+common_src += files(['printing_toolbox.cpp'])

From 44d51bcc1dc4a4a78ccd285665ec1793cd564cbf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 22 May 2019 15:00:58 +0200
Subject: [PATCH 269/539] Added meson nunja submodules

---
 .gitmodules     | 6 ++++++
 externals/meson | 1 +
 externals/ninja | 1 +
 meson.build     | 6 ++++++
 4 files changed, 14 insertions(+)
 create mode 160000 externals/meson
 create mode 160000 externals/ninja

diff --git a/.gitmodules b/.gitmodules
index 6f3a5ee34d05..c57c102c55a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,9 @@
 	path = externals/medi
 	url = https://github.com/SciCompKL/MeDiPack
 	ignore = dirty
+[submodule "externals/ninja"]
+	path = externals/ninja
+	url = https://github.com/ninja-build/ninja
+[submodule "externals/meson"]
+	path = externals/meson
+	url = https://github.com/mesonbuild/meson
diff --git a/externals/meson b/externals/meson
new file mode 160000
index 000000000000..e9bd7d49bdc8
--- /dev/null
+++ b/externals/meson
@@ -0,0 +1 @@
+Subproject commit e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6
diff --git a/externals/ninja b/externals/ninja
new file mode 160000
index 000000000000..20b30dac6698
--- /dev/null
+++ b/externals/ninja
@@ -0,0 +1 @@
+Subproject commit 20b30dac6698d119e7797b34d6ed2c4ed8f48417
diff --git a/meson.build b/meson.build
index 7757f7c9a0d6..894cc5df0752 100644
--- a/meson.build
+++ b/meson.build
@@ -80,3 +80,9 @@ subdir('SU2_SOL/src')
 # install python scripts
 subdir('SU2_PY')
 
+ninja = find_program('./ninja', required : false)
+if ninja.found() == false
+  message('Ninja was not found. Bootstrapping ...')
+  run_config = run_command('externals/ninja/configure.py','--bootstrap')
+  message('./ninja -C <buildfolder> to compile SU2')
+endif

From 61cb70045e4a02d85ffa34c7a7577c5275bb1f6f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 22 May 2019 15:16:02 +0200
Subject: [PATCH 270/539] Small adjustment to ninja bootstrap

---
 meson.build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 894cc5df0752..fc712e4d226d 100644
--- a/meson.build
+++ b/meson.build
@@ -80,9 +80,8 @@ subdir('SU2_SOL/src')
 # install python scripts
 subdir('SU2_PY')
 
-ninja = find_program('./ninja', required : false)
+ninja = find_program('ninja', required : false)
 if ninja.found() == false
-  message('Ninja was not found. Bootstrapping ...')
+  message('Bootstrapping Ninja ...')
   run_config = run_command('externals/ninja/configure.py','--bootstrap')
-  message('./ninja -C <buildfolder> to compile SU2')
 endif

From 83a5e2132fe8fc5f811f571f918d10b5a67a38f8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 22 May 2019 15:28:26 +0200
Subject: [PATCH 271/539] changed default meson options and added python lookup

---
 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index fc712e4d226d..feed32614fdf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,11 @@
 project('SU2', 'c', 'cpp', 
         version: '6.2.0', 
 	license: 'LGPL2',
-	default_options: ['buildtype=debugoptimized', 'optimization=2'])
+	default_options: ['buildtype=release', 'warning_level=0'])
+
+
+pymod = import('python')
+pymod.find_installation('python3')
 
 su2_cpp_args = []
 su2_deps     = []

From f73d2274ebd89ec5eaa52335366070de1baba429 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 23 May 2019 11:45:12 +0200
Subject: [PATCH 272/539] Added pywrapper to meson build

---
 SU2_CFD/src/meson.build  |  6 ++---
 SU2_PY/pySU2/install.sh  |  2 ++
 SU2_PY/pySU2/meson.build | 47 ++++++++++++++++++++++++++++++++++++++++
 meson.build              |  6 ++++-
 meson_options.txt        |  2 ++
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 SU2_PY/pySU2/install.sh
 create mode 100644 SU2_PY/pySU2/meson.build

diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 207c41de699d..76992ef0c6dc 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -65,14 +65,14 @@ su2_cfd = executable('SU2_CFD',
                      su2_cfd_src, 
 		     install : true, 
 		     dependencies : [su2_deps, common_dep], 
-		     cpp_args: su2_cpp_args)
+		     cpp_args:  ['-fPIC'] + [su2_cpp_args])
 
 if get_option('enable-autodiff')
   su2_cfd_ad = executable('SU2_CFD_AD',
                           su2_cfd_src,
 			  install : true, 
 			  dependencies : [su2_deps, codi_dep, commonAD_dep], 
-			  cpp_args: [su2_cpp_args, codi_rev_args])
+			  cpp_args: ['-fPIC'] + [su2_cpp_args, codi_rev_args])
 endif
 
 if get_option('enable-directdiff')
@@ -80,5 +80,5 @@ if get_option('enable-directdiff')
                           su2_cfd_src,
 			  install : true, 
 			  dependencies : [su2_deps, codi_dep, commonDD_dep], 
-			  cpp_args: [su2_cpp_args, codi_for_args])
+			  cpp_args: ['-fPIC'] + [su2_cpp_args, codi_for_args])
 endif
diff --git a/SU2_PY/pySU2/install.sh b/SU2_PY/pySU2/install.sh
new file mode 100644
index 000000000000..67e684487f8a
--- /dev/null
+++ b/SU2_PY/pySU2/install.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+cp "$1/$2" "${MESON_INSTALL_PREFIX}/bin/$2"
diff --git a/SU2_PY/pySU2/meson.build b/SU2_PY/pySU2/meson.build
new file mode 100644
index 000000000000..ffaf3c505706
--- /dev/null
+++ b/SU2_PY/pySU2/meson.build
@@ -0,0 +1,47 @@
+# check for swig
+swig = find_program('swig')
+
+# add mpi4py include
+if get_option('enable-mpi')
+  python_dir = python.get_path('platlib')
+  message ('Looking for mpi4py in ' + python_dir)
+  if get_option('python_path') != ''
+    python_dir = get_option('python_path')
+  endif
+  mpi4py_include = python_dir + '/mpi4py/include/'
+else
+  mpi4py_include = ''
+endif
+
+swig_gen = generator(
+    swig,
+    output: ['@BASENAME@.cxx'],
+    arguments: su2_cpp_args + 
+    [ '-c++', '-python', '-I'+mpi4py_include, '-outdir', meson.current_build_dir(), '-o', './@OUTPUT@', '@INPUT@'],
+    depfile: '@BASENAME@.d',
+)
+
+swig_sources = [
+    'pySU2.i',
+]
+
+wrapper_deps = [
+    dependency('python3'), 
+]
+
+foreach swig_source: swig_sources
+    cpp_source = swig_gen.process(swig_source)
+    swig_lib = shared_library(
+       '_pysu2',
+       cpp_source,
+       dependencies: [wrapper_deps, common_dep, su2_deps],
+       objects: su2_cfd.extract_all_objects(),
+       install: true,
+       include_directories : mpi4py_include,
+       cpp_args : su2_cpp_args,
+       name_prefix : '',
+       install_dir: 'bin'
+    )
+endforeach
+
+meson.add_install_script('install.sh', meson.current_build_dir(), 'pysu2.py')
diff --git a/meson.build b/meson.build
index feed32614fdf..e566d32347c0 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('SU2', 'c', 'cpp',
 
 
 pymod = import('python')
-pymod.find_installation('python3')
+python = pymod.find_installation('python3')
 
 su2_cpp_args = []
 su2_deps     = []
@@ -84,6 +84,10 @@ subdir('SU2_SOL/src')
 # install python scripts
 subdir('SU2_PY')
 
+if get_option('enable-pywrapper')
+  subdir('SU2_PY/pySU2')
+endif
+
 ninja = find_program('ninja', required : false)
 if ninja.found() == false
   message('Bootstrapping Ninja ...')
diff --git a/meson_options.txt b/meson_options.txt
index bb61675a1000..b8e536ce6bec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,3 +3,5 @@ option('enable-tecio', type : 'boolean', value : true, description: 'enable TECI
 option('enable-cgns',  type : 'boolean', value : true, description: 'enable CGNS support')
 option('enable-autodiff',  type : 'boolean', value : false, description: 'enable AD (reverse) support')
 option('enable-directdiff',  type : 'boolean', value : false, description: 'enable AD (forward) support')
+option('enable-pywrapper',  type : 'boolean', value : false, description: 'enable Python wrapper support')
+option('python_path',  type : 'string', value : '', description: 'Python path')

From c0281f9c96cf54a704a899f936ed0bd9a974f961 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 23 May 2019 14:14:39 +0200
Subject: [PATCH 273/539] Updated meson files

---
 SU2_CFD/src/meson.build | 142 ++++++++++++++++++++++------------------
 SU2_DEF/src/meson.build |  15 +++--
 SU2_DOT/src/meson.build |  16 +++--
 SU2_SOL/src/meson.build |  15 +++--
 4 files changed, 107 insertions(+), 81 deletions(-)

diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 76992ef0c6dc..92225a69a61f 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -1,65 +1,83 @@
-su2_cfd_src = ['output_paraview.cpp',
-           'solver_direct_transition.cpp',
-           'solver_adjoint_turbulent.cpp',
-           'integration_structure.cpp',
-           'solver_direct_mean_fem.cpp',
-           'numerics_adjoint_mean.cpp',
-           'transport_model.cpp',
-           'variable_direct_turbulent.cpp',
-           'numerics_adjoint_turbulent.cpp',
-           'variable_direct_transition.cpp',
-           'output_tecplot.cpp',
-           'fluid_model_pvdw.cpp',
-           'variable_direct_elasticity.cpp',
-           'integration_time.cpp',
-           'fluid_model_pig.cpp',
-           'solver_direct_mean.cpp',
-           'iteration_structure.cpp',
-           'variable_template.cpp',
-           'fluid_model_inc.cpp',
-           'solver_adjoint_mean.cpp',
-           'driver_structure.cpp',
-           'variable_adjoint_turbulent.cpp',
-           'variable_adjoint_discrete.cpp',
-           'variable_structure.cpp',
-           'driver_direct_multizone.cpp',
-           'solver_adjoint_elasticity.cpp',
-           'solver_structure.cpp',
-           'numerics_direct_transition.cpp',
-           'solver_template.cpp',
-           'variable_direct_mean_inc.cpp',
-           'solver_direct_elasticity.cpp',
-           'definition_structure.cpp',
-           'output_structure.cpp',
-           'output_cgns.cpp',
-           'numerics_direct_mean_inc.cpp',
-           'transfer_physics.cpp',
-           'data_manufactured_solutions.cpp',
-           'variable_adjoint_mean.cpp',
-           'solver_direct_turbulent.cpp',
-           'output_physics.cpp',
-           'fluid_model.cpp',
-           'solver_direct_mean_inc.cpp',
-           'numerics_direct_mean.cpp',
-           'solver_direct_heat.cpp',
-           'variable_direct_heat.cpp',
-           'numerics_direct_heat.cpp',
-           'fluid_model_ppr.cpp',
-           'numerics_direct_elasticity.cpp',
-           'variable_direct_mean.cpp',
-           'driver_direct_singlezone.cpp',
-           'numerics_direct_turbulent.cpp',
-           'numerics_direct_elasticity_linear.cpp',
-           'python_wrapper_structure.cpp',
-           'numerics_structure.cpp',
-           'numerics_template.cpp',
-           'output_su2.cpp',
-           'transfer_structure.cpp',
-           'output_fieldview.cpp',
-           'solver_adjoint_discrete.cpp',
-           'numerics_direct_elasticity_nonlinear.cpp',
-           'variable_adjoint_elasticity.cpp',
-           'SU2_CFD.cpp']
+su2_cfd_src = files(['driver_adjoint_singlezone.cpp',
+                     'solver_direct_transition.cpp',
+                     'solver_adjoint_turbulent.cpp',
+                     'integration_structure.cpp',
+                     'solver_direct_mean_fem.cpp',
+                     'numerics_adjoint_mean.cpp',
+                     'transport_model.cpp',
+                     'variable_direct_turbulent.cpp',
+                     'numerics_adjoint_turbulent.cpp',
+                     'variable_direct_transition.cpp',
+                     'fluid_model_pvdw.cpp',
+                     'variable_direct_elasticity.cpp',
+                     'integration_time.cpp',
+                     'fluid_model_pig.cpp',
+                     'solver_direct_mean.cpp',
+                     'iteration_structure.cpp',
+                     'variable_template.cpp',
+                     'fluid_model_inc.cpp',
+                     'solver_adjoint_mean.cpp',
+                     'driver_structure.cpp',
+                     'variable_adjoint_turbulent.cpp',
+                     'variable_adjoint_discrete.cpp',
+                     'variable_structure.cpp',
+                     'driver_direct_multizone.cpp',
+                     'solver_adjoint_elasticity.cpp',
+                     'solver_structure.cpp',
+                     'numerics_direct_transition.cpp',
+                     'solver_template.cpp',
+                     'variable_direct_mean_inc.cpp',
+                     'solver_direct_elasticity.cpp',
+                     'definition_structure.cpp',
+                     'numerics_direct_mean_inc.cpp',
+                     'transfer_physics.cpp',
+                     'data_manufactured_solutions.cpp',
+                     'variable_adjoint_mean.cpp',
+                     'solver_direct_turbulent.cpp',
+                     'fluid_model.cpp',
+                     'solver_direct_mean_inc.cpp',
+                     'numerics_direct_mean.cpp',
+                     'solver_direct_heat.cpp',
+                     'variable_direct_heat.cpp',
+                     'numerics_direct_heat.cpp',
+                     'fluid_model_ppr.cpp',
+                     'numerics_direct_elasticity.cpp',
+                     'variable_direct_mean.cpp',
+                     'driver_direct_singlezone.cpp',
+                     'numerics_direct_turbulent.cpp',
+                     'numerics_direct_elasticity_linear.cpp',
+                     'python_wrapper_structure.cpp',
+                     'numerics_structure.cpp',
+                     'numerics_template.cpp',
+                     'transfer_structure.cpp',
+                     'solver_adjoint_discrete.cpp',
+                     'numerics_direct_elasticity_nonlinear.cpp',
+                     'variable_adjoint_elasticity.cpp',
+                     'SU2_CFD.cpp'])
+
+su2_cfd_src += files(['output/output_adj_elasticity.cpp',
+                      'output/output_adj_flow_comp.cpp',
+                      'output/output_adj_flow_inc.cpp',
+                      'output/output_adj_heat.cpp',
+                      'output/output_baseline.cpp',
+                      'output/output_cgns.cpp',
+                      'output/output_csv.cpp',
+                      'output/output_driver.cpp',
+                      'output/output_elasticity.cpp',
+                      'output/output_fieldview.cpp',
+                      'output/output_flow_comp.cpp',
+                      'output/output_flow_comp_fem.cpp',
+                      'output/output_flow.cpp',
+                      'output/output_flow_inc.cpp',
+                      'output/output_heat.cpp',
+                      'output/output_mesh.cpp',
+                      'output/output_paraview.cpp',
+                      'output/output_physics.cpp',
+                      'output/output_structure.cpp',
+                      'output/output_structure_legacy.cpp',
+                      'output/output_su2.cpp',
+                      'output/output_tecplot.cpp'])
+
 
 su2_cfd = executable('SU2_CFD',
                      su2_cfd_src, 
diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
index b5d8c48dfcba..222af158ffb5 100644
--- a/SU2_DEF/src/meson.build
+++ b/SU2_DEF/src/meson.build
@@ -1,11 +1,14 @@
 su2_def_src = ['SU2_DEF.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
+                                       'output/output_structure.cpp',
+                                       'output/output_mesh.cpp',
+                                       'output/output_structure_legacy.cpp',
+                                       'output/output_csv.cpp',
+				       'output/output_cgns.cpp',
+				       'output/output_tecplot.cpp',
+				       'output/output_fieldview.cpp',
+				       'output/output_su2.cpp',
+				       'output/output_paraview.cpp',
 				       'variable_structure.cpp'])
 
 
diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
index 68d8680679f8..ed44fbd59a2e 100644
--- a/SU2_DOT/src/meson.build
+++ b/SU2_DOT/src/meson.build
@@ -1,12 +1,14 @@
-
 su2_dot_src = ['SU2_DOT.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
+                                       'output/output_structure.cpp',
+				       'output/output_baseline.cpp',
+				       'output/output_csv.cpp',
+				       'output/output_structure_legacy.cpp',
+				       'output/output_cgns.cpp',
+				       'output/output_tecplot.cpp',
+				       'output/output_fieldview.cpp',
+				       'output/output_su2.cpp',
+				       'output/output_paraview.cpp',
 				       'variable_structure.cpp'])
 
 
diff --git a/SU2_SOL/src/meson.build b/SU2_SOL/src/meson.build
index 00c559f91d7a..1e9f4c453d76 100644
--- a/SU2_SOL/src/meson.build
+++ b/SU2_SOL/src/meson.build
@@ -1,11 +1,14 @@
 su2_sol_src = ['SU2_SOL.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
+                                       'output/output_structure.cpp',
+                                       'output/output_structure_legacy.cpp',
+				       'output/output_baseline.cpp',
+				       'output/output_csv.cpp',
+				       'output/output_cgns.cpp',
+				       'output/output_tecplot.cpp',
+				       'output/output_fieldview.cpp',
+				       'output/output_su2.cpp',
+				       'output/output_paraview.cpp',
 				       'variable_structure.cpp'])
 
 

From 906767d9836afda15aee23a0c4b2be2adc35e965 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 10:21:55 +0200
Subject: [PATCH 274/539] Renaming of source files to reflect to proposed
 structure (filename equals class name)

---
 Common/src/config_structure.cpp               |  1 +
 SU2_CFD/include/SU2_CFD.hpp                   |  2 +-
 SU2_CFD/include/driver_structure.hpp          | 22 +++++++--------
 SU2_CFD/include/iteration_structure.hpp       |  2 +-
 ...lasticity.hpp => CAdjElasticityOutput.hpp} |  2 +-
 ...adj_flow_inc.hpp => CAdjFlowIncOutput.hpp} |  2 +-
 ...t_adj_flow_comp.hpp => CAdjFlowOutput.hpp} |  8 +++---
 ...output_adj_heat.hpp => CAdjHeatOutput.hpp} |  2 +-
 ...utput_baseline.hpp => CBaselineOutput.hpp} |  2 +-
 .../{output_driver.hpp => CDriverOutput.hpp}  |  2 +-
 ...t_elasticity.hpp => CElasticityOutput.hpp} |  2 +-
 ...ow_comp_fem.hpp => CFlowCompFEMOutput.hpp} |  2 +-
 ...tput_flow_comp.hpp => CFlowCompOutput.hpp} |  2 +-
 ...output_flow_inc.hpp => CFlowIncOutput.hpp} |  2 +-
 .../{output_flow.hpp => CFlowOutput.hpp}      |  2 +-
 .../{output_heat.hpp => CHeatOutput.hpp}      |  2 +-
 .../{output_mesh.hpp => CMeshOutput.hpp}      |  2 +-
 .../output/{output.hpp => COutput.hpp}        |  4 ++-
 ...structure_legacy.hpp => COutputLegacy.hpp} |  0
 SU2_CFD/include/output/CVolumeFileWriter.hpp  |  4 +++
 SU2_CFD/obj/Makefile.am                       | 28 +++++++++----------
 SU2_CFD/src/driver_structure.cpp              |  2 +-
 ...lasticity.cpp => CAdjElasticityOutput.cpp} |  2 +-
 ...j_flow_comp.cpp => CAdjFlowCompOutput.cpp} | 20 ++++++-------
 ...adj_flow_inc.cpp => CAdjFlowIncOutput.cpp} |  2 +-
 ...output_adj_heat.cpp => CAdjHeatOutput.cpp} |  2 +-
 ...utput_baseline.cpp => CBaselineOutput.cpp} |  2 +-
 .../{output_driver.cpp => CDriverOutput.cpp}  |  2 +-
 ...t_elasticity.cpp => CElasticityOutput.cpp} |  2 +-
 ...ow_comp_fem.cpp => CFlowCompFEMOutput.cpp} |  2 +-
 ...tput_flow_comp.cpp => CFlowCompOutput.cpp} |  2 +-
 ...output_flow_inc.cpp => CFlowIncOutput.cpp} |  2 +-
 .../{output_flow.cpp => CFlowOutput.cpp}      |  2 +-
 .../{output_heat.cpp => CHeatOutput.cpp}      |  2 +-
 .../{output_mesh.cpp => CMeshOutput.cpp}      |  2 +-
 .../{output_structure.cpp => COutput.cpp}     |  0
 SU2_CFD/src/output/output_cgns.cpp            |  2 +-
 SU2_CFD/src/output/output_csv.cpp             |  2 +-
 SU2_CFD/src/output/output_fieldview.cpp       |  2 +-
 SU2_CFD/src/output/output_paraview.cpp        |  2 +-
 SU2_CFD/src/output/output_physics.cpp         |  2 +-
 .../src/output/output_structure_legacy.cpp    |  2 +-
 SU2_CFD/src/output/output_su2.cpp             |  2 +-
 SU2_DEF/include/SU2_DEF.hpp                   |  2 +-
 SU2_DEF/src/meson.build                       |  4 +--
 SU2_DOT/include/SU2_DOT.hpp                   |  2 +-
 SU2_DOT/src/meson.build                       |  4 +--
 SU2_SOL/include/SU2_SOL.hpp                   |  2 +-
 SU2_SOL/src/meson.build                       |  4 +--
 49 files changed, 90 insertions(+), 83 deletions(-)
 rename SU2_CFD/include/output/{output_adj_elasticity.hpp => CAdjElasticityOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_adj_flow_inc.hpp => CAdjFlowIncOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_adj_flow_comp.hpp => CAdjFlowOutput.hpp} (94%)
 rename SU2_CFD/include/output/{output_adj_heat.hpp => CAdjHeatOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_baseline.hpp => CBaselineOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_driver.hpp => CDriverOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_elasticity.hpp => CElasticityOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_flow_comp_fem.hpp => CFlowCompFEMOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_flow_comp.hpp => CFlowCompOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_flow_inc.hpp => CFlowIncOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_flow.hpp => CFlowOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_heat.hpp => CHeatOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_mesh.hpp => CMeshOutput.hpp} (99%)
 rename SU2_CFD/include/output/{output.hpp => COutput.hpp} (99%)
 rename SU2_CFD/include/output/{output_structure_legacy.hpp => COutputLegacy.hpp} (100%)
 create mode 100644 SU2_CFD/include/output/CVolumeFileWriter.hpp
 rename SU2_CFD/src/output/{output_adj_elasticity.cpp => CAdjElasticityOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_adj_flow_comp.cpp => CAdjFlowCompOutput.cpp} (96%)
 rename SU2_CFD/src/output/{output_adj_flow_inc.cpp => CAdjFlowIncOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_adj_heat.cpp => CAdjHeatOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_baseline.cpp => CBaselineOutput.cpp} (98%)
 rename SU2_CFD/src/output/{output_driver.cpp => CDriverOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_elasticity.cpp => CElasticityOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_flow_comp_fem.cpp => CFlowCompFEMOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_flow_comp.cpp => CFlowCompOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_flow_inc.cpp => CFlowIncOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_flow.cpp => CFlowOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_heat.cpp => CHeatOutput.cpp} (99%)
 rename SU2_CFD/src/output/{output_mesh.cpp => CMeshOutput.cpp} (98%)
 rename SU2_CFD/src/output/{output_structure.cpp => COutput.cpp} (100%)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 77d2edd2c361..0bef40e0af7f 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3170,6 +3170,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   if (!Time_Domain){
     nTimeIter = 1;
+    Time_Step = 0;
   } 
   
   if (Time_Domain){
diff --git a/SU2_CFD/include/SU2_CFD.hpp b/SU2_CFD/include/SU2_CFD.hpp
index ce2cd994c2ac..7cf5ae968d74 100644
--- a/SU2_CFD/include/SU2_CFD.hpp
+++ b/SU2_CFD/include/SU2_CFD.hpp
@@ -45,7 +45,7 @@
 #include "driver_structure.hpp"
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output/output.hpp"
+#include "output/COutput.hpp"
 #include "numerics_structure.hpp"
 #include "../../Common/include/fem_geometry_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 4bf1465a3a49..e6a1841575a7 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -42,8 +42,8 @@
 #include "iteration_structure.hpp"
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output/output.hpp"
-#include "output/output_driver.hpp"
+#include "output/COutput.hpp"
+#include "output/CDriverOutput.hpp"
 #include "numerics_structure.hpp"
 #include "transfer_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
@@ -51,15 +51,15 @@
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/interpolation_structure.hpp"
 
-#include "output/output_elasticity.hpp"
-#include "output/output_adj_elasticity.hpp"
-#include "output/output_flow_comp.hpp"
-#include "output/output_adj_flow_comp.hpp"
-#include "output/output_flow_comp_fem.hpp"
-#include "output/output_flow_inc.hpp"
-#include "output/output_adj_flow_inc.hpp"
-#include "output/output_heat.hpp"
-#include "output/output_adj_heat.hpp"
+#include "output/CElasticityOutput.hpp"
+#include "output/CAdjElasticityOutput.hpp"
+#include "output/CFlowCompOutput.hpp"
+#include "output/CAdjFlowOutput.hpp"
+#include "output/CFlowCompFEMOutput.hpp"
+#include "output/CFlowIncOutput.hpp"
+#include "output/CAdjFlowIncOutput.hpp"
+#include "output/CHeatOutput.hpp"
+#include "output/CAdjHeatOutput.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index c82074e3fb97..adc8ba3f1400 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -44,7 +44,7 @@
 
 #include "solver_structure.hpp"
 #include "integration_structure.hpp"
-#include "output/output.hpp"
+#include "output/COutput.hpp"
 #include "numerics_structure.hpp"
 #include "transfer_structure.hpp"
 #include "../../Common/include/geometry_structure.hpp"
diff --git a/SU2_CFD/include/output/output_adj_elasticity.hpp b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_adj_elasticity.hpp
rename to SU2_CFD/include/output/CAdjElasticityOutput.hpp
index a0dd2c1017bf..699421bcf727 100644
--- a/SU2_CFD/include/output/output_adj_elasticity.hpp
+++ b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CDiscAdjFEAOutput
  *  \brief Output class for elasticity discrete adjoint problems.
diff --git a/SU2_CFD/include/output/output_adj_flow_inc.hpp b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_adj_flow_inc.hpp
rename to SU2_CFD/include/output/CAdjFlowIncOutput.hpp
index ee687bfefd16..4eef942ca061 100644
--- a/SU2_CFD/include/output/output_adj_flow_inc.hpp
+++ b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CDiscAdjFlowOutput
  *  \brief Output class for flow discrete adjoint problems.
diff --git a/SU2_CFD/include/output/output_adj_flow_comp.hpp b/SU2_CFD/include/output/CAdjFlowOutput.hpp
similarity index 94%
rename from SU2_CFD/include/output/output_adj_flow_comp.hpp
rename to SU2_CFD/include/output/CAdjFlowOutput.hpp
index e4bb98f8ee5e..52b2d3f08edf 100644
--- a/SU2_CFD/include/output/output_adj_flow_comp.hpp
+++ b/SU2_CFD/include/output/CAdjFlowOutput.hpp
@@ -38,14 +38,14 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CDiscAdjFlowOutput
  *  \brief Output class for flow discrete adjoint problems.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CAdjFlowOutput : public COutput {
+class CAdjFlowCompOutput : public COutput {
 private:
 
   bool cont_adj;
@@ -58,12 +58,12 @@ class CAdjFlowOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjFlowCompOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CAdjFlowOutput(void);
+  virtual ~CAdjFlowCompOutput(void);
 
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/output_adj_heat.hpp b/SU2_CFD/include/output/CAdjHeatOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_adj_heat.hpp
rename to SU2_CFD/include/output/CAdjHeatOutput.hpp
index 47ddd9e18bc7..b82f3b6d954e 100644
--- a/SU2_CFD/include/output/output_adj_heat.hpp
+++ b/SU2_CFD/include/output/CAdjHeatOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CDiscAdjFEAOutput
  *  \brief Output class for elasticity discrete adjoint problems.
diff --git a/SU2_CFD/include/output/output_baseline.hpp b/SU2_CFD/include/output/CBaselineOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_baseline.hpp
rename to SU2_CFD/include/output/CBaselineOutput.hpp
index 2e21a68d6952..93e21c27ec87 100644
--- a/SU2_CFD/include/output/output_baseline.hpp
+++ b/SU2_CFD/include/output/CBaselineOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CBaselineOutput
  *  \brief Output class for baseline solver output.
diff --git a/SU2_CFD/include/output/output_driver.hpp b/SU2_CFD/include/output/CDriverOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_driver.hpp
rename to SU2_CFD/include/output/CDriverOutput.hpp
index 9f84808902e1..d5eceadb845f 100644
--- a/SU2_CFD/include/output/output_driver.hpp
+++ b/SU2_CFD/include/output/CDriverOutput.hpp
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <fstream>
 
-#include "output.hpp"
+#include "COutput.hpp"
 #include "../../../Common/include/config_structure.hpp"
 
 using namespace std;
diff --git a/SU2_CFD/include/output/output_elasticity.hpp b/SU2_CFD/include/output/CElasticityOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_elasticity.hpp
rename to SU2_CFD/include/output/CElasticityOutput.hpp
index 69cb5db269f7..1b51384d2bf7 100644
--- a/SU2_CFD/include/output/output_elasticity.hpp
+++ b/SU2_CFD/include/output/CElasticityOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CFEAOutput
  *  \brief Output class for FEA problems.
diff --git a/SU2_CFD/include/output/output_flow_comp_fem.hpp b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_flow_comp_fem.hpp
rename to SU2_CFD/include/output/CFlowCompFEMOutput.hpp
index 95a5a8179101..b6bf078e61ab 100644
--- a/SU2_CFD/include/output/output_flow_comp_fem.hpp
+++ b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output_flow.hpp"
+#include "CFlowOutput.hpp"
 
 
 /*! \class CFlowFEMOutput
diff --git a/SU2_CFD/include/output/output_flow_comp.hpp b/SU2_CFD/include/output/CFlowCompOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_flow_comp.hpp
rename to SU2_CFD/include/output/CFlowCompOutput.hpp
index 2c4fc5c626b3..9c749b0663e6 100644
--- a/SU2_CFD/include/output/output_flow_comp.hpp
+++ b/SU2_CFD/include/output/CFlowCompOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output_flow.hpp"
+#include "CFlowOutput.hpp"
 
 /*! \class CFlowOutput
  *  \brief Output class for compressible Flow problems.
diff --git a/SU2_CFD/include/output/output_flow_inc.hpp b/SU2_CFD/include/output/CFlowIncOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_flow_inc.hpp
rename to SU2_CFD/include/output/CFlowIncOutput.hpp
index 3dade89ca82b..6e836f2f6add 100644
--- a/SU2_CFD/include/output/output_flow_inc.hpp
+++ b/SU2_CFD/include/output/CFlowIncOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output_flow.hpp"
+#include "CFlowOutput.hpp"
 
 /*! \class CIncFlowOutput
  *  \brief Output class for compressible Flow problems.
diff --git a/SU2_CFD/include/output/output_flow.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_flow.hpp
rename to SU2_CFD/include/output/CFlowOutput.hpp
index 1e3fa31803b1..f21c8bf3677f 100644
--- a/SU2_CFD/include/output/output_flow.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 class CFlowOutput : public COutput{
   
diff --git a/SU2_CFD/include/output/output_heat.hpp b/SU2_CFD/include/output/CHeatOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_heat.hpp
rename to SU2_CFD/include/output/CHeatOutput.hpp
index d04ec8d698f7..90e07ceb02c8 100644
--- a/SU2_CFD/include/output/output_heat.hpp
+++ b/SU2_CFD/include/output/CHeatOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 
 /*! \class CHeatOutput
diff --git a/SU2_CFD/include/output/output_mesh.hpp b/SU2_CFD/include/output/CMeshOutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output_mesh.hpp
rename to SU2_CFD/include/output/CMeshOutput.hpp
index 48519c41047f..002f6bbd49e4 100644
--- a/SU2_CFD/include/output/output_mesh.hpp
+++ b/SU2_CFD/include/output/CMeshOutput.hpp
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "output.hpp"
+#include "COutput.hpp"
 
 /*! \class CMeshOutput
  *  \brief Output class for mesh solution.
diff --git a/SU2_CFD/include/output/output.hpp b/SU2_CFD/include/output/COutput.hpp
similarity index 99%
rename from SU2_CFD/include/output/output.hpp
rename to SU2_CFD/include/output/COutput.hpp
index 0865dcdb77cf..a82b9d5d2d0d 100644
--- a/SU2_CFD/include/output/output.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -62,7 +62,9 @@
 #include "../../../Common/include/toolboxes/printing_toolbox.hpp"
 #include "../../../Common/include/toolboxes/signal_processing_toolbox.hpp"
 
-#include "output_structure_legacy.hpp"
+#include "filewriter/CParallelDataSorter.hpp"
+
+#include "COutputLegacy.hpp"
 
 using namespace std;
 
diff --git a/SU2_CFD/include/output/output_structure_legacy.hpp b/SU2_CFD/include/output/COutputLegacy.hpp
similarity index 100%
rename from SU2_CFD/include/output/output_structure_legacy.hpp
rename to SU2_CFD/include/output/COutputLegacy.hpp
diff --git a/SU2_CFD/include/output/CVolumeFileWriter.hpp b/SU2_CFD/include/output/CVolumeFileWriter.hpp
new file mode 100644
index 000000000000..695aa35332d4
--- /dev/null
+++ b/SU2_CFD/include/output/CVolumeFileWriter.hpp
@@ -0,0 +1,4 @@
+#ifndef CFILEWRITER_HPP
+#define CFILEWRITER_HPP
+
+#endif // CFILEWRITER_HPP
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 133f4d10de55..cb4711578c7a 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -125,26 +125,26 @@ libSU2Core_sources = \
   ../src/numerics_structure.cpp \
   ../src/numerics_template.cpp \
   ../src/output/output_cgns.cpp \
-  ../src/output/output_structure.cpp \
+  ../src/output/COutput.cpp \
   ../src/output/output_physics.cpp \
   ../src/output/output_tecplot.cpp \
   ../src/output/output_fieldview.cpp \
   ../src/output/output_su2.cpp \
   ../src/output/output_paraview.cpp \
   ../src/output/output_csv.cpp \
-  ../src/output/output_mesh.cpp \
-  ../src/output/output_elasticity.cpp \
-  ../src/output/output_flow.cpp \
-  ../src/output/output_flow_comp.cpp \
-  ../src/output/output_flow_comp_fem.cpp \
-  ../src/output/output_flow_inc.cpp \
-  ../src/output/output_heat.cpp \
-  ../src/output/output_baseline.cpp \
-  ../src/output/output_adj_elasticity.cpp \
-  ../src/output/output_adj_heat.cpp \
-  ../src/output/output_adj_flow_comp.cpp \
-  ../src/output/output_adj_flow_inc.cpp \
-  ../src/output/output_driver.cpp \
+  ../src/output/CMeshOutput.cpp \
+  ../src/output/CElasticityOutput.cpp \
+  ../src/output/CFlowOutput.cpp \
+  ../src/output/CFlowCompOutput.cpp \
+  ../src/output/CFlowCompFEMOutput.cpp \
+  ../src/output/CFlowIncOutput.cpp \
+  ../src/output/CHeatOutput.cpp \
+  ../src/output/CBaselineOutput.cpp \
+  ../src/output/CAdjElasticityOutput.cpp \
+  ../src/output/CAdjHeatOutput.cpp \
+  ../src/output/CAdjFlowCompOutput.cpp \
+  ../src/output/CAdjFlowIncOutput.cpp \
+  ../src/output/CDriverOutput.cpp \
   ../src/output/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 11e8723958ee..cb7d97a645cf 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -4006,7 +4006,7 @@ void CDriver::Output_Preprocessing(){
       if (rank == MASTER_NODE)
         cout << ": adjoint Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE){      
-        output[iZone] = new CAdjFlowOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CAdjFlowCompOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       } else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE){
         output[iZone] = new CAdjFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
       }
diff --git a/SU2_CFD/src/output/output_adj_elasticity.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_adj_elasticity.cpp
rename to SU2_CFD/src/output/CAdjElasticityOutput.cpp
index e8839df85b0e..0f2e5effc18d 100644
--- a/SU2_CFD/src/output/output_adj_elasticity.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_adj_elasticity.hpp"
+#include "../../include/output/CAdjElasticityOutput.hpp"
 
 CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
diff --git a/SU2_CFD/src/output/output_adj_flow_comp.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
similarity index 96%
rename from SU2_CFD/src/output/output_adj_flow_comp.cpp
rename to SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index b40651fbde26..b074ed05ffe8 100644
--- a/SU2_CFD/src/output/output_adj_flow_comp.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_adj_flow_comp.hpp"
+#include "../../include/output/CAdjFlowOutput.hpp"
 
-CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   nDim = geometry->GetnDim();
  
@@ -98,7 +98,7 @@ CAdjFlowOutput::CAdjFlowOutput(CConfig *config, CGeometry *geometry, unsigned sh
   
 }
 
-CAdjFlowOutput::~CAdjFlowOutput(void) {
+CAdjFlowCompOutput::~CAdjFlowCompOutput(void) {
 
   if (rank == MASTER_NODE){
     HistFile.close();
@@ -106,7 +106,7 @@ CAdjFlowOutput::~CAdjFlowOutput(void) {
 
 }
 
-void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
+void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
@@ -209,7 +209,7 @@ void CAdjFlowOutput::SetHistoryOutputFields(CConfig *config){
   
 }
 
-void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
+void CAdjFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver){ 
  
   CSolver* adjflow_solver = solver[ADJFLOW_SOL];
   CSolver* adjturb_solver = solver[ADJTURB_SOL];  
@@ -293,7 +293,7 @@ void CAdjFlowOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 
 }
 
-void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
+void CAdjFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
   /// DESCRIPTION: x coordinates of the mesh nodes.
@@ -389,7 +389,7 @@ void CAdjFlowOutput::SetVolumeOutputFields(CConfig *config){
  
 }
 
-void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
+void CAdjFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
   
   CVariable* Node_AdjFlow = solver[ADJFLOW_SOL]->node[iPoint]; 
   CVariable* Node_AdjTurb = NULL;
@@ -465,21 +465,21 @@ void CAdjFlowOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   
 }
 
-void CAdjFlowOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
+void CAdjFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
   SetVolumeOutputValue("SENSITIVITY", iPoint, solver[ADJFLOW_SOL]->GetCSensitivity(iMarker, iVertex));
   
 }
 
 
-bool CAdjFlowOutput::SetInit_Residuals(CConfig *config){
+bool CAdjFlowCompOutput::SetInit_Residuals(CConfig *config){
   
   return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
         (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
   
 }
 
-bool CAdjFlowOutput::SetUpdate_Averages(CConfig *config){
+bool CAdjFlowCompOutput::SetUpdate_Averages(CConfig *config){
   return false;
   
 //  return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
diff --git a/SU2_CFD/src/output/output_adj_flow_inc.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_adj_flow_inc.cpp
rename to SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 955f6331dc79..885b8662f172 100644
--- a/SU2_CFD/src/output/output_adj_flow_inc.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_adj_flow_inc.hpp"
+#include "../../include/output/CAdjFlowIncOutput.hpp"
 
 CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output/output_adj_heat.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_adj_heat.cpp
rename to SU2_CFD/src/output/CAdjHeatOutput.cpp
index 39868b68fdaf..39e820367ce0 100644
--- a/SU2_CFD/src/output/output_adj_heat.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_adj_heat.hpp"
+#include "../../include/output/CAdjHeatOutput.hpp"
 
 CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
diff --git a/SU2_CFD/src/output/output_baseline.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
similarity index 98%
rename from SU2_CFD/src/output/output_baseline.cpp
rename to SU2_CFD/src/output/CBaselineOutput.cpp
index 720d4ed336d9..81d949156715 100644
--- a/SU2_CFD/src/output/output_baseline.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../../include/output/output_baseline.hpp"
+#include "../../include/output/CBaselineOutput.hpp"
 
 CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/output_driver.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_driver.cpp
rename to SU2_CFD/src/output/CDriverOutput.cpp
index a4828bedc38c..6d342280fafe 100644
--- a/SU2_CFD/src/output/output_driver.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_driver.hpp"
+#include "../../include/output/CDriverOutput.hpp"
 
 CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput(driver_config) {
 
diff --git a/SU2_CFD/src/output/output_elasticity.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_elasticity.cpp
rename to SU2_CFD/src/output/CElasticityOutput.cpp
index fd65b77e0e42..ec03e8c4e687 100644
--- a/SU2_CFD/src/output/output_elasticity.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_elasticity.hpp"
+#include "../../include/output/CElasticityOutput.hpp"
 
 CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/output_flow_comp_fem.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_flow_comp_fem.cpp
rename to SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 21c037246375..05ba90a7fba5 100644
--- a/SU2_CFD/src/output/output_flow_comp_fem.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -36,7 +36,7 @@
  */
 
 
-#include "../../include/output/output_flow_comp_fem.hpp"
+#include "../../include/output/CFlowCompFEMOutput.hpp"
 
 CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
diff --git a/SU2_CFD/src/output/output_flow_comp.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_flow_comp.cpp
rename to SU2_CFD/src/output/CFlowCompOutput.cpp
index fd32893b5e1f..c097d0b5c64d 100644
--- a/SU2_CFD/src/output/output_flow_comp.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_comp.hpp"
+#include "../../include/output/CFlowCompOutput.hpp"
 
 CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
diff --git a/SU2_CFD/src/output/output_flow_inc.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_flow_inc.cpp
rename to SU2_CFD/src/output/CFlowIncOutput.cpp
index 53ae9efa03c1..d6783d5b8bec 100644
--- a/SU2_CFD/src/output/output_flow_inc.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow_inc.hpp"
+#include "../../include/output/CFlowIncOutput.hpp"
 
 CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
diff --git a/SU2_CFD/src/output/output_flow.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_flow.cpp
rename to SU2_CFD/src/output/CFlowOutput.cpp
index 539aade293ac..b8be7ba68210 100644
--- a/SU2_CFD/src/output/output_flow.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_flow.hpp"
+#include "../../include/output/CFlowOutput.hpp"
 
 CFlowOutput::CFlowOutput(CConfig *config) : COutput (config){
   
diff --git a/SU2_CFD/src/output/output_heat.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
similarity index 99%
rename from SU2_CFD/src/output/output_heat.cpp
rename to SU2_CFD/src/output/CHeatOutput.cpp
index 1346ab4e1523..640e39f507bf 100644
--- a/SU2_CFD/src/output/output_heat.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_heat.hpp"
+#include "../../include/output/CHeatOutput.hpp"
 
 CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/output_mesh.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
similarity index 98%
rename from SU2_CFD/src/output/output_mesh.cpp
rename to SU2_CFD/src/output/CMeshOutput.cpp
index f771401b0df9..16d32bf61281 100644
--- a/SU2_CFD/src/output/output_mesh.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_mesh.hpp"
+#include "../../include/output/CMeshOutput.hpp"
 
 CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/output_structure.cpp b/SU2_CFD/src/output/COutput.cpp
similarity index 100%
rename from SU2_CFD/src/output/output_structure.cpp
rename to SU2_CFD/src/output/COutput.cpp
diff --git a/SU2_CFD/src/output/output_cgns.cpp b/SU2_CFD/src/output/output_cgns.cpp
index d0014259c266..2a5334b3da77 100644
--- a/SU2_CFD/src/output/output_cgns.cpp
+++ b/SU2_CFD/src/output/output_cgns.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
 void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short iZone) {
   
diff --git a/SU2_CFD/src/output/output_csv.cpp b/SU2_CFD/src/output/output_csv.cpp
index 93873e7e4f0a..96bdb65a2df4 100644
--- a/SU2_CFD/src/output/output_csv.cpp
+++ b/SU2_CFD/src/output/output_csv.cpp
@@ -1,4 +1,4 @@
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
 void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
   
diff --git a/SU2_CFD/src/output/output_fieldview.cpp b/SU2_CFD/src/output/output_fieldview.cpp
index 0b836d77865f..7b8bb953d9ba 100644
--- a/SU2_CFD/src/output/output_fieldview.cpp
+++ b/SU2_CFD/src/output/output_fieldview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
 void COutput::SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone) {
   
diff --git a/SU2_CFD/src/output/output_paraview.cpp b/SU2_CFD/src/output/output_paraview.cpp
index 047962b3d9fe..d51af828c41b 100644
--- a/SU2_CFD/src/output/output_paraview.cpp
+++ b/SU2_CFD/src/output/output_paraview.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
 /*--- Subroutine to swap bytes, in case we need to convert to
  big endian, which is expected for ParaView binary legacy format. ---*/
diff --git a/SU2_CFD/src/output/output_physics.cpp b/SU2_CFD/src/output/output_physics.cpp
index e9d897768bcd..94f4939d6a48 100644
--- a/SU2_CFD/src/output/output_physics.cpp
+++ b/SU2_CFD/src/output/output_physics.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_structure_legacy.hpp"
+#include "../../include/output/COutputLegacy.hpp"
 
 
 void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 1a6a3df065f7..de58c6d6fde5 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output_structure_legacy.hpp"
+#include "../../include/output/COutputLegacy.hpp"
 
 COutputLegacy::COutputLegacy(CConfig *config) {
 
diff --git a/SU2_CFD/src/output/output_su2.cpp b/SU2_CFD/src/output/output_su2.cpp
index dd07c96d564f..d9c0dec661a6 100644
--- a/SU2_CFD/src/output/output_su2.cpp
+++ b/SU2_CFD/src/output/output_su2.cpp
@@ -35,7 +35,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
 void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
   
diff --git a/SU2_DEF/include/SU2_DEF.hpp b/SU2_DEF/include/SU2_DEF.hpp
index 73636bda4ba6..99f7c9caa5ae 100644
--- a/SU2_DEF/include/SU2_DEF.hpp
+++ b/SU2_DEF/include/SU2_DEF.hpp
@@ -46,7 +46,7 @@
 #include <cmath>
 
 #include "../../SU2_CFD/include/solver_structure.hpp"
-#include "../../SU2_CFD/include/output/output_mesh.hpp"
+#include "../../SU2_CFD/include/output/CMeshOutput.hpp"
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/grid_movement_structure.hpp"
diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
index 222af158ffb5..f77fb48be8a1 100644
--- a/SU2_DEF/src/meson.build
+++ b/SU2_DEF/src/meson.build
@@ -1,7 +1,7 @@
 su2_def_src = ['SU2_DEF.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output/output_structure.cpp',
-                                       'output/output_mesh.cpp',
+                                       'output/COutput.cpp',
+                                       'output/CMeshOutput.cpp',
                                        'output/output_structure_legacy.cpp',
                                        'output/output_csv.cpp',
 				       'output/output_cgns.cpp',
diff --git a/SU2_DOT/include/SU2_DOT.hpp b/SU2_DOT/include/SU2_DOT.hpp
index 5280d6acbeca..e4925495d56e 100644
--- a/SU2_DOT/include/SU2_DOT.hpp
+++ b/SU2_DOT/include/SU2_DOT.hpp
@@ -48,7 +48,7 @@
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/grid_movement_structure.hpp"
-#include "../../SU2_CFD/include/output/output_baseline.hpp"
+#include "../../SU2_CFD/include/output/CBaselineOutput.hpp"
 
 using namespace std;
 
diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
index ed44fbd59a2e..c2f00086e41f 100644
--- a/SU2_DOT/src/meson.build
+++ b/SU2_DOT/src/meson.build
@@ -1,7 +1,7 @@
 su2_dot_src = ['SU2_DOT.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output/output_structure.cpp',
-				       'output/output_baseline.cpp',
+                                       'output/COutput.cpp',
+				       'output/CBaselineOutput.cpp',
 				       'output/output_csv.cpp',
 				       'output/output_structure_legacy.cpp',
 				       'output/output_cgns.cpp',
diff --git a/SU2_SOL/include/SU2_SOL.hpp b/SU2_SOL/include/SU2_SOL.hpp
index 3229596e9034..bea7e3e44625 100644
--- a/SU2_SOL/include/SU2_SOL.hpp
+++ b/SU2_SOL/include/SU2_SOL.hpp
@@ -43,7 +43,7 @@
 #include <ctime>
 
 #include "../../SU2_CFD/include/solver_structure.hpp"
-#include "../../SU2_CFD/include/output/output_baseline.hpp"
+#include "../../SU2_CFD/include/output/CBaselineOutput.hpp"
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 
diff --git a/SU2_SOL/src/meson.build b/SU2_SOL/src/meson.build
index 1e9f4c453d76..fb70f8110690 100644
--- a/SU2_SOL/src/meson.build
+++ b/SU2_SOL/src/meson.build
@@ -1,8 +1,8 @@
 su2_sol_src = ['SU2_SOL.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
-                                       'output/output_structure.cpp',
+                                       'output/COutput.cpp',
                                        'output/output_structure_legacy.cpp',
-				       'output/output_baseline.cpp',
+				       'output/CBaselineOutput.cpp',
 				       'output/output_csv.cpp',
 				       'output/output_cgns.cpp',
 				       'output/output_tecplot.cpp',

From 0be4b4ad1564b259773886f0b77c893fd48451f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 10:23:25 +0200
Subject: [PATCH 275/539] Removed old tecplot and paraview writing routines

---
 SU2_CFD/include/output/COutput.hpp           |   18 -
 SU2_CFD/include/output/CVolumeFileWriter.hpp |    4 -
 SU2_CFD/src/driver_structure.cpp             |    4 +-
 SU2_CFD/src/output/output_paraview.cpp       | 1885 --------
 SU2_CFD/src/output/output_tecplot.cpp        | 4068 ++++--------------
 5 files changed, 753 insertions(+), 5226 deletions(-)
 delete mode 100644 SU2_CFD/include/output/CVolumeFileWriter.hpp

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index a82b9d5d2d0d..1ba175a3d422 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -505,24 +505,6 @@ class COutput {
    */
   void SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
   
-  /*!
-   * \brief Write a Paraview ASCII solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   */
-  void SetParaview_ASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-
-  /*!
-   * \brief Write a Paraview ASCII solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   */
-  void SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol, bool new_file);
-
   /*!
    * \brief Write a Paraview ASCII solution file with parallel output.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/CVolumeFileWriter.hpp b/SU2_CFD/include/output/CVolumeFileWriter.hpp
deleted file mode 100644
index 695aa35332d4..000000000000
--- a/SU2_CFD/include/output/CVolumeFileWriter.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef CFILEWRITER_HPP
-#define CFILEWRITER_HPP
-
-#endif // CFILEWRITER_HPP
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index cb7d97a645cf..a31fe8b49df0 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -859,10 +859,10 @@ void CDriver::Input_Preprocessing(SU2_Comm MPICommunicator, bool val_periodic) {
         cout  << endl << "Parsing sub-config file for zone " << iZone << endl;
       }
       strcpy(zone_file_name, driver_config->GetConfigFilename(iZone).c_str());
-      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_CFD, iZone, nZone, false);
+      config_container[iZone] = new CConfig(driver_config, zone_file_name, SU2_CFD, iZone, nZone, true);
     }
     else{
-      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_CFD, iZone, nZone, false);
+      config_container[iZone] = new CConfig(driver_config, config_file_name, SU2_CFD, iZone, nZone, true);
     }
 
     /*--- Set the MPI communicator ---*/
diff --git a/SU2_CFD/src/output/output_paraview.cpp b/SU2_CFD/src/output/output_paraview.cpp
index d51af828c41b..9483290f3b53 100644
--- a/SU2_CFD/src/output/output_paraview.cpp
+++ b/SU2_CFD/src/output/output_paraview.cpp
@@ -72,1891 +72,6 @@ void SwapBytes(char *buffer,
   }
 }
 
-string GetVTKFilename(CConfig *config, unsigned short val_iZone,
-                      unsigned short val_nZone, bool surf_sol) {
-  
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  
-  unsigned long iExtIter = config->GetExtIter();
-  
-  bool adjoint = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  
-  char cstr[200], buffer[50];
-  string fileroot, fieldname;
-  ofstream Paraview_File;
-  
-  /*--- Write file name with extension ---*/
-  if (surf_sol) {
-    if (adjoint || disc_adj)
-      fileroot = config->GetSurfAdjCoeff_FileName();
-    else
-      fileroot = config->GetSurfCoeff_FileName();
-  }
-  else {
-    if (adjoint || disc_adj)
-      fileroot = config->GetAdj_FileName();
-    else
-      fileroot = config->GetVolume_FileName();
-  }
-  
-//  if (Kind_Solver == FEM_ELASTICITY) {
-//    if (surf_sol)
-//      fileroot = config->GetSurfStructure_FileName().c_str();
-//    else
-//      fileroot = config->GetStructure_FileName().c_str();
-//  }
-  
-//  if (Kind_Solver == HEAT_EQUATION_FVM) {
-//    if (surf_sol) fileroot = config->GetSurfHeat_FileName().c_str();
-//    else fileroot = config->GetHeat_FileName().c_str();
-//  }
-  
-  if (config->GetKind_SU2() == SU2_DOT) {
-    if (surf_sol)
-      fileroot = config->GetSurfSens_FileName();
-    else
-      fileroot = config->GetVolSens_FileName();
-  }
-  
-  strcpy (cstr, fileroot.c_str());
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-  
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS ||
-       Kind_Solver == DISC_ADJ_EULER || Kind_Solver == DISC_ADJ_NAVIER_STOKES || Kind_Solver == DISC_ADJ_RANS ||
-       Kind_Solver == FEM_ELASTICITY || Kind_Solver == HEAT_EQUATION_FVM) &&
-      (val_nZone > 1) &&
-      (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    if (SU2_TYPE::Int(val_iZone) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 10) && (SU2_TYPE::Int(val_iZone) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 100) && (SU2_TYPE::Int(val_iZone) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 1000) && (SU2_TYPE::Int(val_iZone) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(val_iZone));
-    if (SU2_TYPE::Int(val_iZone) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(val_iZone));
-    
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-    
-  } else if (config->GetDynamic_Analysis() && config->GetWrt_Dynamic()) {
-    if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-  } else {
-    SPRINTF (buffer, ".vtk");
-  }
-  
-  strcat(cstr, buffer);
-  string filename = cstr;
-  return filename;
-}
-
-void COutput::SetParaview_ASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-    
-  unsigned short iDim, iVar, nDim = geometry->GetnDim();
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  unsigned short iInst = config->GetiInst();
-    
-  unsigned long iPoint, iElem, iNode;
-  unsigned long iExtIter = config->GetExtIter();
-  unsigned long *LocalIndex = NULL;
-  bool *SurfacePoint = NULL;
-  
-  unsigned long nSurf_Elem_Storage;
-  unsigned long nGlobal_Elem_Storage;
-  
-  bool grid_movement  = config->GetGrid_Movement();
-  bool adjoint = config->GetContinuous_Adjoint();
-  bool disc_adj = config->GetDiscrete_Adjoint();
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-
-
-  char cstr[200], buffer[50];
-  string filename, fieldname;
-    
-  /*--- Write file name with extension ---*/
-  if (surf_sol) {
-    if ((adjoint || disc_adj) && (!disc_adj_fem))
-      filename = config->GetSurfAdjCoeff_FileName();
-    else
-      filename = config->GetSurfCoeff_FileName();
-  }
-  else {
-    if ((adjoint || disc_adj) && (!disc_adj_fem))
-      filename = config->GetAdj_FileName();
-    else
-      filename = config->GetVolume_FileName();
-  }
-  
-//  if (Kind_Solver == FEM_ELASTICITY) {
-//    if (surf_sol)
-//      filename = config->GetSurfStructure_FileName().c_str();
-//    else
-//      filename = config->GetStructure_FileName().c_str();
-//  }
-
-//  if (Kind_Solver == DISC_ADJ_FEM) {
-//    if (surf_sol)
-//      filename = config->GetAdjSurfStructure_FileName().c_str();
-//    else
-//      filename = config->GetAdjStructure_FileName().c_str();
-//  }
-
-//  if (Kind_Solver == HEAT_EQUATION_FVM) {
-//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-//    else filename = config->GetHeat_FileName().c_str();
-//  }
-  
-  if (config->GetKind_SU2() == SU2_DOT) {
-    if (surf_sol)
-      filename = config->GetSurfSens_FileName();
-    else
-      filename = config->GetVolSens_FileName();
-  }
-
-  strcpy (cstr, filename.c_str());
-
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS || 
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS ||
-       Kind_Solver == DISC_ADJ_EULER || Kind_Solver == DISC_ADJ_NAVIER_STOKES || Kind_Solver == DISC_ADJ_RANS ||
-       Kind_Solver == FEM_ELASTICITY || Kind_Solver == HEAT_EQUATION_FVM) &&
-      (val_nZone > 1) &&
-      (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-    
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    if (SU2_TYPE::Int(iInst) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iInst));
-    if ((SU2_TYPE::Int(iInst) >= 10) && (SU2_TYPE::Int(iInst) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iInst));
-    if ((SU2_TYPE::Int(iInst) >= 100) && (SU2_TYPE::Int(iInst) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iInst));
-    if ((SU2_TYPE::Int(iInst) >= 1000) && (SU2_TYPE::Int(iInst) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iInst));
-    if (SU2_TYPE::Int(iInst) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iInst));
-        
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-
-    } else if (config->GetDynamic_Analysis() && config->GetWrt_Dynamic()) {
-      if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-  } else {
-    SPRINTF (buffer, ".vtk");
-  }
-    
-  strcat(cstr, buffer);
-    
-  /*--- Open Paraview ASCII file and write the header. ---*/
-  ofstream Paraview_File;
-  Paraview_File.open(cstr, ios::out);
-  Paraview_File.precision(6);
-  Paraview_File << "# vtk DataFile Version 3.0\n";
-  Paraview_File << "vtk output\n";
-  Paraview_File << "ASCII\n";
-  Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
-
-  /*--- If it's a surface output, print only the points 
-   that are in the element list, change the numbering ---*/
-  
-  if (surf_sol) {
-        
-    LocalIndex = new unsigned long [nGlobal_Poin+1];
-    SurfacePoint = new bool [nGlobal_Poin+1];
-
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      SurfacePoint[Conn_Line[iNode+0]] = true;
-      SurfacePoint[Conn_Line[iNode+1]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-    }
-    
-    nSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      LocalIndex[iPoint] = 0;
-      if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-    }
-    
-  }
-  
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "POINTS "<< nSurf_Poin <<" double\n";
-  else Paraview_File << "POINTS "<< nGlobal_Poin <<" double\n";
-  
-  /*--- Write surface and volumetric solution data. ---*/
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (surf_sol) {
-      
-      if (LocalIndex[iPoint+1] != 0) {
-        
-          /*--- Write the node coordinates ---*/
-          if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-            for (iDim = 0; iDim < nDim; iDim++)
-              Paraview_File << scientific << Coords[iDim][iPoint] << "\t";
-            if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-          }
-          else {
-            for (iDim = 0; iDim < nDim; iDim++)
-              Paraview_File << scientific << Data[iDim][iPoint] << "\t";
-            if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-          }
-        
-      }
-      
-    } else {
-      
-        if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Coords[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-        else {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Data[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-        
-    }
-  }
-  
-  /*--- Write the header ---*/
-  nSurf_Elem_Storage = nGlobal_Line*3 +nGlobal_BoundTria*4 + nGlobal_BoundQuad*5;
-  nGlobal_Elem_Storage = nGlobal_Tria*4 + nGlobal_Quad*5 + nGlobal_Tetr*5 + nGlobal_Hexa*9 + nGlobal_Pris*7 + nGlobal_Pyra*6;
-  
-  if (surf_sol) Paraview_File << "\nCELLS " << nSurf_Elem << "\t" << nSurf_Elem_Storage << "\n";
-  else Paraview_File << "\nCELLS " << nGlobal_Elem << "\t" << nGlobal_Elem_Storage << "\n";
-  
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      Paraview_File << N_POINTS_LINE << "\t";
-      Paraview_File << LocalIndex[Conn_Line[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_Line[iNode+1]]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+1]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+2]]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+1]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+2]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+3]]-1 << "\t";
-    }
-    
-  }
-  else {
-    
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << Conn_Tria[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Tria[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tria[iNode+2]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << Conn_Quad[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+2]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+3]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      Paraview_File << N_POINTS_TETRAHEDRON << "\t";
-      Paraview_File << Conn_Tetr[iNode+0]-1 << "\t" << Conn_Tetr[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tetr[iNode+2]-1 << "\t" << Conn_Tetr[iNode+3]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      Paraview_File << N_POINTS_HEXAHEDRON << "\t";
-      Paraview_File << Conn_Hexa[iNode+0]-1 << "\t" << Conn_Hexa[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+2]-1 << "\t" << Conn_Hexa[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+4]-1 << "\t" << Conn_Hexa[iNode+5]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+6]-1 << "\t" << Conn_Hexa[iNode+7]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      Paraview_File << N_POINTS_PRISM << "\t";
-      Paraview_File << Conn_Pris[iNode+0]-1 << "\t" << Conn_Pris[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pris[iNode+2]-1 << "\t" << Conn_Pris[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pris[iNode+4]-1 << "\t" << Conn_Pris[iNode+5]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      Paraview_File << N_POINTS_PYRAMID << "\t";
-      Paraview_File << Conn_Pyra[iNode+0]-1 << "\t" << Conn_Pyra[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pyra[iNode+2]-1 << "\t" << Conn_Pyra[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pyra[iNode+4]-1 << "\t";
-    }
-  }
-  
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "\nCELL_TYPES " << nSurf_Elem << "\n";
-  else Paraview_File << "\nCELL_TYPES " << nGlobal_Elem << "\n";
-  
-  if (surf_sol) {
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) Paraview_File << "3\t";    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) Paraview_File << "5\t";    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) Paraview_File << "9\t";
-    
-  }
-  else {
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) Paraview_File << "5\t";
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) Paraview_File << "9\t";
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) Paraview_File << "10\t";
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) Paraview_File << "12\t";
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) Paraview_File << "13\t";
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) Paraview_File << "14\t";
-  }
-  
-  
-  
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "\nPOINT_DATA "<< nSurf_Poin <<"\n";
-  else Paraview_File << "\nPOINT_DATA "<< nGlobal_Poin <<"\n";
-  
-  unsigned short VarCounter = 0;
-  
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-    
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class. ---*/
-    for (unsigned short iField = 1; iField < config->fields.size(); iField++) {
-      
-      fieldname = config->fields[iField];
-
-      fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'), fieldname.end());
-
-      bool output_variable = true;
-      if (fieldname == "x") {
-        output_variable = false;
-        //skip
-        VarCounter++;
-      }
-      if (fieldname == "y")  {
-        output_variable = false;
-        //skip
-        VarCounter++;
-      }
-      if (fieldname == "z")  {
-        output_variable = false;
-        //skip
-        VarCounter++;
-      }
-
-      bool isVector = false;
-      size_t found = config->fields[iField].find("_x");
-      if (found!=string::npos) {
-        output_variable = true;
-        isVector = true;
-      }
-      found = config->fields[iField].find("_y");
-      if (found!=string::npos) {
-        output_variable = false;
-        //skip
-        VarCounter++;
-      }
-      found = config->fields[iField].find("_z");
-      if (found!=string::npos) {
-        output_variable = false;
-        //skip
-        VarCounter++;
-      }
-
-      if (output_variable && isVector) {
-
-        /*--- Several output variables should be written as vectors. ---*/
-
-        fieldname.erase(fieldname.end()-2,fieldname.end());
-
-        if (rank == MASTER_NODE) {
-          Paraview_File << "\nVECTORS " << fieldname << " double\n";
-        }
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter+0][iPoint] << "\t" << Data[VarCounter+1][iPoint] << "\t";
-              if (nDim == 3) Paraview_File << scientific << Data[VarCounter+2][iPoint] << "\t";
-              if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter+0][iPoint] << "\t" << Data[VarCounter+1][iPoint] << "\t";
-            if (nDim == 3) Paraview_File << scientific << Data[VarCounter+2][iPoint] << "\t";
-            if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-          }
-        }
-
-        VarCounter++;
-
-      }
-
-      else if (output_variable) {
-
-        Paraview_File << "\nSCALARS " << fieldname << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-
-        VarCounter++;
-        
-      }
-      
-    }
-    
-  } else {
-    
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-
-      if ((Kind_Solver == FEM_ELASTICITY) || (Kind_Solver == DISC_ADJ_FEM))
-        Paraview_File << "\nSCALARS Displacement_" << iVar+1 << " double 1\n";
-      else
-        Paraview_File << "\nSCALARS Conservative_" << iVar+1 << " double 1\n";
-      
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-    }
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        
-        Paraview_File << "\nSCALARS Limiter_" << iVar+1 << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-      }
-    }
-    
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        
-        Paraview_File << "\nSCALARS Residual_" << iVar+1 << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-      }
-    }
-    
-    /*--- Add names for any extra variables (this will need to be adjusted). ---*/
-    if (grid_movement && !fem) {
-      
-      Paraview_File << "\nSCALARS Grid_Velx double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Grid_Vely double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      if (nDim == 3) {
-        
-        Paraview_File << "\nSCALARS Grid_Velz double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-        
-      }
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      Paraview_File << "\nSCALARS Pressure double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Temperature double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS Pressure_Coefficient double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Mach double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-
-      Paraview_File << "\nSCALARS Laminar_Viscosity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Skin_Friction_Coefficient_X double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Skin_Friction_Coefficient_Y double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      if (nDim == 3) {
-        
-        Paraview_File << "\nSCALARS Skin_Friction_Coefficient_Z double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-        
-      }
-      
-      Paraview_File << "\nSCALARS Heat_Flux double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Y_Plus double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if (Kind_Solver == RANS) {
-      
-      Paraview_File << "\nSCALARS Eddy_Viscosity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if (( Kind_Solver == ADJ_EULER         ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES ) ||
-        ( Kind_Solver == ADJ_RANS          ) ||
-        ( Kind_Solver == DISC_ADJ_EULER         ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
-        ( Kind_Solver == DISC_ADJ_RANS          ) ) {
-      
-      Paraview_File << "\nSCALARS Surface_Sensitivity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    if  (( Kind_Solver == DISC_ADJ_EULER        ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES ) ||
-        ( Kind_Solver == DISC_ADJ_RANS          ) ) {
-
-      Paraview_File << "\nSCALARS Sensitivity_x double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS Sensitivity_y double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      if (nDim == 3) {
-        Paraview_File << "\nSCALARS Sensitivity_z double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (! surf_sol) {
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-      }
-    }
-
-    if (Kind_Solver == FEM_ELASTICITY) {
-
-       if (config->GetDynamic_Analysis() == DYNAMIC) {
-
-           Paraview_File << "\nSCALARS Velocity_1 double 1\n";
-           Paraview_File << "LOOKUP_TABLE default\n";
-
-           for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-              if (! surf_sol) {
-                Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-              }
-            }
-          VarCounter++;
-
-          Paraview_File << "\nSCALARS Velocity_2 double 1\n";
-          Paraview_File << "LOOKUP_TABLE default\n";
-
-          for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-             if (! surf_sol) {
-               Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-             }
-           }
-         VarCounter++;
-
-         if (nDim == 3) {
-
-           Paraview_File << "\nSCALARS Velocity_3 double 1\n";
-           Paraview_File << "LOOKUP_TABLE default\n";
-
-           for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-              if (! surf_sol) {
-               Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-              }
-            }
-            VarCounter++;
-         }
-
-         Paraview_File << "\nSCALARS Acceleration_1 double 1\n";
-         Paraview_File << "LOOKUP_TABLE default\n";
-
-         for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-            if (! surf_sol) {
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          }
-          VarCounter++;
-
-          Paraview_File << "\nSCALARS Acceleration_2 double 1\n";
-          Paraview_File << "LOOKUP_TABLE default\n";
-
-          for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-             if (! surf_sol) {
-               Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-             }
-           }
-         VarCounter++;
-
-         if (nDim == 3) {
-
-         Paraview_File << "\nSCALARS Acceleration_3 double 1\n";
-         Paraview_File << "LOOKUP_TABLE default\n";
-
-         for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-            if (! surf_sol) {
-             Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          }
-          VarCounter++;
-         }
-
-       }
-
-       Paraview_File << "\nSCALARS Sxx double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (! surf_sol) {
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS Syy double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-         if (! surf_sol) {
-           Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-         }
-       }
-     VarCounter++;
-
-     Paraview_File << "\nSCALARS Sxy double 1\n";
-     Paraview_File << "LOOKUP_TABLE default\n";
-
-     for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-    VarCounter++;
-
-    if (nDim == 3) {
-
-      Paraview_File << "\nSCALARS Szz double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-         if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-         }
-       }
-       VarCounter++;
-
-       Paraview_File << "\nSCALARS Sxz double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS Syz double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-       if (! surf_sol) {
-        Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-       }
-       }
-     VarCounter++;
-
-    }
-
-      Paraview_File << "\nSCALARS Von_Mises_Stress double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())) {
-
-      Paraview_File << "\nSCALARS CrossTerm_1 double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS CrossTerm_2 double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-
-      if (nDim == 3){
-
-        Paraview_File << "\nSCALARS CrossTerm_3 double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (! surf_sol) {
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-
-      }
-
-    }
-
-  }
-  
-  Paraview_File.close();
-  
-  if (surf_sol) delete [] LocalIndex;
-  
-}
-
-void COutput::SetParaview_MeshASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol, bool new_file) {
-  
-  unsigned short iDim, iVar, nDim = geometry->GetnDim();
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  
-  unsigned long iPoint, iElem, iNode;
-  unsigned long iExtIter = config->GetExtIter();
-  unsigned long *LocalIndex = NULL;
-  bool *SurfacePoint = NULL;
-  
-  unsigned long nSurf_Elem_Storage;
-  unsigned long nGlobal_Elem_Storage;
-  
-  bool grid_movement  = config->GetGrid_Movement();
-  bool adjoint = config->GetContinuous_Adjoint();
-  bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
-  
-  char cstr[200], buffer[50];
-  string filename, fieldname;
-  
-  /*--- Write file name with extension ---*/
-  
-  if (surf_sol) {
-    if (adjoint)
-      filename = config->GetSurfAdjCoeff_FileName();
-    else
-      filename = config->GetSurfCoeff_FileName();
-  }
-  else {
-    if (adjoint)
-      filename = config->GetAdj_FileName();
-    else
-      filename = config->GetVolume_FileName();
-  }
-  if (config->GetKind_SU2() == SU2_DEF) {
-    if (new_file) {
-      if (surf_sol) filename = "surface_grid";
-      else filename = "volumetric_grid";
-    }
-    else {
-      if (surf_sol) filename = "surface_grid_def";
-      else filename = "volumetric_grid_def";
-    }
-  }
-  
-//  if (Kind_Solver == FEM_ELASTICITY) {
-//    if (surf_sol)
-//      filename = config->GetSurfStructure_FileName().c_str();
-//    else {
-//      filename = config->GetStructure_FileName().c_str();
-//      if (!new_file) {
-//        filename = filename + "_def";
-//      }
-//    }
-//  }
-  
-  
-//  if (Kind_Solver == HEAT_EQUATION_FVM) {
-//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-//    else filename = config->GetHeat_FileName().c_str();
-//  }
-  
-  strcpy (cstr, filename.c_str());
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS || Kind_Solver == FEM_ELASTICITY || Kind_Solver == HEAT_EQUATION_FVM) &&
-      (val_nZone > 1) && (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-  if (((Kind_Solver == ADJ_EULER) || (Kind_Solver == ADJ_NAVIER_STOKES) || (Kind_Solver == ADJ_RANS)) &&
-      (val_nZone > 1) && (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    if (SU2_TYPE::Int(val_iZone) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 10) && (SU2_TYPE::Int(val_iZone) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 100) && (SU2_TYPE::Int(val_iZone) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 1000) && (SU2_TYPE::Int(val_iZone) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(val_iZone));
-    if (SU2_TYPE::Int(val_iZone) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(val_iZone));
-    
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));
-
-    } else if (config->GetDynamic_Analysis() && config->GetWrt_Dynamic()) {
-      if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.vtk", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.vtk", SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.vtk", SU2_TYPE::Int(iExtIter));  
-  } else {
-    SPRINTF (buffer, ".vtk");
-  }
-  
-  strcat(cstr, buffer);
-  
-  /*--- Open Paraview ASCII file and write the header. ---*/
-  ofstream Paraview_File;
-  Paraview_File.open(cstr, ios::out);
-  Paraview_File.precision(6);
-  Paraview_File << "# vtk DataFile Version 3.0\n";
-  Paraview_File << "vtk output\n";
-  Paraview_File << "ASCII\n";
-  if (config->GetKind_SU2()!=SU2_DEF) Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
-  else Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
-
-
-  /*--- If it's a surface output, print only the points
-   that are in the element list, change the numbering ---*/
-  
-  if (surf_sol) {
-    
-    LocalIndex = new unsigned long [nGlobal_Poin+1];
-    SurfacePoint = new bool [nGlobal_Poin+1];
-    
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      SurfacePoint[Conn_Line[iNode+0]] = true;
-      SurfacePoint[Conn_Line[iNode+1]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-    }
-    
-    nSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      LocalIndex[iPoint] = 0;
-      if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-    }
-    
-  }
-  
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "POINTS "<< nSurf_Poin <<" double\n";
-  else Paraview_File << "POINTS "<< nGlobal_Poin <<" double\n";
-  
-  /*--- Write surface and volumetric solution data. ---*/
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (surf_sol) {
-      
-      if (LocalIndex[iPoint+1] != 0) {
-        
-        /*--- Write the node coordinates ---*/
-        if (config->GetKind_SU2() != SU2_SOL) {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Coords[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-        else {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Data[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-        
-      }
-      
-    } else {
-      
-      if (config->GetKind_SU2() != SU2_SOL) {
-        for (iDim = 0; iDim < nDim; iDim++)
-          Paraview_File << scientific << Coords[iDim][iPoint] << "\t";
-        if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-      }
-      else {
-        for (iDim = 0; iDim < nDim; iDim++)
-          Paraview_File << scientific << Data[iDim][iPoint] << "\t";
-        if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-      }
-      
-    }
-  }
-  
-  /*--- Write the header ---*/
-  nSurf_Elem_Storage = nGlobal_Line*3 +nGlobal_BoundTria*4 + nGlobal_BoundQuad*5;
-  nGlobal_Elem_Storage = nGlobal_Tria*4 + nGlobal_Quad*5 + nGlobal_Tetr*5 + nGlobal_Hexa*9 + nGlobal_Pris*7 + nGlobal_Pyra*6;
-  
-  if (surf_sol) Paraview_File << "\nCELLS " << nSurf_Elem << "\t" << nSurf_Elem_Storage << "\n";
-  else Paraview_File << "\nCELLS " << nGlobal_Elem << "\t" << nGlobal_Elem_Storage << "\n";
-  
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      Paraview_File << N_POINTS_LINE << "\t";
-      Paraview_File << LocalIndex[Conn_Line[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_Line[iNode+1]]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+1]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundTria[iNode+2]]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+0]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+1]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+2]]-1 << "\t";
-      Paraview_File << LocalIndex[Conn_BoundQuad[iNode+3]]-1 << "\t";
-    }
-    
-  }
-  else {
-    
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << Conn_Tria[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Tria[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tria[iNode+2]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << Conn_Quad[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+2]-1 << "\t";
-      Paraview_File << Conn_Quad[iNode+3]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      Paraview_File << N_POINTS_TETRAHEDRON << "\t";
-      Paraview_File << Conn_Tetr[iNode+0]-1 << "\t" << Conn_Tetr[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tetr[iNode+2]-1 << "\t" << Conn_Tetr[iNode+3]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      Paraview_File << N_POINTS_HEXAHEDRON << "\t";
-      Paraview_File << Conn_Hexa[iNode+0]-1 << "\t" << Conn_Hexa[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+2]-1 << "\t" << Conn_Hexa[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+4]-1 << "\t" << Conn_Hexa[iNode+5]-1 << "\t";
-      Paraview_File << Conn_Hexa[iNode+6]-1 << "\t" << Conn_Hexa[iNode+7]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      Paraview_File << N_POINTS_PRISM << "\t";
-      Paraview_File << Conn_Pris[iNode+0]-1 << "\t" << Conn_Pris[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pris[iNode+2]-1 << "\t" << Conn_Pris[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pris[iNode+4]-1 << "\t" << Conn_Pris[iNode+5]-1 << "\t";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      Paraview_File << N_POINTS_PYRAMID << "\t";
-      Paraview_File << Conn_Pyra[iNode+0]-1 << "\t" << Conn_Pyra[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pyra[iNode+2]-1 << "\t" << Conn_Pyra[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pyra[iNode+4]-1 << "\t";
-    }
-  }
-  
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "\nCELL_TYPES " << nSurf_Elem << "\n";
-  else Paraview_File << "\nCELL_TYPES " << nGlobal_Elem << "\n";
-  
-  if (surf_sol) {
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) Paraview_File << "3\t";
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) Paraview_File << "5\t";
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) Paraview_File << "9\t";
-    
-  }
-  else {
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) Paraview_File << "5\t";
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) Paraview_File << "9\t";
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) Paraview_File << "10\t";
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) Paraview_File << "12\t";
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) Paraview_File << "13\t";
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) Paraview_File << "14\t";
-  }
-  
-  
-  
-  /*--- Write the header ---*/
-  if (config->GetKind_SU2() != SU2_DEF) {
-    if (surf_sol) Paraview_File << "\nPOINT_DATA "<< nSurf_Poin <<"\n";
-    else Paraview_File << "\nPOINT_DATA "<< nGlobal_Poin <<"\n";
-  }
-  
-  unsigned short VarCounter = 0;
-  
-  if (config->GetKind_SU2() == SU2_SOL) {
-    
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class. ---*/
-    for (unsigned short iField = 1; iField < config->fields.size(); iField++) {
-      
-      fieldname = config->fields[iField];
-      
-      bool output_variable = true;
-      size_t found = config->fields[iField].find("\"x\"");
-      if (found!=string::npos) output_variable = false;
-      found = config->fields[iField].find("\"y\"");
-      if (found!=string::npos) output_variable = false;
-      found = config->fields[iField].find("\"z\"");
-      if (found!=string::npos) output_variable = false;
-      
-      if (output_variable) {
-        fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'), fieldname.end());
-
-        Paraview_File << "\nSCALARS " << fieldname << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-      }
-      
-      VarCounter++;
-      
-      
-    }
-    
-  }
-  
-  else if (config->GetKind_SU2()!=SU2_DEF) {
-    
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-
-      if (Kind_Solver == FEM_ELASTICITY)
-        Paraview_File << "\nSCALARS Displacement_" << iVar+1 << " double 1\n";
-      else
-        Paraview_File << "\nSCALARS Conservative_" << iVar+1 << " double 1\n";
-      
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-    }
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        
-        Paraview_File << "\nSCALARS Limiter_" << iVar+1 << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-      }
-    }
-    
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        
-        Paraview_File << "\nSCALARS Residual_" << iVar+1 << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-      }
-    }
-    
-    /*--- Add names for any extra variables (this will need to be adjusted). ---*/
-    if (grid_movement && !fem) {
-      
-      Paraview_File << "\nSCALARS Grid_Velx double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Grid_Vely double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      if (nDim == 3) {
-        
-        Paraview_File << "\nSCALARS Grid_Velz double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-        
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (surf_sol) {
-            if (LocalIndex[iPoint+1] != 0) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-        
-      }
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      Paraview_File << "\nSCALARS Pressure double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Temperature double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Pressure_Coefficient double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Mach double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      
-      Paraview_File << "\nSCALARS Laminar_Viscosity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Skin_Friction_Coefficient double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Heat_Flux double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-      Paraview_File << "\nSCALARS Y_Plus double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if (Kind_Solver == RANS) {
-      
-      Paraview_File << "\nSCALARS Eddy_Viscosity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-    
-    if (( Kind_Solver == ADJ_EULER         ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES ) ||
-        ( Kind_Solver == ADJ_RANS          )   ) {
-      
-      Paraview_File << "\nSCALARS Surface_Sensitivity double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-      
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (surf_sol) {
-          if (LocalIndex[iPoint+1] != 0) {
-            /*--- Loop over the vars/residuals and write the values to file ---*/
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        } else {
-          /*--- Loop over the vars/residuals and write the values to file ---*/
-          Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-      }
-      VarCounter++;
-      
-    }
-
-    if (Kind_Solver == FEM_ELASTICITY) {
-
-        if (config->GetDynamic_Analysis() == DYNAMIC) {
-
-            Paraview_File << "\nSCALARS Velocity_1 double 1\n";
-            Paraview_File << "LOOKUP_TABLE default\n";
-
-            for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-               if (! surf_sol) {
-                 Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-               }
-             }
-           VarCounter++;
-
-           Paraview_File << "\nSCALARS Velocity_2 double 1\n";
-           Paraview_File << "LOOKUP_TABLE default\n";
-
-           for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-              if (! surf_sol) {
-                Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-              }
-            }
-          VarCounter++;
-
-          if (nDim == 3) {
-
-            Paraview_File << "\nSCALARS Velocity_3 double 1\n";
-            Paraview_File << "LOOKUP_TABLE default\n";
-
-            for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-               if (! surf_sol) {
-                Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-               }
-             }
-             VarCounter++;
-          }
-
-          Paraview_File << "\nSCALARS Acceleration_1 double 1\n";
-          Paraview_File << "LOOKUP_TABLE default\n";
-
-          for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-             if (! surf_sol) {
-               Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-             }
-           }
-           VarCounter++;
-
-           Paraview_File << "\nSCALARS Acceleration_2 double 1\n";
-           Paraview_File << "LOOKUP_TABLE default\n";
-
-           for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-              if (! surf_sol) {
-                Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-              }
-            }
-          VarCounter++;
-
-          if (nDim == 3) {
-
-          Paraview_File << "\nSCALARS Acceleration_3 double 1\n";
-          Paraview_File << "LOOKUP_TABLE default\n";
-
-          for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-             if (! surf_sol) {
-              Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-             }
-           }
-           VarCounter++;
-          }
-
-        }
-
-        Paraview_File << "\nSCALARS Sxx double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-           if (! surf_sol) {
-             Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-           }
-         }
-       VarCounter++;
-
-       Paraview_File << "\nSCALARS Syy double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (! surf_sol) {
-            Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-      VarCounter++;
-
-      Paraview_File << "\nSCALARS Sxy double 1\n";
-      Paraview_File << "LOOKUP_TABLE default\n";
-
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-         if (! surf_sol) {
-           Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-         }
-       }
-     VarCounter++;
-
-     if (nDim == 3) {
-
-       Paraview_File << "\nSCALARS Szz double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          if (! surf_sol) {
-           Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-          }
-        }
-        VarCounter++;
-
-        Paraview_File << "\nSCALARS Sxz double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-         if (! surf_sol) {
-           Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-         }
-       }
-       VarCounter++;
-
-       Paraview_File << "\nSCALARS Syz double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        if (! surf_sol) {
-         Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-        }
-        }
-      VarCounter++;
-
-     }
-
-       Paraview_File << "\nSCALARS Von_Mises_Stress double 1\n";
-       Paraview_File << "LOOKUP_TABLE default\n";
-
-       for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-         if (surf_sol) {
-           if (LocalIndex[iPoint+1] != 0) {
-             /*--- Loop over the vars/residuals and write the values to file ---*/
-             Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-           }
-         } else {
-           /*--- Loop over the vars/residuals and write the values to file ---*/
-           Paraview_File << scientific << Data[VarCounter][iPoint] << "\t";
-         }
-       }
-       VarCounter++;
-
-     }
-
-
-  }
-  
-  Paraview_File.close();
-  
-  if (surf_sol)  delete [] LocalIndex;
-  if (SurfacePoint != NULL) delete [] SurfacePoint;
-  
-}
-
 void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
 
   unsigned short iDim, nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output/output_tecplot.cpp b/SU2_CFD/src/output/output_tecplot.cpp
index c2c113331816..3b87f863b9c8 100644
--- a/SU2_CFD/src/output/output_tecplot.cpp
+++ b/SU2_CFD/src/output/output_tecplot.cpp
@@ -35,3464 +35,898 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
 
-void COutput::SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
+void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
   
-  unsigned short iDim, iVar, nDim = geometry->GetnDim();
-  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short iVar, nDim = geometry->GetnDim();
   
   unsigned long iPoint, iElem, iNode;
   unsigned long iExtIter = config->GetExtIter();
-  unsigned long *LocalIndex = NULL;
-  bool *SurfacePoint = NULL;
-  
-  bool grid_movement  = config->GetGrid_Movement();
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-
-  char cstr[200], buffer[50];
-  string filename;
-  
-  /*--- Write file name with extension ---*/
-  
-  if (surf_sol) {
-    if (adjoint) filename = config->GetSurfAdjCoeff_FileName();
-    else filename = config->GetSurfCoeff_FileName();
-  }
-  else {
-    if (adjoint)
-    filename = config->GetAdj_FileName();
-    else filename = config->GetVolume_FileName();
-  }
-  
-//  if (Kind_Solver == FEM_ELASTICITY) {
-//    if (surf_sol) filename = config->GetSurfStructure_FileName().c_str();
-//    else filename = config->GetStructure_FileName().c_str();
-//  }
   
-//  if (Kind_Solver == HEAT_EQUATION_FVM) {
-//    if (surf_sol) filename = config->GetSurfHeat_FileName().c_str();
-//    else filename = config->GetHeat_FileName().c_str();
-//  }
-  
-  if (config->GetKind_SU2() == SU2_DOT) {
-    if (surf_sol) filename = config->GetSurfSens_FileName();
-    else filename = config->GetVolSens_FileName();
+  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
+    iExtIter = config->GetiInst();
   }
-  strcpy (cstr, filename.c_str());
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
   
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS ||
-       Kind_Solver == DISC_ADJ_EULER || Kind_Solver == DISC_ADJ_NAVIER_STOKES || Kind_Solver == DISC_ADJ_RANS ||
-       Kind_Solver == HEAT_EQUATION_FVM) &&
-      (val_nZone > 1) ) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
+  int iProcessor;
+
+  ofstream Tecplot_File;
   
- if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady() && config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.dat", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.dat", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(iExtIter));
-  }
-  else { SPRINTF (buffer, ".dat"); }
+  string filename;
   
-  strcat(cstr, buffer);
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".dat");
+  else filename          = config->GetFilename(VolumeFilename, ".dat");
   
   /*--- Open Tecplot ASCII file and write the header. ---*/
-  ofstream Tecplot_File;
-  Tecplot_File.open(cstr, ios::out);
-  Tecplot_File.precision(6);
-  if (surf_sol) Tecplot_File << "TITLE = \"Visualization of the surface solution\"" << endl;
-  else Tecplot_File << "TITLE = \"Visualization of the volumetric solution\"" << endl;
-  
-  /*--- Prepare the variable lists. ---*/
   
-  /*--- Write the list of the fields in the restart file.
-   Without including the PointID---*/
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
+  if (rank == MASTER_NODE) {
+    Tecplot_File.open(filename.c_str(), ios::out);
+    Tecplot_File.precision(6);
+    if (surf_sol) Tecplot_File << "TITLE = \"Visualization of the surface solution\"" << endl;
+    else Tecplot_File << "TITLE = \"Visualization of the volumetric solution\"" << endl;
     
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class. ---*/
     Tecplot_File << "VARIABLES = ";
-    nVar_Total = config->fields.size() - 1;
-    for (unsigned short iField = 1; iField < config->fields.size(); iField++) {
-      Tecplot_File << config->fields[iField] << " ";
+    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
+      Tecplot_File << "\"" << Variable_Names[iVar] << "\",";
     }
-    Tecplot_File << endl;
+    Tecplot_File << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
     
-  } else {
+    /*--- Write the header ---*/
     
+    Tecplot_File << "ZONE ";
+    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
+    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+      /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
+      su2double period = config->GetHarmonicBalance_Period();
+      su2double deltaT = period/(su2double)(config->GetnTimeInstances());
+      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
+    }
     if (nDim == 2) {
-      Tecplot_File << "VARIABLES = \"x\",\"y\"";
+      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
+      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
     } else {
-      Tecplot_File << "VARIABLES = \"x\",\"y\",\"z\"";
-    }
-    
-    /*--- Add names for conservative and residual variables ---*/
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-      Tecplot_File << ",\"Conservative_" << iVar+1 << "\"";
+      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
+      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
     }
-    
-    if (!config->GetLow_MemoryOutput()) {
-      
-      if (config->GetWrt_Limiters()) {
-        for (iVar = 0; iVar < nVar_Consv; iVar++) {
-          Tecplot_File << ",\"Limiter_" << iVar+1 << "\"";
-        }
-      }
-      if (config->GetWrt_Residuals()) {
-        for (iVar = 0; iVar < nVar_Consv; iVar++) {
-          Tecplot_File << ",\"Residual_" << iVar+1 << "\"";
-        }
-      }
-      
-      /*--- Add names for any extra variables (this will need to be adjusted). ---*/
-      if (grid_movement) {
-        if (nDim == 2) {
-          Tecplot_File << ",\"Grid_Velx\",\"Grid_Vely\"";
-        } else {
-          Tecplot_File << ",\"Grid_Velx\",\"Grid_Vely\",\"Grid_Velz\"";
-        }
-      }
-      
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        Tecplot_File << ",\"Pressure\",\"Temperature\",\"C<sub>p</sub>\",\"Mach\"";
-      }
-      
-      if (((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS))) {
-        if (nDim == 2) Tecplot_File << ", \"<greek>m</greek>\", \"C<sub>f</sub>_x\", \"C<sub>f</sub>_y\", \"h\", \"y<sup>+</sup>\"";
-        else Tecplot_File << ", \"<greek>m</greek>\", \"C<sub>f</sub>_x\", \"C<sub>f</sub>_y\", \"C<sub>f</sub>_z\", \"h\", \"y<sup>+</sup>\"";
-      }
-      
-      if (Kind_Solver == RANS) {
-        Tecplot_File << ", \"<greek>m</greek><sub>t</sub>\"";
-      }
-      
-      if (config->GetWrt_SharpEdges()) {
-        if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)))  {
-          Tecplot_File << ", \"Sharp_Edge_Dist\"";
-        }
-      }
-      
-      if (( Kind_Solver == ADJ_EULER              ) ||
-          ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-          ( Kind_Solver == ADJ_RANS               )   ) {
-        Tecplot_File << ", \"Surface_Sensitivity\", \"Solution_Sensor\"";
-      }
 
-      if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-          ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-          ( Kind_Solver == DISC_ADJ_RANS               )) {
-        Tecplot_File << ", \"Surface_Sensitivity\", \"Sensitivity_x\", \"Sensitivity_y\"";
-        if (geometry->GetnDim() == 3) {
-          Tecplot_File << ",\"Sensitivity_z\"";
-        }
-      }
-      
-      if (Kind_Solver == FEM_ELASTICITY) {
-        Tecplot_File << ", \"Von_Mises_Stress\"";
-      }
-      
-      if (config->GetExtraOutput()) {
-        string *headings = NULL;
-        //if (Kind_Solver == RANS) {
-        headings = solver[TURB_SOL]->OutputHeadingNames;
-        //}
-        for (iVar = 0; iVar < nVar_Extra; iVar++) {
-          //Tecplot_File << ", \"ExtraOutput_" << iVar+1<<"\"";
-          if (headings == NULL) {
-            Tecplot_File << ", \"ExtraOutput_" << iVar+1<<"\"";
-          } else {
-            Tecplot_File << ", \""<< headings[iVar] <<"\"";
-          }
-        }
-      }
-    }
-    
-    Tecplot_File << endl;
+    Tecplot_File.close();
     
   }
   
-  /*--- If it's a surface output, print only the points
-   that are in the element list, change the numbering ---*/
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
   
-  if (surf_sol) {
-    
-    LocalIndex = new unsigned long [nGlobal_Poin+1];
-    SurfacePoint = new bool [nGlobal_Poin+1];
-    
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      SurfacePoint[Conn_Line[iNode+0]] = true;
-      SurfacePoint[Conn_Line[iNode+1]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-    }
-    
-    nSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      LocalIndex[iPoint] = 0;
-      if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-    }
-    
-  }
+  /*--- Each processor opens the file. ---*/
   
-  /*--- Write the header ---*/
-  Tecplot_File << "ZONE ";
-  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
-  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-    su2double period = config->GetHarmonicBalance_Period();
-    su2double deltaT = period/(su2double)(config->GetnTimeInstances());
-    Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
-  }
+  Tecplot_File.open(filename.c_str(), ios::out | ios::app);
   
-  if (nDim == 2) {
-    if (surf_sol) Tecplot_File << "NODES= "<< nSurf_Poin <<", ELEMENTS= "<< nSurf_Elem <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
-    else Tecplot_File << "NODES= "<< nGlobal_Poin <<", ELEMENTS= "<< nGlobal_Elem <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-  } else {
-    if (surf_sol) Tecplot_File << "NODES= "<< nSurf_Poin<<", ELEMENTS= "<< nSurf_Elem <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-    else Tecplot_File << "NODES= "<< nGlobal_Poin <<", ELEMENTS= "<< nGlobal_Elem <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
+  /*--- Write surface and volumetric solution data. ---*/
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      
+        /*--- Write the node data from this proc ---*/
+        
+        if (surf_sol) {
+            for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
+        for (iVar = 0; iVar < GlobalField_Counter; iVar++)
+          Tecplot_File << scientific << Parallel_Surf_Data[iVar][iPoint] << "\t";
+        Tecplot_File << endl;
+            
+          }
+        } else {
+          
+           for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+          for (iVar = 0; iVar < GlobalField_Counter; iVar++)
+            Tecplot_File << scientific << Parallel_Data[iVar][iPoint] << "\t";
+          Tecplot_File << endl;
+        }
+      }
+    }
+    Tecplot_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
   }
   
-  /*--- Write surface and volumetric solution data. ---*/
+  /*--- Write connectivity data. ---*/
   
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (surf_sol) {
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
       
-      if (LocalIndex[iPoint+1] != 0) {
+      if (surf_sol) {
         
-        /*--- Write the node coordinates ---*/
-        if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-          for (iDim = 0; iDim < nDim; iDim++)
-          Tecplot_File << scientific << Coords[iDim][iPoint] << "\t";
+        for (iElem = 0; iElem < nParallel_Line; iElem++) {
+          iNode = iElem*N_POINTS_LINE;
+          Tecplot_File << Conn_BoundLine_Par[iNode+0] << "\t";
+          Tecplot_File << Conn_BoundLine_Par[iNode+1] << "\n";
         }
         
-        /*--- Loop over the vars/residuals and write the values to file ---*/
-        for (iVar = 0; iVar < nVar_Total; iVar++)
-        Tecplot_File << scientific << Data[iVar][iPoint] << "\t";
+        for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
+          iNode = iElem*N_POINTS_TRIANGLE;
+          Tecplot_File << Conn_BoundTria_Par[iNode+0] << "\t";
+          Tecplot_File << Conn_BoundTria_Par[iNode+1] << "\t";
+          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\t";
+          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\n";
+        }
         
-        Tecplot_File << endl;
+        for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
+          iNode = iElem*N_POINTS_QUADRILATERAL;
+          Tecplot_File << Conn_BoundQuad_Par[iNode+0] << "\t";
+          Tecplot_File << Conn_BoundQuad_Par[iNode+1] << "\t";
+          Tecplot_File << Conn_BoundQuad_Par[iNode+2] << "\t";
+          Tecplot_File << Conn_BoundQuad_Par[iNode+3] << "\n";
+        }
         
+      } else {
+        
+      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+        iNode = iElem*N_POINTS_TRIANGLE;
+        Tecplot_File << Conn_Tria_Par[iNode+0] << "\t";
+        Tecplot_File << Conn_Tria_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Tria_Par[iNode+2] << "\t";
+        Tecplot_File << Conn_Tria_Par[iNode+2] << "\n";
       }
       
-    } else {
+      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+        iNode = iElem*N_POINTS_QUADRILATERAL;
+        Tecplot_File << Conn_Quad_Par[iNode+0] << "\t";
+        Tecplot_File << Conn_Quad_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Quad_Par[iNode+2] << "\t";
+        Tecplot_File << Conn_Quad_Par[iNode+3] << "\n";
+      }
       
-      /*--- Write the node coordinates ---*/
-      if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-        for (iDim = 0; iDim < nDim; iDim++)
-        Tecplot_File << scientific << Coords[iDim][iPoint] << "\t";
+      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+        iNode = iElem*N_POINTS_TETRAHEDRON;
+        Tecplot_File << Conn_Tetr_Par[iNode+0] << "\t" << Conn_Tetr_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Tetr_Par[iNode+2] << "\t" << Conn_Tetr_Par[iNode+2] << "\t";
+        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\t";
+        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\n";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+        iNode = iElem*N_POINTS_HEXAHEDRON;
+        Tecplot_File << Conn_Hexa_Par[iNode+0] << "\t" << Conn_Hexa_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Hexa_Par[iNode+2] << "\t" << Conn_Hexa_Par[iNode+3] << "\t";
+        Tecplot_File << Conn_Hexa_Par[iNode+4] << "\t" << Conn_Hexa_Par[iNode+5] << "\t";
+        Tecplot_File << Conn_Hexa_Par[iNode+6] << "\t" << Conn_Hexa_Par[iNode+7] << "\n";
       }
       
-      /*--- Loop over the vars/residuals and write the values to file ---*/
-      for (iVar = 0; iVar < nVar_Total; iVar++)
-      Tecplot_File << scientific << Data[iVar][iPoint] << "\t";
+      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+        iNode = iElem*N_POINTS_PRISM;
+        Tecplot_File << Conn_Pris_Par[iNode+0] << "\t" << Conn_Pris_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Pris_Par[iNode+1] << "\t" << Conn_Pris_Par[iNode+2] << "\t";
+        Tecplot_File << Conn_Pris_Par[iNode+3] << "\t" << Conn_Pris_Par[iNode+4] << "\t";
+        Tecplot_File << Conn_Pris_Par[iNode+4] << "\t" << Conn_Pris_Par[iNode+5] << "\n";
+      }
       
-      Tecplot_File << endl;
+      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+        iNode = iElem*N_POINTS_PYRAMID;
+        Tecplot_File << Conn_Pyra_Par[iNode+0] << "\t" << Conn_Pyra_Par[iNode+1] << "\t";
+        Tecplot_File << Conn_Pyra_Par[iNode+2] << "\t" << Conn_Pyra_Par[iNode+3] << "\t";
+        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\t";
+        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\n";
+      }
+      }
       
     }
-    
-  }
-  
-  
-  /*--- Write connectivity data. ---*/
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      Tecplot_File << LocalIndex[Conn_Line[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_Line[iNode+1]] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+1]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+2]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+2]] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+1]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+2]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+3]] << "\n";
-    }
-    
-  } else {
-    
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Tecplot_File << Conn_Tria[iNode+0] << "\t";
-      Tecplot_File << Conn_Tria[iNode+1] << "\t";
-      Tecplot_File << Conn_Tria[iNode+2] << "\t";
-      Tecplot_File << Conn_Tria[iNode+2] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Tecplot_File << Conn_Quad[iNode+0] << "\t";
-      Tecplot_File << Conn_Quad[iNode+1] << "\t";
-      Tecplot_File << Conn_Quad[iNode+2] << "\t";
-      Tecplot_File << Conn_Quad[iNode+3] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      Tecplot_File << Conn_Tetr[iNode+0] << "\t" << Conn_Tetr[iNode+1] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+2] << "\t" << Conn_Tetr[iNode+2] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      Tecplot_File << Conn_Hexa[iNode+0] << "\t" << Conn_Hexa[iNode+1] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+2] << "\t" << Conn_Hexa[iNode+3] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+4] << "\t" << Conn_Hexa[iNode+5] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+6] << "\t" << Conn_Hexa[iNode+7] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      Tecplot_File << Conn_Pris[iNode+0] << "\t" << Conn_Pris[iNode+1] << "\t";
-      Tecplot_File << Conn_Pris[iNode+1] << "\t" << Conn_Pris[iNode+2] << "\t";
-      Tecplot_File << Conn_Pris[iNode+3] << "\t" << Conn_Pris[iNode+4] << "\t";
-      Tecplot_File << Conn_Pris[iNode+4] << "\t" << Conn_Pris[iNode+5] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      Tecplot_File << Conn_Pyra[iNode+0] << "\t" << Conn_Pyra[iNode+1] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+2] << "\t" << Conn_Pyra[iNode+3] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\n";
-    }
+    Tecplot_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
   }
   
   Tecplot_File.close();
   
-  if (surf_sol) {
-    delete [] LocalIndex;
-    delete[] SurfacePoint;
-  }
-  
 }
 
-void COutput::SetTecplotASCII_Mesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool surf_sol, bool new_file) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, iElem, iNode;
-  unsigned long *LocalIndex = NULL;
-  bool *SurfacePoint = NULL;
-  char cstr[200];
-  ofstream Tecplot_File;
-
-  if (surf_sol) strcpy(cstr, "surface_grid");
-  else strcpy(cstr, "volumetric_grid");
-  
-  if (config->GetnZone() > 1){
-    char appstr[200];
-    SPRINTF(appstr, "_%u", val_iZone);
-    strcat(cstr, appstr);
-  }
+#ifdef HAVE_MPI
 
-  strcat(cstr,".dat");
+namespace
+{
 
-  /*--- Open Tecplot ASCII file and write the header. ---*/
-  
-  if (new_file) {
-    Tecplot_File.open(cstr, ios::out);
-    Tecplot_File.precision(6);
-    if (surf_sol) Tecplot_File << "TITLE = \"Visualization of the surface solution\"" << endl;
-    else Tecplot_File << "TITLE = \"Visualization of the volumetric solution\"" << endl;
-    
-    if (nDim == 2) Tecplot_File << "VARIABLES = \"x\",\"y\"";
-    else Tecplot_File << "VARIABLES = \"x\",\"y\",\"z\"";
-  }
-  else Tecplot_File.open(cstr, ios::out | ios::app);
-  Tecplot_File << endl;
-  
-  /*--- If it's a surface output, print only the points
-   that are in the element list, change the numbering ---*/
-  
-  if (surf_sol) {
-    
-    LocalIndex = new unsigned long [nGlobal_Poin+1];
-    SurfacePoint = new bool [nGlobal_Poin+1];
-    
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      SurfacePoint[Conn_Line[iNode+0]] = true;
-      SurfacePoint[Conn_Line[iNode+1]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-    }
-    
-    nSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      LocalIndex[iPoint] = 0;
-      if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-    }
-    
-  }
-  
-  /*--- Write the header ---*/
-  
-  Tecplot_File << "ZONE T= ";
-  if (new_file) Tecplot_File << "\"Original grid\", C=BLACK, ";
-  else Tecplot_File << "\"Deformed grid\", C=RED, ";
-  
-  if (nDim == 2) {
-    if (surf_sol) Tecplot_File << "NODES= "<< nSurf_Poin <<", ELEMENTS= "<< nSurf_Elem <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
-    else Tecplot_File << "NODES= "<< nGlobal_Poin <<", ELEMENTS= "<< nGlobal_Elem <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-  } else {
-    if (surf_sol) Tecplot_File << "NODES= "<< nSurf_Poin<<", ELEMENTS= "<< nSurf_Elem <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-    else Tecplot_File << "NODES= "<< nGlobal_Poin <<", ELEMENTS= "<< nGlobal_Elem <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
-  }
-  
-  /*--- Write surface and volumetric solution data. ---*/
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (surf_sol) {
-      
-      if (LocalIndex[iPoint+1] != 0) {
-        
-        /*--- Write the node coordinates ---*/
-          for (iDim = 0; iDim < nDim; iDim++)
-            Tecplot_File << scientific << Coords[iDim][iPoint] << "\t";
-        
-        Tecplot_File << endl;
-        
+/*!
+ * \brief Calculate the partitioning of nodes to determine:
+ * (a) For a given global node number, to which partition does it belong and what is its local node number; and
+ * (b) How many nodes are held by each partition.
+ */
+class NodePartitioner {
+public:
+  /*!
+   * \param[in] global_num_nodes - The total number of nodes being output
+   * \param[in] num_ranks - The number of MPI ranks involved in the output
+   */
+  NodePartitioner(unsigned long global_num_nodes, int num_ranks)
+    : m_num_ranks(num_ranks) {
+    /* rank i has (1-based) global nodes m_node_range[i] + 1 through m_node_range[i + 1] */
+    unsigned long nodes_per_rank = global_num_nodes / num_ranks;
+    unsigned long num_extra_nodes = global_num_nodes - nodes_per_rank * num_ranks;
+    m_node_range.resize(num_ranks + 1);
+    m_node_range[0] = 0;
+    for (int ii = 1; ii <= num_ranks; ii++) {
+      m_node_range[ii] = m_node_range[ii - 1] + nodes_per_rank;
+      if (num_extra_nodes > 0) {
+        ++m_node_range[ii];
+        --num_extra_nodes;
       }
-      
-    } else {
-      
-      /*--- Write the node coordinates ---*/
-
-      for (iDim = 0; iDim < nDim; iDim++)
-          Tecplot_File << scientific << Coords[iDim][iPoint] << "\t";
-      
-      
-      Tecplot_File << endl;
-      
-    }
-    
-  }
-  
-  
-  /*--- Write connectivity data. ---*/
-  
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      Tecplot_File << LocalIndex[Conn_Line[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_Line[iNode+1]] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+1]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+2]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundTria[iNode+2]] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+0]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+1]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+2]] << "\t";
-      Tecplot_File << LocalIndex[Conn_BoundQuad[iNode+3]] << "\n";
-    }
-    
-  } else {
-    
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Tecplot_File << Conn_Tria[iNode+0] << "\t";
-      Tecplot_File << Conn_Tria[iNode+1] << "\t";
-      Tecplot_File << Conn_Tria[iNode+2] << "\t";
-      Tecplot_File << Conn_Tria[iNode+2] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Tecplot_File << Conn_Quad[iNode+0] << "\t";
-      Tecplot_File << Conn_Quad[iNode+1] << "\t";
-      Tecplot_File << Conn_Quad[iNode+2] << "\t";
-      Tecplot_File << Conn_Quad[iNode+3] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      Tecplot_File << Conn_Tetr[iNode+0] << "\t" << Conn_Tetr[iNode+1] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+2] << "\t" << Conn_Tetr[iNode+2] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\t";
-      Tecplot_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      Tecplot_File << Conn_Hexa[iNode+0] << "\t" << Conn_Hexa[iNode+1] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+2] << "\t" << Conn_Hexa[iNode+3] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+4] << "\t" << Conn_Hexa[iNode+5] << "\t";
-      Tecplot_File << Conn_Hexa[iNode+6] << "\t" << Conn_Hexa[iNode+7] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      Tecplot_File << Conn_Pris[iNode+0] << "\t" << Conn_Pris[iNode+1] << "\t";
-      Tecplot_File << Conn_Pris[iNode+1] << "\t" << Conn_Pris[iNode+2] << "\t";
-      Tecplot_File << Conn_Pris[iNode+3] << "\t" << Conn_Pris[iNode+4] << "\t";
-      Tecplot_File << Conn_Pris[iNode+4] << "\t" << Conn_Pris[iNode+5] << "\n";
     }
-    
-    for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      Tecplot_File << Conn_Pyra[iNode+0] << "\t" << Conn_Pyra[iNode+1] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+2] << "\t" << Conn_Pyra[iNode+3] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\t";
-      Tecplot_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\n";
-    }
-  }
-  
-  Tecplot_File.close();
-  
-  if (surf_sol) {
-  	delete [] LocalIndex;
-  	delete [] SurfacePoint;
+    assert(m_node_range[num_ranks] == global_num_nodes);
   }
-  
-}
 
-void COutput::SetSTL_MeshASCII(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iElem, iNode;
-  char cstr[200];
-  ofstream STL_File;
-  su2double p[3] = {0.0,0.0,0.0}, u[3] = {0.0,0.0,0.0}, v[3] = {0.0,0.0,0.0}, n[3] = {0.0,0.0,0.0}, a;
-  unsigned long Point_0, Point_1, Point_2;
-  
-  /*---	STL format:
-   solid NAME
-   ...
-   facet normal 0.00 0.00 1.00
-   outer loop
-   vertex  2.00  2.00  0.00
-   vertex -1.00  1.00  0.00
-   vertex  0.00 -1.00  0.00
-   endloop
-   endfacet
-   ...
-   end solid
-   ---*/
-  
-  if (nDim == 3) {
-    
-    strcpy(cstr, "surface_grid.stl");
-    
-    /*--- Open STL ASCII file and write the header. ---*/
-    
-    STL_File.open(cstr, ios::out);
-    STL_File.precision(6);
-    STL_File << "solid surface_mesh" << endl;
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      
-      iNode = iElem*N_POINTS_TRIANGLE;
-      
-      /*--- Compute Normal vectors ---*/
-      
-      Point_0 = Conn_BoundTria[iNode+0]-1;
-      Point_1 = Conn_BoundTria[iNode+1]-1;
-      Point_2 = Conn_BoundTria[iNode+2]-1;
-      
-      for (iDim = 0; iDim < nDim; iDim++) {
-        p[0] = Coords[iDim][Point_0];
-        p[1] = Coords[iDim][Point_1];
-        p[2] = Coords[iDim][Point_2];
-        u[iDim] = p[1]-p[0];
-        v[iDim] = p[2]-p[0];
-      }
-      
-      n[0] = u[1]*v[2]-u[2]*v[1];
-      n[1] = u[2]*v[0]-u[0]*v[2];
-      n[2] = u[0]*v[1]-u[1]*v[0];
-      a = sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);
-      
-      /*--- Print normal vector ---*/
-      
-      STL_File << "  facet normal ";
-      for (iDim = 0; iDim < nDim; iDim++) {
-        STL_File << n[iDim]/a << " ";
-      }
-      STL_File << endl;
-      
-      /*--- Print nodes for facet ---*/
-      STL_File << "    outer loop" << endl;
-      
-      STL_File << "      vertex ";
-      for (iDim = 0; iDim < nDim; iDim++) STL_File << Coords[iDim][Point_0] << " ";
-      STL_File <<  endl;
-      
-      STL_File << "      vertex ";
-      for (iDim = 0; iDim < nDim; iDim++) STL_File << Coords[iDim][Point_1] << " ";
-      STL_File <<  endl;
-      
-      STL_File << "      vertex ";
-      for (iDim = 0; iDim < nDim; iDim++) STL_File << Coords[iDim][Point_2] << " ";
-      STL_File <<  endl;
-      
-      STL_File << "    endloop" << endl;
-      STL_File << "  endfacet" << endl;
-      
-    }
-    
-    //  for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-    //      iNode = iElem*N_POINTS_QUADRILATERAL;
-    //      STL_File << LocalIndex[Conn_BoundQuad[iNode+0]] << "\t";
-    //      STL_File << LocalIndex[Conn_BoundQuad[iNode+1]] << "\t";
-    //      STL_File << LocalIndex[Conn_BoundQuad[iNode+2]] << "\t";
-    //      STL_File << LocalIndex[Conn_BoundQuad[iNode+3]] << "\n";
-    //    }
-    
-    /*--- Done with Surface Mesh ---*/
-    
-    STL_File << "endsolid" << endl;
-    
-    STL_File.close();
-    
-    
+  /*!
+   * \brief Determine the MPI rank that owns a global node number and its corresponding local node number.
+   * \param global_node_number[in] - The global node number; global node numbers are sequential across all MPI ranks.
+   * \param owning_rank[out] - The MPI rank that owns (will output) the global node
+   * \param node_number[out] - The rank-local node number for the given global node number
+   */
+  void GetOwningRankAndNodeNumber(unsigned long global_node_number, int &owning_rank, unsigned long &node_number)
+  {
+    owning_rank = static_cast<int>(global_node_number / m_node_range[1]);
+    if (owning_rank >= m_num_ranks)
+      owning_rank = m_num_ranks - 1;
+    while(global_node_number > m_node_range[owning_rank + 1])
+      ++owning_rank;
+    while(global_node_number <= m_node_range[owning_rank])
+      --owning_rank;
+    node_number = global_node_number - m_node_range[owning_rank];
   }
-  
-}
 
-void COutput::SetCSV_MeshASCII(CConfig *config, CGeometry *geometry) {
-
-	short iStation, nStation;
-	unsigned short nDim = geometry->GetnDim();
-	unsigned long iVertex;
-	su2double *Plane_P0, *Plane_Normal;
-	vector<su2double> Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil, Variable_Airfoil;
-	ofstream csv_File;
-
-	if (nDim == 3) {
-
-		Plane_P0 = new su2double[3];
-		Plane_Normal = new su2double[3];
-
-		if (geometry->GetnDim() == 3) {
+  /*!
+   * \brief Determine the number of nodes to be output by a particular rank
+   * \param which_rank[in] - The MPI rank
+   * \ret - The number of nodes that will be output by the give MPI rank.
+   */
+  int64_t GetRankNumNodes(int which_rank)
+  {
+    return static_cast<int64_t>(m_node_range[which_rank + 1] - m_node_range[which_rank]);
+  }
 
-			nStation = config->GetnLocationStations();
+private:
+  int m_num_ranks;
+  vector<unsigned long> m_node_range;
+};
 
-			for (iStation = 0; iStation < nStation; iStation++) {
+int64_t GetHaloNodeNumber(unsigned long global_node_number, unsigned long last_local_node, vector<unsigned long> const &halo_node_list)
+{
+  vector<unsigned long>::const_iterator it = lower_bound(halo_node_list.begin(), halo_node_list.end(), global_node_number);
+  assert(it != halo_node_list.end());
+  assert(*it == global_node_number);
+  /* When C++11 is universally available, replace the following mouthful with "auto" */
+  iterator_traits<vector<unsigned long>::const_iterator>::difference_type offset = distance(halo_node_list.begin(), it);
+  assert(offset >= 0);
+  return (int64_t)(last_local_node + offset + 1);
+}
 
-				/*--- Read the values from the config file ---*/
+} /* namespace */
 
-				Plane_Normal[0] = 0.0; Plane_P0[0] = 0.0;
-				Plane_Normal[1] = 0.0; Plane_P0[1] = 0.0;
-				Plane_Normal[2] = 0.0; Plane_P0[2] = 0.0;
+#endif /* HAVE_MPI */
 
-     if (config->GetGeo_Description() == FUSELAGE) {
-       Plane_Normal[0] = 1.0;
-       Plane_P0[0] = config->GetLocationStations(iStation);
-     }
-     
-     if (config->GetGeo_Description() == NACELLE) {
-       Plane_Normal[0] = 0.0;
-       Plane_Normal[1] = -sin(config->GetLocationStations(iStation)*PI_NUMBER/180.0);
-       Plane_Normal[2] = cos(config->GetLocationStations(iStation)*PI_NUMBER/180.0);
-     }
-     
-     if (config->GetGeo_Description() == WING) {
-       Plane_Normal[1] = 1.0;
-       Plane_P0[1] = config->GetLocationStations(iStation);
-     }
+void COutput::WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
 
-				/*--- Compute the airfoil Stations (note that we feed in the Cp) ---*/
+#ifdef HAVE_TECIO
+  
+  /*--- Open Tecplot binary file. ---*/
+  
+  string filename;
+  
+  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".szplt");
+  else filename          = config->GetFilename(VolumeFilename, ".szplt");
 
-				geometry->ComputeAirfoil_Section(Plane_P0, Plane_Normal, -1E6, 1E6, -1E6, 1E6, -1E6, 1E6,
-                                     NULL, Xcoord_Airfoil, Ycoord_Airfoil, Zcoord_Airfoil,
-                                     Variable_Airfoil, true, config);
+  
+  string data_set_title = surf_sol
+    ? "Visualization of the surface solution"
+    : "Visualization of the volumetric solution";
 
-				if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() == 0)) {
-					cout << "Please check the config file, the station (" << Plane_P0[0] << ", " << Plane_P0[1] << ", " << Plane_P0[2] << ") has not been detected." << endl;
-				}
+  ostringstream tecplot_variable_names;
+  for (size_t iVar = 0; iVar < Variable_Names.size()-1; ++iVar) {
+    tecplot_variable_names << Variable_Names[iVar] << ",";
+  }
+  tecplot_variable_names << Variable_Names[Variable_Names.size()-1];
 
-				/*--- Write Cp at each Station (csv format) ---*/
+  void* file_handle = NULL;
+  int32_t err = tecFileWriterOpen(filename.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
+    FILEFORMAT_SZL, FILETYPE_FULL, (int32_t)FieldDataType_Double, NULL, &file_handle);
+  if (err) cout << "Error opening Tecplot file '" << filename << "'" << endl;
 
-				if ((rank == MASTER_NODE) && (Xcoord_Airfoil.size() != 0)) {
+#ifdef HAVE_MPI
+  err = tecMPIInitialize(file_handle, MPI_COMM_WORLD, MASTER_NODE);
+  if (err) cout << "Error initializing Tecplot parallel output." << endl;
+#endif
+  
+  /*--- Define the zone(s). For 2D, and for 3D surfaces, each rank outputs a separate zone. ---*/
 
-					if (iStation == 0) csv_File.open("surface_grid.csv", ios::out);
-					else csv_File.open("surface_grid.csv", ios::app);
+  int64_t num_nodes;
+  int64_t num_cells;
+  int32_t zone_type;
+  if (surf_sol) {
+    num_nodes = static_cast<int64_t>(nGlobal_Surf_Poin);
+    num_cells = static_cast<int64_t>(nSurf_Elem_Par);
+    if (geometry->GetnDim() == 2) 
+      zone_type = ZONETYPE_FELINESEG;
+    else
+      zone_type = ZONETYPE_FEQUADRILATERAL;
+  } else {
+    num_nodes = static_cast<int64_t>(nGlobal_Poin_Par);
+    num_cells = static_cast<int64_t>(nGlobal_Elem_Par);
+    if (geometry->GetnDim() == 2)
+      zone_type = ZONETYPE_FEQUADRILATERAL;
+    else
+      zone_type = ZONETYPE_FEBRICK;
+  }
 
-					/*--- Coordinates value ---*/
+  bool is_unsteady = false;
+  passivedouble solution_time = 0.0;
+  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    is_unsteady = true;
+    solution_time = SU2_TYPE::GetValue(config->GetDelta_UnstTime()*config->GetExtIter());
+  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    is_unsteady = true;
+    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
+    passivedouble period = SU2_TYPE::GetValue(config->GetHarmonicBalance_Period());
+    passivedouble deltaT = period/SU2_TYPE::GetValue(config->GetnTimeInstances());
+    solution_time = deltaT*val_iZone;
+  }
 
-					for (iVertex = 0; iVertex < Xcoord_Airfoil.size(); iVertex++) {
-						csv_File << Xcoord_Airfoil[iVertex] << " ," << Ycoord_Airfoil[iVertex] << " ," << Zcoord_Airfoil[iVertex];
-						if (iVertex == 0) { if (iStation == 0) csv_File << ", 2"; else csv_File << ", 1"; }
-						else csv_File << ", 0";
-						csv_File << endl;
-					}
+  int32_t zone;
+  vector<int32_t> value_locations(GlobalField_Counter, 1); /* Nodal variables. */
+  err = tecZoneCreateFE(file_handle, "Zone", zone_type, num_nodes, num_cells, NULL, NULL, &value_locations[0], NULL, 0, 0, 0, &zone);
+  if (err) cout << rank << ": Error creating Tecplot zone." << endl;
+  if (is_unsteady) {
+    err = tecZoneSetUnsteadyOptions(file_handle, zone, solution_time, config->GetExtIter() + 1);
+    if (err) cout << rank << ": Error setting Tecplot zone unsteady options." << std::endl;
+  }
 
-					csv_File.close();
+#ifdef HAVE_MPI
 
-				}
+  unsigned short iVar;
+  NodePartitioner node_partitioner(num_nodes, size);
+  set<unsigned long> halo_nodes;
+  vector<unsigned long> sorted_halo_nodes;
+  vector<passivedouble> halo_var_data;
+  vector<int> num_nodes_to_receive(size, 0);
+  vector<int> values_to_receive_displacements(size);
 
-			}
+  if (zone_type == ZONETYPE_FEBRICK) {
 
-		}
+    /* We output a single, partitioned zone where each rank outputs one partition. */
+    vector<int32_t> partition_owners;
+    partition_owners.reserve(size);
+    for (int32_t iRank = 0; iRank < size; ++iRank)
+      partition_owners.push_back(iRank);
+    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, size, &partition_owners[0]);
+    if (err) cout << rank << ": Error assigning MPI ranks for Tecplot zone partitions." << endl;
+  
+    /* Gather a list of nodes we refer to but are not outputting. */
 
-		/*--- Delete dynamically allocated memory ---*/
+    for (unsigned long i = 0; i < nParallel_Tria * N_POINTS_TRIANGLE; ++i)
+      if ((unsigned long)Conn_Tria_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tria_Par[i])
+        halo_nodes.insert(Conn_Tria_Par[i]);
+  
+    for (unsigned long i = 0; i < nParallel_Quad * N_POINTS_QUADRILATERAL; ++i)
+      if ((unsigned long)Conn_Quad_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Quad_Par[i])
+        halo_nodes.insert(Conn_Quad_Par[i]);
+ 
+    for (unsigned long i = 0; i < nParallel_Tetr * N_POINTS_TETRAHEDRON; ++i)
+      if ((unsigned long)Conn_Tetr_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tetr_Par[i])
+        halo_nodes.insert(Conn_Tetr_Par[i]);
 
-		delete[] Plane_P0;
-		delete[] Plane_Normal;
+    for (unsigned long i = 0; i < nParallel_Hexa * N_POINTS_HEXAHEDRON; ++i)
+      if ((unsigned long)Conn_Hexa_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Hexa_Par[i])
+        halo_nodes.insert(Conn_Hexa_Par[i]);
+      
+    for (unsigned long i = 0; i < nParallel_Pris * N_POINTS_PRISM; ++i)
+      if ((unsigned long)Conn_Pris_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pris_Par[i])
+        halo_nodes.insert(Conn_Pris_Par[i]);
+    
+    for (unsigned long i = 0; i < nParallel_Pyra * N_POINTS_PYRAMID; ++i)
+      if ((unsigned long)Conn_Pyra_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pyra_Par[i])
+        halo_nodes.insert(Conn_Pyra_Par[i]);
 
-	}
+    /* Sorted list of halo nodes for this MPI rank. */
+    sorted_halo_nodes.assign(halo_nodes.begin(), halo_nodes.end());
+        
+    /* Have to include all nodes our cells refer to or TecIO will barf, so add the halo node count to the number of local nodes. */
+    int64_t partition_num_nodes = end_node[rank] - beg_node[rank] + static_cast<int64_t>(halo_nodes.size());
+    int64_t partition_num_cells = nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
 
-}
+    /*--- We effectively tack the halo nodes onto the end of the node list for this partition.
+      TecIO will later replace them with references to nodes in neighboring partitions. */
+    size_t num_halo_nodes = sorted_halo_nodes.size();
+    vector<int64_t> halo_node_local_numbers(max((size_t)1, num_halo_nodes)); /* Min size 1 to avoid crashes when we access these vectors below. */
+    vector<int32_t> neighbor_partitions(max((size_t)1, num_halo_nodes));
+    vector<int64_t> neighbor_nodes(max((size_t)1, num_halo_nodes));
+    for(int64_t i = 0; i < static_cast<int64_t>(num_halo_nodes); ++i) {
+      halo_node_local_numbers[i] = end_node[rank] - beg_node[rank] + i + 1;
+      int owning_rank;
+      unsigned long node_number;
+      node_partitioner.GetOwningRankAndNodeNumber(sorted_halo_nodes[i], owning_rank, node_number);
+      neighbor_partitions[i] = owning_rank + 1; /* Partition numbers are 1-based. */
+      neighbor_nodes[i] = static_cast<int64_t>(node_number);
+    }
+    err = tecFEPartitionCreate64(file_handle, zone, rank + 1, partition_num_nodes, partition_num_cells,
+      static_cast<int64_t>(num_halo_nodes), &halo_node_local_numbers[0], &neighbor_partitions[0], &neighbor_nodes[0], 0, NULL);
+    if (err) cout << rank << ": Error creating Tecplot zone partition." << endl;
 
-void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-  
-  unsigned short iVar, nDim = geometry->GetnDim();
-  
-  unsigned long iPoint, iElem, iNode;
-  unsigned long iExtIter = config->GetExtIter();
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
-    iExtIter = config->GetiInst();
-  }
-  
-  int iProcessor;
+    /* Gather halo node data. First, tell each rank how many nodes' worth of data we need from them. */
+    for (size_t i = 0; i < num_halo_nodes; ++i)
+      ++num_nodes_to_receive[neighbor_partitions[i] - 1];
+    vector<int> num_nodes_to_send(size);
+    SU2_MPI::Alltoall(&num_nodes_to_receive[0], 1, MPI_INT, &num_nodes_to_send[0], 1, MPI_INT, MPI_COMM_WORLD);
 
-  ofstream Tecplot_File;
-  
-  string filename;
-  
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".dat");
-  else filename          = config->GetFilename(VolumeFilename, ".dat");
-  
-  /*--- Open Tecplot ASCII file and write the header. ---*/
-  
-  if (rank == MASTER_NODE) {
-    Tecplot_File.open(filename.c_str(), ios::out);
-    Tecplot_File.precision(6);
-    if (surf_sol) Tecplot_File << "TITLE = \"Visualization of the surface solution\"" << endl;
-    else Tecplot_File << "TITLE = \"Visualization of the volumetric solution\"" << endl;
-    
-    Tecplot_File << "VARIABLES = ";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      Tecplot_File << "\"" << Variable_Names[iVar] << "\",";
-    }
-    Tecplot_File << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    
-    /*--- Write the header ---*/
-    
-    Tecplot_File << "ZONE ";
-    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
-    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-      /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-      su2double period = config->GetHarmonicBalance_Period();
-      su2double deltaT = period/(su2double)(config->GetnTimeInstances());
-      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
-    }
-    if (nDim == 2) {
-      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
-      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-    } else {
-      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
+    /* Now send the global node numbers whose data we need,
+       and receive the same from all other ranks.
+       Each rank has globally consecutive node numbers,
+       so we can just parcel out sorted_halo_nodes for send. */
+    vector<int> nodes_to_send_displacements(size);
+    vector<int> nodes_to_receive_displacements(size);
+    nodes_to_send_displacements[0] = 0;
+    nodes_to_receive_displacements[0] = 0;
+    for(int iRank = 1; iRank < size; ++iRank) {
+      nodes_to_send_displacements[iRank] = nodes_to_send_displacements[iRank - 1] + num_nodes_to_send[iRank - 1];
+      nodes_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank - 1] + num_nodes_to_receive[iRank - 1];
     }
+    int total_num_nodes_to_send = nodes_to_send_displacements[size - 1] + num_nodes_to_send[size - 1];
+    vector<unsigned long> nodes_to_send(max(1, total_num_nodes_to_send));
 
-    Tecplot_File.close();
+    /* The terminology gets a bit confusing here. We're sending the node numbers
+       (sorted_halo_nodes) whose data we need to receive, and receiving
+       lists of nodes whose data we need to send. */
+    if (sorted_halo_nodes.empty()) sorted_halo_nodes.resize(1); /* Avoid crash. */
+    SU2_MPI::Alltoallv(&sorted_halo_nodes[0], &num_nodes_to_receive[0], &nodes_to_receive_displacements[0], MPI_UNSIGNED_LONG,
+                       &nodes_to_send[0],     &num_nodes_to_send[0],    &nodes_to_send_displacements[0],    MPI_UNSIGNED_LONG,
+                       MPI_COMM_WORLD);
     
+    /* Now actually send and receive the data */
+    vector<passivedouble> data_to_send(max(1, total_num_nodes_to_send * GlobalField_Counter));
+    halo_var_data.resize(max((size_t)1, GlobalField_Counter * num_halo_nodes));
+    vector<int> num_values_to_send(size);
+    vector<int> values_to_send_displacements(size);
+    vector<int> num_values_to_receive(size);
+    size_t index = 0;
+    for(int iRank = 0; iRank < size; ++iRank) {
+      /* We send and receive GlobalField_Counter values per node. */
+      num_values_to_send[iRank]              = num_nodes_to_send[iRank] * GlobalField_Counter;
+      values_to_send_displacements[iRank]    = nodes_to_send_displacements[iRank] * GlobalField_Counter;
+      num_values_to_receive[iRank]           = num_nodes_to_receive[iRank] * GlobalField_Counter;
+      values_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank] * GlobalField_Counter;
+      for(iVar = 0; iVar < GlobalField_Counter; ++iVar)
+        for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
+          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - beg_node[rank] - 1;
+          data_to_send[index++] = SU2_TYPE::GetValue(Parallel_Data[iVar][node_offset]);
+        }
+    }
+    SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
+                       &halo_var_data[0], &num_values_to_receive[0], &values_to_receive_displacements[0], MPI_DOUBLE,
+                       MPI_COMM_WORLD);
   }
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  
-  /*--- Each processor opens the file. ---*/
-  
-  Tecplot_File.open(filename.c_str(), ios::out | ios::app);
-  
+  else {
+    /* Zone will be gathered to and output by MASTER_NODE */
+    int32_t partition_owner = MASTER_NODE;
+    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, 1, &partition_owner);
+  }
+
   /*--- Write surface and volumetric solution data. ---*/
   
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      
-        /*--- Write the node data from this proc ---*/
-        
-        if (surf_sol) {
-            for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-          Tecplot_File << scientific << Parallel_Surf_Data[iVar][iPoint] << "\t";
-        Tecplot_File << endl;
-            
+  if (zone_type == ZONETYPE_FEBRICK) {
+    std::vector<passivedouble> values_to_write(nParallel_Poin);
+    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+      for(unsigned long i = 0; i < nParallel_Poin; ++i)
+        values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, nParallel_Poin, &values_to_write[0]);
+      if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
+      for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
+        if (num_nodes_to_receive[iRank] > 0) {
+          int var_data_offset = values_to_receive_displacements[iRank] + num_nodes_to_receive[iRank] * iVar;
+          err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, static_cast<int64_t>(num_nodes_to_receive[iRank]), &halo_var_data[var_data_offset]);
+          if (err) cout << rank << ": Error outputting Tecplot halo values." << endl;
+        }
+      }
+    }
+  } else {
+    if (rank == MASTER_NODE) {
+      vector<passivedouble> var_data;
+      vector<unsigned long> num_surface_points(size);
+      if (surf_sol)
+        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, &num_surface_points[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      for(int iRank = 0; iRank < size; ++iRank) {
+        int64_t rank_num_points;
+        if (surf_sol)
+          rank_num_points = num_surface_points[iRank];
+        else
+          rank_num_points = node_partitioner.GetRankNumNodes(iRank);
+        if (rank_num_points > 0) {
+          if (iRank == rank) { /* Output local data. */
+            std::vector<passivedouble> values_to_write;
+            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+              if (surf_sol) {
+                values_to_write.resize(nSurf_Poin_Par);
+                for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
+                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]);
+                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &values_to_write[0]);
+              }
+              else {
+                values_to_write.resize(rank_num_points);
+                for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
+                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
+                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]);
+              }
+              if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
+            }
+          }
+          else { /* Receive data from other rank. */
+            var_data.resize(max((int64_t)1, GlobalField_Counter * rank_num_points));
+            SU2_MPI::Recv(&var_data[0], GlobalField_Counter * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+              err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &var_data[iVar * rank_num_points]);
+              if (err) cout << rank << ": Error outputting Tecplot surface variable values." << endl;
+            }
           }
-        } else {
-          
-           for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-          for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-            Tecplot_File << scientific << Parallel_Data[iVar][iPoint] << "\t";
-          Tecplot_File << endl;
         }
       }
     }
-    Tecplot_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-  /*--- Write connectivity data. ---*/
-  
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      
-      if (surf_sol) {
-        
-        for (iElem = 0; iElem < nParallel_Line; iElem++) {
-          iNode = iElem*N_POINTS_LINE;
-          Tecplot_File << Conn_BoundLine_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundLine_Par[iNode+1] << "\n";
-        }
-        
-        for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          Tecplot_File << Conn_BoundTria_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+1] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\n";
-        }
-        
-        for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          Tecplot_File << Conn_BoundQuad_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+1] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+2] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+3] << "\n";
-        }
-        
-      } else {
-        
-      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-        iNode = iElem*N_POINTS_TRIANGLE;
-        Tecplot_File << Conn_Tria_Par[iNode+0] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+2] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-        iNode = iElem*N_POINTS_QUADRILATERAL;
-        Tecplot_File << Conn_Quad_Par[iNode+0] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+3] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-        iNode = iElem*N_POINTS_TETRAHEDRON;
-        Tecplot_File << Conn_Tetr_Par[iNode+0] << "\t" << Conn_Tetr_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+2] << "\t" << Conn_Tetr_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-        iNode = iElem*N_POINTS_HEXAHEDRON;
-        Tecplot_File << Conn_Hexa_Par[iNode+0] << "\t" << Conn_Hexa_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+2] << "\t" << Conn_Hexa_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+4] << "\t" << Conn_Hexa_Par[iNode+5] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+6] << "\t" << Conn_Hexa_Par[iNode+7] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-        iNode = iElem*N_POINTS_PRISM;
-        Tecplot_File << Conn_Pris_Par[iNode+0] << "\t" << Conn_Pris_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+1] << "\t" << Conn_Pris_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+3] << "\t" << Conn_Pris_Par[iNode+4] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+4] << "\t" << Conn_Pris_Par[iNode+5] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-        iNode = iElem*N_POINTS_PYRAMID;
-        Tecplot_File << Conn_Pyra_Par[iNode+0] << "\t" << Conn_Pyra_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+2] << "\t" << Conn_Pyra_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\n";
-      }
-      }
-      
+    else { /* Send data to MASTER_NODE */
+      if (surf_sol)
+        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      vector<passivedouble> var_data;
+      size_t var_data_size = GlobalField_Counter * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
+      var_data.reserve(var_data_size);
+      for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++)
+        if (surf_sol)
+          for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
+            var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
+        else
+          for(unsigned long i = 0; i < nParallel_Poin; ++i)
+            var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
+      if (var_data.size() > 0)
+        SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
     }
-    Tecplot_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
   }
-  
-  Tecplot_File.close();
-  
-}
 
-#ifdef HAVE_MPI
+#else
 
-namespace
-{
+  unsigned short iVar;
 
-/*!
- * \brief Calculate the partitioning of nodes to determine:
- * (a) For a given global node number, to which partition does it belong and what is its local node number; and
- * (b) How many nodes are held by each partition.
- */
-class NodePartitioner {
-public:
-  /*!
-   * \param[in] global_num_nodes - The total number of nodes being output
-   * \param[in] num_ranks - The number of MPI ranks involved in the output
-   */
-  NodePartitioner(unsigned long global_num_nodes, int num_ranks)
-    : m_num_ranks(num_ranks) {
-    /* rank i has (1-based) global nodes m_node_range[i] + 1 through m_node_range[i + 1] */
-    unsigned long nodes_per_rank = global_num_nodes / num_ranks;
-    unsigned long num_extra_nodes = global_num_nodes - nodes_per_rank * num_ranks;
-    m_node_range.resize(num_ranks + 1);
-    m_node_range[0] = 0;
-    for (int ii = 1; ii <= num_ranks; ii++) {
-      m_node_range[ii] = m_node_range[ii - 1] + nodes_per_rank;
-      if (num_extra_nodes > 0) {
-        ++m_node_range[ii];
-        --num_extra_nodes;
-      }
+  vector<passivedouble> var_data;
+  size_t var_data_size = nVar_Par * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
+  var_data.reserve(var_data_size);
+  
+  if (surf_sol) {
+    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+      for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
+        var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &var_data[iVar * nSurf_Poin_Par]);
+      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
+    }
+  } else {
+    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+      for(unsigned long i = 0; i < nParallel_Poin; ++i)
+        var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nParallel_Poin, &var_data[iVar * nParallel_Poin]);
+      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
     }
-    assert(m_node_range[num_ranks] == global_num_nodes);
-  }
-
-  /*!
-   * \brief Determine the MPI rank that owns a global node number and its corresponding local node number.
-   * \param global_node_number[in] - The global node number; global node numbers are sequential across all MPI ranks.
-   * \param owning_rank[out] - The MPI rank that owns (will output) the global node
-   * \param node_number[out] - The rank-local node number for the given global node number
-   */
-  void GetOwningRankAndNodeNumber(unsigned long global_node_number, int &owning_rank, unsigned long &node_number)
-  {
-    owning_rank = static_cast<int>(global_node_number / m_node_range[1]);
-    if (owning_rank >= m_num_ranks)
-      owning_rank = m_num_ranks - 1;
-    while(global_node_number > m_node_range[owning_rank + 1])
-      ++owning_rank;
-    while(global_node_number <= m_node_range[owning_rank])
-      --owning_rank;
-    node_number = global_node_number - m_node_range[owning_rank];
-  }
-
-  /*!
-   * \brief Determine the number of nodes to be output by a particular rank
-   * \param which_rank[in] - The MPI rank
-   * \ret - The number of nodes that will be output by the give MPI rank.
-   */
-  int64_t GetRankNumNodes(int which_rank)
-  {
-    return static_cast<int64_t>(m_node_range[which_rank + 1] - m_node_range[which_rank]);
   }
 
-private:
-  int m_num_ranks;
-  vector<unsigned long> m_node_range;
-};
-
-int64_t GetHaloNodeNumber(unsigned long global_node_number, unsigned long last_local_node, vector<unsigned long> const &halo_node_list)
-{
-  vector<unsigned long>::const_iterator it = lower_bound(halo_node_list.begin(), halo_node_list.end(), global_node_number);
-  assert(it != halo_node_list.end());
-  assert(*it == global_node_number);
-  /* When C++11 is universally available, replace the following mouthful with "auto" */
-  iterator_traits<vector<unsigned long>::const_iterator>::difference_type offset = distance(halo_node_list.begin(), it);
-  assert(offset >= 0);
-  return (int64_t)(last_local_node + offset + 1);
-}
-
-} /* namespace */
-
 #endif /* HAVE_MPI */
-
-void COutput::WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-
-#ifdef HAVE_TECIO
-  
-  /*--- Open Tecplot binary file. ---*/
-  
-  string filename;
   
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".szplt");
-  else filename          = config->GetFilename(VolumeFilename, ".szplt");
+  /*--- Write connectivity data. ---*/
 
+  unsigned long iElem, iNode;
   
-  string data_set_title = surf_sol
-    ? "Visualization of the surface solution"
-    : "Visualization of the volumetric solution";
+#ifdef HAVE_MPI
+  if (zone_type == ZONETYPE_FEBRICK) {
 
-  ostringstream tecplot_variable_names;
-  for (size_t iVar = 0; iVar < Variable_Names.size()-1; ++iVar) {
-    tecplot_variable_names << Variable_Names[iVar] << ",";
-  }
-  tecplot_variable_names << Variable_Names[Variable_Names.size()-1];
+    int64_t nodes[8];
 
-  void* file_handle = NULL;
-  int32_t err = tecFileWriterOpen(filename.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
-    FILEFORMAT_SZL, FILETYPE_FULL, (int32_t)FieldDataType_Double, NULL, &file_handle);
-  if (err) cout << "Error opening Tecplot file '" << filename << "'" << endl;
+    /**
+     *  Each rank writes node numbers relative to the partition it is outputting (starting with node number 1).
+     *  Ghost (halo) nodes identified above are numbered sequentially just beyond the end of the actual, local nodes.
+     *  Note that beg_node and end_node refer to zero-based node numbering, but Conn_* contain one-based node numbers.
+     */
+#define MAKE_LOCAL(n) beg_node[rank] < (unsigned long)n && (unsigned long)n <= end_node[rank] \
+  ? (int64_t)((unsigned long)n - beg_node[rank]) \
+  : GetHaloNodeNumber(n, end_node[rank] - beg_node[rank], sorted_halo_nodes)
 
-#ifdef HAVE_MPI
-  err = tecMPIInitialize(file_handle, MPI_COMM_WORLD, MASTER_NODE);
-  if (err) cout << "Error initializing Tecplot parallel output." << endl;
-#endif
-  
-  /*--- Define the zone(s). For 2D, and for 3D surfaces, each rank outputs a separate zone. ---*/
+    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
+      iNode = iElem*N_POINTS_TETRAHEDRON;
+      nodes[0] = MAKE_LOCAL(Conn_Tetr_Par[iNode+0]);
+      nodes[1] = MAKE_LOCAL(Conn_Tetr_Par[iNode+1]);
+      nodes[2] = MAKE_LOCAL(Conn_Tetr_Par[iNode+2]);
+      nodes[3] = nodes[2];
+      nodes[4] = MAKE_LOCAL(Conn_Tetr_Par[iNode+3]);
+      nodes[5] = nodes[4];
+      nodes[6] = nodes[4];
+      nodes[7] = nodes[4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
 
-  int64_t num_nodes;
-  int64_t num_cells;
-  int32_t zone_type;
-  if (surf_sol) {
-    num_nodes = static_cast<int64_t>(nGlobal_Surf_Poin);
-    num_cells = static_cast<int64_t>(nSurf_Elem_Par);
-    if (geometry->GetnDim() == 2) 
-      zone_type = ZONETYPE_FELINESEG;
-    else
-      zone_type = ZONETYPE_FEQUADRILATERAL;
-  } else {
-    num_nodes = static_cast<int64_t>(nGlobal_Poin_Par);
-    num_cells = static_cast<int64_t>(nGlobal_Elem_Par);
-    if (geometry->GetnDim() == 2)
-      zone_type = ZONETYPE_FEQUADRILATERAL;
-    else
-      zone_type = ZONETYPE_FEBRICK;
-  }
-
-  bool is_unsteady = false;
-  passivedouble solution_time = 0.0;
-  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    is_unsteady = true;
-    solution_time = SU2_TYPE::GetValue(config->GetDelta_UnstTime()*config->GetExtIter());
-  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    is_unsteady = true;
-    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-    passivedouble period = SU2_TYPE::GetValue(config->GetHarmonicBalance_Period());
-    passivedouble deltaT = period/SU2_TYPE::GetValue(config->GetnTimeInstances());
-    solution_time = deltaT*val_iZone;
-  }
-
-  int32_t zone;
-  vector<int32_t> value_locations(GlobalField_Counter, 1); /* Nodal variables. */
-  err = tecZoneCreateFE(file_handle, "Zone", zone_type, num_nodes, num_cells, NULL, NULL, &value_locations[0], NULL, 0, 0, 0, &zone);
-  if (err) cout << rank << ": Error creating Tecplot zone." << endl;
-  if (is_unsteady) {
-    err = tecZoneSetUnsteadyOptions(file_handle, zone, solution_time, config->GetExtIter() + 1);
-    if (err) cout << rank << ": Error setting Tecplot zone unsteady options." << std::endl;
-  }
-
-#ifdef HAVE_MPI
-
-  unsigned short iVar;
-  NodePartitioner node_partitioner(num_nodes, size);
-  set<unsigned long> halo_nodes;
-  vector<unsigned long> sorted_halo_nodes;
-  vector<passivedouble> halo_var_data;
-  vector<int> num_nodes_to_receive(size, 0);
-  vector<int> values_to_receive_displacements(size);
-
-  if (zone_type == ZONETYPE_FEBRICK) {
-
-    /* We output a single, partitioned zone where each rank outputs one partition. */
-    vector<int32_t> partition_owners;
-    partition_owners.reserve(size);
-    for (int32_t iRank = 0; iRank < size; ++iRank)
-      partition_owners.push_back(iRank);
-    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, size, &partition_owners[0]);
-    if (err) cout << rank << ": Error assigning MPI ranks for Tecplot zone partitions." << endl;
-  
-    /* Gather a list of nodes we refer to but are not outputting. */
-
-    for (unsigned long i = 0; i < nParallel_Tria * N_POINTS_TRIANGLE; ++i)
-      if ((unsigned long)Conn_Tria_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tria_Par[i])
-        halo_nodes.insert(Conn_Tria_Par[i]);
-  
-    for (unsigned long i = 0; i < nParallel_Quad * N_POINTS_QUADRILATERAL; ++i)
-      if ((unsigned long)Conn_Quad_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Quad_Par[i])
-        halo_nodes.insert(Conn_Quad_Par[i]);
- 
-    for (unsigned long i = 0; i < nParallel_Tetr * N_POINTS_TETRAHEDRON; ++i)
-      if ((unsigned long)Conn_Tetr_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tetr_Par[i])
-        halo_nodes.insert(Conn_Tetr_Par[i]);
-
-    for (unsigned long i = 0; i < nParallel_Hexa * N_POINTS_HEXAHEDRON; ++i)
-      if ((unsigned long)Conn_Hexa_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Hexa_Par[i])
-        halo_nodes.insert(Conn_Hexa_Par[i]);
-      
-    for (unsigned long i = 0; i < nParallel_Pris * N_POINTS_PRISM; ++i)
-      if ((unsigned long)Conn_Pris_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pris_Par[i])
-        halo_nodes.insert(Conn_Pris_Par[i]);
-    
-    for (unsigned long i = 0; i < nParallel_Pyra * N_POINTS_PYRAMID; ++i)
-      if ((unsigned long)Conn_Pyra_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pyra_Par[i])
-        halo_nodes.insert(Conn_Pyra_Par[i]);
-
-    /* Sorted list of halo nodes for this MPI rank. */
-    sorted_halo_nodes.assign(halo_nodes.begin(), halo_nodes.end());
-        
-    /* Have to include all nodes our cells refer to or TecIO will barf, so add the halo node count to the number of local nodes. */
-    int64_t partition_num_nodes = end_node[rank] - beg_node[rank] + static_cast<int64_t>(halo_nodes.size());
-    int64_t partition_num_cells = nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-
-    /*--- We effectively tack the halo nodes onto the end of the node list for this partition.
-      TecIO will later replace them with references to nodes in neighboring partitions. */
-    size_t num_halo_nodes = sorted_halo_nodes.size();
-    vector<int64_t> halo_node_local_numbers(max((size_t)1, num_halo_nodes)); /* Min size 1 to avoid crashes when we access these vectors below. */
-    vector<int32_t> neighbor_partitions(max((size_t)1, num_halo_nodes));
-    vector<int64_t> neighbor_nodes(max((size_t)1, num_halo_nodes));
-    for(int64_t i = 0; i < static_cast<int64_t>(num_halo_nodes); ++i) {
-      halo_node_local_numbers[i] = end_node[rank] - beg_node[rank] + i + 1;
-      int owning_rank;
-      unsigned long node_number;
-      node_partitioner.GetOwningRankAndNodeNumber(sorted_halo_nodes[i], owning_rank, node_number);
-      neighbor_partitions[i] = owning_rank + 1; /* Partition numbers are 1-based. */
-      neighbor_nodes[i] = static_cast<int64_t>(node_number);
-    }
-    err = tecFEPartitionCreate64(file_handle, zone, rank + 1, partition_num_nodes, partition_num_cells,
-      static_cast<int64_t>(num_halo_nodes), &halo_node_local_numbers[0], &neighbor_partitions[0], &neighbor_nodes[0], 0, NULL);
-    if (err) cout << rank << ": Error creating Tecplot zone partition." << endl;
-
-    /* Gather halo node data. First, tell each rank how many nodes' worth of data we need from them. */
-    for (size_t i = 0; i < num_halo_nodes; ++i)
-      ++num_nodes_to_receive[neighbor_partitions[i] - 1];
-    vector<int> num_nodes_to_send(size);
-    SU2_MPI::Alltoall(&num_nodes_to_receive[0], 1, MPI_INT, &num_nodes_to_send[0], 1, MPI_INT, MPI_COMM_WORLD);
-
-    /* Now send the global node numbers whose data we need,
-       and receive the same from all other ranks.
-       Each rank has globally consecutive node numbers,
-       so we can just parcel out sorted_halo_nodes for send. */
-    vector<int> nodes_to_send_displacements(size);
-    vector<int> nodes_to_receive_displacements(size);
-    nodes_to_send_displacements[0] = 0;
-    nodes_to_receive_displacements[0] = 0;
-    for(int iRank = 1; iRank < size; ++iRank) {
-      nodes_to_send_displacements[iRank] = nodes_to_send_displacements[iRank - 1] + num_nodes_to_send[iRank - 1];
-      nodes_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank - 1] + num_nodes_to_receive[iRank - 1];
-    }
-    int total_num_nodes_to_send = nodes_to_send_displacements[size - 1] + num_nodes_to_send[size - 1];
-    vector<unsigned long> nodes_to_send(max(1, total_num_nodes_to_send));
-
-    /* The terminology gets a bit confusing here. We're sending the node numbers
-       (sorted_halo_nodes) whose data we need to receive, and receiving
-       lists of nodes whose data we need to send. */
-    if (sorted_halo_nodes.empty()) sorted_halo_nodes.resize(1); /* Avoid crash. */
-    SU2_MPI::Alltoallv(&sorted_halo_nodes[0], &num_nodes_to_receive[0], &nodes_to_receive_displacements[0], MPI_UNSIGNED_LONG,
-                       &nodes_to_send[0],     &num_nodes_to_send[0],    &nodes_to_send_displacements[0],    MPI_UNSIGNED_LONG,
-                       MPI_COMM_WORLD);
-    
-    /* Now actually send and receive the data */
-    vector<passivedouble> data_to_send(max(1, total_num_nodes_to_send * GlobalField_Counter));
-    halo_var_data.resize(max((size_t)1, GlobalField_Counter * num_halo_nodes));
-    vector<int> num_values_to_send(size);
-    vector<int> values_to_send_displacements(size);
-    vector<int> num_values_to_receive(size);
-    size_t index = 0;
-    for(int iRank = 0; iRank < size; ++iRank) {
-      /* We send and receive GlobalField_Counter values per node. */
-      num_values_to_send[iRank]              = num_nodes_to_send[iRank] * GlobalField_Counter;
-      values_to_send_displacements[iRank]    = nodes_to_send_displacements[iRank] * GlobalField_Counter;
-      num_values_to_receive[iRank]           = num_nodes_to_receive[iRank] * GlobalField_Counter;
-      values_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank] * GlobalField_Counter;
-      for(iVar = 0; iVar < GlobalField_Counter; ++iVar)
-        for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
-          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - beg_node[rank] - 1;
-          data_to_send[index++] = SU2_TYPE::GetValue(Parallel_Data[iVar][node_offset]);
-        }
-    }
-    SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
-                       &halo_var_data[0], &num_values_to_receive[0], &values_to_receive_displacements[0], MPI_DOUBLE,
-                       MPI_COMM_WORLD);
-  }
-  else {
-    /* Zone will be gathered to and output by MASTER_NODE */
-    int32_t partition_owner = MASTER_NODE;
-    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, 1, &partition_owner);
-  }
-
-  /*--- Write surface and volumetric solution data. ---*/
-  
-  if (zone_type == ZONETYPE_FEBRICK) {
-    std::vector<passivedouble> values_to_write(nParallel_Poin);
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nParallel_Poin; ++i)
-        values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, nParallel_Poin, &values_to_write[0]);
-      if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
-      for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
-        if (num_nodes_to_receive[iRank] > 0) {
-          int var_data_offset = values_to_receive_displacements[iRank] + num_nodes_to_receive[iRank] * iVar;
-          err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, static_cast<int64_t>(num_nodes_to_receive[iRank]), &halo_var_data[var_data_offset]);
-          if (err) cout << rank << ": Error outputting Tecplot halo values." << endl;
-        }
-      }
-    }
-  } else {
-    if (rank == MASTER_NODE) {
-      vector<passivedouble> var_data;
-      vector<unsigned long> num_surface_points(size);
-      if (surf_sol)
-        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, &num_surface_points[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      for(int iRank = 0; iRank < size; ++iRank) {
-        int64_t rank_num_points;
-        if (surf_sol)
-          rank_num_points = num_surface_points[iRank];
-        else
-          rank_num_points = node_partitioner.GetRankNumNodes(iRank);
-        if (rank_num_points > 0) {
-          if (iRank == rank) { /* Output local data. */
-            std::vector<passivedouble> values_to_write;
-            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-              if (surf_sol) {
-                values_to_write.resize(nSurf_Poin_Par);
-                for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]);
-                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &values_to_write[0]);
-              }
-              else {
-                values_to_write.resize(rank_num_points);
-                for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
-                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
-                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]);
-              }
-              if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
-            }
-          }
-          else { /* Receive data from other rank. */
-            var_data.resize(max((int64_t)1, GlobalField_Counter * rank_num_points));
-            SU2_MPI::Recv(&var_data[0], GlobalField_Counter * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
-            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-              err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &var_data[iVar * rank_num_points]);
-              if (err) cout << rank << ": Error outputting Tecplot surface variable values." << endl;
-            }
-          }
-        }
-      }
-    }
-    else { /* Send data to MASTER_NODE */
-      if (surf_sol)
-        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<passivedouble> var_data;
-      size_t var_data_size = GlobalField_Counter * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
-      var_data.reserve(var_data_size);
-      for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++)
-        if (surf_sol)
-          for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-            var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
-        else
-          for(unsigned long i = 0; i < nParallel_Poin; ++i)
-            var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
-      if (var_data.size() > 0)
-        SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
-    }
-  }
-
-#else
-
-  unsigned short iVar;
-
-  vector<passivedouble> var_data;
-  size_t var_data_size = nVar_Par * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
-  var_data.reserve(var_data_size);
-  
-  if (surf_sol) {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &var_data[iVar * nSurf_Poin_Par]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
-  } else {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nParallel_Poin; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nParallel_Poin, &var_data[iVar * nParallel_Poin]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
-  }
-
-#endif /* HAVE_MPI */
-  
-  /*--- Write connectivity data. ---*/
-
-  unsigned long iElem, iNode;
-  
-#ifdef HAVE_MPI
-  if (zone_type == ZONETYPE_FEBRICK) {
-
-    int64_t nodes[8];
-
-    /**
-     *  Each rank writes node numbers relative to the partition it is outputting (starting with node number 1).
-     *  Ghost (halo) nodes identified above are numbered sequentially just beyond the end of the actual, local nodes.
-     *  Note that beg_node and end_node refer to zero-based node numbering, but Conn_* contain one-based node numbers.
-     */
-#define MAKE_LOCAL(n) beg_node[rank] < (unsigned long)n && (unsigned long)n <= end_node[rank] \
-  ? (int64_t)((unsigned long)n - beg_node[rank]) \
-  : GetHaloNodeNumber(n, end_node[rank] - beg_node[rank], sorted_halo_nodes)
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      nodes[0] = MAKE_LOCAL(Conn_Tetr_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Tetr_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Tetr_Par[iNode+2]);
-      nodes[3] = nodes[2];
-      nodes[4] = MAKE_LOCAL(Conn_Tetr_Par[iNode+3]);
-      nodes[5] = nodes[4];
-      nodes[6] = nodes[4];
-      nodes[7] = nodes[4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      nodes[0] = MAKE_LOCAL(Conn_Hexa_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Hexa_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Hexa_Par[iNode+2]);
-      nodes[3] = MAKE_LOCAL(Conn_Hexa_Par[iNode+3]);
-      nodes[4] = MAKE_LOCAL(Conn_Hexa_Par[iNode+4]);
-      nodes[5] = MAKE_LOCAL(Conn_Hexa_Par[iNode+5]);
-      nodes[6] = MAKE_LOCAL(Conn_Hexa_Par[iNode+6]);
-      nodes[7] = MAKE_LOCAL(Conn_Hexa_Par[iNode+7]);
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      nodes[0] = MAKE_LOCAL(Conn_Pris_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Pris_Par[iNode+1]);
-      nodes[2] = nodes[1];
-      nodes[3] = MAKE_LOCAL(Conn_Pris_Par[iNode+2]);
-      nodes[4] = MAKE_LOCAL(Conn_Pris_Par[iNode+3]);
-      nodes[5] = MAKE_LOCAL(Conn_Pris_Par[iNode+4]);
-      nodes[6] = nodes[5];
-      nodes[7] = MAKE_LOCAL(Conn_Pris_Par[iNode+5]);
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-    
-    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      nodes[0] = MAKE_LOCAL(Conn_Pyra_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Pyra_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Pyra_Par[iNode+2]);
-      nodes[3] = MAKE_LOCAL(Conn_Pyra_Par[iNode+3]);
-      nodes[4] = MAKE_LOCAL(Conn_Pyra_Par[iNode+4]);
-      nodes[5] = nodes[4];
-      nodes[6] = nodes[4];
-      nodes[7] = nodes[4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-  } else {
-    if (rank == MASTER_NODE) {
-
-      /* Non-hexahedral output by the master node. Output local data directly, and gather other data from the other ranks. */
-
-      int64_t nodes[4];
-
-      vector<unsigned long> connectivity_sizes(size);
-      unsigned long unused = 0;
-      SU2_MPI::Gather(&unused, 1, MPI_UNSIGNED_LONG, &connectivity_sizes[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<int64_t> connectivity;
-      for(int iRank = 0; iRank < size; ++iRank) {
-        if (iRank == rank) {
-          if (surf_sol) {
-            for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-              iNode = iElem*N_POINTS_LINE;
-              nodes[0] = Conn_BoundLine_Par[iNode+0];
-              nodes[1] = Conn_BoundLine_Par[iNode+1];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 2, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          
-            for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-              iNode = iElem*N_POINTS_TRIANGLE;
-              nodes[0] = Conn_BoundTria_Par[iNode+0];
-              nodes[1] = Conn_BoundTria_Par[iNode+1];
-              nodes[2] = Conn_BoundTria_Par[iNode+2];
-              nodes[3] = Conn_BoundTria_Par[iNode+2];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          
-            for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-              iNode = iElem*N_POINTS_QUADRILATERAL;
-              nodes[0] = Conn_BoundQuad_Par[iNode+0];
-              nodes[1] = Conn_BoundQuad_Par[iNode+1];
-              nodes[2] = Conn_BoundQuad_Par[iNode+2];
-              nodes[3] = Conn_BoundQuad_Par[iNode+3];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          } else {
-            for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-              iNode = iElem*N_POINTS_TRIANGLE;
-              nodes[0] = Conn_Tria_Par[iNode+0];
-              nodes[1] = Conn_Tria_Par[iNode+1];
-              nodes[2] = Conn_Tria_Par[iNode+2];
-              nodes[3] = Conn_Tria_Par[iNode+2];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-        
-            for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-              iNode = iElem*N_POINTS_QUADRILATERAL;
-              nodes[0] = Conn_Quad_Par[iNode+0];
-              nodes[1] = Conn_Quad_Par[iNode+1];
-              nodes[2] = Conn_Quad_Par[iNode+2];
-              nodes[3] = Conn_Quad_Par[iNode+3];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          }
-        } else { /* Receive node map and write out. */
-          connectivity.resize(max((unsigned long)1, connectivity_sizes[iRank]));
-          SU2_MPI::Recv(&connectivity[0], connectivity_sizes[iRank], MPI_UNSIGNED_LONG, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
-          err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, connectivity_sizes[iRank], &connectivity[0]);
-          if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-        }
-      }
-    } else {
-
-      /* Non-hexahedral output by non-master node. Send what we've got to the master node. */
-
-      unsigned long connectivity_size;
-      if (surf_sol)
-        connectivity_size = 2 * nParallel_Line + 4 * nParallel_BoundTria + 4 * nParallel_BoundQuad;
-      else
-        connectivity_size = 4 * (nParallel_Tria + nParallel_Quad);
-      SU2_MPI::Gather(&connectivity_size, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<int64_t> connectivity;
-      connectivity.reserve(connectivity_size);
-      if (surf_sol) {
-        for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-          iNode = iElem*N_POINTS_LINE;
-          connectivity.push_back(Conn_BoundLine_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundLine_Par[iNode+1]);
-        }
-      
-        for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          connectivity.push_back(Conn_BoundTria_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+1]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
-        }
-      
-        for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+1]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+2]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+3]);
-        }
-      } else {
-        for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          connectivity.push_back(Conn_Tria_Par[iNode+0]);
-          connectivity.push_back(Conn_Tria_Par[iNode+1]);
-          connectivity.push_back(Conn_Tria_Par[iNode+2]);
-          connectivity.push_back(Conn_Tria_Par[iNode+2]);
-        }
-    
-        for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          connectivity.push_back(Conn_Quad_Par[iNode+0]);
-          connectivity.push_back(Conn_Quad_Par[iNode+1]);
-          connectivity.push_back(Conn_Quad_Par[iNode+2]);
-          connectivity.push_back(Conn_Quad_Par[iNode+3]);
-        }
-      }
-      if (connectivity.empty()) connectivity.resize(1); /* Avoid crash */
-      SU2_MPI::Send(&connectivity[0], connectivity_size, MPI_UNSIGNED_LONG, MASTER_NODE, rank, MPI_COMM_WORLD);
-    }
-  }
-#else
-  if (surf_sol) {
-
-    int64_t nodes[4];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      nodes[0] = Conn_BoundLine_Par[iNode+0];
-      nodes[1] = Conn_BoundLine_Par[iNode+1];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 2, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_BoundTria_Par[iNode+0];
-      nodes[1] = Conn_BoundTria_Par[iNode+1];
-      nodes[2] = Conn_BoundTria_Par[iNode+2];
-      nodes[3] = Conn_BoundTria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_BoundQuad_Par[iNode+0];
-      nodes[1] = Conn_BoundQuad_Par[iNode+1];
-      nodes[2] = Conn_BoundQuad_Par[iNode+2];
-      nodes[3] = Conn_BoundQuad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-  } else {
-
-    int64_t nodes[8];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_Tria_Par[iNode+0];
-      nodes[1] = Conn_Tria_Par[iNode+1];
-      nodes[2] = Conn_Tria_Par[iNode+2];
-      nodes[3] = Conn_Tria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_Quad_Par[iNode+0];
-      nodes[1] = Conn_Quad_Par[iNode+1];
-      nodes[2] = Conn_Quad_Par[iNode+2];
-      nodes[3] = Conn_Quad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      nodes[0] = Conn_Tetr_Par[iNode+0];
-      nodes[1] = Conn_Tetr_Par[iNode+1];
-      nodes[2] = Conn_Tetr_Par[iNode+2];
-      nodes[3] = Conn_Tetr_Par[iNode+2];
-      nodes[4] = Conn_Tetr_Par[iNode+3];
-      nodes[5] = Conn_Tetr_Par[iNode+3];
-      nodes[6] = Conn_Tetr_Par[iNode+3];
-      nodes[7] = Conn_Tetr_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      nodes[0] = Conn_Hexa_Par[iNode+0];
-      nodes[1] = Conn_Hexa_Par[iNode+1];
-      nodes[2] = Conn_Hexa_Par[iNode+2];
-      nodes[3] = Conn_Hexa_Par[iNode+3];
-      nodes[4] = Conn_Hexa_Par[iNode+4];
-      nodes[5] = Conn_Hexa_Par[iNode+5];
-      nodes[6] = Conn_Hexa_Par[iNode+6];
-      nodes[7] = Conn_Hexa_Par[iNode+7];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      nodes[0] = Conn_Pris_Par[iNode+0];
-      nodes[1] = Conn_Pris_Par[iNode+1];
-      nodes[2] = Conn_Pris_Par[iNode+1];
-      nodes[3] = Conn_Pris_Par[iNode+2];
-      nodes[4] = Conn_Pris_Par[iNode+3];
-      nodes[5] = Conn_Pris_Par[iNode+4];
-      nodes[6] = Conn_Pris_Par[iNode+4];
-      nodes[7] = Conn_Pris_Par[iNode+5];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-    
-    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      nodes[0] = Conn_Pyra_Par[iNode+0];
-      nodes[1] = Conn_Pyra_Par[iNode+1];
-      nodes[2] = Conn_Pyra_Par[iNode+2];
-      nodes[3] = Conn_Pyra_Par[iNode+3];
-      nodes[4] = Conn_Pyra_Par[iNode+4];
-      nodes[5] = Conn_Pyra_Par[iNode+4];
-      nodes[6] = Conn_Pyra_Par[iNode+4];
-      nodes[7] = Conn_Pyra_Par[iNode+4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-  }
-
-#endif
-  
-  err = tecFileWriterClose(&file_handle);
-  if (err) cout << rank << ": Error finishing Tecplot file output." << endl;
-  
-#endif /* HAVE_TECIO */
-
-}
-
-void COutput::SetTecplotBinary_DomainMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-#ifdef HAVE_TECIO
-  
-  passivedouble   t;
-  INTEGER4 i, err, Debug, NPts, NElm, N2DElm, NVolElm, IsDouble, KMax;
-  INTEGER4 ICellMax, JCellMax, KCellMax, ZoneType, StrandID, ParentZn, FileFormat, FileType;
-  INTEGER4 *ShareFromZone = NULL, IsBlock, NumFaceConnections, FaceNeighborMode, ShareConnectivityFromZone;
-  string buffer, variables;
-  stringstream file;
-  bool first_zone = true;
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  unsigned short dims = geometry->GetnDim();
-  enum     FileFormat { PLT = 0, SZPLT = 1 };
-  enum     FileType { FULL = 0, GRID = 1, SOLUTION = 2 };
-  enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
-  
-  /*--- Consistent data for Tecplot zones ---*/
-  
-  Debug            = 0;
-  IsDouble          = 1;
-  NPts            = (INTEGER4)nGlobal_Poin;
-  t              = 0.0;//iExtIter*config->GetDelta_UnstTimeND();
-  KMax            = 0;
-  ICellMax          = 0;
-  JCellMax          = 0;
-  KCellMax          = 0;
-  StrandID          = 0;//(INTEGER4)iExtIter;
-  ParentZn          = 0;
-  IsBlock            = 1;
-  NumFaceConnections      = 0;
-  FaceNeighborMode      = 0;
-  ShareConnectivityFromZone  = 0;
-  
-  /*--- Write Tecplot solution file ---*/
-  
-  if (!wrote_base_file) {
-    
-    file.str(string());
-
-    if (adjoint)
-      buffer = config->GetAdj_FileName();
-    else buffer = config->GetVolume_FileName();
-
-    if (config->GetKind_SU2() == SU2_DOT) {
-      buffer = config->GetVolSens_FileName();
-    }
-    
-    file << buffer << ".mesh.szplt";
-    FileFormat = SZPLT;
-    FileType = GRID;
-    
-    if (dims == 2) variables = "x y";
-    else if (dims == 3) variables = "x y z";
-    else cout << "Error: wrong number of dimensions: " << dims << endl;
-    
-    /*--- Open Tecplot file ---*/
-    err = TECINI142((char *)config->GetVolume_FileName().c_str(),
-                    (char *)variables.c_str(),
-                    (char *)file.str().c_str(),
-                    (char *)".",
-                    &FileFormat,
-                    &FileType,
-                    &Debug,
-                    &IsDouble);
-    if (err) cout << "Error in opening Tecplot file" << endl;
-    
-    first_zone = true;
-    
-    N2DElm = (INTEGER4)(nGlobal_Tria + nGlobal_Quad);
-    if (N2DElm > 0) {
-      
-      /*--- Write the zone header information ---*/
-      
-      if ((INTEGER4)nGlobal_Tria < N2DElm) {   /* Create a Quad zone with a mixed element types */
-
-      
-        ZoneType = FEQUADRILATERAL; NElm = N2DElm;
-      
-        err = TECZNE142((char*)"Mixed Elements",
-                        &ZoneType,
-                        &NPts,
-                        &NElm,
-                        &KMax,
-                        &ICellMax,
-                        &JCellMax,
-                        &KCellMax,
-                        &t,
-                        &StrandID,
-                        &ParentZn,
-                        &IsBlock,
-                        &NumFaceConnections,
-                        &FaceNeighborMode,
-                        0,         /* TotalNumFaceNodes */
-                        0,         /* NumConnectedBoundaryFaces */
-                        0,         /* TotalNumBoundaryConnections */
-                        NULL,      /* PassiveVarList */
-                        NULL,      /* ValueLocation */
-                        ShareFromZone,      /* ShareVarFromZone */
-                        &ShareConnectivityFromZone);
-        if (err) cout << "Error writing Tecplot zone data" << endl;
-
-
-      } else {   /* Create a Tria zone */
-
-        ZoneType = FETRIANGLE; NElm = (INTEGER4)nGlobal_Tria;
-      
-        err = TECZNE142((char*)"Triangle Elements",
-                        &ZoneType,
-                        &NPts,
-                        &NElm,
-                        &KMax,
-                        &ICellMax,
-                        &JCellMax,
-                        &KCellMax,
-                        &t,
-                        &StrandID,
-                        &ParentZn,
-                        &IsBlock,
-                        &NumFaceConnections,
-                        &FaceNeighborMode,
-                        0,         /* TotalNumFaceNodes */
-                        0,         /* NumConnectedBoundaryFaces */
-                        0,         /* TotalNumBoundaryConnections */
-                        NULL,      /* PassiveVarList */
-                        NULL,      /* ValueLocation */
-                        ShareFromZone,      /* ShareVarFromZone */
-                        &ShareConnectivityFromZone);
-        if (err) cout << "Error writing Tecplot zone data" << endl;
-
-      }
-      
-      /*--- write node coordinates and data if not done already---*/
-      
-      if (first_zone) {
-        
-        ShareFromZone = new INTEGER4[dims];
-        for (i = 0; i < dims; i++) ShareFromZone[i] = 0;
-        
-        if (config->GetKind_SU2() == SU2_SOL) {
-          err = TECDAT142(&NPts, Data[0], &IsDouble); ShareFromZone[0] = 1;
-          err = TECDAT142(&NPts, Data[1], &IsDouble); ShareFromZone[1] = 1;
-          if (geometry->GetnDim() == 3) {
-            err = TECDAT142(&NPts, Data[2], &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-          
-        } else if (config->GetKind_SU2() == SU2_DOT) {
-          
-          passivedouble* PassiveData = new passivedouble[NPts];
-          
-          for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[0][i]);
-          err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[0] = 1;
-          
-          for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[1][i]);
-          err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[1] = 1;
-          
-          if (geometry->GetnDim() == 3) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[2][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-          
-          delete [] PassiveData;
-          
-        } else {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[0] = 1;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[1] = 1;
-          if (geometry->GetnDim() == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-        }
-        if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-        first_zone = false;
-      }
-      
-
-      if (nGlobal_Tria > 0) {
-        if ((INTEGER4)nGlobal_Tria < N2DElm) {   /* Write Tria connecivity as collapsed Quad */
-    
-          /*--- Convert the triangle connectivity from 3 nodes to 4 nodes for FEQUADRALATERL */
-          int *Conn_Tria_Mod = new int[nGlobal_Tria*N_POINTS_QUADRILATERAL];
-          unsigned long iNode_Tria, iNode_Quad;
-          for (unsigned long iElem = 0; iElem < nGlobal_Tria; iElem++) {
-            iNode_Tria = iElem*N_POINTS_TRIANGLE;
-            iNode_Quad = iElem*N_POINTS_QUADRILATERAL;
-            Conn_Tria_Mod[iNode_Quad+0] = Conn_Tria[iNode_Tria+0];
-            Conn_Tria_Mod[iNode_Quad+1] = Conn_Tria[iNode_Tria+1];
-            Conn_Tria_Mod[iNode_Quad+2] = Conn_Tria[iNode_Tria+2];
-            Conn_Tria_Mod[iNode_Quad+3] = Conn_Tria[iNode_Tria+2];
-          }
-          NElm = (INTEGER4)(nGlobal_Tria*N_POINTS_QUADRILATERAL);
-          err = TECNODE142(&NElm, Conn_Tria_Mod);
-          if (err) cout << "Error writing triangle connectivity to Tecplot file" << endl;
-          delete [] Conn_Tria_Mod;
-  
-        } else {   /* Write Tria connectivity */
-
-          err = TECNOD142(Conn_Tria);
-          if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-        }
-      }
-
-      if (nGlobal_Quad > 0) {
-      
-        NElm = (INTEGER4)(nGlobal_Quad*N_POINTS_QUADRILATERAL);
-        err = TECNODE142(&NElm, Conn_Quad);
-        if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-
-      }
-      
-    }
-
-    /*--- Create 3D Volume Zone ---*/
-    NVolElm = (INTEGER4)(nGlobal_Tetr + nGlobal_Pyra + nGlobal_Pris + nGlobal_Hexa);
-    if (NVolElm > 0) {
-      
-      /*--- Write the zone header information ---*/
-      
-      if ((INTEGER4)nGlobal_Tetr < NVolElm) {   /* Create a Hexa zone with a mixed element types */
-      
-        /*--- Write the mixed-element zone header information ---*/
-      
-        ZoneType = FEBRICK; NElm = NVolElm;
-      
-        err = TECZNE142((char*)"Mixed Elements",
-                        &ZoneType,
-                        &NPts,
-                        &NElm,
-                        &KMax,
-                        &ICellMax,
-                        &JCellMax,
-                        &KCellMax,
-                        &t,
-                        &StrandID,
-                        &ParentZn,
-                        &IsBlock,
-                        &NumFaceConnections,
-                        &FaceNeighborMode,
-                        0,         /* TotalNumFaceNodes */
-                        0,         /* NumConnectedBoundaryFaces */
-                        0,         /* TotalNumBoundaryConnections */
-                        NULL,      /* PassiveVarList */
-                        NULL,      /* ValueLocation */
-                        ShareFromZone,      /* ShareVarFromZone */
-                        &ShareConnectivityFromZone);
-        if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-      } else {   /* Create a Tetra zone */
-
-        /*--- Write the tetrahedral zone header information ---*/
-
-        ZoneType = FETETRAHEDRON; NElm = (INTEGER4)nGlobal_Tetr;
-        
-        err = TECZNE142((char*)"Tetrahedral Elements",
-                        &ZoneType,
-                        &NPts,
-                        &NElm,
-                        &KMax,
-                        &ICellMax,
-                        &JCellMax,
-                        &KCellMax,
-                        &t,
-                        &StrandID,
-                        &ParentZn,
-                        &IsBlock,
-                        &NumFaceConnections,
-                        &FaceNeighborMode,
-                        0,         /* TotalNumFaceNodes */
-                        0,         /* NumConnectedBoundaryFaces */
-                        0,         /* TotalNumBoundaryConnections */
-                        NULL,      /* PassiveVarList */
-                        NULL,      /* ValueLocation */
-                        ShareFromZone,      /* ShareVarFromZone */
-                        &ShareConnectivityFromZone);
-        if (err) cout << "Error writing Tecplot zone data" << endl;
-      }
-      
-      /*--- write node coordinates and data if not done already---*/
-      
-      if (first_zone) {
-        
-        ShareFromZone = new INTEGER4[dims];
-        for (i = 0; i < dims; i++) ShareFromZone[i] = 0;
-        
-        if (config->GetKind_SU2() == SU2_SOL) {
-          err = TECDAT142(&NPts, Data[0], &IsDouble); ShareFromZone[0] = 1;
-          err = TECDAT142(&NPts, Data[1], &IsDouble); ShareFromZone[1] = 1;
-          if (geometry->GetnDim() == 3) {
-            err = TECDAT142(&NPts, Data[2], &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-          
-        } else if (config->GetKind_SU2() == SU2_DOT) {
-          
-          passivedouble* PassiveData = new passivedouble[NPts];
-          
-          for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[0][i]);
-          err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[0] = 1;
-          
-          for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[1][i]);
-          err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[1] = 1;
-          
-          if (geometry->GetnDim() == 3) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[2][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-          
-          delete [] PassiveData;
-          
-        }  else {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[0] = 1;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[1] = 1;
-          if (geometry->GetnDim() == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            ShareFromZone[2] = 1;
-          }
-        }
-        if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-        first_zone = false;
-      }
-
-    }
-      
-    if (nGlobal_Tetr > 0) {
-      if ((INTEGER4)nGlobal_Tetr < NVolElm) {   /* Write tetra connecivity as collapsed hexa */
-    
-        /*--- Convert the tetrahedral connectivity from 4 nodes to 8 nodes for FEBRICK ---*/
-        int *Conn_Tetr_Mod = new int[nGlobal_Tetr*N_POINTS_HEXAHEDRON];
-        unsigned long iNode_Tetr, iNode_Hexa;
-        for (unsigned long iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-          iNode_Tetr = iElem*N_POINTS_TETRAHEDRON;
-          iNode_Hexa = iElem*N_POINTS_HEXAHEDRON;
-          Conn_Tetr_Mod[iNode_Hexa+0] = Conn_Tetr[iNode_Tetr+0];
-          Conn_Tetr_Mod[iNode_Hexa+1] = Conn_Tetr[iNode_Tetr+1];
-          Conn_Tetr_Mod[iNode_Hexa+2] = Conn_Tetr[iNode_Tetr+2];
-          Conn_Tetr_Mod[iNode_Hexa+3] = Conn_Tetr[iNode_Tetr+2];
-          Conn_Tetr_Mod[iNode_Hexa+4] = Conn_Tetr[iNode_Tetr+3];
-          Conn_Tetr_Mod[iNode_Hexa+5] = Conn_Tetr[iNode_Tetr+3];
-          Conn_Tetr_Mod[iNode_Hexa+6] = Conn_Tetr[iNode_Tetr+3];
-          Conn_Tetr_Mod[iNode_Hexa+7] = Conn_Tetr[iNode_Tetr+3];
-        }
-        NElm = (INTEGER4)(nGlobal_Tetr*N_POINTS_HEXAHEDRON);
-        err = TECNODE142(&NElm, Conn_Tetr_Mod);
-        if (err) cout << "Error writing tetrahedral connectivity to Tecplot file" << endl;
-        delete [] Conn_Tetr_Mod;
-  
-      } else {   /* Write Tetra connectivity */
-
-        err = TECNOD142(Conn_Tetr);
-        if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-      }
-
-    }
-
-    if (nGlobal_Hexa > 0) {
-      
-      NElm = (INTEGER4)(nGlobal_Hexa*N_POINTS_HEXAHEDRON);
-      err = TECNODE142(&NElm, Conn_Hexa);
-      if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-      
-    }
-    
-    if (nGlobal_Pyra > 0) {
-      
-      /*--- Convert the pyramid connectivity from 5 nodes to 8 nodes for FEBRICK ---*/
-      int *Conn_Pyra_Mod = new int[nGlobal_Pyra*N_POINTS_HEXAHEDRON];
-      unsigned long iNode_Pyra, iNode_Hexa;
-      for (unsigned long iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-        iNode_Pyra = iElem*N_POINTS_PYRAMID;
-        iNode_Hexa = iElem*N_POINTS_HEXAHEDRON;
-        Conn_Pyra_Mod[iNode_Hexa+0] = Conn_Pyra[iNode_Pyra+4];
-        Conn_Pyra_Mod[iNode_Hexa+1] = Conn_Pyra[iNode_Pyra+4];
-        Conn_Pyra_Mod[iNode_Hexa+2] = Conn_Pyra[iNode_Pyra+4];
-        Conn_Pyra_Mod[iNode_Hexa+3] = Conn_Pyra[iNode_Pyra+4];
-        Conn_Pyra_Mod[iNode_Hexa+4] = Conn_Pyra[iNode_Pyra+0];
-        Conn_Pyra_Mod[iNode_Hexa+5] = Conn_Pyra[iNode_Pyra+1];
-        Conn_Pyra_Mod[iNode_Hexa+6] = Conn_Pyra[iNode_Pyra+2];
-        Conn_Pyra_Mod[iNode_Hexa+7] = Conn_Pyra[iNode_Pyra+3];
-      }
-      NElm = (INTEGER4)(nGlobal_Pyra*N_POINTS_HEXAHEDRON);
-      err = TECNODE142(&NElm, Conn_Pyra_Mod);
-      if (err) cout << "Error writing pyramid connectivity to Tecplot file" << endl;
-      delete [] Conn_Pyra_Mod;
-      
-    }
-    
-    if (nGlobal_Pris > 0) {
-      
-      /*--- Convert the prism connectivity from 6 nodes to 8 nodes for FEBRICK ---*/
-      int *Conn_Pris_Mod = new int[nGlobal_Pris*N_POINTS_HEXAHEDRON];
-      unsigned long iNode_Pris, iNode_Hexa;
-      for (unsigned long iElem = 0; iElem < nGlobal_Pris; iElem++) {
-        iNode_Pris = iElem*N_POINTS_PRISM;
-        iNode_Hexa = iElem*N_POINTS_HEXAHEDRON;
-        Conn_Pris_Mod[iNode_Hexa+0] = Conn_Pris[iNode_Pris+0];
-        Conn_Pris_Mod[iNode_Hexa+1] = Conn_Pris[iNode_Pris+0];
-        Conn_Pris_Mod[iNode_Hexa+2] = Conn_Pris[iNode_Pris+1];
-        Conn_Pris_Mod[iNode_Hexa+3] = Conn_Pris[iNode_Pris+2];
-        Conn_Pris_Mod[iNode_Hexa+4] = Conn_Pris[iNode_Pris+3];
-        Conn_Pris_Mod[iNode_Hexa+5] = Conn_Pris[iNode_Pris+3];
-        Conn_Pris_Mod[iNode_Hexa+6] = Conn_Pris[iNode_Pris+4];
-        Conn_Pris_Mod[iNode_Hexa+7] = Conn_Pris[iNode_Pris+5];
-      }
-      NElm = (INTEGER4)(nGlobal_Pris*N_POINTS_HEXAHEDRON);
-      err = TECNODE142(&NElm, Conn_Pris_Mod);
-      if (err) cout << "Error writing prism connectivity to Tecplot file" << endl;
-      delete [] Conn_Pris_Mod;
-      
-    }
-    
-    delete [] ShareFromZone;
-    wrote_base_file = true;
-    
-    err = TECEND142();
-    if (err) cout << "Error in closing Tecplot file" << endl;
-    
-  }
-  
-#endif
-  
-}
-
-void COutput::SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-#ifdef HAVE_TECIO
-  
-  passivedouble   t;
-  INTEGER4 i, iVar, err, Debug, NPts, NElm, N2DElm, NVolElm, IsDouble, KMax;
-  INTEGER4 ICellMax, JCellMax, KCellMax, ZoneType, StrandID, ParentZn, FileFormat, FileType;
-  INTEGER4 *ShareFromZone = NULL, IsBlock, NumFaceConnections, FaceNeighborMode, ShareConnectivityFromZone;
-  string buffer, variables;
-  stringstream file;
-  bool first_zone = true, unsteady = config->GetUnsteady_Simulation(), GridMovement = config->GetGrid_Movement();
-  bool Wrt_Unsteady = config->GetWrt_Unsteady();
-  unsigned long iExtIter = config->GetExtIter();
-  unsigned short NVar, dims = geometry->GetnDim();
-  enum     FileType { FULL = 0, GRID = 1, SOLUTION = 2 };
-  enum     FileFormat { PLT = 0, SZPLT = 1 };
-  enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
-  
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-
-  /*--- Consistent data for Tecplot zones ---*/
-  Debug            = 0;
-  IsDouble          = 1;
-  NPts            = (INTEGER4)nGlobal_Poin;
-  t              = SU2_TYPE::GetValue(iExtIter*config->GetDelta_UnstTime());
-  KMax            = 0;
-  ICellMax          = 0;
-  JCellMax          = 0;
-  KCellMax          = 0;
-  StrandID          = (INTEGER4)iExtIter+1;
-  ParentZn          = 0;
-  IsBlock            = 1;
-  NumFaceConnections      = 0;
-  FaceNeighborMode      = 0;
-  ShareConnectivityFromZone  = 0;
-  
-  file.str(string());
-
-  /*--- Write file name with extension ---*/
-  
-  if (adjoint)
-    buffer = config->GetAdj_FileName();
-  else buffer = config->GetVolume_FileName();
-  
-//  if (Kind_Solver == FEM_ELASTICITY) {
-//    buffer = config->GetStructure_FileName().c_str();
-//  }
-  
-//  if (Kind_Solver == HEAT_EQUATION_FVM) {
-//    buffer = config->GetHeat_FileName().c_str();
-//  }
-  
-  if (config->GetKind_SU2() == SU2_DOT) {
-    buffer = config->GetVolSens_FileName();
-  }
-  file << buffer;
-  
-  if (unsteady) {
-    if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      file << "_0000" << iExtIter;
-    if (((int)iExtIter >= 10) && ((int)iExtIter < 100))    file << "_000" << iExtIter;
-    if (((int)iExtIter >= 100) && ((int)iExtIter < 1000))    file << "_00" << iExtIter;
-    if (((int)iExtIter >= 1000) && ((int)iExtIter < 10000))  file << "_0" << iExtIter;
-    if ((int)iExtIter >= 10000)              file << iExtIter;
-  }
-
-  file << ".sol.szplt";
-  FileFormat = SZPLT;
-  FileType = SOLUTION;
-  variables = AssembleVariableNames(geometry, config, nVar_Consv, &NVar);
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-    if (Wrt_Unsteady && GridMovement) nVar_Total = NVar;
-    else nVar_Total = NVar+dims;
-  }
-
-  /*--- Open Tecplot file ---*/
-  err = TECINI142((char *)config->GetVolume_FileName().c_str(),
-                  (char *)variables.c_str(),
-                  (char *)file.str().c_str(),
-                  (char *)".",
-                  &FileFormat,
-                  &FileType,
-                  &Debug,
-                  &IsDouble);
-  if (err) cout << "Error in opening Tecplot file" << endl;
-  
-  first_zone = true;
-  ShareFromZone = new INTEGER4[NVar];
-  for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-  
-  N2DElm = (INTEGER4)(nGlobal_Tria + nGlobal_Quad);
-  if (N2DElm > 0) {
-      
-    /*--- Write the zone header information ---*/
-      
-    if ((INTEGER4)nGlobal_Tria < N2DElm) {   /* Create a Quad zone with a mixed element types */
-      
-      ZoneType = FEQUADRILATERAL; NElm = N2DElm;
-      
-      err = TECZNE142((char*)"Mixed Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-      
-    } else {   /* Create a Tria zone */
-
-      ZoneType = FETRIANGLE; NElm = (INTEGER4)nGlobal_Tria;
-    
-      err = TECZNE142((char*)"Triangle Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-    }
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      
-        delete [] PassiveData;
-        
-      } else {
-
-        if (Wrt_Unsteady && GridMovement) {
-
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
-      first_zone = false;
-    }
-    
-  }
-  if (nGlobal_Quad > 0) {
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-      
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        
-        delete [] PassiveData;
-        
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
-      
-      first_zone = false;
-    }
-    
-  }
-
-  /*--- Create 3D Volume Zone ---*/
-  NVolElm = (INTEGER4)(nGlobal_Tetr + nGlobal_Pyra + nGlobal_Pris + nGlobal_Hexa);
-  if (NVolElm > 0) {
-      
-    /*--- Write the zone header information ---*/
-      
-    if ((INTEGER4)nGlobal_Tetr < NVolElm) {   /* Create a Hexa zone with a mixed element types */
-      
-      /*--- Write the mixed-element zone header information ---*/
-      
-      ZoneType = FEBRICK; NElm = NVolElm;
-      
-      err = TECZNE142((char*)"Mixed Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-    } else {   /* Create a Tetra zone */
-
-      /*--- Write the tetrahedral zone header information ---*/
-
-      ZoneType = FETETRAHEDRON; NElm = (INTEGER4)nGlobal_Tetr;
-    
-      err = TECZNE142((char*)"Tetrahedral Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-    }
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-      
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        
-        delete [] PassiveData;
-        
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
-      
-      first_zone = false;
-    }
-
-  }
-
-  if (nGlobal_Hexa > 0) {
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-      
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        
-        delete [] PassiveData;
-        
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
-      
-      first_zone = false;
+    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
+      iNode = iElem*N_POINTS_HEXAHEDRON;
+      nodes[0] = MAKE_LOCAL(Conn_Hexa_Par[iNode+0]);
+      nodes[1] = MAKE_LOCAL(Conn_Hexa_Par[iNode+1]);
+      nodes[2] = MAKE_LOCAL(Conn_Hexa_Par[iNode+2]);
+      nodes[3] = MAKE_LOCAL(Conn_Hexa_Par[iNode+3]);
+      nodes[4] = MAKE_LOCAL(Conn_Hexa_Par[iNode+4]);
+      nodes[5] = MAKE_LOCAL(Conn_Hexa_Par[iNode+5]);
+      nodes[6] = MAKE_LOCAL(Conn_Hexa_Par[iNode+6]);
+      nodes[7] = MAKE_LOCAL(Conn_Hexa_Par[iNode+7]);
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-  }
-  if (nGlobal_Pyra > 0) {
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-      
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        
-        delete [] PassiveData;
-        
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
       
-      first_zone = false;
+    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
+      iNode = iElem*N_POINTS_PRISM;
+      nodes[0] = MAKE_LOCAL(Conn_Pris_Par[iNode+0]);
+      nodes[1] = MAKE_LOCAL(Conn_Pris_Par[iNode+1]);
+      nodes[2] = nodes[1];
+      nodes[3] = MAKE_LOCAL(Conn_Pris_Par[iNode+2]);
+      nodes[4] = MAKE_LOCAL(Conn_Pris_Par[iNode+3]);
+      nodes[5] = MAKE_LOCAL(Conn_Pris_Par[iNode+4]);
+      nodes[6] = nodes[5];
+      nodes[7] = MAKE_LOCAL(Conn_Pris_Par[iNode+5]);
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
     
-  }
-  if (nGlobal_Pris > 0) {
-
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      ShareFromZone = new INTEGER4[NVar];
-      for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-      
-      i = 0;
-      if (config->GetKind_SU2() == SU2_SOL) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-      } else if (config->GetKind_SU2() == SU2_DOT) {
-        
-        passivedouble* PassiveData = new passivedouble[NPts];
-        
-        if (Wrt_Unsteady && GridMovement) {
-          for (iVar = 0; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        } else {
-          for (iVar = dims; iVar < nVar_Total; iVar++) {
-            for (i = 0; i < NPts; i++) PassiveData[i] = SU2_TYPE::GetValue(Data[iVar][i]);
-            err = TECDAT142(&NPts, PassiveData, &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        
-        delete [] PassiveData;
-        
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          err = TECDAT142(&NPts, Coords[0], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          err = TECDAT142(&NPts, Coords[1], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-          if (dims == 3) {
-            err = TECDAT142(&NPts, Coords[2], &IsDouble);
-            if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-            ShareFromZone[i++] = 1;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      }
-      
-      first_zone = false;
+    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
+      iNode = iElem*N_POINTS_PYRAMID;
+      nodes[0] = MAKE_LOCAL(Conn_Pyra_Par[iNode+0]);
+      nodes[1] = MAKE_LOCAL(Conn_Pyra_Par[iNode+1]);
+      nodes[2] = MAKE_LOCAL(Conn_Pyra_Par[iNode+2]);
+      nodes[3] = MAKE_LOCAL(Conn_Pyra_Par[iNode+3]);
+      nodes[4] = MAKE_LOCAL(Conn_Pyra_Par[iNode+4]);
+      nodes[5] = nodes[4];
+      nodes[6] = nodes[4];
+      nodes[7] = nodes[4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-  }
-  
-  delete [] ShareFromZone;
-  
-  err = TECEND142();
-  if (err) cout << "Error in closing Tecplot file" << endl;
-  
-#endif
-  
-}
+  } else {
+    if (rank == MASTER_NODE) {
 
-void COutput::SetTecplotBinary_SurfaceMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-#ifdef HAVE_TECIO
-  
-  passivedouble   t;
-  INTEGER4 i, err, Debug, NPts, NElm, IsDouble, KMax;
-  INTEGER4 ICellMax, JCellMax, KCellMax, ZoneType, StrandID, ParentZn, FileFormat, FileType;
-  INTEGER4 *ShareFromZone, IsBlock, NumFaceConnections, FaceNeighborMode, ShareConnectivityFromZone;
-  string buffer, variables;
-  stringstream file;
-  bool first_zone = true;
-  unsigned short iDim, dims = geometry->GetnDim();
-  unsigned long iPoint, iElem, iNode;
-  enum     FileFormat { PLT = 0, SZPLT = 1 };
-  enum     FileType { FULL = 0, GRID = 1, SOLUTION = 2 };
-  enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
-  
-  /*--- Write Tecplot solution file ---*/
-  if (!wrote_surf_file) {
-    
-    file.str(string());
-    buffer = config->GetSurfCoeff_FileName();
-    if (config->GetKind_SU2() == SU2_DOT) {
-      buffer = config->GetSurfSens_FileName();
-    }
-    
-    FileFormat = PLT;
+      /* Non-hexahedral output by the master node. Output local data directly, and gather other data from the other ranks. */
 
-    file << buffer << ".mesh.szplt";
-    FileType = GRID;
-    
-    if (dims == 2) variables = "x y";
-    else if (dims == 3) variables = "x y z";
-    else cout << "Error: wrong number of dimensions: " << dims << endl;
-    
-    first_zone = true;
-    ShareFromZone = new INTEGER4[dims];
-    for (i = 0; i < dims; i++) ShareFromZone[i] = 0;
-    
-    /*--- Perform a renumbering for the surface points/elements ---*/
-    unsigned long *LocalIndex = new unsigned long [nGlobal_Poin+1];
-    bool *SurfacePoint = new bool [nGlobal_Poin+1];
-    
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-    
-    for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      SurfacePoint[Conn_Line[iNode+0]] = true;
-      SurfacePoint[Conn_Line[iNode+1]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-      SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-    }
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-      SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-    }
-    
-    unsigned long nSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      LocalIndex[iPoint] = 0;
-      if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-    }
-    
-    /*--- Collect surface coordinates into one array as well ---*/
-    /*--- Note the -1 in the Coords/Data array in order to undo the 1-based indexing ---*/
-    passivedouble **Surf_Coords = new passivedouble*[dims];
-    for (iDim = 0; iDim < dims; iDim++)
-      Surf_Coords[iDim] = new passivedouble[nSurf_Poin];
-    
-    unsigned long iSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      if (SurfacePoint[iPoint]) {
-        for (iDim = 0; iDim < dims; iDim++) {
-          if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT))
-            Surf_Coords[iDim][iSurf_Poin] = SU2_TYPE::GetValue(Data[iDim][iPoint-1]);
-          else
-            Surf_Coords[iDim][iSurf_Poin] = SU2_TYPE::GetValue(Coords[iDim][iPoint-1]);
-        }
-        iSurf_Poin++;
-      }
-    }
-    
-    /*--- Consistent data for Tecplot zones ---*/
-    Debug            = 0;
-    IsDouble          = 1;
-    NPts            = (INTEGER4)nSurf_Poin;
-    t              = 0.0;//iExtIter*config->GetDelta_UnstTimeND();
-    KMax            = 0;
-    ICellMax          = 0;
-    JCellMax          = 0;
-    KCellMax          = 0;
-    StrandID          = 0;//(INTEGER4)iExtIter;
-    ParentZn          = 0;
-    IsBlock            = 1;
-    NumFaceConnections      = 0;
-    FaceNeighborMode      = 0;
-    ShareConnectivityFromZone  = 0;
-    
-    /*--- Open Tecplot file ---*/
-    err = TECINI142((char *)config->GetSurfCoeff_FileName().c_str(),
-                    (char *)variables.c_str(),
-                    (char *)file.str().c_str(),
-                    (char *)".",
-                    &FileFormat,
-                    &FileType,
-                    &Debug,
-                    &IsDouble);
-    if (err) cout << "Error in opening Tecplot file" << endl;
-    
-    
-    if (nGlobal_Line > 0) {
-      
-      /*--- Put the connectivity into a single array for writing ---*/
-      int *Conn_Line_New = new int[nGlobal_Line*N_POINTS_LINE];
-      iNode = 0;
-      for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-        iNode = iElem*N_POINTS_LINE;
-        Conn_Line_New[iNode+0] = LocalIndex[Conn_Line[iNode+0]];
-        Conn_Line_New[iNode+1] = LocalIndex[Conn_Line[iNode+1]];
-      }
-      
-      /*--- Write the zone header information ---*/
-      ZoneType = FELINESEG; NElm = (INTEGER4)nGlobal_Line;
-      
-      err = TECZNE142((char*)"Line Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      NULL,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-      /*--- write node coordinates and data if not done already---*/
-      if (first_zone) {
-        
-        err = TECDAT142(&NPts, Surf_Coords[0], &IsDouble); ShareFromZone[0] = 1;
-        err = TECDAT142(&NPts, Surf_Coords[1], &IsDouble); ShareFromZone[1] = 1;
-        if (geometry->GetnDim() == 3) {
-          err = TECDAT142(&NPts, Surf_Coords[2], &IsDouble);
-          ShareFromZone[2] = 1;
-        }
-        if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-        first_zone = false;
-      }
-      
-      err = TECNOD142(Conn_Line_New);
-      if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-      
-      delete [] Conn_Line_New;
-    }
-    
-    if (nGlobal_BoundTria > 0) {
-      
-      /*--- Put the connectivity into a single array for writing ---*/
-      int *Conn_BoundTria_New = new int[nGlobal_BoundTria*N_POINTS_TRIANGLE];
-      
-      iNode = 0;
-      for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-        iNode = iElem*N_POINTS_TRIANGLE;
-        Conn_BoundTria_New[iNode+0] = LocalIndex[Conn_BoundTria[iNode+0]];
-        Conn_BoundTria_New[iNode+1] = LocalIndex[Conn_BoundTria[iNode+1]];
-        Conn_BoundTria_New[iNode+2] = LocalIndex[Conn_BoundTria[iNode+2]];
-      }
-      
-      /*--- Write the zone header information ---*/
-      ZoneType = FETRIANGLE; NElm = (INTEGER4)nGlobal_BoundTria;
-      
-      err = TECZNE142((char*)"Triangle Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-      /*--- write node coordinates and data if not done already---*/
-      if (first_zone) {
-        
-        err = TECDAT142(&NPts, Surf_Coords[0], &IsDouble); ShareFromZone[0] = 1;
-        err = TECDAT142(&NPts, Surf_Coords[1], &IsDouble); ShareFromZone[1] = 1;
-        if (geometry->GetnDim() == 3) {
-          err = TECDAT142(&NPts, Surf_Coords[2], &IsDouble);
-          ShareFromZone[2] = 1;
-        }
-        if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-        first_zone = false;
-      }
-      
-      err = TECNOD142(Conn_BoundTria_New);
-      if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-      
-      delete [] Conn_BoundTria_New;
-    }
-    
-    if (nGlobal_BoundQuad > 0) {
-      
-      
-      /*--- Put the connectivity into a single array for writing ---*/
-      int *Conn_BoundQuad_New = new int[nGlobal_BoundQuad*N_POINTS_QUADRILATERAL];
-      iNode = 0;
-      for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-        iNode = iElem*N_POINTS_QUADRILATERAL;
-        Conn_BoundQuad_New[iNode+0] = LocalIndex[Conn_BoundQuad[iNode+0]];
-        Conn_BoundQuad_New[iNode+1] = LocalIndex[Conn_BoundQuad[iNode+1]];
-        Conn_BoundQuad_New[iNode+2] = LocalIndex[Conn_BoundQuad[iNode+2]];
-        Conn_BoundQuad_New[iNode+3] = LocalIndex[Conn_BoundQuad[iNode+3]];
-      }
-      
-      /*--- Write the zone header information ---*/
-      ZoneType = FEQUADRILATERAL; NElm = (INTEGER4)nGlobal_BoundQuad;
-      
-      err = TECZNE142((char*)"Quadrilateral Elements",
-                      &ZoneType,
-                      &NPts,
-                      &NElm,
-                      &KMax,
-                      &ICellMax,
-                      &JCellMax,
-                      &KCellMax,
-                      &t,
-                      &StrandID,
-                      &ParentZn,
-                      &IsBlock,
-                      &NumFaceConnections,
-                      &FaceNeighborMode,
-                      0,         /* TotalNumFaceNodes */
-                      0,         /* NumConnectedBoundaryFaces */
-                      0,         /* TotalNumBoundaryConnections */
-                      NULL,      /* PassiveVarList */
-                      NULL,      /* ValueLocation */
-                      ShareFromZone,      /* ShareVarFromZone */
-                      &ShareConnectivityFromZone);
-      if (err) cout << "Error writing Tecplot zone data" << endl;
-      
-      /*--- write node coordinates and data if not done already---*/
-      if (first_zone) {
-        
-        err = TECDAT142(&NPts, Surf_Coords[0], &IsDouble); ShareFromZone[0] = 1;
-        err = TECDAT142(&NPts, Surf_Coords[1], &IsDouble); ShareFromZone[1] = 1;
-        if (geometry->GetnDim() == 3) {
-          err = TECDAT142(&NPts, Surf_Coords[2], &IsDouble);
-          ShareFromZone[2] = 1;
-        }
-        if (err) cout << "Error writing coordinates to Tecplot file" << endl;
-        first_zone = false;
-      }
-      
-      err = TECNOD142(Conn_BoundQuad_New);
-      if (err) cout << "Error writing connectivity to Tecplot file" << endl;
-      
-      delete [] Conn_BoundQuad_New;
-    }
-    
-    for (iDim = 0; iDim < dims; iDim++)
-      delete [] Surf_Coords[iDim];
-    delete [] Surf_Coords;
-    delete [] ShareFromZone;
-    delete [] LocalIndex;
-    delete [] SurfacePoint;
-    
-    wrote_surf_file = true;
-    
-    err = TECEND142();
-    if (err) cout << "Error in closing Tecplot file" << endl;
-    
-  }
-  
-#endif
-  
-}
+      int64_t nodes[4];
 
-void COutput::SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-#ifdef HAVE_TECIO
-  
-  passivedouble   t;
-  INTEGER4 i, iVar, err, Debug, NPts, NElm, IsDouble, KMax;
-  INTEGER4 ICellMax, JCellMax, KCellMax, ZoneType, StrandID, ParentZn, FileFormat, FileType;
-  INTEGER4 *ShareFromZone, IsBlock, NumFaceConnections, FaceNeighborMode, ShareConnectivityFromZone;
-  string buffer, variables;
-  stringstream file;
-  bool first_zone = true, unsteady = config->GetUnsteady_Simulation(), GridMovement = config->GetGrid_Movement();
-  bool Wrt_Unsteady = config->GetWrt_Unsteady();
-  unsigned long iPoint, iElem, iNode, iSurf_Poin, iExtIter = config->GetExtIter();
-  unsigned short iDim, NVar, dims = geometry->GetnDim();
-  enum     FileFormat { PLT = 0, SZPLT = 1 };
-  enum     FileType { FULL = 0, GRID = 1, SOLUTION = 2 };
-  enum   ZoneType { ORDERED=0, FELINESEG=1, FETRIANGLE=2, FEQUADRILATERAL=3, FETETRAHEDRON=4, FEBRICK=5, FEPOLYGON=6, FEPOLYHEDRON=7 };
-  
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  
-  file.str(string());
-  
-  /*--- Write file name with extension ---*/
-  
-  if (adjoint) buffer = config->GetSurfAdjCoeff_FileName();
-  else buffer = config->GetSurfCoeff_FileName();
-  
-  if (config->GetKind_SU2() == SU2_DOT) {
-    buffer = config->GetSurfSens_FileName();
-  }
-  
-  file << buffer;
-  
-  if (unsteady) {
-    if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      file << "_0000" << iExtIter;
-    if (((int)iExtIter >= 10) && ((int)iExtIter < 100))    file << "_000" << iExtIter;
-    if (((int)iExtIter >= 100) && ((int)iExtIter < 1000))    file << "_00" << iExtIter;
-    if (((int)iExtIter >= 1000) && ((int)iExtIter < 10000))  file << "_0" << iExtIter;
-    if ((int)iExtIter >= 10000)              file << iExtIter;
-  }
-  file << ".sol.szplt";
-  FileFormat = PLT;
-  FileType = SOLUTION;
-  variables = AssembleVariableNames(geometry, config, nVar_Consv, &NVar);
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-    if (Wrt_Unsteady && GridMovement) nVar_Total = NVar;
-    else nVar_Total = NVar+dims;
-  }
-  
-  first_zone = true;
-  ShareFromZone = new INTEGER4[NVar];
-  for (i = 0; i < NVar; i++) ShareFromZone[i] = 0;
-  
-  
-  /*--- Perform a renumbering for the surface points/elements ---*/
-  unsigned long *LocalIndex = new unsigned long [nGlobal_Poin+1];
-  bool *SurfacePoint = new bool [nGlobal_Poin+1];
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) SurfacePoint[iPoint] = false;
-  
-  for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-    iNode = iElem*N_POINTS_LINE;
-    SurfacePoint[Conn_Line[iNode+0]] = true;
-    SurfacePoint[Conn_Line[iNode+1]] = true;
-  }
-  for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-    SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-    SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-  }
-  for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-  }
-  
-  unsigned long nSurf_Poin = 0;
-  for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-    LocalIndex[iPoint] = 0;
-    if (SurfacePoint[iPoint]) { nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin; }
-  }
-  
-  /*--- Collect surface coordinates into one array as well ---*/
-  /*--- Note the -1 in the Coords/Data array in order to undo the 1-based indexing ---*/
-  passivedouble **Surf_Coords = NULL;
-  if (Wrt_Unsteady && GridMovement) {
-    Surf_Coords = new passivedouble*[dims];
-    for (iDim = 0; iDim < dims; iDim++)
-    Surf_Coords[iDim] = new passivedouble[nSurf_Poin];
-    
-    iSurf_Poin = 0;
-    for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-      if (SurfacePoint[iPoint]) {
-        for (iDim = 0; iDim < dims; iDim++) {
-          if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT))
-            Surf_Coords[iDim][iSurf_Poin] = SU2_TYPE::GetValue(Data[iDim][iPoint-1]);
-          else
-            Surf_Coords[iDim][iSurf_Poin] = SU2_TYPE::GetValue(Coords[iDim][iPoint-1]);
-        }
-        iSurf_Poin++;
-      }
-    }
-  }
-  
-  /*--- Collect surface data into one array for the surface as well ---*/
-  /*--- Note the -1 in the Coords/Data array in order to undo the 1-based indexing ---*/
-  passivedouble **Surf_Data = new passivedouble*[nVar_Total];
-  for (iVar = 0; iVar < nVar_Total; iVar++)
-  Surf_Data[iVar] = new passivedouble[nSurf_Poin];
-  
-  iSurf_Poin = 0;
-  for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-    if (SurfacePoint[iPoint]) {
-      for (iVar = 0; iVar < nVar_Total; iVar++) {
-        if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-          if (Wrt_Unsteady && GridMovement)
-            Surf_Data[iVar][iSurf_Poin] = SU2_TYPE::GetValue(Data[iVar][iPoint-1]);
-          else
-          Surf_Data[iVar][iSurf_Poin] = SU2_TYPE::GetValue(Data[iVar][iPoint-1]);
-        } else
-        Surf_Data[iVar][iSurf_Poin] = SU2_TYPE::GetValue(Data[iVar][iPoint-1]);
-      }
-      iSurf_Poin++;
-    }
-  }
-  
-  /*--- Consistent data for Tecplot zones ---*/
-  Debug            = 0;
-  IsDouble          = 1;
-  NPts            = (INTEGER4)nSurf_Poin;
-  t              = SU2_TYPE::GetValue(iExtIter*config->GetDelta_UnstTime());
-  KMax            = 0;
-  ICellMax          = 0;
-  JCellMax          = 0;
-  KCellMax          = 0;
-  StrandID          = (INTEGER4)iExtIter+1;
-  ParentZn          = 0;
-  IsBlock            = 1;
-  NumFaceConnections      = 0;
-  FaceNeighborMode      = 0;
-  ShareConnectivityFromZone  = 0;
-  
-  
-  /*--- Open Tecplot file ---*/
-  err = TECINI142((char *)config->GetVolume_FileName().c_str(),
-                  (char *)variables.c_str(),
-                  (char *)file.str().c_str(),
-                  (char *)".",
-                  &FileFormat,
-                  &FileType,
-                  &Debug,
-                  &IsDouble);
-  if (err) cout << "Error in opening Tecplot file" << endl;
-  
-  
-  if (nGlobal_Line > 0) {
-    
-    /*--- Write the zone header information ---*/
-    ZoneType = FELINESEG; NElm = (INTEGER4)nGlobal_Line;
-    
-    err = TECZNE142((char*)"Line Elements",
-                    &ZoneType,
-                    &NPts,
-                    &NElm,
-                    &KMax,
-                    &ICellMax,
-                    &JCellMax,
-                    &KCellMax,
-                    &t,
-                    &StrandID,
-                    &ParentZn,
-                    &IsBlock,
-                    &NumFaceConnections,
-                    &FaceNeighborMode,
-                    0,         /* TotalNumFaceNodes */
-                    0,         /* NumConnectedBoundaryFaces */
-                    0,         /* TotalNumBoundaryConnections */
-                    NULL,      /* PassiveVarList */
-                    NULL,      /* ValueLocation */
-                    ShareFromZone,      /* ShareVarFromZone */
-                    &ShareConnectivityFromZone);
-    if (err) cout << "Error writing Tecplot zone data" << endl;
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      i = 0;
-      if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Data[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        for (iVar = dims; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Coords[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
+      vector<unsigned long> connectivity_sizes(size);
+      unsigned long unused = 0;
+      SU2_MPI::Gather(&unused, 1, MPI_UNSIGNED_LONG, &connectivity_sizes[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      vector<int64_t> connectivity;
+      for(int iRank = 0; iRank < size; ++iRank) {
+        if (iRank == rank) {
+          if (surf_sol) {
+            for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+              iNode = iElem*N_POINTS_LINE;
+              nodes[0] = Conn_BoundLine_Par[iNode+0];
+              nodes[1] = Conn_BoundLine_Par[iNode+1];
+              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 2, nodes);
+              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+            }
+          
+            for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
+              iNode = iElem*N_POINTS_TRIANGLE;
+              nodes[0] = Conn_BoundTria_Par[iNode+0];
+              nodes[1] = Conn_BoundTria_Par[iNode+1];
+              nodes[2] = Conn_BoundTria_Par[iNode+2];
+              nodes[3] = Conn_BoundTria_Par[iNode+2];
+              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+            }
+          
+            for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
+              iNode = iElem*N_POINTS_QUADRILATERAL;
+              nodes[0] = Conn_BoundQuad_Par[iNode+0];
+              nodes[1] = Conn_BoundQuad_Par[iNode+1];
+              nodes[2] = Conn_BoundQuad_Par[iNode+2];
+              nodes[3] = Conn_BoundQuad_Par[iNode+3];
+              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+            }
+          } else {
+            for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+              iNode = iElem*N_POINTS_TRIANGLE;
+              nodes[0] = Conn_Tria_Par[iNode+0];
+              nodes[1] = Conn_Tria_Par[iNode+1];
+              nodes[2] = Conn_Tria_Par[iNode+2];
+              nodes[3] = Conn_Tria_Par[iNode+2];
+              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+            }
+        
+            for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+              iNode = iElem*N_POINTS_QUADRILATERAL;
+              nodes[0] = Conn_Quad_Par[iNode+0];
+              nodes[1] = Conn_Quad_Par[iNode+1];
+              nodes[2] = Conn_Quad_Par[iNode+2];
+              nodes[3] = Conn_Quad_Par[iNode+3];
+              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+            }
           }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
+        } else { /* Receive node map and write out. */
+          connectivity.resize(max((unsigned long)1, connectivity_sizes[iRank]));
+          SU2_MPI::Recv(&connectivity[0], connectivity_sizes[iRank], MPI_UNSIGNED_LONG, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+          err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, connectivity_sizes[iRank], &connectivity[0]);
+          if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
         }
       }
-      first_zone = false;
-    }
-    
-  }
-  
-  if (nGlobal_BoundTria > 0) {
-    
-    /*--- Write the zone header information ---*/
-    ZoneType = FETRIANGLE; NElm = (INTEGER4)nGlobal_BoundTria;
-    
-    err = TECZNE142((char*)"Triangle Elements",
-                    &ZoneType,
-                    &NPts,
-                    &NElm,
-                    &KMax,
-                    &ICellMax,
-                    &JCellMax,
-                    &KCellMax,
-                    &t,
-                    &StrandID,
-                    &ParentZn,
-                    &IsBlock,
-                    &NumFaceConnections,
-                    &FaceNeighborMode,
-                    0,         /* TotalNumFaceNodes */
-                    0,         /* NumConnectedBoundaryFaces */
-                    0,         /* TotalNumBoundaryConnections */
-                    NULL,      /* PassiveVarList */
-                    NULL,      /* ValueLocation */
-                    ShareFromZone,      /* ShareVarFromZone */
-                    &ShareConnectivityFromZone);
-    if (err) cout << "Error writing Tecplot zone data" << endl;
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
-      
-      i = 0;
-      if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Data[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        for (iVar = dims; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
-        }
-      } else {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Coords[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
-        }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
+    } else {
+
+      /* Non-hexahedral output by non-master node. Send what we've got to the master node. */
+
+      unsigned long connectivity_size;
+      if (surf_sol)
+        connectivity_size = 2 * nParallel_Line + 4 * nParallel_BoundTria + 4 * nParallel_BoundQuad;
+      else
+        connectivity_size = 4 * (nParallel_Tria + nParallel_Quad);
+      SU2_MPI::Gather(&connectivity_size, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      vector<int64_t> connectivity;
+      connectivity.reserve(connectivity_size);
+      if (surf_sol) {
+        for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+          iNode = iElem*N_POINTS_LINE;
+          connectivity.push_back(Conn_BoundLine_Par[iNode+0]);
+          connectivity.push_back(Conn_BoundLine_Par[iNode+1]);
         }
-      }
-      first_zone = false;
-    }
-    
-  }
-  
-  if (nGlobal_BoundQuad > 0) {
-    
-    /*--- Write the zone header information ---*/
-    ZoneType = FEQUADRILATERAL; NElm = (INTEGER4)nGlobal_BoundQuad;
-    
-    err = TECZNE142((char*)"Quadrilateral Elements",
-                    &ZoneType,
-                    &NPts,
-                    &NElm,
-                    &KMax,
-                    &ICellMax,
-                    &JCellMax,
-                    &KCellMax,
-                    &t,
-                    &StrandID,
-                    &ParentZn,
-                    &IsBlock,
-                    &NumFaceConnections,
-                    &FaceNeighborMode,
-                    0,         /* TotalNumFaceNodes */
-                    0,         /* NumConnectedBoundaryFaces */
-                    0,         /* TotalNumBoundaryConnections */
-                    NULL,      /* PassiveVarList */
-                    NULL,      /* ValueLocation */
-                    ShareFromZone,      /* ShareVarFromZone */
-                    &ShareConnectivityFromZone);
-    if (err) cout << "Error writing Tecplot zone data" << endl;
-    
-    /*--- write node coordinates and data if not done already---*/
-    if (first_zone) {
       
-      i = 0;
-      if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Data[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
+        for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
+          iNode = iElem*N_POINTS_TRIANGLE;
+          connectivity.push_back(Conn_BoundTria_Par[iNode+0]);
+          connectivity.push_back(Conn_BoundTria_Par[iNode+1]);
+          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
+          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
         }
-        for (iVar = dims; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
+      
+        for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
+          iNode = iElem*N_POINTS_QUADRILATERAL;
+          connectivity.push_back(Conn_BoundQuad_Par[iNode+0]);
+          connectivity.push_back(Conn_BoundQuad_Par[iNode+1]);
+          connectivity.push_back(Conn_BoundQuad_Par[iNode+2]);
+          connectivity.push_back(Conn_BoundQuad_Par[iNode+3]);
         }
       } else {
-        if (Wrt_Unsteady && GridMovement) {
-          for (iDim = 0; iDim < dims; iDim++) {
-            err = TECDAT142(&NPts, Surf_Coords[iDim], &IsDouble); ShareFromZone[i++] = 1;
-            if (err) cout << "Error writing data to Tecplot file" << endl;
-          }
+        for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+          iNode = iElem*N_POINTS_TRIANGLE;
+          connectivity.push_back(Conn_Tria_Par[iNode+0]);
+          connectivity.push_back(Conn_Tria_Par[iNode+1]);
+          connectivity.push_back(Conn_Tria_Par[iNode+2]);
+          connectivity.push_back(Conn_Tria_Par[iNode+2]);
         }
-        for (iVar = 0; iVar < nVar_Total; iVar++) {
-          err = TECDAT142(&NPts, Surf_Data[iVar], &IsDouble); ShareFromZone[i++] = 1;
-          if (err) cout << "Error writing data to Tecplot file" << endl;
+    
+        for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+          iNode = iElem*N_POINTS_QUADRILATERAL;
+          connectivity.push_back(Conn_Quad_Par[iNode+0]);
+          connectivity.push_back(Conn_Quad_Par[iNode+1]);
+          connectivity.push_back(Conn_Quad_Par[iNode+2]);
+          connectivity.push_back(Conn_Quad_Par[iNode+3]);
         }
       }
-      first_zone = false;
+      if (connectivity.empty()) connectivity.resize(1); /* Avoid crash */
+      SU2_MPI::Send(&connectivity[0], connectivity_size, MPI_UNSIGNED_LONG, MASTER_NODE, rank, MPI_COMM_WORLD);
     }
-    
-  }
-  
-  for (iVar = 0; iVar < nVar_Total; iVar++)
-  delete [] Surf_Data[iVar];
-  delete [] Surf_Data;
-  
-  if (Surf_Coords != NULL) {
-    for (iDim = 0; iDim < dims; iDim++) delete [] Surf_Coords[iDim];
-    delete [] Surf_Coords;
   }
-  delete [] LocalIndex;
-  delete [] SurfacePoint;
-  delete [] ShareFromZone;
-  
-  err = TECEND142();
-  if (err) cout << "Error in closing Tecplot file" << endl;
-  
-#endif
-  
-}
+#else
+  if (surf_sol) {
 
-string COutput::AssembleVariableNames(CGeometry *geometry, CConfig *config, unsigned short nVar_Consv, unsigned short *NVar) {
-  
-  /*--- Local variables ---*/
-  stringstream variables; variables.str(string());
-  unsigned short iVar;
-  *NVar = 0;
-  unsigned short nDim = geometry->GetnDim();
-  unsigned short Kind_Solver  = config->GetKind_Solver();
-  bool grid_movement = config->GetGrid_Movement();
-  bool Wrt_Unsteady = config->GetWrt_Unsteady();
-  
-  
-  /*--- Write the basic variable header based on the particular solution ----*/
-  
-  /*--- Write the list of the fields in the restart file.
-   Without including the PointID---*/
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-    
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class.
-     We simply read in and remove the quotation marks from the var names. ---*/
-    
-    /*--- Set the number of variables to be written. Subtract off an index for
-     the PointID as well as each coordinate (x, y, z). ---*/
-    string varname;
-    
-    if (Wrt_Unsteady && grid_movement) {
-      
-      *NVar = config->fields.size()-1;
-      for (unsigned short iField = 1; iField < config->fields.size(); iField++) {
-        varname = config->fields[iField];
-        varname.erase (varname.begin(), varname.begin()+1);
-        varname.erase (varname.end()-1, varname.end());
-        variables << varname << " ";
-      }
-    } else {
-      
-      *NVar = config->fields.size()-1-nDim;
-      for (unsigned short iField = 1+nDim; iField < config->fields.size(); iField++) {
-        varname = config->fields[iField];
-        varname.erase (varname.begin(), varname.begin()+1);
-        varname.erase (varname.end()-1, varname.end());
-        variables << varname << " ";
-      }
-    }
-    
-  } else {
-    
-    if (Wrt_Unsteady && grid_movement) {
-      if (nDim == 2) {
-        variables << "x y "; *NVar += 2;
-      } else {
-        variables << "x y z "; *NVar += 3;
-      }
-    }
-    
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-      variables << "Conservative_" << iVar+1<<" "; *NVar += 1;
+    int64_t nodes[4];
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+      iNode = iElem*N_POINTS_LINE;
+      nodes[0] = Conn_BoundLine_Par[iNode+0];
+      nodes[1] = Conn_BoundLine_Par[iNode+1];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 2, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        variables << "Limiter_" << iVar+1<<" "; *NVar += 1;
-      }
+        
+    for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
+      iNode = iElem*N_POINTS_TRIANGLE;
+      nodes[0] = Conn_BoundTria_Par[iNode+0];
+      nodes[1] = Conn_BoundTria_Par[iNode+1];
+      nodes[2] = Conn_BoundTria_Par[iNode+2];
+      nodes[3] = Conn_BoundTria_Par[iNode+2];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        variables << "Residual_" << iVar+1<<" "; *NVar += 1;
-      }
+        
+    for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
+      iNode = iElem*N_POINTS_QUADRILATERAL;
+      nodes[0] = Conn_BoundQuad_Par[iNode+0];
+      nodes[1] = Conn_BoundQuad_Par[iNode+1];
+      nodes[2] = Conn_BoundQuad_Par[iNode+2];
+      nodes[3] = Conn_BoundQuad_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-    /*--- Add names for any extra variables (this will need to be adjusted). ---*/
-    if (grid_movement) {
-      if (nDim == 2) {
-        variables << "Grid_Velx Grid_Vely "; *NVar += 2;
-      } else {
-        variables << "Grid_Velx Grid_Vely Grid_Velz "; *NVar += 3;
-      }
+
+  } else {
+
+    int64_t nodes[8];
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+      iNode = iElem*N_POINTS_TRIANGLE;
+      nodes[0] = Conn_Tria_Par[iNode+0];
+      nodes[1] = Conn_Tria_Par[iNode+1];
+      nodes[2] = Conn_Tria_Par[iNode+2];
+      nodes[3] = Conn_Tria_Par[iNode+2];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      variables << "Pressure Temperature Pressure_Coefficient Mach ";
-      *NVar += 4;
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+      iNode = iElem*N_POINTS_QUADRILATERAL;
+      nodes[0] = Conn_Quad_Par[iNode+0];
+      nodes[1] = Conn_Quad_Par[iNode+1];
+      nodes[2] = Conn_Quad_Par[iNode+2];
+      nodes[3] = Conn_Quad_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if (nDim == 2) {
-        variables << "Laminar_Viscosity Skin_Friction_Coefficient_x Skin_Friction_Coefficient_y Heat_Flux Y_Plus ";
-        *NVar += 5;
-      }
-      else {
-        variables << "Laminar_Viscosity Skin_Friction_Coefficient_x Skin_Friction_Coefficient_y Skin_Friction_Coefficient_z Heat_Flux Y_Plus ";
-        *NVar += 6;
-      }
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
+      iNode = iElem*N_POINTS_TETRAHEDRON;
+      nodes[0] = Conn_Tetr_Par[iNode+0];
+      nodes[1] = Conn_Tetr_Par[iNode+1];
+      nodes[2] = Conn_Tetr_Par[iNode+2];
+      nodes[3] = Conn_Tetr_Par[iNode+2];
+      nodes[4] = Conn_Tetr_Par[iNode+3];
+      nodes[5] = Conn_Tetr_Par[iNode+3];
+      nodes[6] = Conn_Tetr_Par[iNode+3];
+      nodes[7] = Conn_Tetr_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-    if (Kind_Solver == RANS) {
-      variables << "Eddy_Viscosity ";
-      *NVar += 1;
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
+      iNode = iElem*N_POINTS_HEXAHEDRON;
+      nodes[0] = Conn_Hexa_Par[iNode+0];
+      nodes[1] = Conn_Hexa_Par[iNode+1];
+      nodes[2] = Conn_Hexa_Par[iNode+2];
+      nodes[3] = Conn_Hexa_Par[iNode+3];
+      nodes[4] = Conn_Hexa_Par[iNode+4];
+      nodes[5] = Conn_Hexa_Par[iNode+5];
+      nodes[6] = Conn_Hexa_Par[iNode+6];
+      nodes[7] = Conn_Hexa_Par[iNode+7];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        variables << "Sharp_Edge_Dist ";
-        *NVar += 1;
-      }
+      
+    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
+      iNode = iElem*N_POINTS_PRISM;
+      nodes[0] = Conn_Pris_Par[iNode+0];
+      nodes[1] = Conn_Pris_Par[iNode+1];
+      nodes[2] = Conn_Pris_Par[iNode+1];
+      nodes[3] = Conn_Pris_Par[iNode+2];
+      nodes[4] = Conn_Pris_Par[iNode+3];
+      nodes[5] = Conn_Pris_Par[iNode+4];
+      nodes[6] = Conn_Pris_Par[iNode+4];
+      nodes[7] = Conn_Pris_Par[iNode+5];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
     
-
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )   ) {
-      variables << "Surface_Sensitivity Solution_Sensor ";
-      *NVar += 2;
+    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
+      iNode = iElem*N_POINTS_PYRAMID;
+      nodes[0] = Conn_Pyra_Par[iNode+0];
+      nodes[1] = Conn_Pyra_Par[iNode+1];
+      nodes[2] = Conn_Pyra_Par[iNode+2];
+      nodes[3] = Conn_Pyra_Par[iNode+3];
+      nodes[4] = Conn_Pyra_Par[iNode+4];
+      nodes[5] = Conn_Pyra_Par[iNode+4];
+      nodes[6] = Conn_Pyra_Par[iNode+4];
+      nodes[7] = Conn_Pyra_Par[iNode+4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
+      
   }
+
+#endif
   
-  return variables.str();
+  err = tecFileWriterClose(&file_handle);
+  if (err) cout << rank << ": Error finishing Tecplot file output." << endl;
   
+#endif /* HAVE_TECIO */
+
 }

From a081b9b8a239cd9ebd8eb0a3388122f543116a9d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 10:27:31 +0200
Subject: [PATCH 276/539] Adding filewriter and sorter files

---
 .../output/filewriter/CCSVFileWriter.hpp      |   16 +
 .../output/filewriter/CFEMDataSorter.hpp      |   55 +
 .../output/filewriter/CFVMDataSorter.hpp      |   45 +
 .../include/output/filewriter/CFileWriter.hpp |   25 +
 .../output/filewriter/CParallelDataSorter.hpp |  101 +
 .../filewriter/CParaviewBinaryFileWriter.hpp  |   19 +
 .../output/filewriter/CParaviewFileWriter.hpp |   16 +
 .../filewriter/CSU2BinaryFileWriter.hpp       |   15 +
 .../output/filewriter/CSU2FileWriter.hpp      |   16 +
 .../filewriter/CSurfaceFEMDataSorter.hpp      |   42 +
 .../filewriter/CSurfaceFVMDataSorter.hpp      |   43 +
 .../filewriter/CTecplotBinaryFileWriter.hpp   |   82 +
 .../output/filewriter/CTecplotFileWriter.hpp  |   19 +
 SU2_CFD/obj/Makefile.am                       |   13 +
 SU2_CFD/src/meson.build                       |   43 +-
 SU2_CFD/src/output/COutput.cpp                |   14 +-
 .../src/output/filewriter/CCSVFileWriter.cpp  |  157 ++
 .../src/output/filewriter/CFEMDataSorter.cpp  |  591 +++++
 .../src/output/filewriter/CFVMDataSorter.cpp  | 1115 +++++++++
 .../output/filewriter/CParallelDataSorter.cpp |  130 ++
 .../output/filewriter/CParallelFileWriter.cpp |   20 +
 .../filewriter/CParaviewBinaryFileWriter.cpp  | 1051 +++++++++
 .../output/filewriter/CParaviewFileWriter.cpp |  348 +++
 .../filewriter/CSU2BinaryFileWriter.cpp       |  283 +++
 .../src/output/filewriter/CSU2FileWriter.cpp  |  111 +
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  415 ++++
 .../filewriter/CSurfaceFVMDataSorter.cpp      | 2040 +++++++++++++++++
 .../filewriter/CTecplotBinaryFileWriter.cpp   |  643 ++++++
 .../output/filewriter/CTecplotFileWriter.cpp  |  218 ++
 29 files changed, 7670 insertions(+), 16 deletions(-)
 create mode 100644 SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
 create mode 100644 SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
 create mode 100644 SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
 create mode 100644 SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp

diff --git a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
new file mode 100644
index 000000000000..a31aecc77bbc
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
@@ -0,0 +1,16 @@
+#pragma once
+#include "CFileWriter.hpp"
+
+class CCSVFileWriter : public CFileWriter{
+  
+
+public:
+  
+  CCSVFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  ~CCSVFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
new file mode 100644
index 000000000000..c6b3809db9db
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
@@ -0,0 +1,55 @@
+#pragma once
+
+#include "CParallelDataSorter.hpp"
+
+class CFEMDataSorter : public CParallelDataSorter{
+private:
+  
+  std::vector<std::vector<su2double> >* Local_Data;
+  
+  
+public:
+  CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> > &Local_Data);
+  
+  ~CFEMDataSorter();
+  
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
+   */
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
+   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
+   */
+  void DeallocateConnectivity_Parallel(bool surf_sol);
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
+   */
+  void DeallocateData_Parallel();
+  
+  unsigned long GetGlobalIndex(unsigned long iPoint) { return beg_node[rank] + iPoint; }
+  
+private:
+  
+  
+  /*!
+   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  
+};
diff --git a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
new file mode 100644
index 000000000000..452595211539
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "CParallelDataSorter.hpp"
+#include <vector>
+
+class CFVMDataSorter : public CParallelDataSorter{
+  
+private:
+  std::vector<std::vector<su2double> >* Local_Data;
+  
+public:
+  CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data);
+  
+  ~CFVMDataSorter();
+  
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
+   */
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  
+  unsigned long GetGlobalIndex(unsigned long iPoint) { return beg_node[rank] + iPoint; }
+  
+private:
+  
+  
+  /*!
+   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
+   */
+  void SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type, bool val_sort);
+  
+};
diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
new file mode 100644
index 000000000000..910f77744bc0
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -0,0 +1,25 @@
+#pragma once
+#include "../../../Common/include/geometry_structure.hpp"
+#include "CParallelDataSorter.hpp"
+
+class CFileWriter{
+protected:
+
+  string filename;
+  vector<string> fieldnames;
+  unsigned short nDim;
+  
+  int rank, size;
+  
+  string file_ext;
+  
+public:
+  
+  CFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  virtual ~CFileWriter();
+  
+  virtual void Write_Data(CParallelDataSorter* data_sorter){}
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
new file mode 100644
index 000000000000..155b6fa97056
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -0,0 +1,101 @@
+#pragma once
+#include "../../../Common/include/geometry_structure.hpp"
+
+class CParallelDataSorter{
+protected:
+  
+  int rank; 
+  int size;
+  
+  unsigned long nGlobal_Poin_Par;   // Global number of nodes with halos
+  unsigned long nGlobal_Elem_Par;  // Global number of elems without halos
+  unsigned long nParallel_Poin;
+  unsigned long nParallel_Line,
+  nParallel_Tria,
+  nParallel_Quad,
+  nParallel_Tetr,
+  nParallel_Hexa,
+  nParallel_Pris,
+  nParallel_Pyra;
+  int *Conn_Line_Par;
+  int *Conn_Tria_Par;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
+  int *Conn_Quad_Par;
+  int *Conn_Tetr_Par;
+  int *Conn_Hexa_Par;
+  int *Conn_Pris_Par;
+  int *Conn_Pyra_Par;
+  map<unsigned long,unsigned long> Global2Renumber, 
+                                   Renumber2Global;
+  
+  unsigned long nGlobalPoint_Sort;
+  unsigned long nLocalPoint_Sort;
+  unsigned long nPoint_Restart;
+  int *Local_Halo_Sort;
+
+  unsigned long *beg_node;
+  unsigned long *end_node;
+
+  unsigned long *nPoint_Lin;
+  unsigned long *nPoint_Cum;
+  
+  unsigned short GlobalField_Counter;
+  
+  su2double** Parallel_Data;
+  
+  bool connectivity_sorted;  
+  
+public:
+  
+  CParallelDataSorter(CConfig *config, unsigned short nFields);
+  
+  virtual ~CParallelDataSorter();
+  
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  virtual void SortOutputData(CConfig *config, CGeometry *geometry){}
+
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
+   */
+  virtual void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort){}
+ 
+  unsigned long GetnPoints(){return nParallel_Poin;}
+  
+  unsigned long GetnPointsGlobal(){return nGlobal_Poin_Par;}
+  
+  unsigned long GetnElem(){return nGlobal_Elem_Par;}
+    
+  unsigned long GetnElem(GEO_TYPE type);
+    
+  unsigned long GetElem_Connectivity(GEO_TYPE type, unsigned long iElem, unsigned long iNode);
+  
+  unsigned long GetNodeBegin(unsigned short rank){return beg_node[rank];}
+  
+  unsigned long GetNodeEnd(unsigned short rank){return end_node[rank];}
+  
+  su2double GetData(unsigned short iField, unsigned long iPoint) {return Parallel_Data[iField][iPoint];}
+  
+  virtual unsigned long GetGlobalIndex(unsigned long iPoint){return 0;}
+  
+  unsigned long GetnPointCumulative(){return nPoint_Cum[rank];}
+  
+  bool GetConnectivitySorted(){return connectivity_sorted;}
+
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
+   */
+  void DeallocateData();
+  
+  /*!
+   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
+   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
+   */
+  void DeallocateConnectivity();
+  
+};
diff --git a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
new file mode 100644
index 000000000000..a5ee2ca8486d
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "CFileWriter.hpp"
+
+class CParaviewBinaryFileWriter : public CFileWriter{
+  
+public:
+  
+  CParaviewBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  ~CParaviewBinaryFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+private:
+  void SwapBytes(char *buffer, size_t nBytes, unsigned long nVar);
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
new file mode 100644
index 000000000000..7de0c95e749f
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "CFileWriter.hpp"
+
+class CParaviewFileWriter : public CFileWriter{
+  
+public:
+  
+  CParaviewFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  ~CParaviewFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
new file mode 100644
index 000000000000..f76538c983f8
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
@@ -0,0 +1,15 @@
+#pragma once
+#include "CFileWriter.hpp"
+
+class CSU2BinaryFileWriter : public CFileWriter{
+  
+
+public:
+  
+  CSU2BinaryFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  ~CSU2BinaryFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
diff --git a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
new file mode 100644
index 000000000000..084fa854ec0c
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
@@ -0,0 +1,16 @@
+#pragma once
+#include "CFileWriter.hpp"
+
+class CSU2FileWriter : public CFileWriter{
+  
+
+public:
+  
+  CSU2FileWriter(string filename, vector<string> fields, unsigned short nDim);
+  
+  ~CSU2FileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
new file mode 100644
index 000000000000..8e0a97b3f05f
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "CParallelDataSorter.hpp"
+#include "CFEMDataSorter.hpp"
+
+class CSurfaceFEMDataSorter : public CParallelDataSorter{
+  
+  CFEMDataSorter* volume_sorter;
+    
+public:
+  CSurfaceFEMDataSorter(CConfig *config, unsigned short nFields, CFEMDataSorter* volume_sorter);
+  
+  ~CSurfaceFEMDataSorter();
+  
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
+   */
+  void SortConnectivity(CConfig *config, CGeometry *geometry,  bool val_sort);
+    
+  unsigned long GetGlobalIndex(unsigned long iPoint) { return Renumber2Global[iPoint]; }
+  
+private:
+  
+  /*!
+   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors (DG-FEM solver).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+};
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
new file mode 100644
index 000000000000..268e82f11b3e
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "CParallelDataSorter.hpp"
+#include "CFVMDataSorter.hpp"
+
+class CSurfaceFVMDataSorter : public CParallelDataSorter{
+  
+  CFVMDataSorter* volume_sorter;
+    
+public:
+  CSurfaceFVMDataSorter(CConfig *config, unsigned short nFields, CFVMDataSorter* volume_sorter);
+  
+  ~CSurfaceFVMDataSorter();
+  
+  /*!
+   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void SortOutputData(CConfig *config, CGeometry *geometry);
+  
+  /*!
+   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
+   */
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  
+  unsigned long GetGlobalIndex(unsigned long iPoint) { return Renumber2Global[iPoint]; }
+  
+  
+private:
+  
+  /*!
+   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] Elem_Type - VTK index of the element type being merged.
+   */
+  void SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+
+};
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
new file mode 100644
index 000000000000..24556c750983
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "CFileWriter.hpp"
+
+class CTecplotBinaryFileWriter : public CFileWriter{
+  
+  unsigned long time_iter;
+  su2double timestep;
+  
+public:
+  
+  CTecplotBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  
+  ~CTecplotBinaryFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+  /*!
+   * \brief Calculate the partitioning of nodes to determine:
+   * (a) For a given global node number, to which partition does it belong and what is its local node number; and
+   * (b) How many nodes are held by each partition.
+   */
+  class NodePartitioner {
+  public:
+    /*!
+     * \param[in] global_num_nodes - The total number of nodes being output
+     * \param[in] num_ranks - The number of MPI ranks involved in the output
+     */
+    NodePartitioner(unsigned long global_num_nodes, int num_ranks)
+      : m_num_ranks(num_ranks) {
+      /* rank i has (1-based) global nodes m_node_range[i] + 1 through m_node_range[i + 1] */
+      unsigned long nodes_per_rank = global_num_nodes / num_ranks;
+      unsigned long num_extra_nodes = global_num_nodes - nodes_per_rank * num_ranks;
+      m_node_range.resize(num_ranks + 1);
+      m_node_range[0] = 0;
+      for (int ii = 1; ii <= num_ranks; ii++) {
+        m_node_range[ii] = m_node_range[ii - 1] + nodes_per_rank;
+        if (num_extra_nodes > 0) {
+          ++m_node_range[ii];
+          --num_extra_nodes;
+        }
+      }
+      assert(m_node_range[num_ranks] == global_num_nodes);
+    }
+  
+    /*!
+     * \brief Determine the MPI rank that owns a global node number and its corresponding local node number.
+     * \param global_node_number[in] - The global node number; global node numbers are sequential across all MPI ranks.
+     * \param owning_rank[out] - The MPI rank that owns (will output) the global node
+     * \param node_number[out] - The rank-local node number for the given global node number
+     */
+    void GetOwningRankAndNodeNumber(unsigned long global_node_number, int &owning_rank, unsigned long &node_number)
+    {
+      owning_rank = static_cast<int>(global_node_number / m_node_range[1]);
+      if (owning_rank >= m_num_ranks)
+        owning_rank = m_num_ranks - 1;
+      while(global_node_number > m_node_range[owning_rank + 1])
+        ++owning_rank;
+      while(global_node_number <= m_node_range[owning_rank])
+        --owning_rank;
+      node_number = global_node_number - m_node_range[owning_rank];
+    }
+  
+    /*!
+     * \brief Determine the number of nodes to be output by a particular rank
+     * \param which_rank[in] - The MPI rank
+     * \ret - The number of nodes that will be output by the give MPI rank.
+     */
+    int64_t GetRankNumNodes(int which_rank)
+    {
+      return static_cast<int64_t>(m_node_range[which_rank + 1] - m_node_range[which_rank]);
+    }
+  
+  private:
+    int m_num_ranks;
+    vector<unsigned long> m_node_range;
+  };
+  
+  int64_t GetHaloNodeNumber(unsigned long global_node_number, unsigned long last_local_node, vector<unsigned long> const &halo_node_list);
+  
+};
+
diff --git a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
new file mode 100644
index 000000000000..d89b34de7800
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "CFileWriter.hpp"
+
+class CTecplotFileWriter : public CFileWriter{
+  
+  unsigned long time_iter;
+  su2double timestep;
+  
+public:
+  
+  CTecplotFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  
+  ~CTecplotFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
+
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index cb4711578c7a..a2e0d65308a1 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -124,6 +124,19 @@ libSU2Core_sources = \
   ../src/numerics_direct_elasticity.cpp \
   ../src/numerics_structure.cpp \
   ../src/numerics_template.cpp \
+  ../src/output/filewriter/CCSVFileWriter.cpp \
+  ../src/output/filewriter/CFEMDataSorter.cpp \
+  ../src/output/filewriter/CFVMDataSorter.cpp \
+  ../src/output/filewriter/CParallelDataSorter.cpp \
+  ../src/output/filewriter/CParallelFileWriter.cpp \
+  ../src/output/filewriter/CParaviewBinaryFileWriter.cpp \
+  ../src/output/filewriter/CParaviewFileWriter.cpp \
+  ../src/output/filewriter/CSurfaceFEMDataSorter.cpp \
+  ../src/output/filewriter/CSurfaceFVMDataSorter.cpp \
+  ../src/output/filewriter/CSU2BinaryFileWriter.cpp \
+  ../src/output/filewriter/CSU2FileWriter.cpp \
+  ../src/output/filewriter/CTecplotFileWriter.cpp \
+  ../src/output/filewriter/CTecplotFileWriter.cpp \
   ../src/output/output_cgns.cpp \
   ../src/output/COutput.cpp \
   ../src/output/output_physics.cpp \
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 92225a69a61f..3488f17e7d7e 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -55,28 +55,41 @@ su2_cfd_src = files(['driver_adjoint_singlezone.cpp',
                      'variable_adjoint_elasticity.cpp',
                      'SU2_CFD.cpp'])
 
-su2_cfd_src += files(['output/output_adj_elasticity.cpp',
-                      'output/output_adj_flow_comp.cpp',
-                      'output/output_adj_flow_inc.cpp',
-                      'output/output_adj_heat.cpp',
-                      'output/output_baseline.cpp',
+su2_cfd_src += files(['output/CAdjElasticityOutput.cpp',
+                      'output/CAdjFlowCompOutput.cpp',
+                      'output/CAdjFlowIncOutput.cpp',
+                      'output/CAdjHeatOutput.cpp',
+                      'output/CBaselineOutput.cpp',
                       'output/output_cgns.cpp',
                       'output/output_csv.cpp',
-                      'output/output_driver.cpp',
-                      'output/output_elasticity.cpp',
+                      'output/CDriverOutput.cpp',
+                      'output/CElasticityOutput.cpp',
                       'output/output_fieldview.cpp',
-                      'output/output_flow_comp.cpp',
-                      'output/output_flow_comp_fem.cpp',
-                      'output/output_flow.cpp',
-                      'output/output_flow_inc.cpp',
-                      'output/output_heat.cpp',
-                      'output/output_mesh.cpp',
+                      'output/CFlowCompOutput.cpp',
+                      'output/CFlowCompFEMOutput.cpp',
+                      'output/CFlowOutput.cpp',
+                      'output/CFlowIncOutput.cpp',
+                      'output/CHeatOutput.cpp',
+                      'output/CMeshOutput.cpp',
                       'output/output_paraview.cpp',
                       'output/output_physics.cpp',
-                      'output/output_structure.cpp',
+                      'output/COutput.cpp',
                       'output/output_structure_legacy.cpp',
                       'output/output_su2.cpp',
-                      'output/output_tecplot.cpp'])
+                      'output/output_tecplot.cpp',
+		      'output/filewriter/CParallelDataSorter.cpp',
+		      'output/filewriter/CFVMDataSorter.cpp',
+		      'output/filewriter/CFEMDataSorter.cpp',
+		      'output/filewriter/CSurfaceFEMDataSorter.cpp',
+		      'output/filewriter/CSurfaceFVMDataSorter.cpp',
+		      'output/filewriter/CParallelFileWriter.cpp',
+		      'output/filewriter/CParaviewFileWriter.cpp',
+		      'output/filewriter/CParaviewBinaryFileWriter.cpp',
+		      'output/filewriter/CTecplotFileWriter.cpp',
+		      'output/filewriter/CTecplotBinaryFileWriter.cpp',
+		      'output/filewriter/CCSVFileWriter.cpp',
+		      'output/filewriter/CSU2FileWriter.cpp',
+		      'output/filewriter/CSU2BinaryFileWriter.cpp'])
 
 
 su2_cfd = executable('SU2_CFD',
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 07fdd26c0180..419057d44006 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -35,7 +35,19 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/output.hpp"
+#include "../../include/output/COutput.hpp"
+#include "../../include/output/filewriter/CFVMDataSorter.hpp"
+#include "../../include/output/filewriter/CFEMDataSorter.hpp"
+#include "../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
+
+#include "../../include/output/filewriter/CParaviewFileWriter.hpp"
+#include "../../include/output/filewriter/CTecplotFileWriter.hpp"
+#include "../../include/output/filewriter/CTecplotBinaryFileWriter.hpp"
+#include "../../include/output/filewriter/CCSVFileWriter.hpp"
+#include "../../include/output/filewriter/CSU2FileWriter.hpp"
+#include "../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
+
+
 
 COutput::COutput(CConfig *config) {
   
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
new file mode 100644
index 000000000000..659f8749876b
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -0,0 +1,157 @@
+#include "../../../include/output/filewriter/CCSVFileWriter.hpp"
+
+
+
+
+CCSVFileWriter::CCSVFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".csv";
+  
+  this->filename += file_ext;
+  
+}
+
+
+CCSVFileWriter::~CCSVFileWriter(){
+  
+}
+
+void CCSVFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  /*--- Routine to write the surface CSV files (ASCII). We
+   assume here that, as an ASCII file, it is safer to merge the
+   surface data onto the master rank for writing for 2 reasons:
+   (a) as a surface file, the amount of data should be much less
+   than the volume solution, and (b) writing ASCII files in parallel
+   requires serializing the IO calls with barriers, which ruins
+   the performance at moderate to high rank counts. ---*/
+  
+  unsigned short iVar;
+  
+  int iProcessor, nProcessor = size;
+  
+  unsigned long iPoint, index;
+  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
+  unsigned long nLocalVertex_Surface = 0, MaxLocalVertex_Surface = 0;
+    
+  ofstream Surf_file;
+  Surf_file.precision(15);
+  
+  /*--- Find the max number of surface vertices among all
+   partitions so we can set up buffers. The master node will handle
+   the writing of the CSV file after gathering all of the data. ---*/
+  
+  nLocalVertex_Surface   = data_sorter->GetnPoints();
+  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
+  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long[nProcessor];
+  
+  /*--- Communicate the number of local vertices on each partition
+   to the master node with collective calls. ---*/
+  
+  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1,
+                     MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
+  
+  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG,
+                  Buffer_Recv_nVertex,  1, MPI_UNSIGNED_LONG,
+                  MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- Allocate buffers for send/recv of the data and global IDs. ---*/
+  
+  su2double *bufD_Send = new su2double[MaxLocalVertex_Surface*fieldnames.size()];
+  su2double *bufD_Recv = NULL;
+  
+  unsigned long *bufL_Send = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *bufL_Recv = NULL;
+  
+  /*--- Load send buffers with the local data on this rank. ---*/
+  
+  index = 0;
+  for (iPoint = 0; iPoint < nLocalVertex_Surface; iPoint++) {
+    
+    /*--- Global index values. ---*/
+    
+    bufL_Send[iPoint] = data_sorter->GetGlobalIndex(iPoint);
+    
+    /*--- Solution data. ---*/
+    
+    for (iVar = 0; iVar < fieldnames.size(); iVar++){
+      bufD_Send[index] = data_sorter->GetData(iVar, iPoint);
+      index++;
+    }
+    
+  }
+  
+  /*--- Only the master rank allocates buffers for the recv. ---*/
+  
+  if (rank == MASTER_NODE) {
+    bufD_Recv = new su2double[nProcessor*MaxLocalVertex_Surface*fieldnames.size()];
+    bufL_Recv = new unsigned long[nProcessor*MaxLocalVertex_Surface];
+  }
+  
+  /*--- Collective comms of the solution data and global IDs. ---*/
+  
+  SU2_MPI::Gather(bufD_Send, (int)MaxLocalVertex_Surface*fieldnames.size(), MPI_DOUBLE,
+                  bufD_Recv, (int)MaxLocalVertex_Surface*fieldnames.size(), MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+  
+  SU2_MPI::Gather(bufL_Send, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG,
+                  bufL_Recv, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*--- The master rank alone writes the surface CSV file. ---*/
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Open the CSV file and write the header with variable names. ---*/
+    
+    Surf_file.open(filename.c_str(), ios::out);
+    Surf_file << "\"Point\",";
+    for (iVar = 0; iVar < fieldnames.size()-1; iVar++) {
+      Surf_file << "\"" << fieldnames[iVar] << "\",";
+    }
+    Surf_file << "\"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
+    
+    /*--- Loop through all of the collected data and write each node's values ---*/
+    
+    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
+      for (iPoint = 0; iPoint < Buffer_Recv_nVertex[iProcessor]; iPoint++) {
+        
+        /*--- Current index position for global index access. ---*/
+        
+        index  = iProcessor*MaxLocalVertex_Surface + iPoint;
+        
+        /*--- Write global index values. ---*/
+        
+        Surf_file << bufL_Recv[index] << ", ";
+        
+        /*--- Reset index for solution data access. ---*/
+        
+        index  = (iProcessor*MaxLocalVertex_Surface*fieldnames.size() +
+                  iPoint*fieldnames.size());
+        
+        /*--- Write the solution data for each field variable. ---*/
+        
+        for (iVar = 0; iVar < fieldnames.size(); iVar++){
+          Surf_file << scientific << bufD_Recv[index + iVar];
+          if (iVar != fieldnames.size() -1) Surf_file << ", ";
+        }
+        Surf_file << endl;
+        
+      }
+    }
+    
+    /*--- Close the file. ---*/
+    
+    Surf_file.close();
+    
+  }
+  
+  /*--- Free temporary memory. ---*/
+  
+  if (rank == MASTER_NODE) {
+    delete [] bufL_Recv;
+    delete [] bufD_Recv;
+    delete [] Buffer_Recv_nVertex;
+  }
+  delete [] bufL_Send;
+  delete [] bufD_Send;
+}
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
new file mode 100644
index 000000000000..8583ab739d11
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -0,0 +1,591 @@
+#include "../../../include/output/filewriter/CFEMDataSorter.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
+
+CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
+ 
+  this->Local_Data = &Local_Data;
+  
+  unsigned long iPoint;
+  
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+  
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+    
+    /* Count up the number of local points we have for allocating storage. */
+    
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+      nLocalPoint_Sort++;
+    }
+  }
+  
+  Local_Halo_Sort = new int[nLocalPoint_Sort];
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
+    Local_Halo_Sort[iPoint] = false;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nGlobalPoint_Sort = nLocalPoint_Sort;
+#endif
+
+  /*--- Set a final variable for the number of points in the restart
+   file. We do not write the periodic points for the FV solver, even if
+   they show up in the viz. files. ---*/
+
+  nPoint_Restart = nGlobalPoint_Sort;
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+
+  beg_node = new unsigned long[size];
+  end_node = new unsigned long[size];
+
+  nPoint_Lin = new unsigned long[size];
+  nPoint_Cum = new unsigned long[size+1];
+
+  unsigned long total_points = 0;
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
+    total_points  += nPoint_Lin[ii];
+  }
+
+  /*--- Get the number of remainder points after the even division. ---*/
+
+  unsigned long remainder = nGlobalPoint_Sort - total_points;
+  for (unsigned long ii = 0; ii < remainder; ii++) {
+    nPoint_Lin[ii]++;
+  }
+
+  /*--- Store the local number of nodes on each proc in the linear
+   partitioning, the beginning/end index, and the linear partitioning
+   within an array in cumulative storage format. ---*/
+
+  beg_node[0] = 0;
+  end_node[0] = beg_node[0] + nPoint_Lin[0];
+  nPoint_Cum[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    beg_node[ii]   = end_node[ii-1];
+    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
+    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
+  }
+  nPoint_Cum[size] = nGlobalPoint_Sort;
+}
+
+CFEMDataSorter::~CFEMDataSorter(){
+  
+  delete [] beg_node;
+  delete [] end_node;
+  delete [] nPoint_Cum;
+  delete [] nPoint_Lin;
+  
+  delete [] Local_Halo_Sort;
+  
+}
+
+
+void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+
+  unsigned long iProcessor;
+  unsigned long iPoint, Global_Index;
+
+  /* For convenience, set the total number of variables stored at each DOF. */
+
+  int VARS_PER_POINT = GlobalField_Counter;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+
+  //map<unsigned long, unsigned long> mapLocal2Global;
+  vector<unsigned long> globalID;
+
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+
+    /* Loop over the DOFs for this element and store the solution. */
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+    }
+  }
+
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Flag = new int[size];
+
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+    nPoint_Flag[ii]= -1;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
+
+    /*--- Get the global index of the current point. ---*/
+
+    Global_Index = globalID[iPoint];
+
+    /*--- Search for the processor that owns this point ---*/
+
+    iProcessor = Global_Index/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Cum[iProcessor])
+      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+
+    /*--- If we have not visted this node yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      nPoint_Send[iProcessor+1]++;
+    }
+
+  }
+
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+
+  /*--- Prepare to send coordinates. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
+
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
+
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+
+  /*--- Allocate memory to hold the connectivity that we are sending. ---*/
+
+  su2double *connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+
+  /*--- Allocate arrays for sending the global ID. ---*/
+
+  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
+    idSend[ii] = 0;
+
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
+
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
+
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+
+    /*--- Get the index of the current point. ---*/
+
+    Global_Index = globalID[iPoint];
+
+    /*--- Search for the processor that owns this point. ---*/
+
+    iProcessor = Global_Index/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Cum[iProcessor])
+      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+
+    /*--- Load data into the buffer for sending. ---*/
+
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
+
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      unsigned long nn = index[iProcessor];
+
+      /*--- Load the data values. ---*/
+
+      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+        connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
+      }
+
+      /*--- Load the global ID (minus offset) for sorting the
+       points once they all reach the correct processor. ---*/
+
+      nn = idIndex[iProcessor];
+      idSend[nn] = Global_Index - beg_node[iProcessor];
+
+      /*--- Increment the index by the message length ---*/
+
+      index[iProcessor]  += VARS_PER_POINT;
+      idIndex[iProcessor]++;
+
+    }
+
+  }
+
+  /*--- Free memory after loading up the send buffer. ---*/
+
+  delete [] index;
+  delete [] idIndex;
+
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+
+  su2double *connRecv = NULL;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
+    connRecv[ii] = 0;
+
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
+    idRecv[ii] = 0;
+
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the global IDs. ---*/
+
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+
+  /*--- Repeat the process to communicate the global IDs. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
+
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. First, allocate the
+   appropriate amount of memory for this section. ---*/
+
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
+      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+    }
+  }
+
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
+
+  nParallel_Poin = nPoint_Recv[size];
+
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+
+  /*--- Free temporary memory from communications ---*/
+
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] nPoint_Recv;
+  delete [] nPoint_Send;
+  delete [] nPoint_Flag;
+  
+}
+
+
+void CFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
+
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting volumetric grid connectivity." << endl;
+  
+  SortVolumetricConnectivity(config, geometry, TRIANGLE     );
+  SortVolumetricConnectivity(config, geometry, QUADRILATERAL);
+  SortVolumetricConnectivity(config, geometry, TETRAHEDRON  );
+  SortVolumetricConnectivity(config, geometry, HEXAHEDRON   );
+  SortVolumetricConnectivity(config, geometry, PRISM        );
+  SortVolumetricConnectivity(config, geometry, PYRAMID      );
+  
+  
+  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  
+  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  
+}
+
+void CFEMDataSorter::SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  /* Determine the number of nodes for this element type. */
+  unsigned short NODES_PER_ELEMENT = 0;
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+        geometrical information for the FEM DG solver. ---*/
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+
+  const CFEMStandardElement *standardElementsSol = DGGeometry->GetStandardElementsSol();
+
+  /*--- Determine the number of sub-elements on this rank. ---*/
+  unsigned long nSubElem_Local = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+
+    /* Determine the necessary data from the corresponding standard elem. */
+    const unsigned short ind       = volElem[i].indStandardElement;
+    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
+    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
+
+     /* Only store the linear sub elements if they are of
+        the current type that we are storing. */
+     if(Elem_Type == VTK_Type1) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType1();
+     if(Elem_Type == VTK_Type2) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType2();
+  }
+
+  /* Allocate the memory to store the connectivity if the size is
+     larger than zero. */
+  int *Conn_SubElem = NULL;
+  if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
+
+  /*--- Loop again over the local volume elements and store the global
+        connectivities of the sub-elements. Note one is added to the
+        index value, because visualization softwares typically use
+        1-based indexing. ---*/
+  unsigned long kNode = 0;
+  for(unsigned long i=0; i<nVolElemOwned; ++i) {
+
+    /* Determine the necessary data from the corresponding standard elem. */
+    const unsigned short ind       = volElem[i].indStandardElement;
+    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
+    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
+
+    /* Check if the first sub-element is of the required type. */
+    if(Elem_Type == VTK_Type1) {
+
+      /* Get the number of sub-elements and the local connectivity of
+         the sub-elements. */
+      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType1();
+      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType1();
+
+      /* Store the global connectivities. */
+      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
+      for(unsigned short k=0; k<kk; ++k, ++kNode)
+        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
+    }
+
+    /* Check if the second sub-element is of the required type. */
+    if(Elem_Type == VTK_Type2) {
+
+      /* Get the number of sub-elements and the local connectivity of
+         the sub-elements. */
+      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType2();
+      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType2();
+
+      /* Store the global connectivities. */
+      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
+      for(unsigned short k=0; k<kk; ++k, ++kNode)
+        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
+    }
+  }
+
+  /*--- Store the particular global element count in the class data,
+        and set the class data pointer to the connectivity array. ---*/
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nParallel_Tria = nSubElem_Local;
+      Conn_Tria_Par = Conn_SubElem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nSubElem_Local;
+      Conn_Quad_Par = Conn_SubElem;
+      break;
+    case TETRAHEDRON:
+      nParallel_Tetr = nSubElem_Local;
+      Conn_Tetr_Par = Conn_SubElem;
+      break;
+    case HEXAHEDRON:
+      nParallel_Hexa = nSubElem_Local;
+      Conn_Hexa_Par = Conn_SubElem;
+      break;
+    case PRISM:
+      nParallel_Pris = nSubElem_Local;
+      Conn_Pris_Par = Conn_SubElem;
+      break;
+    case PYRAMID:
+      nParallel_Pyra = nSubElem_Local;
+      Conn_Pyra_Par = Conn_SubElem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
+}
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
new file mode 100644
index 000000000000..44385f8779b4
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -0,0 +1,1115 @@
+#include "../../../include/output/filewriter/CFVMDataSorter.hpp"
+
+
+CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
+ 
+  this->Local_Data = &Local_Data;
+  
+  unsigned long iPoint;
+  
+  /*--- Reset point sorting counters ---*/
+
+  nGlobalPoint_Sort = 0;
+  nLocalPoint_Sort  = 0;
+
+  /*--- Search all send/recv boundaries on this partition for any periodic
+     nodes that were part of the original domain. We want to recover these
+     for visualization purposes. ---*/
+  
+  unsigned long iVertex;
+  bool isPeriodic;
+  
+  Local_Halo_Sort = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo_Sort[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      
+      /*--- Checking for less than or equal to the rank, because there may
+         be some periodic halo nodes that send info to the same rank. ---*/
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo_Sort[iPoint] = false;
+      }
+    }
+  }
+  
+  /*--- Sum total number of nodes that belong to the domain ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo_Sort[iPoint] == false)
+      nLocalPoint_Sort++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nGlobalPoint_Sort = nLocalPoint_Sort;
+#endif
+  
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+
+  beg_node = new unsigned long[size];
+  end_node = new unsigned long[size];
+
+  nPoint_Lin = new unsigned long[size];
+  nPoint_Cum = new unsigned long[size+1];
+
+  unsigned long total_points = 0;
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
+    total_points  += nPoint_Lin[ii];
+  }
+
+  /*--- Get the number of remainder points after the even division. ---*/
+
+  unsigned long remainder = nGlobalPoint_Sort - total_points;
+  for (unsigned long ii = 0; ii < remainder; ii++) {
+    nPoint_Lin[ii]++;
+  }
+
+  /*--- Store the local number of nodes on each proc in the linear
+   partitioning, the beginning/end index, and the linear partitioning
+   within an array in cumulative storage format. ---*/
+
+  beg_node[0] = 0;
+  end_node[0] = beg_node[0] + nPoint_Lin[0];
+  nPoint_Cum[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    beg_node[ii]   = end_node[ii-1];
+    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
+    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
+  }
+  nPoint_Cum[size] = nGlobalPoint_Sort;
+  
+}
+
+CFVMDataSorter::~CFVMDataSorter(){
+  
+  delete [] beg_node;
+  delete [] end_node;
+  delete [] nPoint_Cum;
+  delete [] nPoint_Lin;
+  
+  delete [] Local_Halo_Sort;
+  
+}
+
+
+
+void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+  
+  unsigned long iProcessor;
+  unsigned long iPoint, Global_Index, nTotalPoint;
+  
+  int VARS_PER_POINT = GlobalField_Counter;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint_Sort;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+    nPoint_Flag[ii]= -1;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
+    
+    /*--- We only write interior points and recovered periodic points. ---*/
+    
+    if (!Local_Halo_Sort[iPoint]) {
+      
+      /*--- Get the global index of the current point. ---*/
+      
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this node yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        nPoint_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+  
+  /*--- Prepare to send coordinates. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
+    
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  su2double *connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    
+    /*--- We only write interior points and recovered periodic points. ---*/
+    
+    if (!Local_Halo_Sort[iPoint]) {
+      
+      /*--- Get the index of the current point. ---*/
+      
+      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      
+      /*--- Search for the processor that owns this point. ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear[iProcessor])
+        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+      
+      /*--- Load node coordinates into the buffer for sending. ---*/
+      
+      if (nPoint_Flag[iProcessor] != (int)iPoint) {
+        
+        nPoint_Flag[iProcessor] = (int)iPoint;
+        unsigned long nn = index[iProcessor];
+        
+        /*--- Load the data values. ---*/
+        
+        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+          connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
+        }
+        
+        /*--- Load the global ID (minus offset) for sorting the
+         points once they all reach the correct processor. ---*/
+        
+        nn = idIndex[iProcessor];
+        idSend[nn] = Global_Index - starting_node[iProcessor];
+        
+        /*--- Increment the index by the message length ---*/
+        
+        index[iProcessor]  += VARS_PER_POINT;
+        idIndex[iProcessor]++;
+        
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] idIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  su2double *connRecv = NULL;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the global IDs. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. First, allocate the
+   appropriate amount of memory for this section. ---*/
+  
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
+      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+    }
+  }
+  
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
+  
+  nParallel_Poin = nPoint_Recv[size];
+  
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] nPoint_Recv;
+  delete [] nPoint_Send;
+  delete [] nPoint_Flag;
+
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+  
+}
+
+
+void CFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
+
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting volumetric grid connectivity." << endl;
+  
+  SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
+  SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
+  SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
+  SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
+  SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
+  SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);  
+  
+  
+  /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  
+  unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+#ifndef HAVE_MPI
+  nGlobal_Elem_Par = nTotal_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+}
+
+void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
+                                         CGeometry *geometry,
+                                         unsigned short Elem_Type,
+                                         bool val_sort) {
+  
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT = 0;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
+  
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    case TETRAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
+      break;
+    case HEXAHEDRON:
+      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
+      break;
+    case PRISM:
+      NODES_PER_ELEMENT = N_POINTS_PRISM;
+      break;
+    case PYRAMID:
+      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+      if (Local_Halo[iPoint] == false)
+        nLocalPoint++;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++ ) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+        
+        /*--- Get the index of the current point. ---*/
+        
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
+        
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+        
+        /*--- Search for the processor that owns this point. If we are
+         sorting the elements, we use the linear partitioning to find
+         the rank, otherwise, we simply have the current rank load its
+         own elements into the connectivity data structure. ---*/
+        
+        if (val_sort) {
+          iProcessor = Global_Index/npoint_procs[0];
+          if (iProcessor >= (unsigned long)size)
+            iProcessor = (unsigned long)size-1;
+          if (Global_Index >= nPoint_Linear[iProcessor])
+            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+          else
+            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        } else {
+          iProcessor = rank;
+        }
+        
+        
+        /*--- If we have not visited this element yet, increment our
+         number of elements that must be sent to a particular proc. ---*/
+        
+        if ((nElem_Flag[iProcessor] != ii)) {
+          nElem_Flag[iProcessor] = ii;
+          nElem_Send[iProcessor+1]++;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
+  
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++) {
+    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
+      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+        
+        /*--- Get the index of the current point. ---*/
+        
+        iPoint = geometry->elem[ii]->GetNode(jj);
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- Search for the lowest global index in this element. We
+         send the element to the processor owning the range that includes
+         the lowest global index value. ---*/
+        
+        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+          jPoint = geometry->elem[ii]->GetNode(kk);
+          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+          if (newID < Global_Index) Global_Index = newID;
+        }
+       
+        /*--- Search for the processor that owns this point. If we are
+         sorting the elements, we use the linear partitioning to find
+         the rank, otherwise, we simply have the current rank load its
+         own elements into the connectivity data structure. ---*/
+        
+        if (val_sort) {
+          iProcessor = Global_Index/npoint_procs[0];
+          if (iProcessor >= (unsigned long)size)
+            iProcessor = (unsigned long)size-1;
+          if (Global_Index >= nPoint_Linear[iProcessor])
+            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+          else
+            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        } else {
+          iProcessor = rank;
+        }
+        
+        
+        /*--- Load connectivity into the buffer for sending ---*/
+        
+        if (nElem_Flag[iProcessor] != ii) {
+          
+          nElem_Flag[iProcessor] = ii;
+          unsigned long nn = index[iProcessor];
+          unsigned long mm = haloIndex[iProcessor];
+          
+          /*--- Load the connectivity values. ---*/
+          
+          for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+            iPoint = geometry->elem[ii]->GetNode(kk);
+            connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+            
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. ---*/
+            
+            if (Local_Halo[iPoint]) haloSend[mm] = true;
+            
+          }
+          
+          /*--- Increment the index by the message length ---*/
+          
+          index[iProcessor]    += NODES_PER_ELEMENT;
+          haloIndex[iProcessor]++;
+          
+        }
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] haloIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
+  
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
+    }
+  }
+  
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  switch (Elem_Type) {
+    case TRIANGLE:
+      nParallel_Tria = nElem_Total;
+      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nElem_Total;
+      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
+      break;
+    case TETRAHEDRON:
+      nParallel_Tetr = nElem_Total;
+      if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
+      break;
+    case HEXAHEDRON:
+      nParallel_Hexa = nElem_Total;
+      if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
+      break;
+    case PRISM:
+      nParallel_Pris = nElem_Total;
+      if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
+      break;
+    case PYRAMID:
+      nParallel_Pyra = nElem_Total;
+      if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic; 
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+
+}
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
new file mode 100644
index 000000000000..e2ef432e8ebe
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -0,0 +1,130 @@
+#include "../../../include/output/filewriter/CParallelDataSorter.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
+
+CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields){
+  
+  rank = SU2_MPI::GetRank();
+  size = SU2_MPI::GetSize();
+  
+  GlobalField_Counter = nFields;
+  
+  nParallel_Hexa = 0;
+  nParallel_Line = 0;
+  nParallel_Quad = 0;
+  nParallel_Tetr = 0;
+  nParallel_Pris = 0;
+  nParallel_Pyra = 0;
+  nParallel_Tria = 0;
+  
+  Conn_Line_Par = NULL;
+  Conn_Hexa_Par = NULL;
+  Conn_Pris_Par = NULL;
+  Conn_Quad_Par = NULL;
+  Conn_Tetr_Par = NULL;
+  Conn_Tria_Par = NULL;
+  Conn_Pyra_Par = NULL;
+  
+  Parallel_Data = NULL;
+}
+
+CParallelDataSorter::~CParallelDataSorter(){
+  
+  DeallocateConnectivity();
+  
+  DeallocateData();
+  
+}
+
+
+unsigned long CParallelDataSorter::GetnElem(GEO_TYPE type){
+  
+  switch (type) {
+    case LINE:
+      return nParallel_Line;
+      break;
+    case TRIANGLE:
+      return nParallel_Tria;
+      break;
+    case QUADRILATERAL:
+      return nParallel_Quad;
+      break;
+    case TETRAHEDRON:
+      return nParallel_Tetr;
+      break;
+    case HEXAHEDRON:
+      return nParallel_Hexa;
+      break;
+    case PRISM:
+      return nParallel_Pris;
+      break;
+    case PYRAMID:
+      return nParallel_Pyra;
+      break;
+    default:
+      break;
+  }
+  
+  SU2_MPI::Error("GEO_TYPE not found", CURRENT_FUNCTION);
+  
+  return 0;
+}
+
+
+unsigned long CParallelDataSorter::GetElem_Connectivity(GEO_TYPE type, unsigned long iElem, unsigned long iNode) {
+  
+  switch (type) {
+    case LINE:
+      return Conn_Line_Par[iElem*N_POINTS_LINE + iNode];
+      break;
+    case TRIANGLE:
+      return Conn_Tria_Par[iElem*N_POINTS_TRIANGLE + iNode];
+      break;
+    case QUADRILATERAL:
+      return Conn_Quad_Par[iElem*N_POINTS_QUADRILATERAL + iNode];
+      break;
+    case TETRAHEDRON:
+      return Conn_Tetr_Par[iElem*N_POINTS_TETRAHEDRON + iNode];
+      break;
+    case HEXAHEDRON:
+      return Conn_Hexa_Par[iElem*N_POINTS_HEXAHEDRON + iNode];
+      break;
+    case PRISM:
+      return Conn_Pris_Par[iElem*N_POINTS_PRISM + iNode];
+      break;
+    case PYRAMID:
+      return Conn_Pyra_Par[iElem*N_POINTS_PYRAMID + iNode];
+      break;
+    default:
+      break;
+  }
+  
+  SU2_MPI::Error("GEO_TYPE not found", CURRENT_FUNCTION);
+  
+  return 0;
+}
+
+void CParallelDataSorter::DeallocateConnectivity() {
+  
+  /*--- Deallocate memory for connectivity data on each processor. ---*/
+  
+  if (nParallel_Line > 0 && Conn_Line_Par != NULL) delete [] Conn_Line_Par;
+  if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
+  if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
+  if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
+  if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
+  if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
+  if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
+  
+  
+}
+
+void CParallelDataSorter::DeallocateData() {
+  
+  /*--- Deallocate memory for solution data ---*/
+  
+  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  }
+  if (Parallel_Data != NULL) delete [] Parallel_Data;
+
+}
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
new file mode 100644
index 000000000000..99fc77580523
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -0,0 +1,20 @@
+#include "../../../include/output/filewriter/CFileWriter.hpp"
+
+
+CFileWriter::CFileWriter(string filename, vector<string> fields, unsigned short nDim){
+  
+  rank = SU2_MPI::GetRank();
+  size = SU2_MPI::GetSize();
+  
+  this->nDim = nDim;
+  
+  this->filename = filename;
+  
+  this->fieldnames = fields;
+  
+}
+
+
+CFileWriter::~CFileWriter(){
+  
+}
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
new file mode 100644
index 000000000000..afdcc802bd93
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -0,0 +1,1051 @@
+#include "../../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
+
+
+CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+  CFileWriter(filename, fields, nDim){
+  
+  file_ext = ".vtk";
+  
+  this->filename += file_ext;
+  
+}
+
+
+CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
+  
+}
+
+void CParaviewBinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  if (!data_sorter->GetConnectivitySorted()){
+    SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
+  }
+  
+  unsigned short iDim;
+  
+  unsigned long iPoint, iElem, iNode;
+  
+  ofstream Paraview_File;
+    
+  int MAX_STRING_LENGTH = 255;
+  char str_buf[MAX_STRING_LENGTH], fname[100];
+  
+  const int NCOORDS = 3;
+
+  strcpy(fname, filename.c_str());
+  
+  /*--- Check for big endian. We have to swap bytes otherwise. ---*/
+  
+  bool BigEndian;
+  union {int i; char c[4];} val;
+  val.i = 0x76543210;
+  if (val.c[0] == 0x10) BigEndian = false;
+  else BigEndian = true;
+  
+  /*--- Serial implementation in case we have not compiled with MPI. ---*/
+  
+#ifndef HAVE_MPI
+  
+  FILE* fhw;
+  fhw = fopen(fname, "wb");
+  
+  unsigned long iNode2;
+  unsigned long nSurf_Elem_Storage;
+  unsigned long nGlobal_Elem_Storage;
+  
+  /*--- Error check for opening the file. ---*/
+  
+  if (!fhw) {
+    SU2_MPI::Error(string("Unable to open VTK binary legacy file ") +
+                   filename, CURRENT_FUNCTION);
+  }
+  
+  /*--- File header written in ASCII. ---*/
+  
+  strcpy(str_buf, "# vtk DataFile Version 3.0\n");
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  strcpy(str_buf, "vtk output\n");
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  strcpy(str_buf, "BINARY\n");
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  /*--- Write the point coordinates. ---*/
+  
+  unsigned long GlobalPoint = data_sorter->GetnPointsGlobal();
+  
+  SPRINTF(str_buf, "POINTS %i float\n", (int)GlobalPoint);
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  /*--- Load/write the 1D buffer of point coordinates. ---*/
+  
+  float *coord_buf = new float[GlobalPoint*NCOORDS];
+  for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
+    for (iDim = 0; iDim < NCOORDS; iDim++) {
+      if (nDim == 2 && iDim == 2) {
+        coord_buf[iPoint*NCOORDS + iDim] = 0.0;
+      } else {
+        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(iDim,iPoint));
+        coord_buf[iPoint*NCOORDS + iDim] = val;
+      }
+    }
+  }
+  if (!BigEndian) SwapBytes((char *)coord_buf, sizeof(float), 3*GlobalPoint);
+  
+  fwrite(coord_buf, sizeof(float), 3*GlobalPoint, fhw);
+  delete [] coord_buf;
+  
+  /*--- Write the connectivity data. ---*/
+  
+  unsigned long nTot_Line;
+  unsigned long nTot_Tria, nTot_Quad;
+  unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
+  nTot_Line = data_sorter->GetnElem(LINE);  
+  nTot_Tria = data_sorter->GetnElem(TRIANGLE);
+  nTot_Quad = data_sorter->GetnElem(QUADRILATERAL);
+  nTot_Tetr = data_sorter->GetnElem(TETRAHEDRON);
+  nTot_Hexa = data_sorter->GetnElem(HEXAHEDRON);
+  nTot_Pris = data_sorter->GetnElem(PRISM);
+  nTot_Pyra = data_sorter->GetnElem(PYRAMID);
+  nGlobal_Elem_Storage = (nTot_Line*3 + nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 +
+                          nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6);
+  
+  int *conn_buf = NULL;
+  
+  SPRINTF (str_buf, "\nCELLS %i %i\n", (int)data_sorter->GetnElem(),
+           (int)nGlobal_Elem_Storage);
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  conn_buf = new int[data_sorter->GetnElem()*(N_POINTS_HEXAHEDRON+1)];
+  
+  
+  /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
+  
+  
+  for (iElem = 0; iElem < nTot_Line; iElem++) {
+    iNode  = iElem*N_POINTS_LINE;
+    iNode2 = iElem*(N_POINTS_LINE+1);
+    conn_buf[iNode2+0] = N_POINTS_LINE;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Line*(N_POINTS_LINE+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Line*(N_POINTS_LINE+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Tria; iElem++) {
+    iNode  = iElem*N_POINTS_TRIANGLE;
+    iNode2 = iElem*(N_POINTS_TRIANGLE+1);
+    conn_buf[iNode2+0] = N_POINTS_TRIANGLE;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Tria*(N_POINTS_TRIANGLE+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Tria*(N_POINTS_TRIANGLE+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Quad; iElem++) {
+    iNode  = iElem*N_POINTS_QUADRILATERAL;
+    iNode2 = iElem*(N_POINTS_QUADRILATERAL+1);
+    conn_buf[iNode2+0] = N_POINTS_QUADRILATERAL;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
+    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Quad*(N_POINTS_QUADRILATERAL+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Quad*(N_POINTS_QUADRILATERAL+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Tetr; iElem++) {
+    iNode  = iElem*N_POINTS_TETRAHEDRON;
+    iNode2 = iElem*(N_POINTS_TETRAHEDRON+1);
+    conn_buf[iNode2+0] = N_POINTS_TETRAHEDRON;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
+    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Tetr*(N_POINTS_TETRAHEDRON+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Tetr*(N_POINTS_TETRAHEDRON+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Hexa; iElem++) {
+    iNode  = iElem*N_POINTS_HEXAHEDRON;
+    iNode2 = iElem*(N_POINTS_HEXAHEDRON+1);
+    conn_buf[iNode2+0] = N_POINTS_HEXAHEDRON;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
+    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
+    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
+    conn_buf[iNode2+6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
+    conn_buf[iNode2+7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
+    conn_buf[iNode2+8] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Hexa*(N_POINTS_HEXAHEDRON+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Hexa*(N_POINTS_HEXAHEDRON+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Pris; iElem++) {
+    iNode  = iElem*N_POINTS_PRISM;
+    iNode2 = iElem*(N_POINTS_PRISM+1);
+    conn_buf[iNode2+0] = N_POINTS_PRISM;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
+    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
+    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
+    conn_buf[iNode2+6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Pris*(N_POINTS_PRISM+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Pris*(N_POINTS_PRISM+1), fhw);
+  
+  for (iElem = 0; iElem < nTot_Pyra; iElem++) {
+    iNode  = iElem*N_POINTS_PYRAMID;
+    iNode2 = iElem*(N_POINTS_PYRAMID+1);
+    conn_buf[iNode2+0] = N_POINTS_PYRAMID;
+    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
+    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
+    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
+    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
+    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
+  }
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
+                            nTot_Pyra*(N_POINTS_PYRAMID+1));
+  fwrite(conn_buf, sizeof(int),
+         nTot_Pyra*(N_POINTS_PYRAMID+1), fhw);
+  
+  
+  
+  if (conn_buf != NULL) delete [] conn_buf;
+  
+  /*--- Load/write the cell type for all elements in the file. ---*/
+  
+
+  SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(data_sorter->GetnElem()));
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  int *type_buf = NULL;
+  
+  type_buf = new int[data_sorter->GetnElem()];
+  
+  for (iElem = 0; iElem < nTot_Line; iElem++) {
+    type_buf[iElem] = LINE;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Line);
+  fwrite(type_buf, sizeof(int), nTot_Line, fhw);
+    
+  for (iElem = 0; iElem < nTot_Tria; iElem++) {
+    type_buf[iElem] = TRIANGLE;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Tria);
+  fwrite(type_buf, sizeof(int), nTot_Tria, fhw);
+  
+  for (iElem = 0; iElem < nTot_Quad; iElem++) {
+    type_buf[iElem] = QUADRILATERAL;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Quad);
+  fwrite(type_buf, sizeof(int), nTot_Quad, fhw);
+  
+  for (iElem = 0; iElem < nTot_Tetr; iElem++) {
+    type_buf[iElem] = TETRAHEDRON;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Tetr);
+  fwrite(type_buf, sizeof(int), nTot_Tetr, fhw);
+  
+  for (iElem = 0; iElem < nTot_Hexa; iElem++) {
+    type_buf[iElem] = HEXAHEDRON;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Hexa);
+  fwrite(type_buf, sizeof(int), nTot_Hexa, fhw);
+  
+  for (iElem = 0; iElem < nTot_Pris; iElem++) {
+    type_buf[iElem] = PRISM;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Pris);
+  fwrite(type_buf, sizeof(int), nTot_Pris, fhw);
+  
+  for (iElem = 0; iElem < nTot_Pyra; iElem++) {
+    type_buf[iElem] = PYRAMID;
+  }
+  if (!BigEndian)
+    SwapBytes((char *)type_buf, sizeof(int), nTot_Pyra);
+  fwrite(type_buf, sizeof(int), nTot_Pyra, fhw);
+  
+  
+  
+  if (type_buf != NULL) delete [] type_buf;
+  
+  /*--- Now write the scalar and vector data (reuse the counts above). ---*/
+  
+  SPRINTF (str_buf, "\nPOINT_DATA %i\n", (int)GlobalPoint);
+  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  
+  unsigned short varStart = 2;
+  if (nDim == 3) varStart++;
+  
+  /*--- Need to adjust container location to avoid PointID tag and coords. ---*/
+  
+  unsigned short iField, VarCounter = varStart;
+  for (iField = varStart; iField < fieldnames.size(); iField++) {
+    
+    string fieldname = fieldnames[iField];
+    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'),
+                    fieldname.end());
+    
+    bool output_variable = true, isVector = false;
+    size_t found = fieldname[iField].find("_x");
+    if (found!=string::npos) {
+      output_variable = true;
+      isVector = true;
+    }
+    found = fieldname[iField].find("_y");
+    if (found!=string::npos) {
+      //skip
+      output_variable = false;
+      VarCounter++;
+    }
+    found = fieldname[iField].find("_z");
+    if (found!=string::npos) {
+      //skip
+      output_variable = false;
+      VarCounter++;
+    }
+    
+    if (output_variable && isVector) {
+      
+      fieldname.erase(fieldname.end()-2,fieldname.end());
+      SPRINTF (str_buf, "\nVECTORS %s float\n", fieldname.c_str());
+      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      
+      /*--- Prepare the 1D data buffer on this rank. ---*/
+      
+      float *vec_buf = new float[GlobalPoint*NCOORDS];
+      
+      /*--- For now, create a temp 1D buffer to load up the data for writing.
+       This will be replaced with a derived data type most likely. ---*/
+      
+      float val = 0.0;
+      for (iPoint = 0; iPoint < GlobalPoint; iPoint++)
+        for (iDim = 0; iDim < NCOORDS; iDim++) {
+          if (nDim == 2 && iDim == 2) {
+            vec_buf[iPoint*NCOORDS + iDim] = 0.0;
+          } else {
+            val = (float)SU2_TYPE::GetValue(Data[VarCounter+iDim][iPoint]);
+            vec_buf[iPoint*NCOORDS + iDim] = val;
+          }
+        }
+      if (!BigEndian)
+        SwapBytes((char *)vec_buf, sizeof(float), NCOORDS*GlobalPoint);
+      fwrite(vec_buf, sizeof(float), NCOORDS*GlobalPoint, fhw);
+      
+      delete [] vec_buf;
+      
+      VarCounter++;
+      
+    } else if (output_variable) {
+      
+      SPRINTF (str_buf, "\nSCALARS %s float 1\n", fieldname.c_str());
+      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      
+      SPRINTF (str_buf, "LOOKUP_TABLE default\n");
+      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      
+      /*--- Prepare the 1D data buffer on this rank. ---*/
+      
+      float *scalar_buf = new float[GlobalPoint];
+      
+      /*--- For now, create a temp 1D buffer to load up the data for writing.
+       This will be replaced with a derived data type most likely. ---*/
+      
+      for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
+        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter,iPoint));
+        scalar_buf[iPoint] = val;
+      }
+      if (!BigEndian)
+        SwapBytes((char *)scalar_buf, sizeof(float), GlobalPoint);
+      fwrite(scalar_buf, sizeof(float), GlobalPoint, fhw);
+      
+      delete [] scalar_buf;
+      
+      VarCounter++;
+    }
+    
+  }
+  
+  /*--- Close the file. ---*/
+  
+  fclose(fhw);
+  
+#else
+  
+  /*--- Parallel binary output using MPI I/O. ---*/
+  
+  MPI_File fhw;
+  SU2_MPI::Status status;
+  MPI_Datatype etype, filetype;
+  MPI_Offset disp, disp2;
+  int ierr;
+  
+  /*--- All ranks open the file using MPI. Here, we try to open the file with
+   exclusive so that an error is generated if the file exists. We always want
+   to write a fresh output file, so we delete any existing files and create
+   a new one. ---*/
+  
+  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                       MPI_INFO_NULL, &fhw);
+  if (ierr != MPI_SUCCESS)  {
+    MPI_File_close(&fhw);
+    if (rank == 0)
+      MPI_File_delete(fname, MPI_INFO_NULL);
+    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                         MPI_INFO_NULL, &fhw);
+  }
+  
+  /*--- Error check opening the file. ---*/
+  
+  if (ierr) {
+    SU2_MPI::Error(string("Unable to open VTK binary legacy file ") +
+                   string(fname), CURRENT_FUNCTION);
+  }
+    
+  /*--- Write the initial strings to the file. Only the master will
+   write the header lines, but all ranks will store the offsets. ---*/
+  
+  disp = 0;
+  strcpy(str_buf, "# vtk DataFile Version 3.0\n");
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  strcpy(str_buf, "vtk output\n");
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  strcpy(str_buf, "BINARY\n");
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  /*--- Communicate the number of total points that will be
+   written by each rank. After this communication, each proc knows how
+   many poinnts will be written before its location in the file and the
+   offsets can be correctly set. ---*/
+  
+  unsigned long myPoint, GlobalPoint;
+  
+  GlobalPoint = data_sorter->GetnPointsGlobal();
+  myPoint     = data_sorter->GetnPoints();
+  
+  
+  int *nPoint_Snd = new int[size+1];
+  int *nPoint_Cum = new int[size+1];
+  
+  nPoint_Snd[0] = 0; nPoint_Cum[0] = 0;
+  for (int ii=1; ii < size; ii++) {
+    nPoint_Snd[ii] = myPoint; nPoint_Cum[ii] = 0;
+  }
+  nPoint_Snd[size] = myPoint; nPoint_Cum[size] = 0;
+  
+  /*--- Communicate the local counts to all ranks for building offsets. ---*/
+  
+  SU2_MPI::Alltoall(&(nPoint_Snd[1]), 1, MPI_INT,
+                    &(nPoint_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
+  
+  /*--- Put the counters into cumulative storage format. ---*/
+  
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Cum[ii+1] += nPoint_Cum[ii];
+  }
+  
+  SPRINTF(str_buf, "POINTS %i float\n", SU2_TYPE::Int(GlobalPoint));
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  /*--- Load/write the 1D buffer of point coordinates. Note that we
+   always have 3 coordinate dimensions, even for 2D problems. ---*/
+  
+  float *coord_buf = new float[myPoint*NCOORDS];
+  for (iPoint = 0; iPoint < myPoint; iPoint++) {
+    for (iDim = 0; iDim < NCOORDS; iDim++) {
+      if (nDim == 2 && iDim == 2) {
+        coord_buf[iPoint*NCOORDS + iDim] = 0.0;
+      } else {
+        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(iDim, iPoint));
+        coord_buf[iPoint*NCOORDS + iDim] = val;
+      }
+    }
+  }
+  if (!BigEndian) SwapBytes((char *)coord_buf, sizeof(float), myPoint*NCOORDS);
+
+  /*--- We will write the point coordinates as floats. ---*/
+  
+  etype = MPI_FLOAT;
+  
+  /*--- Define a derived datatype for this ranks contiguous
+   chunk of data that will be placed in the file. ---*/
+  
+  MPI_Type_contiguous(myPoint*NCOORDS, MPI_FLOAT, &filetype);
+  MPI_Type_commit(&filetype);
+  
+  /*--- Compute the offset for this rank's linear partition of the
+   data in bytes. ---*/
+  
+  disp2 = disp + NCOORDS*nPoint_Cum[rank]*sizeof(float);
+  
+  /*--- Set the view for the MPI file write, i.e., describe the
+   location in the file that this rank "sees" for writing its
+   piece of the file. ---*/
+  
+  MPI_File_set_view(fhw, disp2, etype, filetype,
+                    (char*)"native", MPI_INFO_NULL);
+  
+  /*--- Collective call for all ranks to write simultaneously. ---*/
+  
+  MPI_File_write_all(fhw, coord_buf, myPoint*NCOORDS, MPI_FLOAT, &status);
+  
+  /*--- Update the displacement position for MPI IO. ---*/
+  
+  disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
+  
+  /*--- Free the derived datatype and coordinate array. ---*/
+  
+  MPI_Type_free(&filetype);
+  delete [] coord_buf;
+  
+  /*--- Compute our local number of elements, the required storage,
+   and reduce the total number of elements and storage globally. ---*/
+  
+  unsigned long nTot_Line;
+  unsigned long nTot_Tria, nTot_Quad;
+  unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
+  unsigned long myElem, myElemStorage, GlobalElem, GlobalElemStorage;
+  
+  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
+                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
+                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = data_sorter->GetnElem(PRISM),
+                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+  
+  SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Quad, &nTot_Quad, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tetr, &nTot_Tetr, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Hexa, &nTot_Hexa, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pris, &nTot_Pris, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pyra, &nTot_Pyra, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  
+  myElem        = (nParallel_Line + nParallel_Tria + nParallel_Quad + nParallel_Tetr +
+                   nParallel_Hexa + nParallel_Pris + nParallel_Pyra);
+  myElemStorage = (nParallel_Line*3 + nParallel_Tria*4 + nParallel_Quad*5 + nParallel_Tetr*5 +
+                   nParallel_Hexa*9 + nParallel_Pris*7 + nParallel_Pyra*6);
+  
+  GlobalElem        = (nTot_Line + nTot_Tria   + nTot_Quad   + nTot_Tetr   +
+                       nTot_Hexa   + nTot_Pris   + nTot_Pyra);
+  GlobalElemStorage = (nTot_Line*3 + nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 +
+                       nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6);
+  
+  
+  
+  /*--- Communicate the number of total cells/storage that will be
+   written by each rank. After this communication, each proc knows how
+   many cells will be written before its location in the file and the
+   offsets can be correctly set. ---*/
+  
+  int *nElem_Snd = new int[size+1]; int *nElemStorage_Snd = new int[size+1];
+  int *nElem_Cum = new int[size+1]; int *nElemStorage_Cum = new int[size+1];
+  
+  nElem_Snd[0] = 0; nElemStorage_Snd[0] = 0;
+  nElem_Cum[0] = 0; nElemStorage_Cum[0] = 0;
+  for (int ii=1; ii < size; ii++) {
+    nElem_Snd[ii] = myElem; nElemStorage_Snd[ii] = myElemStorage;
+    nElem_Cum[ii] = 0;      nElemStorage_Cum[ii] = 0;
+  }
+  nElem_Snd[size] = myElem; nElemStorage_Snd[size] = myElemStorage;
+  nElem_Cum[size] = 0;      nElemStorage_Cum[size] = 0;
+  
+  /*--- Communicate the local counts to all ranks for building offsets. ---*/
+  
+  SU2_MPI::Alltoall(&(nElem_Snd[1]), 1, MPI_INT,
+                    &(nElem_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
+  
+  SU2_MPI::Alltoall(&(nElemStorage_Snd[1]), 1, MPI_INT,
+                    &(nElemStorage_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
+  
+  /*--- Put the counters into cumulative storage format. ---*/
+  
+  for (int ii = 0; ii < size; ii++) {
+    nElem_Cum[ii+1]        += nElem_Cum[ii];
+    nElemStorage_Cum[ii+1] += nElemStorage_Cum[ii];
+  }
+  
+  /*--- Reset the file view before writing the next ASCII line for cells. ---*/
+  
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                    (char*)"native", MPI_INFO_NULL);
+  SPRINTF(str_buf, "\nCELLS %i %i\n", SU2_TYPE::Int(GlobalElem),
+          SU2_TYPE::Int(GlobalElemStorage));
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
+  
+  int *conn_buf = new int[myElemStorage];
+  unsigned long iStorage = 0;
+  
+  for (iElem = 0; iElem < nParallel_Line; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_LINE;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1;
+    iStorage += (N_POINTS_LINE+1);
+  }
+  
+  for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_TRIANGLE;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 ;
+    iStorage += (N_POINTS_TRIANGLE+1);
+  }
+  
+  for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_QUADRILATERAL;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
+    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
+    iStorage += (N_POINTS_QUADRILATERAL+1);
+    
+  }
+  
+  for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_TETRAHEDRON;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
+    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
+    iStorage += (N_POINTS_TETRAHEDRON+1);
+    
+  }
+  
+  for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_HEXAHEDRON;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
+    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
+    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
+    conn_buf[iStorage+6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
+    conn_buf[iStorage+7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
+    conn_buf[iStorage+8] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
+    iStorage += (N_POINTS_HEXAHEDRON+1);
+  }
+  
+  for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_PRISM;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
+    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
+    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
+    conn_buf[iStorage+6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
+    iStorage += (N_POINTS_PRISM+1);
+  }
+  
+  for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+    conn_buf[iStorage+0] = N_POINTS_PYRAMID;
+    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
+    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
+    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
+    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
+    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
+    iStorage += (N_POINTS_PYRAMID+1);
+  }
+  
+  
+  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int), myElemStorage);
+  
+  /*--- We write the connectivity with MPI_INTs. ---*/
+  
+  etype = MPI_INT;
+  
+  /*--- Define a derived datatype for this ranks contiguous
+   chunk of data that will be placed in the file. ---*/
+  
+  MPI_Type_contiguous(myElemStorage, MPI_INT, &filetype);
+  MPI_Type_commit(&filetype);
+  
+  /*--- Compute the offset for this rank's linear partition of the
+   data in bytes. ---*/
+  
+  disp2 = (disp + nElemStorage_Cum[rank]*sizeof(int));
+  
+  /*--- Set the view for the MPI file write, i.e., describe the
+   location in the file that this rank "sees" for writing its
+   piece of the file. ---*/
+  
+  MPI_File_set_view(fhw, disp2, etype, filetype,
+                    (char*)"native", MPI_INFO_NULL);
+  
+  /*--- Collective call for all ranks to write simultaneously. ---*/
+  
+  MPI_File_write_all(fhw, conn_buf, myElemStorage, MPI_INT, &status);
+  
+  /*--- Update the displacement position for MPI IO. ---*/
+  
+  disp += nElemStorage_Cum[size]*sizeof(int);
+  
+  /*--- Free the derived datatype. ---*/
+  
+  MPI_Type_free(&filetype);
+  delete [] conn_buf;
+  
+  /*--- Load/write the cell type for all elements in the file. ---*/
+  
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                    (char*)"native", MPI_INFO_NULL);
+  SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(GlobalElem));
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  int *type_buf = new int[myElem];
+  unsigned long jElem = 0;
+  
+  for (iElem = 0; iElem < nParallel_Line; iElem++) {
+    type_buf[jElem] = LINE; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+    type_buf[jElem] = TRIANGLE; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+    type_buf[jElem] = QUADRILATERAL; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+    type_buf[jElem] = TETRAHEDRON; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+    type_buf[jElem] = HEXAHEDRON; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+    type_buf[jElem] = PRISM; jElem++;
+  }
+  for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+    type_buf[jElem] = PYRAMID; jElem++;
+  }
+  
+  if (!BigEndian) SwapBytes((char *)type_buf, sizeof(int), myElem);
+
+  /*--- We write the cell types with MPI_INTs. ---*/
+  
+  etype = MPI_INT;
+  
+  /*--- Define a derived datatype for this ranks contiguous
+   chunk of data that will be placed in the file. ---*/
+  
+  MPI_Type_contiguous(myElem, MPI_INT, &filetype);
+  MPI_Type_commit(&filetype);
+  
+  /*--- Compute the offset for this rank's linear partition of the
+   data in bytes. ---*/
+  
+  disp2 = (disp + nElem_Cum[rank]*sizeof(int));
+  
+  /*--- Set the view for the MPI file write, i.e., describe the
+   location in the file that this rank "sees" for writing its
+   piece of the file. ---*/
+  
+  MPI_File_set_view(fhw, disp2, etype, filetype,
+                    (char*)"native", MPI_INFO_NULL);
+  
+  /*--- Collective call for all ranks to write simultaneously. ---*/
+  
+  MPI_File_write_all(fhw, type_buf, myElem, MPI_INT, &status);
+  
+  /*--- Update the displacement position for MPI IO. ---*/
+  
+  disp += nElem_Cum[size]*sizeof(int);
+  
+  /*--- Free the derived datatype. ---*/
+  
+  MPI_Type_free(&filetype);
+  if (type_buf != NULL) delete [] type_buf;
+  
+  /*--- Now write the scalar and vector point data. ---*/
+  
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                    (char*)"native", MPI_INFO_NULL);
+  SPRINTF (str_buf, "\nPOINT_DATA %i\n", SU2_TYPE::Int(GlobalPoint));
+  if (rank == MASTER_NODE)
+    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                      MPI_CHAR, MPI_STATUS_IGNORE);
+  disp += strlen(str_buf)*sizeof(char);
+  
+  /*--- Adjust container start location to avoid point coords. ---*/
+  
+  unsigned short varStart = 2;
+  if (nDim == 3) varStart++;
+  
+  /*--- Loop over all variables that have been registered in the output. ---*/
+  
+  unsigned short iField, VarCounter = varStart;
+  for (iField = varStart; iField < fieldnames.size(); iField++) {
+    
+    string fieldname = fieldnames[iField];
+    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'),
+                    fieldname.end());
+    
+    /*--- Check whether this field is a vector or scalar. ---*/
+    
+    bool output_variable = true, isVector = false;
+    size_t found = fieldnames[iField].find("_x");
+    if (found!=string::npos) {
+      output_variable = true;
+      isVector        = true;
+    }
+    found = fieldnames[iField].find("_y");
+    if (found!=string::npos) {
+      /*--- We have found a vector, so skip the Y component. ---*/
+      output_variable = false;
+      VarCounter++;
+    }
+    found = fieldnames[iField].find("_z");
+    if (found!=string::npos) {
+      /*--- We have found a vector, so skip the Z component. ---*/
+      output_variable = false;
+      VarCounter++;
+    }
+    
+    /*--- Write the point data as an <X,Y,Z> vector or a scalar. ---*/
+    
+    if (output_variable && isVector) {
+      
+      /*--- Adjust the string name to remove the leading "X-" ---*/
+      
+      fieldname.erase(fieldname.end()-2,fieldname.end());
+      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                        (char*)"native", MPI_INFO_NULL);
+      SPRINTF (str_buf, "\nVECTORS %s float\n", fieldname.c_str());
+      if (rank == MASTER_NODE)
+        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                          MPI_CHAR, MPI_STATUS_IGNORE);
+      disp += strlen(str_buf)*sizeof(char);
+      
+      /*--- Prepare the 1D data buffer on this rank. ---*/
+      
+      float *vec_buf = new float[myPoint*NCOORDS];
+      
+      /*--- Load up the buffer for writing this rank's vector data. ---*/
+      
+      float val = 0.0;
+      for (iPoint = 0; iPoint < myPoint; iPoint++) {
+        for (iDim = 0; iDim < NCOORDS; iDim++) {
+          if (nDim == 2 && iDim == 2) {
+            vec_buf[iPoint*NCOORDS + iDim] = 0.0;
+          } else {
+            val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter+iDim,iPoint));
+            vec_buf[iPoint*NCOORDS + iDim] = val;
+          }
+        }
+      }
+      if (!BigEndian)
+        SwapBytes((char *)vec_buf, sizeof(float), myPoint*NCOORDS);
+
+      /*--- We will write the point data as floats. ---*/
+      
+      etype = MPI_FLOAT;
+      
+      /*--- Define a derived datatype for this ranks contiguous
+       chunk of data that will be placed in the file. ---*/
+      
+      MPI_Type_contiguous(myPoint*NCOORDS, MPI_FLOAT, &filetype);
+      MPI_Type_commit(&filetype);
+      
+      /*--- Compute the offset for this rank's linear partition of the
+       data in bytes. ---*/
+      
+      disp2 = disp + NCOORDS*nPoint_Cum[rank]*sizeof(float);
+      
+      /*--- Set the view for the MPI file write, i.e., describe the
+       location in the file that this rank "sees" for writing its
+       piece of the file. ---*/
+      
+      MPI_File_set_view(fhw, disp2, etype, filetype,
+                        (char*)"native", MPI_INFO_NULL);
+      
+      /*--- Collective call for all ranks to write simultaneously. ---*/
+      
+      MPI_File_write_all(fhw, vec_buf, myPoint*NCOORDS, MPI_FLOAT, &status);
+      
+      /*--- Update the displacement position for MPI IO. ---*/
+      
+      disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
+      
+      /*--- Free the derived datatype and coordinate array. ---*/
+      
+      MPI_Type_free(&filetype);
+      delete [] vec_buf; vec_buf = NULL;
+      
+      VarCounter++;
+      
+    } else if (output_variable) {
+      
+      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                        (char*)"native", MPI_INFO_NULL);
+      SPRINTF (str_buf, "\nSCALARS %s float 1\n", fieldname.c_str());
+      if (rank == MASTER_NODE)
+        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                          MPI_CHAR, MPI_STATUS_IGNORE);
+      disp += strlen(str_buf)*sizeof(char);
+      
+      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
+                        (char*)"native", MPI_INFO_NULL);
+      SPRINTF (str_buf, "LOOKUP_TABLE default\n");
+      if (rank == MASTER_NODE)
+        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
+                          MPI_CHAR, MPI_STATUS_IGNORE);
+      disp += strlen(str_buf)*sizeof(char);
+      
+      /*--- Prepare the 1D data buffer on this rank. ---*/
+      
+      float *scalar_buf = new float[myPoint];
+      
+      /*--- For now, create a temp 1D buffer to load up the data for writing.
+       This will be replaced with a derived data type most likely. ---*/
+      
+      for (iPoint = 0; iPoint < myPoint; iPoint++) {
+        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter,iPoint));
+        scalar_buf[iPoint] = val;
+      }
+      if (!BigEndian) SwapBytes((char *)scalar_buf, sizeof(float), myPoint);
+      
+      /*--- We will write the point data as floats. ---*/
+      
+      etype = MPI_FLOAT;
+      
+      /*--- Define a derived datatype for this ranks contiguous
+       chunk of data that will be placed in the file. ---*/
+      
+      MPI_Type_contiguous(myPoint, MPI_FLOAT, &filetype);
+      MPI_Type_commit(&filetype);
+      
+      /*--- Compute the offset for this rank's linear partition of the
+       data in bytes. ---*/
+      
+      disp2 = disp + nPoint_Cum[rank]*sizeof(float);
+      
+      /*--- Set the view for the MPI file write, i.e., describe the
+       location in the file that this rank "sees" for writing its
+       piece of the file. ---*/
+      
+      MPI_File_set_view(fhw, disp2, etype, filetype,
+                        (char*)"native", MPI_INFO_NULL);
+      
+      /*--- Collective call for all ranks to write simultaneously. ---*/
+      
+      MPI_File_write_all(fhw, scalar_buf, myPoint, MPI_FLOAT, &status);
+      
+      /*--- Update the displacement position for MPI IO. ---*/
+      
+      disp += nPoint_Cum[size]*sizeof(float);
+      
+      /*--- Free the derived datatype and coordinate array. ---*/
+      
+      MPI_Type_free(&filetype);
+      delete [] scalar_buf; scalar_buf = NULL;
+      
+      VarCounter++;
+    }
+    
+  }
+  
+  /*--- All ranks close the file after writing. ---*/
+  
+  MPI_File_close(&fhw);
+  
+  /*--- Delete the offset counters that we needed for MPI IO. ---*/
+  
+  delete [] nElem_Snd;        delete [] nElem_Cum;
+  delete [] nElemStorage_Snd; delete [] nElemStorage_Cum;
+  delete [] nPoint_Snd;       delete [] nPoint_Cum;
+  
+#endif
+}
+
+
+/*--- Subroutine to swap bytes, in case we need to convert to
+ big endian, which is expected for ParaView binary legacy format. ---*/
+
+void CParaviewBinaryFileWriter::SwapBytes(char *buffer, size_t nBytes, unsigned long nVar) {
+  
+  /*--- Store half the number of bytes in kk. ---*/
+  
+  const int kk = (int)nBytes/2;
+  
+  /*--- Loop over the number of variables in the buffer. ---*/
+  
+  for (int j = 0; j < (int)nVar; j++) {
+    
+    /*--- Initialize ii and jj, which are used to store the
+     indices of the bytes to be swapped. ---*/
+    
+    int ii = j*(int)nBytes;
+    int jj = ii + (int)nBytes - 1;
+    
+    /*--- Swap the bytes. ---*/
+    
+    for (int i = 0; i < kk; i++) {
+      char tmp   = buffer[jj];
+      buffer[jj] = buffer[ii];
+      buffer[ii] = tmp;
+      
+      ii++;
+      jj--;
+      
+    }
+  }
+}
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
new file mode 100644
index 000000000000..488c039406e8
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -0,0 +1,348 @@
+#include "../../../include/output/filewriter/CParaviewFileWriter.hpp"
+
+
+CParaviewFileWriter::CParaviewFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".vtk";
+  
+  this->filename += file_ext;
+  
+}
+
+
+CParaviewFileWriter::~CParaviewFileWriter(){
+  
+}
+
+void CParaviewFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  if (!data_sorter->GetConnectivitySorted()){
+    SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
+  }
+  
+  unsigned short iDim;
+
+  unsigned long iPoint, iElem;
+
+  unsigned long nSurf_Elem_Storage;
+  unsigned long nGlobal_Elem_Storage;
+
+  ofstream Paraview_File;
+
+  int iProcessor;
+ 
+  /*--- Open Paraview ASCII file and write the header. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Paraview_File.open(filename.c_str(), ios::out);
+    Paraview_File.precision(6);
+    Paraview_File << "# vtk DataFile Version 3.0\n";
+    Paraview_File << "vtk output\n";
+    Paraview_File << "ASCII\n";
+    Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
+    
+    /*--- Write the header ---*/
+    Paraview_File << "POINTS "<< data_sorter->GetnPointsGlobal() <<" double\n";
+    
+  }
+
+  Paraview_File.close();
+
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+
+  /*--- Each processor opens the file. ---*/
+
+  Paraview_File.open(filename.c_str(), ios::out | ios::app);
+
+  /*--- Write surface and volumetric point coordinates. ---*/
+
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      
+      /*--- Write the node data from this proc ---*/
+      
+      
+      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+        for (iDim = 0; iDim < nDim; iDim++)
+          Paraview_File << scientific << data_sorter->GetData(iDim, iPoint) << "\t";
+        if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
+      }
+    }
+    
+    Paraview_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+
+  /*--- Reduce the total number of each element. ---*/
+
+  unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
+  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
+                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
+                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = data_sorter->GetnElem(PRISM),
+                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+#ifdef HAVE_MPI
+  SU2_MPI::Reduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Quad, &nTot_Quad, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Tetr, &nTot_Tetr, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Hexa, &nTot_Hexa, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Pris, &nTot_Pris, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  SU2_MPI::Reduce(&nParallel_Pyra, &nTot_Pyra, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+#else
+  nTot_Line      = nParallel_Line;
+
+  nTot_Tria = nParallel_Tria;
+  nTot_Quad = nParallel_Quad;
+  nTot_Tetr = nParallel_Tetr;
+  nTot_Hexa = nParallel_Hexa;
+  nTot_Pris = nParallel_Pris;
+  nTot_Pyra = nParallel_Pyra;
+#endif
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Write the header ---*/
+    nGlobal_Elem_Storage = nTot_Line*3 + nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 + nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6;
+    
+    Paraview_File << "\nCELLS " << data_sorter->GetnElem() << "\t" << nGlobal_Elem_Storage << "\n";
+    
+  }
+
+  Paraview_File.flush();
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  
+  /*--- Write connectivity data. ---*/
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      
+      
+      for (iElem = 0; iElem < nParallel_Line; iElem++) {
+        Paraview_File << N_POINTS_LINE << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1 << "\t";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+        Paraview_File << N_POINTS_TRIANGLE << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1 << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1 << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 << "\t";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+        Paraview_File << N_POINTS_QUADRILATERAL << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1 << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1 << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1 << "\t";
+        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1 << "\t";
+      }
+      
+      
+      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+        Paraview_File << N_POINTS_TETRAHEDRON << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1 << "\t";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+        Paraview_File << N_POINTS_HEXAHEDRON << "\t"; 
+        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1 << "\t";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+        Paraview_File << N_POINTS_PRISM << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1 << "\t";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+        Paraview_File << N_POINTS_PYRAMID << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1 << "\t" 
+                      << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1 << "\t";
+        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1 << "\t";
+      }
+      
+    }    Paraview_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+  
+  if (rank == MASTER_NODE) {
+    
+    /*--- Write the header ---*/
+    Paraview_File << "\nCELL_TYPES " << data_sorter->GetnElem() << "\n";
+    
+  }
+
+  Paraview_File.flush();
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iElem = 0; iElem < nParallel_Line; iElem++) Paraview_File << "3\t";
+      for (iElem = 0; iElem < nParallel_Tria; iElem++) Paraview_File << "5\t";
+      for (iElem = 0; iElem < nParallel_Quad; iElem++) Paraview_File << "9\t";
+      for (iElem = 0; iElem < nParallel_Tetr; iElem++) Paraview_File << "10\t";
+      for (iElem = 0; iElem < nParallel_Hexa; iElem++) Paraview_File << "12\t";
+      for (iElem = 0; iElem < nParallel_Pris; iElem++) Paraview_File << "13\t";
+      for (iElem = 0; iElem < nParallel_Pyra; iElem++) Paraview_File << "14\t";  
+    }   
+    Paraview_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+  
+  if (rank == MASTER_NODE) {
+    /*--- Write the header ---*/
+    Paraview_File << "\nPOINT_DATA "<< data_sorter->GetnPointsGlobal() <<"\n";
+    
+  }
+
+  Paraview_File.flush();
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+
+  unsigned short varStart = 2;
+  if (nDim == 3) varStart++;
+
+  /*--- Need to adjust container location to avoid PointID tag and coords. ---*/
+  unsigned short VarCounter = varStart;
+
+  for (unsigned short iField = varStart; iField < fieldnames.size(); iField++) {
+
+    string fieldname = fieldnames[iField];
+
+    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'), fieldname.end());
+
+    bool output_variable = true, isVector = false;
+    size_t found = fieldnames[iField].find("_x");
+    if (found!=string::npos) {
+      output_variable = true;
+      isVector = true;
+    }
+    found = fieldnames[iField].find("_y");
+    if (found!=string::npos) {
+      output_variable = false;
+      //skip
+      Paraview_File.flush();
+#ifdef HAVE_MPI
+      SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+      VarCounter++;
+    }
+found = fieldnames[iField].find("_z");
+    if (found!=string::npos) {
+      output_variable = false;
+      //skip
+      Paraview_File.flush();
+#ifdef HAVE_MPI
+      SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+      VarCounter++;
+    }
+
+    if (output_variable && isVector) {
+
+      fieldname.erase(fieldname.end()-2,fieldname.end());
+
+      if (rank == MASTER_NODE) {
+        Paraview_File << "\nVECTORS " << fieldname << " double\n";
+      }
+
+      Paraview_File.flush();
+#ifdef HAVE_MPI
+      SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+
+      /*--- Write surface and volumetric point coordinates. ---*/
+
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        if (rank == iProcessor) {
+          
+          /*--- Write the node data from this proc ---*/
+          
+          for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+            Paraview_File << scientific << data_sorter->GetData(VarCounter+0, iPoint) << "\t" << data_sorter->GetData(VarCounter+1, iPoint) << "\t";
+            if (nDim == 3) Paraview_File << scientific << data_sorter->GetData(VarCounter+2, iPoint) << "\t";
+            if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
+          }
+        }
+        
+        Paraview_File.flush();
+#ifdef HAVE_MPI
+        SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+      }
+
+      VarCounter++;
+
+    } else if (output_variable) {
+
+      if (rank == MASTER_NODE) {
+
+        Paraview_File << "\nSCALARS " << fieldname << " double 1\n";
+        Paraview_File << "LOOKUP_TABLE default\n";
+      }
+
+      Paraview_File.flush();
+#ifdef HAVE_MPI
+      SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+
+      /*--- Write surface and volumetric point coordinates. ---*/
+
+      for (iProcessor = 0; iProcessor < size; iProcessor++) {
+        if (rank == iProcessor) {
+
+          /*--- Write the node data from this proc ---*/
+          
+          for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+            Paraview_File << scientific << data_sorter->GetData(VarCounter, iPoint) << "\t";
+          }
+          
+        }
+        Paraview_File.flush();
+#ifdef HAVE_MPI
+        SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+      }
+      
+      VarCounter++;
+    }
+
+  }
+
+  Paraview_File.close();
+}
+
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
new file mode 100644
index 000000000000..ca8f2c31c4a9
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -0,0 +1,283 @@
+#include "../../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
+
+
+
+
+CSU2BinaryFileWriter::CSU2BinaryFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".su2s";
+  
+  this->filename += file_ext;
+  
+}
+
+
+CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
+  
+}
+
+void CSU2BinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  
+  /*--- Local variables ---*/
+
+  unsigned short iVar;
+  unsigned long iPoint;
+//  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
+//                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+//  bool wrt_perf  = config->GetWrt_Performance();
+  
+  unsigned short GlobalField_Counter = fieldnames.size();
+  unsigned long nParallel_Poin = data_sorter->GetnPoints();
+  
+  ofstream restart_file;
+  char str_buf[CGNS_STRING_SIZE], fname[100];
+  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
+  
+  strcpy(fname, filename.c_str());
+
+  /*--- Prepare the first ints containing the counts. The first is a
+   magic number that we can use to check for binary files (it is the hex
+   representation for "SU2"). The second two values are number of variables
+   and number of points (DoFs). The last two values are for metadata: 
+   one int for ExtIter and 8 su2doubles. ---*/
+
+  int var_buf_size = 5;
+  int var_buf[5] = {535532, GlobalField_Counter, (int)data_sorter->GetnPointsGlobal(), 1, 8};
+
+  /*--- Prepare the 1D data buffer on this rank. ---*/
+
+  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
+
+  /*--- For now, create a temp 1D buffer to load up the data for writing.
+   This will be replaced with a derived data type most likely. ---*/
+
+  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
+      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,iPoint));
+
+//  /*--- Prepare metadata. ---*/
+
+//  int Restart_ExtIter;
+//  if (dual_time)
+//    Restart_ExtIter= (int)config->GetExtIter() + 1;
+//  else
+//    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
+
+//  passivedouble Restart_Metadata[8] = {
+//    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
+//    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
+//    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
+//    SU2_TYPE::GetValue(config->GetdCD_dCL()),
+//    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
+//    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
+//    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
+//    0.0
+//  };
+
+//  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+//        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+//        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+//    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
+//  }
+
+  /*--- Set a timer for the binary file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
+#ifndef HAVE_MPI
+
+  FILE* fhw;
+  fhw = fopen(fname, "wb");
+
+  /*--- Error check for opening the file. ---*/
+
+  if (!fhw) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  }
+
+  /*--- First, write the number of variables and points. ---*/
+
+  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
+  file_size += (su2double)var_buf_size*sizeof(int);
+  
+  /*--- Write the variable names to the file. Note that we are adopting a
+   fixed length of 33 for the string length to match with CGNS. This is 
+   needed for when we read the strings later. ---*/
+
+  for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
+    fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
+    file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
+  }
+
+  /*--- Call to write the entire restart file data in binary in one shot. ---*/
+
+  fwrite(buf, nParallel_Poin*GlobalField_Counter, sizeof(passivedouble), fhw);
+  file_size += (su2double)nParallel_Poin*GlobalField_Counter*sizeof(passivedouble);
+
+  /*--- Write the external iteration. ---*/
+
+  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
+  file_size += (su2double)sizeof(int);
+
+  /*--- Write the metadata. ---*/
+
+//  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
+//  file_size += (su2double)8*sizeof(passivedouble);
+
+  /*--- Close the file. ---*/
+
+  fclose(fhw);
+
+#else
+
+  /*--- Parallel binary output using MPI I/O. ---*/
+
+  MPI_File fhw;
+  SU2_MPI::Status status;
+  MPI_Datatype etype, filetype;
+  MPI_Offset disp;
+  int ierr;
+
+  /*--- We're writing only su2doubles in the data portion of the file. ---*/
+
+  etype = MPI_DOUBLE;
+
+  /*--- Define a derived datatype for this ranks contiguous chunk of data
+   that will be placed in the restart (1D array size = num points * num vars). ---*/
+
+  MPI_Type_contiguous(nParallel_Poin*GlobalField_Counter, MPI_DOUBLE, &filetype);
+  MPI_Type_commit(&filetype);
+
+  /*--- All ranks open the file using MPI. Here, we try to open the file with
+   exclusive so that an error is generated if the file exists. We always want
+   to write a fresh restart file, so we delete any existing files and create
+   a new one. ---*/
+
+  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                       MPI_INFO_NULL, &fhw);
+  if (ierr != MPI_SUCCESS)  {
+    MPI_File_close(&fhw);
+    if (rank == 0)
+      MPI_File_delete(fname, MPI_INFO_NULL);
+    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
+                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
+                         MPI_INFO_NULL, &fhw);
+  }
+
+  /*--- Error check opening the file. ---*/
+
+  if (ierr) {
+    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  }
+
+  /*--- First, write the number of variables and points (i.e., cols and rows),
+   which we will need in order to read the file later. Also, write the 
+   variable string names here. Only the master rank writes the header. ---*/
+
+  if (rank == MASTER_NODE) {
+    MPI_File_write(fhw, var_buf, var_buf_size, MPI_INT, MPI_STATUS_IGNORE);
+    file_size += (su2double)var_buf_size*sizeof(int);
+
+    /*--- Write the variable names to the file. Note that we are adopting a
+     fixed length of 33 for the string length to match with CGNS. This is
+     needed for when we read the strings later. ---*/
+
+    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
+      strncpy(str_buf, fieldnames[iVar].c_str(), CGNS_STRING_SIZE);
+      MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
+      file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
+    }
+  }
+
+  /*--- Compute the offset for this rank's linear partition of the data in bytes.
+   After the calculations above, we have the partition sizes store in nPoint_Linear
+   in cumulative storage format. ---*/
+
+  disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+          GlobalField_Counter*data_sorter->GetnPointCumulative()*sizeof(passivedouble));
+
+  /*--- Set the view for the MPI file write, i.e., describe the location in
+   the file that this rank "sees" for writing its piece of the restart file. ---*/
+
+  MPI_File_set_view(fhw, disp, etype, filetype, (char*)"native", MPI_INFO_NULL);
+
+  /*--- Collective call for all ranks to write to their view simultaneously. ---*/
+
+  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
+  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
+
+  /*--- Free the derived datatype. ---*/
+
+  MPI_Type_free(&filetype);
+
+  /*--- Reset the file view before writing the metadata. ---*/
+
+  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
+
+  /*--- Finally, the master rank writes the metadata. ---*/
+
+  if (rank == MASTER_NODE) {
+
+    /*--- External iteration. ---*/
+
+//    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+//            GlobalField_Counter*data_sorter->GetnPointsGlobal()*sizeof(passivedouble));
+//    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
+//    file_size += (su2double)sizeof(int);
+
+    /*--- Additional doubles for AoA, AoS, etc. ---*/
+
+//    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
+//            GlobalField_Counter*data_sorter->GetnPointsGlobal()*sizeof(passivedouble) + 1*sizeof(int));
+//    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
+//    file_size += (su2double)8*sizeof(passivedouble);
+
+  }
+
+  /*--- All ranks close the file after writing. ---*/
+
+  MPI_File_close(&fhw);
+
+#endif
+
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  /*--- Communicate the total file size for the restart ---*/
+  
+#ifdef HAVE_MPI
+  su2double my_file_size = file_size;
+  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
+                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
+//  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
+  
+//  if ((rank == MASTER_NODE) && (wrt_perf)) {
+//    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
+//    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
+//  }
+  
+  /*--- Free temporary data buffer for writing the binary file. ---*/
+
+  delete [] buf;
+
+}
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
new file mode 100644
index 000000000000..04c033f93596
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -0,0 +1,111 @@
+#include "../../../include/output/filewriter/CSU2FileWriter.hpp"
+
+
+
+
+CSU2FileWriter::CSU2FileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".su2s";
+  
+  this->filename += file_ext;
+  
+}
+
+
+CSU2FileWriter::~CSU2FileWriter(){
+  
+}
+
+void CSU2FileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  /*--- Local variables ---*/
+  
+  unsigned short iVar;
+  unsigned long iPoint;
+
+  ofstream restart_file;
+  
+  int iProcessor;
+  
+  /*--- Only the master node writes the header. ---*/
+  
+  if (rank == MASTER_NODE) {
+    restart_file.open(filename.c_str(), ios::out);
+    restart_file.precision(15);
+    restart_file << "\"PointID\"";
+    for (iVar = 0; iVar < fieldnames.size()-1; iVar++)
+      restart_file << "\t\"" << fieldnames[iVar] << "\"";
+    restart_file << "\t\"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
+    restart_file.close();
+  }
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  
+  /*--- All processors open the file. ---*/
+  
+  restart_file.open(filename.c_str(), ios::out | ios::app);
+  restart_file.precision(15);
+  
+  /*--- Write the restart file in parallel, processor by processor. ---*/
+  
+  unsigned long myPoint = 0, offset = 0, Global_Index;
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+        
+        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+        
+        Global_Index = data_sorter->GetGlobalIndex(iPoint);
+        
+        /*--- Write global index. (note outer loop over procs) ---*/
+        
+        restart_file << Global_Index << "\t";
+        myPoint++;
+        
+        /*--- Loop over the variables and write the values to file ---*/
+        
+        for (iVar = 0; iVar < fieldnames.size(); iVar++) {
+          restart_file << scientific << data_sorter->GetData(iVar, iPoint) << "\t";
+        }
+        restart_file << "\n";
+      }
+      
+    }
+    /*--- Flush the file and wait for all processors to arrive. ---*/
+    restart_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+    
+  }
+
+  /*--- Write the metadata (master rank alone) ----*/
+
+//  if (rank == MASTER_NODE) {
+//    if (dual_time)
+//      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
+//    else
+//      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+//    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+//    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+//    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+//    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+//    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+//    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+//    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+
+//    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+//          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+//          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
+//      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+//    }
+//  }
+
+  /*--- All processors close the file. ---*/
+
+  restart_file.close();
+}
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
new file mode 100644
index 000000000000..e5bdc4db4df4
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -0,0 +1,415 @@
+#include "../../../include/output/filewriter/CSurfaceFEMDataSorter.hpp"
+#include "../../../Common/include/fem_geometry_structure.hpp"
+
+
+CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, unsigned short nFields, CFEMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
+ 
+  this->volume_sorter = volume_sorter;
+  
+  connectivity_sorted = false;
+  
+}
+
+CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){}
+
+
+
+void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+  
+  if (!connectivity_sorted){
+    SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
+  }
+  
+  const int VARS_PER_POINT = GlobalField_Counter;
+
+  /*---------------------------------------------------*/
+  /*--- Step 1: Determine the global DOF ID's of the   */
+  /*---         locally stored surface connectivities. */
+  /*---------------------------------------------------*/
+
+  /* Loop over the surface connectivities and store global
+     DOF ID's in a vector. Subtract 1, because the stored
+     connectivities are 1 based. */
+  std::vector<unsigned long> globalSurfaceDOFIDs;
+  globalSurfaceDOFIDs.reserve(nParallel_Line*N_POINTS_LINE +
+                              nParallel_Tria*N_POINTS_TRIANGLE +
+                              nParallel_Quad*N_POINTS_QUADRILATERAL);
+
+  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i) {
+    const unsigned long globalID = Conn_Line_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  for(unsigned long i=0; i<(nParallel_Tria*N_POINTS_TRIANGLE); ++i) {
+    const unsigned long globalID = Conn_Tria_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  for(unsigned long i=0; i<(nParallel_Quad*N_POINTS_QUADRILATERAL); ++i) {
+    const unsigned long globalID = Conn_Quad_Par[i]-1;
+    globalSurfaceDOFIDs.push_back(globalID);
+  }
+
+  /* Sort globalSurfaceDOFIDs in increasing order and remove the
+     multiple entries. */
+  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  vector<unsigned long>::iterator lastEntry;
+  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 2: Communicate the information of globalSurfaceDOFIDs  ---*/
+  /*---         to the ranks, which actually store this information ---*/
+  /*---         in Parallel_Data.                                   ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Allocate the memory for the first index of the communication buffers. */
+  vector<vector<unsigned long> > sendBuf(size, vector<unsigned long>(0));
+
+  /* Loop over the entries of globalSurfaceDOFIDs and fill the
+     communication buffers accordingly. */
+  for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
+
+    /* Search for the processor that owns this point. */
+    unsigned long iProcessor = globalSurfaceDOFIDs[i]/nPoint_Lin[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor])
+      while(globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor+1]) ++iProcessor;
+    else
+      while(globalSurfaceDOFIDs[i] <  nPoint_Cum[iProcessor])   --iProcessor;
+
+    /* Store the global ID in the send buffer for iProcessor. */
+    sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
+  }
+
+  /* Determine the number of DOFs to be sent to each processor. */
+  int nRankSend = 0;
+  vector<unsigned long> nDOFSend(size);
+  for(int i=0; i<size; ++i) {
+    nDOFSend[i] = sendBuf[i].size();
+    if(nDOFSend[i] && (i != rank)) ++nRankSend;
+  }
+
+  /* Communicate nDOFSend using Alltoall. */
+  vector<unsigned long> nDOFRecv(size);
+
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(nDOFSend.data(), 1, MPI_UNSIGNED_LONG,
+                    nDOFRecv.data(), 1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  nDOFRecv[rank] = nDOFSend[rank];
+#endif
+
+  /* Determine the number of messages this rank will receive. */
+  int nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) ++nRankRecv;
+  }
+
+  /* Define the receive buffers. */
+  vector<vector<unsigned long> > recvBuf(size, vector<unsigned long>(0));
+
+#ifdef HAVE_MPI
+  /* Launch the non-blocking sends. Do not send anything to myself. */
+  vector<SU2_MPI::Request> sendReq(nRankSend);
+  nRankSend = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFSend[i] && (i != rank)) {
+      SU2_MPI::Isend(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
+                     i, rank, MPI_COMM_WORLD, &sendReq[nRankSend]);
+      ++nRankSend;
+    }
+  }
+
+  /* Launch the non-blocking receives. Do not receive anything from myself. */
+  vector<SU2_MPI::Request> recvReq(nRankRecv);
+  nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) {
+      recvBuf[i].resize(nDOFRecv[i]);
+      SU2_MPI::Irecv(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
+                     i, i, MPI_COMM_WORLD, &recvReq[nRankRecv]);
+      ++nRankRecv;
+    }
+  }
+
+#endif
+
+  /* Copy my own data. */
+  recvBuf[rank] = sendBuf[rank];
+
+#ifdef HAVE_MPI
+  /* Complete the non-blocking communication. */
+  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
+  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
+#endif
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 2: Determine the number of locally stored surface DOFs ---*/
+  /*---         and store the data in Parallel_Surf_Data.           ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Store all received surface ID in one vector and sort it. */
+  globalSurfaceDOFIDs.resize(0);
+  for(int i=0; i<size; ++i) {
+    if( nDOFRecv[i] )
+      globalSurfaceDOFIDs.insert(globalSurfaceDOFIDs.end(),
+                                  recvBuf[i].begin(), recvBuf[i].end());
+  }
+
+  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
+  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
+
+  /* Allocate the memory for Parallel_Surf_Data. */
+  nParallel_Poin = globalSurfaceDOFIDs.size();
+
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for(int jj=0; jj<VARS_PER_POINT; jj++)
+    Parallel_Data[jj] = new su2double[nParallel_Poin];
+
+  /* Determine the local index of the global surface DOFs and
+     copy the data into Parallel_Surf_Data. */
+  for(unsigned long i=0; i<nParallel_Poin; ++i) {
+    const unsigned long ii = globalSurfaceDOFIDs[i] - nPoint_Cum[rank];
+
+    for(int jj=0; jj<VARS_PER_POINT; jj++)
+      Parallel_Data[jj][i] = volume_sorter->GetData(jj,ii);
+  }
+
+  /*--- Reduce the total number of surf points we have. This will be
+        needed for writing the surface solution files later. ---*/
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nGlobal_Surf_Poin = nSurf_Poin_Par;
+#endif
+
+  /*-------------------------------------------------------------------*/
+  /*--- Step 3: Modify the surface connectivities, such that only   ---*/
+  /*---         the data of surface DOFs needs to be written.       ---*/
+  /*-------------------------------------------------------------------*/
+
+  /* Determine the offset for my surface DOFs. */
+  unsigned long offsetSurfaceDOFs = 0;
+#ifdef HAVE_MPI
+  vector<unsigned long> nSurfaceDOFsRanks(size);
+
+  SU2_MPI::Allgather(&nParallel_Poin, 1, MPI_UNSIGNED_LONG,
+                     nSurfaceDOFsRanks.data(), 1, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+
+  for(int i=0; i<rank; ++i) offsetSurfaceDOFs += nSurfaceDOFsRanks[i];
+#endif
+
+  /* Create the map from the global volume numbering to the new global
+     surface numbering. */
+  map<unsigned long, unsigned long> mapGlobalVol2Surf;
+  for(unsigned long i=0; i<nParallel_Poin; ++i)
+    mapGlobalVol2Surf[globalSurfaceDOFIDs[i]] = offsetSurfaceDOFs + i;
+
+  /* Fill the receive buffers with the modified global surface DOF numbers,
+     such that this information can be returned to the original ranks. */
+  for(int i=0; i<size; ++i) {
+    for(unsigned long j=0; j<nDOFRecv[i]; ++j)
+      recvBuf[i][j] = mapGlobalVol2Surf.find(recvBuf[i][j])->second;
+  }
+
+  /* Copy the original send buffers, because that information is
+     still needed. */
+  vector<vector<unsigned long> > originalSendBuf = sendBuf;
+
+#ifdef HAVE_MPI
+  /* Launch the non-blocking sends for the reverse communication, where the
+     receive buffers must be used for sending. Do not send anything to myself. */
+  nRankRecv = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFRecv[i] && (i != rank)) {
+      SU2_MPI::Isend(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
+                     i, rank+1, MPI_COMM_WORLD, &recvReq[nRankRecv]);
+      ++nRankRecv;
+    }
+  }
+
+  /* Launch the non-blocking receives for the reverse communication, where the
+     send buffers must be used for receiving.  Do not receive anything from myself. */
+  nRankSend = 0;
+  for(int i=0; i<size; ++i) {
+    if(nDOFSend[i] && (i != rank)) {
+      SU2_MPI::Irecv(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
+                     i, i+1, MPI_COMM_WORLD, &sendReq[nRankSend]);
+      ++nRankSend;
+    }
+  }
+
+#endif
+
+  /* Copy my own data. */
+  sendBuf[rank] = recvBuf[rank];
+
+#ifdef HAVE_MPI
+  /* Complete the non-blocking communication. */
+  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
+  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
+#endif
+
+  /* Clear the map mapGlobalVol2Surf and fill it with the data
+     needed to modify the surface connectivity. Note that 1 is added,
+     because the visualization softwares typically use 1 based indexing. */
+  mapGlobalVol2Surf.clear();
+
+  for(int i=0; i<size; ++i) {
+    for(unsigned long j=0; j<nDOFSend[i]; ++j)
+      mapGlobalVol2Surf[originalSendBuf[i][j]+1] = sendBuf[i][j]+1;
+  }
+
+  /* Modify the locally stored surface connectivities. */
+  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i)
+    Conn_Line_Par[i] = mapGlobalVol2Surf.find(Conn_Line_Par[i])->second;
+
+  for(unsigned long i=0; i<(nParallel_Tria*N_POINTS_TRIANGLE); ++i)
+    Conn_Tria_Par[i] = mapGlobalVol2Surf.find(Conn_Tria_Par[i])->second;
+
+  for(unsigned long i=0; i<(nParallel_Quad*N_POINTS_QUADRILATERAL); ++i)
+    Conn_Quad_Par[i] = mapGlobalVol2Surf.find(Conn_Quad_Par[i])->second;
+}
+
+void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
+
+  
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting surface grid connectivity." << endl;
+  
+  
+  SortSurfaceConnectivity(config, geometry, LINE         );
+  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+  
+    
+    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
+#ifndef HAVE_MPI
+    nSurf_Elem_Par   = nTotal_Surf_Elem;
+#else
+    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+    
+
+}
+
+
+
+void CSurfaceFEMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  /* Determine the number of nodes for this element type. */
+    unsigned short NODES_PER_ELEMENT = 0;
+    switch (Elem_Type) {
+      case LINE:
+        NODES_PER_ELEMENT = N_POINTS_LINE;
+        break;
+      case TRIANGLE:
+        NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+        break;
+      case QUADRILATERAL:
+        NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+    }
+    
+    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+          geometrical information for the FEM DG solver. ---*/
+    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  
+    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+  
+    const CBoundaryFEM *boundaries = DGGeometry->GetBoundaries();
+    const CFEMStandardBoundaryFace *standardBoundaryFacesSol = DGGeometry->GetStandardBoundaryFacesSol();
+  
+    /*--- Create the map from the global DOF ID to the local index.
+          Note one is added to the index value, because visualization
+          softwares typically use 1-based indexing. ---*/
+    vector<unsigned long> globalID;
+    for(unsigned long l=0; l<nVolElemOwned; ++l) {
+      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+        const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j + 1;
+        globalID.push_back(globalIndex);
+      }
+    }
+  
+    /*--- Determine the number of sub-elements on this rank by looping
+          over the surface elements of the boundary markers that must
+          be plotted. ---*/
+    unsigned long nSubElem_Local = 0;
+    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
+      if( !boundaries[iMarker].periodicBoundary ) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
+          for(unsigned long i=0; i<surfElem.size(); ++i) {
+            const unsigned short ind      = surfElem[i].indStandardElement;
+            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
+            if(Elem_Type == VTK_Type) nSubElem_Local += standardBoundaryFacesSol[ind].GetNSubFaces();
+          }
+        }
+      }
+    }
+  
+    /* Allocate the memory to store the connectivity if the size is
+       larger than zero. */
+    int *Conn_SubElem = NULL;
+    if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
+  
+    /*--- Repeat the loop over the surface elements of the boundary markers
+          that must be plotted, but now store the connectivity. ---*/
+    unsigned long kNode = 0;
+    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
+      if( !boundaries[iMarker].periodicBoundary ) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
+  
+          /* Loop over the surface elements of this boundary marker. */
+          for(unsigned long i=0; i<surfElem.size(); ++i) {
+  
+            /* Check if this is the element type to be stored. */
+            const unsigned short ind      = surfElem[i].indStandardElement;
+            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
+            if(Elem_Type == VTK_Type) {
+  
+              /* Get the number of sub-elements and the local connectivity of
+                 the sub-elements. */
+              const unsigned short nSubFaces     = standardBoundaryFacesSol[ind].GetNSubFaces();
+              const unsigned short *connSubFaces = standardBoundaryFacesSol[ind].GetSubFaceConn();
+  
+              /* Store the global connectivities. */
+              const unsigned short kk = NODES_PER_ELEMENT*nSubFaces;
+              for(unsigned short k=0; k<kk; ++k, ++kNode)
+                Conn_SubElem[kNode] = globalID[surfElem[i].DOFsSolFace[connSubFaces[k]]];
+            }
+          }
+        }
+      }
+    }
+  
+    /*--- Store the particular global element count in the class data,
+          and set the class data pointer to the connectivity array. ---*/
+    switch (Elem_Type) {
+      case LINE:
+        nParallel_Line = nSubElem_Local;
+        Conn_Line_Par = Conn_SubElem;
+        break;
+      case TRIANGLE:
+        nParallel_Tria = nSubElem_Local;
+        Conn_Tria_Par = Conn_SubElem;
+        break;
+      case QUADRILATERAL:
+        nParallel_Quad = nSubElem_Local;
+        Conn_Quad_Par = Conn_SubElem;
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+        break;
+    }
+    
+}
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
new file mode 100644
index 000000000000..514de0db87be
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -0,0 +1,2040 @@
+#include "../../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
+
+CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, unsigned short nFields, CFVMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
+ 
+  this->volume_sorter = volume_sorter;
+  
+  connectivity_sorted = false;
+  
+}
+
+CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){}
+
+void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+  
+  if (!connectivity_sorted){
+    SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
+  }
+  
+  unsigned short iMarker;
+  unsigned long iProcessor;
+  unsigned long iPoint, jPoint, kPoint, iElem;
+  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
+  
+  int VARS_PER_POINT = GlobalField_Counter;
+  int *Local_Halo = NULL;
+  int iNode, count;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
+  /*---         linear partitions across all procs and the output data     ---*/
+  /*---         for the entire field is similarly linearly partitioned.    ---*/
+  /*---         We need to identify which nodes in the volume data are     ---*/
+  /*---         also surface points. Our first step is to loop over all    ---*/
+  /*---         of the sorted surface connectivity and create a data       ---*/
+  /*---         structure on each proc that can identify the local surf    ---*/
+  /*---         points. Note that the linear partitioning is slightly      ---*/
+  /*---         different between the nodes and elements, so we will       ---*/
+  /*---         have to move between the two systems in this routine.      ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Search all send/recv boundaries on this partition for any periodic
+   nodes that were part of the original domain. We want to recover these
+   for visualization purposes. This is the linear partitioning for nodes. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      
+      /*--- Checking for less than or equal to the rank, because there may
+       be some periodic halo nodes that send info to the same rank. ---*/
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        if (isPeriodic) Local_Halo[iPoint] = false;
+      }
+    }
+  }
+  
+  /*--- Sum total number of nodes that belong to the domain ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  
+  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
+  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Nodes[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Nodes[size] = nTotalPoint;
+  
+  /*--- Prepare to check and communicate the nodes that each proc has
+   locally from the surface connectivity. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  /*--- Loop through our local line elements and check where each
+   of the grid nodes resides based on global index. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_Line_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Reset out flags and then loop through our local triangle surface
+   elements performing the same check for where each grid node resides. ---*/
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Tria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_Tria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Reset out flags and then loop through our local quad surface
+   elements performing the same check for where each grid node resides. ---*/
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Quad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_Quad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- If we have not visited this element yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+      
+      if ((nElem_Flag[iProcessor] != iNode)) {
+        nElem_Flag[iProcessor] = iNode;
+        nElem_Send[iProcessor+1]++;
+      }
+      
+    }
+  }
+  
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many nodes it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  unsigned long *idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Now loop back through the local connectivities for the surface
+   elements and load up the global IDs for sending to their home proc. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_Line_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Tria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_Tria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Quad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_Quad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      
+      /*--- Load global ID into the buffer for sending ---*/
+      
+      if (nElem_Flag[iProcessor] != iNode) {
+        
+        nElem_Flag[iProcessor] = iNode;
+        unsigned long nn = idIndex[iProcessor];
+        
+        /*--- Load the connectivity values. ---*/
+        
+        idSend[nn] = Global_Index; nn++;
+        
+        /*--- Increment the index by the message length ---*/
+        
+        idIndex[iProcessor]++;
+        
+      }
+      
+    }
+  }
+  
+  /*--- Allocate the memory that we need for receiving the global IDs
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *idRecv = NULL;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the global IDs. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = nElem_Recv[rank];
+  int ll = nElem_Send[rank];
+  int kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 2: Each proc now knows which is its local grid nodes from     ---*/
+  /*---         the entire volume solution are part of the surface. We     ---*/
+  /*---         now apply a mask to extract just those points on the       ---*/
+  /*---         surface. We also need to perform a renumbering so that     ---*/
+  /*---         the surface data (nodes and connectivity) have their       ---*/
+  /*---         own global numbering. This is important for writing        ---*/
+  /*---         output files in a later routine.                           ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- Create a local data structure that acts as a mask to extract the
+   set of points within the local set that are on the surface. ---*/
+  
+  int *surfPoint = new int[volume_sorter->GetnPoints()];
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) surfPoint[iPoint] = -1;
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
+  }
+  
+  /*--- First, add up the number of surface points I have on my rank. ---*/
+  
+  nParallel_Poin = 0;
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      
+      /*--- Save the global index values for CSV output. ---*/
+      
+      Renumber2Global[nParallel_Poin] = surfPoint[iPoint];
+      
+      /*--- Increment total number of surface points found locally. ---*/
+      
+      nParallel_Poin++;
+
+    }
+  }
+  
+  /*--- Communicate this number of local surface points to all other
+   processors so that it can be used to create offsets for the new
+   global numbering for the surface points. ---*/
+  
+  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  
+  for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nParallel_Poin;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+  
+  /*--- Go to cumulative storage format to compute the offsets. ---*/
+  
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+  
+  /*--- Now that we know the number of local surface points that we have,
+   we can allocate the new data structure to hold these points alone. Here,
+   we also copy the data for those points from our volume data structure. ---*/
+  
+  Parallel_Data = new su2double*[VARS_PER_POINT];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
+    Parallel_Data[jj] = new su2double[nParallel_Poin];
+    count = 0;
+    for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
+      if (surfPoint[ii] !=-1) {
+        Parallel_Data[jj][count] = volume_sorter->GetData(jj,ii);
+        count++;
+      }
+    }
+  }
+  
+  /*--- Reduce the total number of surf points we have. This will be
+   needed for writing the surface solution files later. ---*/
+  
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Now that we know every proc's global offset for the number of
+   surface points, we can create the new global numbering. Here, we
+   create a new mapping using two arrays, which will need to be
+   communicated. We use our mask again here.  ---*/
+  
+  unsigned long *globalP = new unsigned long[nParallel_Poin];
+  unsigned long *renumbP = new unsigned long[nParallel_Poin];
+  
+  count = 0;
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
+    if (surfPoint[iPoint] != -1) {
+      globalP[count] = surfPoint[iPoint];
+      renumbP[count] = count + nPoint_Recv[rank];
+      count++;
+    }
+  }
+  
+  /*--------------------------------------------------------------------------*/
+  /*--- Step 3: Communicate the arrays with the new global surface point   ---*/
+  /*---         numbering to the procs that hold the connectivity for      ---*/
+  /*---         each element. This will be done in two phases. First,      ---*/
+  /*---         we send the arrays around to the other procs based on      ---*/
+  /*---         the linear partitioning for the elems. This gets us        ---*/
+  /*---         most of the way there, however, due to the type of         ---*/
+  /*---         linear partitioning for the elements, there may exist      ---*/
+  /*---         elements that have nodes outside of the linear part.       ---*/
+  /*---         bounds. This is because the elems are distributed based    ---*/
+  /*---         on the node with the smallest global ID.                   ---*/
+  /*--------------------------------------------------------------------------*/
+  
+  /*--- First, we perform the linear partitioning again as it is done
+   for elements, which is slightly different than for nodes (above). ---*/
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear_Elems[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear_Elems[size] = nTotalPoint;
+  
+  /*--- Reset our flags and counters ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  /*--- Loop through my local surface nodes, find which proc the global
+   value lives on, then communicate the global ID and remumbered value. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
+    }
+    
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the globals that we are
+   sending. ---*/
+  
+  unsigned long *globalSend = NULL;
+  globalSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    globalSend[ii] = 0;
+  
+  /*--- Allocate memory to hold the renumbering that we are
+   sending. ---*/
+  
+  unsigned long *renumbSend = NULL;
+  renumbSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    renumbSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
+  
+  /*--- Loop back through and load up the buffers for the global IDs
+   and their new renumbering values. ---*/
+  
+  for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
+    
+    Global_Index = globalP[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+    
+    
+    if (nElem_Flag[iProcessor] != ii) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = index[iProcessor];
+      
+      globalSend[nn] = Global_Index;
+      renumbSend[nn] = renumbP[ii];
+      
+      /*--- Increment the index by the message length ---*/
+      
+      index[iProcessor]++;
+      
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *globalRecv = NULL;
+  globalRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    globalRecv[ii] = 0;
+  
+  unsigned long *renumbRecv = NULL;
+  renumbRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    renumbRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(globalRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(globalSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking recv's for the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(renumbRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the renumbered ID. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(renumbSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+  
+#endif
+  
+  /*--- Load our own procs data into the buffers directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) globalRecv[mm] = globalSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) renumbRecv[mm] = renumbSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*-- Now update my local connectivitiy for the surface with the new
+   numbering. Create a new mapping for global -> renumber for nodes. Note
+   the adding of 1 back in here for the eventual viz. purposes. ---*/
+  
+  map<unsigned long,unsigned long> Global2Renumber;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
+  }
+  
+  
+  /*--- The final step is one last pass over all elements to check
+   for points outside of the linear partitions of the elements. Again,
+   note that elems were distributed based on their smallest global ID,
+   so some nodes of the elem may have global IDs lying outside of the
+   linear partitioning. We need to recover the mapping for these
+   outliers. We loop over all local surface elements to find these. ---*/
+  
+  vector<unsigned long>::iterator it;
+  vector<unsigned long> outliers;
+  
+  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
+    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
+      
+      iNode = ii*N_POINTS_LINE+jj;
+      Global_Index = Conn_Line_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Tria; ii++) {
+    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
+      
+      iNode = ii*N_POINTS_TRIANGLE + jj;
+      Global_Index = Conn_Tria_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
+  
+  for (int ii = 0; ii < (int)nParallel_Quad; ii++) {
+    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
+      
+      iNode = ii*N_POINTS_QUADRILATERAL+jj;
+      Global_Index = Conn_Quad_Par[iNode]-1;
+      
+      /*--- Search for the processor that owns this point ---*/
+      
+      iProcessor = Global_Index/npoint_procs[0];
+      if (iProcessor >= (unsigned long)size)
+        iProcessor = (unsigned long)size-1;
+      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
+        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      else
+        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      
+      /*--- Store the global ID if it is outside our own linear partition. ---*/
+      
+      if ((iProcessor != (unsigned long)rank)) {
+        outliers.push_back(Global_Index);
+      }
+      
+    }
+  }
+  
+  /*--- Create a unique list of global IDs that fall outside of our procs
+   linear partition. ---*/
+  
+  sort(outliers.begin(), outliers.end());
+  it = unique(outliers.begin(), outliers.end());
+  outliers.resize(it - outliers.begin());
+  
+  /*--- Now loop over the outliers and communicate to those procs that
+   hold the new numbering for our outlier points. We need to ask for the
+   new numbering from these procs. ---*/
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      nElem_Flag[iProcessor] = ii;
+      nElem_Send[iProcessor+1]++;
+    }
+    
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  delete [] idSend;
+  idSend = new unsigned long[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Reset our index variable for reuse. ---*/
+  
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop over the outliers again and load up the global IDs. ---*/
+  
+  for (int ii = 0; ii < (int)outliers.size(); ii++) {
+    
+    Global_Index = outliers[ii];
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = Global_Index/npoint_procs[0];
+    if (iProcessor >= (unsigned long)size)
+      iProcessor = (unsigned long)size-1;
+    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
+      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    else
+      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+    
+    /*--- If we have not visited this element yet, increment our
+     number of elements that must be sent to a particular proc. ---*/
+    
+    if ((nElem_Flag[iProcessor] != ii)) {
+      
+      nElem_Flag[iProcessor] = ii;
+      unsigned long nn = idIndex[iProcessor];
+      
+      /*--- Load the global ID values. ---*/
+      
+      idSend[nn] = Global_Index; nn++;
+      
+      /*--- Increment the index by the message length ---*/
+      
+      idIndex[iProcessor]++;
+      
+    }
+  }
+  
+  /*--- Allocate the memory that we need for receiving the
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  delete [] idRecv;
+  idRecv = new unsigned long[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    idRecv[ii] = 0;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- The procs holding the outlier grid nodes now have the global IDs
+   that they need to have their renumbering shared. ---*/
+  
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
+      if (idRecv[ii] == globalP[iPoint]) {
+        idRecv[ii] = renumbP[iPoint];
+      }
+    }
+  }
+  
+  /*--- Now simply reverse the last communication to give the renumbered IDs
+   back to the owner of the outlier points. Note everything is flipped. ---*/
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[nRecvs];
+  recv_req = new SU2_MPI::Request[nSends];
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  mm = nElem_Send[rank];
+  ll = nElem_Recv[rank];
+  kk = nElem_Recv[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idSend[mm] = idRecv[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  number = nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Add the renumbering for the outliers to the map from before carrying
+   the global -> renumber transformation. Note that by construction, 
+   nElem_Send[ii] == outliers.size(). We also add in the 1 for viz. here. ---*/
+  
+  for (int ii = 0; ii < nElem_Send[size]; ii++) {
+    Global2Renumber[outliers[ii]] = idSend[ii] + 1;
+  }
+  
+  /*--- We can now overwrite the local connectivity for our surface elems
+   using our completed map with the new global renumbering. Whew!! Note
+   the -1 when accessing the conn from the map. ---*/
+  
+  for (iElem = 0; iElem < nParallel_Line; iElem++) {
+    iNode = (int)iElem*N_POINTS_LINE;
+    Conn_Line_Par[iNode+0] = (int)Global2Renumber[Conn_Line_Par[iNode+0]-1];
+    Conn_Line_Par[iNode+1] = (int)Global2Renumber[Conn_Line_Par[iNode+1]-1];
+  }
+  
+  for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+    iNode = (int)iElem*N_POINTS_TRIANGLE;
+    Conn_Tria_Par[iNode+0] = (int)Global2Renumber[Conn_Tria_Par[iNode+0]-1];
+    Conn_Tria_Par[iNode+1] = (int)Global2Renumber[Conn_Tria_Par[iNode+1]-1];
+    Conn_Tria_Par[iNode+2] = (int)Global2Renumber[Conn_Tria_Par[iNode+2]-1];
+  }
+  
+  for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+    iNode = (int)iElem*N_POINTS_QUADRILATERAL;
+    Conn_Quad_Par[iNode+0] = (int)Global2Renumber[Conn_Quad_Par[iNode+0]-1];
+    Conn_Quad_Par[iNode+1] = (int)Global2Renumber[Conn_Quad_Par[iNode+1]-1];
+    Conn_Quad_Par[iNode+2] = (int)Global2Renumber[Conn_Quad_Par[iNode+2]-1];
+    Conn_Quad_Par[iNode+3] = (int)Global2Renumber[Conn_Quad_Par[iNode+3]-1];
+  }
+  
+  /*--- Free temporary memory ---*/
+  
+  delete [] idIndex;
+  delete [] surfPoint;
+  delete [] globalP;
+  delete [] renumbP;
+  
+  delete [] idSend;
+  delete [] idRecv;
+  delete [] globalSend;
+  delete [] globalRecv;
+  delete [] renumbSend;
+  delete [] renumbRecv;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Local_Halo;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear_Elems;
+  delete [] nPoint_Linear_Nodes;
+  delete [] nPoint_Send;
+  delete [] nPoint_Recv;
+  
+}
+
+void CSurfaceFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
+  
+  /*--- Sort connectivity for each type of element (excluding halos). Note
+   In these routines, we sort the connectivity into a linear partitioning
+   across all processors based on the global index of the grid nodes. ---*/
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+  
+  
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting surface grid connectivity." << endl;
+
+  SortSurfaceConnectivity(config, geometry, LINE         );
+  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+  
+  
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
+#ifndef HAVE_MPI
+  nSurf_Elem_Par   = nTotal_Surf_Elem;
+#else
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  connectivity_sorted = true;
+  
+}
+
+void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
+  
+  unsigned long iProcessor;
+  unsigned short NODES_PER_ELEMENT;
+  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long nElem_Total = 0, Global_Index;
+  
+  unsigned long iVertex, iMarker;
+  int SendRecv, RecvFrom;
+  
+  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  
+  int *Local_Halo = NULL;
+  int *Conn_Elem  = NULL;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Store the local number of this element type and the number of nodes
+   per this element type. In serial, this will be the total number of this
+   element type in the entire mesh. In parallel, it is the number on only
+   the current partition. ---*/
+  
+  switch (Elem_Type) {
+    case LINE:
+      NODES_PER_ELEMENT = N_POINTS_LINE;
+      break;
+    case TRIANGLE:
+      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
+      break;
+    case QUADRILATERAL:
+      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      NODES_PER_ELEMENT = 0;
+      break;
+  }
+  
+  /*--- Force the removal of all added periodic elements (use global index).
+   First, we isolate and create a list of all added periodic points, excluding
+   those that were part of the original domain (we want these to be in the
+   output files). ---*/
+  
+  vector<unsigned long> Added_Periodic;
+  Added_Periodic.clear();
+  
+  if (config->GetKind_SU2() != SU2_DEF) {
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+        SendRecv = config->GetMarker_All_SendRecv(iMarker);
+        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
+              (SendRecv < 0)) {
+            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Now we communicate this information to all processors, so that they
+   can force the removal of these particular nodes by flagging them as halo
+   points. In general, this should be a small percentage of the total mesh,
+   so the communication/storage costs here shouldn't be prohibitive. ---*/
+  
+  /*--- First communicate the number of points that each rank has found. ---*/
+  
+  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
+  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
+  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
+  
+  nAddedPeriodic = Added_Periodic.size();
+  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     MPI_MAX, MPI_COMM_WORLD);
+  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
+#else
+  maxAddedPeriodic = nAddedPeriodic;
+  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
+#endif
+  
+  /*--- Communicate the global index values of all added periodic nodes. ---*/
+  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
+  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  
+  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
+    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  }
+  
+  /*--- Gather the element connectivity information. All processors will now
+   have a copy of the global index values for all added periodic points. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
+                     MPI_COMM_WORLD);
+#else
+  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
+    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
+#endif
+  
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. Here,
+   we are also choosing to keep periodic nodes that were part of the original
+   domain. We will check the communicated list of added periodic points. ---*/
+  
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
+                   (SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- We want to keep the periodic nodes that were part of the original domain.
+         For SU2_DEF we want to keep all periodic nodes. ---*/
+        
+        if (config->GetKind_SU2() == SU2_DEF) {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
+        }else {
+          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
+                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
+        }
+        
+        notPeriodic = (isPeriodic && (SendRecv < 0));
+        
+        /*--- Lastly, check that this isn't an added periodic point that
+         we will forcibly remove. Use the communicated list of these points. ---*/
+        
+        addedPeriodic = false; kPoint = 0;
+        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
+          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
+            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
+              addedPeriodic = true;
+          }
+          
+          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
+          
+          kPoint = (iProcessor+1)*maxAddedPeriodic;
+          
+        }
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if ((notHalo || notPeriodic) && !addedPeriodic) {
+          Local_Halo[iPoint] = false;
+        }
+        
+      }
+    }
+  }
+  
+  /*--- Now that we've done the gymnastics to find any periodic points,
+   compute the total number of local and global points for the output. ---*/
+  
+  nLocalPoint = 0;
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    if (Local_Halo[iPoint] == false)
+      nLocalPoint++;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTotalPoint = nLocalPoint;
+#endif
+  
+  /*--- Compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+  
+  unsigned long *npoint_procs  = new unsigned long[size];
+  unsigned long *starting_node = new unsigned long[size];
+  unsigned long *ending_node   = new unsigned long[size];
+  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  
+  unsigned long total_pt_accounted = 0;
+  for (int ii = 0; ii < size; ii++) {
+    npoint_procs[ii] = nTotalPoint/size;
+    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
+  }
+  
+  /*--- Get the number of remainder points after the even division. ---*/
+  
+  unsigned long rem_points = nTotalPoint-total_pt_accounted;
+  for (unsigned long ii = 0; ii < rem_points; ii++) {
+    npoint_procs[ii]++;
+  }
+  
+  /*--- Store the local number of nodes and the beginning/end index ---*/
+  
+  starting_node[0] = 0;
+  ending_node[0]   = starting_node[0] + npoint_procs[0];
+  nPoint_Linear[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    starting_node[ii] = ending_node[ii-1];
+    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
+    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
+  }
+  nPoint_Linear[size] = nTotalPoint;
+  
+  /*--- We start with the connectivity distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many elements we must send to each other rank in order to
+   have all elements sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size];
+  
+  for (int ii=0; ii < size; ii++) {
+    nElem_Send[ii] = 0;
+    nElem_Recv[ii] = 0;
+    nElem_Flag[ii]= -1;
+  }
+  nElem_Send[size] = 0; nElem_Recv[size] = 0;
+
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- If we have not visited this element yet, increment our
+             number of elements that must be sent to a particular proc. ---*/
+            
+            if ((nElem_Flag[iProcessor] != ii)) {
+              nElem_Flag[iProcessor] = ii;
+              nElem_Send[iProcessor+1]++;
+            }
+            
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Communicate the number of cells to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
+                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nElem_Recv[1] = nElem_Send[1];
+#endif
+  
+  /*--- Prepare to send connectivities. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  int nSends = 0, nRecvs = 0;
+  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
+  
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
+    
+    nElem_Send[ii+1] += nElem_Send[ii];
+    nElem_Recv[ii+1] += nElem_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  unsigned long *connSend = NULL;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
+  /*--- Create an index variable to keep track of our index
+   position as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
+  
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_Plotting(iMarker) == YES) {
+      
+      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
+        
+        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
+          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
+            
+            /*--- Get the index of the current point. ---*/
+            
+            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
+            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+            
+            /*--- Search for the lowest global index in this element. We
+             send the element to the processor owning the range that includes
+             the lowest global index value. ---*/
+            
+            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
+              if (newID < Global_Index) Global_Index = newID;
+            }
+            
+            /*--- Search for the processor that owns this point ---*/
+            
+            iProcessor = Global_Index/npoint_procs[0];
+            if (iProcessor >= (unsigned long)size)
+              iProcessor = (unsigned long)size-1;
+            if (Global_Index >= nPoint_Linear[iProcessor])
+              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+            else
+              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+            
+            /*--- Load connectivity into the buffer for sending ---*/
+            
+            if (nElem_Flag[iProcessor] != ii) {
+              
+              nElem_Flag[iProcessor] = ii;
+              unsigned long nn = index[iProcessor];
+              unsigned long mm = haloIndex[iProcessor];
+              
+              /*--- Load the connectivity values. ---*/
+              
+              for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
+                iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
+                connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
+                
+                /*--- Check if this is a halo node. If so, flag this element
+                 as a halo cell. We will use this later to sort and remove
+                 any duplicates from the connectivity list. ---*/
+                
+                if (Local_Halo[iPoint]) haloSend[mm] = true;
+                
+              }
+              
+              /*--- Increment the index by the message length ---*/
+              
+              index[iProcessor]    += NODES_PER_ELEMENT;
+              haloIndex[iProcessor]++;
+              
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] haloIndex;
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+  
+  unsigned long *connRecv = NULL;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
+  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
+    connRecv[ii] = 0;
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the flags for the halo cells. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  /*--- Launch the non-blocking recv's for the connectivity. ---*/
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = NODES_PER_ELEMENT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
+  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
+  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  
+  mm = nElem_Recv[rank];
+  ll = nElem_Send[rank];
+  kk = nElem_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Store the connectivity for this rank in the proper data
+   structure before post-processing below. Note that we add 1 here
+   to the connectivity for vizualization packages. First, allocate
+   appropriate amount of memory for this section. ---*/
+  
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  int count = 0; nElem_Total = 0;
+  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
+    }
+  }
+
+  /*--- Store the particular global element count in the class data,
+   and set the class data pointer to the connectivity array. ---*/
+  
+  switch (Elem_Type) {
+    case LINE:
+      nParallel_Line = nElem_Total;
+      if (nParallel_Line > 0) Conn_Line_Par = Conn_Elem;
+      break;
+    case TRIANGLE:
+      nParallel_Tria = nElem_Total;
+      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
+      break;
+    case QUADRILATERAL:
+      nParallel_Quad = nElem_Total;
+      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
+      break;
+    default:
+      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+      break;
+  }
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] connSend;
+  delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
+  delete [] Local_Halo;
+  delete [] nElem_Recv;
+  delete [] nElem_Send;
+  delete [] nElem_Flag;
+  delete [] Buffer_Recv_nAddedPeriodic;
+  delete [] Buffer_Send_AddedPeriodic;
+  delete [] Buffer_Recv_AddedPeriodic;
+  delete [] npoint_procs;
+  delete [] starting_node;
+  delete [] ending_node;
+  delete [] nPoint_Linear;
+  
+}
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
new file mode 100644
index 000000000000..5e74506e0252
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -0,0 +1,643 @@
+#include "../../../include/output/filewriter/CTecplotBinaryFileWriter.hpp"
+#ifdef HAVE_TECIO
+  #include "TECIO.h"
+#endif
+#include <set>
+
+CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".szplt";
+  
+  this->filename += file_ext;
+  
+  this->time_iter = time_iter;
+  
+  this->timestep = timestep;
+  
+}
+
+
+CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){
+  
+}
+
+
+void CTecplotBinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  if (!data_sorter->GetConnectivitySorted()){
+    SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
+  }
+  
+#ifdef HAVE_TECIO
+  
+  /*--- Reduce the total number of each element. ---*/
+
+  unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
+  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
+                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
+                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = data_sorter->GetnElem(PRISM),
+                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Quad, &nTot_Quad, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tetr, &nTot_Tetr, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Hexa, &nTot_Hexa, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pris, &nTot_Pris, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pyra, &nTot_Pyra, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTot_Line      = nParallel_Line;
+
+  nTot_Tria = nParallel_Tria;
+  nTot_Quad = nParallel_Quad;
+  nTot_Tetr = nParallel_Tetr;
+  nTot_Hexa = nParallel_Hexa;
+  nTot_Pris = nParallel_Pris;
+  nTot_Pyra = nParallel_Pyra;
+#endif
+  
+  string data_set_title = "Visualization of the solution";
+
+  ostringstream tecplot_variable_names;
+  for (size_t iVar = 0; iVar < fieldnames.size()-1; ++iVar) {
+    tecplot_variable_names << fieldnames[iVar] << ",";
+  }
+  tecplot_variable_names << fieldnames[fieldnames.size()-1];
+
+  void* file_handle = NULL;
+  int32_t err = tecFileWriterOpen(filename.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
+    FILEFORMAT_SZL, FILETYPE_FULL, (int32_t)FieldDataType_Double, NULL, &file_handle);
+  if (err) cout << "Error opening Tecplot file '" << filename << "'" << endl;
+
+#ifdef HAVE_MPI
+  err = tecMPIInitialize(file_handle, MPI_COMM_WORLD, MASTER_NODE);
+  if (err) cout << "Error initializing Tecplot parallel output." << endl;
+#endif
+  
+  /*--- Define the zone(s). For 2D, and for 3D surfaces, each rank outputs a separate zone. ---*/
+
+  int64_t num_nodes;
+  int64_t num_cells;
+  int32_t zone_type;
+  
+  
+  num_nodes = static_cast<int64_t>(data_sorter->GetnPointsGlobal());
+  num_cells = static_cast<int64_t>(data_sorter->GetnElem());
+  if (nDim == 3){
+    if ((nTot_Quad >= 0 || nTot_Tria >= 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
+      zone_type = ZONETYPE_FEQUADRILATERAL;
+    }
+    else {
+      zone_type = ZONETYPE_FEBRICK;
+    }
+  }
+  else {
+    if (nTot_Line > 0 && (nTot_Tria + nTot_Quad == 0)){
+      zone_type = ZONETYPE_FELINESEG;
+    }
+    else{
+      zone_type = ZONETYPE_FEQUADRILATERAL;
+    }
+  }
+
+  bool is_unsteady = false;
+  passivedouble solution_time = 0.0;
+//  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+//    is_unsteady = true;
+//    solution_time = SU2_TYPE::GetValue(config->GetDelta_UnstTime()*config->GetExtIter());
+//  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+//    is_unsteady = true;
+//    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
+//    passivedouble period = SU2_TYPE::GetValue(config->GetHarmonicBalance_Period());
+//    passivedouble deltaT = period/SU2_TYPE::GetValue(config->GetnTimeInstances());
+//    solution_time = deltaT*val_iZone;
+//  }
+
+  if (timestep > 0.0){
+    is_unsteady = true;
+    solution_time = timestep*time_iter;
+  }
+  
+  int32_t zone;
+  vector<int32_t> value_locations(fieldnames.size(), 1); /* Nodal variables. */
+  err = tecZoneCreateFE(file_handle, "Zone", zone_type, num_nodes, num_cells, NULL, NULL, &value_locations[0], NULL, 0, 0, 0, &zone);
+  if (err) cout << rank << ": Error creating Tecplot zone." << endl;
+  if (is_unsteady) {
+    err = tecZoneSetUnsteadyOptions(file_handle, zone, solution_time, time_iter + 1);
+    if (err) cout << rank << ": Error setting Tecplot zone unsteady options." << std::endl;
+  }
+
+#ifdef HAVE_MPI
+
+  unsigned short iVar;
+  NodePartitioner node_partitioner(num_nodes, size);
+  std::set<unsigned long> halo_nodes;
+  vector<unsigned long> sorted_halo_nodes;
+  vector<passivedouble> halo_var_data;
+  vector<int> num_nodes_to_receive(size, 0);
+  vector<int> values_to_receive_displacements(size);
+
+  if (zone_type == ZONETYPE_FEBRICK) {
+
+    /* We output a single, partitioned zone where each rank outputs one partition. */
+    vector<int32_t> partition_owners;
+    partition_owners.reserve(size);
+    for (int32_t iRank = 0; iRank < size; ++iRank)
+      partition_owners.push_back(iRank);
+    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, size, &partition_owners[0]);
+    if (err) cout << rank << ": Error assigning MPI ranks for Tecplot zone partitions." << endl;
+  
+    /* Gather a list of nodes we refer to but are not outputting. */
+
+    for (unsigned long i = 0; i < nParallel_Tria * N_POINTS_TRIANGLE; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(TRIANGLE, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(TRIANGLE, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(TRIANGLE, 0, i));
+  
+    for (unsigned long i = 0; i < nParallel_Quad * N_POINTS_QUADRILATERAL; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i));
+
+    for (unsigned long i = 0; i < nParallel_Tetr * N_POINTS_TETRAHEDRON; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i));
+
+    for (unsigned long i = 0; i < nParallel_Hexa * N_POINTS_HEXAHEDRON; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i));
+      
+    for (unsigned long i = 0; i < nParallel_Pris * N_POINTS_PRISM; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(PRISM, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(PRISM, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(PRISM, 0, i));
+    
+    for (unsigned long i = 0; i < nParallel_Pyra * N_POINTS_PYRAMID; ++i)
+      if ((unsigned long)data_sorter->GetElem_Connectivity(PYRAMID, 0, i) <= data_sorter->GetNodeBegin(rank) || 
+          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(PYRAMID, 0, i))
+        halo_nodes.insert(data_sorter->GetElem_Connectivity(PYRAMID, 0, i));
+
+    /* Sorted list of halo nodes for this MPI rank. */
+    sorted_halo_nodes.assign(halo_nodes.begin(), halo_nodes.end());
+        
+    /* Have to include all nodes our cells refer to or TecIO will barf, so add the halo node count to the number of local nodes. */
+    int64_t partition_num_nodes = data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank) + static_cast<int64_t>(halo_nodes.size());
+    int64_t partition_num_cells = nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
+
+    /*--- We effectively tack the halo nodes onto the end of the node list for this partition.
+      TecIO will later replace them with references to nodes in neighboring partitions. */
+    size_t num_halo_nodes = sorted_halo_nodes.size();
+    vector<int64_t> halo_node_local_numbers(max((size_t)1, num_halo_nodes)); /* Min size 1 to avoid crashes when we access these vectors below. */
+    vector<int32_t> neighbor_partitions(max((size_t)1, num_halo_nodes));
+    vector<int64_t> neighbor_nodes(max((size_t)1, num_halo_nodes));
+    for(int64_t i = 0; i < static_cast<int64_t>(num_halo_nodes); ++i) {
+      halo_node_local_numbers[i] = data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank) + i + 1;
+      int owning_rank;
+      unsigned long node_number;
+      node_partitioner.GetOwningRankAndNodeNumber(sorted_halo_nodes[i], owning_rank, node_number);
+      neighbor_partitions[i] = owning_rank + 1; /* Partition numbers are 1-based. */
+      neighbor_nodes[i] = static_cast<int64_t>(node_number);
+    }
+    err = tecFEPartitionCreate64(file_handle, zone, rank + 1, partition_num_nodes, partition_num_cells,
+      static_cast<int64_t>(num_halo_nodes), &halo_node_local_numbers[0], &neighbor_partitions[0], &neighbor_nodes[0], 0, NULL);
+    if (err) cout << rank << ": Error creating Tecplot zone partition." << endl;
+
+    /* Gather halo node data. First, tell each rank how many nodes' worth of data we need from them. */
+    for (size_t i = 0; i < num_halo_nodes; ++i)
+      ++num_nodes_to_receive[neighbor_partitions[i] - 1];
+    vector<int> num_nodes_to_send(size);
+    SU2_MPI::Alltoall(&num_nodes_to_receive[0], 1, MPI_INT, &num_nodes_to_send[0], 1, MPI_INT, MPI_COMM_WORLD);
+
+    /* Now send the global node numbers whose data we need,
+       and receive the same from all other ranks.
+       Each rank has globally consecutive node numbers,
+       so we can just parcel out sorted_halo_nodes for send. */
+    vector<int> nodes_to_send_displacements(size);
+    vector<int> nodes_to_receive_displacements(size);
+    nodes_to_send_displacements[0] = 0;
+    nodes_to_receive_displacements[0] = 0;
+    for(int iRank = 1; iRank < size; ++iRank) {
+      nodes_to_send_displacements[iRank] = nodes_to_send_displacements[iRank - 1] + num_nodes_to_send[iRank - 1];
+      nodes_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank - 1] + num_nodes_to_receive[iRank - 1];
+    }
+    int total_num_nodes_to_send = nodes_to_send_displacements[size - 1] + num_nodes_to_send[size - 1];
+    vector<unsigned long> nodes_to_send(max(1, total_num_nodes_to_send));
+
+    /* The terminology gets a bit confusing here. We're sending the node numbers
+       (sorted_halo_nodes) whose data we need to receive, and receiving
+       lists of nodes whose data we need to send. */
+    if (sorted_halo_nodes.empty()) sorted_halo_nodes.resize(1); /* Avoid crash. */
+    SU2_MPI::Alltoallv(&sorted_halo_nodes[0], &num_nodes_to_receive[0], &nodes_to_receive_displacements[0], MPI_UNSIGNED_LONG,
+                       &nodes_to_send[0],     &num_nodes_to_send[0],    &nodes_to_send_displacements[0],    MPI_UNSIGNED_LONG,
+                       MPI_COMM_WORLD);
+    
+    /* Now actually send and receive the data */
+    vector<passivedouble> data_to_send(max(1, total_num_nodes_to_send * (int)fieldnames.size()));
+    halo_var_data.resize(max((size_t)1, fieldnames.size() * num_halo_nodes));
+    vector<int> num_values_to_send(size);
+    vector<int> values_to_send_displacements(size);
+    vector<int> num_values_to_receive(size);
+    size_t index = 0;
+    for(int iRank = 0; iRank < size; ++iRank) {
+      /* We send and receive GlobalField_Counter values per node. */
+      num_values_to_send[iRank]              = num_nodes_to_send[iRank] * fieldnames.size();
+      values_to_send_displacements[iRank]    = nodes_to_send_displacements[iRank] * fieldnames.size();
+      num_values_to_receive[iRank]           = num_nodes_to_receive[iRank] * fieldnames.size();
+      values_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank] * fieldnames.size();
+      for(iVar = 0; iVar < fieldnames.size(); ++iVar)
+        for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
+          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - data_sorter->GetNodeBegin(rank) - 1;
+          data_to_send[index++] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,node_offset));
+        }
+    }
+    SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
+                       &halo_var_data[0], &num_values_to_receive[0], &values_to_receive_displacements[0], MPI_DOUBLE,
+                       MPI_COMM_WORLD);
+  }
+  else {
+    /* Zone will be gathered to and output by MASTER_NODE */
+    int32_t partition_owner = MASTER_NODE;
+    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, 1, &partition_owner);
+  }
+
+  /*--- Write surface and volumetric solution data. ---*/
+  
+  if (zone_type == ZONETYPE_FEBRICK) {
+    std::vector<passivedouble> values_to_write(data_sorter->GetnPoints());
+    for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
+      for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
+        values_to_write[i] = SU2_TYPE::GetValue(data_sorter->GetData(iVar, i));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, data_sorter->GetnPoints(), &values_to_write[0]);
+      if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
+      for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
+        if (num_nodes_to_receive[iRank] > 0) {
+          int var_data_offset = values_to_receive_displacements[iRank] + num_nodes_to_receive[iRank] * iVar;
+          err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, static_cast<int64_t>(num_nodes_to_receive[iRank]), &halo_var_data[var_data_offset]);
+          if (err) cout << rank << ": Error outputting Tecplot halo values." << endl;
+        }
+      }
+    }
+  } else {
+    if (rank == MASTER_NODE) {
+      vector<passivedouble> var_data;
+      unsigned long nPoint = data_sorter->GetnPoints();
+      vector<unsigned long> num_points(size);
+      SU2_MPI::Gather(&nPoint, 1, MPI_UNSIGNED_LONG, &num_points[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      
+      for(int iRank = 0; iRank < size; ++iRank) {
+        int64_t rank_num_points = num_points[iRank];
+
+        if (rank_num_points > 0) {
+          if (iRank == rank) { /* Output local data. */
+            std::vector<passivedouble> values_to_write;
+            for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
+              values_to_write.resize(rank_num_points);
+              for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
+                values_to_write[i] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,i));
+              err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]); 
+              if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
+            }
+          }
+          else { /* Receive data from other rank. */
+            var_data.resize(max((int64_t)1, (int64_t)fieldnames.size() * rank_num_points));
+            SU2_MPI::Recv(&var_data[0], fieldnames.size() * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+            for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
+              err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &var_data[iVar * rank_num_points]);
+              if (err) cout << rank << ": Error outputting Tecplot surface variable values." << endl;
+            }
+          }
+        }
+      }
+    }
+    else { /* Send data to MASTER_NODE */
+      unsigned long nPoint = data_sorter->GetnPoints();
+      
+      SU2_MPI::Gather(&nPoint, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+    
+      vector<passivedouble> var_data;
+      size_t var_data_size = fieldnames.size() * data_sorter->GetnPoints();
+      var_data.reserve(var_data_size);
+      for (iVar = 0; err == 0 && iVar < fieldnames.size() ; iVar++)
+          for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
+            var_data.push_back(SU2_TYPE::GetValue(data_sorter->GetData(iVar,i)));
+      
+      if (var_data.size() > 0)
+        SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
+    }
+  }
+
+#else
+
+  unsigned short iVar;
+
+  vector<passivedouble> var_data;
+  size_t var_data_size = nVar_Par * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
+  var_data.reserve(var_data_size);
+  
+  if (surf_sol) {
+    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+      for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
+        var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &var_data[iVar * nSurf_Poin_Par]);
+      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
+    }
+  } else {
+    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
+      for(unsigned long i = 0; i < nParallel_Poin; ++i)
+        var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nParallel_Poin, &var_data[iVar * nParallel_Poin]);
+      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
+    }
+  }
+
+#endif /* HAVE_MPI */
+  
+  /*--- Write connectivity data. ---*/
+
+  unsigned long iElem;
+  
+#ifdef HAVE_MPI
+  if (zone_type == ZONETYPE_FEBRICK) {
+
+    int64_t nodes[8];
+
+    /**
+     *  Each rank writes node numbers relative to the partition it is outputting (starting with node number 1).
+     *  Ghost (halo) nodes identified above are numbered sequentially just beyond the end of the actual, local nodes.
+     *  Note that beg_node and end_node refer to zero-based node numbering, but Conn_* contain one-based node numbers.
+     */
+#define MAKE_LOCAL(n) data_sorter->GetNodeBegin(rank) < (unsigned long)n && (unsigned long)n <= data_sorter->GetNodeEnd(rank) \
+  ? (int64_t)((unsigned long)n - data_sorter->GetNodeBegin(rank)) \
+  : GetHaloNodeNumber(n, data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank), sorted_halo_nodes)
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
+      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0));
+      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1));
+      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2));
+      nodes[3] = nodes[2];
+      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3));
+      nodes[5] = nodes[4];
+      nodes[6] = nodes[4];
+      nodes[7] = nodes[4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
+      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0));
+      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1));
+      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2));
+      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3));
+      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4));
+      nodes[5] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5));
+      nodes[6] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6));
+      nodes[7] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7));
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+      
+    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
+      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 0));
+      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 1));
+      nodes[2] = nodes[1];
+      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 2));
+      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 3));
+      nodes[5] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 4));
+      nodes[6] = nodes[5];
+      nodes[7] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 5));
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+    
+    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
+      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0));
+      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1));
+      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2));
+      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3));
+      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4));
+      nodes[5] = nodes[4];
+      nodes[6] = nodes[4];
+      nodes[7] = nodes[4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+  } else {
+    if (rank == MASTER_NODE) {
+
+      /* Non-hexahedral output by the master node. Output local data directly, and gather other data from the other ranks. */
+
+      int64_t nodes[4];
+
+      vector<unsigned long> connectivity_sizes(size);
+      unsigned long unused = 0;
+      SU2_MPI::Gather(&unused, 1, MPI_UNSIGNED_LONG, &connectivity_sizes[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      vector<int64_t> connectivity;
+      for(int iRank = 0; iRank < size; ++iRank) {
+        if (iRank == rank) {
+          for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+            nodes[0] = data_sorter->GetElem_Connectivity(LINE, iElem, 0);
+            nodes[1] = data_sorter->GetElem_Connectivity(LINE, iElem, 1);
+            err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 2, nodes);
+            if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+          }
+          
+          for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+            nodes[0] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
+            nodes[1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
+            nodes[2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+            nodes[3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+            err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+            if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+          }
+          
+          for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+            nodes[0] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
+            nodes[1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
+            nodes[2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
+            nodes[3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
+            err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
+            if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+          }
+          
+        } else { /* Receive node map and write out. */
+          connectivity.resize(max((unsigned long)1, connectivity_sizes[iRank]));
+          SU2_MPI::Recv(&connectivity[0], connectivity_sizes[iRank], MPI_UNSIGNED_LONG, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+          err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, connectivity_sizes[iRank], &connectivity[0]);
+          if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+        }
+      }
+    } else {
+
+      /* Non-hexahedral output by non-master node. Send what we've got to the master node. */
+
+      unsigned long connectivity_size;
+      connectivity_size = 2 * nParallel_Line + 4 * (nParallel_Tria + nParallel_Quad);
+      SU2_MPI::Gather(&connectivity_size, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
+      vector<int64_t> connectivity;
+      connectivity.reserve(connectivity_size);
+      for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+        connectivity.push_back(data_sorter->GetElem_Connectivity(LINE, iElem, 0));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(LINE, iElem, 0));
+      }
+      
+      for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
+      }
+      
+      for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2));
+        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3));
+      }
+      
+      if (connectivity.empty()) connectivity.resize(1); /* Avoid crash */
+      SU2_MPI::Send(&connectivity[0], connectivity_size, MPI_UNSIGNED_LONG, MASTER_NODE, rank, MPI_COMM_WORLD);
+    }
+  }
+#else
+  if (surf_sol) {
+
+    int64_t nodes[4];
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
+      iNode = iElem*N_POINTS_LINE;
+      nodes[0] = Conn_BoundLine_Par[iNode+0];
+      nodes[1] = Conn_BoundLine_Par[iNode+1];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 2, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+        
+    for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
+      iNode = iElem*N_POINTS_TRIANGLE;
+      nodes[0] = Conn_BoundTria_Par[iNode+0];
+      nodes[1] = Conn_BoundTria_Par[iNode+1];
+      nodes[2] = Conn_BoundTria_Par[iNode+2];
+      nodes[3] = Conn_BoundTria_Par[iNode+2];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+        
+    for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
+      iNode = iElem*N_POINTS_QUADRILATERAL;
+      nodes[0] = Conn_BoundQuad_Par[iNode+0];
+      nodes[1] = Conn_BoundQuad_Par[iNode+1];
+      nodes[2] = Conn_BoundQuad_Par[iNode+2];
+      nodes[3] = Conn_BoundQuad_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+
+  } else {
+
+    int64_t nodes[8];
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+      iNode = iElem*N_POINTS_TRIANGLE;
+      nodes[0] = Conn_Tria_Par[iNode+0];
+      nodes[1] = Conn_Tria_Par[iNode+1];
+      nodes[2] = Conn_Tria_Par[iNode+2];
+      nodes[3] = Conn_Tria_Par[iNode+2];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+      iNode = iElem*N_POINTS_QUADRILATERAL;
+      nodes[0] = Conn_Quad_Par[iNode+0];
+      nodes[1] = Conn_Quad_Par[iNode+1];
+      nodes[2] = Conn_Quad_Par[iNode+2];
+      nodes[3] = Conn_Quad_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
+      iNode = iElem*N_POINTS_TETRAHEDRON;
+      nodes[0] = Conn_Tetr_Par[iNode+0];
+      nodes[1] = Conn_Tetr_Par[iNode+1];
+      nodes[2] = Conn_Tetr_Par[iNode+2];
+      nodes[3] = Conn_Tetr_Par[iNode+2];
+      nodes[4] = Conn_Tetr_Par[iNode+3];
+      nodes[5] = Conn_Tetr_Par[iNode+3];
+      nodes[6] = Conn_Tetr_Par[iNode+3];
+      nodes[7] = Conn_Tetr_Par[iNode+3];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+
+    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
+      iNode = iElem*N_POINTS_HEXAHEDRON;
+      nodes[0] = Conn_Hexa_Par[iNode+0];
+      nodes[1] = Conn_Hexa_Par[iNode+1];
+      nodes[2] = Conn_Hexa_Par[iNode+2];
+      nodes[3] = Conn_Hexa_Par[iNode+3];
+      nodes[4] = Conn_Hexa_Par[iNode+4];
+      nodes[5] = Conn_Hexa_Par[iNode+5];
+      nodes[6] = Conn_Hexa_Par[iNode+6];
+      nodes[7] = Conn_Hexa_Par[iNode+7];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+      
+    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
+      iNode = iElem*N_POINTS_PRISM;
+      nodes[0] = Conn_Pris_Par[iNode+0];
+      nodes[1] = Conn_Pris_Par[iNode+1];
+      nodes[2] = Conn_Pris_Par[iNode+1];
+      nodes[3] = Conn_Pris_Par[iNode+2];
+      nodes[4] = Conn_Pris_Par[iNode+3];
+      nodes[5] = Conn_Pris_Par[iNode+4];
+      nodes[6] = Conn_Pris_Par[iNode+4];
+      nodes[7] = Conn_Pris_Par[iNode+5];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+    
+    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
+      iNode = iElem*N_POINTS_PYRAMID;
+      nodes[0] = Conn_Pyra_Par[iNode+0];
+      nodes[1] = Conn_Pyra_Par[iNode+1];
+      nodes[2] = Conn_Pyra_Par[iNode+2];
+      nodes[3] = Conn_Pyra_Par[iNode+3];
+      nodes[4] = Conn_Pyra_Par[iNode+4];
+      nodes[5] = Conn_Pyra_Par[iNode+4];
+      nodes[6] = Conn_Pyra_Par[iNode+4];
+      nodes[7] = Conn_Pyra_Par[iNode+4];
+      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+    }
+      
+  }
+
+#endif
+  
+  err = tecFileWriterClose(&file_handle);
+  if (err) cout << rank << ": Error finishing Tecplot file output." << endl;
+  
+#endif /* HAVE_TECIO */
+  
+
+}
+
+
+int64_t CTecplotBinaryFileWriter::GetHaloNodeNumber(unsigned long global_node_number, unsigned long last_local_node, vector<unsigned long> const &halo_node_list)
+{
+  vector<unsigned long>::const_iterator it = lower_bound(halo_node_list.begin(), halo_node_list.end(), global_node_number);
+  assert(it != halo_node_list.end());
+  assert(*it == global_node_number);
+  /* When C++11 is universally available, replace the following mouthful with "auto" */
+  iterator_traits<vector<unsigned long>::const_iterator>::difference_type offset = distance(halo_node_list.begin(), it);
+  assert(offset >= 0);
+  return (int64_t)(last_local_node + offset + 1);
+}
+
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
new file mode 100644
index 000000000000..3f4a78828c43
--- /dev/null
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -0,0 +1,218 @@
+#include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
+
+
+CTecplotFileWriter::CTecplotFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".dat";
+  
+  this->filename += file_ext;
+  
+  this->time_iter = time_iter;
+  
+  this->timestep = timestep;
+  
+}
+
+
+CTecplotFileWriter::~CTecplotFileWriter(){
+  
+}
+
+void CTecplotFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  if (!data_sorter->GetConnectivitySorted()){
+    SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
+  }
+  
+  unsigned short iVar;
+  
+  unsigned long iPoint, iElem;
+ 
+  int iProcessor;
+
+  ofstream Tecplot_File;
+  
+  /*--- Reduce the total number of each element. ---*/
+
+  unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
+  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
+                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
+                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = data_sorter->GetnElem(PRISM),
+                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Quad, &nTot_Quad, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Tetr, &nTot_Tetr, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Hexa, &nTot_Hexa, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pris, &nTot_Pris, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nParallel_Pyra, &nTot_Pyra, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nTot_Line      = nParallel_Line;
+
+  nTot_Tria = nParallel_Tria;
+  nTot_Quad = nParallel_Quad;
+  nTot_Tetr = nParallel_Tetr;
+  nTot_Hexa = nParallel_Hexa;
+  nTot_Pris = nParallel_Pris;
+  nTot_Pyra = nParallel_Pyra;
+#endif
+    
+  /*--- Open Tecplot ASCII file and write the header. ---*/
+  
+  if (rank == MASTER_NODE) {
+    Tecplot_File.open(filename.c_str(), ios::out);
+    Tecplot_File.precision(6);
+    Tecplot_File << "TITLE = \"Visualization of the solution\"" << endl;
+    
+    Tecplot_File << "VARIABLES = ";
+    for (iVar = 0; iVar < fieldnames.size()-1; iVar++) {
+      Tecplot_File << "\"" << fieldnames[iVar] << "\",";
+    }
+    Tecplot_File << "\"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
+    
+    /*--- Write the header ---*/
+    
+    Tecplot_File << "ZONE ";
+
+    if (timestep > 0.0){
+      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(time_iter+1)<<", SOLUTIONTIME="<< time_iter*timestep <<", ";      
+    }
+    
+//    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+//      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
+//    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+//      /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
+//      su2double period = config->GetHarmonicBalance_Period();
+//      su2double deltaT = period/(su2double)(config->GetnTimeInstances());
+//      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
+//    }
+//    if (nDim == 2) {
+//      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
+//      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
+//    } else {
+//      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
+//      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
+//    }
+    
+    Tecplot_File << "NODES= "<< data_sorter->GetnPointsGlobal() <<", ELEMENTS= "<< data_sorter->GetnElem();
+    
+    if (nDim == 3){
+      if ((nTot_Quad > 0 || nTot_Tria > 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
+        Tecplot_File << ", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL" << endl;
+      }
+      else {
+        Tecplot_File <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
+      }
+    }
+    else {
+      if (nTot_Line > 0 && (nTot_Tria + nTot_Quad == 0)){
+        Tecplot_File << ", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;       
+      }
+      else{
+        Tecplot_File << ", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;   
+      }
+    }
+    Tecplot_File.close();    
+  }
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  
+  /*--- Each processor opens the file. ---*/
+  
+  Tecplot_File.open(filename.c_str(), ios::out | ios::app);
+  
+  /*--- Write surface and volumetric solution data. ---*/
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      
+      /*--- Write the node data from this proc ---*/
+      
+      
+      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+        for (iVar = 0; iVar < fieldnames.size(); iVar++)
+          Tecplot_File << scientific << data_sorter->GetData(iVar, iPoint) << "\t";
+        Tecplot_File << endl;
+      }
+    }
+    
+    Tecplot_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+
+  
+  /*--- Write connectivity data. ---*/
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      
+      for (iElem = 0; iElem < nParallel_Line; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(LINE, iElem, 0) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(LINE, iElem, 1)<< "\n";
+      }
+      
+      
+      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\n";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) << "\n";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\n";        
+      }
+      
+      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) << "\n";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 2) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 5) << "\n";
+      }
+      
+      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
+        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t";
+        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\n";
+      }
+      
+      
+    }
+    Tecplot_File.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+  
+  Tecplot_File.close();
+  
+}
+
+

From a940935e49f4d968133d64e065b30ea35efd62ea Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:09:20 +0200
Subject: [PATCH 277/539] Added mesh file writer

---
 .../output/filewriter/CSU2MeshFileWriter.hpp   | 18 ++++++++++++++++++
 SU2_CFD/src/meson.build                        |  3 ++-
 SU2_CFD/src/output/COutput.cpp                 |  2 ++
 .../src/output/filewriter/CFEMDataSorter.cpp   |  1 +
 .../src/output/filewriter/CFVMDataSorter.cpp   |  2 ++
 .../output/filewriter/CSU2MeshFileWriter.cpp   |  0
 SU2_DEF/src/meson.build                        | 16 +++++++++++++++-
 7 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
 create mode 100644 SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp

diff --git a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
new file mode 100644
index 000000000000..26a3768921ee
--- /dev/null
+++ b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#include "CFileWriter.hpp"
+
+class CSU2MeshFileWriter : public CFileWriter{
+  
+private:
+  unsigned short iZone, nZone;
+
+public:
+  
+  CSU2MeshFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone);
+  
+  ~CSU2MeshFileWriter();
+  
+  void Write_Data(CParallelDataSorter* data_sorter);
+  
+};
+
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 3488f17e7d7e..32a68d0154e6 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -89,7 +89,8 @@ su2_cfd_src += files(['output/CAdjElasticityOutput.cpp',
 		      'output/filewriter/CTecplotBinaryFileWriter.cpp',
 		      'output/filewriter/CCSVFileWriter.cpp',
 		      'output/filewriter/CSU2FileWriter.cpp',
-		      'output/filewriter/CSU2BinaryFileWriter.cpp'])
+		      'output/filewriter/CSU2BinaryFileWriter.cpp',
+		      'output/filewriter/CSU2MeshFileWriter.cpp'])
 
 
 su2_cfd = executable('SU2_CFD',
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 419057d44006..b148e8d9f1b5 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -41,11 +41,13 @@
 #include "../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
 
 #include "../../include/output/filewriter/CParaviewFileWriter.hpp"
+#include "../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
 #include "../../include/output/filewriter/CTecplotFileWriter.hpp"
 #include "../../include/output/filewriter/CTecplotBinaryFileWriter.hpp"
 #include "../../include/output/filewriter/CCSVFileWriter.hpp"
 #include "../../include/output/filewriter/CSU2FileWriter.hpp"
 #include "../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
+#include "../../include/output/filewriter/CSU2MeshFileWriter.hpp"
 
 
 
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 8583ab739d11..15cc7111ecb7 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -457,6 +457,7 @@ void CFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool
   SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
   
+  connectivity_sorted = true;
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 44385f8779b4..81fee1a72970 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -500,6 +500,8 @@ void CFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool
   SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
   
+  connectivity_sorted = true;  
+  
 }
 
 void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
index f77fb48be8a1..59b80ccc13f9 100644
--- a/SU2_DEF/src/meson.build
+++ b/SU2_DEF/src/meson.build
@@ -9,7 +9,21 @@ su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
 				       'output/output_fieldview.cpp',
 				       'output/output_su2.cpp',
 				       'output/output_paraview.cpp',
-				       'variable_structure.cpp'])
+				       'variable_structure.cpp',
+				       'output/filewriter/CParallelDataSorter.cpp',
+				       'output/filewriter/CFVMDataSorter.cpp',
+                                       'output/filewriter/CFEMDataSorter.cpp',
+                                       'output/filewriter/CSurfaceFEMDataSorter.cpp',
+                                       'output/filewriter/CSurfaceFVMDataSorter.cpp',
+                                       'output/filewriter/CParallelFileWriter.cpp',
+                                       'output/filewriter/CParaviewFileWriter.cpp',
+                                       'output/filewriter/CParaviewBinaryFileWriter.cpp',
+                                       'output/filewriter/CTecplotFileWriter.cpp',
+                                       'output/filewriter/CTecplotBinaryFileWriter.cpp',
+                                       'output/filewriter/CCSVFileWriter.cpp',
+                                       'output/filewriter/CSU2FileWriter.cpp',
+                                       'output/filewriter/CSU2BinaryFileWriter.cpp',
+                                       'output/filewriter/CSU2MeshFileWriter.cpp'])
 
 
 su2_def = executable('SU2_DEF',

From 81f197cb8aec459fd022fca1907428d2017e1071 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:10:33 +0200
Subject: [PATCH 278/539] Enable new file writing routines

---
 SU2_CFD/include/output/COutput.hpp |  2 +
 SU2_CFD/src/output/COutput.cpp     | 94 +++++++++++++++++-------------
 2 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 1ba175a3d422..6f37b87a50bf 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -78,6 +78,8 @@ class COutput {
 
 protected:
   
+  CParallelDataSorter* data_sorter;
+  
   COutputLegacy *output_legacy;
 
   unsigned long nGlobal_Poin;   // Global number of nodes with halos
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index b148e8d9f1b5..10566d4a5873 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -449,18 +449,28 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
     cout << endl << "Loading solution output data locally on each rank." << endl;
   
   CollectVolumeData(config, geometry, solver_container);
+ 
+  /*---- Construct a data sorter object to partition and distribute
+   *  the local data into linear chunks across the processors ---*/
+  
+  if (fem_output){
+  
+    data_sorter = new CFEMDataSorter(config, geometry, GlobalField_Counter, Local_Data);
+
+  }  else {
+    
+    data_sorter = new CFVMDataSorter(config, geometry, GlobalField_Counter, Local_Data);
+    
+  }
   
   /*--- Sort the data, needed for volume and surface output ---*/
   
   if (rank == MASTER_NODE) 
     cout << "Sorting output data across all ranks." << endl;
   
-  if (fem_output){
-    SortOutputData_FEM(config, geometry);
-  }
-  else {
-    SortOutputData(config, geometry);
-  }
+  data_sorter->SortOutputData(config, geometry);
+  
+//  SortOutputData(config, geometry);
 }
 
 void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
@@ -564,6 +574,10 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
    
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = config->GetnZone();
+  
+  unsigned short nDim = geometry->GetnDim();
+  
+  CFileWriter* filewriter;
 
   /*--- Write files depending on the format --- */
   
@@ -574,9 +588,9 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     if (rank == MASTER_NODE) {
         cout << "Writing SU2 ASCII restart file." << endl;     
     }
-   
-    WriteRestart_Parallel_ASCII(config, geometry);
-    
+       
+    filewriter = new CSU2FileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+        
     break;
     
   case SU2_RESTART_BINARY:
@@ -585,8 +599,8 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing SU2 binary restart file." << endl;   
     }
 
-    WriteRestart_Parallel_Binary(config, geometry);
-    
+    filewriter = new CSU2BinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+        
     break;
   
   case SU2_MESH:
@@ -594,7 +608,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     /*--- Load and sort the output data and connectivity.
      *  Note that the solver container is not need in this case. ---*/
     
-    SortConnectivity(config, geometry, false, true);
+    data_sorter->SortConnectivity(config, geometry, true);
     
     /*--- Set the mesh ASCII format ---*/
     
@@ -602,7 +616,8 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing SU2 mesh file." << endl;
     }
     
-    SetSU2_MeshASCII(config, geometry);
+    filewriter = new CSU2MeshFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, config->GetiZone(), config->GetnZone());
+    
     
     break;    
     
@@ -610,7 +625,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    SortConnectivity(config, geometry, false, false);
+     data_sorter->SortConnectivity(config, geometry, false);
     
     /*--- Write tecplot binary ---*/
     
@@ -618,7 +633,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing Tecplot binary file volume solution file." << endl;
     }
     
-    WriteTecplotBinary_Parallel(config, geometry, iZone, config->GetnZone(), false);
+    filewriter = new CTecplotBinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
       
     break;
     
@@ -626,7 +641,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    SortConnectivity(config, geometry, false, true);
+    data_sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write tecplot binary ---*/
     
@@ -634,7 +649,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing Tecplot ASCII file volume solution file." << endl;
     }
     
-    WriteTecplotASCII_Parallel(config, geometry, iZone, config->GetnZone(), false);
+    filewriter = new CTecplotFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
 
     break;
     
@@ -642,14 +657,14 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    SortConnectivity(config, geometry, false, true);
+    data_sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write paraview binary ---*/
     if (rank == MASTER_NODE) {
       cout << "Writing Paraview binary file volume solution file." << endl;
     }
     
-    WriteParaViewBinary_Parallel(config, geometry, iZone, nZone, false);
+    filewriter = new CParaviewBinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
     
     break;
     
@@ -657,14 +672,14 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    SortConnectivity(config, geometry, false, true);
+    data_sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write paraview binary ---*/
     if (rank == MASTER_NODE) {
         cout << "Writing Paraview ASCII file volume solution file." << endl;      
     }
     
-    WriteParaViewASCII_Parallel(config, geometry, iZone, nZone, false);
+    filewriter = new CParaviewFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
 
     break;
     
@@ -672,11 +687,10 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     SU2_MPI::Error("Requested volume output format not available.", CURRENT_FUNCTION);
     break;
   } 
-
-  /*--- Clean up the surface data that was only needed for output. ---*/
   
-  if (format != SU2_RESTART_ASCII && format != SU2_RESTART_BINARY)
-    DeallocateConnectivity_Parallel(false);
+  filewriter->Write_Data(data_sorter);
+
+  delete filewriter;
   
 }
 
@@ -4472,29 +4486,31 @@ void COutput::DeallocateConnectivity_Parallel(bool surf_sol) {
 
 void COutput::DeallocateData_Parallel() {
   
-  /*--- Deallocate memory for solution data ---*/
   
-  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
-  }
-  if (Parallel_Data != NULL) delete [] Parallel_Data;
+  if (data_sorter != NULL) delete data_sorter;
+//  /*--- Deallocate memory for solution data ---*/
+  
+//  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+//    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+//  }
+//  if (Parallel_Data != NULL) delete [] Parallel_Data;
 
 }
 
 void COutput::DeallocateSurfaceData_Parallel() {
   
-  if (Parallel_Surf_Data != NULL) {
+//  if (Parallel_Surf_Data != NULL) {
     
-    Global2Renumber.clear();
-    Renumber2Global.clear();
+//    Global2Renumber.clear();
+//    Renumber2Global.clear();
     
-    /*--- Deallocate memory for surface solution data ---*/
+//    /*--- Deallocate memory for surface solution data ---*/
     
-    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
-    }
-    delete [] Parallel_Surf_Data;
-  }
+//    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+//      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
+//    }
+//    delete [] Parallel_Surf_Data;
+//  }
   
 }
 

From 11f9864c536ca7558e502daf1678383b9f3213e4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:11:01 +0200
Subject: [PATCH 279/539] Added mesh file writing source

---
 .../output/filewriter/CSU2MeshFileWriter.cpp  | 284 ++++++++++++++++++
 1 file changed, 284 insertions(+)

diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index e69de29bb2d1..30e3fa773d6f 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -0,0 +1,284 @@
+#include "../../../include/output/filewriter/CSU2MeshFileWriter.hpp"
+#include "../../../../Common/include/toolboxes/printing_toolbox.hpp"
+
+
+
+
+CSU2MeshFileWriter::CSU2MeshFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone) : 
+  CFileWriter(filename, fields, nDim){
+
+  file_ext = ".su2";
+  
+  this->filename += file_ext;
+  
+  this->iZone = iZone;
+  this->nZone = nZone;
+  
+}
+
+
+CSU2MeshFileWriter::~CSU2MeshFileWriter(){
+  
+}
+
+
+void CSU2MeshFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+  
+  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
+  unsigned short iMarker, iDim, iChar, VTK_Type, nMarker_;
+  short SendTo;
+  ifstream input_file;
+  string text_line, Marker_Tag, str;
+  string::size_type position;
+  int iProcessor;
+  
+  ofstream output_file;
+  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
+  
+  strcpy (out_file, filename.c_str());
+  strcpy (cstr, out_file); 
+  
+  if (rank == MASTER_NODE){
+    
+    
+    output_file.open(cstr, ios::out);
+    
+    if (nZone > 1){
+      output_file << "IZONE= " << iZone+1 << endl;
+    }
+    
+    /*--- Write dimensions data. ---*/
+    
+    output_file << "NDIME= " << nDim << endl;
+    
+//    /*--- Write the angle of attack offset. ---*/
+    
+//    output_file << "AOA_OFFSET= " << config->GetAoA_Offset() << endl;
+    
+//    /*--- Write the angle of attack offset. ---*/
+    
+//    output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
+    
+    output_file << "NELEM= " << data_sorter->GetnElem() << endl;
+    
+    output_file.close();
+  }
+  
+  output_file.open(cstr, ios::out | ios::app);
+  output_file.precision(15);
+  nElem = 0;
+  offset = 0;
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iElem = 0; iElem < data_sorter->GetnElem(TRIANGLE); iElem++) {
+        output_file << "5\t";                
+        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) - 1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < data_sorter->GetnElem(QUADRILATERAL); iElem++) {
+        output_file << "9\t";
+        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) - 1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < data_sorter->GetnElem(TETRAHEDRON); iElem++) {
+        output_file << "10\t";
+        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) - 1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }  
+      for (iElem = 0; iElem < data_sorter->GetnElem(HEXAHEDRON); iElem++) {
+        output_file << "12\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) - 1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      for (iElem = 0; iElem < data_sorter->GetnElem(PRISM); iElem++) {
+        output_file << "13\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) - 1 << "\t";
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+      
+      for (iElem = 0; iElem < data_sorter->GetnElem(PYRAMID); iElem++) {
+        output_file << "14\t";
+        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) - 1 << "\t"; 
+        output_file << nElem + offset << "\n"; nElem++;
+      }
+    }
+    output_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nElem, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);    
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+  
+  
+  /*--- Write the node coordinates ---*/
+  if (rank == MASTER_NODE){
+    output_file << "NPOIN= " << data_sorter->GetnPointsGlobal();
+//    if (geometry->GetGlobal_nPointDomain() != nGlobal_Poin_Par)
+//      output_file << "\t" << geometry->GetGlobal_nPointDomain();
+    output_file << endl;
+    output_file.flush();    
+  }
+  
+  
+  unsigned long Global_Index, myPoint = 0;
+  offset = 0;
+  
+  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+    if (rank == iProcessor) {
+      for (iPoint = 0; iPoint <  data_sorter->GetnPoints(); iPoint++) {
+        
+        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+        
+        Global_Index = iPoint + offset;
+        
+        /*--- Only write original domain points, i.e., exclude any periodic
+         or halo nodes, even if they are output in the viz. files. ---*/
+        
+//        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
+          
+          /*--- Loop over the variables and write the values to file ---*/
+          
+          for (iDim = 0; iDim < nDim; iDim++) {
+            output_file << scientific << data_sorter->GetData(iDim, iPoint) << "\t";
+          }
+          
+          /*--- Write global index. (note outer loop over procs) ---*/
+          
+          output_file << Global_Index << "\t";
+          myPoint++;
+          
+          output_file << "\n";
+//        }
+      }
+    }
+    /*--- Flush the file and wait for all processors to arrive. ---*/
+    output_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
+  }
+  
+  output_file.close();
+  
+  if (rank == MASTER_NODE){
+    
+    output_file.open(cstr, ios::out | ios::app);
+    
+    /*--- Read the boundary information ---*/
+    
+    if (nZone > 1){
+      str = "boundary";
+    } else {
+      str = "boundary_" + PrintingToolbox::to_string(iZone);
+    }
+    
+    str += ".dat";
+    
+    input_file.open(str.c_str(), ios::out);
+    
+    /*--- Read grid file with format SU2 ---*/
+    
+    while (getline (input_file, text_line)) {
+      
+      /*--- Write the physical boundaries ---*/
+      
+      position = text_line.find ("NMARK=",0);
+      if (position != string::npos) {
+        
+        text_line.erase (0,6); nMarker_ = atoi(text_line.c_str());
+        output_file << "NMARK= " << nMarker_ << endl;
+        
+        for (iMarker = 0 ; iMarker < nMarker_; iMarker++) {
+          
+          getline (input_file, text_line);
+          text_line.erase (0,11);
+          string::size_type position;
+          for (iChar = 0; iChar < 20; iChar++) {
+            position = text_line.find( " ", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+            position = text_line.find( "\r", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+            position = text_line.find( "\n", 0 );
+            if (position != string::npos) text_line.erase (position,1);
+          }
+          Marker_Tag = text_line.c_str();
+          
+          /*--- Standart physical boundary ---*/
+          
+          getline (input_file, text_line);
+          
+          text_line.erase (0,13); nElem_Bound_ = atoi(text_line.c_str());
+          output_file << "MARKER_TAG= " << Marker_Tag << endl;
+          output_file << "MARKER_ELEMS= " << nElem_Bound_<< endl;
+          getline (input_file, text_line);
+          
+          text_line.erase (0,8); SendTo = atoi(text_line.c_str());
+          
+          if (Marker_Tag == "SEND_RECEIVE"){
+            output_file << "SEND_TO= " << SendTo << endl;
+          }
+          for (iElem_Bound = 0; iElem_Bound < nElem_Bound_; iElem_Bound++) {
+            
+            getline(input_file, text_line);
+            istringstream bound_line(text_line);
+            
+            bound_line >> VTK_Type;
+            output_file << VTK_Type;
+            
+            switch(VTK_Type) {
+            case LINE:
+              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
+              output_file << "\t" << vnodes_edge[0] << "\t" << vnodes_edge[1] << endl;
+              break;
+            case TRIANGLE:
+              bound_line >> vnodes_triangle[0]; bound_line >> vnodes_triangle[1]; bound_line >> vnodes_triangle[2];
+              output_file << "\t" << vnodes_triangle[0] << "\t" << vnodes_triangle[1] << "\t" << vnodes_triangle[2] << endl;
+              break;
+            case QUADRILATERAL:
+              bound_line >> vnodes_quad[0]; bound_line >> vnodes_quad[1]; bound_line >> vnodes_quad[2]; bound_line >> vnodes_quad[3];
+              output_file << "\t" << vnodes_quad[0] << "\t" << vnodes_quad[1] << "\t" << vnodes_quad[2] << "\t" << vnodes_quad[3] << endl;
+              break;
+            case VERTEX:
+              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
+              output_file << "\t" << vnodes_edge[0] <<  "\t" << vnodes_edge[1] <<endl;
+              break;
+            }
+          }
+        }
+      }
+      
+    }
+    
+    input_file.close();
+    
+//    remove(str.c_str());
+    
+    output_file.close();
+  }
+}

From 547f256b6cf68d9c4469234b73f7b879393ed508 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:14:12 +0200
Subject: [PATCH 280/539] Small bug fix

---
 Common/src/grid_movement_structure.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 12532d38db1f..25f422fff249 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -7832,6 +7832,12 @@ void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeomet
     /*--- Read the name of the output file ---*/
     
     str = config[ZONE_0]->GetMesh_Out_FileName();
+    
+    unsigned short lastindex = str.find_last_of(".");
+    str = str.substr(0, lastindex);
+    
+    str += ".su2";
+    
     strcpy (mesh_file, str.c_str());
     strcpy (cstr, mesh_file);
     

From cc469201a6eff90edbd05f0aeb6fd780ff2fd2b9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:14:45 +0200
Subject: [PATCH 281/539] Added some comments

---
 .../output/filewriter/CParallelDataSorter.hpp | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 155b6fa97056..fe21c3ddfbf3 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -63,28 +63,82 @@ class CParallelDataSorter{
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
-  virtual void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort){}
+  virtual void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort = true){}
  
+  /*!
+   * \brief Get the number of points the local rank owns.
+   * \return local number of points.
+   */
   unsigned long GetnPoints(){return nParallel_Poin;}
   
+  /*!
+   * \brief Get the global number of points (accumulated from all ranks)
+   * \return Global number of points.
+   */
   unsigned long GetnPointsGlobal(){return nGlobal_Poin_Par;}
   
+  /*!
+   * \brief Get the global of elements (accumulated from all ranks and element types)
+   * \return Global number elements.
+   */
   unsigned long GetnElem(){return nGlobal_Elem_Par;}
-    
+   
+  /*!
+   * \brief Get the local number of elements of a specific type that the current rank owns
+   * \input type - The type of element, ref GEO_TYPE
+   * \return Local number of elements of a specific type.
+   */
   unsigned long GetnElem(GEO_TYPE type);
     
+  /*!
+   * \brief Get the connectivity of specific element.
+   * \input type - The type of element, ref GEO_TYPE
+   * \input iElem - The element ID
+   * \input iNode - The node ID
+   * \return the connected node.
+   */
   unsigned long GetElem_Connectivity(GEO_TYPE type, unsigned long iElem, unsigned long iNode);
   
+  /*!
+   * \brief Beginning node ID of the linear partition owned by a specific processor.
+   * \input rank - the processor rank.
+   * \return The beginning node ID.
+   */
   unsigned long GetNodeBegin(unsigned short rank){return beg_node[rank];}
   
+  /*!
+   * \brief Ending node ID of the linear partition owned by a specific processor.
+   * \input rank - the processor rank.
+   * \return The ending node ID.
+   */
   unsigned long GetNodeEnd(unsigned short rank){return end_node[rank];}
   
+  /*!
+   * \brief Get the value of the linear partitioned data.
+   * \input iField - the output field ID.
+   * \input iPoint - the point ID.
+   * \return the value of the data field at a point.
+   */
   su2double GetData(unsigned short iField, unsigned long iPoint) {return Parallel_Data[iField][iPoint];}
   
+  /*!
+   * \brief Get the global index of a point.
+   * \input iPoint - the point ID.
+   * \return Global index of a specific point.
+   */
   virtual unsigned long GetGlobalIndex(unsigned long iPoint){return 0;}
   
+  /*!
+   * \brief Get the cumulated number of points
+   * \input rank - the processor rank.
+   * \return The cumulated number of points up to certain processor rank.
+   */
   unsigned long GetnPointCumulative(){return nPoint_Cum[rank];}
   
+  /*!
+   * \brief Check whether the current connectivity is sorted (i.e. if SortConnectivity has been called)
+   * \return <TRUE> if the connectivity is sorted.
+   */  
   bool GetConnectivitySorted(){return connectivity_sorted;}
 
   /*!

From d7b720f6276f5f9da83bb1de36d66f9bd958dbf6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 18:53:59 +0200
Subject: [PATCH 282/539] Refactored the writing of result files

---
 SU2_CFD/include/output/COutput.hpp            |  13 +-
 .../output/filewriter/CCSVFileWriter.hpp      |   2 +-
 .../include/output/filewriter/CFileWriter.hpp |   5 +-
 .../filewriter/CParaviewBinaryFileWriter.hpp  |   4 +-
 .../output/filewriter/CParaviewFileWriter.hpp |   4 +-
 .../filewriter/CSU2BinaryFileWriter.hpp       |   4 +-
 .../output/filewriter/CSU2FileWriter.hpp      |   4 +-
 .../output/filewriter/CSU2MeshFileWriter.hpp  |   4 +-
 .../filewriter/CTecplotBinaryFileWriter.hpp   |   4 +-
 .../output/filewriter/CTecplotFileWriter.hpp  |   4 +-
 SU2_CFD/src/output/COutput.cpp                | 177 ++++++------------
 .../src/output/filewriter/CCSVFileWriter.cpp  |  13 +-
 .../output/filewriter/CParallelFileWriter.cpp |   6 +-
 .../filewriter/CParaviewBinaryFileWriter.cpp  |  12 +-
 .../output/filewriter/CParaviewFileWriter.cpp |  12 +-
 .../filewriter/CSU2BinaryFileWriter.cpp       |  11 +-
 .../src/output/filewriter/CSU2FileWriter.cpp  |  12 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  12 +-
 .../filewriter/CTecplotBinaryFileWriter.cpp   |  12 +-
 .../output/filewriter/CTecplotFileWriter.cpp  |  12 +-
 20 files changed, 131 insertions(+), 196 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 6f37b87a50bf..8e2c0ea5086d 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -62,7 +62,8 @@
 #include "../../../Common/include/toolboxes/printing_toolbox.hpp"
 #include "../../../Common/include/toolboxes/signal_processing_toolbox.hpp"
 
-#include "filewriter/CParallelDataSorter.hpp"
+class CFileWriter;
+class CParallelDataSorter;
 
 #include "COutputLegacy.hpp"
 
@@ -465,6 +466,16 @@ class COutput {
   
   /*----------------------------- Protected member functions ----------------------------*/  
 
+  /*!
+   * \brief Allocates the appropriate file writer based on the chosen format.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] sorter - The parallel file sorter.
+   * \param[out] filewriter - The allocated filewriter.
+   * \param[in] format - The output format.
+   */
+  void SetFileWriter(CConfig *config, CGeometry *geomery, CParallelDataSorter *sorter, CFileWriter* filewriter, unsigned short format);  
+  
   /*!
    * \brief Write a native SU2 restart file (ASCII) in parallel.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
index a31aecc77bbc..d527803fd0a2 100644
--- a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
@@ -10,7 +10,7 @@ class CCSVFileWriter : public CFileWriter{
   
   ~CCSVFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index 910f77744bc0..bec505783d3d 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -5,7 +5,6 @@
 class CFileWriter{
 protected:
 
-  string filename;
   vector<string> fieldnames;
   unsigned short nDim;
   
@@ -15,11 +14,11 @@ class CFileWriter{
   
 public:
   
-  CFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CFileWriter(vector<string> fields, unsigned short nDim);
   
   virtual ~CFileWriter();
   
-  virtual void Write_Data(CParallelDataSorter* data_sorter){}
+  virtual void Write_Data(string filename, CParallelDataSorter* data_sorter){}
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
index a5ee2ca8486d..fce42d406c2a 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
@@ -6,11 +6,11 @@ class CParaviewBinaryFileWriter : public CFileWriter{
   
 public:
   
-  CParaviewBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim);
   
   ~CParaviewBinaryFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 private:
   void SwapBytes(char *buffer, size_t nBytes, unsigned long nVar);
diff --git a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
index 7de0c95e749f..008ab8fcf024 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
@@ -6,11 +6,11 @@ class CParaviewFileWriter : public CFileWriter{
   
 public:
   
-  CParaviewFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CParaviewFileWriter(vector<string> fields, unsigned short nDim);
   
   ~CParaviewFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
index f76538c983f8..305f74e09f0e 100644
--- a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
@@ -6,10 +6,10 @@ class CSU2BinaryFileWriter : public CFileWriter{
 
 public:
   
-  CSU2BinaryFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim);
   
   ~CSU2BinaryFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
diff --git a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
index 084fa854ec0c..18899020b489 100644
--- a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
@@ -6,11 +6,11 @@ class CSU2FileWriter : public CFileWriter{
 
 public:
   
-  CSU2FileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CSU2FileWriter(vector<string> fields, unsigned short nDim);
   
   ~CSU2FileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
index 26a3768921ee..d8e922d592f9 100644
--- a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
@@ -8,11 +8,11 @@ class CSU2MeshFileWriter : public CFileWriter{
 
 public:
   
-  CSU2MeshFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone);
+  CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone);
   
   ~CSU2MeshFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
index 24556c750983..a6aa2963964a 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -9,11 +9,11 @@ class CTecplotBinaryFileWriter : public CFileWriter{
   
 public:
   
-  CTecplotBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
   
   ~CTecplotBinaryFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Calculate the partitioning of nodes to determine:
diff --git a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
index d89b34de7800..8c28fcbc2700 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
@@ -9,11 +9,11 @@ class CTecplotFileWriter : public CFileWriter{
   
 public:
   
-  CTecplotFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
   
   ~CTecplotFileWriter();
   
-  void Write_Data(CParallelDataSorter* data_sorter);
+  void Write_Data(string filename, CParallelDataSorter* data_sorter);
   
 };
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 10566d4a5873..d9a56d06a150 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -39,7 +39,7 @@
 #include "../../include/output/filewriter/CFVMDataSorter.hpp"
 #include "../../include/output/filewriter/CFEMDataSorter.hpp"
 #include "../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
-
+#include "../../include/output/filewriter/CSurfaceFEMDataSorter.hpp"
 #include "../../include/output/filewriter/CParaviewFileWriter.hpp"
 #include "../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
 #include "../../include/output/filewriter/CTecplotFileWriter.hpp"
@@ -470,115 +470,11 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   
   data_sorter->SortOutputData(config, geometry);
   
-//  SortOutputData(config, geometry);
 }
 
-void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
-  
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
 
-  /*--- Write files depending on the format --- */
+void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataSorter *sorter, CFileWriter* filewriter, unsigned short format){
   
-  switch (format) {
-  
-  case CSV:
-    
-    SortConnectivity(config, geometry, true, true);
-    
-    if (rank == MASTER_NODE) {
-        cout << "Writing surface CSV file." << endl;
-    }
-    
-    WriteSurface_CSV(config, geometry);
-  
-    break;  
-    
-  case TECPLOT_BINARY:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    SortConnectivity(config, geometry, true, false);
-    
-    /*--- Write tecplot binary ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot binary file surface solution file." << endl;  
-    }
-    
-    WriteTecplotBinary_Parallel(config, geometry, iZone, config->GetnZone(), true);
-      
-    break;
-    
-  case TECPLOT:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    SortConnectivity(config, geometry, true, true);
-    
-    /*--- Write tecplot binary ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot ASCII file surface solution file." << endl;
-    }
-    
-    WriteTecplotASCII_Parallel(config, geometry, iZone, config->GetnZone(), true);
-
-    break;
-    
-  case PARAVIEW_BINARY:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    SortConnectivity(config, geometry, true, true);
-    
-    /*--- Write paraview binary ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing Paraview binary file surface solution file." << endl;
-    }
-    
-    WriteParaViewBinary_Parallel(config, geometry, iZone, nZone, true);
-    
-    break;
-    
-  case PARAVIEW:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    SortConnectivity(config, geometry, true, true);
-    
-    /*--- Write paraview binary ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing Paraview ASCII file surface solution file." << endl;
-    }
-
-    WriteParaViewASCII_Parallel(config, geometry, iZone, nZone, true);
-
-    break;
-  default:
-    SU2_MPI::Error("Requested surface output format not available.", CURRENT_FUNCTION);
-    break;
-  } 
-
-  /*--- Clean up the surface data that was only needed for output. ---*/
- 
-  DeallocateConnectivity_Parallel(true);
-  
-  DeallocateSurfaceData_Parallel();
-  
-}
-
-void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
-   
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-  
-  unsigned short nDim = geometry->GetnDim();
-  
-  CFileWriter* filewriter;
-
   /*--- Write files depending on the format --- */
   
   switch (format) {
@@ -589,7 +485,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
         cout << "Writing SU2 ASCII restart file." << endl;     
     }
        
-    filewriter = new CSU2FileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+    filewriter = new CSU2FileWriter(Variable_Names, nDim);
         
     break;
     
@@ -599,7 +495,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing SU2 binary restart file." << endl;   
     }
 
-    filewriter = new CSU2BinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+    filewriter = new CSU2BinaryFileWriter(Variable_Names, nDim);
         
     break;
   
@@ -608,7 +504,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     /*--- Load and sort the output data and connectivity.
      *  Note that the solver container is not need in this case. ---*/
     
-    data_sorter->SortConnectivity(config, geometry, true);
+    sorter->SortConnectivity(config, geometry, true);
     
     /*--- Set the mesh ASCII format ---*/
     
@@ -616,7 +512,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
       cout << "Writing SU2 mesh file." << endl;
     }
     
-    filewriter = new CSU2MeshFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, config->GetiZone(), config->GetnZone());
+    filewriter = new CSU2MeshFileWriter(Variable_Names, nDim, config->GetiZone(), config->GetnZone());
     
     
     break;    
@@ -625,15 +521,15 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-     data_sorter->SortConnectivity(config, geometry, false);
+     sorter->SortConnectivity(config, geometry, false);
     
     /*--- Write tecplot binary ---*/
     
     if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot binary file volume solution file." << endl;
+      cout << "Writing Tecplot binary file solution file." << endl;
     }
     
-    filewriter = new CTecplotBinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
+    filewriter = new CTecplotBinaryFileWriter(Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
       
     break;
     
@@ -641,15 +537,15 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    data_sorter->SortConnectivity(config, geometry, true);
+    sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write tecplot binary ---*/
     
     if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot ASCII file volume solution file." << endl;
+      cout << "Writing Tecplot ASCII file solution file." << endl;
     }
     
-    filewriter = new CTecplotFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
+    filewriter = new CTecplotFileWriter(Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
 
     break;
     
@@ -657,14 +553,14 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    data_sorter->SortConnectivity(config, geometry, true);
+    sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write paraview binary ---*/
     if (rank == MASTER_NODE) {
-      cout << "Writing Paraview binary file volume solution file." << endl;
+      cout << "Writing Paraview binary file solution file." << endl;
     }
     
-    filewriter = new CParaviewBinaryFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+    filewriter = new CParaviewBinaryFileWriter(Variable_Names, nDim);
     
     break;
     
@@ -672,14 +568,14 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     
     /*--- Load and sort the output data and connectivity. ---*/
     
-    data_sorter->SortConnectivity(config, geometry, true);
+    sorter->SortConnectivity(config, geometry, true);
     
     /*--- Write paraview binary ---*/
     if (rank == MASTER_NODE) {
         cout << "Writing Paraview ASCII file volume solution file." << endl;      
     }
     
-    filewriter = new CParaviewFileWriter(config->GetFilename(VolumeFilename,""), Variable_Names, nDim);
+    filewriter = new CParaviewFileWriter(Variable_Names, nDim);
 
     break;
     
@@ -687,10 +583,45 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     SU2_MPI::Error("Requested volume output format not available.", CURRENT_FUNCTION);
     break;
   } 
+}
+
+void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+  
+  CParallelDataSorter* surface_sort;
+  CFileWriter*         file_writer;
+  
+  if (fem_output){
+    surface_sort = new CSurfaceFEMDataSorter(config, GlobalField_Counter, dynamic_cast<CFEMDataSorter*>(data_sorter));
+  } else {
+    surface_sort = new CSurfaceFVMDataSorter(config, GlobalField_Counter, dynamic_cast<CFVMDataSorter*>(data_sorter));    
+  }
+  
+  /*--- Set the file writer --- */
+  
+  SetFileWriter(config, geometry, surface_sort, file_writer, format);
+  
+  /*--- Write data to file --- */
+  
+  file_writer->Write_Data(config->GetFilename(SurfaceFilename, ""), surface_sort);
+  
+  delete file_writer;
+  delete surface_sort;
+  
+}
+
+void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+  
+  CFileWriter* file_writer;
+
+  /*--- Set the file writer --- */
+  
+  SetFileWriter(config, geometry, data_sorter, file_writer, format);
+  
+  /*--- Write data to file --- */
   
-  filewriter->Write_Data(data_sorter);
+  file_writer->Write_Data(config->GetFilename(VolumeFilename, ""), data_sorter);
 
-  delete filewriter;
+  delete file_writer;
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index 659f8749876b..87b69ce5df31 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -1,15 +1,10 @@
 #include "../../../include/output/filewriter/CCSVFileWriter.hpp"
 
-
-
-
 CCSVFileWriter::CCSVFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
-  CFileWriter(filename, fields, nDim){
+  CFileWriter(fields, nDim){
 
   file_ext = ".csv";
-  
-  this->filename += file_ext;
-  
+    
 }
 
 
@@ -17,7 +12,9 @@ CCSVFileWriter::~CCSVFileWriter(){
   
 }
 
-void CCSVFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   /*--- Routine to write the surface CSV files (ASCII). We
    assume here that, as an ASCII file, it is safer to merge the
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
index 99fc77580523..d66e1d976bdd 100644
--- a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -1,15 +1,13 @@
 #include "../../../include/output/filewriter/CFileWriter.hpp"
 
 
-CFileWriter::CFileWriter(string filename, vector<string> fields, unsigned short nDim){
+CFileWriter::CFileWriter(vector<string> fields, unsigned short nDim){
   
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
   this->nDim = nDim;
-  
-  this->filename = filename;
-  
+    
   this->fieldnames = fields;
   
 }
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index afdcc802bd93..d97d6f77cec9 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -1,13 +1,11 @@
 #include "../../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
 
 
-CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
-  CFileWriter(filename, fields, nDim){
+CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim) : 
+  CFileWriter(fields, nDim){
   
   file_ext = ".vtk";
-  
-  this->filename += file_ext;
-  
+    
 }
 
 
@@ -15,7 +13,9 @@ CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
   
 }
 
-void CParaviewBinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   if (!data_sorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index 488c039406e8..2cb2e75f1a41 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -1,13 +1,11 @@
 #include "../../../include/output/filewriter/CParaviewFileWriter.hpp"
 
 
-CParaviewFileWriter::CParaviewFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
-  CFileWriter(filename, fields, nDim){
+CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".vtk";
-  
-  this->filename += file_ext;
-  
+    
 }
 
 
@@ -15,7 +13,9 @@ CParaviewFileWriter::~CParaviewFileWriter(){
   
 }
 
-void CParaviewFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   if (!data_sorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index ca8f2c31c4a9..33e547f705d2 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -3,13 +3,11 @@
 
 
 
-CSU2BinaryFileWriter::CSU2BinaryFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
-  CFileWriter(filename, fields, nDim){
+CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".su2s";
-  
-  this->filename += file_ext;
-  
+    
 }
 
 
@@ -17,8 +15,9 @@ CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
   
 }
 
-void CSU2BinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
   
+  filename += file_ext;
   
   /*--- Local variables ---*/
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 04c033f93596..05779fcf90ca 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -3,13 +3,11 @@
 
 
 
-CSU2FileWriter::CSU2FileWriter(string filename, vector<string> fields, unsigned short nDim) : 
-  CFileWriter(filename, fields, nDim){
+CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".su2s";
-  
-  this->filename += file_ext;
-  
+    
 }
 
 
@@ -17,7 +15,9 @@ CSU2FileWriter::~CSU2FileWriter(){
   
 }
 
-void CSU2FileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   /*--- Local variables ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 30e3fa773d6f..7430ca1f5df3 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -4,13 +4,11 @@
 
 
 
-CSU2MeshFileWriter::CSU2MeshFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone) : 
-  CFileWriter(filename, fields, nDim){
+CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".su2";
-  
-  this->filename += file_ext;
-  
+    
   this->iZone = iZone;
   this->nZone = nZone;
   
@@ -22,7 +20,9 @@ CSU2MeshFileWriter::~CSU2MeshFileWriter(){
 }
 
 
-void CSU2MeshFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
   unsigned short iMarker, iDim, iChar, VTK_Type, nMarker_;
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 5e74506e0252..02122f0e0120 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -4,13 +4,11 @@
 #endif
 #include <set>
 
-CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  CFileWriter(filename, fields, nDim){
+CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".szplt";
-  
-  this->filename += file_ext;
-  
+    
   this->time_iter = time_iter;
   
   this->timestep = timestep;
@@ -23,7 +21,9 @@ CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){
 }
 
 
-void CTecplotBinaryFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   if (!data_sorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 3f4a78828c43..c2ced304786c 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,13 +1,11 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
 
-CTecplotFileWriter::CTecplotFileWriter(string filename, vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  CFileWriter(filename, fields, nDim){
+CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
+  CFileWriter(fields, nDim){
 
   file_ext = ".dat";
-  
-  this->filename += file_ext;
-  
+    
   this->time_iter = time_iter;
   
   this->timestep = timestep;
@@ -19,7 +17,9 @@ CTecplotFileWriter::~CTecplotFileWriter(){
   
 }
 
-void CTecplotFileWriter::Write_Data(CParallelDataSorter *data_sorter){
+void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
+  
+  filename += file_ext;
   
   if (!data_sorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);

From 84728a8c2d4e2647a03e29a9d257fd13e1a9a757 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 31 May 2019 20:02:05 +0200
Subject: [PATCH 283/539] Removed all old merging routines [ci skip]

---
 SU2_CFD/include/output/COutput.hpp            |  486 +-
 .../output/filewriter/CCSVFileWriter.hpp      |    2 +-
 SU2_CFD/src/meson.build                       |    6 -
 SU2_CFD/src/output/COutput.cpp                | 5612 +----------------
 .../src/output/filewriter/CCSVFileWriter.cpp  |    2 +-
 SU2_DEF/src/meson.build                       |    6 -
 6 files changed, 195 insertions(+), 5919 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 8e2c0ea5086d..2dd97ca47354 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -83,91 +83,11 @@ class COutput {
   
   COutputLegacy *output_legacy;
 
-  unsigned long nGlobal_Poin;   // Global number of nodes with halos
-  unsigned long nSurf_Poin;   // Global number of nodes of the surface
-  unsigned long nGlobal_Doma;   // Global number of nodes without halos
-  unsigned long nGlobal_Elem;  // Global number of elems without halos
-  unsigned long nSurf_Elem,  // Global number of surface elems without halos
-  nGlobal_Line,
-  nGlobal_BoundTria,
-  nGlobal_BoundQuad,
-  nGlobal_Tria,
-  nGlobal_Quad,
-  nGlobal_Tetr,
-  nGlobal_Hexa,
-  nGlobal_Pris,
-  nGlobal_Pyra;
-  su2double **Coords;              // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
-  int *Conn_Line;
-  int *Conn_BoundTria;
-  int *Conn_BoundQuad;
-  int *Conn_Tria;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
-  int *Conn_Quad;
-  int *Conn_Tetr;
-  int *Conn_Hexa;
-  int *Conn_Pris;
-  int *Conn_Pyra;
-  
-  
-  unsigned long nGlobal_Poin_Par;   // Global number of nodes with halos
-  unsigned long nGlobal_Elem_Par;  // Global number of elems without halos
-  unsigned long nGlobal_Surf_Poin;
-  unsigned long nSurf_Elem_Par;
-  unsigned long nSurf_Poin_Par;
-  unsigned long nParallel_Poin;
-  unsigned long nParallel_Line,
-  nParallel_BoundTria,
-  nParallel_BoundQuad,
-  nParallel_Tria,
-  nParallel_Quad,
-  nParallel_Tetr,
-  nParallel_Hexa,
-  nParallel_Pris,
-  nParallel_Pyra;
-  int *Conn_BoundLine_Par;
-  int *Conn_BoundTria_Par;
-  int *Conn_BoundQuad_Par;
-  int *Conn_Tria_Par;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
-  int *Conn_Quad_Par;
-  int *Conn_Tetr_Par;
-  int *Conn_Hexa_Par;
-  int *Conn_Pris_Par;
-  int *Conn_Pyra_Par;
-  map<unsigned long,unsigned long> Global2Renumber, 
-                                   Renumber2Global;
-  
-  unsigned long nGlobalPoint_Sort;
-  unsigned long nLocalPoint_Sort;
-  unsigned long nPoint_Restart;
-  int *Local_Halo_Sort;
-
-  unsigned long *beg_node;
-  unsigned long *end_node;
-
-  unsigned long *nPoint_Lin;
-  unsigned long *nPoint_Cum;
-  
   std::vector< std::vector<su2double> > Local_Data;
-  su2double **Local_Data_Copy;      // Local data copy for cte. lift mode
-  su2double **Parallel_Data;        // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
-  su2double **Parallel_Surf_Data;   // node i (x, y, z) = (Coords[0][i], Coords[1][i], Coords[2][i])
+
   vector<string> Variable_Names;
-  int* Local_Halo;
 
-  su2double **Data;
-  unsigned short nVar_Consv, nVar_Total, nVar_Extra, nZones;
-  bool wrote_surf_file, wrote_CGNS_base, wrote_Tecplot_base, wrote_Paraview_base;
-  unsigned short wrote_base_file;
   su2double RhoRes_New, *RhoRes_Old;
-  int cgns_base, cgns_zone, cgns_base_results, cgns_zone_results;
-  
-  su2double Sum_Total_RadialDistortion, Sum_Total_CircumferentialDistortion; // Add all the distortion to compute a run average.
-
-  unsigned long nMarker_InletFile;       /*!< \brief Counter for total number of inlet boundaries written to inlet profile file. */
-  vector<string> Marker_Tags_InletFile;   /*!< \brief Marker tags for the strings of the markers in the inlet profile file. */
-  unsigned long *nRow_InletFile;         /*!< \brief Counters for the number of points per marker in the inlet profile file. */
-  unsigned long *nRowCum_InletFile;      /*!< \brief Counters for the number of points per marker in cumulative storage format in the inlet profile file. */
-  su2double **InletCoords;  /*!< \brief Data structure for holding the merged inlet boundary coordinates from all ranks. */
 
   bool no_writing;
 
@@ -474,410 +394,8 @@ class COutput {
    * \param[out] filewriter - The allocated filewriter.
    * \param[in] format - The output format.
    */
-  void SetFileWriter(CConfig *config, CGeometry *geomery, CParallelDataSorter *sorter, CFileWriter* filewriter, unsigned short format);  
-  
-  /*!
-   * \brief Write a native SU2 restart file (ASCII) in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - Flow, adjoint or linearized solution.
-   * \param[in] val_iZone - iZone index.
-   */
-  void WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write a native SU2 restart file (binary) in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - Flow, adjoint or linearized solution.
-   * \param[in] val_iZone - iZone index.
-   */
-  void WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write the x, y, & z coordinates to a CGNS output file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write the element connectivity to a CGNS output file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write solution data to a CGNS output file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write a Paraview ASCII solution file with parallel output.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
-   */
-  void WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-
-  /*!
-   * \brief Write a Paraview binary solution file with parallel output.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
-   */
-  void WriteParaViewBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-  
-  /*!
-   * \brief Write a Tecplot ASCII solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   */
-  void SetTecplotASCII(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot ASCII mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplot_MeshASCII(CConfig *config, CGeometry *geometry, bool surf_sol, bool new_file);
-
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a stl ASCII mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetSTL_MeshASCII(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a n3d ASCII mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SetCSV_MeshASCII(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a n3d ASCII mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplotASCII_Mesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone, bool surf_sol, bool new_file);
-
-  /*!
-   * \brief Write the solution data and connectivity to a Tecplot ASCII mesh file in parallel.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
-   */
-  void WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-
-  /*!
-   * \brief Write a Tecplot binary solution file with parallel output.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   * \param[in] surf_sol - Flag controlling whether this is a volume or surface file.
-   */
-  void WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol);
-  
-  /*!
-   * \brief Write the solution data and connectivity to a CSV file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void WriteSurface_CSV(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  string AssembleVariableNames(CGeometry *geometry, CConfig *config, unsigned short nVar_Consv, unsigned short *NVar);
-
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetSU2_MeshASCII(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetSU2_MeshBinary(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Write the nodal coordinates to a binary file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void WriteCoordinates_Binary(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-
-  /*!
-   * \brief Write a file with the adjoint sensitivities projected onto each surface node.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   */
-  void WriteProjectedSensitivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplotBinary_DomainMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write the coordinates and connectivity to a Tecplot binary surface mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplotBinary_SurfaceMesh(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write solution data to a Tecplot binary volume solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplotBinary_DomainSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-
-  /*!
-   * \brief Write solution data to a Tecplot binary surface solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetTecplotBinary_SurfaceSolution(CConfig *config, CGeometry *geometry, unsigned short val_iZone);
-  
-  /*!
-   * \brief Write a Tecplot ASCII solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - Current zone.
-   * \param[in] val_nZone - Total number of zones.
-   */
-  void SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetFieldViewASCII_Mesh(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetFieldViewBinary_Mesh(CConfig *config, CGeometry *geometry);
-  
-  /*!
-   * \brief Write solution data to a Tecplot binary volume solution file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] val_iZone - iZone index.
-   */
-  void SetFieldViewBinary(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
-  
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing coordinates.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void DeallocateCoordinates(CConfig *config, CGeometry *geometry);
+  void SetFileWriter(CConfig *config, CGeometry *geomery, CParallelDataSorter *sorter, CFileWriter *&filewriter, unsigned short format);  
   
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing connectivity.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void DeallocateConnectivity(CConfig *config, CGeometry *geometry, bool surf_sol);
-  
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing solution variables.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void DeallocateSolution(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write the sensitivity (including mesh sensitivity) computed with the discrete adjoint method
-   *  on the surface and in the volume to a file.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_nZone - Number of Zones.
-   */
-  void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned short val_nZone);
-
-  /*!
-   * \brief Load the desired solution data into a structure used for parallel reordering and output file writing for DG-FEM flow problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solution - Flow, adjoint or linearized solution.
-   * \param[in] val_nZone - iZone index.
-   */
-  void LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone);
-
-  /*!
-   * \brief Prepare the number of points and offsets for linear partitioning that are needed for output.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void PrepareOffsets(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
-   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
-   */
-  void SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort);
-
-  /*!
-   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing (DG-FEM solver).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
-   */
-  void SortConnectivity_FEM(CConfig *config, CGeometry *geometry, bool surf);
-
-  /*!
-   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
-   */
-  void SortVolumetricConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type, bool val_sort);
-
-  /*!
-   * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors (DG-FEM solver).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-
-  /*!
-   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-
-  /*!
-   * \brief Sort the connectivity for a single surface element type into a linear partitioning across all processors (DG-FEM solver).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] Elem_Type - VTK index of the element type being merged.
-   */
-  void SortSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
-
-  /*!
-   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Sort the output data for each grid node into a linear partitioning across all processors (DG-FEM solver).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData_FEM(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Sort the surface output data for each grid node into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData_Surface(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Sort the surface output data for each grid node into a linear partitioning across all processors (DG-FEM solver).
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
-   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
-   */
-  void DeallocateConnectivity_Parallel(bool surf_sol);
-  
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   */
-  void DeallocateSurfaceData_Parallel();
-
-  /*!
-   * \brief Merge the node coordinates of all inlet boundaries from all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void MergeInletCoordinates(CConfig *config, CGeometry *geometry);
-
-  /*!
-   * \brief Write a template inlet profile file for all inlets for flow problems.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - Solver container.
-   */
-  void Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver);
-
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing inlet boundary coordinates.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void DeallocateInletCoordinates(CConfig *config, CGeometry *geometry);
-  
-  /*! 
-   * \brief Create and write a CSV file with a slice of data.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] FlowSolution - Flow solution.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] val_iZone - Current zone number in the grid file.
-   * \param[in] val_direction - Controls the slice direction (0 for constant x/vertical, 1 for constant y/horizontal.
-   */
-  void WriteCSV_Slice(CConfig *config, CGeometry *geometry, CSolver *FlowSolver, unsigned long iExtIter, unsigned short val_iZone, unsigned short val_direction);
   
   /*!
    * \brief Set the history file header
diff --git a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
index d527803fd0a2..bcab5ffa0e13 100644
--- a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
@@ -6,7 +6,7 @@ class CCSVFileWriter : public CFileWriter{
 
 public:
   
-  CCSVFileWriter(string filename, vector<string> fields, unsigned short nDim);
+  CCSVFileWriter(vector<string> fields, unsigned short nDim);
   
   ~CCSVFileWriter();
   
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 32a68d0154e6..a0b130024c99 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -60,23 +60,17 @@ su2_cfd_src += files(['output/CAdjElasticityOutput.cpp',
                       'output/CAdjFlowIncOutput.cpp',
                       'output/CAdjHeatOutput.cpp',
                       'output/CBaselineOutput.cpp',
-                      'output/output_cgns.cpp',
-                      'output/output_csv.cpp',
                       'output/CDriverOutput.cpp',
                       'output/CElasticityOutput.cpp',
-                      'output/output_fieldview.cpp',
                       'output/CFlowCompOutput.cpp',
                       'output/CFlowCompFEMOutput.cpp',
                       'output/CFlowOutput.cpp',
                       'output/CFlowIncOutput.cpp',
                       'output/CHeatOutput.cpp',
                       'output/CMeshOutput.cpp',
-                      'output/output_paraview.cpp',
                       'output/output_physics.cpp',
                       'output/COutput.cpp',
                       'output/output_structure_legacy.cpp',
-                      'output/output_su2.cpp',
-                      'output/output_tecplot.cpp',
 		      'output/filewriter/CParallelDataSorter.cpp',
 		      'output/filewriter/CFVMDataSorter.cpp',
 		      'output/filewriter/CFEMDataSorter.cpp',
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index d9a56d06a150..ebd5cb5ba52b 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -86,96 +86,7 @@ COutput::COutput(CConfig *config) {
   HistorySep = ","; 
   
   unsigned short iZone;
-  
-  /*--- Initialize point and connectivity counters to zero. ---*/
-  
-  nGlobal_Poin      = 0;
-  nSurf_Poin        = 0;
-  nGlobal_Elem      = 0;
-  nSurf_Elem        = 0;
-  nGlobal_Tria      = 0;
-  nGlobal_Quad      = 0;
-  nGlobal_Tetr      = 0;
-  nGlobal_Hexa      = 0;
-  nGlobal_Pris      = 0;
-  nGlobal_Pyra      = 0;
-  nGlobal_Line      = 0;
-  nGlobal_BoundTria = 0;
-  nGlobal_BoundQuad = 0;
-
-  /*--- Initialize pointers to NULL ---*/
-  
-  Coords = NULL;
-  Conn_Line = NULL;     Conn_BoundTria = NULL;  Conn_BoundQuad = NULL;
-  Conn_Tria = NULL;     Conn_Quad = NULL;       Conn_Tetr = NULL;
-  Conn_Hexa = NULL;     Conn_Pris = NULL;       Conn_Pyra = NULL;
-  Data = NULL;
-  
-  /*--- Initialize parallel pointers to NULL ---*/
-  
-  nGlobal_Poin_Par    = 0;
-  nGlobal_Elem_Par    = 0;
-  nGlobal_Surf_Poin   = 0;
-  nParallel_Poin      = 0;
-  nSurf_Poin_Par      = 0;
-  nSurf_Elem_Par      = 0;
-  nParallel_Tria      = 0;
-  nParallel_Quad      = 0;
-  nParallel_Tetr      = 0;
-  nParallel_Hexa      = 0;
-  nParallel_Pris      = 0;
-  nParallel_Pyra      = 0;
-  nParallel_Line      = 0;
-  nParallel_BoundTria = 0;
-  nParallel_BoundQuad = 0;
-  
-  /*--- Initialize pointers to NULL ---*/
-  
-  Conn_BoundLine_Par = NULL;  Conn_BoundTria_Par = NULL;  Conn_BoundQuad_Par = NULL;
-  Conn_Tria_Par = NULL;  Conn_Quad_Par = NULL;       Conn_Tetr_Par = NULL;
-  Conn_Hexa_Par = NULL;  Conn_Pris_Par = NULL;       Conn_Pyra_Par = NULL;
-  
-  Local_Data_Copy    = NULL;
-  Parallel_Data      = NULL;
-  Parallel_Surf_Data = NULL;
-
-  /*--- Initialize structures for storing linear partitioning offsets ---*/
-
-  nGlobalPoint_Sort = 0;
-  nLocalPoint_Sort  = 0;
-  nPoint_Restart    = 0;
-
-  Local_Halo_Sort = NULL;
-
-  beg_node = NULL;
-  end_node = NULL;
-
-  nPoint_Lin = NULL;
-  nPoint_Cum = NULL;
-  
-  /*--- Inlet profile data structures. ---*/
-
-  nRow_InletFile    = NULL;
-  nRowCum_InletFile = NULL;
-  InletCoords       = NULL;
-
-  Marker_Tags_InletFile.clear();
-
-  /*--- Initialize CGNS write flag ---*/
-  
-  wrote_base_file = false;
-  
-  /*--- Initialize CGNS write flag ---*/
-  
-  wrote_CGNS_base = false;
-  
-  /*--- Initialize Tecplot surface flag ---*/
-  
-  wrote_surf_file = false;
-  
-  /*--- Initialize Paraview write flag ---*/
-  
-  wrote_Paraview_base = false;
+ 
   
   /*--- Initialize residual ---*/
   
@@ -183,9 +94,6 @@ COutput::COutput(CConfig *config) {
   RhoRes_Old = new su2double[config->GetnZone()];
   for (iZone = 0; iZone < config->GetnZone(); iZone++) RhoRes_Old[iZone] = EPS;
   
-  wrote_Paraview_base = false;
-
-  
   nRequestedHistoryFields = config->GetnHistoryOutput();
   for (unsigned short iField = 0; iField < nRequestedHistoryFields; iField++){
     RequestedHistoryFields.push_back(config->GetHistoryOutput_Field(iField));
@@ -232,22 +140,8 @@ COutput::COutput(CConfig *config) {
 }
 
 COutput::~COutput(void) {
-  /* delete pointers initialized at construction*/
-  /* Coords and Conn_*(Connectivity) have their own dealloc functions */
-  /* Data is taken care of in DeallocateSolution function */
 
   if (RhoRes_Old != NULL) delete [] RhoRes_Old;
-
-  
-  /*--- Deallocate the structures holding the linear partitioning ---*/
-
-  if (Local_Halo_Sort != NULL) delete [] Local_Halo_Sort;
-
-  if (beg_node != NULL) delete [] beg_node;
-  if (end_node != NULL) delete [] end_node;
-
-  if (nPoint_Lin != NULL) delete [] nPoint_Lin;
-  if (nPoint_Cum != NULL) delete [] nPoint_Cum;
   
   delete ConvergenceTable;
   delete MultiZoneHeaderTable;
@@ -473,12 +367,34 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
 }
 
 
-void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataSorter *sorter, CFileWriter* filewriter, unsigned short format){
+void COutput::DeallocateData_Parallel(){
+  
+  if (data_sorter != NULL)
+    delete data_sorter;
+  
+  data_sorter = NULL;
+  
+}
+
+
+void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataSorter *sorter, CFileWriter *&filewriter, unsigned short format){
   
   /*--- Write files depending on the format --- */
   
   switch (format) {
     
+    case CSV:
+
+      sorter->SortConnectivity(config, geometry, true);
+      
+      if (rank == MASTER_NODE) {
+          cout << "Writing CSV file." << endl;     
+      }
+         
+      filewriter = new CCSVFileWriter(Variable_Names, nDim);
+          
+      break;
+    
   case SU2_RESTART_ASCII:
     
     if (rank == MASTER_NODE) {
@@ -587,18 +503,22 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
 
 void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
   
-  CParallelDataSorter* surface_sort;
-  CFileWriter*         file_writer;
+  CParallelDataSorter* surface_sort = NULL;
+  CFileWriter*         file_writer = NULL;
   
   if (fem_output){
     surface_sort = new CSurfaceFEMDataSorter(config, GlobalField_Counter, dynamic_cast<CFEMDataSorter*>(data_sorter));
   } else {
     surface_sort = new CSurfaceFVMDataSorter(config, GlobalField_Counter, dynamic_cast<CFVMDataSorter*>(data_sorter));    
   }
-  
+
   /*--- Set the file writer --- */
   
   SetFileWriter(config, geometry, surface_sort, file_writer, format);
+    
+  /*--- Sort the surface output data --- */
+  
+  surface_sort->SortOutputData(config, geometry);
   
   /*--- Write data to file --- */
   
@@ -611,7 +531,7 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
 
 void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
   
-  CFileWriter* file_writer;
+  CFileWriter* file_writer = NULL;
 
   /*--- Set the file writer --- */
   
@@ -727,5325 +647,183 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
   return Convergence;
 }
 
+void COutput::SetHistoryFile_Header(CConfig *config) { 
 
-void COutput::SortConnectivity(CConfig *config, CGeometry *geometry, bool surf, bool val_sort) {
-
-  /*--- Sort connectivity for each type of element (excluding halos). Note
-   In these routines, we sort the connectivity into a linear partitioning
-   across all processors based on the global index of the grid nodes. ---*/
   
-  /*--- Sort volumetric grid connectivity. ---*/
+  if ((config->GetOutput_FileFormat() == TECPLOT) ||
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW) ||
+      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
+    HistFile << "VARIABLES = ";
+  }
   
-  if (!surf) {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting volumetric grid connectivity." << endl;
-    
-    if (!fem_output){
-      SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
-      SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
-      SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
-      SortVolumetricConnectivity(config, geometry, HEXAHEDRON,    val_sort);
-      SortVolumetricConnectivity(config, geometry, PRISM,         val_sort);
-      SortVolumetricConnectivity(config, geometry, PYRAMID,       val_sort);  
-    } else {
-      SortVolumetricConnectivity_FEM(config, geometry, TRIANGLE     );
-      SortVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL);
-      SortVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON  );
-      SortVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON   );
-      SortVolumetricConnectivity_FEM(config, geometry, PRISM        );
-      SortVolumetricConnectivity_FEM(config, geometry, PYRAMID      );
-    }
-    
-    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
+  stringstream out;
+  string RequestedField;
+  std::vector<bool> found_field(nRequestedHistoryFields, false);
     
-    unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-#ifndef HAVE_MPI
-  nGlobal_Elem_Par = nTotal_Elem;
-#else
-  SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      RequestedField = RequestedHistoryFields[iReqField];   
+      if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutput_List[iField_Output])){
+        found_field[iReqField] = true;        
+        out << "\"" << Field.FieldName << "\"" << HistorySep;
+      }
+    }  
   }
   
-  /*--- Sort surface grid connectivity. ---*/
-  
-  else {
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting surface grid connectivity." << endl;
-    
-    if (!fem_output){
-      SortSurfaceConnectivity(config, geometry, LINE         );
-      SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-      SortSurfaceConnectivity(config, geometry, QUADRILATERAL);
-    } else {
-      SortSurfaceConnectivity_FEM(config, geometry, LINE         );
-      SortSurfaceConnectivity_FEM(config, geometry, TRIANGLE     );
-      SortSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);   
-    }    
-    
-    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
-#ifndef HAVE_MPI
-    nSurf_Elem_Par   = nTotal_Surf_Elem;
-#else
-    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-    
-    /*--- Sort the surface output data --- */
-    if (fem_output){
-      SortOutputData_Surface_FEM(config, geometry);
-    } else {
-      SortOutputData_Surface(config, geometry);
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){  
+      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutputPerSurface_List[iField_Output])){
+          found_field[iReqField] = true;          
+          out << "\"" << Field.FieldName << "\"" << HistorySep;        
+        }
+      }
     }
   }
+  
+  /*--- Print the string to file and remove the last character (a separator) ---*/
+  HistFile << out.str().substr(0, out.str().size() - 1);
+  HistFile << endl;
+  if (config->GetOutput_FileFormat() == TECPLOT ||
+      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
+      config->GetOutput_FileFormat() == FIELDVIEW ||
+      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+    HistFile << "ZONE T= \"Convergence history\"" << endl;
+  }
+  HistFile.flush();
+  
 }
 
 
-void COutput::SortVolumetricConnectivity(CConfig *config,
-                                         CGeometry *geometry,
-                                         unsigned short Elem_Type,
-                                         bool val_sort) {
-  
-  unsigned long iProcessor;
-  unsigned short NODES_PER_ELEMENT = 0;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
-  unsigned long nElem_Total = 0, Global_Index;
-  
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+void COutput::SetHistoryFile_Output(CConfig *config) { 
   
-  int *Local_Halo = NULL;
-  int *Conn_Elem  = NULL;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
+  stringstream out;
+  string RequestedField;
   
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
   
-  switch (Elem_Type) {
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    case TETRAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+      RequestedField = RequestedHistoryFields[iReqField];   
+      if (RequestedField == Field.OutputGroup){
+        out << std::setprecision(10) << Field.Value << HistorySep << " ";
+      }
+    }
   }
   
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
+  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        RequestedField = RequestedHistoryFields[iReqField];   
+        if (RequestedField == Field.OutputGroup){
+          out << std::setprecision(10) << Field.Value << HistorySep << " ";
         }
       }
     }
   }
   
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
+  /*--- Print the string to file and remove the last two characters (a separator and a space) ---*/
   
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
+  HistFile << out.str().substr(0, out.str().size()-2);
+  HistFile << endl;
+  HistFile.flush();
+}
+
+void COutput::SetScreen_Header(CConfig *config) {
+  if (config->GetMultizone_Problem()) 
+    MultiZoneHeaderTable->PrintHeader();
+  ConvergenceTable->PrintHeader();
+}
+
+
+void COutput::SetScreen_Output(CConfig *config) {
   
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
+  string RequestedField;
   
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
+  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
+    stringstream out;
+    RequestedField = RequestedScreenFields[iReqField]; 
+    if (HistoryOutput_Map.count(RequestedField) > 0){  
+      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
+        case FORMAT_INTEGER:
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
+          break;
+        case FORMAT_FIXED:
+          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
+          break;
+        case FORMAT_SCIENTIFIC:
+          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
+          break;      
+      }
+    }
+    if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
+      switch (HistoryOutputPerSurface_Map[RequestedField][0].ScreenFormat) {
+        case FORMAT_INTEGER:
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value), field_width);
+          break;
+        case FORMAT_FIXED:
+          PrintingToolbox::PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
+          break;
+        case FORMAT_SCIENTIFIC:
+          PrintingToolbox::PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
+          break;   
+      }
+    }      
+    (*ConvergenceTable) << out.str();
   }
+}
+
+void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
+    no_writing = !wrt;
+
+    /*--- Set the common output fields ---*/
+    
+    SetCommonHistoryFields(config);
+    
+    /*--- Set the History output fields using a virtual function call to the child implementation ---*/
+    
+    SetHistoryOutputFields(config);
+    
+    /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
+    
+    Postprocess_HistoryFields(config);
+    
+    if (rank == MASTER_NODE && !no_writing){
       
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
+      /*--- Check for consistency and remove fields that are requested but not available --- */
+      
+      CheckHistoryOutput();
+      
+      /*--- Open history file and print the header ---*/
+      
+      PrepareHistoryFile(config);
+      
+      /*--- Set the multizone screen header ---*/
+      
+      if (config->GetMultizone_Problem()){
+        MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
+        MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+        MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
       }
+      
     }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
+    
+}
 
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
+void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
   
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
+  no_writing = !wrt;
+
+  /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the connectivity distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many elements we must send to each other rank in order to
-   have all elements sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++ ) {
-    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
-      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-        
-        /*--- Get the index of the current point. ---*/
-        
-        iPoint = geometry->elem[ii]->GetNode(jj);
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- Search for the lowest global index in this element. We
-         send the element to the processor owning the range that includes
-         the lowest global index value. ---*/
-        
-        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-          jPoint = geometry->elem[ii]->GetNode(kk);
-          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-          if (newID < Global_Index) Global_Index = newID;
-        }
-        
-        /*--- Search for the processor that owns this point. If we are
-         sorting the elements, we use the linear partitioning to find
-         the rank, otherwise, we simply have the current rank load its
-         own elements into the connectivity data structure. ---*/
-        
-        if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-        } else {
-          iProcessor = rank;
-        }
-        
-        
-        /*--- If we have not visited this element yet, increment our
-         number of elements that must be sent to a particular proc. ---*/
-        
-        if ((nElem_Flag[iProcessor] != ii)) {
-          nElem_Flag[iProcessor] = ii;
-          nElem_Send[iProcessor+1]++;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send connectivities. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  unsigned long *connSend = NULL;
-  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
-  /*--- Create an index variable to keep track of our index
-   position as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
-  
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (int ii = 0; ii < (int)geometry->GetnElem(); ii++) {
-    if (geometry->elem[ii]->GetVTK_Type() == Elem_Type) {
-      for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-        
-        /*--- Get the index of the current point. ---*/
-        
-        iPoint = geometry->elem[ii]->GetNode(jj);
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- Search for the lowest global index in this element. We
-         send the element to the processor owning the range that includes
-         the lowest global index value. ---*/
-        
-        for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-          jPoint = geometry->elem[ii]->GetNode(kk);
-          unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-          if (newID < Global_Index) Global_Index = newID;
-        }
-       
-        /*--- Search for the processor that owns this point. If we are
-         sorting the elements, we use the linear partitioning to find
-         the rank, otherwise, we simply have the current rank load its
-         own elements into the connectivity data structure. ---*/
-        
-        if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-        } else {
-          iProcessor = rank;
-        }
-        
-        
-        /*--- Load connectivity into the buffer for sending ---*/
-        
-        if (nElem_Flag[iProcessor] != ii) {
-          
-          nElem_Flag[iProcessor] = ii;
-          unsigned long nn = index[iProcessor];
-          unsigned long mm = haloIndex[iProcessor];
-          
-          /*--- Load the connectivity values. ---*/
-          
-          for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-            iPoint = geometry->elem[ii]->GetNode(kk);
-            connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
-            
-            /*--- Check if this is a halo node. If so, flag this element
-             as a halo cell. We will use this later to sort and remove
-             any duplicates from the connectivity list. ---*/
-            
-            if (Local_Halo[iPoint]) haloSend[mm] = true;
-            
-          }
-          
-          /*--- Increment the index by the message length ---*/
-          
-          index[iProcessor]    += NODES_PER_ELEMENT;
-          haloIndex[iProcessor]++;
-          
-        }
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] haloIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *connRecv = NULL;
-  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
-  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
-  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. Note that we add 1 here
-   to the connectivity for vizualization packages. First, allocate
-   appropriate amount of memory for this section. ---*/
-  
-  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
-  int count = 0; nElem_Total = 0;
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
-    }
-  }
-  
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  switch (Elem_Type) {
-    case TRIANGLE:
-      nParallel_Tria = nElem_Total;
-      if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
-      break;
-    case QUADRILATERAL:
-      nParallel_Quad = nElem_Total;
-      if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
-      break;
-    case TETRAHEDRON:
-      nParallel_Tetr = nElem_Total;
-      if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
-      break;
-    case HEXAHEDRON:
-      nParallel_Hexa = nElem_Total;
-      if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
-      break;
-    case PRISM:
-      nParallel_Pris = nElem_Total;
-      if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
-      break;
-    case PYRAMID:
-      nParallel_Pyra = nElem_Total;
-      if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      break;
-  }
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
-  delete [] Local_Halo;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic; 
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-
-}
-
-void COutput::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  unsigned long iProcessor;
-  unsigned short NODES_PER_ELEMENT;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
-  unsigned long nElem_Total = 0, Global_Index;
-  
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  int *Local_Halo = NULL;
-  int *Conn_Elem  = NULL;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--- Store the local number of this element type and the number of nodes
-   per this element type. In serial, this will be the total number of this
-   element type in the entire mesh. In parallel, it is the number on only
-   the current partition. ---*/
-  
-  switch (Elem_Type) {
-    case LINE:
-      NODES_PER_ELEMENT = N_POINTS_LINE;
-      break;
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      NODES_PER_ELEMENT = 0;
-      break;
-  }
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the connectivity distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many elements we must send to each other rank in order to
-   have all elements sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      
-      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
-        
-        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
-          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-            
-            /*--- Get the index of the current point. ---*/
-            
-            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
-            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Search for the lowest global index in this element. We
-             send the element to the processor owning the range that includes
-             the lowest global index value. ---*/
-            
-            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-              if (newID < Global_Index) Global_Index = newID;
-            }
-            
-            /*--- Search for the processor that owns this point ---*/
-            
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
-            /*--- If we have not visited this element yet, increment our
-             number of elements that must be sent to a particular proc. ---*/
-            
-            if ((nElem_Flag[iProcessor] != ii)) {
-              nElem_Flag[iProcessor] = ii;
-              nElem_Send[iProcessor+1]++;
-            }
-            
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send connectivities. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  unsigned long *connSend = NULL;
-  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
-  /*--- Create an index variable to keep track of our index
-   position as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
-  
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Plotting(iMarker) == YES) {
-      
-      for (int ii = 0; ii < (int)geometry->GetnElem_Bound(iMarker); ii++) {
-        
-        if (geometry->bound[iMarker][ii]->GetVTK_Type() == Elem_Type) {
-          for ( int jj = 0; jj < NODES_PER_ELEMENT; jj++ ) {
-            
-            /*--- Get the index of the current point. ---*/
-            
-            iPoint = geometry->bound[iMarker][ii]->GetNode(jj);
-            Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-            
-            /*--- Search for the lowest global index in this element. We
-             send the element to the processor owning the range that includes
-             the lowest global index value. ---*/
-            
-            for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-              jPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-              unsigned long newID = geometry->node[jPoint]->GetGlobalIndex();
-              if (newID < Global_Index) Global_Index = newID;
-            }
-            
-            /*--- Search for the processor that owns this point ---*/
-            
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
-            /*--- Load connectivity into the buffer for sending ---*/
-            
-            if (nElem_Flag[iProcessor] != ii) {
-              
-              nElem_Flag[iProcessor] = ii;
-              unsigned long nn = index[iProcessor];
-              unsigned long mm = haloIndex[iProcessor];
-              
-              /*--- Load the connectivity values. ---*/
-              
-              for (int kk = 0; kk < NODES_PER_ELEMENT; kk++) {
-                iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
-                connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
-                
-                /*--- Check if this is a halo node. If so, flag this element
-                 as a halo cell. We will use this later to sort and remove
-                 any duplicates from the connectivity list. ---*/
-                
-                if (Local_Halo[iPoint]) haloSend[mm] = true;
-                
-              }
-              
-              /*--- Increment the index by the message length ---*/
-              
-              index[iProcessor]    += NODES_PER_ELEMENT;
-              haloIndex[iProcessor]++;
-              
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] haloIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *connRecv = NULL;
-  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = NODES_PER_ELEMENT*nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = NODES_PER_ELEMENT*nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = NODES_PER_ELEMENT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = NODES_PER_ELEMENT*nElem_Recv[rank];
-  int ll = NODES_PER_ELEMENT*nElem_Send[rank];
-  int kk = NODES_PER_ELEMENT*nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. Note that we add 1 here
-   to the connectivity for vizualization packages. First, allocate
-   appropriate amount of memory for this section. ---*/
-  
-  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
-  int count = 0; nElem_Total = 0;
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
-    }
-  }
-
-  /*--- Store the particular global element count in the class data,
-   and set the class data pointer to the connectivity array. ---*/
-  
-  switch (Elem_Type) {
-    case LINE:
-      nParallel_Line = nElem_Total;
-      if (nParallel_Line > 0) Conn_BoundLine_Par = Conn_Elem;
-      break;
-    case TRIANGLE:
-      nParallel_BoundTria = nElem_Total;
-      if (nParallel_BoundTria > 0) Conn_BoundTria_Par = Conn_Elem;
-      break;
-    case QUADRILATERAL:
-      nParallel_BoundQuad = nElem_Total;
-      if (nParallel_BoundQuad > 0) Conn_BoundQuad_Par = Conn_Elem;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      break;
-  }
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
-  delete [] Local_Halo;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-  
-}
-
-void COutput::SortOutputData(CConfig *config, CGeometry *geometry) {
-  
-  unsigned long iProcessor;
-  unsigned long iPoint, Global_Index, nTotalPoint;
-  
-  int VARS_PER_POINT = GlobalField_Counter;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint_Sort;
-#endif
-  
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
-  /*--- We start with the grid nodes distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many nodes we must send to each other rank in order to
-   have all nodes sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  int *nPoint_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-    nPoint_Flag[ii]= -1;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
-    
-    /*--- We only write interior points and recovered periodic points. ---*/
-    
-    if (!Local_Halo_Sort[iPoint]) {
-      
-      /*--- Get the global index of the current point. ---*/
-      
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this node yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        nPoint_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-  
-  /*--- Prepare to send coordinates. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
-    
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  su2double *connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for sending the global ID. ---*/
-  
-  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-  
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
-  
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-    
-    /*--- We only write interior points and recovered periodic points. ---*/
-    
-    if (!Local_Halo_Sort[iPoint]) {
-      
-      /*--- Get the index of the current point. ---*/
-      
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Search for the processor that owns this point. ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-      
-      /*--- Load node coordinates into the buffer for sending. ---*/
-      
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        unsigned long nn = index[iProcessor];
-        
-        /*--- Load the data values. ---*/
-        
-        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-          connSend[nn] = Local_Data[iPoint][kk]; nn++;
-        }
-        
-        /*--- Load the global ID (minus offset) for sorting the
-         points once they all reach the correct processor. ---*/
-        
-        nn = idIndex[iProcessor];
-        idSend[nn] = Global_Index - starting_node[iProcessor];
-        
-        /*--- Increment the index by the message length ---*/
-        
-        index[iProcessor]  += VARS_PER_POINT;
-        idIndex[iProcessor]++;
-        
-      }
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] idIndex;
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
-    connRecv[ii] = 0;
-  
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
-  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
-    idRecv[ii] = 0;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the global IDs. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = VARS_PER_POINT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = VARS_PER_POINT*nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = VARS_PER_POINT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = VARS_PER_POINT*nPoint_Recv[rank];
-  int ll = VARS_PER_POINT*nPoint_Send[rank];
-  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-  
-  mm = nPoint_Recv[rank];
-  ll = nPoint_Send[rank];
-  kk = nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. First, allocate the
-   appropriate amount of memory for this section. ---*/
-  
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
-      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
-    }
-  }
-  
-  /*--- Store the total number of local points my rank has for
-   the current section after completing the communications. ---*/
-  
-  nParallel_Poin = nPoint_Recv[size];
-  
-  /*--- Reduce the total number of points we will write in the output files. ---*/
-
-#ifndef HAVE_MPI
-  nGlobal_Poin_Par = nParallel_Poin;
-#else
-  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] idSend;
-  delete [] idRecv;
-  delete [] nPoint_Recv;
-  delete [] nPoint_Send;
-  delete [] nPoint_Flag;
-
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-  
-}
-
-void COutput::SortOutputData_Surface(CConfig *config, CGeometry *geometry) {
-  
-  unsigned short iMarker;
-  unsigned long iProcessor;
-  unsigned long iPoint, jPoint, kPoint, iElem;
-  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
-  
-  int VARS_PER_POINT = GlobalField_Counter;
-  int *Local_Halo = NULL;
-  int iNode, count;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
-  /*---         linear partitions across all procs and the output data     ---*/
-  /*---         for the entire field is similarly linearly partitioned.    ---*/
-  /*---         We need to identify which nodes in the volume data are     ---*/
-  /*---         also surface points. Our first step is to loop over all    ---*/
-  /*---         of the sorted surface connectivity and create a data       ---*/
-  /*---         structure on each proc that can identify the local surf    ---*/
-  /*---         points. Note that the linear partitioning is slightly      ---*/
-  /*---         different between the nodes and elements, so we will       ---*/
-  /*---         have to move between the two systems in this routine.      ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. This is the linear partitioning for nodes. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-  
-  /*--- Sum total number of nodes that belong to the domain ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  
-  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
-  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Nodes[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear_Nodes[size] = nTotalPoint;
-  
-  /*--- Prepare to check and communicate the nodes that each proc has
-   locally from the surface connectivity. ---*/
-  
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  /*--- Loop through our local line elements and check where each
-   of the grid nodes resides based on global index. ---*/
-  
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Reset out flags and then loop through our local triangle surface
-   elements performing the same check for where each grid node resides. ---*/
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Reset out flags and then loop through our local quad surface
-   elements performing the same check for where each grid node resides. ---*/
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this element yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-      
-      if ((nElem_Flag[iProcessor] != iNode)) {
-        nElem_Flag[iProcessor] = iNode;
-        nElem_Send[iProcessor+1]++;
-      }
-      
-    }
-  }
-  
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many nodes it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate arrays for sending the global ID. ---*/
-  
-  unsigned long *idSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
-  
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-  
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
-  
-  /*--- Now loop back through the local connectivities for the surface
-   elements and load up the global IDs for sending to their home proc. ---*/
-  
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
-        
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
-        
-        /*--- Load the connectivity values. ---*/
-        
-        idSend[nn] = Global_Index; nn++;
-        
-        /*--- Increment the index by the message length ---*/
-        
-        idIndex[iProcessor]++;
-        
-      }
-      
-    }
-  }
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
-        
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
-        
-        /*--- Load the connectivity values. ---*/
-        
-        idSend[nn] = Global_Index; nn++;
-        
-        /*--- Increment the index by the message length ---*/
-        
-        idIndex[iProcessor]++;
-        
-      }
-      
-    }
-  }
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      /*--- Get global index. Note the -1 since it was 1-based for viz. ---*/
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
-      /*--- Load global ID into the buffer for sending ---*/
-      
-      if (nElem_Flag[iProcessor] != iNode) {
-        
-        nElem_Flag[iProcessor] = iNode;
-        unsigned long nn = idIndex[iProcessor];
-        
-        /*--- Load the connectivity values. ---*/
-        
-        idSend[nn] = Global_Index; nn++;
-        
-        /*--- Increment the index by the message length ---*/
-        
-        idIndex[iProcessor]++;
-        
-      }
-      
-    }
-  }
-  
-  /*--- Allocate the memory that we need for receiving the global IDs
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *idRecv = NULL;
-  idRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    idRecv[ii] = 0;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the global IDs. ---*/
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = nElem_Recv[rank];
-  int ll = nElem_Send[rank];
-  int kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 2: Each proc now knows which is its local grid nodes from     ---*/
-  /*---         the entire volume solution are part of the surface. We     ---*/
-  /*---         now apply a mask to extract just those points on the       ---*/
-  /*---         surface. We also need to perform a renumbering so that     ---*/
-  /*---         the surface data (nodes and connectivity) have their       ---*/
-  /*---         own global numbering. This is important for writing        ---*/
-  /*---         output files in a later routine.                           ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- Create a local data structure that acts as a mask to extract the
-   set of points within the local set that are on the surface. ---*/
-  
-  int *surfPoint = new int[nParallel_Poin];
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) surfPoint[iPoint] = -1;
-  
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
-  }
-  
-  /*--- First, add up the number of surface points I have on my rank. ---*/
-  
-  nSurf_Poin_Par = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-    if (surfPoint[iPoint] != -1) {
-      
-      /*--- Save the global index values for CSV output. ---*/
-      
-      Renumber2Global[nSurf_Poin_Par] = surfPoint[iPoint];
-      
-      /*--- Increment total number of surface points found locally. ---*/
-      
-      nSurf_Poin_Par++;
-
-    }
-  }
-  
-  /*--- Communicate this number of local surface points to all other
-   processors so that it can be used to create offsets for the new
-   global numbering for the surface points. ---*/
-  
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  
-  for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nSurf_Poin_Par;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-  
-  /*--- Go to cumulative storage format to compute the offsets. ---*/
-  
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-  
-  /*--- Now that we know the number of local surface points that we have,
-   we can allocate the new data structure to hold these points alone. Here,
-   we also copy the data for those points from our volume data structure. ---*/
-  
-  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
-    count = 0;
-    for (int ii = 0; ii < (int)nParallel_Poin; ii++) {
-      if (surfPoint[ii] !=-1) {
-        Parallel_Surf_Data[jj][count] = Parallel_Data[jj][ii];
-        count++;
-      }
-    }
-  }
-  
-  /*--- Reduce the total number of surf points we have. This will be
-   needed for writing the surface solution files later. ---*/
-  
-#ifndef HAVE_MPI
-  nGlobal_Surf_Poin = nSurf_Poin_Par;
-#else
-  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Now that we know every proc's global offset for the number of
-   surface points, we can create the new global numbering. Here, we
-   create a new mapping using two arrays, which will need to be
-   communicated. We use our mask again here.  ---*/
-  
-  unsigned long *globalP = new unsigned long[nSurf_Poin_Par];
-  unsigned long *renumbP = new unsigned long[nSurf_Poin_Par];
-  
-  count = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-    if (surfPoint[iPoint] != -1) {
-      globalP[count] = surfPoint[iPoint];
-      renumbP[count] = count + nPoint_Recv[rank];
-      count++;
-    }
-  }
-  
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 3: Communicate the arrays with the new global surface point   ---*/
-  /*---         numbering to the procs that hold the connectivity for      ---*/
-  /*---         each element. This will be done in two phases. First,      ---*/
-  /*---         we send the arrays around to the other procs based on      ---*/
-  /*---         the linear partitioning for the elems. This gets us        ---*/
-  /*---         most of the way there, however, due to the type of         ---*/
-  /*---         linear partitioning for the elements, there may exist      ---*/
-  /*---         elements that have nodes outside of the linear part.       ---*/
-  /*---         bounds. This is because the elems are distributed based    ---*/
-  /*---         on the node with the smallest global ID.                   ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- First, we perform the linear partitioning again as it is done
-   for elements, which is slightly different than for nodes (above). ---*/
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Elems[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear_Elems[size] = nTotalPoint;
-  
-  /*--- Reset our flags and counters ---*/
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  /*--- Loop through my local surface nodes, find which proc the global
-   value lives on, then communicate the global ID and remumbered value. ---*/
-  
-  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
-    
-    Global_Index = globalP[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-    
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-    
-    if ((nElem_Flag[iProcessor] != ii)) {
-      nElem_Flag[iProcessor] = ii;
-      nElem_Send[iProcessor+1]++;
-    }
-    
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  nSends = 0; nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the globals that we are
-   sending. ---*/
-  
-  unsigned long *globalSend = NULL;
-  globalSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    globalSend[ii] = 0;
-  
-  /*--- Allocate memory to hold the renumbering that we are
-   sending. ---*/
-  
-  unsigned long *renumbSend = NULL;
-  renumbSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    renumbSend[ii] = 0;
-  
-  /*--- Create an index variable to keep track of our index
-   position as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
-  
-  /*--- Loop back through and load up the buffers for the global IDs
-   and their new renumbering values. ---*/
-  
-  for (int ii = 0; ii < (int)nSurf_Poin_Par; ii++) {
-    
-    Global_Index = globalP[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-    
-    
-    if (nElem_Flag[iProcessor] != ii) {
-      
-      nElem_Flag[iProcessor] = ii;
-      unsigned long nn = index[iProcessor];
-      
-      globalSend[nn] = Global_Index;
-      renumbSend[nn] = renumbP[ii];
-      
-      /*--- Increment the index by the message length ---*/
-      
-      index[iProcessor]++;
-      
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  
-  /*--- Allocate the memory that we need for receiving the
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  unsigned long *globalRecv = NULL;
-  globalRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    globalRecv[ii] = 0;
-  
-  unsigned long *renumbRecv = NULL;
-  renumbRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    renumbRecv[ii] = 0;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the global ID. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(globalRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the global ID. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(globalSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking recv's for the renumbered ID. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(renumbRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the renumbered ID. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(renumbSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-  
-#endif
-  
-  /*--- Load our own procs data into the buffers directly. ---*/
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) globalRecv[mm] = globalSend[nn];
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) renumbRecv[mm] = renumbSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*-- Now update my local connectivitiy for the surface with the new
-   numbering. Create a new mapping for global -> renumber for nodes. Note
-   the adding of 1 back in here for the eventual viz. purposes. ---*/
-  
-  map<unsigned long,unsigned long> Global2Renumber;
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    Global2Renumber[globalRecv[ii]] = renumbRecv[ii] + 1;
-  }
-  
-  
-  /*--- The final step is one last pass over all elements to check
-   for points outside of the linear partitions of the elements. Again,
-   note that elems were distributed based on their smallest global ID,
-   so some nodes of the elem may have global IDs lying outside of the
-   linear partitioning. We need to recover the mapping for these
-   outliers. We loop over all local surface elements to find these. ---*/
-  
-  vector<unsigned long>::iterator it;
-  vector<unsigned long> outliers;
-  
-  for (int ii = 0; ii < (int)nParallel_Line; ii++) {
-    for ( int jj = 0; jj < N_POINTS_LINE; jj++ ) {
-      
-      iNode = ii*N_POINTS_LINE+jj;
-      Global_Index = Conn_BoundLine_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
-  }
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundTria; ii++) {
-    for ( int jj = 0; jj < N_POINTS_TRIANGLE; jj++ ) {
-      
-      iNode = ii*N_POINTS_TRIANGLE + jj;
-      Global_Index = Conn_BoundTria_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
-  }
-  
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii]= -1;
-  
-  for (int ii = 0; ii < (int)nParallel_BoundQuad; ii++) {
-    for ( int jj = 0; jj < N_POINTS_QUADRILATERAL; jj++ ) {
-      
-      iNode = ii*N_POINTS_QUADRILATERAL+jj;
-      Global_Index = Conn_BoundQuad_Par[iNode]-1;
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/npoint_procs[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
-      /*--- Store the global ID if it is outside our own linear partition. ---*/
-      
-      if ((iProcessor != (unsigned long)rank)) {
-        outliers.push_back(Global_Index);
-      }
-      
-    }
-  }
-  
-  /*--- Create a unique list of global IDs that fall outside of our procs
-   linear partition. ---*/
-  
-  sort(outliers.begin(), outliers.end());
-  it = unique(outliers.begin(), outliers.end());
-  outliers.resize(it - outliers.begin());
-  
-  /*--- Now loop over the outliers and communicate to those procs that
-   hold the new numbering for our outlier points. We need to ask for the
-   new numbering from these procs. ---*/
-  
-  for (int ii=0; ii < size; ii++) {
-    nElem_Send[ii] = 0;
-    nElem_Recv[ii] = 0;
-    nElem_Flag[ii]= -1;
-  }
-  nElem_Send[size] = 0; nElem_Recv[size] = 0;
-  
-  for (int ii = 0; ii < (int)outliers.size(); ii++) {
-    
-    Global_Index = outliers[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-    
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-    
-    if ((nElem_Flag[iProcessor] != ii)) {
-      nElem_Flag[iProcessor] = ii;
-      nElem_Send[iProcessor+1]++;
-    }
-    
-  }
-  
-  /*--- Communicate the number of cells to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nElem_Send[1]), 1, MPI_INT,
-                    &(nElem_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nElem_Recv[1] = nElem_Send[1];
-#endif
-  
-  /*--- Prepare to send connectivities. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  nSends = 0; nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nElem_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nElem_Recv[ii+1] > 0)) nRecvs++;
-    
-    nElem_Send[ii+1] += nElem_Send[ii];
-    nElem_Recv[ii+1] += nElem_Recv[ii];
-  }
-  
-  delete [] idSend;
-  idSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    idSend[ii] = 0;
-  
-  /*--- Reset our index variable for reuse. ---*/
-  
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
-  
-  /*--- Loop over the outliers again and load up the global IDs. ---*/
-  
-  for (int ii = 0; ii < (int)outliers.size(); ii++) {
-    
-    Global_Index = outliers[ii];
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-    
-    /*--- If we have not visited this element yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-    
-    if ((nElem_Flag[iProcessor] != ii)) {
-      
-      nElem_Flag[iProcessor] = ii;
-      unsigned long nn = idIndex[iProcessor];
-      
-      /*--- Load the global ID values. ---*/
-      
-      idSend[nn] = Global_Index; nn++;
-      
-      /*--- Increment the index by the message length ---*/
-      
-      idIndex[iProcessor]++;
-      
-    }
-  }
-  
-  /*--- Allocate the memory that we need for receiving the
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-  
-  delete [] idRecv;
-  idRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    idRecv[ii] = 0;
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  mm = nElem_Recv[rank];
-  ll = nElem_Send[rank];
-  kk = nElem_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  number = nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- The procs holding the outlier grid nodes now have the global IDs
-   that they need to have their renumbering shared. ---*/
-  
-  for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-      if (idRecv[ii] == globalP[iPoint]) {
-        idRecv[ii] = renumbP[iPoint];
-      }
-    }
-  }
-  
-  /*--- Now simply reverse the last communication to give the renumbered IDs
-   back to the owner of the outlier points. Note everything is flipped. ---*/
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[nRecvs];
-  recv_req = new SU2_MPI::Request[nSends];
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking recv's for the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  mm = nElem_Send[rank];
-  ll = nElem_Recv[rank];
-  kk = nElem_Recv[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idSend[mm] = idRecv[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  number = nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  /*--- Add the renumbering for the outliers to the map from before carrying
-   the global -> renumber transformation. Note that by construction, 
-   nElem_Send[ii] == outliers.size(). We also add in the 1 for viz. here. ---*/
-  
-  for (int ii = 0; ii < nElem_Send[size]; ii++) {
-    Global2Renumber[outliers[ii]] = idSend[ii] + 1;
-  }
-  
-  /*--- We can now overwrite the local connectivity for our surface elems
-   using our completed map with the new global renumbering. Whew!! Note
-   the -1 when accessing the conn from the map. ---*/
-  
-  for (iElem = 0; iElem < nParallel_Line; iElem++) {
-    iNode = (int)iElem*N_POINTS_LINE;
-    Conn_BoundLine_Par[iNode+0] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+0]-1];
-    Conn_BoundLine_Par[iNode+1] = (int)Global2Renumber[Conn_BoundLine_Par[iNode+1]-1];
-  }
-  
-  for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-    iNode = (int)iElem*N_POINTS_TRIANGLE;
-    Conn_BoundTria_Par[iNode+0] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+0]-1];
-    Conn_BoundTria_Par[iNode+1] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+1]-1];
-    Conn_BoundTria_Par[iNode+2] = (int)Global2Renumber[Conn_BoundTria_Par[iNode+2]-1];
-  }
-  
-  for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-    iNode = (int)iElem*N_POINTS_QUADRILATERAL;
-    Conn_BoundQuad_Par[iNode+0] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+0]-1];
-    Conn_BoundQuad_Par[iNode+1] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+1]-1];
-    Conn_BoundQuad_Par[iNode+2] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+2]-1];
-    Conn_BoundQuad_Par[iNode+3] = (int)Global2Renumber[Conn_BoundQuad_Par[iNode+3]-1];
-  }
-  
-  /*--- Free temporary memory ---*/
-  
-  delete [] idIndex;
-  delete [] surfPoint;
-  delete [] globalP;
-  delete [] renumbP;
-  
-  delete [] idSend;
-  delete [] idRecv;
-  delete [] globalSend;
-  delete [] globalRecv;
-  delete [] renumbSend;
-  delete [] renumbRecv;
-  delete [] nElem_Recv;
-  delete [] nElem_Send;
-  delete [] nElem_Flag;
-  delete [] Local_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear_Elems;
-  delete [] nPoint_Linear_Nodes;
-  delete [] nPoint_Send;
-  delete [] nPoint_Recv;
-  
-}
-
-void COutput::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geometry) {
-  
-  /*--- Local variables ---*/
-  
-  unsigned short iVar;
-  unsigned long iPoint;
-
-  ofstream restart_file;
-  string filename;
-  
-  int iProcessor;
-  
-  filename = config->GetFilename(RestartFilename, ".dat");
-  
-  /*--- Only the master node writes the header. ---*/
-  
-  if (rank == MASTER_NODE) {
-    restart_file.open(filename.c_str(), ios::out);
-    restart_file.precision(15);
-    restart_file << "\"PointID\"";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++)
-      restart_file << "\t\"" << Variable_Names[iVar] << "\"";
-    restart_file << "\t\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    restart_file.close();
-  }
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  
-  /*--- All processors open the file. ---*/
-  
-  restart_file.open(filename.c_str(), ios::out | ios::app);
-  restart_file.precision(15);
-  
-  /*--- Write the restart file in parallel, processor by processor. ---*/
-  
-  unsigned long myPoint = 0, offset = 0, Global_Index;
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-        
-        /*--- Global Index of the current point. (note outer loop over procs) ---*/
-        
-        Global_Index = iPoint + offset;
-        
-        /*--- Only write original domain points, i.e., exclude any periodic
-         or halo nodes, even if they are output in the viz. files. ---*/
-        
-        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-          
-          /*--- Write global index. (note outer loop over procs) ---*/
-          
-          restart_file << Global_Index << "\t";
-          myPoint++;
-          
-          /*--- Loop over the variables and write the values to file ---*/
-          
-          for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-            restart_file << scientific << Parallel_Data[iVar][iPoint] << "\t";
-          }
-          restart_file << "\n";
-        }
-      }
-    }
-    /*--- Flush the file and wait for all processors to arrive. ---*/
-    restart_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-    
-  }
-
-  /*--- Write the metadata (master rank alone) ----*/
-
-//  if (rank == MASTER_NODE) {
-//    if (dual_time)
-//      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-//    else
-//      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-//    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-//    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-//    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-//    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-//    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-//    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-//    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-
-//    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-//          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-//          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-//      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-//    }
-//  }
-
-  /*--- All processors close the file. ---*/
-
-  restart_file.close();
-  
-}
-
-void COutput::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geometry) {
-
-  /*--- Local variables ---*/
-
-  unsigned short iVar;
-  unsigned long iPoint;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool wrt_perf  = config->GetWrt_Performance();
-  ofstream restart_file;
-  string filename;
-  char str_buf[CGNS_STRING_SIZE], fname[100];
-  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
-  
-  filename = config->GetFilename(RestartFilename, ".dat");
-
-  strcpy(fname, filename.c_str());
-
-  /*--- Prepare the first ints containing the counts. The first is a
-   magic number that we can use to check for binary files (it is the hex
-   representation for "SU2"). The second two values are number of variables
-   and number of points (DoFs). The last two values are for metadata: 
-   one int for ExtIter and 8 su2doubles. ---*/
-
-  int var_buf_size = 5;
-  int var_buf[5] = {535532, GlobalField_Counter, (int)nGlobalPoint_Sort, 1, 8};
-
-  /*--- Prepare the 1D data buffer on this rank. ---*/
-
-  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
-
-  /*--- For now, create a temp 1D buffer to load up the data for writing.
-   This will be replaced with a derived data type most likely. ---*/
-
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(Parallel_Data[iVar][iPoint]);
-
-  /*--- Prepare metadata. ---*/
-
-  int Restart_ExtIter;
-  if (dual_time)
-    Restart_ExtIter= (int)config->GetExtIter() + 1;
-  else
-    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
-
-  passivedouble Restart_Metadata[8] = {
-    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
-    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
-    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
-    SU2_TYPE::GetValue(config->GetdCD_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
-    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
-    0.0
-  };
-
-//  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-//        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-//        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-//    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
-//  }
-
-  /*--- Set a timer for the binary file writing. ---*/
-  
-#ifndef HAVE_MPI
-  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-  StartTime = MPI_Wtime();
-#endif
-  
-#ifndef HAVE_MPI
-
-  FILE* fhw;
-  fhw = fopen(fname, "wb");
-
-  /*--- Error check for opening the file. ---*/
-
-  if (!fhw) {
-    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
-  }
-
-  /*--- First, write the number of variables and points. ---*/
-
-  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
-  file_size += (su2double)var_buf_size*sizeof(int);
-  
-  /*--- Write the variable names to the file. Note that we are adopting a
-   fixed length of 33 for the string length to match with CGNS. This is 
-   needed for when we read the strings later. ---*/
-
-  for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
-    fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
-    file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
-  }
-
-  /*--- Call to write the entire restart file data in binary in one shot. ---*/
-
-  fwrite(buf, GlobalField_Counter*nParallel_Poin, sizeof(passivedouble), fhw);
-  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
-
-  /*--- Write the external iteration. ---*/
-
-  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
-  file_size += (su2double)sizeof(int);
-
-  /*--- Write the metadata. ---*/
-
-  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
-  file_size += (su2double)8*sizeof(passivedouble);
-
-  /*--- Close the file. ---*/
-
-  fclose(fhw);
-
-#else
-
-  /*--- Parallel binary output using MPI I/O. ---*/
-
-  MPI_File fhw;
-  SU2_MPI::Status status;
-  MPI_Datatype etype, filetype;
-  MPI_Offset disp;
-  int ierr;
-
-  /*--- We're writing only su2doubles in the data portion of the file. ---*/
-
-  etype = MPI_DOUBLE;
-
-  /*--- Define a derived datatype for this ranks contiguous chunk of data
-   that will be placed in the restart (1D array size = num points * num vars). ---*/
-
-  MPI_Type_contiguous(GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &filetype);
-  MPI_Type_commit(&filetype);
-
-  /*--- All ranks open the file using MPI. Here, we try to open the file with
-   exclusive so that an error is generated if the file exists. We always want
-   to write a fresh restart file, so we delete any existing files and create
-   a new one. ---*/
-
-  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                       MPI_INFO_NULL, &fhw);
-  if (ierr != MPI_SUCCESS)  {
-    MPI_File_close(&fhw);
-    if (rank == 0)
-      MPI_File_delete(fname, MPI_INFO_NULL);
-    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                         MPI_INFO_NULL, &fhw);
-  }
-
-  /*--- Error check opening the file. ---*/
-
-  if (ierr) {
-    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
-  }
-
-  /*--- First, write the number of variables and points (i.e., cols and rows),
-   which we will need in order to read the file later. Also, write the 
-   variable string names here. Only the master rank writes the header. ---*/
-
-  if (rank == MASTER_NODE) {
-    MPI_File_write(fhw, var_buf, var_buf_size, MPI_INT, MPI_STATUS_IGNORE);
-    file_size += (su2double)var_buf_size*sizeof(int);
-
-    /*--- Write the variable names to the file. Note that we are adopting a
-     fixed length of 33 for the string length to match with CGNS. This is
-     needed for when we read the strings later. ---*/
-
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      disp = var_buf_size*sizeof(int) + iVar*CGNS_STRING_SIZE*sizeof(char);
-      strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
-      MPI_File_write_at(fhw, disp, str_buf, CGNS_STRING_SIZE, MPI_CHAR, MPI_STATUS_IGNORE);
-      file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
-    }
-  }
-
-  /*--- Compute the offset for this rank's linear partition of the data in bytes.
-   After the calculations above, we have the partition sizes store in nPoint_Linear
-   in cumulative storage format. ---*/
-
-  disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-          GlobalField_Counter*nPoint_Cum[rank]*sizeof(passivedouble));
-
-  /*--- Set the view for the MPI file write, i.e., describe the location in
-   the file that this rank "sees" for writing its piece of the restart file. ---*/
-
-  MPI_File_set_view(fhw, disp, etype, filetype, (char*)"native", MPI_INFO_NULL);
-
-  /*--- Collective call for all ranks to write to their view simultaneously. ---*/
-
-  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
-  file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
-
-  /*--- Free the derived datatype. ---*/
-
-  MPI_Type_free(&filetype);
-
-  /*--- Reset the file view before writing the metadata. ---*/
-
-  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
-
-  /*--- Finally, the master rank writes the metadata. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- External iteration. ---*/
-
-    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble));
-    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
-    file_size += (su2double)sizeof(int);
-
-    /*--- Additional doubles for AoA, AoS, etc. ---*/
-
-    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-            GlobalField_Counter*nGlobalPoint_Sort*sizeof(passivedouble) + 1*sizeof(int));
-    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
-    file_size += (su2double)8*sizeof(passivedouble);
-
-  }
-
-  /*--- All ranks close the file after writing. ---*/
-
-  MPI_File_close(&fhw);
-
-#endif
-
-  /*--- Compute and store the write time. ---*/
-  
-#ifndef HAVE_MPI
-  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-  StopTime = MPI_Wtime();
-#endif
-  UsedTime = StopTime-StartTime;
-  
-  /*--- Communicate the total file size for the restart ---*/
-  
-#ifdef HAVE_MPI
-  su2double my_file_size = file_size;
-  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
-                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Compute and store the bandwidth ---*/
-  
-  Bandwidth = file_size/(1.0e6)/UsedTime;
-  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
-  
-  if ((rank == MASTER_NODE) && (wrt_perf)) {
-    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
-    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
-  }
-  
-  /*--- Free temporary data buffer for writing the binary file. ---*/
-
-  delete [] buf;
-
-}
-
-void COutput::WriteCSV_Slice(CConfig *config, CGeometry *geometry,
-                             CSolver *FlowSolver, unsigned long iExtIter,
-                             unsigned short val_iZone, unsigned short val_direction) {
-
-  /*--- This routine is for exporting slices of field data for 2D cartesian
-   grids. It assumes that the grid points lie on lines of constant x-
-   or y-coordinates. It is a simple way to export slices or profiles on
-   these meshes for use in verification and validation work. It will
-   eventually be replaced by general routines for probing/slicing.  ---*/
-
-  int DIRECTION = (int)val_direction;
-
-  su2double coordMin, coordMax;
-  coordMin = config->GetStations_Bounds(0);
-  coordMax = config->GetStations_Bounds(1);
-
-  unsigned short iVar;
-  unsigned long iPoint, iVertex, Global_Index;
-  char cstr[200];
-
-  int rank = MASTER_NODE, iProcessor, nProcessor = SINGLE_NODE;
-#ifdef HAVE_MPI
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nProcessor);
-#endif
-
-  bool isPeriodic;
-
-  int *Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-
-  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-
-  /*--- Sum total number of nodes that belong to the domain ---*/
-
-  unsigned long nTotalPoint;
-  unsigned long nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-
-  unsigned long *npoint_procs  = new unsigned long[nProcessor];
-  unsigned long *nPoint_Linear = new unsigned long[nProcessor+1];
-
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < nProcessor; ii++) {
-    npoint_procs[ii] = nTotalPoint/nProcessor;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-
-  /*--- Store the point offsets for each rank. ---*/
-
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < nProcessor; ii++) {
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[nProcessor] = nTotalPoint;
-
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long nLocalVertex_Surface = 0;
-  unsigned long MaxLocalVertex_Surface = 0;
-
-  /*--- Find the max number of vertices we will send from among all
-   partitions and set up buffers. The master node will handle the
-   writing of the CSV file after gathering all of the data. ---*/
-
-  nLocalVertex_Surface = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-
-    /*--- Global Index of the current point. (note outer loop over procs) ---*/
-
-    Global_Index = iPoint + nPoint_Linear[rank];
-
-    /*--- Only write original domain points, i.e., exclude any periodic
-     or halo nodes, even if they are output in the viz. files. ---*/
-
-    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
-          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
-        nLocalVertex_Surface++;
-      }
-    }
-  }
-
-  /*--- Communicate the number of local vertices on each partition
-   to the master node ---*/
-
-  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long [nProcessor];
-
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG, Buffer_Recv_nVertex, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  MaxLocalVertex_Surface = nLocalVertex_Surface;
-  Buffer_Recv_nVertex[0] = Buffer_Send_nVertex[0];
-#endif
-
-  /*--- Send and Recv buffers ---*/
-
-  su2double *Buffer_Send_Data = new su2double [MaxLocalVertex_Surface*GlobalField_Counter];
-  su2double *Buffer_Recv_Data = NULL;
-
-  unsigned long *Buffer_Send_GlobalIndex = new unsigned long [MaxLocalVertex_Surface];
-  unsigned long *Buffer_Recv_GlobalIndex = NULL;
-
-  /*--- Prepare the receive buffers on the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-    Buffer_Recv_Data = new su2double [nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
-    Buffer_Recv_GlobalIndex  = new unsigned long [nProcessor*MaxLocalVertex_Surface];
-  }
-
-  /*--- Loop over all vertices in this partition and load the
-   data of the specified type into the buffer to be sent to
-   the master node. ---*/
-
-  nLocalVertex_Surface = 0;
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-
-    /*--- Global Index of the current point. (note outer loop over procs) ---*/
-
-    Global_Index = iPoint + nPoint_Linear[rank];
-
-    /*--- Only write original domain points, i.e., exclude any periodic
-     or halo nodes, even if they are output in the viz. files. ---*/
-
-    if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-      if ((Parallel_Data[DIRECTION][iPoint] > coordMin) &&
-          (Parallel_Data[DIRECTION][iPoint] < coordMax)) {
-        Buffer_Send_GlobalIndex[nLocalVertex_Surface] = Global_Index;
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          Buffer_Send_Data[nLocalVertex_Surface*GlobalField_Counter+iVar] = Parallel_Data[iVar][iPoint];
-        }
-        nLocalVertex_Surface++;
-      }
-    }
-  }
-
-  /*--- Send the information to the master node ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, Buffer_Recv_Data, MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (iVertex = 0; iVertex < Buffer_Recv_nVertex[0]; iVertex++) {
-    Buffer_Recv_GlobalIndex[iVertex] = Buffer_Send_GlobalIndex[iVertex];
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      Buffer_Recv_Data[iVertex*GlobalField_Counter+iVar] = Buffer_Send_Data[iVertex*GlobalField_Counter+iVar];
-    }
-  }
-#endif
-
-  /*--- The master node unpacks the data and writes the surface CSV file ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Write file name with extension if unsteady ---*/
-    char buffer[50];
-    string filename = "slice";
-    if (DIRECTION == 0) {
-      SPRINTF (buffer, "_vert.csv");
-    } else if (DIRECTION == 1) {
-      SPRINTF (buffer, "_hori.csv");
-    }
-    ofstream SurfFlow_file;
-
-    /*--- Write file name with extension if unsteady ---*/
-    strcpy (cstr, filename.c_str());
-    strcat (cstr, buffer);
-    SurfFlow_file.precision(15);
-    SurfFlow_file.open(cstr, ios::out);
-
-    /*--- Global index is first, then the rest of the data. We already have the names. ---*/
-
-    SurfFlow_file << "\"Global_Index\",";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      SurfFlow_file << "\"" << Variable_Names[iVar] << "\",";
-    }
-    SurfFlow_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-
-    /*--- Loop through all of the collected data and write each node's values ---*/
-
-    unsigned long Total_Index;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iVertex = 0; iVertex < Buffer_Recv_nVertex[iProcessor]; iVertex++) {
-
-        /*--- Current index position and global index ---*/
-
-        Total_Index  = iProcessor*MaxLocalVertex_Surface+iVertex;
-        Global_Index = Buffer_Recv_GlobalIndex[Total_Index];
-
-        /*--- Write the the data ---*/
-
-        SurfFlow_file << scientific << Global_Index;
-        Total_Index  = iProcessor*MaxLocalVertex_Surface*GlobalField_Counter+iVertex*GlobalField_Counter;
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-          SurfFlow_file << scientific << ", " << Buffer_Recv_Data[Total_Index+iVar];
-        }
-        SurfFlow_file << endl;
-
-      }
-    }
-
-    /*--- Close the CSV file ---*/
-
-    SurfFlow_file.close();
-
-    /*--- Release the recv buffers on the master node ---*/
-
-    delete [] Buffer_Recv_Data;
-    delete [] Buffer_Recv_GlobalIndex;
-    delete [] Buffer_Recv_nVertex;
-
-  }
-
-  /*--- Release the memory for the remaining buffers and exit ---*/
-
-  delete [] Buffer_Send_Data;
-  delete [] Buffer_Send_GlobalIndex;
-  
-}
-
-void COutput::DeallocateConnectivity_Parallel(bool surf_sol) {
-  
-  /*--- Deallocate memory for connectivity data on each processor. ---*/
-  
-  if (surf_sol) {
-    if (nParallel_Line > 0      && Conn_BoundLine_Par      != NULL)
-      delete [] Conn_BoundLine_Par;
-    if (nParallel_BoundTria > 0 && Conn_BoundTria_Par != NULL)
-      delete [] Conn_BoundTria_Par;
-    if (nParallel_BoundQuad > 0 && Conn_BoundQuad_Par != NULL)
-      delete [] Conn_BoundQuad_Par;
-  }
-  else {
-    if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
-    if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
-    if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
-    if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
-    if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
-    if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
-  }
-  
-}
-
-void COutput::DeallocateData_Parallel() {
-  
-  
-  if (data_sorter != NULL) delete data_sorter;
-//  /*--- Deallocate memory for solution data ---*/
-  
-//  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-//    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
-//  }
-//  if (Parallel_Data != NULL) delete [] Parallel_Data;
-
-}
-
-void COutput::DeallocateSurfaceData_Parallel() {
-  
-//  if (Parallel_Surf_Data != NULL) {
-    
-//    Global2Renumber.clear();
-//    Renumber2Global.clear();
-    
-//    /*--- Deallocate memory for surface solution data ---*/
-    
-//    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-//      if (Parallel_Surf_Data[iVar] != NULL) delete [] Parallel_Surf_Data[iVar];
-//    }
-//    delete [] Parallel_Surf_Data;
-//  }
-  
-}
-
-void COutput::MergeInletCoordinates(CConfig *config, CGeometry *geometry) {
-
-  /*--- Local variables needed on all processors ---*/
-
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, jPoint, kPoint;
-
-  int iProcessor, nProcessor = size;
-
-  unsigned long iVertex, iMarker;
-  unsigned long Buffer_Send_nPoin[1], *Buffer_Recv_nPoin = NULL;
-  unsigned long nLocalPoint = 0, MaxLocalPoint = 0;
-
-  unsigned long index, iChar;
-
-  char str_buf[MAX_STRING_SIZE];
-  vector<string> Marker_Tags;
-
-  unsigned long *nRowCum_Counter = NULL;
-
-  if (rank == MASTER_NODE) Buffer_Recv_nPoin = new unsigned long[nProcessor];
-
-  /*--- Search all boundaries on the present rank to count the number
-   of nodes found on inlet markers. ---*/
-
-  nLocalPoint = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- Only communicate owned nodes to avoid duplicates. ---*/
-
-        if (geometry->node[iPoint]->GetDomain())
-          nLocalPoint++;
-
-      }
-    }
-  }
-  Buffer_Send_nPoin[0] = nLocalPoint;
-
-  /*--- Communicate the total number of nodes on this domain. ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(&Buffer_Send_nPoin, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nPoin, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Allreduce(&nLocalPoint, &MaxLocalPoint, 1, MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-#else
-  Buffer_Recv_nPoin[0] = Buffer_Send_nPoin[0];
-  MaxLocalPoint        = nLocalPoint;
-#endif
-
-  /*--- Send and Recv buffers. ---*/
-
-  su2double *Buffer_Send_X = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_X = NULL;
-
-  su2double *Buffer_Send_Y = new su2double[MaxLocalPoint];
-  su2double *Buffer_Recv_Y = NULL;
-
-  su2double *Buffer_Send_Z = NULL, *Buffer_Recv_Z = NULL;
-  if (nDim == 3) Buffer_Send_Z = new su2double[MaxLocalPoint];
-
-  char *Buffer_Send_Str = new char[MaxLocalPoint*MAX_STRING_SIZE];
-  char *Buffer_Recv_Str = NULL;
-
-  /*--- Prepare the receive buffers in the master node only. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    Buffer_Recv_X = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Y = new su2double[nProcessor*MaxLocalPoint];
-    if (nDim == 3) Buffer_Recv_Z = new su2double[nProcessor*MaxLocalPoint];
-    Buffer_Recv_Str = new char[nProcessor*MaxLocalPoint*MAX_STRING_SIZE];
-
-    /*--- Sum total number of nodes to be written and allocate arrays ---*/
-
-    unsigned long nGlobal_InletPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      nGlobal_InletPoint += Buffer_Recv_nPoin[iProcessor];
-    }
-    InletCoords = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      InletCoords[iDim] = new su2double[nGlobal_InletPoint];
-    }
-  }
-
-  /*--- Main communication routine. Loop over each coordinate and perform
-   the MPI comm. Temporary 1-D buffers are used to send the coordinates at
-   all nodes on each partition to the master node. These are then unpacked
-   by the master and sorted by marker tag in one large n-dim. array. ---*/
-
-  /*--- Loop over this partition to collect the coords of the local points. ---*/
-
-  su2double *Coords_Local; jPoint = 0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
-
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-
-        /*--- Only communicate owned nodes to avoid duplicates. ---*/
-
-        if (geometry->node[iPoint]->GetDomain()) {
-
-          /*--- Retrieve local coordinates at this node. ---*/
-
-          Coords_Local = geometry->node[iPoint]->GetCoord();
-
-          /*--- Load local coords into the temporary send buffer. ---*/
-
-          Buffer_Send_X[jPoint] = Coords_Local[0];
-          Buffer_Send_Y[jPoint] = Coords_Local[1];
-          if (nDim == 3) Buffer_Send_Z[jPoint] = Coords_Local[2];
-
-          /*--- If US system, the output should be in inches ---*/
-
-          if (config->GetSystemMeasurements() == US) {
-            Buffer_Send_X[jPoint] *= 12.0;
-            Buffer_Send_Y[jPoint] *= 12.0;
-            if (nDim == 3) Buffer_Send_Z[jPoint] *= 12.0;
-          }
-
-          /*--- Store the marker tag for this particular node. ---*/
-
-          SPRINTF(&Buffer_Send_Str[jPoint*MAX_STRING_SIZE], "%s",
-                  config->GetMarker_All_TagBound(iMarker).c_str());
-
-          /*--- Increment jPoint as the counter. We need this because iPoint
-           may include halo nodes that we skip over during this loop. ---*/
-          
-          jPoint++;
-          
-        }
-      }
-    }
-  }
-
-  /*--- Gather the coordinate data on the master node using MPI. ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Gather(Buffer_Send_X, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_X, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Gather(Buffer_Send_Y, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Y, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  if (nDim == 3) {
-    SU2_MPI::Gather(Buffer_Send_Z, MaxLocalPoint, MPI_DOUBLE, Buffer_Recv_Z, MaxLocalPoint, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  }
-  SU2_MPI::Gather(Buffer_Send_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, Buffer_Recv_Str, MaxLocalPoint*MAX_STRING_SIZE, MPI_CHAR, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < MaxLocalPoint; iPoint++) {
-    Buffer_Recv_X[iPoint] = Buffer_Send_X[iPoint];
-    Buffer_Recv_Y[iPoint] = Buffer_Send_Y[iPoint];
-    if (nDim == 3) Buffer_Recv_Z[iPoint] = Buffer_Send_Z[iPoint];
-    index = iPoint*MAX_STRING_SIZE;
-    for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
-      Buffer_Recv_Str[index + iChar] = Buffer_Send_Str[index + iChar];
-    }
-  }
-#endif
-
-  /*--- The master node unpacks and sorts this variable by marker tag. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    Marker_Tags_InletFile.clear();
-
-    /*--- First, parse the marker tags to count how many total inlet markers
-     we have now on the master. ---*/
-
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        index = (iProcessor*MaxLocalPoint + iPoint)*MAX_STRING_SIZE;
-        for (iChar = 0; iChar < MAX_STRING_SIZE; iChar++) {
-          str_buf[iChar] = Buffer_Recv_Str[index + iChar];
-        }
-        Marker_Tags.push_back(str_buf);
-        Marker_Tags_InletFile.push_back(str_buf);
-      }
-    }
-
-    /*--- Sort and remove the duplicate inlet marker strings. ---*/
-
-    sort(Marker_Tags_InletFile.begin(), Marker_Tags_InletFile.end());
-    Marker_Tags_InletFile.erase(unique(Marker_Tags_InletFile.begin(),
-                                       Marker_Tags_InletFile.end()),
-                                Marker_Tags_InletFile.end());
-
-    /*--- Store the unique number of markers for writing later. ---*/
-
-    nMarker_InletFile = Marker_Tags_InletFile.size();
-
-    /*--- Count the number of rows (nodes) per marker. ---*/
-
-    nRow_InletFile = new unsigned long[nMarker_InletFile];
-    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-      nRow_InletFile[iMarker] = 0;
-    }
-
-    /*--- Now count the number of points per marker. ---*/
-
-    jPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[jPoint]) {
-            nRow_InletFile[iMarker]++;
-          }
-        }
-        jPoint++;
-      }
-    }
-
-    /*--- Now put the number of points per marker into cumulative storage.
-     We will also create an extra counter to make sorting easier. ---*/
-
-    nRowCum_InletFile = new unsigned long[nMarker_InletFile+1];
-    nRowCum_Counter   = new unsigned long[nMarker_InletFile+1];
-
-    nRowCum_InletFile[0] = 0; nRowCum_Counter[0] = 0;
-    for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-      nRowCum_InletFile[iMarker+1] = nRowCum_InletFile[iMarker] + nRow_InletFile[iMarker];
-      nRowCum_Counter[iMarker+1]   = nRowCum_Counter[iMarker]   + nRow_InletFile[iMarker];
-    }
-
-    /*--- Load up the coordinates, sorted into chunks per marker. ---*/
-
-    jPoint = 0; kPoint = 0;
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nPoin[iProcessor]; iPoint++) {
-        for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-          if (Marker_Tags_InletFile[iMarker] == Marker_Tags[kPoint]) {
-
-            /*--- Find our current index for this marker and store coords. ---*/
-
-            index = nRowCum_Counter[iMarker];
-            InletCoords[0][index] = Buffer_Recv_X[jPoint];
-            InletCoords[1][index] = Buffer_Recv_Y[jPoint];
-            if (nDim == 3) InletCoords[2][index] = Buffer_Recv_Z[jPoint];
-
-            /*--- Increment the counter for this marker. ---*/
-
-            nRowCum_Counter[iMarker]++;
-
-          }
-        }
-
-        /*--- Increment point counter for marker tags and data. ---*/
-
-        kPoint++;
-        jPoint++;
-        
-      }
-
-      /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
-
-      jPoint = (iProcessor+1)*MaxLocalPoint;
-
-    }
-  }
-
-  /*--- Immediately release the temporary data buffers. ---*/
-
-  delete [] Buffer_Send_X;
-  delete [] Buffer_Send_Y;
-  if (Buffer_Send_Z != NULL) delete [] Buffer_Send_Z;
-  delete [] Buffer_Send_Str;
-  if (rank == MASTER_NODE) {
-    delete [] Buffer_Recv_X;
-    delete [] Buffer_Recv_Y;
-    if (Buffer_Recv_Z != NULL)  delete [] Buffer_Recv_Z;
-    delete [] Buffer_Recv_nPoin;
-    delete [] Buffer_Recv_Str;
-    delete [] nRowCum_Counter;
-  }
-
-}
-
-void COutput::Write_InletFile_Flow(CConfig *config, CGeometry *geometry, CSolver **solver) {
-
-  unsigned short iMarker, iDim, iVar;
-  unsigned long iPoint;
-  su2double turb_val[2] = {0.0,0.0};
-
-  const unsigned short nDim = geometry->GetnDim();
-
-  bool turbulent = (config->GetKind_Solver() == RANS ||
-                    config->GetKind_Solver() == ADJ_RANS ||
-                    config->GetKind_Solver() == DISC_ADJ_RANS);
-
-  unsigned short nVar_Turb = 0;
-  if (turbulent)
-    switch (config->GetKind_Turb_Model()) {
-      case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-        nVar_Turb = 1;
-        turb_val[0] = solver[TURB_SOL]->GetNuTilde_Inf();
-        break;
-      case SST:
-        nVar_Turb = 2;
-        turb_val[0] = solver[TURB_SOL]->GetTke_Inf();
-        turb_val[1] = solver[TURB_SOL]->GetOmega_Inf();
-        break;
-      default:
-        SU2_MPI::Error("Specified turbulence model unavailable or none selected", CURRENT_FUNCTION);
-        break;
-    }
-
-  /*--- Count the number of columns that we have for this flow case.
-   Here, we have nDim entries for node coordinates, 2 entries for the total
-   conditions or mass flow, another nDim for the direction vector, and
-   finally entries for the number of turbulence variables. ---*/
-
-  unsigned short nCol_InletFile = nDim + 2 + nDim + nVar_Turb;
-
-  /*--- Write the inlet profile file. Note that we have already merged
-   all of the information for the markers and coordinates previously
-   in the MergeInletCoordinates() routine. ---*/
-
-  ofstream node_file("inlet_example.dat");
-
-  node_file << "NMARK= " << nMarker_InletFile << endl;
-
-  for (iMarker = 0; iMarker < nMarker_InletFile; iMarker++) {
-
-    /*--- Access the default data for this marker. ---*/
-
-    string Marker_Tag   = Marker_Tags_InletFile[iMarker];
-    su2double p_total   = config->GetInlet_Ptotal(Marker_Tag);
-    su2double t_total   = config->GetInlet_Ttotal(Marker_Tag);
-    su2double* flow_dir = config->GetInlet_FlowDir(Marker_Tag);
-
-    /*--- Header information for this marker. ---*/
-
-    node_file << "MARKER_TAG= " << Marker_Tag              << endl;
-    node_file << "NROW="        << nRow_InletFile[iMarker] << endl;
-    node_file << "NCOL="        << nCol_InletFile          << endl;
-
-    node_file << setprecision(15);
-    node_file << std::scientific;
-
-    /*--- Loop over the data structure and write the coords and vars to file. ---*/
-
-    for (iPoint = nRowCum_InletFile[iMarker]; iPoint < nRowCum_InletFile[iMarker+1]; iPoint++) {
-
-      for (iDim = 0; iDim < nDim; iDim++) {
-        node_file << InletCoords[iDim][iPoint] << "\t";
-      }
-      node_file << t_total << "\t" << p_total;
-      for (iDim = 0; iDim < nDim; iDim++) {
-        node_file << "\t" << flow_dir[iDim];
-      }
-      for (iVar = 0; iVar < nVar_Turb; iVar++) {
-        node_file << "\t" << turb_val[iVar];
-      }
-      node_file << endl;
-    }
-
-  }
-  node_file.close();
-
-  /*--- Print a message to inform the user about the template file. ---*/
-  
-  stringstream err;
-  err << endl;
-  err << "  Created a template inlet profile file with node coordinates" << endl;
-  err << "  and solver variables at `inlet_example.dat`." << endl;
-  err << "  You can use this file as a guide for making your own inlet" << endl;
-  err << "  specification." << endl << endl;
-  SU2_MPI::Error(err.str(), CURRENT_FUNCTION);
-
-}
-
-void COutput::DeallocateInletCoordinates(CConfig *config, CGeometry *geometry) {
-
-  unsigned short iDim, nDim = geometry->GetnDim();
-
-  /*--- The master node alone owns all data found in this routine. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- Deallocate memory for inlet coordinate data ---*/
-
-    if (nRow_InletFile != NULL)    delete [] nRow_InletFile;
-    if (nRowCum_InletFile != NULL) delete [] nRowCum_InletFile;
-
-    Marker_Tags_InletFile.clear();
-
-    for (iDim = 0; iDim < nDim; iDim++) {
-      if (InletCoords[iDim] != NULL) delete [] InletCoords[iDim];
-    }
-    if (InletCoords != NULL) delete [] InletCoords;
-  }
-
-}
-
-
-
-
-void COutput::PrepareOffsets(CConfig *config, CGeometry *geometry) {
-
-  unsigned long iPoint;
-
-
-  /*--- Reset point sorting counters ---*/
-
-  nGlobalPoint_Sort = 0;
-  nLocalPoint_Sort  = 0;
-
-  /*--- Prepare the offsets for the FV solver ---*/
-
-  if (!fem_output) {
-
-    /*--- Search all send/recv boundaries on this partition for any periodic
-     nodes that were part of the original domain. We want to recover these
-     for visualization purposes. ---*/
-
-    unsigned long iVertex;
-    bool isPeriodic;
-
-    Local_Halo_Sort = new int[geometry->GetnPoint()];
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      Local_Halo_Sort[iPoint] = !geometry->node[iPoint]->GetDomain();
-
-    for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-
-        /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-          if (isPeriodic) Local_Halo_Sort[iPoint] = false;
-        }
-      }
-    }
-
-    /*--- Sum total number of nodes that belong to the domain ---*/
-
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo_Sort[iPoint] == false)
-        nLocalPoint_Sort++;
-
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-    nGlobalPoint_Sort = nLocalPoint_Sort;
-#endif
-
-    /*--- Set a final variable for the number of points in the restart
-     file. We do not write the periodic points for the FV solver, even if
-     they show up in the viz. files. ---*/
-
-    nPoint_Restart = geometry->GetGlobal_nPointDomain();
-
-  } else {
-
-    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-     geometrical information for the FEM DG solver. ---*/
-
-    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-
-    /*--- Update the solution by looping over the owned volume elements. ---*/
-
-    for(unsigned long l=0; l<nVolElemOwned; ++l) {
-
-      /* Count up the number of local points we have for allocating storage. */
-
-      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-        nLocalPoint_Sort++;
-      }
-    }
-
-    Local_Halo_Sort = new int[nLocalPoint_Sort];
-    for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
-      Local_Halo_Sort[iPoint] = false;
-
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-    nGlobalPoint_Sort = nLocalPoint_Sort;
-#endif
-
-    /*--- Set a final variable for the number of points in the restart
-     file. We do not write the periodic points for the FV solver, even if
-     they show up in the viz. files. ---*/
-
-    nPoint_Restart = nGlobalPoint_Sort;
-
-  }
-
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-
-  beg_node = new unsigned long[size];
-  end_node = new unsigned long[size];
-
-  nPoint_Lin = new unsigned long[size];
-  nPoint_Cum = new unsigned long[size+1];
-
-  unsigned long total_points = 0;
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
-    total_points  += nPoint_Lin[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long remainder = nGlobalPoint_Sort - total_points;
-  for (unsigned long ii = 0; ii < remainder; ii++) {
-    nPoint_Lin[ii]++;
-  }
-
-  /*--- Store the local number of nodes on each proc in the linear
-   partitioning, the beginning/end index, and the linear partitioning
-   within an array in cumulative storage format. ---*/
-
-  beg_node[0] = 0;
-  end_node[0] = beg_node[0] + nPoint_Lin[0];
-  nPoint_Cum[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    beg_node[ii]   = end_node[ii-1];
-    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
-    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
-  }
-  nPoint_Cum[size] = nGlobalPoint_Sort;
-  
-}
-
-void COutput::SortConnectivity_FEM(CConfig *config, CGeometry *geometry, bool surf) {
-
-
-  /*--- Sort connectivity for each type of element (excluding halos). Note
-   In these routines, we sort the connectivity into a linear partitioning
-   across all processors based on the global index of the grid nodes. ---*/
-
-  /*--- Sort volumetric grid connectivity. ---*/
-
-  if (!surf) {
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting volumetric grid connectivity." << endl;
-
-    SortVolumetricConnectivity_FEM(config, geometry, TRIANGLE     );
-    SortVolumetricConnectivity_FEM(config, geometry, QUADRILATERAL);
-    SortVolumetricConnectivity_FEM(config, geometry, TETRAHEDRON  );
-    SortVolumetricConnectivity_FEM(config, geometry, HEXAHEDRON   );
-    SortVolumetricConnectivity_FEM(config, geometry, PRISM        );
-    SortVolumetricConnectivity_FEM(config, geometry, PYRAMID      );
-    
-    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
-  
-    unsigned long nTotal_Elem = nParallel_Tria + nParallel_Quad + nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-  #ifndef HAVE_MPI
-    nGlobal_Elem_Par = nTotal_Elem;
-  #else
-    SU2_MPI::Allreduce(&nTotal_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  #endif
-  }
-
-  /*--- Sort surface grid connectivity. ---*/
-
-  else {
-
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting surface grid connectivity." << endl;
-
-    SortSurfaceConnectivity_FEM(config, geometry, LINE         );
-    SortSurfaceConnectivity_FEM(config, geometry, TRIANGLE     );
-    SortSurfaceConnectivity_FEM(config, geometry, QUADRILATERAL);
-    
-    /*--- Reduce the total number of cells we will be writing in the output files. ---*/
-  
-    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_BoundTria + nParallel_BoundQuad;
-  #ifndef HAVE_MPI
-    nSurf_Elem_Par   = nTotal_Surf_Elem;
-  #else
-    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nSurf_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-  #endif
-  }
-}
-
-void COutput::SortVolumetricConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  /* Determine the number of nodes for this element type. */
-  unsigned short NODES_PER_ELEMENT = 0;
-  switch (Elem_Type) {
-    case TRIANGLE:
-      NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-      break;
-    case QUADRILATERAL:
-      NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-      break;
-    case TETRAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_TETRAHEDRON;
-      break;
-    case HEXAHEDRON:
-      NODES_PER_ELEMENT = N_POINTS_HEXAHEDRON;
-      break;
-    case PRISM:
-      NODES_PER_ELEMENT = N_POINTS_PRISM;
-      break;
-    case PYRAMID:
-      NODES_PER_ELEMENT = N_POINTS_PYRAMID;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-  }
-
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-        geometrical information for the FEM DG solver. ---*/
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-
-  const CFEMStandardElement *standardElementsSol = DGGeometry->GetStandardElementsSol();
-
-  /*--- Determine the number of sub-elements on this rank. ---*/
-  unsigned long nSubElem_Local = 0;
-  for(unsigned long i=0; i<nVolElemOwned; ++i) {
-
-    /* Determine the necessary data from the corresponding standard elem. */
-    const unsigned short ind       = volElem[i].indStandardElement;
-    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
-    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
-
-     /* Only store the linear sub elements if they are of
-        the current type that we are storing. */
-     if(Elem_Type == VTK_Type1) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType1();
-     if(Elem_Type == VTK_Type2) nSubElem_Local += standardElementsSol[ind].GetNSubElemsType2();
-  }
-
-  /* Allocate the memory to store the connectivity if the size is
-     larger than zero. */
-  int *Conn_SubElem = NULL;
-  if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
-
-  /*--- Loop again over the local volume elements and store the global
-        connectivities of the sub-elements. Note one is added to the
-        index value, because visualization softwares typically use
-        1-based indexing. ---*/
-  unsigned long kNode = 0;
-  for(unsigned long i=0; i<nVolElemOwned; ++i) {
-
-    /* Determine the necessary data from the corresponding standard elem. */
-    const unsigned short ind       = volElem[i].indStandardElement;
-    const unsigned short VTK_Type1 = standardElementsSol[ind].GetVTK_Type1();
-    const unsigned short VTK_Type2 = standardElementsSol[ind].GetVTK_Type2();
-
-    /* Check if the first sub-element is of the required type. */
-    if(Elem_Type == VTK_Type1) {
-
-      /* Get the number of sub-elements and the local connectivity of
-         the sub-elements. */
-      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType1();
-      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType1();
-
-      /* Store the global connectivities. */
-      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
-      for(unsigned short k=0; k<kk; ++k, ++kNode)
-        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
-    }
-
-    /* Check if the second sub-element is of the required type. */
-    if(Elem_Type == VTK_Type2) {
-
-      /* Get the number of sub-elements and the local connectivity of
-         the sub-elements. */
-      const unsigned short nSubElems     = standardElementsSol[ind].GetNSubElemsType2();
-      const unsigned short *connSubElems = standardElementsSol[ind].GetSubConnType2();
-
-      /* Store the global connectivities. */
-      const unsigned short kk = NODES_PER_ELEMENT*nSubElems;
-      for(unsigned short k=0; k<kk; ++k, ++kNode)
-        Conn_SubElem[kNode] = connSubElems[k] + volElem[i].offsetDOFsSolGlobal + 1;
-    }
-  }
-
-  /*--- Store the particular global element count in the class data,
-        and set the class data pointer to the connectivity array. ---*/
-  switch (Elem_Type) {
-    case TRIANGLE:
-      nParallel_Tria = nSubElem_Local;
-      Conn_Tria_Par = Conn_SubElem;
-      break;
-    case QUADRILATERAL:
-      nParallel_Quad = nSubElem_Local;
-      Conn_Quad_Par = Conn_SubElem;
-      break;
-    case TETRAHEDRON:
-      nParallel_Tetr = nSubElem_Local;
-      Conn_Tetr_Par = Conn_SubElem;
-      break;
-    case HEXAHEDRON:
-      nParallel_Hexa = nSubElem_Local;
-      Conn_Hexa_Par = Conn_SubElem;
-      break;
-    case PRISM:
-      nParallel_Pris = nSubElem_Local;
-      Conn_Pris_Par = Conn_SubElem;
-      break;
-    case PYRAMID:
-      nParallel_Pyra = nSubElem_Local;
-      Conn_Pyra_Par = Conn_SubElem;
-      break;
-    default:
-      SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-      break;
-  }
-}
-
-void COutput::SortSurfaceConnectivity_FEM(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
-  
-  /* Determine the number of nodes for this element type. */
-    unsigned short NODES_PER_ELEMENT = 0;
-    switch (Elem_Type) {
-      case LINE:
-        NODES_PER_ELEMENT = N_POINTS_LINE;
-        break;
-      case TRIANGLE:
-        NODES_PER_ELEMENT = N_POINTS_TRIANGLE;
-        break;
-      case QUADRILATERAL:
-        NODES_PER_ELEMENT = N_POINTS_QUADRILATERAL;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-    }
-    
-    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-          geometrical information for the FEM DG solver. ---*/
-    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-  
-    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-  
-    const CBoundaryFEM *boundaries = DGGeometry->GetBoundaries();
-    const CFEMStandardBoundaryFace *standardBoundaryFacesSol = DGGeometry->GetStandardBoundaryFacesSol();
-  
-    /*--- Create the map from the global DOF ID to the local index.
-          Note one is added to the index value, because visualization
-          softwares typically use 1-based indexing. ---*/
-    vector<unsigned long> globalID;
-    for(unsigned long l=0; l<nVolElemOwned; ++l) {
-      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-        const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j + 1;
-        globalID.push_back(globalIndex);
-      }
-    }
-  
-    /*--- Determine the number of sub-elements on this rank by looping
-          over the surface elements of the boundary markers that must
-          be plotted. ---*/
-    unsigned long nSubElem_Local = 0;
-    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
-      if( !boundaries[iMarker].periodicBoundary ) {
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
-          for(unsigned long i=0; i<surfElem.size(); ++i) {
-            const unsigned short ind      = surfElem[i].indStandardElement;
-            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
-            if(Elem_Type == VTK_Type) nSubElem_Local += standardBoundaryFacesSol[ind].GetNSubFaces();
-          }
-        }
-      }
-    }
-  
-    /* Allocate the memory to store the connectivity if the size is
-       larger than zero. */
-    int *Conn_SubElem = NULL;
-    if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
-  
-    /*--- Repeat the loop over the surface elements of the boundary markers
-          that must be plotted, but now store the connectivity. ---*/
-    unsigned long kNode = 0;
-    for(unsigned short iMarker=0; iMarker < config->GetnMarker_All(); ++iMarker) {
-      if( !boundaries[iMarker].periodicBoundary ) {
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          const vector<CSurfaceElementFEM> &surfElem = boundaries[iMarker].surfElem;
-  
-          /* Loop over the surface elements of this boundary marker. */
-          for(unsigned long i=0; i<surfElem.size(); ++i) {
-  
-            /* Check if this is the element type to be stored. */
-            const unsigned short ind      = surfElem[i].indStandardElement;
-            const unsigned short VTK_Type = standardBoundaryFacesSol[ind].GetVTK_Type();
-            if(Elem_Type == VTK_Type) {
-  
-              /* Get the number of sub-elements and the local connectivity of
-                 the sub-elements. */
-              const unsigned short nSubFaces     = standardBoundaryFacesSol[ind].GetNSubFaces();
-              const unsigned short *connSubFaces = standardBoundaryFacesSol[ind].GetSubFaceConn();
-  
-              /* Store the global connectivities. */
-              const unsigned short kk = NODES_PER_ELEMENT*nSubFaces;
-              for(unsigned short k=0; k<kk; ++k, ++kNode)
-                Conn_SubElem[kNode] = globalID[surfElem[i].DOFsSolFace[connSubFaces[k]]];
-            }
-          }
-        }
-      }
-    }
-  
-    /*--- Store the particular global element count in the class data,
-          and set the class data pointer to the connectivity array. ---*/
-    switch (Elem_Type) {
-      case LINE:
-        nParallel_Line = nSubElem_Local;
-        Conn_BoundLine_Par = Conn_SubElem;
-        break;
-      case TRIANGLE:
-        nParallel_BoundTria = nSubElem_Local;
-        Conn_BoundTria_Par = Conn_SubElem;
-        break;
-      case QUADRILATERAL:
-        nParallel_BoundQuad = nSubElem_Local;
-        Conn_BoundQuad_Par = Conn_SubElem;
-        break;
-      default:
-        SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
-        break;
-    }
-    
-}
-
-void COutput::SortOutputData_FEM(CConfig *config, CGeometry *geometry) {
-
-  unsigned long iProcessor;
-  unsigned long iPoint, Global_Index;
-
-  /* For convenience, set the total number of variables stored at each DOF. */
-
-  int VARS_PER_POINT = GlobalField_Counter;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-
-  //map<unsigned long, unsigned long> mapLocal2Global;
-  vector<unsigned long> globalID;
-
-  /*--- Update the solution by looping over the owned volume elements. ---*/
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
-
-    /* Loop over the DOFs for this element and store the solution. */
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
-      globalID.push_back(globalIndex);
-    }
-  }
-
-  /*--- We start with the grid nodes distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many nodes we must send to each other rank in order to
-   have all nodes sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  int *nPoint_Flag = new int[size];
-
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-    nPoint_Flag[ii]= -1;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
-
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
-
-    /*--- Get the global index of the current point. ---*/
-
-    Global_Index = globalID[iPoint];
-
-    /*--- Search for the processor that owns this point ---*/
-
-    iProcessor = Global_Index/nPoint_Lin[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Cum[iProcessor])
-      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
-
-    /*--- If we have not visted this node yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      nPoint_Send[iProcessor+1]++;
-    }
-
-  }
-
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-
-  /*--- Prepare to send coordinates. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
-
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
-
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-
-  /*--- Allocate memory to hold the connectivity that we are sending. ---*/
-
-  su2double *connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-
-  /*--- Allocate arrays for sending the global ID. ---*/
-
-  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
-
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
-
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
-
-    /*--- Get the index of the current point. ---*/
-
-    Global_Index = globalID[iPoint];
-
-    /*--- Search for the processor that owns this point. ---*/
-
-    iProcessor = Global_Index/nPoint_Lin[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Cum[iProcessor])
-      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
-
-    /*--- Load data into the buffer for sending. ---*/
-
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      unsigned long nn = index[iProcessor];
-
-      /*--- Load the data values. ---*/
-
-      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-        connSend[nn] = Local_Data[iPoint][kk]; nn++;
-      }
-
-      /*--- Load the global ID (minus offset) for sorting the
-       points once they all reach the correct processor. ---*/
-
-      nn = idIndex[iProcessor];
-      idSend[nn] = Global_Index - beg_node[iProcessor];
-
-      /*--- Increment the index by the message length ---*/
-
-      index[iProcessor]  += VARS_PER_POINT;
-      idIndex[iProcessor]++;
-
-    }
-
-  }
-
-  /*--- Free memory after loading up the send buffer. ---*/
-
-  delete [] index;
-  delete [] idIndex;
-
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-
-  su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
-    connRecv[ii] = 0;
-
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
-  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
-    idRecv[ii] = 0;
-
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the global IDs. ---*/
-
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = VARS_PER_POINT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = VARS_PER_POINT*nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = VARS_PER_POINT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-
-  /*--- Repeat the process to communicate the global IDs. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-
-  int mm = VARS_PER_POINT*nPoint_Recv[rank];
-  int ll = VARS_PER_POINT*nPoint_Send[rank];
-  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
-
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
-
-  mm = nPoint_Recv[rank];
-  ll = nPoint_Send[rank];
-  kk = nPoint_Send[rank+1];
-
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. First, allocate the
-   appropriate amount of memory for this section. ---*/
-
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
-      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
-    }
-  }
-
-  /*--- Store the total number of local points my rank has for
-   the current section after completing the communications. ---*/
-
-  nParallel_Poin = nPoint_Recv[size];
-
-  /*--- Reduce the total number of points we will write in the output files. ---*/
-
-#ifndef HAVE_MPI
-  nGlobal_Poin_Par = nParallel_Poin;
-#else
-  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-
-  /*--- Free temporary memory from communications ---*/
-
-  delete [] connSend;
-  delete [] connRecv;
-  delete [] idSend;
-  delete [] idRecv;
-  delete [] nPoint_Recv;
-  delete [] nPoint_Send;
-  delete [] nPoint_Flag;
-  
-}
-
-void COutput::SortOutputData_Surface_FEM(CConfig *config, CGeometry *geometry) {
-  
-  const int VARS_PER_POINT = GlobalField_Counter;
-
-  /*---------------------------------------------------*/
-  /*--- Step 1: Determine the global DOF ID's of the   */
-  /*---         locally stored surface connectivities. */
-  /*---------------------------------------------------*/
-
-  /* Loop over the surface connectivities and store global
-     DOF ID's in a vector. Subtract 1, because the stored
-     connectivities are 1 based. */
-  std::vector<unsigned long> globalSurfaceDOFIDs;
-  globalSurfaceDOFIDs.reserve(nParallel_Line*N_POINTS_LINE +
-                              nParallel_BoundTria*N_POINTS_TRIANGLE +
-                              nParallel_BoundQuad*N_POINTS_QUADRILATERAL);
-
-  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i) {
-    const unsigned long globalID = Conn_BoundLine_Par[i]-1;
-    globalSurfaceDOFIDs.push_back(globalID);
-  }
-
-  for(unsigned long i=0; i<(nParallel_BoundTria*N_POINTS_TRIANGLE); ++i) {
-    const unsigned long globalID = Conn_BoundTria_Par[i]-1;
-    globalSurfaceDOFIDs.push_back(globalID);
-  }
-
-  for(unsigned long i=0; i<(nParallel_BoundQuad*N_POINTS_QUADRILATERAL); ++i) {
-    const unsigned long globalID = Conn_BoundQuad_Par[i]-1;
-    globalSurfaceDOFIDs.push_back(globalID);
-  }
-
-  /* Sort globalSurfaceDOFIDs in increasing order and remove the
-     multiple entries. */
-  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
-  vector<unsigned long>::iterator lastEntry;
-  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
-  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
-
-  /*-------------------------------------------------------------------*/
-  /*--- Step 2: Communicate the information of globalSurfaceDOFIDs  ---*/
-  /*---         to the ranks, which actually store this information ---*/
-  /*---         in Parallel_Data.                                   ---*/
-  /*-------------------------------------------------------------------*/
-
-  /* Allocate the memory for the first index of the communication buffers. */
-  vector<vector<unsigned long> > sendBuf(size, vector<unsigned long>(0));
-
-  /* Loop over the entries of globalSurfaceDOFIDs and fill the
-     communication buffers accordingly. */
-  for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
-
-    /* Search for the processor that owns this point. */
-    unsigned long iProcessor = globalSurfaceDOFIDs[i]/nPoint_Lin[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor])
-      while(globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor+1]) ++iProcessor;
-    else
-      while(globalSurfaceDOFIDs[i] <  nPoint_Cum[iProcessor])   --iProcessor;
-
-    /* Store the global ID in the send buffer for iProcessor. */
-    sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
-  }
-
-  /* Determine the number of DOFs to be sent to each processor. */
-  int nRankSend = 0;
-  vector<unsigned long> nDOFSend(size);
-  for(int i=0; i<size; ++i) {
-    nDOFSend[i] = sendBuf[i].size();
-    if(nDOFSend[i] && (i != rank)) ++nRankSend;
-  }
-
-  /* Communicate nDOFSend using Alltoall. */
-  vector<unsigned long> nDOFRecv(size);
-
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(nDOFSend.data(), 1, MPI_UNSIGNED_LONG,
-                    nDOFRecv.data(), 1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  nDOFRecv[rank] = nDOFSend[rank];
-#endif
-
-  /* Determine the number of messages this rank will receive. */
-  int nRankRecv = 0;
-  for(int i=0; i<size; ++i) {
-    if(nDOFRecv[i] && (i != rank)) ++nRankRecv;
-  }
-
-  /* Define the receive buffers. */
-  vector<vector<unsigned long> > recvBuf(size, vector<unsigned long>(0));
-
-#ifdef HAVE_MPI
-  /* Launch the non-blocking sends. Do not send anything to myself. */
-  vector<SU2_MPI::Request> sendReq(nRankSend);
-  nRankSend = 0;
-  for(int i=0; i<size; ++i) {
-    if(nDOFSend[i] && (i != rank)) {
-      SU2_MPI::Isend(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
-                     i, rank, MPI_COMM_WORLD, &sendReq[nRankSend]);
-      ++nRankSend;
-    }
-  }
-
-  /* Launch the non-blocking receives. Do not receive anything from myself. */
-  vector<SU2_MPI::Request> recvReq(nRankRecv);
-  nRankRecv = 0;
-  for(int i=0; i<size; ++i) {
-    if(nDOFRecv[i] && (i != rank)) {
-      recvBuf[i].resize(nDOFRecv[i]);
-      SU2_MPI::Irecv(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
-                     i, i, MPI_COMM_WORLD, &recvReq[nRankRecv]);
-      ++nRankRecv;
-    }
-  }
-
-#endif
-
-  /* Copy my own data. */
-  recvBuf[rank] = sendBuf[rank];
-
-#ifdef HAVE_MPI
-  /* Complete the non-blocking communication. */
-  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
-  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
-#endif
-
-  /*-------------------------------------------------------------------*/
-  /*--- Step 2: Determine the number of locally stored surface DOFs ---*/
-  /*---         and store the data in Parallel_Surf_Data.           ---*/
-  /*-------------------------------------------------------------------*/
-
-  /* Store all received surface ID in one vector and sort it. */
-  globalSurfaceDOFIDs.resize(0);
-  for(int i=0; i<size; ++i) {
-    if( nDOFRecv[i] )
-      globalSurfaceDOFIDs.insert(globalSurfaceDOFIDs.end(),
-                                  recvBuf[i].begin(), recvBuf[i].end());
-  }
-
-  sort(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
-  lastEntry = unique(globalSurfaceDOFIDs.begin(), globalSurfaceDOFIDs.end());
-  globalSurfaceDOFIDs.erase(lastEntry, globalSurfaceDOFIDs.end());
-
-  /* Allocate the memory for Parallel_Surf_Data. */
-  nSurf_Poin_Par = globalSurfaceDOFIDs.size();
-
-  Parallel_Surf_Data = new su2double*[VARS_PER_POINT];
-  for(int jj=0; jj<VARS_PER_POINT; jj++)
-    Parallel_Surf_Data[jj] = new su2double[nSurf_Poin_Par];
-
-  /* Determine the local index of the global surface DOFs and
-     copy the data into Parallel_Surf_Data. */
-  for(unsigned long i=0; i<nSurf_Poin_Par; ++i) {
-    const unsigned long ii = globalSurfaceDOFIDs[i] - nPoint_Cum[rank];
-
-    for(int jj=0; jj<VARS_PER_POINT; jj++)
-      Parallel_Surf_Data[jj][i] = Parallel_Data[jj][ii];
-  }
-
-  /*--- Reduce the total number of surf points we have. This will be
-        needed for writing the surface solution files later. ---*/
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nSurf_Poin_Par, &nGlobal_Surf_Poin, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nGlobal_Surf_Poin = nSurf_Poin_Par;
-#endif
-
-  /*-------------------------------------------------------------------*/
-  /*--- Step 3: Modify the surface connectivities, such that only   ---*/
-  /*---         the data of surface DOFs needs to be written.       ---*/
-  /*-------------------------------------------------------------------*/
-
-  /* Determine the offset for my surface DOFs. */
-  unsigned long offsetSurfaceDOFs = 0;
-#ifdef HAVE_MPI
-  vector<unsigned long> nSurfaceDOFsRanks(size);
-
-  SU2_MPI::Allgather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG,
-                     nSurfaceDOFsRanks.data(), 1, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-
-  for(int i=0; i<rank; ++i) offsetSurfaceDOFs += nSurfaceDOFsRanks[i];
-#endif
-
-  /* Create the map from the global volume numbering to the new global
-     surface numbering. */
-  map<unsigned long, unsigned long> mapGlobalVol2Surf;
-  for(unsigned long i=0; i<nSurf_Poin_Par; ++i)
-    mapGlobalVol2Surf[globalSurfaceDOFIDs[i]] = offsetSurfaceDOFs + i;
-
-  /* Fill the receive buffers with the modified global surface DOF numbers,
-     such that this information can be returned to the original ranks. */
-  for(int i=0; i<size; ++i) {
-    for(unsigned long j=0; j<nDOFRecv[i]; ++j)
-      recvBuf[i][j] = mapGlobalVol2Surf.find(recvBuf[i][j])->second;
-  }
-
-  /* Copy the original send buffers, because that information is
-     still needed. */
-  vector<vector<unsigned long> > originalSendBuf = sendBuf;
-
-#ifdef HAVE_MPI
-  /* Launch the non-blocking sends for the reverse communication, where the
-     receive buffers must be used for sending. Do not send anything to myself. */
-  nRankRecv = 0;
-  for(int i=0; i<size; ++i) {
-    if(nDOFRecv[i] && (i != rank)) {
-      SU2_MPI::Isend(recvBuf[i].data(), nDOFRecv[i], MPI_UNSIGNED_LONG,
-                     i, rank+1, MPI_COMM_WORLD, &recvReq[nRankRecv]);
-      ++nRankRecv;
-    }
-  }
-
-  /* Launch the non-blocking receives for the reverse communication, where the
-     send buffers must be used for receiving.  Do not receive anything from myself. */
-  nRankSend = 0;
-  for(int i=0; i<size; ++i) {
-    if(nDOFSend[i] && (i != rank)) {
-      SU2_MPI::Irecv(sendBuf[i].data(), nDOFSend[i], MPI_UNSIGNED_LONG,
-                     i, i+1, MPI_COMM_WORLD, &sendReq[nRankSend]);
-      ++nRankSend;
-    }
-  }
-
-#endif
-
-  /* Copy my own data. */
-  sendBuf[rank] = recvBuf[rank];
-
-#ifdef HAVE_MPI
-  /* Complete the non-blocking communication. */
-  SU2_MPI::Waitall(nRankRecv, recvReq.data(), MPI_STATUSES_IGNORE);
-  SU2_MPI::Waitall(nRankSend, sendReq.data(), MPI_STATUSES_IGNORE);
-#endif
-
-  /* Clear the map mapGlobalVol2Surf and fill it with the data
-     needed to modify the surface connectivity. Note that 1 is added,
-     because the visualization softwares typically use 1 based indexing. */
-  mapGlobalVol2Surf.clear();
-
-  for(int i=0; i<size; ++i) {
-    for(unsigned long j=0; j<nDOFSend[i]; ++j)
-      mapGlobalVol2Surf[originalSendBuf[i][j]+1] = sendBuf[i][j]+1;
-  }
-
-  /* Modify the locally stored surface connectivities. */
-  for(unsigned long i=0; i<(nParallel_Line*N_POINTS_LINE); ++i)
-    Conn_BoundLine_Par[i] = mapGlobalVol2Surf.find(Conn_BoundLine_Par[i])->second;
-
-  for(unsigned long i=0; i<(nParallel_BoundTria*N_POINTS_TRIANGLE); ++i)
-    Conn_BoundTria_Par[i] = mapGlobalVol2Surf.find(Conn_BoundTria_Par[i])->second;
-
-  for(unsigned long i=0; i<(nParallel_BoundQuad*N_POINTS_QUADRILATERAL); ++i)
-    Conn_BoundQuad_Par[i] = mapGlobalVol2Surf.find(Conn_BoundQuad_Par[i])->second;
-}
-
-void COutput::SetHistoryFile_Header(CConfig *config) { 
-
-  
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
-  }
-  
-  stringstream out;
-  string RequestedField;
-  std::vector<bool> found_field(nRequestedHistoryFields, false);
-    
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
-    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];   
-      if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutput_List[iField_Output])){
-        found_field[iReqField] = true;        
-        out << "\"" << Field.FieldName << "\"" << HistorySep;
-      }
-    }  
-  }
-  
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){  
-      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutputPerSurface_List[iField_Output])){
-          found_field[iReqField] = true;          
-          out << "\"" << Field.FieldName << "\"" << HistorySep;        
-        }
-      }
-    }
-  }
-  
-  /*--- Print the string to file and remove the last character (a separator) ---*/
-  HistFile << out.str().substr(0, out.str().size() - 1);
-  HistFile << endl;
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
-  }
-  HistFile.flush();
-  
-}
-
-
-void COutput::SetHistoryFile_Output(CConfig *config) { 
-  
-  stringstream out;
-  string RequestedField;
-  
-  
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
-    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];   
-      if (RequestedField == Field.OutputGroup){
-        out << std::setprecision(10) << Field.Value << HistorySep << " ";
-      }
-    }
-  }
-  
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup){
-          out << std::setprecision(10) << Field.Value << HistorySep << " ";
-        }
-      }
-    }
-  }
-  
-  /*--- Print the string to file and remove the last two characters (a separator and a space) ---*/
-  
-  HistFile << out.str().substr(0, out.str().size()-2);
-  HistFile << endl;
-  HistFile.flush();
-}
-
-void COutput::SetScreen_Header(CConfig *config) {
-  if (config->GetMultizone_Problem()) 
-    MultiZoneHeaderTable->PrintHeader();
-  ConvergenceTable->PrintHeader();
-}
-
-
-void COutput::SetScreen_Output(CConfig *config) {
-  
-  string RequestedField;
-  
-  for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-    stringstream out;
-    RequestedField = RequestedScreenFields[iReqField]; 
-    if (HistoryOutput_Map.count(RequestedField) > 0){  
-      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
-        case FORMAT_INTEGER:
-          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
-          break;
-        case FORMAT_FIXED:
-          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
-          break;
-        case FORMAT_SCIENTIFIC:
-          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
-          break;      
-      }
-    }
-    if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
-      switch (HistoryOutputPerSurface_Map[RequestedField][0].ScreenFormat) {
-        case FORMAT_INTEGER:
-          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value), field_width);
-          break;
-        case FORMAT_FIXED:
-          PrintingToolbox::PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
-          break;
-        case FORMAT_SCIENTIFIC:
-          PrintingToolbox::PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
-          break;   
-      }
-    }      
-    (*ConvergenceTable) << out.str();
-  }
-}
-
-void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
-  
-    no_writing = !wrt;
-
-    /*--- Set the common output fields ---*/
-    
-    SetCommonHistoryFields(config);
-    
-    /*--- Set the History output fields using a virtual function call to the child implementation ---*/
-    
-    SetHistoryOutputFields(config);
-    
-    /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
-    
-    Postprocess_HistoryFields(config);
-    
-    if (rank == MASTER_NODE && !no_writing){
-      
-      /*--- Check for consistency and remove fields that are requested but not available --- */
-      
-      CheckHistoryOutput();
-      
-      /*--- Open history file and print the header ---*/
-      
-      PrepareHistoryFile(config);
-      
-      /*--- Set the multizone screen header ---*/
-      
-      if (config->GetMultizone_Problem()){
-        MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
-        MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
-        MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
-      }
-      
-    }
-    
-}
-
-void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
-  
-  no_writing = !wrt;
-
-  /*--- Set the History output fields using a virtual function call to the child implementation ---*/
-  
-  SetMultizoneHistoryOutputFields(output, config);
+  SetMultizoneHistoryOutputFields(output, config);
   
   if (rank == MASTER_NODE && !no_writing){
     
@@ -6311,15 +1089,11 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     }
     cout << endl;
   }
-  
-  /*--- First, prepare the offsets needed throughout below. ---*/    
-  
-  PrepareOffsets(config, geometry);    
-  
+
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
    
-  Local_Data.resize(nLocalPoint_Sort, std::vector<su2double>(GlobalField_Counter, 0.0));
+  Local_Data.resize(geometry->GetnPoint(), std::vector<su2double>(GlobalField_Counter, 0.0));
   
 }
 
@@ -6359,26 +1133,22 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
       
       /*--- Check for halos & write only if requested ---*/
+      /*--- Load the volume data into the Local_Data() array. --- */
       
-      if (!Local_Halo_Sort[iPoint] || Wrt_Halo) {
-        
-        /*--- Load the volume data into the Local_Data() array. --- */
-        
-        LoadVolumeData(config, geometry, solver, jPoint);
-        
-        for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-          if (config->GetMarker_All_Plotting(iMarker) == YES) {
-            iVertex = geometry->node[iPoint]->GetVertex(iMarker);
-            if (iVertex != -1){ 
-              
-              /*--- Load the surface data into the Local_Data() array. --- */
-              
-              LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
-            }
+      LoadVolumeData(config, geometry, solver, jPoint);
+      
+      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+        if (config->GetMarker_All_Plotting(iMarker) == YES) {
+          iVertex = geometry->node[iPoint]->GetVertex(iMarker);
+          if (iVertex != -1){ 
+            
+            /*--- Load the surface data into the Local_Data() array. --- */
+            
+            LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
           }
         }
-        jPoint++;
       }
+      jPoint++;
     }
   }
 }
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index 87b69ce5df31..665a8bde45b3 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -1,6 +1,6 @@
 #include "../../../include/output/filewriter/CCSVFileWriter.hpp"
 
-CCSVFileWriter::CCSVFileWriter(string filename, vector<string> fields, unsigned short nDim) : 
+CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim) : 
   CFileWriter(fields, nDim){
 
   file_ext = ".csv";
diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
index 59b80ccc13f9..4ad7f25492b5 100644
--- a/SU2_DEF/src/meson.build
+++ b/SU2_DEF/src/meson.build
@@ -3,12 +3,6 @@ su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output/COutput.cpp',
                                        'output/CMeshOutput.cpp',
                                        'output/output_structure_legacy.cpp',
-                                       'output/output_csv.cpp',
-				       'output/output_cgns.cpp',
-				       'output/output_tecplot.cpp',
-				       'output/output_fieldview.cpp',
-				       'output/output_su2.cpp',
-				       'output/output_paraview.cpp',
 				       'variable_structure.cpp',
 				       'output/filewriter/CParallelDataSorter.cpp',
 				       'output/filewriter/CFVMDataSorter.cpp',

From 413b35c3c63e314dc45019b455779647bfaf4147 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 09:00:57 +0200
Subject: [PATCH 284/539] Adapted makefiles

---
 SU2_CFD/obj/Makefile.am |  9 ++-------
 SU2_DEF/obj/Makefile.am | 24 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index a2e0d65308a1..0225620bcc1e 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -135,16 +135,11 @@ libSU2Core_sources = \
   ../src/output/filewriter/CSurfaceFVMDataSorter.cpp \
   ../src/output/filewriter/CSU2BinaryFileWriter.cpp \
   ../src/output/filewriter/CSU2FileWriter.cpp \
+  ../src/output/filewriter/CSU2MeshFileWriter.cpp \
   ../src/output/filewriter/CTecplotFileWriter.cpp \
-  ../src/output/filewriter/CTecplotFileWriter.cpp \
-  ../src/output/output_cgns.cpp \
+  ../src/output/filewriter/CTecplotBinaryFileWriter.cpp \
   ../src/output/COutput.cpp \
   ../src/output/output_physics.cpp \
-  ../src/output/output_tecplot.cpp \
-  ../src/output/output_fieldview.cpp \
-  ../src/output/output_su2.cpp \
-  ../src/output/output_paraview.cpp \
-  ../src/output/output_csv.cpp \
   ../src/output/CMeshOutput.cpp \
   ../src/output/CElasticityOutput.cpp \
   ../src/output/CFlowOutput.cpp \
diff --git a/SU2_DEF/obj/Makefile.am b/SU2_DEF/obj/Makefile.am
index fd3fb61ba9f0..0789b939b322 100644
--- a/SU2_DEF/obj/Makefile.am
+++ b/SU2_DEF/obj/Makefile.am
@@ -49,14 +49,22 @@ ___bin_SU2_DEF_SOURCES = \
 
 ___bin_SU2_DEF_CXXFLAGS =
 ___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_structure.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_cgns.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_tecplot.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_mesh.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_csv.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_fieldview.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_su2.o \
-  ../../SU2_CFD/src/output/libSU2Core_a-output_paraview.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-COutput.o \
+  ../../SU2_CFD/src/output/libSU2Core_a-CMeshOutput.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CCSVFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CFEMDataSorter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CFVMDataSorter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CParallelDataSorter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CParallelFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CParaviewFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CParaviewBinaryFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CSU2FileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CSU2BinaryFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CSU2MeshFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CSurfaceFEMDataSorter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CSurfaceFVMDataSorter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CTecplotFileWriter.o \
+  ../../SU2_CFD/src/output/filewriter/libSU2Core_a-CTecplotBinaryFileWriter.o \
   ../../SU2_CFD/src/output/libSU2Core_a-output_structure_legacy.o \
   ../../SU2_CFD/src/libSU2Core_a-solver_structure.o \
   ../../SU2_CFD/src/libSU2Core_a-variable_structure.o

From 90cecf56a582adc4040a1d41ceb9037b244f505b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 10:47:59 +0200
Subject: [PATCH 285/539] Changed travis file to use meson

---
 .travis.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b974c79b1279..6cda8c789fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,13 @@ compiler:
 notifications:
     email:
         recipients:
-            - su2code-dev@lists.stanford.edu
+            - tim.albring@scicomp.uni-kl.de
   
 branches:
     only:
-        - develop
+        - meson_build
 
 python:
-    - 2.7
     - 3.6
 
 env:
@@ -27,19 +26,19 @@ env:
         CXXFLAGS="-O3 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="./preconfigure.py --prefix=$TRAVIS_BUILD_DIR --enable-PY_WRAPPER --disable-tecio"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="./preconfigure.py --enable-mpi --with-cc=mpicc --with-cxx=mpicxx --prefix=$TRAVIS_BUILD_DIR --enable-PY_WRAPPER --disable-tecio"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="./preconfigure.py --with-cc=gcc --with-cxx=g++ --prefix=$TRAVIS_BUILD_DIR --enable-autodiff --enable-direct-diff --disable-tecio"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="./preconfigure.py --enable-mpi --with-cc=mpicc --with-cxx=mpicxx --prefix=$TRAVIS_BUILD_DIR --enable-autodiff --enable-direct-diff --disable-tecio"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -65,14 +64,16 @@ before_install:
     - test -n $CXX && unset CXX
 
 install:
+    - export NINJA_LATEST=$(curl -s https://api.github.com/repos/ninja-build/ninja/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep ninja-linux.zip)
+    - wget "$NINJA_LATEST"
+    - unzip -q ninja-linux.zip -d build
+    - export PATH="$PWD/build:$PATH"
+    - pip install meson
     # Configure, make, and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
-    - ./bootstrap
-    - autoreconf -f -i
     - $CONFIGURE_COMMAND
-    - make -j 4
-    - make install
+    - ninja -C build install
 
     # Add environmental variables according to the configure step
     - export SU2_RUN=$TRAVIS_BUILD_DIR/bin

From 6ed37bc34793c22940041343b745e54849ddfbf0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 10:48:59 +0200
Subject: [PATCH 286/539] Small fix to tecio meson file

---
 externals/tecio/teciosrc/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/externals/tecio/teciosrc/meson.build b/externals/tecio/teciosrc/meson.build
index 89c63fc6b1ab..887dad54a90f 100644
--- a/externals/tecio/teciosrc/meson.build
+++ b/externals/tecio/teciosrc/meson.build
@@ -1,11 +1,11 @@
 tecio_cpp_flags = ['-fpermissive', '-DUSEENUM', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS']
 
 if (build_machine.system() == 'darwin')
-  tec_cxx_flags += ['-DDARWIN', '-DMAC64']
+  tecio_cpp_flags += ['-DDARWIN', '-DMAC64']
 endif
 
 if (build_machine.system() == 'linux')
-  tec_cxx_flags += ['-DLINUX', '-DLINUX64']
+  tecio_cpp_flags += ['-DLINUX', '-DLINUX64']
 endif
 
 

From 7de26d113d9f036fed579c8d606297005ded774f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 11:04:46 +0200
Subject: [PATCH 287/539] Changed travis to use ninja meson submodules

---
 .travis.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6cda8c789fd3..9eaff210fcf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,19 +26,19 @@ env:
         CXXFLAGS="-O3 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
+        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -64,16 +64,15 @@ before_install:
     - test -n $CXX && unset CXX
 
 install:
-    - export NINJA_LATEST=$(curl -s https://api.github.com/repos/ninja-build/ninja/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep ninja-linux.zip)
-    - wget "$NINJA_LATEST"
-    - unzip -q ninja-linux.zip -d build
-    - export PATH="$PWD/build:$PATH"
-    - pip install meson
+    - cd externals/ninja
+    - python configure.py --bootstrap
+    - cd $TRAVIS_BUILD_DIR
+    
     # Configure, make, and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
-    - ninja -C build install
+    - externals/ninja/ninja -C build install
 
     # Add environmental variables according to the configure step
     - export SU2_RUN=$TRAVIS_BUILD_DIR/bin

From 2c3c1ac1a74494244e4b0605998d5a85fcf345eb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 11:12:57 +0200
Subject: [PATCH 288/539] Small fix to travis

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9eaff210fcf5..e1098be57cd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,7 +67,8 @@ install:
     - cd externals/ninja
     - python configure.py --bootstrap
     - cd $TRAVIS_BUILD_DIR
-    
+    - export PATH=externals/ninja:$PATH
+
     # Configure, make, and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND

From 02f4296966e6c7be889ff6a21269197b77681693 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 11:28:27 +0200
Subject: [PATCH 289/539] Some changes to tecio build

---
 externals/tecio/meson.build             | 10 ++++++++++
 externals/tecio/teciompisrc/meson.build |  2 +-
 meson.build                             | 15 +++------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/externals/tecio/meson.build b/externals/tecio/meson.build
index 019f4ec317a3..a0a4f10504c3 100644
--- a/externals/tecio/meson.build
+++ b/externals/tecio/meson.build
@@ -6,3 +6,13 @@ else
   message('Boost sources found.')
 endif
 
+if get_option('enable-mpi')
+  subdir('teciompisrc')
+  su2_deps += teciompi_dep
+  su2_cpp_args += ['-DHAVE_TECIO', '-DTECIOMPI']
+else
+  subdir('teciosrc')
+  pthread_dep = dependency('threads')
+  su2_deps += [tecio_dep, pthread_dep]
+  su2_cpp_args += '-DHAVE_TECIO'
+endif
diff --git a/externals/tecio/teciompisrc/meson.build b/externals/tecio/teciompisrc/meson.build
index ab51bf8da0f4..e8edfaa57982 100644
--- a/externals/tecio/teciompisrc/meson.build
+++ b/externals/tecio/teciompisrc/meson.build
@@ -1,4 +1,4 @@
-tec_cxx_flags = ['-DUSEENUM','-DTECIOMPI', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS', '-DTP_PROJECT_USES_BOOST', '-DBOOST_ALL_NO_LIB']
+tec_cxx_flags = ['-fpermissive', '-DUSEENUM','-DTECIOMPI', '-DTHREED', '-DMAKEARCHIVE', '-DNO_ASSERTS', '-DNO_THIRD_PARTY_LIBS', '-DTP_PROJECT_USES_BOOST', '-DBOOST_ALL_NO_LIB']
 
 if (build_machine.system() == 'darwin')
   tec_cxx_flags += ['-DDARWIN', '-DMAC64']
diff --git a/meson.build b/meson.build
index e566d32347c0..a5dc510d6ec1 100644
--- a/meson.build
+++ b/meson.build
@@ -47,24 +47,15 @@ if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
   # add parmetis dependency
   su2_deps     += parmetis_dep
   su2_cpp_args += '-DHAVE_PARMETIS' 
-  if get_option('enable-tecio')
-    subdir('externals/tecio/teciompisrc')
-    su2_deps += teciompi_dep
-    su2_cpp_args += ['-DHAVE_TECIO', '-DTECIOMPI']
-  endif
   
   # add medi dependency
   if get_option('enable-autodiff')
     codi_dep += declare_dependency(include_directories: ['externals/medi/include', 'externals/medi/src'])
   endif
+endif
 
-else
-  if get_option('enable-tecio')
-    subdir('externals/tecio/teciosrc')
-    pthread_dep = dependency('threads')
-    su2_deps += [tecio_dep, pthread_dep]
-    su2_cpp_args += '-DHAVE_TECIO'
-  endif
+if get_option('enable-tecio')
+  subdir('externals/tecio')
 endif
 
 # compile common library

From eb39ecce0f9a633c03e6f1aee84cbff7e6271cdf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 13:35:41 +0200
Subject: [PATCH 290/539] Small fix

---
 meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meson.build b/meson.build
index a5dc510d6ec1..9b5f288ad3e4 100644
--- a/meson.build
+++ b/meson.build
@@ -42,8 +42,6 @@ if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
   # compile parmetis
   subdir('externals/parmetis')
  
-  subdir('externals/tecio')
-
   # add parmetis dependency
   su2_deps     += parmetis_dep
   su2_cpp_args += '-DHAVE_PARMETIS' 

From 950df2fe9d2ccd81c4507eecdbcd021551f2cdc8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 13:40:47 +0200
Subject: [PATCH 291/539] Some updates to travis

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1098be57cd4..2d7e02852724 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 # Continous Integration setup for SU2.
 # Tests on the develop branch in both serial and parallel.
 
-dist: trusty
+dist: xenial
 sudo: required
 
 language: python
@@ -23,7 +23,7 @@ python:
 
 env:
     global:
-        CXXFLAGS="-O3 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
+        CXXFLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
         - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
@@ -64,12 +64,13 @@ before_install:
     - test -n $CXX && unset CXX
 
 install:
+    # build ninja
     - cd externals/ninja
     - python configure.py --bootstrap
     - cd $TRAVIS_BUILD_DIR
     - export PATH=externals/ninja:$PATH
 
-    # Configure, make, and install SU2
+    # Compile and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND

From 7c1fe7d6cee660e6796e647bc5e1bd9d5f421505 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 14:20:39 +0200
Subject: [PATCH 292/539] Some updates

---
 .travis.yml | 2 +-
 meson.build | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d7e02852724..06629f3c79f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 # Continous Integration setup for SU2.
 # Tests on the develop branch in both serial and parallel.
 
-dist: xenial
+dist: trusty
 sudo: required
 
 language: python
diff --git a/meson.build b/meson.build
index 9b5f288ad3e4..f1d305df5305 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,10 @@
 project('SU2', 'c', 'cpp', 
         version: '6.2.0', 
 	license: 'LGPL2',
-	default_options: ['buildtype=release', 'warning_level=0'])
+	default_options: ['buildtype=release', 
+                          'warning_level=0', 
+                          'c_std=c11',
+                          'cpp_std=c++11'])
 
 
 pymod = import('python')

From 4fa0cd246ab26435aa823ab95d8577a13686a02b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 14:25:29 +0200
Subject: [PATCH 293/539] Some updates

---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index f1d305df5305..67144720bf00 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,6 @@ project('SU2', 'c', 'cpp',
 	license: 'LGPL2',
 	default_options: ['buildtype=release', 
                           'warning_level=0', 
-                          'c_std=c11',
                           'cpp_std=c++11'])
 
 

From 5117e272c80479c00aed158a96d2b3ccdd0234cf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 14:45:49 +0200
Subject: [PATCH 294/539] Adding caching for travis

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 06629f3c79f6..b072e2f1e3c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,11 @@ sudo: required
 
 language: python
 
+cache: 
+    ccache: true
+    directories:
+        - build
+
 compiler:
     - gcc
 

From 2a1e69dfcfaed972ee81f0e082d1c2ad01946701 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 15:43:26 +0200
Subject: [PATCH 295/539] small debug

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b072e2f1e3c1..76a6519ea098 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,8 @@ install:
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
-    - externals/ninja/ninja -C build install
+    - touch Common/src/config_structure.cpp
+    - externals/ninja/ninja -v -C build install
 
     # Add environmental variables according to the configure step
     - export SU2_RUN=$TRAVIS_BUILD_DIR/bin

From 033469aae83d12ddd2173f80247d279ad8e325b1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:07:31 +0200
Subject: [PATCH 296/539] small debug

---
 .travis.yml | 5 +++--
 meson.build | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76a6519ea098..137a354037a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,14 +73,15 @@ install:
     - cd externals/ninja
     - python configure.py --bootstrap
     - cd $TRAVIS_BUILD_DIR
-    - export PATH=externals/ninja:$PATH
+    - export PATH=$TRAVIS_BUILD_DIR/externals/ninja:$PATH
 
     # Compile and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
     - touch Common/src/config_structure.cpp
-    - externals/ninja/ninja -v -C build install
+    - echo $PATCH
+    - ninja -v -C build install
 
     # Add environmental variables according to the configure step
     - export SU2_RUN=$TRAVIS_BUILD_DIR/bin
diff --git a/meson.build b/meson.build
index 67144720bf00..6015ab44f149 100644
--- a/meson.build
+++ b/meson.build
@@ -78,9 +78,3 @@ subdir('SU2_PY')
 if get_option('enable-pywrapper')
   subdir('SU2_PY/pySU2')
 endif
-
-ninja = find_program('ninja', required : false)
-if ninja.found() == false
-  message('Bootstrapping Ninja ...')
-  run_config = run_command('externals/ninja/configure.py','--bootstrap')
-endif

From ff1678653894ecd8c1c1dad26ba69bdbf67830a6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:21:00 +0200
Subject: [PATCH 297/539] small debug

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 137a354037a4..4e412b9f8944 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
 dist: trusty
 sudo: required
 
-language: python
+language: c
 
 cache: 
     ccache: true
@@ -80,7 +80,7 @@ install:
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
     - touch Common/src/config_structure.cpp
-    - echo $PATCH
+    - echo $PATH
     - ninja -v -C build install
 
     # Add environmental variables according to the configure step

From b523ca46433de88b595f8fb2beeba8e462d85371 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:42:42 +0200
Subject: [PATCH 298/539] small debug

---
 .travis.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e412b9f8944..57af1c47a3ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,14 @@
 dist: trusty
 sudo: required
 
-language: c
+language: cpp
 
 cache: 
     ccache: true
+    pip: true
     directories:
         - build
+        - miniconda
 
 compiler:
     - gcc
@@ -54,15 +56,11 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -qq build-essential libopenmpi-dev
  
-    # Install Python dependencies
-    # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
-    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-    - bash miniconda.sh -b -p $HOME/miniconda
-    - export PATH="$HOME/miniconda/bin:$PATH"
-    - hash -r
-    - conda config --set always_yes yes --set changeps1 no
-    - conda update -q conda
-    - conda install -q python=$TRAVIS_PYTHON_VERSION numpy scipy mpi4py swig
+
+    - pip install --upgrade pip
+    - pip install numpy
+    - pip install mpi4py
+    - pip install swig
 
     # to avoid interference with MPI
     - test -n $CC  && unset CC

From 42c3b6d4bae9e3c59cbc739a0131bd9a673c4a69 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:48:06 +0200
Subject: [PATCH 299/539] small debug

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 57af1c47a3ef..4f35aac07df5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,13 @@
 dist: trusty
 sudo: required
 
-language: cpp
+language: python
 
 cache: 
     ccache: true
     pip: true
     directories:
         - build
-        - miniconda
 
 compiler:
     - gcc

From a1a2ff4ed784cdbb9020e38e9347ed8446f5fcfc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:52:59 +0200
Subject: [PATCH 300/539] small debug

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4f35aac07df5..34af4605c77d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ before_install:
 
     # Install the necessary packages using apt-get with sudo
     - sudo apt-get update -qq
-    - sudo apt-get install -qq build-essential libopenmpi-dev
+    - sudo apt-get install -qq build-essential libopenmpi-dev swig
  
 
     - pip install --upgrade pip

From ce731a79b81d5cc78a3f211fb9ca8cec6f383c93 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 16:56:43 +0200
Subject: [PATCH 301/539] small debug

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 34af4605c77d..7755f4c41206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,6 @@ before_install:
     - pip install --upgrade pip
     - pip install numpy
     - pip install mpi4py
-    - pip install swig
 
     # to avoid interference with MPI
     - test -n $CC  && unset CC

From aac1094c154a36277390ba7c5d71cdd0d6ff7c49 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:09:59 +0200
Subject: [PATCH 302/539] small debug

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7755f4c41206..5cbb4a0166be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,19 +32,19 @@ env:
         CXXFLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="externals/meson/meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -59,6 +59,7 @@ before_install:
     - pip install --upgrade pip
     - pip install numpy
     - pip install mpi4py
+    - pip install meson
 
     # to avoid interference with MPI
     - test -n $CC  && unset CC

From 40745d5adde82e94228bb0be82a07e22f5e51c71 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:13:39 +0200
Subject: [PATCH 303/539] small debug

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5cbb4a0166be..9613cd24035f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,19 +32,19 @@ env:
         CXXFLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:

From 960613214e70b870492f303b1464cffd1627ecda Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:21:40 +0200
Subject: [PATCH 304/539] small debug

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9613cd24035f..50514d87e232 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,12 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -qq build-essential libopenmpi-dev swig
  
+    # Install Python dependencies
+    # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
+    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    - bash miniconda.sh -b -p $HOME/miniconda
+    - export PATH="$HOME/miniconda/bin:$PATH"
+    - conda install -q python=$TRAVIS_PYTHON_VERSION
 
     - pip install --upgrade pip
     - pip install numpy

From ba10cb54e3751d5f30501a6460832cf0cdc5480f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:24:48 +0200
Subject: [PATCH 305/539] small debug

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 50514d87e232..e58947dea590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ before_install:
     - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
-    - conda install -q python=$TRAVIS_PYTHON_VERSION
+    - conda install --yes -q python=$TRAVIS_PYTHON_VERSION
 
     - pip install --upgrade pip
     - pip install numpy

From 14d0132e7bbfe62edb1abecb8692ac9217ff014a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:47:15 +0200
Subject: [PATCH 306/539] small debug

---
 .travis.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e58947dea590..8a5fff528ac9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,11 @@ sudo: required
 language: python
 
 cache: 
-    ccache: true
     pip: true
     directories:
-        - build
+        - $HOME/build
+        - $HOME/.ccache
+        - $HOME/miniconda
 
 compiler:
     - gcc
@@ -33,19 +34,23 @@ env:
     matrix:
         # Serial build and test
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
-          TEST_SCRIPT=serial_regression.py
+          #TEST_SCRIPT=serial_regression.py
+	  TEST_SCRIPT="echo script"
 
         # Parallel build and test
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
-          TEST_SCRIPT=parallel_regression.py
+          #TEST_SCRIPT=parallel_regression.py
+	  TEST_SCRIPT="echo script"
 
         # Serial build and test for AD
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
-          TEST_SCRIPT=serial_regression_AD.py
+          #TEST_SCRIPT=serial_regression_AD.py
+	  TEST_SCRIPT="echo script"
 
         # Parallel build and test for AD:
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
-          TEST_SCRIPT=parallel_regression_AD.py
+          #TEST_SCRIPT=parallel_regression_AD.py
+	  TEST_SCRIPT="echo script"
 
 before_install:
     # Temporarily fixes Travis CI issue with paths for Python packages
@@ -57,8 +62,8 @@ before_install:
  
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
-    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-    - bash miniconda.sh -b -p $HOME/miniconda
+    - if [ ! -d "$HOME/miniconda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh fi
+    - if [ ! -d "$HOME/miniconda" ]; then bash miniconda.sh -b -p $HOME/miniconda fi
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda install --yes -q python=$TRAVIS_PYTHON_VERSION
 

From 204b8f3073b403f36bab1ba6bc188de2d6ed8a86 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:51:07 +0200
Subject: [PATCH 307/539] small debug

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a5fff528ac9..f36f5f601a26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,8 +62,8 @@ before_install:
  
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
-    - if [ ! -d "$HOME/miniconda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh fi
-    - if [ ! -d "$HOME/miniconda" ]; then bash miniconda.sh -b -p $HOME/miniconda fi
+    - if [ ! -d "$HOME/miniconda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
+    - if [ ! -d "$HOME/miniconda" ]; then bash miniconda.sh -b -p $HOME/miniconda; fi
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda install --yes -q python=$TRAVIS_PYTHON_VERSION
 

From 79fc9455594066f78709bae52bf57e75b8797f91 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 17:54:20 +0200
Subject: [PATCH 308/539] small debug

---
 .travis.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f36f5f601a26..b9a9d5398d3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,23 +34,19 @@ env:
     matrix:
         # Serial build and test
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
-          #TEST_SCRIPT=serial_regression.py
-	  TEST_SCRIPT="echo script"
+          TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
-          #TEST_SCRIPT=parallel_regression.py
-	  TEST_SCRIPT="echo script"
+          TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
-          #TEST_SCRIPT=serial_regression_AD.py
-	  TEST_SCRIPT="echo script"
+          TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
         - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
-          #TEST_SCRIPT=parallel_regression_AD.py
-	  TEST_SCRIPT="echo script"
+          TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
     # Temporarily fixes Travis CI issue with paths for Python packages
@@ -110,4 +106,5 @@ before_script:
 
 script: 
     # Run the tests via the Python scripts
-    - python $TEST_SCRIPT
+    #- python $TEST_SCRIPT
+    - echo "Test"

From 1368c536a837b075567bd67cbcfeb8392ff32910 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 18:16:28 +0200
Subject: [PATCH 309/539] small debug

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9a9d5398d3e..e154480335c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,8 +58,8 @@ before_install:
  
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
-    - if [ ! -d "$HOME/miniconda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
-    - if [ ! -d "$HOME/miniconda" ]; then bash miniconda.sh -b -p $HOME/miniconda; fi
+    - if [ ! -f "$HOME/miniconda/bin/conda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
+    - if [ ! -f "$HOME/miniconda/bin/conda" ]; then bash miniconda.sh -b -p $HOME/miniconda; fi
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda install --yes -q python=$TRAVIS_PYTHON_VERSION
 

From 0371d5535b5c0a59404f765b571434a0a84f6347 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 3 Jun 2019 19:14:23 +0200
Subject: [PATCH 310/539] small debug

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e154480335c4..00822f158cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
     - if [ ! -f "$HOME/miniconda/bin/conda" ]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
-    - if [ ! -f "$HOME/miniconda/bin/conda" ]; then bash miniconda.sh -b -p $HOME/miniconda; fi
+    - if [ ! -f "$HOME/miniconda/bin/conda" ]; then bash miniconda.sh -u -b -p $HOME/miniconda; fi
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda install --yes -q python=$TRAVIS_PYTHON_VERSION
 

From 18e3ac2fae55298cd1571a87ca7e1b6b6cb14b82 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 4 Jun 2019 08:39:32 +0200
Subject: [PATCH 311/539] another try

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 00822f158cbc..0df729ae90af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ cache:
     directories:
         - $HOME/build
         - $HOME/.ccache
-        - $HOME/miniconda
 
 compiler:
     - gcc

From d48b7f9e74279e0e177d985f11ec4314394a46ac Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 19 Jun 2019 16:22:46 +0200
Subject: [PATCH 312/539] Removed cpp files from meson build

---
 SU2_DOT/src/meson.build | 11 +++++------
 SU2_SOL/src/meson.build |  6 ------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
index c2f00086e41f..e51d0d4aca72 100644
--- a/SU2_DOT/src/meson.build
+++ b/SU2_DOT/src/meson.build
@@ -2,13 +2,12 @@ su2_dot_src = ['SU2_DOT.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output/COutput.cpp',
 				       'output/CBaselineOutput.cpp',
-				       'output/output_csv.cpp',
+				       'output/filewriter/CCSVFileWriter.cpp',
 				       'output/output_structure_legacy.cpp',
-				       'output/output_cgns.cpp',
-				       'output/output_tecplot.cpp',
-				       'output/output_fieldview.cpp',
-				       'output/output_su2.cpp',
-				       'output/output_paraview.cpp',
+				       'output/filewriter/CTecplotFileWriter.cpp',
+				       'output/filewriter/CTecplotBinaryFileWriter.cpp',
+				       'output/filewriter/CSU2FileWriter.cpp',
+				       'output/filewriter/CSU2BinaryFileWriter.cpp',
 				       'variable_structure.cpp'])
 
 
diff --git a/SU2_SOL/src/meson.build b/SU2_SOL/src/meson.build
index fb70f8110690..e2b269860a00 100644
--- a/SU2_SOL/src/meson.build
+++ b/SU2_SOL/src/meson.build
@@ -3,12 +3,6 @@ su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output/COutput.cpp',
                                        'output/output_structure_legacy.cpp',
 				       'output/CBaselineOutput.cpp',
-				       'output/output_csv.cpp',
-				       'output/output_cgns.cpp',
-				       'output/output_tecplot.cpp',
-				       'output/output_fieldview.cpp',
-				       'output/output_su2.cpp',
-				       'output/output_paraview.cpp',
 				       'variable_structure.cpp'])
 
 

From 6ad4cb41275169275ab4d463422407f8d1f973b6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 26 Jun 2019 15:55:10 +0200
Subject: [PATCH 313/539] Removed redundant history output

---
 SU2_CFD/src/output/CAdjElasticityOutput.cpp | 7 -------
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp   | 4 ----
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp    | 6 +-----
 SU2_CFD/src/output/CAdjHeatOutput.cpp       | 6 +-----
 SU2_CFD/src/output/CElasticityOutput.cpp    | 7 -------
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp   | 4 ----
 SU2_CFD/src/output/CFlowIncOutput.cpp       | 4 ----
 SU2_CFD/src/output/CHeatOutput.cpp          | 6 ------
 8 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 0f2e5effc18d..6fc43b97e5e7 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -120,13 +120,6 @@ void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
 
 inline void CAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
-  SetHistoryOutputValue("INT_ITER", config->GetIntIter());
-  SetHistoryOutputValue("EXT_ITER", config->GetExtIter());
-
-  SetHistoryOutputValue("TIME_ITER",  config->GetTimeIter());
-  SetHistoryOutputValue("OUTER_ITER", config->GetOuterIter());
-  SetHistoryOutputValue("INNER_ITER", config->GetInnerIter());
-    
   SetHistoryOutputValue("ADJOINT_DISP_X", log10(solver[ADJFEA_SOL]->GetRes_RMS(0)));
   SetHistoryOutputValue("ADJOINT_DISP_Y", log10(solver[ADJFEA_SOL]->GetRes_RMS(1)));
   if (nVar_FEM == 3){
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index b074ed05ffe8..5114300e9fba 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -214,10 +214,6 @@ void CAdjFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
   CSolver* adjflow_solver = solver[ADJFLOW_SOL];
   CSolver* adjturb_solver = solver[ADJTURB_SOL];  
 
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
-
   SetHistoryOutputValue("RMS_ADJ_DENSITY", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_RMS(2)));
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 885b8662f172..ae7d3835260e 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -221,11 +221,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   CSolver* adjflow_solver = solver[ADJFLOW_SOL];
   CSolver* adjturb_solver = solver[ADJTURB_SOL];  
   CSolver* adjheat_solver = solver[ADJHEAT_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
-  
+
   SetHistoryOutputValue("RMS_ADJ_PRESSURE", log10(adjflow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_ADJ_VELOCITY-Y", log10(adjflow_solver->GetRes_RMS(2)));
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 39e820367ce0..acc63cabcade 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -121,11 +121,7 @@ void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
 void CAdjHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) { 
   
   CSolver* adjheat_solver = solver[ADJHEAT_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER", config->GetTimeIter());  
-  SetHistoryOutputValue("INNER_ITER", config->GetInnerIter());
-  SetHistoryOutputValue("OUTER_ITER", config->GetOuterIter()); 
-  
+
   SetHistoryOutputValue("RMS_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_RMS(0)));
  
   SetHistoryOutputValue("MAX_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_Max(0)));
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index ec03e8c4e687..aa3770fe15d5 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -151,13 +151,6 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
-  // Iteration numbers
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
-
-  // Misc.
-  AddHistoryOutput("PHYS_TIME",   "Time(min)", FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
   // Residuals
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 05ba90a7fba5..689f1cd3776d 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -298,10 +298,6 @@ void CFlowCompFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
   
   CSolver* flow_solver = solver[FLOW_SOL];
   
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
-
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_MOMENTUM-Y", log10(flow_solver->GetRes_RMS(2)));
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index d6783d5b8bec..07d27ae3ea7a 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -240,10 +240,6 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   CSolver* turb_solver = solver[TURB_SOL];  
   CSolver* heat_solver = solver[HEAT_SOL];
   
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
-
   SetHistoryOutputValue("RMS_PRESSURE", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
   SetHistoryOutputValue("RMS_VELOCITY-Y", log10(flow_solver->GetRes_RMS(2)));
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 640e39f507bf..97492df01d34 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -112,14 +112,8 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
 
 void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("TIME_ITER",   "Time_Iter",  FORMAT_INTEGER, "ITER");
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER");  
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter",  FORMAT_INTEGER, "ITER");
-  
-  AddHistoryOutput("PHYS_TIME",   "Time(min)",                FORMAT_SCIENTIFIC, "PHYS_TIME");
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
   
-  
   AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
   AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
   AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);

From a5e1111cfa966215715b24957aec7356e710a629 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 27 Jun 2019 10:40:54 +0200
Subject: [PATCH 314/539] Changed filenames for restart

---
 SU2_CFD/src/output/COutput.cpp                         | 8 +++++++-
 SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp | 2 +-
 SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index ebd5cb5ba52b..81035f5294dd 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -531,6 +531,12 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
 
 void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
   
+  string FileName = VolumeFilename;
+  
+  if(format == SU2_RESTART_ASCII || format == SU2_RESTART_BINARY){
+    FileName = RestartFilename;
+  }
+  
   CFileWriter* file_writer = NULL;
 
   /*--- Set the file writer --- */
@@ -539,7 +545,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   
   /*--- Write data to file --- */
   
-  file_writer->Write_Data(config->GetFilename(VolumeFilename, ""), data_sorter);
+  file_writer->Write_Data(config->GetFilename(FileName, ""), data_sorter);
 
   delete file_writer;
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 33e547f705d2..fb96db041af5 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -6,7 +6,7 @@
 CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim) : 
   CFileWriter(fields, nDim){
 
-  file_ext = ".su2s";
+  file_ext = ".dat";
     
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 05779fcf90ca..20c41ac9370a 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -6,7 +6,7 @@
 CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim) : 
   CFileWriter(fields, nDim){
 
-  file_ext = ".su2s";
+  file_ext = ".dat";
     
 }
 

From 60cfa6094167f2b4178917e204510e84943d7fd8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 27 Jun 2019 10:41:02 +0200
Subject: [PATCH 315/539] Fix mesh writer

---
 SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 7430ca1f5df3..0d2e232cc513 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -108,12 +108,12 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
       }
       for (iElem = 0; iElem < data_sorter->GetnElem(PRISM); iElem++) {
         output_file << "13\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 0) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 2) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 3) - 1 << "\t";
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) - 1 << "\t"; 
+        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 5) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }
       

From 164173bd11a56ebe92bd786c758551ccbb3ac45c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 27 Jun 2019 19:32:16 +0200
Subject: [PATCH 316/539] Simplified data sorter routines

---
 .../output/filewriter/CParallelDataSorter.hpp |  11 +-
 .../filewriter/CSurfaceFEMDataSorter.hpp      |   3 +-
 .../filewriter/CSurfaceFVMDataSorter.hpp      |   3 +-
 SU2_CFD/src/output/COutput.cpp                |  31 +-
 .../src/output/filewriter/CFVMDataSorter.cpp  |  59 +--
 .../output/filewriter/CParallelDataSorter.cpp |   2 +
 .../filewriter/CSU2BinaryFileWriter.cpp       |   2 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  14 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      | 407 +++---------------
 TestCases/rans/propeller/propeller.cfg        |   2 -
 10 files changed, 127 insertions(+), 407 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index fe21c3ddfbf3..9406d5c4746a 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -24,8 +24,6 @@ class CParallelDataSorter{
   int *Conn_Hexa_Par;
   int *Conn_Pris_Par;
   int *Conn_Pyra_Par;
-  map<unsigned long,unsigned long> Global2Renumber, 
-                                   Renumber2Global;
   
   unsigned long nGlobalPoint_Sort;
   unsigned long nLocalPoint_Sort;
@@ -133,7 +131,14 @@ class CParallelDataSorter{
    * \input rank - the processor rank.
    * \return The cumulated number of points up to certain processor rank.
    */
-  unsigned long GetnPointCumulative(){return nPoint_Cum[rank];}
+  unsigned long GetnPointCumulative(unsigned short rank){return nPoint_Cum[rank];}
+  
+  /*!
+   * \brief Get the linear number of points
+   * \input rank - the processor rank.
+   * \return The linear number of points up to certain processor rank.
+   */
+  unsigned long GetnPointLinear(unsigned short rank){return nPoint_Lin[rank];}  
   
   /*!
    * \brief Check whether the current connectivity is sorted (i.e. if SortConnectivity has been called)
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
index 8e0a97b3f05f..4298889fbe73 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
@@ -6,6 +6,7 @@
 class CSurfaceFEMDataSorter : public CParallelDataSorter{
   
   CFEMDataSorter* volume_sorter;
+  std::vector<unsigned long> globalSurfaceDOFIDs;
     
 public:
   CSurfaceFEMDataSorter(CConfig *config, unsigned short nFields, CFEMDataSorter* volume_sorter);
@@ -27,7 +28,7 @@ class CSurfaceFEMDataSorter : public CParallelDataSorter{
    */
   void SortConnectivity(CConfig *config, CGeometry *geometry,  bool val_sort);
     
-  unsigned long GetGlobalIndex(unsigned long iPoint) { return Renumber2Global[iPoint]; }
+  unsigned long GetGlobalIndex(unsigned long iPoint) { return globalSurfaceDOFIDs[iPoint]; }
   
 private:
   
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
index 268e82f11b3e..8b9e85bfede5 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
@@ -6,7 +6,8 @@
 class CSurfaceFVMDataSorter : public CParallelDataSorter{
   
   CFVMDataSorter* volume_sorter;
-    
+  map<unsigned long,unsigned long> Renumber2Global;
+  
 public:
   CSurfaceFVMDataSorter(CConfig *config, unsigned short nFields, CFVMDataSorter* volume_sorter);
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 81035f5294dd..9c92be2af374 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1095,11 +1095,38 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     }
     cout << endl;
   }
-
+  
+  unsigned long nPoint = 0;
+  
+  if (fem_output){
+    
+    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+    
+    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+    
+    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+    
+    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+    
+    /*--- Access the solution by looping over the owned volume elements. ---*/
+    
+    for(unsigned long l=0; l<nVolElemOwned; ++l) {
+      
+      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {        
+       
+        nPoint++;
+        
+      }
+    }
+  } else {
+    nPoint = geometry->GetnPoint();
+  }
+  
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
    
-  Local_Data.resize(geometry->GetnPoint(), std::vector<su2double>(GlobalField_Counter, 0.0));
+  Local_Data.resize(nPoint, std::vector<su2double>(GlobalField_Counter, 0.0));
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 81fee1a72970..f787512d0cd0 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -125,41 +125,6 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   nTotalPoint = nLocalPoint_Sort;
 #endif
   
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
   /*--- We start with the grid nodes distributed across all procs with
    no particular ordering assumed. We need to loop through our local partition
    and decide how many nodes we must send to each other rank in order to
@@ -190,13 +155,13 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/nPoint_Lin[0];
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      if (Global_Index >= nPoint_Cum[iProcessor])
+        while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
       
       /*--- If we have not visited this node yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -274,13 +239,13 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
       
       /*--- Search for the processor that owns this point. ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/nPoint_Lin[0];
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear[iProcessor])
-        while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
+      if (Global_Index >= nPoint_Cum[iProcessor])
+        while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+        while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
       
       /*--- Load node coordinates into the buffer for sending. ---*/
       
@@ -299,7 +264,7 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
          points once they all reach the correct processor. ---*/
         
         nn = idIndex[iProcessor];
-        idSend[nn] = Global_Index - starting_node[iProcessor];
+        idSend[nn] = Global_Index - beg_node[iProcessor];
         
         /*--- Increment the index by the message length ---*/
         
@@ -463,12 +428,6 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   delete [] nPoint_Recv;
   delete [] nPoint_Send;
   delete [] nPoint_Flag;
-
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
-  
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index e2ef432e8ebe..13161643ec1a 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -25,6 +25,8 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   Conn_Pyra_Par = NULL;
   
   Parallel_Data = NULL;
+  
+  nLocalPoint_Sort = 0;
 }
 
 CParallelDataSorter::~CParallelDataSorter(){
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index fb96db041af5..39b7dce30a66 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -202,7 +202,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
    in cumulative storage format. ---*/
 
   disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-          GlobalField_Counter*data_sorter->GetnPointCumulative()*sizeof(passivedouble));
+          GlobalField_Counter*data_sorter->GetnPointCumulative(rank)*sizeof(passivedouble));
 
   /*--- Set the view for the MPI file write, i.e., describe the location in
    the file that this rank "sees" for writing its piece of the restart file. ---*/
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index e5bdc4db4df4..033d8c5a64c8 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -30,7 +30,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   /* Loop over the surface connectivities and store global
      DOF ID's in a vector. Subtract 1, because the stored
      connectivities are 1 based. */
-  std::vector<unsigned long> globalSurfaceDOFIDs;
+  globalSurfaceDOFIDs.clear();
   globalSurfaceDOFIDs.reserve(nParallel_Line*N_POINTS_LINE +
                               nParallel_Tria*N_POINTS_TRIANGLE +
                               nParallel_Quad*N_POINTS_QUADRILATERAL);
@@ -71,13 +71,13 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
 
     /* Search for the processor that owns this point. */
-    unsigned long iProcessor = globalSurfaceDOFIDs[i]/nPoint_Lin[0];
+    unsigned long iProcessor = globalSurfaceDOFIDs[i]/volume_sorter->GetnPointLinear(0);
     if (iProcessor >= (unsigned long)size)
       iProcessor = (unsigned long)size-1;
-    if (globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor])
-      while(globalSurfaceDOFIDs[i] >= nPoint_Cum[iProcessor+1]) ++iProcessor;
+    if (globalSurfaceDOFIDs[i] >= volume_sorter->GetnPointCumulative(iProcessor))
+      while(globalSurfaceDOFIDs[i] >= volume_sorter->GetnPointCumulative(iProcessor+1)) ++iProcessor;
     else
-      while(globalSurfaceDOFIDs[i] <  nPoint_Cum[iProcessor])   --iProcessor;
+      while(globalSurfaceDOFIDs[i] <  volume_sorter->GetnPointCumulative(iProcessor))   --iProcessor;
 
     /* Store the global ID in the send buffer for iProcessor. */
     sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
@@ -172,7 +172,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   /* Determine the local index of the global surface DOFs and
      copy the data into Parallel_Surf_Data. */
   for(unsigned long i=0; i<nParallel_Poin; ++i) {
-    const unsigned long ii = globalSurfaceDOFIDs[i] - nPoint_Cum[rank];
+    const unsigned long ii = globalSurfaceDOFIDs[i] - volume_sorter->GetnPointCumulative(rank);
 
     for(int jj=0; jj<VARS_PER_POINT; jj++)
       Parallel_Data[jj][i] = volume_sorter->GetData(jj,ii);
@@ -209,6 +209,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   map<unsigned long, unsigned long> mapGlobalVol2Surf;
   for(unsigned long i=0; i<nParallel_Poin; ++i)
     mapGlobalVol2Surf[globalSurfaceDOFIDs[i]] = offsetSurfaceDOFs + i;
+   
 
   /* Fill the receive buffers with the modified global surface DOF numbers,
      such that this information can be returned to the original ranks. */
@@ -295,6 +296,7 @@ void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometr
     SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
     
+    connectivity_sorted = true;
 
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 514de0db87be..d738de742ddc 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -5,7 +5,12 @@ CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, unsigned short nFi
   this->volume_sorter = volume_sorter;
   
   connectivity_sorted = false;
-  
+
+  beg_node = new unsigned long[size];
+  end_node = new unsigned long[size];
+
+  nPoint_Lin = new unsigned long[size];
+  nPoint_Cum = new unsigned long[size+1];
 }
 
 CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){}
@@ -16,17 +21,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
   }
   
-  unsigned short iMarker;
   unsigned long iProcessor;
-  unsigned long iPoint, jPoint, kPoint, iElem;
-  unsigned long Global_Index, nLocalPoint, nTotalPoint, iVertex;
+  unsigned long iPoint, iElem;
+  unsigned long Global_Index;
   
   int VARS_PER_POINT = GlobalField_Counter;
   int *Local_Halo = NULL;
   int iNode, count;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
 
 #ifdef HAVE_MPI
   SU2_MPI::Request *send_req, *recv_req;
@@ -34,92 +35,6 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   int ind;
 #endif
   
-  /*--------------------------------------------------------------------------*/
-  /*--- Step 1: We already have the surface connectivity spread out in     ---*/
-  /*---         linear partitions across all procs and the output data     ---*/
-  /*---         for the entire field is similarly linearly partitioned.    ---*/
-  /*---         We need to identify which nodes in the volume data are     ---*/
-  /*---         also surface points. Our first step is to loop over all    ---*/
-  /*---         of the sorted surface connectivity and create a data       ---*/
-  /*---         structure on each proc that can identify the local surf    ---*/
-  /*---         points. Note that the linear partitioning is slightly      ---*/
-  /*---         different between the nodes and elements, so we will       ---*/
-  /*---         have to move between the two systems in this routine.      ---*/
-  /*--------------------------------------------------------------------------*/
-  
-  /*--- Search all send/recv boundaries on this partition for any periodic
-   nodes that were part of the original domain. We want to recover these
-   for visualization purposes. This is the linear partitioning for nodes. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      
-      /*--- Checking for less than or equal to the rank, because there may
-       be some periodic halo nodes that send info to the same rank. ---*/
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo[iPoint] = false;
-      }
-    }
-  }
-  
-  /*--- Sum total number of nodes that belong to the domain ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  
-  unsigned long *nPoint_Linear_Nodes = new unsigned long[size+1];
-  unsigned long *nPoint_Linear_Elems = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Nodes[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Nodes[ii] = nPoint_Linear_Nodes[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear_Nodes[size] = nTotalPoint;
   
   /*--- Prepare to check and communicate the nodes that each proc has
    locally from the surface connectivity. ---*/
@@ -148,13 +63,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
       
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -182,14 +97,14 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
       
@@ -216,13 +131,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
       
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -286,14 +201,14 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+
       /*--- Load global ID into the buffer for sending ---*/
       
       if (nElem_Flag[iProcessor] != iNode) {
@@ -326,14 +241,14 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+
       /*--- Load global ID into the buffer for sending ---*/
       
       if (nElem_Flag[iProcessor] != iNode) {
@@ -366,14 +281,14 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-        while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+
       /*--- Load global ID into the buffer for sending ---*/
       
       if (nElem_Flag[iProcessor] != iNode) {
@@ -484,7 +399,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) surfPoint[iPoint] = -1;
   
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    surfPoint[(int)idRecv[ii]- starting_node[rank]] = (int)idRecv[ii];
+    surfPoint[(int)idRecv[ii]- volume_sorter->GetNodeBegin(rank)] = (int)idRecv[ii];
   }
   
   /*--- First, add up the number of surface points I have on my rank. ---*/
@@ -583,184 +498,6 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   /*---         on the node with the smallest global ID.                   ---*/
   /*--------------------------------------------------------------------------*/
   
-  /*--- First, we perform the linear partitioning again as it is done
-   for elements, which is slightly different than for nodes (above). ---*/
-  
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear_Elems[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear_Elems[ii] = nPoint_Linear_Elems[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear_Elems[size] = nTotalPoint;
-  
   /*--- Reset our flags and counters ---*/
   
   for (int ii=0; ii < size; ii++) {
@@ -779,13 +516,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/npoint_procs[0];
+    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
     if (iProcessor >= (unsigned long)size)
       iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
     else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
     
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -855,14 +592,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/npoint_procs[0];
+    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
     if (iProcessor >= (unsigned long)size)
       iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-      while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
     else
-      while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-    
+      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
     
     if (nElem_Flag[iProcessor] != ii) {
       
@@ -1028,14 +764,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
       if ((iProcessor != (unsigned long)rank)) {
@@ -1055,14 +790,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
-      
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
       if ((iProcessor != (unsigned long)rank)) {
@@ -1082,13 +816,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/npoint_procs[0];
+      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
       if (iProcessor >= (unsigned long)size)
         iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Linear_Elems[iProcessor])
-        while(Global_Index >= nPoint_Linear_Elems[iProcessor+1]) iProcessor++;
+      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
       else
-        while(Global_Index <  nPoint_Linear_Elems[iProcessor])   iProcessor--;
+        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
       
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
@@ -1122,14 +856,13 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     Global_Index = outliers[ii];
     
     /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = Global_Index/npoint_procs[0];
+    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
     if (iProcessor >= (unsigned long)size)
       iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
     else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
+      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
     
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -1185,14 +918,14 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/npoint_procs[0];
+    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
     if (iProcessor >= (unsigned long)size)
       iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Linear_Nodes[iProcessor])
-      while(Global_Index >= nPoint_Linear_Nodes[iProcessor+1]) iProcessor++;
+    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
+      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
     else
-      while(Global_Index <  nPoint_Linear_Nodes[iProcessor])   iProcessor--;
-    
+      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
     
@@ -1412,14 +1145,6 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   delete [] nElem_Send;
   delete [] nElem_Flag;
   delete [] Local_Halo;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear_Elems;
-  delete [] nPoint_Linear_Nodes;
   delete [] nPoint_Send;
   delete [] nPoint_Recv;
   
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 97ca0eb06c9b..40dd81817020 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -297,8 +297,6 @@ WRT_SHARPEDGES= NO
 % Minimize the required output memory
 LOW_MEMORY_OUTPUT= NO
 %
-% Verbosity of console output: NONE removes minor MPI overhead (NONE, HIGH)
-CONSOLE_OUTPUT_VERBOSITY= HIGH
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)

From 3fc93135b1e5a3b262ccd0fb17570872324d0d1b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 28 Jun 2019 10:50:06 +0200
Subject: [PATCH 317/539] Adapting test cases

---
 .../hb_rans_preconditioning/davis.cfg               |  2 +-
 TestCases/serial_regression.py                      | 10 +++++-----
 TestCases/sliding_interface/bars_SST_2D/bars.cfg    |  1 +
 .../sliding_interface/channel_2D/channel_2D_WA.cfg  |  1 +
 .../sliding_interface/channel_3D/channel_3D_WA.cfg  |  1 +
 .../incompressible_steady/config.cfg                |  1 +
 TestCases/sliding_interface/pipe/pipe_NN.cfg        |  1 +
 .../rotating_cylinders/rot_cylinders_WA.cfg         |  1 +
 .../sliding_interface/uniform_flow/uniform_NN.cfg   | 13 ++++++++++---
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 7fa8eafd4aa5..44652204ca05 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -40,7 +40,7 @@ HB_PRECONDITION= YES
 HB_PERIOD= 0.057465
 %
 % List of frequencies to be resolved for harmonic balance method
-OMEGA_HB = [0,109.339, 218.678, 328.017,-109.339, -218.678, -328.017]
+OMEGA_HB = (0,109.339, 218.678, 328.017,-109.339, -218.678, -328.017)
 %
 %
 % Type of mesh motion (NONE, FLUTTER, RIGID_ROTATION, RIGID_PITCHING)
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 70ecd6681527..f23a4d573d84 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -933,7 +933,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 2
-    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.117827] #last 4 columns
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.255896] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -946,7 +946,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 2
-    channel_2D.test_vals = [2.000000, 0.000000, 0.396634, 0.320019, 0.403674] #last 4 columns
+    channel_2D.test_vals = [2.000000, 0.000000, 0.400174, 0.352029, 0.407521] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -972,7 +972,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [0.457554, 0.542877, 0.781840, 0.944999] #last 4 columns
+    pipe.test_vals = [0.486616, 0.617750, 0.950973, 1.018949] #last 4 columns
     pipe.su2_exec  = "SU2_CFD"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -985,7 +985,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.715494, 1.096497, 1.126065] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.716122, 1.095620, 1.136611] #last 4 columns
     rotating_cylinders.su2_exec  = "SU2_CFD"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.722945, -1.612486] #last 3 columns
+    bars_SST_2D.test_vals = [13.000000, -0.720012, -1.607989] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 48463342c84e..54203f0e2177 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -134,6 +134,7 @@ KT_CONSTANT= 0.028085
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
 MARKER_ZONE_INTERFACE= (outflow_bars, inflow_channel)
+MARKER_FLUID_INTERFACE= (outflow_bars, inflow_channel)
 
 %Dynamic Mesh simulation(Yes, No)
 % Navier-Stokes wall boundary marker(s) (NONE = no marker)
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 780ac06fb4b7..bce9d956aaa6 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -88,6 +88,7 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
+MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index b61f9ceed1ea..0b651810a986 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -86,6 +86,7 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
+MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
diff --git a/TestCases/sliding_interface/incompressible_steady/config.cfg b/TestCases/sliding_interface/incompressible_steady/config.cfg
index 7dbb71936260..0d6cb94d8512 100644
--- a/TestCases/sliding_interface/incompressible_steady/config.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/config.cfg
@@ -14,6 +14,7 @@ PHYSICAL_PROBLEM= MULTIPHYSICS
 CONFIG_LIST = (configOut.cfg, configCircle.cfg)
 
 MARKER_ZONE_INTERFACE= (circleOut, circleIn)
+MARKER_FLUID_INTERFACE= (circleOut, circleIn)
 
 MULTIZONE_MESH= NO
 
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 1c8250a1591e..0960997375f7 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -94,6 +94,7 @@ MARKER_RIEMANN= (intake_upper_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
+MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
 
 
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index ee4971106799..0c8300a41f92 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -89,6 +89,7 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
+MARKER_FLUID_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 36dea48b522f..1f297f059ce9 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -13,12 +13,18 @@
 % Enable Multizone mode
 MULTIZONE= YES
 %
-MULTIZONE_SOLVER= BLOCK_JACOBI
+MULTIZONE_SOLVER=BLOCK_JACOBI
+
+% List of config files to specify zone options
+CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
+%
 %
 TIME_DOMAIN=YES
 %
-% List of config files to specify zone options
-CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
+TIME_STEP= 1e-04
+TIME_ITER= 10
+OUTER_ITER= 120
+INNER_ITER= 1
 %
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
@@ -77,6 +83,7 @@ MARKER_EULER= (outlet)
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
+MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %

From 0515509c64655e81dea67241459de4471c83c2cc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 28 Jun 2019 10:50:37 +0200
Subject: [PATCH 318/539] Added comment

---
 .../include/output/filewriter/CSurfaceFEMDataSorter.hpp    | 7 ++++++-
 .../include/output/filewriter/CSurfaceFVMDataSorter.hpp    | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
index 4298889fbe73..4ee9b00fe189 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
@@ -27,7 +27,12 @@ class CSurfaceFEMDataSorter : public CParallelDataSorter{
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
   void SortConnectivity(CConfig *config, CGeometry *geometry,  bool val_sort);
-    
+  
+  /*!
+   * \brief Get the global index of the surface point
+   * \param Local surface index
+   * \return Global index
+   */
   unsigned long GetGlobalIndex(unsigned long iPoint) { return globalSurfaceDOFIDs[iPoint]; }
   
 private:
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
index 8b9e85bfede5..7f8a146fb94c 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
@@ -28,6 +28,11 @@ class CSurfaceFVMDataSorter : public CParallelDataSorter{
    */
   void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
   
+  /*!
+   * \brief Get the global index of the surface point
+   * \param Local surface index
+   * \return Global index
+   */  
   unsigned long GetGlobalIndex(unsigned long iPoint) { return Renumber2Global[iPoint]; }
   
   

From 0c9846b99a0c9be5007d230792d04c129d205e66 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 28 Jun 2019 18:13:57 +0200
Subject: [PATCH 319/539] Added option so set output frequencies

---
 Common/include/config_structure.hpp      | 22 ++++++
 Common/include/config_structure.inl      |  4 +
 Common/src/config_structure.cpp          | 24 +++++-
 SU2_CFD/include/output/CDriverOutput.hpp |  6 ++
 SU2_CFD/include/output/COutput.hpp       |  8 +-
 SU2_CFD/src/output/CDriverOutput.cpp     | 49 +++++++++++-
 SU2_CFD/src/output/COutput.cpp           | 98 ++++++++++++++++--------
 7 files changed, 173 insertions(+), 38 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 982dbee8122b..38bcb1dc0a94 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1059,6 +1059,8 @@ class CConfig {
   Restart_Iter;                 /*!< \brief Determines the restart iteration in the multizone problem */
   su2double Time_Step;          /*!< \brief Determines the time step for the multizone problem */
   su2double Max_Time;           /*!< \brief Determines the maximum time for the time-domain problems */
+  su2double *HistoryWrtFreq,    /*!< \brief Array containing history writing frequencies for timer iter, outer iter, inner iter */
+            *ScreenWrtFreq;     /*!< \brief Array containing screen writing frequencies for timer iter, outer iter, inner iter */
   bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
   bool SinglezoneDriver;        /*!< \brief Determines if the single-zone driver is used. (TEMPORARY) */
   bool Wrt_ZoneConv;            /*!< \brief Write the convergence history of each individual zone to screen. */
@@ -9107,10 +9109,30 @@ class CConfig {
   */
   string GetConv_Field();
   
+  /*!
+   * \brief Set_StartTime
+   * \param starttime
+   */
   void Set_StartTime(su2double starttime);
   
+  /*!
+   * \brief Get_StartTime
+   * \return 
+   */
   su2double Get_StartTime();
 
+  /*!
+   * \brief GetHistory_Wrt_Freq
+   * \return 
+   */
+  su2double* GetHistory_Wrt_Freq();
+  
+  /*!
+   * \brief GetScreen_Wrt_Freq
+   * \return 
+   */
+  su2double* GetScreen_Wrt_Freq();
+  
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index a6ac2a029599..1983ab9cbe0a 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2055,3 +2055,7 @@ inline string CConfig::GetConv_Field(){ return ConvField; }
 inline void  CConfig::Set_StartTime(su2double starttime){StartTime = starttime;}
 
 inline su2double  CConfig::Get_StartTime() {return StartTime;}
+
+inline su2double* CConfig::GetScreen_Wrt_Freq() {return ScreenWrtFreq;}
+
+inline su2double* CConfig::GetHistory_Wrt_Freq() {return HistoryWrtFreq;}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 2998a7723b63..e15dbf25c340 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2416,6 +2416,14 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Type of output printed to the volume solution file */
   addStringListOption("VOLUME_OUTPUT", nVolumeOutput, VolumeOutput);
   
+  su2double WrtFreqDefault[] = {1.0,1.0,1.0};
+  
+  /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
+  addDoubleArrayOption("HISTORY_WRT_FREQ", 3, HistoryWrtFreq, WrtFreqDefault);
+  
+  /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
+  addDoubleArrayOption("SCREEN_WRT_FREQ", 3, ScreenWrtFreq, WrtFreqDefault);
+ 
   /* DESCRIPTION: Using Uncertainty Quantification with SST Turbulence Model */
   addBoolOption("USING_UQ", using_uq, false);
 
@@ -3180,18 +3188,26 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   if (!Time_Domain){
     nTimeIter = 1;
     Time_Step = 0;
+    
+    ScreenWrtFreq[0] = 1.0;
+    HistoryWrtFreq[0] = 1.0;
+    
+    nExtIter = nIter;
   } 
   
   if (Time_Domain){
     Delta_UnstTime = Time_Step;
     Delta_DynTime  = Time_Step;
+    nExtIter = nTimeIter;
   }
   
-  if (!Time_Domain){
-    nExtIter = nIter;
-  } else {
-    nExtIter = nTimeIter;
+  if (!Multizone_Problem){
+    ScreenWrtFreq[1] = 1.0;
+    HistoryWrtFreq[1] = 1.0;
   }
+  
+
+  
 
   /*--- If we're solving a purely steady problem with no prescribed grid
    movement (both rotating frame and moving walls can be steady), make sure that
diff --git a/SU2_CFD/include/output/CDriverOutput.hpp b/SU2_CFD/include/output/CDriverOutput.hpp
index d5eceadb845f..8a2a5bbd4bc6 100644
--- a/SU2_CFD/include/output/CDriverOutput.hpp
+++ b/SU2_CFD/include/output/CDriverOutput.hpp
@@ -105,5 +105,11 @@ class CDriverOutput : public COutput {
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteScreen_Output(CConfig *config);
+  
+  /*!
+   * \brief Determines if the history file output.
+   * \param[in] config - Definition of the particular problem.
+   */
+  bool WriteHistoryFile_Output(CConfig *config);
 
 };
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 2dd97ca47354..30f672288462 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -539,7 +539,13 @@ class COutput {
    * \param[in] iIter - Current iteration.
    * \param[in] iFreq - Frequency of output printing.
    */
-  inline bool PrintOutput(unsigned long iIter, unsigned long iFreq) {return (iIter % iFreq == 0);} 
+  inline bool PrintOutput(unsigned long iIter, unsigned long iFreq) {
+    if (iFreq == 0.0){
+      return false;
+    }
+    
+    return (iIter % iFreq == 0);
+  } 
   
   /*--------------------------------- Virtual functions ---------------------------------------- */
   
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 6d342280fafe..959d0ae0cf51 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -169,9 +169,52 @@ inline bool CDriverOutput::WriteScreen_Header(CConfig *config) {
 
 }
 inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
+  
+  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
 
-  bool write_output = true;
-
-  return write_output;
+  /*--- Check if screen output should be written --- */
+  
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (Convergence) {return true;}
+  
+  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq[1]) && 
+      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+ 
+  return true;
 }
 
+inline bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
+  
+  su2double* HistoryWrt_Freq = config->GetHistory_Wrt_Freq();
+    
+  /*--- Check if screen output should be written --- */
+  
+  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq[0])&& 
+      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (Convergence) {return true;}
+  
+  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq[1]) && 
+      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+    
+    return false;
+    
+  }
+ 
+  return true;
+}
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9c92be2af374..dcea209fcb2b 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1246,25 +1246,18 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
    map<string, bool>::iterator it = Average.begin();
    for (it = Average.begin(); it != Average.end(); it++){
-     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES");
+     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES", TYPE_AUTO_RESIDUAL);
    }
   
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  
   bool write_header = false;
-  if (config->GetUnsteady_Simulation() == STEADY) {
-    write_header = ((curr_InnerIter % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);
-  } else if  (config->GetUnsteady_Simulation() == TIME_STEPPING) {
-    if (!config->GetRestart())
-      write_header = ((curr_TimeIter % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);    
-    else {
-      write_header = (((curr_TimeIter - config->GetRestart_Iter()) % (config->GetWrt_Con_Freq()*40)) == 0) || (config->GetMultizone_Problem() && curr_InnerIter == 0);    
-    }
-  } else {
-    write_header = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST || config->GetUnsteady_Simulation() == DT_STEPPING_2ND) && config->GetInnerIter() == 0;
-  }
 
+  if (curr_InnerIter == 0){
+    write_header = true;
+  }
+  
   /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
   if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
 
@@ -1272,31 +1265,76 @@ bool COutput::WriteScreen_Header(CConfig *config) {
 }
 
 bool COutput::WriteScreen_Output(CConfig *config) {
-  bool write_output = false;
   
-  write_output = config->GetnInner_Iter() - 1 == curr_InnerIter;
+  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
+    
   
-  if (((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) )){
-    write_output = write_output || PrintOutput(config->GetInnerIter(), config->GetWrt_Con_Freq_DualTime());
+  if (config->GetMultizone_Problem() && !config->GetWrt_ZoneConv()){
+    
+    return false;
+    
   }
-  else if (((config->GetUnsteady_Simulation() == STEADY) || (config->GetUnsteady_Simulation() == TIME_STEPPING) )){
-    write_output = write_output ||  PrintOutput(config->GetInnerIter(), config->GetWrt_Con_Freq()) ;    
-  } 
-
-  /*--- For multizone problems, print the body only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
+  
+  /*--- Check if screen output should be written --- */
+  
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (Convergence) {return true;}
+  
+  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq[1]) && 
+      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (!PrintOutput(curr_InnerIter, ScreenWrt_Freq[2]) &&
+      !(curr_InnerIter == config->GetnInner_Iter() - 1)){
+    
+    return false;
+    
+  }
+ 
+  return true;
+  
 }
 
 bool COutput::WriteHistoryFile_Output(CConfig *config) { 
-// if (!write_dualtime){
-//   return true;
-// }
-// else {
-//   return false;
-// }
+
+  su2double* HistoryWrt_Freq = config->GetHistory_Wrt_Freq();
+    
+  /*--- Check if screen output should be written --- */
+  
+  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq[0])&& 
+      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (Convergence) {return true;}
+  
+  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq[1]) && 
+      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+    
+    return false;
+    
+  }
+  
+  if (!PrintOutput(curr_InnerIter, HistoryWrt_Freq[2]) &&
+      !(curr_InnerIter == config->GetnInner_Iter() - 1)){
+    
+    return false;
+    
+  }
+ 
   return true;
+
 }
 
 void COutput::SetCommonHistoryFields(CConfig *config){

From cb486995be2bd022a30448a60f288ae697cd9350 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Jul 2019 18:00:12 +0200
Subject: [PATCH 320/539] Simplified data sorter routines and removed handling
 of periodic points

---
 .../output/filewriter/CParallelDataSorter.hpp |  13 +-
 .../filewriter/CSurfaceFEMDataSorter.hpp      |   3 +-
 .../filewriter/CSurfaceFVMDataSorter.hpp      |   2 +-
 SU2_CFD/src/output/COutput.cpp                |   4 +-
 .../src/output/filewriter/CFEMDataSorter.cpp  |  66 +--
 .../src/output/filewriter/CFVMDataSorter.cpp  | 501 +++---------------
 .../output/filewriter/CParallelDataSorter.cpp |  57 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  47 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      | 434 ++-------------
 9 files changed, 231 insertions(+), 896 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 9406d5c4746a..4f28bd4255eb 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -28,7 +28,6 @@ class CParallelDataSorter{
   unsigned long nGlobalPoint_Sort;
   unsigned long nLocalPoint_Sort;
   unsigned long nPoint_Restart;
-  int *Local_Halo_Sort;
 
   unsigned long *beg_node;
   unsigned long *end_node;
@@ -157,4 +156,16 @@ class CParallelDataSorter{
    */
   void DeallocateConnectivity();
   
+  /*!
+   * \brief CreateLinearPartition
+   */
+  void CreateLinearPartition(unsigned long nGlobalPoint);
+  
+  /*!
+   * \brief FindProcessor
+   * \param global_index
+   * \return 
+   */
+  unsigned short FindProcessor(unsigned long global_index);
+  
 };
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
index 4ee9b00fe189..828e94ba067d 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
@@ -9,7 +9,8 @@ class CSurfaceFEMDataSorter : public CParallelDataSorter{
   std::vector<unsigned long> globalSurfaceDOFIDs;
     
 public:
-  CSurfaceFEMDataSorter(CConfig *config, unsigned short nFields, CFEMDataSorter* volume_sorter);
+  
+  CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, CFEMDataSorter* volume_sorter);
   
   ~CSurfaceFEMDataSorter();
   
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
index 7f8a146fb94c..fc3d35f6c2ab 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
@@ -9,7 +9,7 @@ class CSurfaceFVMDataSorter : public CParallelDataSorter{
   map<unsigned long,unsigned long> Renumber2Global;
   
 public:
-  CSurfaceFVMDataSorter(CConfig *config, unsigned short nFields, CFVMDataSorter* volume_sorter);
+  CSurfaceFVMDataSorter(CConfig *config, CGeometry* geometry, unsigned short nFields, CFVMDataSorter* volume_sorter);
   
   ~CSurfaceFVMDataSorter();
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index dcea209fcb2b..a61a26960ae4 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -507,9 +507,9 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   CFileWriter*         file_writer = NULL;
   
   if (fem_output){
-    surface_sort = new CSurfaceFEMDataSorter(config, GlobalField_Counter, dynamic_cast<CFEMDataSorter*>(data_sorter));
+    surface_sort = new CSurfaceFEMDataSorter(config, geometry, GlobalField_Counter, dynamic_cast<CFEMDataSorter*>(data_sorter));
   } else {
-    surface_sort = new CSurfaceFVMDataSorter(config, GlobalField_Counter, dynamic_cast<CFVMDataSorter*>(data_sorter));    
+    surface_sort = new CSurfaceFVMDataSorter(config, geometry,GlobalField_Counter, dynamic_cast<CFVMDataSorter*>(data_sorter));    
   }
 
   /*--- Set the file writer --- */
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 15cc7111ecb7..3c76c1a23e75 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -4,9 +4,7 @@
 CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
  
   this->Local_Data = &Local_Data;
-  
-  unsigned long iPoint;
-  
+    
   /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
    geometrical information for the FEM DG solver. ---*/
   
@@ -26,10 +24,6 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
     }
   }
   
-  Local_Halo_Sort = new int[nLocalPoint_Sort];
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++)
-    Local_Halo_Sort[iPoint] = false;
-  
 #ifdef HAVE_MPI
   SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
                      MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
@@ -43,43 +37,9 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
 
   nPoint_Restart = nGlobalPoint_Sort;
   
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-
-  beg_node = new unsigned long[size];
-  end_node = new unsigned long[size];
-
-  nPoint_Lin = new unsigned long[size];
-  nPoint_Cum = new unsigned long[size+1];
-
-  unsigned long total_points = 0;
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
-    total_points  += nPoint_Lin[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long remainder = nGlobalPoint_Sort - total_points;
-  for (unsigned long ii = 0; ii < remainder; ii++) {
-    nPoint_Lin[ii]++;
-  }
-
-  /*--- Store the local number of nodes on each proc in the linear
-   partitioning, the beginning/end index, and the linear partitioning
-   within an array in cumulative storage format. ---*/
-
-  beg_node[0] = 0;
-  end_node[0] = beg_node[0] + nPoint_Lin[0];
-  nPoint_Cum[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    beg_node[ii]   = end_node[ii-1];
-    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
-    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
-  }
-  nPoint_Cum[size] = nGlobalPoint_Sort;
+  /*--- Create a linear partition --- */
+  
+  CreateLinearPartition(nGlobalPoint_Sort);  
 }
 
 CFEMDataSorter::~CFEMDataSorter(){
@@ -89,8 +49,6 @@ CFEMDataSorter::~CFEMDataSorter(){
   delete [] nPoint_Cum;
   delete [] nPoint_Lin;
   
-  delete [] Local_Halo_Sort;
-  
 }
 
 
@@ -158,13 +116,7 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
 
     /*--- Search for the processor that owns this point ---*/
 
-    iProcessor = Global_Index/nPoint_Lin[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Cum[iProcessor])
-      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+    iProcessor = FindProcessor(Global_Index);   
 
     /*--- If we have not visted this node yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -236,13 +188,7 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
 
     /*--- Search for the processor that owns this point. ---*/
 
-    iProcessor = Global_Index/nPoint_Lin[0];
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= nPoint_Cum[iProcessor])
-      while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-    else
-      while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+    iProcessor = FindProcessor(Global_Index);
 
     /*--- Load data into the buffer for sending. ---*/
 
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index f787512d0cd0..fcd0bb978034 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -4,92 +4,13 @@
 CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
  
   this->Local_Data = &Local_Data;
+    
+  nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
+  nLocalPoint_Sort  = geometry->GetnPointDomain();
   
-  unsigned long iPoint;
-  
-  /*--- Reset point sorting counters ---*/
-
-  nGlobalPoint_Sort = 0;
-  nLocalPoint_Sort  = 0;
-
-  /*--- Search all send/recv boundaries on this partition for any periodic
-     nodes that were part of the original domain. We want to recover these
-     for visualization purposes. ---*/
-  
-  unsigned long iVertex;
-  bool isPeriodic;
-  
-  Local_Halo_Sort = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo_Sort[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      
-      /*--- Checking for less than or equal to the rank, because there may
-         be some periodic halo nodes that send info to the same rank. ---*/
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                      (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        if (isPeriodic) Local_Halo_Sort[iPoint] = false;
-      }
-    }
-  }
-  
-  /*--- Sum total number of nodes that belong to the domain ---*/
-  
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo_Sort[iPoint] == false)
-      nLocalPoint_Sort++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nGlobalPoint_Sort = nLocalPoint_Sort;
-#endif
-  
-  
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-
-  beg_node = new unsigned long[size];
-  end_node = new unsigned long[size];
-
-  nPoint_Lin = new unsigned long[size];
-  nPoint_Cum = new unsigned long[size+1];
-
-  unsigned long total_points = 0;
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Lin[ii] = nGlobalPoint_Sort/size;
-    total_points  += nPoint_Lin[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long remainder = nGlobalPoint_Sort - total_points;
-  for (unsigned long ii = 0; ii < remainder; ii++) {
-    nPoint_Lin[ii]++;
-  }
-
-  /*--- Store the local number of nodes on each proc in the linear
-   partitioning, the beginning/end index, and the linear partitioning
-   within an array in cumulative storage format. ---*/
-
-  beg_node[0] = 0;
-  end_node[0] = beg_node[0] + nPoint_Lin[0];
-  nPoint_Cum[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    beg_node[ii]   = end_node[ii-1];
-    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
-    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
-  }
-  nPoint_Cum[size] = nGlobalPoint_Sort;
+  /*--- Create a linear partition --- */
   
+  CreateLinearPartition(nGlobalPoint_Sort);  
 }
 
 CFVMDataSorter::~CFVMDataSorter(){
@@ -98,17 +19,13 @@ CFVMDataSorter::~CFVMDataSorter(){
   delete [] end_node;
   delete [] nPoint_Cum;
   delete [] nPoint_Lin;
-  
-  delete [] Local_Halo_Sort;
-  
+    
 }
 
-
-
 void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   
   unsigned long iProcessor;
-  unsigned long iPoint, Global_Index, nTotalPoint;
+  unsigned long iPoint, Global_Index;
   
   int VARS_PER_POINT = GlobalField_Counter;
   
@@ -118,13 +35,6 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   int ind;
 #endif
   
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint_Sort;
-#endif
-  
   /*--- We start with the grid nodes distributed across all procs with
    no particular ordering assumed. We need to loop through our local partition
    and decide how many nodes we must send to each other rank in order to
@@ -143,34 +53,22 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   }
   nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++ ) {
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
     
-    /*--- We only write interior points and recovered periodic points. ---*/
+    /*--- Get the global index of the current point. ---*/
     
-    if (!Local_Halo_Sort[iPoint]) {
-      
-      /*--- Get the global index of the current point. ---*/
-      
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-      
-      /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/nPoint_Lin[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Cum[iProcessor])
-        while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
-      
-      /*--- If we have not visited this node yet, increment our
+    Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+    
+    /*--- Search for the processor that owns this point ---*/
+    
+    iProcessor = FindProcessor(Global_Index);
+    
+    /*--- If we have not visited this node yet, increment our
        number of elements that must be sent to a particular proc. ---*/
-      
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        nPoint_Send[iProcessor+1]++;
-      }
-      
+    
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      nPoint_Send[iProcessor+1]++;
     }
   }
   
@@ -227,51 +125,40 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+    
+    /*--- Get the index of the current point. ---*/
     
-    /*--- We only write interior points and recovered periodic points. ---*/
+    Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+    
+    /*--- Search for the processor that owns this point. ---*/
+    
+    iProcessor = FindProcessor(Global_Index);
+
+    /*--- Load node coordinates into the buffer for sending. ---*/
     
-    if (!Local_Halo_Sort[iPoint]) {
+    if (nPoint_Flag[iProcessor] != (int)iPoint) {
       
-      /*--- Get the index of the current point. ---*/
+      nPoint_Flag[iProcessor] = (int)iPoint;
+      unsigned long nn = index[iProcessor];
       
-      Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+      /*--- Load the data values. ---*/
       
-      /*--- Search for the processor that owns this point. ---*/
+      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
+        connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
+      }
       
-      iProcessor = Global_Index/nPoint_Lin[0];
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= nPoint_Cum[iProcessor])
-        while(Global_Index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-      else
-        while(Global_Index <  nPoint_Cum[iProcessor])   iProcessor--;
+      /*--- Load the global ID (minus offset) for sorting the
+         points once they all reach the correct processor. ---*/
       
-      /*--- Load node coordinates into the buffer for sending. ---*/
+      nn = idIndex[iProcessor];
+      idSend[nn] = Global_Index - beg_node[iProcessor];
+      
+      /*--- Increment the index by the message length ---*/
+      
+      index[iProcessor]  += VARS_PER_POINT;
+      idIndex[iProcessor]++;
       
-      if (nPoint_Flag[iProcessor] != (int)iPoint) {
-        
-        nPoint_Flag[iProcessor] = (int)iPoint;
-        unsigned long nn = index[iProcessor];
-        
-        /*--- Load the data values. ---*/
-        
-        for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-          connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
-        }
-        
-        /*--- Load the global ID (minus offset) for sorting the
-         points once they all reach the correct processor. ---*/
-        
-        nn = idIndex[iProcessor];
-        idSend[nn] = Global_Index - beg_node[iProcessor];
-        
-        /*--- Increment the index by the message length ---*/
-        
-        index[iProcessor]  += VARS_PER_POINT;
-        idIndex[iProcessor]++;
-        
-      }
     }
   }
   
@@ -470,15 +357,9 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   
   unsigned long iProcessor;
   unsigned short NODES_PER_ELEMENT = 0;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long iPoint, jPoint;
   unsigned long nElem_Total = 0, Global_Index;
   
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
-  
-  int *Local_Halo = NULL;
   int *Conn_Elem  = NULL;
 
 #ifdef HAVE_MPI
@@ -515,187 +396,6 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
       SU2_MPI::Error("Unrecognized element type", CURRENT_FUNCTION);
   }
   
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-      if (Local_Halo[iPoint] == false)
-        nLocalPoint++;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
   /*--- We start with the connectivity distributed across all procs with
    no particular ordering assumed. We need to loop through our local partition
    and decide how many elements we must send to each other rank in order to
@@ -739,13 +439,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
          own elements into the connectivity data structure. ---*/
         
         if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+          iProcessor = FindProcessor(Global_Index);
         } else {
           iProcessor = rank;
         }
@@ -798,21 +492,12 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
     connSend[ii] = 0;
   
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
   unsigned long *index = new unsigned long[size];
   for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
   
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   
@@ -841,25 +526,17 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
          own elements into the connectivity data structure. ---*/
         
         if (val_sort) {
-          iProcessor = Global_Index/npoint_procs[0];
-          if (iProcessor >= (unsigned long)size)
-            iProcessor = (unsigned long)size-1;
-          if (Global_Index >= nPoint_Linear[iProcessor])
-            while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-          else
-            while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
+          iProcessor = FindProcessor(Global_Index);    
         } else {
           iProcessor = rank;
         }
         
-        
         /*--- Load connectivity into the buffer for sending ---*/
         
         if (nElem_Flag[iProcessor] != ii) {
           
           nElem_Flag[iProcessor] = ii;
           unsigned long nn = index[iProcessor];
-          unsigned long mm = haloIndex[iProcessor];
           
           /*--- Load the connectivity values. ---*/
           
@@ -867,18 +544,11 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
             iPoint = geometry->elem[ii]->GetNode(kk);
             connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
             
-            /*--- Check if this is a halo node. If so, flag this element
-             as a halo cell. We will use this later to sort and remove
-             any duplicates from the connectivity list. ---*/
-            
-            if (Local_Halo[iPoint]) haloSend[mm] = true;
-            
           }
           
           /*--- Increment the index by the message length ---*/
           
           index[iProcessor]    += NODES_PER_ELEMENT;
-          haloIndex[iProcessor]++;
           
         }
       }
@@ -888,7 +558,6 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   /*--- Free memory after loading up the send buffer. ---*/
   
   delete [] index;
-  delete [] haloIndex;
   
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
@@ -900,16 +569,10 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
     connRecv[ii] = 0;
   
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
 #ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the flags for the halo cells. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
+
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
   
   /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
@@ -942,38 +605,6 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
       iMessage++;
     }
   }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
 #endif
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
@@ -988,16 +619,14 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   ll = nElem_Send[rank];
   kk = nElem_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  int number = 2*nSends;
+  int number = nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = 2*nRecvs;
+  number = nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -1013,13 +642,11 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
   int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
-    }
+    nElem_Total++;
+    for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+      Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+      count++;
+    }  
   }
   
   /*--- Store the particular global element count in the class data,
@@ -1059,18 +686,8 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   
   delete [] connSend;
   delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
-  delete [] Local_Halo;
   delete [] nElem_Recv;
   delete [] nElem_Send;
   delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic; 
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
 
 }
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index 13161643ec1a..d0a5c5788367 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -26,7 +26,8 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   
   Parallel_Data = NULL;
   
-  nLocalPoint_Sort = 0;
+  nLocalPoint_Sort  = 0;
+  nGlobalPoint_Sort = 0;
 }
 
 CParallelDataSorter::~CParallelDataSorter(){
@@ -37,6 +38,60 @@ CParallelDataSorter::~CParallelDataSorter(){
   
 }
 
+void CParallelDataSorter::CreateLinearPartition(unsigned long nGlobalPoint){
+    
+  /*--- Now that we know the actual number of points we need to output,
+   compute the number of points that will be on each processor.
+   This is a linear partitioning with the addition of a simple load
+   balancing for any remainder points. ---*/
+
+  beg_node = new unsigned long[size];
+  end_node = new unsigned long[size];
+
+  nPoint_Lin = new unsigned long[size];
+  nPoint_Cum = new unsigned long[size+1];
+
+  unsigned long total_points = 0;
+  for (int ii = 0; ii < size; ii++) {
+    nPoint_Lin[ii] = nGlobalPoint/size;
+    total_points  += nPoint_Lin[ii];
+  }
+
+  /*--- Get the number of remainder points after the even division. ---*/
+
+  unsigned long remainder = nGlobalPoint - total_points;
+  for (unsigned long ii = 0; ii < remainder; ii++) {
+    nPoint_Lin[ii]++;
+  }
+
+  /*--- Store the local number of nodes on each proc in the linear
+   partitioning, the beginning/end index, and the linear partitioning
+   within an array in cumulative storage format. ---*/
+
+  beg_node[0] = 0;
+  end_node[0] = beg_node[0] + nPoint_Lin[0];
+  nPoint_Cum[0] = 0;
+  for (int ii = 1; ii < size; ii++) {
+    beg_node[ii]   = end_node[ii-1];
+    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
+    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
+  }
+  nPoint_Cum[size] = nGlobalPoint;
+  
+}
+
+unsigned short CParallelDataSorter::FindProcessor(unsigned long global_index){
+  
+  unsigned short iProcessor = global_index/nPoint_Lin[0];
+  if (iProcessor >= (unsigned long)size)
+    iProcessor = (unsigned long)size-1;
+  if (global_index >= nPoint_Cum[iProcessor])
+    while(global_index >= nPoint_Cum[iProcessor+1]) iProcessor++;
+  else
+    while(global_index <  nPoint_Cum[iProcessor])   iProcessor--;
+  
+  return iProcessor;
+}
 
 unsigned long CParallelDataSorter::GetnElem(GEO_TYPE type){
   
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 033d8c5a64c8..9a895bd2ad88 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -2,12 +2,49 @@
 #include "../../../Common/include/fem_geometry_structure.hpp"
 
 
-CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, unsigned short nFields, CFEMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
+CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, CFEMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
  
   this->volume_sorter = volume_sorter;
   
   connectivity_sorted = false;
   
+  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
+   geometrical information for the FEM DG solver. ---*/
+  
+  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
+  
+  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
+  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
+  
+  /*--- Update the solution by looping over the owned volume elements. ---*/
+  
+  for(unsigned long l=0; l<nVolElemOwned; ++l) {
+    
+    /* Count up the number of local points we have for allocating storage. */
+    
+    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+      nLocalPoint_Sort++;
+    }
+  }
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Allreduce(&nLocalPoint_Sort, &nGlobalPoint_Sort, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+  nGlobalPoint_Sort = nLocalPoint_Sort;
+#endif
+
+  /*--- Set a final variable for the number of points in the restart
+   file. We do not write the periodic points for the FV solver, even if
+   they show up in the viz. files. ---*/
+
+  nPoint_Restart = nGlobalPoint_Sort;
+  
+  
+  /*--- Create a linear partition --- */
+  
+  CreateLinearPartition(nGlobalPoint_Sort);
+  
 }
 
 CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){}
@@ -71,13 +108,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
 
     /* Search for the processor that owns this point. */
-    unsigned long iProcessor = globalSurfaceDOFIDs[i]/volume_sorter->GetnPointLinear(0);
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (globalSurfaceDOFIDs[i] >= volume_sorter->GetnPointCumulative(iProcessor))
-      while(globalSurfaceDOFIDs[i] >= volume_sorter->GetnPointCumulative(iProcessor+1)) ++iProcessor;
-    else
-      while(globalSurfaceDOFIDs[i] <  volume_sorter->GetnPointCumulative(iProcessor))   --iProcessor;
+    unsigned long iProcessor = FindProcessor(globalSurfaceDOFIDs[i]);
 
     /* Store the global ID in the send buffer for iProcessor. */
     sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index d738de742ddc..4a355a4d05ae 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1,19 +1,29 @@
 #include "../../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
 
-CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, unsigned short nFields, CFVMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
+CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, CFVMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
  
   this->volume_sorter = volume_sorter;
   
   connectivity_sorted = false;
+  
+  nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
+  nLocalPoint_Sort  = geometry->GetnPointDomain();
+  
+  /*--- Create a linear partition --- */
+  
+  CreateLinearPartition(nGlobalPoint_Sort);
 
-  beg_node = new unsigned long[size];
-  end_node = new unsigned long[size];
-
-  nPoint_Lin = new unsigned long[size];
-  nPoint_Cum = new unsigned long[size+1];
 }
 
-CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){}
+CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){
+  
+  delete [] beg_node;
+  delete [] end_node;
+  
+  delete [] nPoint_Cum;
+  delete [] nPoint_Lin;
+  
+}
 
 void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   
@@ -63,13 +73,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);      
       
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -97,13 +101,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);
 
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -131,14 +129,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
-      
+      iProcessor = FindProcessor(Global_Index);
+
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
       
@@ -200,14 +192,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       Global_Index = Conn_Line_Par[iNode]-1;
       
       /*--- Search for the processor that owns this point ---*/
-      
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+   
+      iProcessor = FindProcessor(Global_Index);
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -241,13 +227,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -281,13 +261,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -516,14 +490,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-    else
-      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
-    
+    iProcessor = FindProcessor(Global_Index);
+
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
     
@@ -592,14 +560,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-    else
-      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
-    
+    iProcessor = FindProcessor(Global_Index);
+
     if (nElem_Flag[iProcessor] != ii) {
       
       nElem_Flag[iProcessor] = ii;
@@ -764,13 +726,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);
+
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
       if ((iProcessor != (unsigned long)rank)) {
@@ -790,13 +747,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+      iProcessor = FindProcessor(Global_Index);
+
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
       if ((iProcessor != (unsigned long)rank)) {
@@ -816,14 +768,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-      if (iProcessor >= (unsigned long)size)
-        iProcessor = (unsigned long)size-1;
-      if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-        while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-      else
-        while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
-      
+      iProcessor = FindProcessor(Global_Index);
+
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
       if ((iProcessor != (unsigned long)rank)) {
@@ -856,14 +802,9 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     Global_Index = outliers[ii];
     
     /*--- Search for the processor that owns this point ---*/
-    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-    else
-      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
     
+    iProcessor = FindProcessor(Global_Index);
+
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
     
@@ -918,13 +859,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = Global_Index/volume_sorter->GetnPointLinear(0);
-    if (iProcessor >= (unsigned long)size)
-      iProcessor = (unsigned long)size-1;
-    if (Global_Index >= volume_sorter->GetnPointCumulative(iProcessor))
-      while(Global_Index >= volume_sorter->GetnPointCumulative(iProcessor+1)) iProcessor++;
-    else
-      while(Global_Index < volume_sorter->GetnPointCumulative(iProcessor)) iProcessor--;
+    iProcessor = FindProcessor(Global_Index);
 
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -1182,13 +1117,10 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   
   unsigned long iProcessor;
   unsigned short NODES_PER_ELEMENT;
-  unsigned long iPoint, jPoint, kPoint, nLocalPoint, nTotalPoint;
+  unsigned long iPoint, jPoint;
   unsigned long nElem_Total = 0, Global_Index;
   
-  unsigned long iVertex, iMarker;
-  int SendRecv, RecvFrom;
-  
-  bool notPeriodic, notHalo, addedPeriodic, isPeriodic;
+  unsigned long iMarker;  
   
   int *Local_Halo = NULL;
   int *Conn_Elem  = NULL;
@@ -1220,187 +1152,6 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
       break;
   }
   
-  /*--- Force the removal of all added periodic elements (use global index).
-   First, we isolate and create a list of all added periodic points, excluding
-   those that were part of the original domain (we want these to be in the
-   output files). ---*/
-  
-  vector<unsigned long> Added_Periodic;
-  Added_Periodic.clear();
-  
-  if (config->GetKind_SU2() != SU2_DEF) {
-    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-        SendRecv = config->GetMarker_All_SendRecv(iMarker);
-        for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-          
-          if ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-              (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 0) &&
-              (SendRecv < 0)) {
-            Added_Periodic.push_back(geometry->node[iPoint]->GetGlobalIndex());
-          }
-        }
-      }
-    }
-  }
-  
-  /*--- Now we communicate this information to all processors, so that they
-   can force the removal of these particular nodes by flagging them as halo
-   points. In general, this should be a small percentage of the total mesh,
-   so the communication/storage costs here shouldn't be prohibitive. ---*/
-  
-  /*--- First communicate the number of points that each rank has found. ---*/
-  
-  unsigned long nAddedPeriodic = 0, maxAddedPeriodic = 0;
-  unsigned long Buffer_Send_nAddedPeriodic[1], *Buffer_Recv_nAddedPeriodic = NULL;
-  Buffer_Recv_nAddedPeriodic = new unsigned long[size];
-  
-  nAddedPeriodic = Added_Periodic.size();
-  Buffer_Send_nAddedPeriodic[0] = nAddedPeriodic;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nAddedPeriodic, &maxAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     MPI_MAX, MPI_COMM_WORLD);
-  SU2_MPI::Allgather(&Buffer_Send_nAddedPeriodic, 1, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_nAddedPeriodic,  1, MPI_UNSIGNED_LONG, MPI_COMM_WORLD);
-#else
-  maxAddedPeriodic = nAddedPeriodic;
-  Buffer_Recv_nAddedPeriodic[0] = Buffer_Send_nAddedPeriodic[0];
-#endif
-  
-  /*--- Communicate the global index values of all added periodic nodes. ---*/
-  unsigned long *Buffer_Send_AddedPeriodic = new unsigned long[maxAddedPeriodic];
-  unsigned long *Buffer_Recv_AddedPeriodic = new unsigned long[size*maxAddedPeriodic];
-  
-  for (iPoint = 0; iPoint < Added_Periodic.size(); iPoint++) {
-    Buffer_Send_AddedPeriodic[iPoint] = Added_Periodic[iPoint];
-  }
-  
-  /*--- Gather the element connectivity information. All processors will now
-   have a copy of the global index values for all added periodic points. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allgather(Buffer_Send_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     Buffer_Recv_AddedPeriodic, maxAddedPeriodic, MPI_UNSIGNED_LONG,
-                     MPI_COMM_WORLD);
-#else
-  for (iPoint = 0; iPoint < maxAddedPeriodic; iPoint++)
-    Buffer_Recv_AddedPeriodic[iPoint] = Buffer_Send_AddedPeriodic[iPoint];
-#endif
-  
-  /*--- Search all send/recv boundaries on this partition for halo cells. In
-   particular, consider only the recv conditions (these are the true halo
-   nodes). Check the ranks of the processors that are communicating and
-   choose to keep only the halo cells from the higher rank processor. Here,
-   we are also choosing to keep periodic nodes that were part of the original
-   domain. We will check the communicated list of added periodic points. ---*/
-  
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
-      SendRecv = config->GetMarker_All_SendRecv(iMarker);
-      RecvFrom = abs(SendRecv)-1;
-      
-      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-        
-        /*--- We need to keep one copy of overlapping halo cells. ---*/
-        
-        notHalo = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() == 0) &&
-                   (SendRecv < 0) && (rank > RecvFrom));
-        
-        /*--- We want to keep the periodic nodes that were part of the original domain.
-         For SU2_DEF we want to keep all periodic nodes. ---*/
-        
-        if (config->GetKind_SU2() == SU2_DEF) {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0));
-        }else {
-          isPeriodic = ((geometry->vertex[iMarker][iVertex]->GetRotation_Type() > 0) &&
-                        (geometry->vertex[iMarker][iVertex]->GetRotation_Type() % 2 == 1));
-        }
-        
-        notPeriodic = (isPeriodic && (SendRecv < 0));
-        
-        /*--- Lastly, check that this isn't an added periodic point that
-         we will forcibly remove. Use the communicated list of these points. ---*/
-        
-        addedPeriodic = false; kPoint = 0;
-        for (iProcessor = 0; iProcessor < (unsigned long)size; iProcessor++) {
-          for (jPoint = 0; jPoint < Buffer_Recv_nAddedPeriodic[iProcessor]; jPoint++) {
-            if (Global_Index == Buffer_Recv_AddedPeriodic[kPoint+jPoint])
-              addedPeriodic = true;
-          }
-          
-          /*--- Adjust jNode to index of next proc's data in the buffers. ---*/
-          
-          kPoint = (iProcessor+1)*maxAddedPeriodic;
-          
-        }
-        
-        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
-        
-        if ((notHalo || notPeriodic) && !addedPeriodic) {
-          Local_Halo[iPoint] = false;
-        }
-        
-      }
-    }
-  }
-  
-  /*--- Now that we've done the gymnastics to find any periodic points,
-   compute the total number of local and global points for the output. ---*/
-  
-  nLocalPoint = 0;
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    if (Local_Halo[iPoint] == false)
-      nLocalPoint++;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nLocalPoint, &nTotalPoint, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nTotalPoint = nLocalPoint;
-#endif
-  
-  /*--- Compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-  
-  unsigned long *npoint_procs  = new unsigned long[size];
-  unsigned long *starting_node = new unsigned long[size];
-  unsigned long *ending_node   = new unsigned long[size];
-  unsigned long *nPoint_Linear = new unsigned long[size+1];
-  
-  unsigned long total_pt_accounted = 0;
-  for (int ii = 0; ii < size; ii++) {
-    npoint_procs[ii] = nTotalPoint/size;
-    total_pt_accounted = total_pt_accounted + npoint_procs[ii];
-  }
-  
-  /*--- Get the number of remainder points after the even division. ---*/
-  
-  unsigned long rem_points = nTotalPoint-total_pt_accounted;
-  for (unsigned long ii = 0; ii < rem_points; ii++) {
-    npoint_procs[ii]++;
-  }
-  
-  /*--- Store the local number of nodes and the beginning/end index ---*/
-  
-  starting_node[0] = 0;
-  ending_node[0]   = starting_node[0] + npoint_procs[0];
-  nPoint_Linear[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    starting_node[ii] = ending_node[ii-1];
-    ending_node[ii]   = starting_node[ii] + npoint_procs[ii];
-    nPoint_Linear[ii] = nPoint_Linear[ii-1] + npoint_procs[ii-1];
-  }
-  nPoint_Linear[size] = nTotalPoint;
-  
   /*--- We start with the connectivity distributed across all procs with
    no particular ordering assumed. We need to loop through our local partition
    and decide how many elements we must send to each other rank in order to
@@ -1444,14 +1195,8 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
             
             /*--- Search for the processor that owns this point ---*/
             
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
+            iProcessor = FindProcessor(Global_Index);
+
             /*--- If we have not visited this element yet, increment our
              number of elements that must be sent to a particular proc. ---*/
             
@@ -1501,12 +1246,6 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
     connSend[ii] = 0;
   
-  /*--- Allocate arrays for storing halo flags. ---*/
-  
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    haloSend[ii] = false;
-  
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
@@ -1544,21 +1283,14 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
             
             /*--- Search for the processor that owns this point ---*/
             
-            iProcessor = Global_Index/npoint_procs[0];
-            if (iProcessor >= (unsigned long)size)
-              iProcessor = (unsigned long)size-1;
-            if (Global_Index >= nPoint_Linear[iProcessor])
-              while(Global_Index >= nPoint_Linear[iProcessor+1]) iProcessor++;
-            else
-              while(Global_Index <  nPoint_Linear[iProcessor])   iProcessor--;
-            
+            iProcessor = FindProcessor(Global_Index);
+
             /*--- Load connectivity into the buffer for sending ---*/
             
             if (nElem_Flag[iProcessor] != ii) {
               
               nElem_Flag[iProcessor] = ii;
               unsigned long nn = index[iProcessor];
-              unsigned long mm = haloIndex[iProcessor];
               
               /*--- Load the connectivity values. ---*/
               
@@ -1566,19 +1298,11 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
                 iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
                 connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
                 
-                /*--- Check if this is a halo node. If so, flag this element
-                 as a halo cell. We will use this later to sort and remove
-                 any duplicates from the connectivity list. ---*/
-                
-                if (Local_Halo[iPoint]) haloSend[mm] = true;
-                
               }
               
               /*--- Increment the index by the message length ---*/
               
-              index[iProcessor]    += NODES_PER_ELEMENT;
-              haloIndex[iProcessor]++;
-              
+              index[iProcessor]    += NODES_PER_ELEMENT;              
             }
           }
         }
@@ -1589,7 +1313,6 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   /*--- Free memory after loading up the send buffer. ---*/
   
   delete [] index;
-  delete [] haloIndex;
   
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
@@ -1600,17 +1323,13 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
     connRecv[ii] = 0;
-  
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
-  
+
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
    and the flags for the halo cells. ---*/
   
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
+  send_req = new SU2_MPI::Request[nSends];
+  recv_req = new SU2_MPI::Request[nRecvs];
   
   /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
@@ -1643,38 +1362,6 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
       iMessage++;
     }
   }
-  
-  /*--- Repeat the process to communicate the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
-      int ll     = nElem_Recv[ii];
-      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the halo flags. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
-      int ll = nElem_Send[ii];
-      int kk = nElem_Send[ii+1] - nElem_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
 #endif
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
@@ -1689,16 +1376,14 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   ll = nElem_Send[rank];
   kk = nElem_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
-  
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  int number = 2*nSends;
+  int number = nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = 2*nRecvs;
+  number = nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -1714,12 +1399,10 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
   int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    if (!haloRecv[ii]) {
-      nElem_Total++;
-      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-        count++;
-      }
+    nElem_Total++;
+    for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+      Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+      count++;
     }
   }
 
@@ -1748,18 +1431,9 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   
   delete [] connSend;
   delete [] connRecv;
-  delete [] haloSend;
-  delete [] haloRecv;
   delete [] Local_Halo;
   delete [] nElem_Recv;
   delete [] nElem_Send;
   delete [] nElem_Flag;
-  delete [] Buffer_Recv_nAddedPeriodic;
-  delete [] Buffer_Send_AddedPeriodic;
-  delete [] Buffer_Recv_AddedPeriodic;
-  delete [] npoint_procs;
-  delete [] starting_node;
-  delete [] ending_node;
-  delete [] nPoint_Linear;
   
 }

From 21d0042faa32c80da25bb1b007945dab17a106f6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Jul 2019 18:13:22 +0200
Subject: [PATCH 321/539] Fixed some post-merging problems

---
 SU2_CFD/src/variables/CDiscAdjFEAVariable.cpp | 3 ---
 SU2_CFD/src/variables/CFEAVariable.cpp        | 4 ----
 SU2_CFD/src/variables/CHeatFVMVariable.cpp    | 2 --
 SU2_CFD/src/variables/CVariable.cpp           | 9 ++++++++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/variables/CDiscAdjFEAVariable.cpp b/SU2_CFD/src/variables/CDiscAdjFEAVariable.cpp
index fe7de7a974fb..1827050bcbf1 100644
--- a/SU2_CFD/src/variables/CDiscAdjFEAVariable.cpp
+++ b/SU2_CFD/src/variables/CDiscAdjFEAVariable.cpp
@@ -107,19 +107,16 @@ CDiscAdjFEAVariable::CDiscAdjFEAVariable(su2double* val_solution, unsigned short
   }
 
   Solution_BGS          = NULL;
-  Solution_BGS_k        = NULL;
   Cross_Term_Derivative = NULL;
   Geometry_CrossTerm_Derivative = NULL;
   if (fsi){
     Cross_Term_Derivative = new su2double[nDim];
     Geometry_CrossTerm_Derivative = new su2double[nDim];
     Solution_BGS          = new su2double[nDim];
-    Solution_BGS_k        = new su2double[nDim];
     for (iDim = 0; iDim < nDim; iDim++) {
       Geometry_CrossTerm_Derivative [iDim] = 0.0;
       Cross_Term_Derivative[iDim] = 0.0;
       Solution_BGS[iDim]          = 0.0;
-      Solution_BGS_k[iDim]        = 0.0;
     }
   }
   
diff --git a/SU2_CFD/src/variables/CFEAVariable.cpp b/SU2_CFD/src/variables/CFEAVariable.cpp
index e2e19dd19910..6927da8498c6 100644
--- a/SU2_CFD/src/variables/CFEAVariable.cpp
+++ b/SU2_CFD/src/variables/CFEAVariable.cpp
@@ -90,8 +90,6 @@ CFEAVariable::CFEAVariable(su2double *val_fea, unsigned short val_nDim, unsigned
   Prestretch            = NULL;    // Prestretch geometry
   Reference_Geometry    = NULL;    // Reference geometry for optimization purposes
 
-  Solution_BGS_k        = NULL;    // Old solution stored to check convergence in the BGS loop
-
   if      (nDim == 2) Stress = new su2double [3];
   else if (nDim == 3) Stress = new su2double [6];
 
@@ -167,7 +165,5 @@ CFEAVariable::~CFEAVariable(void) {
   if (Reference_Geometry    != NULL) delete [] Reference_Geometry;
   if (Prestretch            != NULL) delete [] Prestretch;
 
-  if (Solution_BGS_k        != NULL) delete [] Solution_BGS_k;
-
 }
 
diff --git a/SU2_CFD/src/variables/CHeatFVMVariable.cpp b/SU2_CFD/src/variables/CHeatFVMVariable.cpp
index 8053c0546d82..7317d2991b5c 100644
--- a/SU2_CFD/src/variables/CHeatFVMVariable.cpp
+++ b/SU2_CFD/src/variables/CHeatFVMVariable.cpp
@@ -55,7 +55,6 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
 
   /*--- Array initialization ---*/
   Solution_Direct = NULL;
-  Solution_BGS_k  = NULL;
 
   /*--- Initialization of heat variable ---*/
   Solution[0] = val_Heat;		Solution_Old[0] = val_Heat;
@@ -94,6 +93,5 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
 }
 
 CHeatFVMVariable::~CHeatFVMVariable(void) {
-  if (Solution_BGS_k  != NULL) delete [] Solution_BGS_k;
   if (Solution_Direct != NULL) delete [] Solution_Direct;
 }
diff --git a/SU2_CFD/src/variables/CVariable.cpp b/SU2_CFD/src/variables/CVariable.cpp
index b948adfc98e3..0bd41552d45e 100644
--- a/SU2_CFD/src/variables/CVariable.cpp
+++ b/SU2_CFD/src/variables/CVariable.cpp
@@ -56,6 +56,7 @@ CVariable::CVariable(void) {
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
 
 }
 
@@ -77,6 +78,7 @@ CVariable::CVariable(unsigned short val_nvar, CConfig *config) {
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
 
   /*--- Initialize the number of solution variables. This version
    of the constructor will be used primarily for converting the
@@ -156,7 +158,11 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
         Rmatrix[iDim][jDim] = 0.0;
     }
   }
-
+  
+  if (config->GetMultizone_Problem()){
+    Solution_BGS_k = new su2double[nVar];
+  }
+  
 }
 
 CVariable::~CVariable(void) {
@@ -175,6 +181,7 @@ CVariable::~CVariable(void) {
   if (Residual_Old        != NULL) delete [] Residual_Old;
   if (Residual_Sum        != NULL) delete [] Residual_Sum;
   if (Solution_Adj_Old    != NULL) delete [] Solution_Adj_Old;
+  if (Solution_BGS_k      != NULL) delete [] Solution_BGS_k;
 
   if (Gradient != NULL) {
     for (iVar = 0; iVar < nVar; iVar++)

From bbc086f1371af44fbb7592d84ef864efa9524b45 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Jul 2019 18:18:28 +0200
Subject: [PATCH 322/539] Fixed conv criteria for multizone problems

---
 SU2_CFD/include/output/COutput.hpp      |   4 +-
 SU2_CFD/src/driver_direct_multizone.cpp |   4 +-
 SU2_CFD/src/output/CDriverOutput.cpp    |   4 +-
 SU2_CFD/src/output/COutput.cpp          | 176 ++++++++++++------------
 4 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 30f672288462..41ea4cb5d8d0 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -111,7 +111,7 @@ class COutput {
   
   enum HistoryFieldType {           
     TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
-    TYPE_REL_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
+    TYPE_AUTO_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
     TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
     TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
   };
@@ -284,7 +284,7 @@ class COutput {
   void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config);  
   
   
-  void SetMultizoneHistory_Output(COutput** output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter);
+  void SetMultizoneHistory_Output(COutput** output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter);
   
   /*! 
    * \brief Returns a pointer to the legacy output class needed for some old driver implementations.
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index f68b9545b8f7..54a53a2e9882 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -436,11 +436,11 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
   }
 
   /*--- Print out the convergence data to screen and history file ---*/
-  driver_output->SetMultizoneHistory_Output(output, config_container, driver_config->GetTimeIter(), driver_config->GetOuterIter());
+  driver_output->SetMultizoneHistory_Output(output, config_container, driver_config, driver_config->GetTimeIter(), driver_config->GetOuterIter());
 
   if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
 
-  return Convergence;
+  return driver_output->GetConvergence();
 
 }
 
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 959d0ae0cf51..7058f564433a 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -106,7 +106,7 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
     map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
     vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
     
-    nField = ZoneHistoryFields.size();
+    nField = ZoneHistoryNames.size();
     
     
     /*-- For all the variables per solver --*/
@@ -140,7 +140,7 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
     map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
     vector<string>                  ZoneHistoryNames  = output[iZone]->GetHistoryOutput_List();
     
-    nField = ZoneHistoryFields.size();
+    nField = ZoneHistoryNames.size();
     
     
     /*-- For all the variables per solver --*/
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index a61a26960ae4..2187fcddd477 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -210,33 +210,34 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   Postprocess_HistoryData(config);
 
 }
-void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, unsigned long TimeIter, unsigned long OuterIter){
+void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter){
   
   curr_TimeIter  = TimeIter;
   curr_OuterIter = OuterIter;
   
-
   bool write_header, write_screen, write_history;
   
   /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
   
   LoadMultizoneHistoryData(output, config);
   
+  Convergence_Monitoring(driver_config, curr_OuterIter);  
+  
   /*--- Output using only the master node ---*/
   
   if (rank == MASTER_NODE && !no_writing) {
     
     /*--- Write the history file ---------------------------------------------------------------------------*/
-    write_history = WriteHistoryFile_Output(config[ZONE_0]);
-    if (write_history) SetHistoryFile_Output(config[ZONE_0]);
+    write_history = WriteHistoryFile_Output(driver_config);
+    if (write_history) SetHistoryFile_Output(driver_config);
     
     /*--- Write the screen header---------------------------------------------------------------------------*/
-    write_header = WriteScreen_Header(config[ZONE_0]);
-    if (write_header) SetScreen_Header(config[ZONE_0]);
+    write_header = WriteScreen_Header(driver_config);
+    if (write_header) SetScreen_Header(driver_config);
     
     /*--- Write the screen output---------------------------------------------------------------------------*/
-    write_screen = WriteScreen_Output(config[ZONE_0]);
-    if (write_screen) SetScreen_Output(config[ZONE_0]);
+    write_screen = WriteScreen_Output(driver_config);
+    if (write_screen) SetScreen_Output(driver_config);
     
   }
   
@@ -555,101 +556,100 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
 bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
   unsigned short iCounter;
+    
+  Convergence = false;
   
-  bool Already_Converged = Convergence;
-  
-  su2double monitor = HistoryOutput_Map[Conv_Field].Value;
-  
-  /*--- Cauchy based convergence criteria ---*/
-  
-  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT) {
+  if( HistoryOutput_Map.count(Conv_Field) > 0 ){
+    
+    su2double monitor = HistoryOutput_Map[Conv_Field].Value;
+    
+    /*--- Cauchy based convergence criteria ---*/
     
-    if (Iteration == 0){
-      for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
-        Cauchy_Serie[iCounter] = 0.0;
+    if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT) {
+      
+      if (Iteration == 0){
+        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
+          Cauchy_Serie[iCounter] = 0.0;
+        }
+        New_Func = monitor;
       }
+      
+      Old_Func = New_Func;
       New_Func = monitor;
+      Cauchy_Func = fabs(New_Func - Old_Func);
+      
+      Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
+      Cauchy_Value = 1.0;
+      if (Iteration >= config->GetCauchy_Elems()){     
+        Cauchy_Value = 0.0;
+        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
+          Cauchy_Value += Cauchy_Serie[iCounter];
+      }
+      
+      if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
+      else { Convergence = true; Convergence_FullMG = true; New_Func = 0.0;}
+      
+      SetHistoryOutputValue("CAUCHY", Cauchy_Value);
+      
     }
     
-    Old_Func = New_Func;
-    New_Func = monitor;
-    Cauchy_Func = fabs(New_Func - Old_Func);
+    /*--- Residual based convergence criteria ---*/
     
-    Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
-    Cauchy_Value = 1.0;
-    if (Iteration >= config->GetCauchy_Elems()){     
-      Cauchy_Value = 0.0;
-      for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-        Cauchy_Value += Cauchy_Serie[iCounter];
+    if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_RESIDUAL || HistoryOutput_Map[Conv_Field].FieldType == TYPE_AUTO_RESIDUAL) {
+      
+      /*--- Check the convergence ---*/
+      
+      if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
+      else { Convergence = false; Convergence_FullMG = false; }
+      
     }
     
-    if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
-    else { Convergence = true; Convergence_FullMG = true; New_Func = 0.0;}
+    /*--- Do not apply any convergence criteria of the number
+     of iterations is less than a particular value ---*/
     
-    SetHistoryOutputValue("CAUCHY", Cauchy_Value);
- 
-  }
-  
-  /*--- Residual based convergence criteria ---*/
-  
-  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_RESIDUAL || HistoryOutput_Map[Conv_Field].FieldType == TYPE_REL_RESIDUAL) {
+    if (Iteration < config->GetStartConv_Iter()) {
+      Convergence = false;
+      Convergence_FullMG = false;
+    }
+    
+    /*--- Apply the same convergence criteria to all the processors ---*/
+    
+#ifdef HAVE_MPI
     
-    /*--- Check the convergence ---*/
+    unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
+    sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
+    rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
     
-    if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
+    /*--- Convergence criteria ---*/
+    
+    sbuf_conv[0] = Convergence;
+    SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+    
+    /*-- Compute global convergence criteria in the master node --*/
+    
+    sbuf_conv[0] = 0;
+    if (rank == MASTER_NODE) {
+      if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
+      else sbuf_conv[0] = 0;
+    }
+    
+    SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+    
+    if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
     else { Convergence = false; Convergence_FullMG = false; }
     
-  }
-  
-  /*--- Do not apply any convergence criteria of the number
-     of iterations is less than a particular value ---*/
-  
-  if (Iteration < config->GetStartConv_Iter()) {
-    Convergence = false;
-    Convergence_FullMG = false;
-  }
-  
-  if (Already_Converged) { Convergence = true; Convergence_FullMG = true; }
-  
-  
-  /*--- Apply the same convergence criteria to all the processors ---*/
-  
-#ifdef HAVE_MPI
-  
-  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-  
-  /*--- Convergence criteria ---*/
-  
-  sbuf_conv[0] = Convergence;
-  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*-- Compute global convergence criteria in the master node --*/
-  
-  sbuf_conv[0] = 0;
-  if (rank == MASTER_NODE) {
-    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-    else sbuf_conv[0] = 0;
-  }
-  
-  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-  
-  if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
-  else { Convergence = false; Convergence_FullMG = false; }
-  
-  delete [] sbuf_conv;
-  delete [] rbuf_conv;
-  
+    delete [] sbuf_conv;
+    delete [] rbuf_conv;
+    
 #endif
-  
-  /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
-  
-  if (monitor != monitor) {
-    SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+    
+    /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
+    
+    if (monitor != monitor) {
+      SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+    }
+    
   }
-  
-  
   return Convergence;
 }
 
@@ -1230,7 +1230,7 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, TYPE_REL_RESIDUAL);
+      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, TYPE_AUTO_RESIDUAL);
       Average[currentField.OutputGroup] = true;
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){

From 070e2012797e463584543527d9d850d616979dd9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 9 Jul 2019 18:19:01 +0200
Subject: [PATCH 323/539] Added option to set output frequencies

---
 Common/include/config_structure.hpp |  1 +
 Common/src/config_structure.cpp     | 26 +++++++++++++--------
 SU2_CFD/src/output/COutput.cpp      | 35 ++++++++++++++++++++++++++---
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 38bcb1dc0a94..a440831045c0 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1059,6 +1059,7 @@ class CConfig {
   Restart_Iter;                 /*!< \brief Determines the restart iteration in the multizone problem */
   su2double Time_Step;          /*!< \brief Determines the time step for the multizone problem */
   su2double Max_Time;           /*!< \brief Determines the maximum time for the time-domain problems */
+  su2double *default_wrt_freq;
   su2double *HistoryWrtFreq,    /*!< \brief Array containing history writing frequencies for timer iter, outer iter, inner iter */
             *ScreenWrtFreq;     /*!< \brief Array containing screen writing frequencies for timer iter, outer iter, inner iter */
   bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index e15dbf25c340..8fdb08cb7ac6 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -652,6 +652,7 @@ void CConfig::SetPointersNull(void) {
   default_body_force         = NULL;
   default_sineload_coeff     = NULL;
   default_nacelle_location   = NULL;
+  default_wrt_freq           = NULL;
   
   default_cp_polycoeffs = NULL;
   default_mu_polycoeffs = NULL;
@@ -698,6 +699,10 @@ void CConfig::SetPointersNull(void) {
   top_optim_kernels       = NULL;
   top_optim_kernel_params = NULL;
   top_optim_filter_radius = NULL;
+  
+  ScreenOutput = NULL;
+  HistoryOutput = NULL;
+  VolumeOutput = NULL;
 
   /*--- Variable initialization ---*/
   
@@ -757,6 +762,7 @@ void CConfig::SetConfig_Options() {
   default_body_force         = new su2double[3];
   default_sineload_coeff     = new su2double[3];
   default_nacelle_location   = new su2double[5];
+  default_wrt_freq             = new su2double[3];
   
   /*--- All temperature polynomial fits for the fluid models currently
    assume a quartic form (5 coefficients). For example,
@@ -2416,13 +2422,12 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Type of output printed to the volume solution file */
   addStringListOption("VOLUME_OUTPUT", nVolumeOutput, VolumeOutput);
   
-  su2double WrtFreqDefault[] = {1.0,1.0,1.0};
-  
+  default_wrt_freq[0] = 1.0; default_wrt_freq[1] = 1.0; default_wrt_freq[2] = 1.0;
   /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
-  addDoubleArrayOption("HISTORY_WRT_FREQ", 3, HistoryWrtFreq, WrtFreqDefault);
+  addDoubleArrayOption("HISTORY_WRT_FREQ", 3, HistoryWrtFreq, default_wrt_freq);
   
   /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
-  addDoubleArrayOption("SCREEN_WRT_FREQ", 3, ScreenWrtFreq, WrtFreqDefault);
+  addDoubleArrayOption("SCREEN_WRT_FREQ", 3, ScreenWrtFreq, default_wrt_freq);
  
   /* DESCRIPTION: Using Uncertainty Quantification with SST Turbulence Model */
   addBoolOption("USING_UQ", using_uq, false);
@@ -3202,12 +3207,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
   
   if (!Multizone_Problem){
-    ScreenWrtFreq[1] = 1.0;
-    HistoryWrtFreq[1] = 1.0;
+    ScreenWrtFreq[1] = 0.0;
+    HistoryWrtFreq[1] = 0.0;
   }
-  
-
-  
 
   /*--- If we're solving a purely steady problem with no prescribed grid
    movement (both rotating frame and moving walls can be steady), make sure that
@@ -7265,6 +7267,7 @@ CConfig::~CConfig(void) {
   if (default_body_force    != NULL) delete [] default_body_force;
   if (default_sineload_coeff!= NULL) delete [] default_sineload_coeff;
   if (default_nacelle_location    != NULL) delete [] default_nacelle_location;
+  if (default_wrt_freq != NULL) delete [] default_wrt_freq;
   
   if (default_cp_polycoeffs != NULL) delete [] default_cp_polycoeffs;
   if (default_mu_polycoeffs != NULL) delete [] default_mu_polycoeffs;
@@ -7301,6 +7304,11 @@ CConfig::~CConfig(void) {
   if (top_optim_kernels != NULL) delete [] top_optim_kernels;
   if (top_optim_kernel_params != NULL) delete [] top_optim_kernel_params;
   if (top_optim_filter_radius != NULL) delete [] top_optim_filter_radius;
+  
+  if (ScreenOutput != NULL) delete [] ScreenOutput;
+  if (HistoryOutput != NULL) delete [] HistoryOutput;
+  if (VolumeOutput != NULL) delete [] VolumeOutput;
+  
 
 }
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 2187fcddd477..b08d85895cc2 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1252,15 +1252,44 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  
+
   bool write_header = false;
+  
+  unsigned long RestartIter = 0;
+  
+  if (config->GetRestart() && config->GetTime_Domain()){
+    RestartIter = config->GetRestart_Iter();
+  }
+  
+  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
+  
+  /*--- Header is always disabled for multizone problems unless explicitely requested --- */
+  
+  if (config->GetMultizone_Problem() && !config->GetWrt_ZoneConv()){
+    return false;
+  }
 
+  /* --- Always print header in the first iteration --- */
+  
+  if ((curr_InnerIter == 0) && 
+      (curr_OuterIter == 0) && 
+      (curr_TimeIter == RestartIter)){
+    return true;
+  }
+  
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+    return false;
+  }
+   
+  if (SU2_TYPE::Int(ScreenWrt_Freq[2]) == 0 && SU2_TYPE::Int(ScreenWrt_Freq[1]) == 0){
+    return false;
+  }
+  
   if (curr_InnerIter == 0){
     write_header = true;
   }
   
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
   return write_header;
 }
 

From 01936b5631d1448f406a27afcafecaae57b7274e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 10 Jul 2019 13:31:57 +0200
Subject: [PATCH 324/539] Enabled travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34200fe028a2..2df142d950f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ compiler:
 notifications:
     email:
         recipients:
-            - tim.albring@scicomp.uni-kl.de
+            - su2code-dev@lists.stanford.edu 
   
 branches:
     only:
-        - feature_input_output
+        - develop
 
 python:
     - 3.6

From 4f869ca7b28f4dec3b762d37dd23b94c918f46fc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 10 Jul 2019 13:33:05 +0200
Subject: [PATCH 325/539] Added performance output for filewriter

---
 .../include/output/filewriter/CFileWriter.hpp | 45 +++++++++-
 SU2_CFD/src/output/COutput.cpp                | 17 +++-
 .../filewriter/CParaviewBinaryFileWriter.cpp  | 88 ++++++++++++++++++-
 .../output/filewriter/CParaviewFileWriter.cpp | 26 +++++-
 .../filewriter/CSU2BinaryFileWriter.cpp       |  3 +-
 .../src/output/filewriter/CSU2FileWriter.cpp  | 27 +++++-
 .../filewriter/CTecplotBinaryFileWriter.cpp   | 28 +++++-
 .../output/filewriter/CTecplotFileWriter.cpp  | 24 +++++
 8 files changed, 246 insertions(+), 12 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index bec505783d3d..3a1fffcfde29 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "../../../Common/include/geometry_structure.hpp"
 #include "CParallelDataSorter.hpp"
+#include <sys/stat.h>
 
 class CFileWriter{
 protected:
@@ -12,13 +13,55 @@ class CFileWriter{
   
   string file_ext;
   
-public:
+  su2double StartTime, StopTime, UsedTime, Bandwidth, file_size;
   
+public:
+  /*!
+   * \brief CFileWriter
+   * \param fields
+   * \param nDim
+   */  
   CFileWriter(vector<string> fields, unsigned short nDim);
   
+  /*!
+   * \brief ~CFileWriter
+   */
   virtual ~CFileWriter();
   
+  /*!
+   * \brief Write_Data
+   * \param filename
+   * \param data_sorter
+   */
   virtual void Write_Data(string filename, CParallelDataSorter* data_sorter){}
   
+  /*!
+   * \brief Get_Bandwidth
+   */
+  su2double Get_Bandwidth(){return Bandwidth;}
+  
+  /*!
+   * \brief Get_Filesize
+   */
+  su2double Get_Filesize(){return file_size;}
+  
+  /*!
+   * \brief Get_UsedTime
+   * \return 
+   */
+  su2double Get_UsedTime(){return UsedTime;}
+ 
+protected:
+  /*!
+   * \brief Determine_Filesize
+   * \param filename
+   * \return 
+   */
+  unsigned long Determine_Filesize(std::string filename){
+      struct stat stat_buf;
+      int rc = stat(filename.c_str(), &stat_buf);
+      return rc == 0 ? stat_buf.st_size : -1;
+  }
+  
 };
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index b08d85895cc2..e0ae8c486c07 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -521,9 +521,13 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   
   surface_sort->SortOutputData(config, geometry);
   
-  /*--- Write data to file --- */
+  if (surface_sort->GetnElem() > 0){
+  
+    /*--- Write data to file --- */
   
-  file_writer->Write_Data(config->GetFilename(SurfaceFilename, ""), surface_sort);
+    file_writer->Write_Data(config->GetFilename(SurfaceFilename, ""), surface_sort);
+  
+  }
   
   delete file_writer;
   delete surface_sort;
@@ -547,6 +551,15 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   /*--- Write data to file --- */
   
   file_writer->Write_Data(config->GetFilename(FileName, ""), data_sorter);
+  
+  if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
+    cout << "Wrote " << file_writer->Get_Filesize()/1.0e6 << " MB to disk in ";
+    cout << file_writer->Get_UsedTime() << " s. (" << file_writer->Get_Bandwidth() << " MB/s)." << endl;
+  }
+  
+  if(format == SU2_RESTART_ASCII || format == SU2_RESTART_BINARY){
+    config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg() + file_writer->Get_Bandwidth());
+  }
 
   delete file_writer;
   
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index d97d6f77cec9..43554bc8c840 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -42,6 +42,16 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (val.c[0] == 0x10) BigEndian = false;
   else BigEndian = true;
   
+  file_size = 0.0;
+  
+  /*--- Set a timer for the file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
   /*--- Serial implementation in case we have not compiled with MPI. ---*/
   
 #ifndef HAVE_MPI
@@ -64,15 +74,19 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   strcpy(str_buf, "# vtk DataFile Version 3.0\n");
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   strcpy(str_buf, "vtk output\n");
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   strcpy(str_buf, "BINARY\n");
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   /*--- Write the point coordinates. ---*/
   
@@ -80,6 +94,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   SPRINTF(str_buf, "POINTS %i float\n", (int)GlobalPoint);
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   /*--- Load/write the 1D buffer of point coordinates. ---*/
   
@@ -97,6 +112,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian) SwapBytes((char *)coord_buf, sizeof(float), 3*GlobalPoint);
   
   fwrite(coord_buf, sizeof(float), 3*GlobalPoint, fhw);
+  file_size += sizeof(char)*3*GlobalPoint;
+  
   delete [] coord_buf;
   
   /*--- Write the connectivity data. ---*/
@@ -119,6 +136,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   SPRINTF (str_buf, "\nCELLS %i %i\n", (int)data_sorter->GetnElem(),
            (int)nGlobal_Elem_Storage);
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
+  
   conn_buf = new int[data_sorter->GetnElem()*(N_POINTS_HEXAHEDRON+1)];
   
   
@@ -137,6 +156,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   fwrite(conn_buf, sizeof(int),
          nTot_Line*(N_POINTS_LINE+1), fhw);
   
+  file_size += sizeof(int)*nTot_Line*(N_POINTS_LINE+1);
+  
   for (iElem = 0; iElem < nTot_Tria; iElem++) {
     iNode  = iElem*N_POINTS_TRIANGLE;
     iNode2 = iElem*(N_POINTS_TRIANGLE+1);
@@ -149,6 +170,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Tria*(N_POINTS_TRIANGLE+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Tria*(N_POINTS_TRIANGLE+1), fhw);
+  file_size += sizeof(int)*nTot_Tria*(N_POINTS_TRIANGLE+1);
   
   for (iElem = 0; iElem < nTot_Quad; iElem++) {
     iNode  = iElem*N_POINTS_QUADRILATERAL;
@@ -163,6 +185,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Quad*(N_POINTS_QUADRILATERAL+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Quad*(N_POINTS_QUADRILATERAL+1), fhw);
+  file_size += sizeof(int)*nTot_Quad*(N_POINTS_QUADRILATERAL+1);
   
   for (iElem = 0; iElem < nTot_Tetr; iElem++) {
     iNode  = iElem*N_POINTS_TETRAHEDRON;
@@ -177,7 +200,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Tetr*(N_POINTS_TETRAHEDRON+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Tetr*(N_POINTS_TETRAHEDRON+1), fhw);
-  
+  file_size += sizeof(int)*nTot_Tetr*(N_POINTS_TETRAHEDRON+1);
+   
   for (iElem = 0; iElem < nTot_Hexa; iElem++) {
     iNode  = iElem*N_POINTS_HEXAHEDRON;
     iNode2 = iElem*(N_POINTS_HEXAHEDRON+1);
@@ -195,6 +219,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Hexa*(N_POINTS_HEXAHEDRON+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Hexa*(N_POINTS_HEXAHEDRON+1), fhw);
+  file_size += sizeof(int)*nTot_Hexa*(N_POINTS_HEXAHEDRON+1);
   
   for (iElem = 0; iElem < nTot_Pris; iElem++) {
     iNode  = iElem*N_POINTS_PRISM;
@@ -211,6 +236,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Pris*(N_POINTS_PRISM+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Pris*(N_POINTS_PRISM+1), fhw);
+  file_size += sizeof(int)*nTot_Pris*(N_POINTS_PRISM+1);
   
   for (iElem = 0; iElem < nTot_Pyra; iElem++) {
     iNode  = iElem*N_POINTS_PYRAMID;
@@ -226,7 +252,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                             nTot_Pyra*(N_POINTS_PYRAMID+1));
   fwrite(conn_buf, sizeof(int),
          nTot_Pyra*(N_POINTS_PYRAMID+1), fhw);
-  
+  file_size += sizeof(int)*nTot_Pyra*(N_POINTS_PYRAMID+1);
   
   
   if (conn_buf != NULL) delete [] conn_buf;
@@ -236,6 +262,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
 
   SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(data_sorter->GetnElem()));
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)*strlen(str_buf);
   
   int *type_buf = NULL;
   
@@ -247,6 +274,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Line);
   fwrite(type_buf, sizeof(int), nTot_Line, fhw);
+  file_size += sizeof(int)*nTot_Line;
     
   for (iElem = 0; iElem < nTot_Tria; iElem++) {
     type_buf[iElem] = TRIANGLE;
@@ -254,6 +282,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Tria);
   fwrite(type_buf, sizeof(int), nTot_Tria, fhw);
+  file_size += sizeof(int)*nTot_Tria;
   
   for (iElem = 0; iElem < nTot_Quad; iElem++) {
     type_buf[iElem] = QUADRILATERAL;
@@ -261,6 +290,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Quad);
   fwrite(type_buf, sizeof(int), nTot_Quad, fhw);
+  file_size += sizeof(int)*nTot_Quad;
   
   for (iElem = 0; iElem < nTot_Tetr; iElem++) {
     type_buf[iElem] = TETRAHEDRON;
@@ -268,6 +298,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Tetr);
   fwrite(type_buf, sizeof(int), nTot_Tetr, fhw);
+  file_size += sizeof(int)*nTot_Tetr;
   
   for (iElem = 0; iElem < nTot_Hexa; iElem++) {
     type_buf[iElem] = HEXAHEDRON;
@@ -275,6 +306,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Hexa);
   fwrite(type_buf, sizeof(int), nTot_Hexa, fhw);
+  file_size += sizeof(int)*nTot_Hexa;
   
   for (iElem = 0; iElem < nTot_Pris; iElem++) {
     type_buf[iElem] = PRISM;
@@ -282,6 +314,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Pris);
   fwrite(type_buf, sizeof(int), nTot_Pris, fhw);
+  file_size += sizeof(int)*nTot_Pris;
   
   for (iElem = 0; iElem < nTot_Pyra; iElem++) {
     type_buf[iElem] = PYRAMID;
@@ -289,7 +322,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   if (!BigEndian)
     SwapBytes((char *)type_buf, sizeof(int), nTot_Pyra);
   fwrite(type_buf, sizeof(int), nTot_Pyra, fhw);
-  
+  file_size += sizeof(int)*nTot_Pyra;
   
   
   if (type_buf != NULL) delete [] type_buf;
@@ -298,6 +331,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   SPRINTF (str_buf, "\nPOINT_DATA %i\n", (int)GlobalPoint);
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+  file_size += sizeof(char)* strlen(str_buf);
   
   unsigned short varStart = 2;
   if (nDim == 3) varStart++;
@@ -335,6 +369,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       fieldname.erase(fieldname.end()-2,fieldname.end());
       SPRINTF (str_buf, "\nVECTORS %s float\n", fieldname.c_str());
       fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      file_size += sizeof(char)* strlen(str_buf);
       
       /*--- Prepare the 1D data buffer on this rank. ---*/
       
@@ -356,6 +391,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       if (!BigEndian)
         SwapBytes((char *)vec_buf, sizeof(float), NCOORDS*GlobalPoint);
       fwrite(vec_buf, sizeof(float), NCOORDS*GlobalPoint, fhw);
+      file_size += sizeof(float)*NCOORDS*GlobalPoint;
       
       delete [] vec_buf;
       
@@ -365,9 +401,11 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       
       SPRINTF (str_buf, "\nSCALARS %s float 1\n", fieldname.c_str());
       fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      file_size += sizeof(char)* strlen(str_buf);
       
       SPRINTF (str_buf, "LOOKUP_TABLE default\n");
       fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
+      file_size += sizeof(char)* strlen(str_buf);
       
       /*--- Prepare the 1D data buffer on this rank. ---*/
       
@@ -383,6 +421,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       if (!BigEndian)
         SwapBytes((char *)scalar_buf, sizeof(float), GlobalPoint);
       fwrite(scalar_buf, sizeof(float), GlobalPoint, fhw);
+      file_size += sizeof(float)*GlobalPoint;
       
       delete [] scalar_buf;
       
@@ -438,24 +477,29 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
+  
   
   strcpy(str_buf, "vtk output\n");
   if (rank == MASTER_NODE)
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
   
   strcpy(str_buf, "BINARY\n");
   if (rank == MASTER_NODE)
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
   
   strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
   if (rank == MASTER_NODE)
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
   
   /*--- Communicate the number of total points that will be
    written by each rank. After this communication, each proc knows how
@@ -493,6 +537,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
   
   /*--- Load/write the 1D buffer of point coordinates. Note that we
    always have 3 coordinate dimensions, even for 2D problems. ---*/
@@ -539,6 +584,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   /*--- Update the displacement position for MPI IO. ---*/
   
   disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
+  file_size += sizeof(float)*myPoint*NCOORDS;
   
   /*--- Free the derived datatype and coordinate array. ---*/
   
@@ -630,6 +676,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);
   
   /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
   
@@ -738,6 +785,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   disp += nElemStorage_Cum[size]*sizeof(int);
   
+  file_size += sizeof(int)*myElemStorage;  
+  
   /*--- Free the derived datatype. ---*/
   
   MPI_Type_free(&filetype);
@@ -752,6 +801,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);  
   
   int *type_buf = new int[myElem];
   unsigned long jElem = 0;
@@ -810,6 +860,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   disp += nElem_Cum[size]*sizeof(int);
   
+  file_size += sizeof(int)*myElem;    
+  
   /*--- Free the derived datatype. ---*/
   
   MPI_Type_free(&filetype);
@@ -824,6 +876,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
     MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                       MPI_CHAR, MPI_STATUS_IGNORE);
   disp += strlen(str_buf)*sizeof(char);
+  file_size += sizeof(char)*strlen(str_buf);  
   
   /*--- Adjust container start location to avoid point coords. ---*/
   
@@ -874,6 +927,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
         MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                           MPI_CHAR, MPI_STATUS_IGNORE);
       disp += strlen(str_buf)*sizeof(char);
+      file_size += sizeof(char)*strlen(str_buf);  
       
       /*--- Prepare the 1D data buffer on this rank. ---*/
       
@@ -925,6 +979,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       
       disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
       
+      file_size += sizeof(float)*myPoint*NCOORDS;  
+      
       /*--- Free the derived datatype and coordinate array. ---*/
       
       MPI_Type_free(&filetype);
@@ -941,6 +997,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
         MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                           MPI_CHAR, MPI_STATUS_IGNORE);
       disp += strlen(str_buf)*sizeof(char);
+      file_size += sizeof(char)*strlen(str_buf);  
       
       MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
                         (char*)"native", MPI_INFO_NULL);
@@ -949,6 +1006,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
         MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
                           MPI_CHAR, MPI_STATUS_IGNORE);
       disp += strlen(str_buf)*sizeof(char);
+      file_size += sizeof(char)*strlen(str_buf);  
       
       /*--- Prepare the 1D data buffer on this rank. ---*/
       
@@ -993,6 +1051,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       
       disp += nPoint_Cum[size]*sizeof(float);
       
+      file_size += sizeof(float)*myPoint;  
+      
       /*--- Free the derived datatype and coordinate array. ---*/
       
       MPI_Type_free(&filetype);
@@ -1007,6 +1067,28 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   MPI_File_close(&fhw);
   
+  
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  /*--- Communicate the total file size for the restart ---*/
+  
+#ifdef HAVE_MPI
+  su2double my_file_size = file_size;
+  SU2_MPI::Allreduce(&my_file_size, &file_size, 1,
+                     MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
+  
   /*--- Delete the offset counters that we needed for MPI IO. ---*/
   
   delete [] nElem_Snd;        delete [] nElem_Cum;
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index 2cb2e75f1a41..08f00a1a4e0f 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -31,7 +31,15 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
   ofstream Paraview_File;
 
   int iProcessor;
- 
+  
+  /*--- Set a timer for the file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
   /*--- Open Paraview ASCII file and write the header. ---*/
   
   if (rank == MASTER_NODE) {
@@ -344,5 +352,21 @@ found = fieldnames[iField].find("_z");
   }
 
   Paraview_File.close();
+  
+  
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  file_size = Determine_Filesize(filename);
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 39b7dce30a66..ea98399a5628 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -32,7 +32,8 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
   
   ofstream restart_file;
   char str_buf[CGNS_STRING_SIZE], fname[100];
-  su2double file_size = 0.0, StartTime, StopTime, UsedTime, Bandwidth;
+
+  file_size = 0.0;
   
   strcpy(fname, filename.c_str());
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 20c41ac9370a..8fe6636c8ede 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -28,6 +28,14 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   int iProcessor;
   
+  /*--- Set a timer for the file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
   /*--- Only the master node writes the header. ---*/
   
   if (rank == MASTER_NODE) {
@@ -82,7 +90,24 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
 #endif
     
   }
-
+  
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  /*--- Determine the file size ---*/
+  
+  file_size = Determine_Filesize(filename);
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
+  
   /*--- Write the metadata (master rank alone) ----*/
 
 //  if (rank == MASTER_NODE) {
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 02122f0e0120..f22f8326c13c 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -29,6 +29,14 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
   }
   
+  /*--- Set a timer for the binary file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif  
+  
 #ifdef HAVE_TECIO
   
   /*--- Reduce the total number of each element. ---*/
@@ -92,15 +100,16 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
       zone_type = ZONETYPE_FEQUADRILATERAL;
     }
     else {
-      zone_type = ZONETYPE_FEBRICK;
+      zone_type = ZONETYPE_FEBRICK;      
     }
   }
   else {
-    if (nTot_Line > 0 && (nTot_Tria + nTot_Quad == 0)){
+    if (nTot_Line >= 0 && (nTot_Tria + nTot_Quad == 0)){
       zone_type = ZONETYPE_FELINESEG;
+      
     }
     else{
-      zone_type = ZONETYPE_FEQUADRILATERAL;
+      zone_type = ZONETYPE_FEQUADRILATERAL;      
     }
   }
 
@@ -626,7 +635,20 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   
 #endif /* HAVE_TECIO */
   
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
 
+  file_size = Determine_Filesize(filename);
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index c2ced304786c..4c51034060e2 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -33,6 +33,16 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
 
   ofstream Tecplot_File;
   
+  file_size = 0.0;
+  
+  /*--- Set a timer for the file writing. ---*/
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
   /*--- Reduce the total number of each element. ---*/
 
   unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
@@ -213,6 +223,20 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   Tecplot_File.close();
   
+  /*--- Compute and store the write time. ---*/
+  
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTime = StopTime-StartTime;
+  
+  file_size = Determine_Filesize(filename);
+  
+  /*--- Compute and store the bandwidth ---*/
+  
+  Bandwidth = file_size/(1.0e6)/UsedTime;
 }
 
 

From 829056861de7250a38e1a35f5378424d820c6a09 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 10 Jul 2019 13:33:22 +0200
Subject: [PATCH 326/539] Small bugfixes

---
 Common/include/toolboxes/printing_toolbox.hpp | 6 +++---
 SU2_CFD/src/driver_direct_multizone.cpp       | 2 --
 SU2_CFD/src/output/CFlowOutput.cpp            | 2 ++
 SU2_CFD/src/variables/CVariable.cpp           | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 7e95b12789d0..a44656c65f23 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -160,19 +160,19 @@ class CTablePrinter{
 
 
 
-inline void PrintScreenFixed(std::stringstream &stream, su2double val, unsigned short field_width) {
+inline void PrintScreenFixed(std::ostream &stream, su2double val, unsigned short field_width) {
   stream.precision(6); stream.setf(std::ios::fixed, std::ios::floatfield); stream.width(field_width);
   stream << std::right << val;
   stream.unsetf(std::ios::fixed);
 }
 
-inline void PrintScreenScientific(std::stringstream &stream, su2double val, unsigned short field_width) {
+inline void PrintScreenScientific(std::ostream &stream, su2double val, unsigned short field_width) {
   stream.precision(4); stream.setf(std::ios::scientific, std::ios::floatfield); stream.width(field_width);
   stream << std::right << val;
   stream.unsetf(std::ios::scientific);  
 }
 
-inline void PrintScreenInteger(std::stringstream &stream, unsigned long val, unsigned short field_width){
+inline void PrintScreenInteger(std::ostream &stream, unsigned long val, unsigned short field_width){
   stream.width(field_width);
   stream << std::right << val;
 }
diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 54a53a2e9882..07c8d17c54a9 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -438,8 +438,6 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
   /*--- Print out the convergence data to screen and history file ---*/
   driver_output->SetMultizoneHistory_Output(output, config_container, driver_config, driver_config->GetTimeIter(), driver_config->GetOuterIter());
 
-  if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
-
   return driver_output->GetConvergence();
 
 }
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index b8be7ba68210..37acd1ef4dde 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -601,6 +601,8 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
   delete [] Vector;
   delete [] Surface_VelocityIdeal;
   delete [] Surface_MassFlow_Abs;
+  
+  std::cout << std::resetiosflags(std::cout.flags());
 }
 
 void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
diff --git a/SU2_CFD/src/variables/CVariable.cpp b/SU2_CFD/src/variables/CVariable.cpp
index 0bd41552d45e..be21b7d495b4 100644
--- a/SU2_CFD/src/variables/CVariable.cpp
+++ b/SU2_CFD/src/variables/CVariable.cpp
@@ -114,6 +114,7 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
   Residual_Old = NULL;
   Residual_Sum = NULL;
   Solution_Adj_Old = NULL;
+  Solution_BGS_k = NULL;
 
   /*--- Initializate the number of dimension and number of variables ---*/
   nDim = val_nDim;

From d1f26f8dd5efcba31bcdb967969003f60f2a50f2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 10 Jul 2019 17:52:20 +0200
Subject: [PATCH 327/539] Fixes for disabled mpi compilation

---
 SU2_CFD/src/driver_direct_multizone.cpp       |   1 -
 SU2_CFD/src/output/COutput.cpp                |   1 -
 .../filewriter/CParaviewBinaryFileWriter.cpp  |  13 +-
 .../output/filewriter/CParaviewFileWriter.cpp |   1 -
 .../filewriter/CSU2BinaryFileWriter.cpp       |   6 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |   2 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |   4 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      |   2 +-
 .../filewriter/CTecplotBinaryFileWriter.cpp   | 210 +++++++-----------
 9 files changed, 95 insertions(+), 145 deletions(-)

diff --git a/SU2_CFD/src/driver_direct_multizone.cpp b/SU2_CFD/src/driver_direct_multizone.cpp
index 07c8d17c54a9..64daac802acb 100644
--- a/SU2_CFD/src/driver_direct_multizone.cpp
+++ b/SU2_CFD/src/driver_direct_multizone.cpp
@@ -398,7 +398,6 @@ void CMultizoneDriver::Corrector(unsigned short val_iZone) {
 
 bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
 
-  bool Convergence = false;
   int rank = MASTER_NODE;
 #ifdef HAVE_MPI
   int size;
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index e0ae8c486c07..acc12b39a151 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1145,7 +1145,6 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
 
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
   
-  bool Wrt_Halo = config->GetWrt_Halo();
   unsigned short iMarker = 0;
   unsigned long iPoint = 0, jPoint = 0;
   long iVertex = 0;
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 43554bc8c840..33d8e15cceb6 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -23,7 +23,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   unsigned short iDim;
   
-  unsigned long iPoint, iElem, iNode;
+  unsigned long iPoint, iElem;
   
   ofstream Paraview_File;
     
@@ -59,8 +59,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   FILE* fhw;
   fhw = fopen(fname, "wb");
   
-  unsigned long iNode2;
-  unsigned long nSurf_Elem_Storage;
+  unsigned long iNode2, iNode;
   unsigned long nGlobal_Elem_Storage;
   
   /*--- Error check for opening the file. ---*/
@@ -346,18 +345,18 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
                     fieldname.end());
     
     bool output_variable = true, isVector = false;
-    size_t found = fieldname[iField].find("_x");
+    size_t found = fieldnames[iField].find("_x");
     if (found!=string::npos) {
       output_variable = true;
       isVector = true;
     }
-    found = fieldname[iField].find("_y");
+    found = fieldnames[iField].find("_y");
     if (found!=string::npos) {
       //skip
       output_variable = false;
       VarCounter++;
     }
-    found = fieldname[iField].find("_z");
+    found = fieldnames[iField].find("_z");
     if (found!=string::npos) {
       //skip
       output_variable = false;
@@ -384,7 +383,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
           if (nDim == 2 && iDim == 2) {
             vec_buf[iPoint*NCOORDS + iDim] = 0.0;
           } else {
-            val = (float)SU2_TYPE::GetValue(Data[VarCounter+iDim][iPoint]);
+            val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter+iDim,iPoint));
             vec_buf[iPoint*NCOORDS + iDim] = val;
           }
         }
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index 08f00a1a4e0f..bacd54891f85 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -25,7 +25,6 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
 
   unsigned long iPoint, iElem;
 
-  unsigned long nSurf_Elem_Storage;
   unsigned long nGlobal_Elem_Storage;
 
   ofstream Paraview_File;
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index ea98399a5628..2adc688e1b28 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -111,7 +111,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
    needed for when we read the strings later. ---*/
 
   for (iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    strncpy(str_buf, Variable_Names[iVar].c_str(), CGNS_STRING_SIZE);
+    strncpy(str_buf, fieldnames[iVar].c_str(), CGNS_STRING_SIZE);
     fwrite(str_buf, CGNS_STRING_SIZE, sizeof(char), fhw);
     file_size += (su2double)CGNS_STRING_SIZE*sizeof(char);
   }
@@ -123,8 +123,8 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
 
   /*--- Write the external iteration. ---*/
 
-  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
-  file_size += (su2double)sizeof(int);
+//  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
+//  file_size += (su2double)sizeof(int);
 
   /*--- Write the metadata. ---*/
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 0d2e232cc513..96a69158fb78 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -24,7 +24,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   filename += file_ext;
   
-  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
+  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], offset, nElem;
   unsigned short iMarker, iDim, iChar, VTK_Type, nMarker_;
   short SendTo;
   ifstream input_file;
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 9a895bd2ad88..8f3ff5945c97 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -215,7 +215,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
                      MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #else
-  nGlobal_Surf_Poin = nSurf_Poin_Par;
+  nGlobal_Poin_Par = nParallel_Poin;
 #endif
 
   /*-------------------------------------------------------------------*/
@@ -322,7 +322,7 @@ void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometr
     
     unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
-    nSurf_Elem_Par   = nTotal_Surf_Elem;
+    nGlobal_Elem_Par   = nTotal_Surf_Elem;
 #else
     SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 4a355a4d05ae..dc95f643dcde 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1104,7 +1104,7 @@ void CSurfaceFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometr
   
   unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
-  nSurf_Elem_Par   = nTotal_Surf_Elem;
+  nGlobal_Elem_Par   = nTotal_Surf_Elem;
 #else
   SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index f22f8326c13c..c607b2f1e9a7 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -344,26 +344,19 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
 #else
 
   unsigned short iVar;
-
+  
   vector<passivedouble> var_data;
-  size_t var_data_size = nVar_Par * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
+  size_t var_data_size = fieldnames.size() * data_sorter->GetnPoints();
   var_data.reserve(var_data_size);
   
-  if (surf_sol) {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &var_data[iVar * nSurf_Poin_Par]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
-  } else {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nParallel_Poin; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nParallel_Poin, &var_data[iVar * nParallel_Poin]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
+
+  for (iVar = 0; err == 0 && iVar <  fieldnames.size(); iVar++) {
+    for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
+      var_data.push_back(SU2_TYPE::GetValue(data_sorter->GetData(iVar,i)));
+    err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, data_sorter->GetnPoints(), &var_data[iVar * data_sorter->GetnPoints()]);
+    if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
   }
+  
 
 #endif /* HAVE_MPI */
   
@@ -514,119 +507,80 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     }
   }
 #else
-  if (surf_sol) {
-
-    int64_t nodes[4];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      nodes[0] = Conn_BoundLine_Par[iNode+0];
-      nodes[1] = Conn_BoundLine_Par[iNode+1];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 2, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_BoundTria_Par[iNode+0];
-      nodes[1] = Conn_BoundTria_Par[iNode+1];
-      nodes[2] = Conn_BoundTria_Par[iNode+2];
-      nodes[3] = Conn_BoundTria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_BoundQuad_Par[iNode+0];
-      nodes[1] = Conn_BoundQuad_Par[iNode+1];
-      nodes[2] = Conn_BoundQuad_Par[iNode+2];
-      nodes[3] = Conn_BoundQuad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-  } else {
-
-    int64_t nodes[8];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_Tria_Par[iNode+0];
-      nodes[1] = Conn_Tria_Par[iNode+1];
-      nodes[2] = Conn_Tria_Par[iNode+2];
-      nodes[3] = Conn_Tria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_Quad_Par[iNode+0];
-      nodes[1] = Conn_Quad_Par[iNode+1];
-      nodes[2] = Conn_Quad_Par[iNode+2];
-      nodes[3] = Conn_Quad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      nodes[0] = Conn_Tetr_Par[iNode+0];
-      nodes[1] = Conn_Tetr_Par[iNode+1];
-      nodes[2] = Conn_Tetr_Par[iNode+2];
-      nodes[3] = Conn_Tetr_Par[iNode+2];
-      nodes[4] = Conn_Tetr_Par[iNode+3];
-      nodes[5] = Conn_Tetr_Par[iNode+3];
-      nodes[6] = Conn_Tetr_Par[iNode+3];
-      nodes[7] = Conn_Tetr_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      nodes[0] = Conn_Hexa_Par[iNode+0];
-      nodes[1] = Conn_Hexa_Par[iNode+1];
-      nodes[2] = Conn_Hexa_Par[iNode+2];
-      nodes[3] = Conn_Hexa_Par[iNode+3];
-      nodes[4] = Conn_Hexa_Par[iNode+4];
-      nodes[5] = Conn_Hexa_Par[iNode+5];
-      nodes[6] = Conn_Hexa_Par[iNode+6];
-      nodes[7] = Conn_Hexa_Par[iNode+7];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      nodes[0] = Conn_Pris_Par[iNode+0];
-      nodes[1] = Conn_Pris_Par[iNode+1];
-      nodes[2] = Conn_Pris_Par[iNode+1];
-      nodes[3] = Conn_Pris_Par[iNode+2];
-      nodes[4] = Conn_Pris_Par[iNode+3];
-      nodes[5] = Conn_Pris_Par[iNode+4];
-      nodes[6] = Conn_Pris_Par[iNode+4];
-      nodes[7] = Conn_Pris_Par[iNode+5];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-    
-    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      nodes[0] = Conn_Pyra_Par[iNode+0];
-      nodes[1] = Conn_Pyra_Par[iNode+1];
-      nodes[2] = Conn_Pyra_Par[iNode+2];
-      nodes[3] = Conn_Pyra_Par[iNode+3];
-      nodes[4] = Conn_Pyra_Par[iNode+4];
-      nodes[5] = Conn_Pyra_Par[iNode+4];
-      nodes[6] = Conn_Pyra_Par[iNode+4];
-      nodes[7] = Conn_Pyra_Par[iNode+4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
+  
+  int64_t nodes[8];
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+    nodes[3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+  }
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
+    nodes[3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+  }
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
+    nodes[3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
+    nodes[4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[5] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[6] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[7] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+  }
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2);
+    nodes[3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3);
+    nodes[4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4);
+    nodes[5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5);
+    nodes[6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6);
+    nodes[7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+  }
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1);
+    nodes[3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2);
+    nodes[4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3);
+    nodes[5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4);
+    nodes[6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4);
+    nodes[7] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
+  
+  for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
+    nodes[0] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0);
+    nodes[1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1);
+    nodes[2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2);
+    nodes[3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3);
+    nodes[4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[6] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[7] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
+    if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
+  }
+  
+  
 
 #endif
   

From ada86e107f0c8e9a534155d89222a5c8ef9fac12 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 10 Jul 2019 17:53:46 +0200
Subject: [PATCH 328/539] Adapted MMS test cases

---
 TestCases/mms/dg_navierstokes/lam_mms_dg.cfg      | 13 ++++++++-----
 .../mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg      | 13 ++++++++-----
 TestCases/mms/dg_ringleb/ringleb_dg.cfg           | 15 +++++++++------
 TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg    | 13 ++++++++-----
 .../mms/fvm_incomp_navierstokes/lam_mms_fds.cfg   | 13 ++++++++-----
 TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg    | 13 ++++++++-----
 6 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index 700dcefc151a..3bee767b1570 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -86,7 +86,7 @@ MARKER_CUSTOM= ( BottomBoundary, LeftBoundary, RightBoundary, TopBoundary )
 CFL_NUMBER= 0.03
 %
 % Number of total iterations
-EXT_ITER= 101
+ITER= 101
 %
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
@@ -147,7 +147,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -159,13 +159,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -174,7 +174,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -184,3 +184,6 @@ WRT_SOL_FREQ= 25000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index f7fabad7d3d3..61d7ec2bd3e6 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -99,7 +99,7 @@ CFL_NUMBER= 0.2
 %CFL_NUMBER=1.e-30
 %
 % Number of total iterations
-EXT_ITER= 101
+ITER= 101
 %
 % Runge-Kutta alpha coefficients
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
@@ -165,7 +165,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -177,13 +177,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -192,7 +192,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -202,3 +202,6 @@ WRT_SOL_FREQ= 25000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index fbe7a0fc1942..f70271b43857 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -95,8 +95,8 @@ CFL_NUMBER= 1.0
 %CFL_NUMBER= 0.2       % For AUSM
 %
 % Number of total iterations
-EXT_ITER= 101
-%EXT_ITER= 1
+ITER= 101
+%ITER= 1
 %
 % Runge-Kutta alpha coefficients
 %RK_ALPHA_COEFF= ( 0.25, 0.166667, 0.375, 0.5, 1.0 )
@@ -164,7 +164,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -176,13 +176,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -191,7 +191,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -201,3 +201,6 @@ WRT_SOL_FREQ= 5000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index 345f9fb9242f..247ffadfb6e2 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -90,7 +90,7 @@ MAX_DELTA_TIME= 1E30
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 9999
+ITER= 9999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -195,7 +195,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -207,13 +207,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -222,7 +222,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -232,3 +232,6 @@ WRT_SOL_FREQ= 50
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index 2094cef844e8..c379949402af 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -107,7 +107,7 @@ MAX_DELTA_TIME= 1E30
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 9999
+ITER= 9999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -216,7 +216,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -228,13 +228,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -243,7 +243,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -253,3 +253,6 @@ WRT_SOL_FREQ= 50
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% 
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index 1f9cfe746b1c..1335a77edbc5 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -122,7 +122,7 @@ MAX_DELTA_TIME= 1E30
 RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
 %
 % Number of total iterations
-EXT_ITER= 9999
+ITER= 9999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -231,7 +231,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -243,13 +243,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +258,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -268,3 +268,6 @@ WRT_SOL_FREQ= 50
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)

From f7244fc69b2271c08998bf407c089c6c95e6204b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Jul 2019 10:52:08 +0200
Subject: [PATCH 329/539] Fix for AD

---
 SU2_CFD/src/output/CDriverOutput.cpp               |  8 ++++----
 SU2_CFD/src/output/COutput.cpp                     | 14 +++++++-------
 .../output/filewriter/CTecplotBinaryFileWriter.cpp |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 7058f564433a..56a2eb96d59a 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -174,7 +174,7 @@ inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
 
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -183,7 +183,7 @@ inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq[1]) && 
+  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(ScreenWrt_Freq[1])) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
@@ -200,7 +200,7 @@ inline bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq[0])&& 
+  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(HistoryWrt_Freq[0]))&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -209,7 +209,7 @@ inline bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq[1]) && 
+  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(HistoryWrt_Freq[1])) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index acc12b39a151..f66f0b2376d9 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1289,7 +1289,7 @@ bool COutput::WriteScreen_Header(CConfig *config) {
     return true;
   }
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     return false;
   }
@@ -1318,7 +1318,7 @@ bool COutput::WriteScreen_Output(CConfig *config) {
   
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq[0])&& 
+  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -1327,14 +1327,14 @@ bool COutput::WriteScreen_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq[1]) && 
+  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(ScreenWrt_Freq[1])) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, ScreenWrt_Freq[2]) &&
+  if (!PrintOutput(curr_InnerIter, SU2_TYPE::Int(ScreenWrt_Freq[2])) &&
       !(curr_InnerIter == config->GetnInner_Iter() - 1)){
     
     return false;
@@ -1351,7 +1351,7 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq[0])&& 
+  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(HistoryWrt_Freq[0]))&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -1360,14 +1360,14 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq[1]) && 
+  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(HistoryWrt_Freq[1])) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, HistoryWrt_Freq[2]) &&
+  if (!PrintOutput(curr_InnerIter, SU2_TYPE::Int(HistoryWrt_Freq[2])) &&
       !(curr_InnerIter == config->GetnInner_Iter() - 1)){
     
     return false;
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index c607b2f1e9a7..0e85e999a031 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -128,7 +128,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
 
   if (timestep > 0.0){
     is_unsteady = true;
-    solution_time = timestep*time_iter;
+    solution_time = SU2_TYPE::GetValue(timestep)*time_iter;
   }
   
   int32_t zone;

From abfe70a3c6c891e1fa30218162b477f2d58e0e6a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Jul 2019 14:32:53 +0200
Subject: [PATCH 330/539] Adapted more test cases

---
 SU2_CFD/src/driver_structure.cpp              |  1 -
 SU2_PY/SU2_CFD.py                             |  4 ++--
 TestCases/parallel_regression.py              | 24 +++++++++++--------
 .../flatPlate_rigidMotion_Conf.cfg            |  5 ++--
 .../sup_vor_shed_WA.cfg                       |  1 +
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 06e13320a928..dbc666f6f8d3 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -619,7 +619,6 @@ void CDriver::Postprocessing() {
     delete [] ConvHist_file;
     }
   }
-  delete [] ConvHist_file;
 
   if (rank == MASTER_NODE)
     cout << endl <<"------------------------- Solver Postprocessing -------------------------" << endl;
diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
index 8590a9f83cbd..b67b8d568532 100755
--- a/SU2_PY/SU2_CFD.py
+++ b/SU2_PY/SU2_CFD.py
@@ -94,10 +94,10 @@ def main():
       SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, comm);
     elif options.harmonic_balance:
       SU2Driver = pysu2.CHBDriver(options.filename, options.nZone, comm);
-    elif (options.nZone == 2) and (options.fsi):
+    elif (options.nZone >= 2):
       SU2Driver = pysu2.CMultizoneDriver(options.filename, options.nZone, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index f0904a2be692..656d7a55258b 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -671,6 +671,7 @@ def main():
     harmonic_balance.su2_exec  = "parallel_computation.py -f"
     harmonic_balance.timeout   = 1600
     harmonic_balance.tol       = 0.00001
+    harmonic_balance.new_output = False
     test_list.append(harmonic_balance)
 
     # Turbulent pitching NACA 64a010 airfoil
@@ -682,6 +683,7 @@ def main():
     hb_rans_preconditioning.su2_exec  = "parallel_computation.py -f"
     hb_rans_preconditioning.timeout   = 1600
     hb_rans_preconditioning.tol       = 0.00001
+    hb_rans_preconditioning.new_output = False
     test_list.append(hb_rans_preconditioning)
 
     ######################################
@@ -746,7 +748,7 @@ def main():
     aeroelastic.test_vals = [0.078210, 0.036447, -0.001685, -0.000113] #last 4 columns
     aeroelastic.su2_exec  = "parallel_computation.py -f"
     aeroelastic.timeout   = 1600
-    aeroelastic.tol       = 0.000001
+    aeroelastic.tol       = 0.00001
     aeroelastic.unsteady  = True
     test_list.append(aeroelastic)
 
@@ -861,7 +863,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 5
-    uniform_flow.test_vals = [5.000000, 0.000000 ,-0.188747,-10.629606] #last 4 columns
+    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631532] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -874,7 +876,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 2
-    channel_2D.test_vals = [2.000000, 0.000000, 0.396756, 0.320050, 0.403711] #last 4 columns
+    channel_2D.test_vals = [2.000000, 0.000000, 0.400157, 0.352002, 0.407541] #last 4 columns
     channel_2D.su2_exec  = "parallel_computation.py -f"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -900,7 +902,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [ 0.112190, 0.457550, 0.542875, 0.781838, 0.944998] #last 4 columns
+    pipe.test_vals = [0.112416, 0.486612, 0.617747, 0.950972, 1.018949] #last 4 columns
     pipe.su2_exec  = "parallel_computation.py -f"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -913,7 +915,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.715495, 1.096497, 1.126070] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.716123, 1.095620, 1.136616] #last 4 columns
     rotating_cylinders.su2_exec  = "parallel_computation.py -f"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -926,7 +928,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208747, 1.128610] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208652, 1.128007] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "parallel_computation.py -f"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -939,7 +941,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.717707, -1.605264] #last 4 columns
+    bars_SST_2D.test_vals = [13.000000, -0.720012, -1.607989] #last 4 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1069,7 +1071,7 @@ def main():
     pywrapper_aeroelastic.test_vals = [0.078210, 0.036447, -0.001685, -0.000113] #last 4 columns
     pywrapper_aeroelastic.su2_exec  = "mpirun -np 2 SU2_CFD.py --parallel -f"
     pywrapper_aeroelastic.timeout   = 1600
-    pywrapper_aeroelastic.tol       = 0.000001
+    pywrapper_aeroelastic.tol       = 0.00001
     pywrapper_aeroelastic.unsteady  = True
     test_list.append(pywrapper_aeroelastic)
 
@@ -1078,9 +1080,11 @@ def main():
     pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     pywrapper_fsi2d.cfg_file  = "configFSI.cfg"
     pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [2.000000, 0.500000, -7.780230, -1.142095] #last 4 columns
+    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641483] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "mpirun -np 2 SU2_CFD.py --nZone 2 --fsi True --parallel -f"
     pywrapper_fsi2d.timeout   = 1600
+    pywrapper_fsi2d.unsteady  = True
+    pywrapper_fsi2d.multizone = True
     pywrapper_fsi2d.tol       = 0.00001
     test_list.append(pywrapper_fsi2d)
 
@@ -1089,7 +1093,7 @@ def main():
     pywrapper_unsteadyCHT.cfg_dir       = "py_wrapper/flatPlate_unsteady_CHT"
     pywrapper_unsteadyCHT.cfg_file      = "unsteady_CHT_FlatPlate_Conf.cfg"
     pywrapper_unsteadyCHT.test_iter     = 5
-    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.263342, -0.000032, 0.145689] #last 4 columns
+    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.259805, 0.000064, 0.144178] #last 4 columns
     pywrapper_unsteadyCHT.su2_exec      = "mpirun -np 2 python launch_unsteady_CHT_FlatPlate.py --parallel -f"
     pywrapper_unsteadyCHT.timeout       = 1600
     pywrapper_unsteadyCHT.tol           = 0.00001
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 3a4fe9703125..90f8454e7324 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -460,8 +460,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 % Number of total iterations
 ITER= 999999
-%
-ITER= 10
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= CAUCHY
@@ -570,3 +568,6 @@ WRT_BINARY_RESTART= YES
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index f3506756c441..a5ab296e0529 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -90,6 +90,7 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
+MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE

From 8bfb5c1aefef03692fc943213697e55e8a0c8884 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 11 Jul 2019 17:49:58 +0200
Subject: [PATCH 331/539] Added caching of offset for setting output values

---
 SU2_CFD/include/output/COutput.hpp            | 31 ++++++++++++++++---
 SU2_CFD/src/output/COutput.cpp                | 16 +++++++++-
 .../unsteady_CHT_FlatPlate_Conf.cfg           |  7 +++--
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 41ea4cb5d8d0..41f2ee6e8e81 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -154,6 +154,8 @@ class COutput {
 
   std::map<string, VolumeOutputField >          VolumeOutput_Map;
   std::vector<string>                           VolumeOutput_List;
+  std::vector<short>                            Offset_Cache;
+  unsigned short                                Offset_Cache_Index;
   
   std::vector<string> RequestedHistoryFields;
   unsigned short nRequestedHistoryFields;
@@ -497,12 +499,33 @@ class COutput {
    * \param[in] value - The new value of this field.
    */
   inline void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
-    if (VolumeOutput_Map.count(name) > 0){
-      if (VolumeOutput_Map[name].Offset != -1){
-        Local_Data[iPoint][VolumeOutput_Map[name].Offset] = value;
+
+    if (VolumeOutput_List.size() != Offset_Cache.size()){ 
+      
+      /*--- Build up the offset cache to speed up subsequent 
+       * calls of this routine since the order of calls is 
+       * the same for every value of iPoint --- */
+      
+      if (VolumeOutput_Map.count(name) > 0){
+        const short Offset = VolumeOutput_Map[name].Offset;
+        Offset_Cache.push_back(Offset);        
+        if (Offset != -1){
+          Local_Data[iPoint][Offset] = value;
+        }
+      } else {
+        SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
       }
     } else {
-      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+      
+      /*--- Use the offset cache for the access ---*/
+      
+      const short Offset = Offset_Cache[Offset_Cache_Index++];
+      if (Offset != -1){
+        Local_Data[iPoint][Offset] = value;
+      }   
+      if (Offset_Cache_Index == Offset_Cache.size()){
+        Offset_Cache_Index = 0;
+      }
     }
   }
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index f66f0b2376d9..4bcc8d01dbfa 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1149,6 +1149,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   unsigned long iPoint = 0, jPoint = 0;
   long iVertex = 0;
   
+  /*--- Reset the offset cache and index --- */
+  Offset_Cache_Index = 0;
+  Offset_Cache.clear();
+  
   if (fem_output){
     
     /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
@@ -1168,6 +1172,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
         
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
+        if (VolumeOutput_List.size() != Offset_Cache.size()){
+          SU2_MPI::Error("Number of volume output fields does not match the offset cache size.", CURRENT_FUNCTION);
+        }
+        
         jPoint++;
         
       }
@@ -1181,7 +1189,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       /*--- Load the volume data into the Local_Data() array. --- */
       
       LoadVolumeData(config, geometry, solver, jPoint);
-      
+
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
         if (config->GetMarker_All_Plotting(iMarker) == YES) {
           iVertex = geometry->node[iPoint]->GetVertex(iMarker);
@@ -1193,9 +1201,15 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
           }
         }
       }
+      
+      if (VolumeOutput_List.size() != Offset_Cache.size()){
+        SU2_MPI::Error("Number of volume output fields does not match the offset cache size.", CURRENT_FUNCTION);
+      }      
+      
       jPoint++;
     }
   }
+
 }
 
 void COutput::Postprocess_HistoryData(CConfig *config){
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index a11e612955ec..bdfa94687c5d 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -160,15 +160,18 @@ KT_CONSTANT= 0.0257
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
+%
+TIME_ITER= 10
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 0.003
+TIME_STEP= 0.003
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 1.0
+MAX_TIME= 1.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0

From 9d30aa3b6e57f28572ba1a74729091101c9e3ec3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 14 Jul 2019 14:41:28 +0200
Subject: [PATCH 332/539] Small fix

---
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp |  2 +-
 SU2_CFD/src/output/COutput.cpp            | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 689f1cd3776d..259f846475b2 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -215,7 +215,7 @@ void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE"); 
   }
   
-  if (config->GetKind_Solver() == FEM_LES || config->GetKind_SGS_Model() != IMPLICIT_LES) {
+  if (config->GetKind_Solver() == FEM_LES && (config->GetKind_SGS_Model() != IMPLICIT_LES)) {
     AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
   }
 }
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 4bcc8d01dbfa..9785de8d3e38 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1191,15 +1191,14 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       LoadVolumeData(config, geometry, solver, jPoint);
 
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-        if (config->GetMarker_All_Plotting(iMarker) == YES) {
-          iVertex = geometry->node[iPoint]->GetVertex(iMarker);
-          if (iVertex != -1){ 
-            
-            /*--- Load the surface data into the Local_Data() array. --- */
-            
-            LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
-          }
+        iVertex = geometry->node[iPoint]->GetVertex(iMarker);
+        if (iVertex != -1){ 
+          
+          /*--- Load the surface data into the Local_Data() array. --- */
+          
+          LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
         }
+        
       }
       
       if (VolumeOutput_List.size() != Offset_Cache.size()){

From f20b609155cf62648dd961c0b033367e27773f54 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 14 Jul 2019 16:23:02 +0200
Subject: [PATCH 333/539] Small fix

---
 SU2_CFD/src/output/CBaselineOutput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 81d949156715..5e3412578d5b 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -99,7 +99,7 @@ void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
 
   // Add all the remaining fields
   
-  for (iField = nDim-1; iField < nRequestedVolumeFields; iField++){
+  for (iField = nDim; iField < nRequestedVolumeFields; iField++){
     AddVolumeOutput(RequestedVolumeFields[iField], RequestedVolumeFields[iField], "SOLUTION");
   }
   

From 72f5b72a6b49ad962b5fd3a887992e598171f976 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 14 Jul 2019 16:23:50 +0200
Subject: [PATCH 334/539] cleaned up includes and added forward decl. where
 possible

---
 SU2_CFD/include/output/CFlowCompFEMOutput.hpp |  1 +
 SU2_CFD/include/output/CFlowCompOutput.hpp    |  2 ++
 SU2_CFD/include/output/CFlowIncOutput.hpp     |  2 ++
 SU2_CFD/include/output/COutput.hpp            | 15 +++-----------
 SU2_CFD/include/output/COutputLegacy.hpp      | 20 ++++++++++++-------
 .../include/output/filewriter/CFileWriter.hpp | 19 ++++++++++++------
 .../output/filewriter/CParallelDataSorter.hpp |  7 ++++++-
 .../filewriter/CTecplotBinaryFileWriter.hpp   |  2 ++
 SU2_CFD/src/output/CAdjElasticityOutput.cpp   |  3 +++
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |  3 +++
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |  3 +++
 SU2_CFD/src/output/CAdjHeatOutput.cpp         |  3 +++
 SU2_CFD/src/output/CBaselineOutput.cpp        |  3 +++
 SU2_CFD/src/output/CElasticityOutput.cpp      |  3 +++
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |  4 +++-
 SU2_CFD/src/output/CFlowCompOutput.cpp        |  3 +++
 SU2_CFD/src/output/CFlowIncOutput.cpp         |  3 +++
 SU2_CFD/src/output/CFlowOutput.cpp            |  3 ++-
 SU2_CFD/src/output/CHeatOutput.cpp            |  2 ++
 SU2_CFD/src/output/CMeshOutput.cpp            |  1 +
 SU2_CFD/src/output/COutput.cpp                |  2 ++
 .../src/output/filewriter/CCSVFileWriter.cpp  |  1 +
 .../src/output/filewriter/CFVMDataSorter.cpp  |  2 +-
 .../output/filewriter/CParallelDataSorter.cpp |  1 -
 .../filewriter/CSU2BinaryFileWriter.cpp       |  3 ---
 .../filewriter/CSurfaceFVMDataSorter.cpp      |  1 +
 .../output/filewriter/CTecplotFileWriter.cpp  |  1 -
 SU2_CFD/src/output/output_physics.cpp         |  2 ++
 .../src/output/output_structure_legacy.cpp    |  3 +++
 SU2_DOT/include/SU2_DOT.hpp                   |  2 ++
 30 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
index b6bf078e61ab..0ce15c944b22 100644
--- a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
@@ -40,6 +40,7 @@
 
 #include "CFlowOutput.hpp"
 
+class CVariable;
 
 /*! \class CFlowFEMOutput
  *  \brief Output class for compressible Flow problems.
diff --git a/SU2_CFD/include/output/CFlowCompOutput.hpp b/SU2_CFD/include/output/CFlowCompOutput.hpp
index 9c749b0663e6..2e02c9c49cd7 100644
--- a/SU2_CFD/include/output/CFlowCompOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompOutput.hpp
@@ -40,6 +40,8 @@
 
 #include "CFlowOutput.hpp"
 
+class CVariable;
+
 /*! \class CFlowOutput
  *  \brief Output class for compressible Flow problems.
  *  \author R. Sanchez, T. Albring.
diff --git a/SU2_CFD/include/output/CFlowIncOutput.hpp b/SU2_CFD/include/output/CFlowIncOutput.hpp
index 6e836f2f6add..eff4819fdd43 100644
--- a/SU2_CFD/include/output/CFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CFlowIncOutput.hpp
@@ -40,6 +40,8 @@
 
 #include "CFlowOutput.hpp"
 
+class CVariable;
+
 /*! \class CIncFlowOutput
  *  \brief Output class for compressible Flow problems.
  *  \author R. Sanchez, T. Albring.
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 41f2ee6e8e81..1f5b2cd45a96 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -40,28 +40,19 @@
 
 #include "../../../Common/include/mpi_structure.hpp"
 
-#ifdef HAVE_CGNS
-  #include "cgnslib.h"
-#endif
-#ifdef HAVE_TECIO
-  #include "TECIO.h"
-#endif
 #include <fstream>
 #include <cmath>
 #include <time.h>
 #include <sstream>
 #include <iomanip>
 #include <limits>
+#include <vector>
 
-#include "../solver_structure.hpp"
-#include "../integration_structure.hpp"
-#include "../../../Common/include/geometry_structure.hpp"
-#include "../../../Common/include/fem_geometry_structure.hpp"
-#include "../../../Common/include/fem_standard_element.hpp"
-#include "../../../Common/include/config_structure.hpp"
 #include "../../../Common/include/toolboxes/printing_toolbox.hpp"
 #include "../../../Common/include/toolboxes/signal_processing_toolbox.hpp"
 
+class CGeometry;
+class CSolver;
 class CFileWriter;
 class CParallelDataSorter;
 
diff --git a/SU2_CFD/include/output/COutputLegacy.hpp b/SU2_CFD/include/output/COutputLegacy.hpp
index 25883227a25a..052104bd11ab 100644
--- a/SU2_CFD/include/output/COutputLegacy.hpp
+++ b/SU2_CFD/include/output/COutputLegacy.hpp
@@ -50,13 +50,19 @@
 #include <cmath>
 #include <time.h>
 #include <fstream>
-
-#include "../solver_structure.hpp"
-#include "../integration_structure.hpp"
-#include "../../../Common/include/geometry_structure.hpp"
-#include "../../../Common/include/fem_geometry_structure.hpp"
-#include "../../../Common/include/fem_standard_element.hpp"
-#include "../../../Common/include/config_structure.hpp"
+#include <vector>
+
+//#include "../solver_structure.hpp"
+//#include "../integration_structure.hpp"
+//#include "../../../Common/include/geometry_structure.hpp"
+//#include "../../../Common/include/fem_geometry_structure.hpp"
+//#include "../../../Common/include/fem_standard_element.hpp"
+
+#include "../../../Common/include/option_structure.hpp"
+class CGeometry;
+class CConfig;
+class CSolver;
+class CIntegration;
 
 using namespace std;
 
diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index 3a1fffcfde29..0bbbd3b03334 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -1,17 +1,24 @@
 #pragma once
-#include "../../../Common/include/geometry_structure.hpp"
-#include "CParallelDataSorter.hpp"
+#include "../../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/option_structure.hpp"
 #include <sys/stat.h>
+#include <vector>
+#include <string>
+#include <fstream>
+
+#include "../../output/filewriter/CParallelDataSorter.hpp"
+
+using namespace std;
 
 class CFileWriter{
 protected:
 
-  vector<string> fieldnames;
+  std::vector<std::string> fieldnames;
   unsigned short nDim;
   
   int rank, size;
   
-  string file_ext;
+  std::string file_ext;
   
   su2double StartTime, StopTime, UsedTime, Bandwidth, file_size;
   
@@ -21,7 +28,7 @@ class CFileWriter{
    * \param fields
    * \param nDim
    */  
-  CFileWriter(vector<string> fields, unsigned short nDim);
+  CFileWriter(std::vector<std::string> fields, unsigned short nDim);
   
   /*!
    * \brief ~CFileWriter
@@ -33,7 +40,7 @@ class CFileWriter{
    * \param filename
    * \param data_sorter
    */
-  virtual void Write_Data(string filename, CParallelDataSorter* data_sorter){}
+  virtual void Write_Data(std::string filename, CParallelDataSorter* data_sorter){}
   
   /*!
    * \brief Get_Bandwidth
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 4f28bd4255eb..6189dc17d62d 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -1,5 +1,10 @@
 #pragma once
-#include "../../../Common/include/geometry_structure.hpp"
+
+#include "../../../Common/include/mpi_structure.hpp"
+#include "../../../Common/include/option_structure.hpp"
+
+class CGeometry;
+class CConfig;
 
 class CParallelDataSorter{
 protected:
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
index a6aa2963964a..d5ecf2077464 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -2,6 +2,8 @@
 
 #include "CFileWriter.hpp"
 
+#include <assert.h>
+
 class CTecplotBinaryFileWriter : public CFileWriter{
   
   unsigned long time_iter;
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 6fc43b97e5e7..d1cc33af5543 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CAdjElasticityOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 5114300e9fba..5aa23e4077d0 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CAdjFlowOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index ae7d3835260e..32f847056eb0 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CAdjFlowIncOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   cont_adj = config->GetContinuous_Adjoint();
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index acc63cabcade..e505b4fca74f 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CAdjHeatOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
   
   nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 5e3412578d5b..4bf1faa2a59a 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -38,6 +38,9 @@
 
 #include "../../include/output/CBaselineOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
 
   nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index aa3770fe15d5..444b72a19ccf 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CElasticityOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
   linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 259f846475b2..020d6ec48714 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -35,9 +35,11 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "../../include/output/CFlowCompFEMOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();  
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index c097d0b5c64d..7138379f460e 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CFlowCompOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();  
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 07d27ae3ea7a..9b18c570575c 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/CFlowIncOutput.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
 
   nDim = geometry->GetnDim();
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 37acd1ef4dde..4e1d68ae5b79 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -34,8 +34,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "../../include/output/CFlowOutput.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
 
 CFlowOutput::CFlowOutput(CConfig *config) : COutput (config){
   
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 97492df01d34..0bad6152c2eb 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -36,6 +36,8 @@
  */
 
 #include "../../include/output/CHeatOutput.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
 
 CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index 16d32bf61281..7b6d24265d30 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "../../include/output/CMeshOutput.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
 
 CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9785de8d3e38..7b512d45e529 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -50,6 +50,8 @@
 #include "../../include/output/filewriter/CSU2MeshFileWriter.hpp"
 
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
 
 COutput::COutput(CConfig *config) {
   
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index 665a8bde45b3..f0ebd7f42944 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -1,4 +1,5 @@
 #include "../../../include/output/filewriter/CCSVFileWriter.hpp"
+#include "../../../include/output/filewriter/CParallelDataSorter.hpp"
 
 CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim) : 
   CFileWriter(fields, nDim){
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index fcd0bb978034..68a5986d26d7 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -1,5 +1,5 @@
 #include "../../../include/output/filewriter/CFVMDataSorter.hpp"
-
+#include "../../../Common/include/geometry_structure.hpp"
 
 CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
  
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index d0a5c5788367..626788db6bad 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -1,5 +1,4 @@
 #include "../../../include/output/filewriter/CParallelDataSorter.hpp"
-#include "../../../Common/include/fem_geometry_structure.hpp"
 
 CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields){
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 2adc688e1b28..5d8b4a184a25 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -1,8 +1,5 @@
 #include "../../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
 
-
-
-
 CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim) : 
   CFileWriter(fields, nDim){
 
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index dc95f643dcde..a0908ca8e002 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1,4 +1,5 @@
 #include "../../../include/output/filewriter/CSurfaceFVMDataSorter.hpp"
+#include "../../../Common/include/geometry_structure.hpp"
 
 CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, CFVMDataSorter* volume_sorter) : CParallelDataSorter(config, nFields){
  
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 4c51034060e2..d4320ec3e4b8 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,6 +1,5 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
-
 CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
   CFileWriter(fields, nDim){
 
diff --git a/SU2_CFD/src/output/output_physics.cpp b/SU2_CFD/src/output/output_physics.cpp
index 94f4939d6a48..6d12c1b7ba5d 100644
--- a/SU2_CFD/src/output/output_physics.cpp
+++ b/SU2_CFD/src/output/output_physics.cpp
@@ -37,6 +37,8 @@
 
 #include "../../include/output/COutputLegacy.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
 
 void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry *geometry, CConfig *config) {
 
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 5940666f4488..4a7debec0d41 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -37,6 +37,9 @@
 
 #include "../../include/output/COutputLegacy.hpp"
 
+#include "../../../Common/include/geometry_structure.hpp"
+#include "../../include/solver_structure.hpp"
+
 COutputLegacy::COutputLegacy(CConfig *config) {
 
   rank = SU2_MPI::GetRank();
diff --git a/SU2_DOT/include/SU2_DOT.hpp b/SU2_DOT/include/SU2_DOT.hpp
index e4925495d56e..5a557974f616 100644
--- a/SU2_DOT/include/SU2_DOT.hpp
+++ b/SU2_DOT/include/SU2_DOT.hpp
@@ -46,9 +46,11 @@
 #include <cmath>
 
 #include "../../Common/include/geometry_structure.hpp"
+#include "../../Common/include/fem_geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 #include "../../Common/include/grid_movement_structure.hpp"
 #include "../../SU2_CFD/include/output/CBaselineOutput.hpp"
+#include "../../SU2_CFD/include/solver_structure.hpp"
 
 using namespace std;
 

From 88da9374903b54ab462d1a3a68819e56a1d62538 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Sun, 14 Jul 2019 20:50:49 +0200
Subject: [PATCH 335/539] Added missing include

---
 SU2_CFD/include/output/filewriter/CFileWriter.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index 0bbbd3b03334..9fc178d4acdf 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -4,6 +4,7 @@
 #include <sys/stat.h>
 #include <vector>
 #include <string>
+#include <cstring>
 #include <fstream>
 
 #include "../../output/filewriter/CParallelDataSorter.hpp"

From 25c5d4fb30a6fa1c45bba253fc4f0c5f2dd0611e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 12:32:36 +0200
Subject: [PATCH 336/539] Removing merging leftover

---
 TestCases/parallel_regression.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 3bfa3f573fe8..df6ea3f29cec 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -915,11 +915,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-<<<<<<< HEAD
     rotating_cylinders.test_vals = [3.000000, 0.000000, 0.716123, 1.095620, 1.136616] #last 4 columns
-=======
-    rotating_cylinders.test_vals = [-1.254634, 4.531678, 0.000000, 0.000000] #last 4 columns
->>>>>>> origin/develop
     rotating_cylinders.su2_exec  = "parallel_computation.py -f"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001

From f9bac10fa68327c6f24d454c6f2f1a3a34f92086 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 14:48:02 +0200
Subject: [PATCH 337/539] Removed unused routine

---
 SU2_CFD/include/driver_structure.hpp |   3 -
 SU2_CFD/src/driver_structure.cpp     | 238 ---------------------------
 2 files changed, 241 deletions(-)

diff --git a/SU2_CFD/include/driver_structure.hpp b/SU2_CFD/include/driver_structure.hpp
index 6883ad000bc9..74b18358e605 100644
--- a/SU2_CFD/include/driver_structure.hpp
+++ b/SU2_CFD/include/driver_structure.hpp
@@ -209,9 +209,6 @@ class CDriver {
    * \brief Definition and allocation of all interface classes.
    */
   void Interface_Preprocessing();
-
-  
-  void SetTransferTypes();
   
   /*!
    * \brief Definition and allocation of all solver classes.
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index 27ca73c67bcf..a9aef19e4748 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -3248,222 +3248,6 @@ void CDriver::Numerics_Postprocessing(CNumerics *****numerics_container,
 
 }
 
-void CDriver::SetTransferTypes(){
-  
-  unsigned short donorZone, targetZone;
-  unsigned short nMarkerTarget, iMarkerTarget, nMarkerDonor, iMarkerDonor;
-
-  /*--- Initialize some useful booleans ---*/
-  bool fluid_donor, structural_donor, heat_donor;
-  bool fluid_target, structural_target, heat_target;
-
-  bool discrete_adjoint = config_container[ZONE_0]->GetDiscrete_Adjoint();
-
-  int markDonor, markTarget, Donor_check, Target_check, iMarkerInt, nMarkerInt;
-
-#ifdef HAVE_MPI
-  int *Buffer_Recv_mark = NULL, iRank, nProcessor = size;
-
-  if (rank == MASTER_NODE)
-    Buffer_Recv_mark = new int[nProcessor];
-#endif
-  
-  /*--- Coupling between zones ---*/
-  // There's a limit here, the interface boundary must connect only 2 zones
-  
-  /*--- Loops over all target and donor zones to find which ones are connected through an interface boundary (fsi or sliding mesh) ---*/
-  for (targetZone = 0; targetZone < nZone; targetZone++) {
-    for (donorZone = 0; donorZone < nZone; donorZone++) {
-      
-      
-      transfer_types[donorZone][targetZone] = NO_TRANSFER;
-      
-      if ( donorZone == targetZone ) {
-        transfer_types[donorZone][targetZone] = ZONES_ARE_EQUAL;
-        // We're processing the same zone, so skip the following
-        continue;
-      }
-      
-      nMarkerInt = (int) ( config_container[donorZone]->GetMarker_n_ZoneInterface() / 2 );
-      
-      /*--- Loops on Interface markers to find if the 2 zones are sharing the boundary and to determine donor and target marker tag ---*/
-      for (iMarkerInt = 1; iMarkerInt <= nMarkerInt; iMarkerInt++) {
-        
-        markDonor  = -1;
-        markTarget = -1;
-        
-        /*--- On the donor side ---*/
-        nMarkerDonor = config_container[donorZone]->GetnMarker_All();
-        
-        for (iMarkerDonor = 0; iMarkerDonor < nMarkerDonor; iMarkerDonor++) {
-          /*--- If the tag GetMarker_All_ZoneInterface(iMarker) equals the index we are looping at ---*/
-          if ( config_container[donorZone]->GetMarker_All_ZoneInterface(iMarkerDonor) == iMarkerInt ) {
-            /*--- We have identified the identifier for the interface marker ---*/
-            markDonor = iMarkerDonor;
-            
-            break;
-          }
-        }
-        
-        /*--- On the target side ---*/
-        nMarkerTarget = config_container[targetZone]->GetnMarker_All();
-        
-        for (iMarkerTarget = 0; iMarkerTarget < nMarkerTarget; iMarkerTarget++) {
-          
-          /*--- If the tag GetMarker_All_ZoneInterface(iMarker) equals the index we are looping at ---*/
-          if ( config_container[targetZone]->GetMarker_All_ZoneInterface(iMarkerTarget) == iMarkerInt ) {
-            /*--- We have identified the identifier for the interface marker ---*/
-            markTarget = iMarkerTarget;
-            
-            break;
-          } 
-        }
-                
-#ifdef HAVE_MPI
-        
-        Donor_check  = -1;
-        Target_check = -1;
-        
-        /*--- We gather a vector in MASTER_NODE that determines if the boundary is not on the processor because of the partition or because the zone does not include it ---*/
-        
-        SU2_MPI::Gather(&markDonor , 1, MPI_INT, Buffer_Recv_mark, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-        
-        if (rank == MASTER_NODE) {
-          for (iRank = 0; iRank < nProcessor; iRank++) {
-            if( Buffer_Recv_mark[iRank] != -1 ) {
-              Donor_check = Buffer_Recv_mark[iRank];
-              
-              break;
-            }
-          }
-        }
-        
-        SU2_MPI::Bcast(&Donor_check , 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-        
-        SU2_MPI::Gather(&markTarget, 1, MPI_INT, Buffer_Recv_mark, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-        
-        if (rank == MASTER_NODE){
-          for (iRank = 0; iRank < nProcessor; iRank++){
-            if( Buffer_Recv_mark[iRank] != -1 ){
-              Target_check = Buffer_Recv_mark[iRank];
-              
-              break;
-            }
-          }
-        }
-        
-        SU2_MPI::Bcast(&Target_check, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-        
-#else
-        Donor_check  = markDonor;
-        Target_check = markTarget;  
-#endif
-        
-        /* --- Check ifzones are actually sharing the interface boundary, if not skip ---*/        
-        if(Target_check == -1 || Donor_check == -1) {
-          transfer_types[donorZone][targetZone] = NO_COMMON_INTERFACE;
-          continue;
-        }
-        
-        /*--- Set some boolean to properly allocate data structure later ---*/
-        fluid_target      = false; 
-        structural_target = false;
-        
-        fluid_donor       = false; 
-        structural_donor  = false;
-        
-        heat_donor        = false;
-        heat_target       = false;
-        
-        switch ( config_container[targetZone]->GetKind_Solver() ) {
-        
-        case EULER : case NAVIER_STOKES: case RANS: 
-        case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-          fluid_target  = true;   
-          break;
-          
-        case FEM_ELASTICITY: case DISC_ADJ_FEM:
-          structural_target = true;   
-          break;
-          
-        case HEAT_EQUATION_FVM: case DISC_ADJ_HEAT:
-          heat_target = true;
-          break;
-        }
-        
-        switch ( config_container[donorZone]->GetKind_Solver() ) {
-        
-        case EULER : case NAVIER_STOKES: case RANS:
-        case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-          fluid_donor  = true;
-          break;
-          
-        case FEM_ELASTICITY: case DISC_ADJ_FEM:
-          structural_donor = true;
-          break;
-          
-        case HEAT_EQUATION_FVM : case DISC_ADJ_HEAT:
-          heat_donor = true;
-          break;
-        }
-        
-        if (fluid_donor && structural_target && (!discrete_adjoint)) {
-          transfer_types[donorZone][targetZone] = FLOW_TRACTION;
-          if (markDonor != -1){
-            config_container[donorZone]->SetSurface_Movement(markDonor, FLUID_STRUCTURE);
-          }
-        }
-        else if (structural_donor && fluid_target && (!discrete_adjoint)) {
-          transfer_types[donorZone][targetZone] = STRUCTURAL_DISPLACEMENTS;
-        }
-        else if (fluid_donor && structural_target && discrete_adjoint) {
-          transfer_types[donorZone][targetZone] = FLOW_TRACTION;
-          if (markDonor != -1){
-            config_container[donorZone]->SetSurface_Movement(markDonor, FLUID_STRUCTURE);
-          }
-        }
-        else if (structural_donor && fluid_target && discrete_adjoint){
-          transfer_types[donorZone][targetZone] = STRUCTURAL_DISPLACEMENTS_DISC_ADJ;
-        }
-        else if (fluid_donor && fluid_target) {
-          transfer_types[donorZone][targetZone] = SLIDING_INTERFACE;
-        }
-        else if (fluid_donor && heat_target) {
-          if(config_container[donorZone]->GetEnergy_Equation())
-            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_FS;
-          else if (config_container[donorZone]->GetWeakly_Coupled_Heat())
-            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_FS;
-          else { }
-        }
-        else if (heat_donor && fluid_target) {
-          if(config_container[targetZone]->GetEnergy_Equation())
-            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_SF;
-          else if (config_container[targetZone]->GetWeakly_Coupled_Heat())
-            transfer_types[donorZone][targetZone] = CONJUGATE_HEAT_WEAKLY_SF;
-          else { }
-        }
-        else if (heat_donor && heat_target) {
-          SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
-        }
-        else {
-          transfer_types[donorZone][targetZone] = CONSERVATIVE_VARIABLES;
-        }
-        
-        break;
-        
-      }
-      
-      if (config_container[donorZone]->GetBoolMixingPlaneInterface()){
-        transfer_types[donorZone][targetZone] = MIXING_PLANE;
-      }
-    }
-  }
-#ifdef HAVE_MPI
-      if (rank == MASTER_NODE) 
-        delete [] Buffer_Recv_mark;
-#endif
-}
-
 void CDriver::Iteration_Preprocessing() {
 
   for (iInst = 0; iInst < nInst[iZone]; iInst++)  {
@@ -3804,13 +3588,6 @@ void CDriver::Interface_Preprocessing() {
         nVar = solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->GetnPrimVar();
         transfer_container[donorZone][targetZone] = new CTransfer_SlidingInterface(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "sliding interface. " << endl;
-        if (markDonor != -1 ){
-          config_container[donorZone]->SetMarker_All_KindBC(markDonor, FLUID_INTERFACE);          
-          solver_container[donorZone][INST_0][MESH_0][FLOW_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);     
-          if (config_container[donorZone]->GetKind_Turb_Model() != NONE){
-            solver_container[donorZone][INST_0][MESH_0][TURB_SOL]->InitSlidingState(config_container[donorZone], geometry_container[donorZone][INST_0][MESH_0], markDonor);               
-          }
-        }
       }
       else if (fluid_donor && heat_target) {
         nVarTransfer = 0;
@@ -3822,9 +3599,6 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
-        if (markDonor != -1 ){
-          config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
-        }
       }
       else if (heat_donor && fluid_target) {
         nVarTransfer = 0;
@@ -3836,9 +3610,6 @@ void CDriver::Interface_Preprocessing() {
         else { }
         transfer_container[donorZone][targetZone] = new CTransfer_ConjugateHeatVars(nVar, nVarTransfer, config_container[donorZone]);
         if (rank == MASTER_NODE) cout << "conjugate heat variables. " << endl;
-        if (markDonor != -1 ){
-          config_container[donorZone]->SetMarker_All_KindBC(markDonor, CHT_WALL_INTERFACE);
-        }
       }
       else if (heat_donor && heat_target) {
         SU2_MPI::Error("Conjugate heat transfer between solids not implemented yet.", CURRENT_FUNCTION);
@@ -3870,15 +3641,6 @@ void CDriver::Interface_Preprocessing() {
   if (rank == MASTER_NODE) 
   delete [] Buffer_Recv_mark;
 #endif
-  
-  /*--- Update boundary information since some kind BCs have changed ---*/
-  
-  for (iZone = 0; iZone < nZone; iZone++){
-    for (unsigned short iMesh = 0; iMesh <= config_container[iZone]->GetnMGLevels(); iMesh++){
-      geometry_container[iZone][INST_0][iMesh]->UpdateBoundaries(config_container[iZone]);
-    }
-  }
-  
 }
 
 void CDriver::InitStaticMeshMovement(){

From f01e158c90460d8e41b829fa7fb4a8987d591134 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 14:48:51 +0200
Subject: [PATCH 338/539] Added one more check to the Offset_Cache

---
 SU2_CFD/include/output/COutput.hpp       | 37 +++---------
 SU2_CFD/src/output/CElasticityOutput.cpp | 16 +++---
 SU2_CFD/src/output/COutput.cpp           | 73 +++++++++++++++++++++---
 3 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 1f5b2cd45a96..96f55211dfba 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -147,6 +147,7 @@ class COutput {
   std::vector<string>                           VolumeOutput_List;
   std::vector<short>                            Offset_Cache;
   unsigned short                                Offset_Cache_Index;
+  bool                                          Offset_Cache_Checked;
   
   std::vector<string> RequestedHistoryFields;
   unsigned short nRequestedHistoryFields;
@@ -489,36 +490,12 @@ class COutput {
    * \param[in] name - Name of the field.
    * \param[in] value - The new value of this field.
    */
-  inline void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
-
-    if (VolumeOutput_List.size() != Offset_Cache.size()){ 
-      
-      /*--- Build up the offset cache to speed up subsequent 
-       * calls of this routine since the order of calls is 
-       * the same for every value of iPoint --- */
-      
-      if (VolumeOutput_Map.count(name) > 0){
-        const short Offset = VolumeOutput_Map[name].Offset;
-        Offset_Cache.push_back(Offset);        
-        if (Offset != -1){
-          Local_Data[iPoint][Offset] = value;
-        }
-      } else {
-        SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
-      }
-    } else {
-      
-      /*--- Use the offset cache for the access ---*/
-      
-      const short Offset = Offset_Cache[Offset_Cache_Index++];
-      if (Offset != -1){
-        Local_Data[iPoint][Offset] = value;
-      }   
-      if (Offset_Cache_Index == Offset_Cache.size()){
-        Offset_Cache_Index = 0;
-      }
-    }
-  }
+  void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
+  
+  /*!
+   * \brief CheckOffsetCache
+   */
+  void CheckOffsetCache();
   
   /*!
    * \brief CheckHistoryOutput
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 444b72a19ccf..9d7ab5add6ea 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -224,13 +224,15 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "SOLUTION");
   if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "SOLUTION");
   
-  AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY");
-  AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY");
-  if (nDim == 3) AddVolumeOutput("VELOCITY-Z", "Velocity_z", "VELOCITY");
-  
-  AddVolumeOutput("ACCELERATION-X",    "Acceleration_x", "ACCELERATION");
-  AddVolumeOutput("ACCELERATION-Y",    "Acceleration_y", "ACCELERATION");
-  if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "ACCELERATION");
+  if(dynamic){
+    AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY");
+    AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY");
+    if (nDim == 3) AddVolumeOutput("VELOCITY-Z", "Velocity_z", "VELOCITY");
+    
+    AddVolumeOutput("ACCELERATION-X",    "Acceleration_x", "ACCELERATION");
+    AddVolumeOutput("ACCELERATION-Y",    "Acceleration_y", "ACCELERATION");
+    if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "ACCELERATION");
+  }
   
   AddVolumeOutput("STRESS-XX",    "Sxx", "STRESS");
   AddVolumeOutput("STRESS-YY",    "Syy", "STRESS");
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 7b512d45e529..7d6d98cde7eb 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1154,6 +1154,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   /*--- Reset the offset cache and index --- */
   Offset_Cache_Index = 0;
   Offset_Cache.clear();
+  Offset_Cache_Checked = false;
   
   if (fem_output){
     
@@ -1174,9 +1175,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
         
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
-        if (VolumeOutput_List.size() != Offset_Cache.size()){
-          SU2_MPI::Error("Number of volume output fields does not match the offset cache size.", CURRENT_FUNCTION);
-        }
+        CheckOffsetCache();
         
         jPoint++;
         
@@ -1201,11 +1200,9 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
           LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
         }
         
-      }
+      } 
       
-      if (VolumeOutput_List.size() != Offset_Cache.size()){
-        SU2_MPI::Error("Number of volume output fields does not match the offset cache size.", CURRENT_FUNCTION);
-      }      
+      CheckOffsetCache();
       
       jPoint++;
     }
@@ -1213,6 +1210,68 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
 }
 
+void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
+  
+  if (VolumeOutput_List.size() != Offset_Cache.size()){ 
+    
+    /*--- Build up the offset cache to speed up subsequent 
+     * calls of this routine since the order of calls is 
+     * the same for every value of iPoint --- */
+    
+    if (VolumeOutput_Map.count(name) > 0){
+      const short Offset = VolumeOutput_Map[name].Offset;
+      Offset_Cache.push_back(Offset);        
+      if (Offset != -1){
+        Local_Data[iPoint][Offset] = value;
+      }
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+    }
+  } else {
+    
+    /*--- Use the offset cache for the access ---*/
+    
+    const short Offset = Offset_Cache[Offset_Cache_Index++];
+    if (Offset != -1){
+      Local_Data[iPoint][Offset] = value;
+    }   
+    if (Offset_Cache_Index == Offset_Cache.size()){
+      Offset_Cache_Index = 0;
+    }
+  }
+  
+}
+
+void COutput::CheckOffsetCache(){
+  
+  if (!Offset_Cache_Checked){
+    vector<short> Offset_Cache_Copy = Offset_Cache;
+    
+    /*--- Remove the -1 offset --- */
+    
+    Offset_Cache_Copy.erase(std::remove(Offset_Cache_Copy.begin(), Offset_Cache_Copy.end(), -1), 
+                            Offset_Cache_Copy.end());
+    
+    /*--- Check if all offsets are unique. If thats not the case, then SetVolumeOutputValue() was called
+       * more than once for the same output field. --- */
+    
+    vector<short>::iterator it = std::unique( Offset_Cache_Copy.begin(), Offset_Cache_Copy.end() );
+    if (it != Offset_Cache_Copy.end() ){
+      SU2_MPI::Error("Offset cache contains duplicate entries.", CURRENT_FUNCTION);
+    }
+    
+    /*--- Check if the size of the offset cache matches the size of the volume output list. 
+       * If that is not the case, then probably SetVolumeOutputValue() was not called for all fields declared with
+       * AddVolumeOutput(). ---*/
+    
+    if (VolumeOutput_List.size() != Offset_Cache.size()){
+      SU2_MPI::Error("Offset cache size and volume output size do not match.", CURRENT_FUNCTION);
+    }
+  }
+  Offset_Cache_Checked = true;
+  
+}
+
 void COutput::Postprocess_HistoryData(CConfig *config){
    
   map<string, su2double> Average;

From 496662412e110e412d330f50ebf535e04ed3b563 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 14:49:12 +0200
Subject: [PATCH 339/539] Fixed some test cases

---
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg  | 10 +++-------
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg |  7 ++-----
 TestCases/serial_regression.py               | 10 +++++-----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index e9cfb6c5608d..3e09de891bec 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -75,16 +75,12 @@ MESH_FORMAT= SU2
 MULTIZONE_MESH = NO
 %
 RESTART_SOL= YES
-SOLUTION_FILENAME= solution_fluid.dat
-SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
+SOLUTION_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
-RESTART_FILENAME= restart_fluid.dat
-RESTART_STRUCTURE_FILENAME= restart_solid.dat
+RESTART_FILENAME= restart_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
-VOLUME_FILENAME= fluid
-SURFACE_FILENAME= surface_fluid
-VOLUME_STRUCTURE_FILENAME= solid
+VOLUME_FILENAME= solid
 %
 WRT_CON_FREQ= 10
 CONV_FILENAME= history
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 1357f999b644..de9adca1e582 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -21,7 +21,7 @@ PHYSICAL_PROBLEM= EULER
 MATH_PROBLEM= DIRECT
 KIND_TURB_MODEL= NONE
 
-GRID_MOVEMENT = FLUID_STRUCTURE_STATIC
+SURFACE_MOVEMENT = FLUID_STRUCTURE_STATIC
 MULTIZONE_MESH = NO
 INNER_ITER= 60
 %
@@ -86,7 +86,7 @@ DEFORM_LINEAR_SOLVER_ERROR= 1e-6
 DEFORM_LINEAR_SOLVER_ITER= 1000
 %
 % Convergence criteria ------------------------------------------------- %
-EXT_ITER= 1
+OUTER_ITER= 1
 % interaction
 FSI_ITER= 1
 % if running from scratch this helps a bunch
@@ -112,15 +112,12 @@ MESH_FORMAT= SU2
 %
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_fluid.dat
-SOLUTION_STRUCTURE_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
 RESTART_FILENAME= restart_fluid.dat
-RESTART_STRUCTURE_FILENAME= restart_solid.dat
 %
 OUTPUT_FORMAT= PARAVIEW
 VOLUME_FILENAME= fluid
 SURFACE_FILENAME= surface_fluid
-VOLUME_STRUCTURE_FILENAME= solid
 %
 WRT_CON_FREQ= 10
 CONV_FILENAME= history
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 5d8e201a647a..1a8b4657a5ec 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -933,7 +933,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 2
-    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.255896] #last 4 columns
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.253885] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -946,7 +946,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 2
-    channel_2D.test_vals = [2.000000, 0.000000, 0.400174, 0.352029, 0.407521] #last 4 columns
+    channel_2D.test_vals = [2.000000, 0.000000, 0.400117, 0.352029, 0.407521] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -998,7 +998,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208747, 1.128612] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208652, 1.128008] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1087,7 +1087,7 @@ def main():
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [4.000000, 0.000000, -3.731033, -5.527944] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641487] #last 4 columns
     fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
     fsi2d.multizone = True
@@ -1532,7 +1532,7 @@ def main():
     pywrapper_aeroelastic.su2_exec  = "SU2_CFD.py -f"
     pywrapper_aeroelastic.new_output  = True
     pywrapper_aeroelastic.timeout   = 1600
-    pywrapper_aeroelastic.tol       = 0.000001
+    pywrapper_aeroelastic.tol       = 0.00001
     pywrapper_aeroelastic.unsteady  = True
     test_list.append(pywrapper_aeroelastic)
     pass_list.append(pywrapper_aeroelastic.run_test())

From c0ca542f993792a873442c21e3a477ea65ca33b0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 15:36:40 +0200
Subject: [PATCH 340/539] Added files to meson

---
 Common/src/toolboxes/meson.build |  2 ++
 SU2_CFD/src/meson.build          | 33 +++++++++++++++++++-------------
 SU2_DEF/src/meson.build          | 13 +++++++------
 SU2_DOT/src/meson.build          | 15 +++++++--------
 SU2_SOL/src/meson.build          | 14 +++++++-------
 meson.build                      |  8 +++++---
 6 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/Common/src/toolboxes/meson.build b/Common/src/toolboxes/meson.build
index 757787505f0c..3ea68d61e84e 100644
--- a/Common/src/toolboxes/meson.build
+++ b/Common/src/toolboxes/meson.build
@@ -1 +1,3 @@
 common_src += files(['printing_toolbox.cpp'])
+
+subdir('MMS')
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 76992ef0c6dc..10abf1dc2b94 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -1,52 +1,41 @@
 su2_cfd_src = ['output_paraview.cpp',
+           'driver_adjoint_singlezone.cpp',
            'solver_direct_transition.cpp',
            'solver_adjoint_turbulent.cpp',
            'integration_structure.cpp',
            'solver_direct_mean_fem.cpp',
            'numerics_adjoint_mean.cpp',
            'transport_model.cpp',
-           'variable_direct_turbulent.cpp',
            'numerics_adjoint_turbulent.cpp',
-           'variable_direct_transition.cpp',
            'output_tecplot.cpp',
            'fluid_model_pvdw.cpp',
-           'variable_direct_elasticity.cpp',
            'integration_time.cpp',
            'fluid_model_pig.cpp',
            'solver_direct_mean.cpp',
            'iteration_structure.cpp',
-           'variable_template.cpp',
            'fluid_model_inc.cpp',
            'solver_adjoint_mean.cpp',
            'driver_structure.cpp',
-           'variable_adjoint_turbulent.cpp',
-           'variable_adjoint_discrete.cpp',
-           'variable_structure.cpp',
            'driver_direct_multizone.cpp',
            'solver_adjoint_elasticity.cpp',
            'solver_structure.cpp',
            'numerics_direct_transition.cpp',
            'solver_template.cpp',
-           'variable_direct_mean_inc.cpp',
            'solver_direct_elasticity.cpp',
            'definition_structure.cpp',
            'output_structure.cpp',
            'output_cgns.cpp',
            'numerics_direct_mean_inc.cpp',
            'transfer_physics.cpp',
-           'data_manufactured_solutions.cpp',
-           'variable_adjoint_mean.cpp',
            'solver_direct_turbulent.cpp',
            'output_physics.cpp',
            'fluid_model.cpp',
            'solver_direct_mean_inc.cpp',
            'numerics_direct_mean.cpp',
            'solver_direct_heat.cpp',
-           'variable_direct_heat.cpp',
            'numerics_direct_heat.cpp',
            'fluid_model_ppr.cpp',
            'numerics_direct_elasticity.cpp',
-           'variable_direct_mean.cpp',
            'driver_direct_singlezone.cpp',
            'numerics_direct_turbulent.cpp',
            'numerics_direct_elasticity_linear.cpp',
@@ -58,9 +47,27 @@ su2_cfd_src = ['output_paraview.cpp',
            'output_fieldview.cpp',
            'solver_adjoint_discrete.cpp',
            'numerics_direct_elasticity_nonlinear.cpp',
-           'variable_adjoint_elasticity.cpp',
            'SU2_CFD.cpp']
 
+su2_cfd_src += files(['variables/CIncNSVariable.cpp',
+                     'variables/CTransLMVariable.cpp',
+	             'variables/CAdjEulerVariable.cpp',
+                     'variables/CHeatFVMVariable.cpp',
+                     'variables/CTurbVariable.cpp',
+                     'variables/CAdjNSVariable.cpp',
+                     'variables/CBaselineVariable.cpp',
+                     'variables/CDiscAdjFEAVariable.cpp',
+                     'variables/CFEABoundVariable.cpp',
+                     'variables/CDiscAdjVariable.cpp',
+                     'variables/CTurbSAVariable.cpp',
+                     'variables/CFEAVariable.cpp',
+                     'variables/CTurbSSTVariable.cpp',
+                     'variables/CVariable.cpp',
+                     'variables/CNSVariable.cpp',
+                     'variables/CAdjTurbVariable.cpp',
+                     'variables/CIncEulerVariable.cpp',
+                     'variables/CEulerVariable.cpp'])
+
 su2_cfd = executable('SU2_CFD',
                      su2_cfd_src, 
 		     install : true, 
diff --git a/SU2_DEF/src/meson.build b/SU2_DEF/src/meson.build
index b5d8c48dfcba..1e48e7e25fec 100644
--- a/SU2_DEF/src/meson.build
+++ b/SU2_DEF/src/meson.build
@@ -1,12 +1,13 @@
 su2_def_src = ['SU2_DEF.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
-				       'variable_structure.cpp'])
+                                       'output_cgns.cpp',
+                                       'output_fieldview.cpp',
+                                       'output_paraview.cpp',
+                                       'output_tecplot.cpp',
+                                       'output_su2.cpp',                   
+				       'variables/CBaselineVariable.cpp',
+				       'variables/CVariable.cpp'])
 
 
 su2_def = executable('SU2_DEF',
diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
index 68d8680679f8..b3c789f58722 100644
--- a/SU2_DOT/src/meson.build
+++ b/SU2_DOT/src/meson.build
@@ -1,14 +1,13 @@
-
 su2_dot_src = ['SU2_DOT.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
-				       'variable_structure.cpp'])
-
+                                       'output_cgns.cpp',
+                                       'output_fieldview.cpp',
+                                       'output_paraview.cpp',
+                                       'output_tecplot.cpp',
+                                       'output_su2.cpp',                   
+				       'variables/CBaselineVariable.cpp',
+				       'variables/CVariable.cpp'])
 
 su2_dot = executable('SU2_DOT',
                      su2_dot_src, 
diff --git a/SU2_SOL/src/meson.build b/SU2_SOL/src/meson.build
index 00c559f91d7a..16c32ef2f008 100644
--- a/SU2_SOL/src/meson.build
+++ b/SU2_SOL/src/meson.build
@@ -1,13 +1,13 @@
 su2_sol_src = ['SU2_SOL.cpp']
 su2_cfd_obj = su2_cfd.extract_objects(['solver_structure.cpp',
                                        'output_structure.cpp',
-				       'output_cgns.cpp',
-				       'output_tecplot.cpp',
-				       'output_fieldview.cpp',
-				       'output_su2.cpp',
-				       'output_paraview.cpp',
-				       'variable_structure.cpp'])
-
+                                       'output_cgns.cpp',
+                                       'output_fieldview.cpp',
+                                       'output_paraview.cpp',
+                                       'output_tecplot.cpp',
+                                       'output_su2.cpp',                   
+				       'variables/CBaselineVariable.cpp',
+				       'variables/CVariable.cpp'])
 
 su2_sol = executable('SU2_SOL',
                      su2_sol_src, 
diff --git a/meson.build b/meson.build
index 6015ab44f149..a9ee0724519d 100644
--- a/meson.build
+++ b/meson.build
@@ -16,9 +16,11 @@ su2_deps     = []
 mpi_dep = [dependency('mpi', language:'c', required: false), 
            dependency('mpi', language:'cpp', required: false)]
 
-codi_dep = [declare_dependency(include_directories: 'externals/codi/include')]
-codi_rev_args = '-DCODI_REVERSE_TYPE'
-codi_for_args = '-DCODI_FORWARD_TYPE'
+if get_option('enable-autodiff') or get_option('enable-directdiff')
+  codi_dep = [declare_dependency(include_directories: 'externals/codi/include')]
+  codi_rev_args = '-DCODI_REVERSE_TYPE'
+  codi_for_args = '-DCODI_FORWARD_TYPE'
+endif
 
 # Add cgns library
 if get_option('enable-cgns')

From f3c7a5d8bdd3b7344a9fdcc62f75174479f8db2c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 15:59:04 +0200
Subject: [PATCH 341/539] Readded MARKER_FLUID_INTERFACE option to test cases

---
 TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg         | 1 +
 TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg         | 1 +
 .../sliding_interface/incompressible_steady/configCircle.cfg     | 1 +
 TestCases/sliding_interface/incompressible_steady/configOut.cfg  | 1 +
 TestCases/sliding_interface/pipe/pipe_WA.cfg                     | 1 +
 .../sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg    | 1 +
 .../supersonic_vortex_shedding/sup_vor_shed_NN.cfg               | 1 +
 TestCases/sliding_interface/uniform_flow/uniform_WA.cfg          | 1 +
 8 files changed, 8 insertions(+)

diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index b6ccd43d20e2..b4084f38f5eb 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -89,6 +89,7 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
+MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 %
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index ae97b4aac1ee..f8dc09a78713 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -97,6 +97,7 @@ MARKER_RIEMANN= (up_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 3.0, 0.0,
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
+MARKER_FLUID_INTERFACE= ( internal_interface, inner_interface, domain_interface, external_interface )
 
 %KIND_INTERPOLATION= ISOPARAMETRIC
 %
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 06ca16ec414d..6224930ba354 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -53,6 +53,7 @@ REF_AREA= 1.0
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 
+MARKER_FLUID_INTERFACE= (circleIn)
 
 MARKER_PLOTTING= ( NONE )
 MARKER_MONITORING= ( NONE )
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index 8b8b4565172a..ed22bdf80ff2 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -58,6 +58,7 @@ MARKER_HEATFLUX = ( upper, -1000.0, lower, 1000.0 )
 INC_OUTLET_TYPE = PRESSURE_OUTLET
 MARKER_OUTLET= ( outlet, 0.0 )
 
+MARKER_FLUID_INTERFACE= (circleOut)
 
 INC_INLET_TYPE= VELOCITY_INLET
 SPECIFIED_INLET_PROFILE= YES
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 600fa1f71f27..0adf1db41c10 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -93,6 +93,7 @@ MARKER_RIEMANN= (intake_upper_inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15,
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
+MARKER_FLUID_INTERFACE= ( intake_interface, inlet_interface_1, outlet_interface_1, inlet_interface_2, outlet_interface_2, inlet_interface_3, outlet_interface_3, inlet_interface_4 )
 %
 
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index decf097c27dd..06918e4a8b24 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -87,6 +87,7 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
+MARKER_FLUID_INTERFACE= ( domain_interface, external_interface, internal_interface, inner_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 8df7c6c5b1e7..e4a298bca765 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -88,6 +88,7 @@ MARKER_RIEMANN= (inlet, STATIC_SUPERSONIC_INFLOW_PT, 95750, 288.15, 2.5, 0.0, 0.
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
+MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %KIND_INTERPOLATION= SLIDING_MESH
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 0833e8e40a18..0d4f77687ce0 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -87,6 +87,7 @@ MARKER_EULER= (outlet)
 %
 % Zone interaction boundary definition
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
+MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
 %
 KIND_INTERPOLATION= WEIGHTED_AVERAGE

From 5a69fc74f3a3e13766ac47608e80134bfd3c5668 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 15 Jul 2019 16:18:40 +0200
Subject: [PATCH 342/539] Adapted unsteadyCHT pywrapper case

---
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg                | 2 +-
 TestCases/fea_fsi/MixElemsKnowles/config.cfg               | 2 +-
 .../launch_unsteady_CHT_FlatPlate.py                       | 4 ++--
 .../flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 3e09de891bec..7bf7b9dfb9c7 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -53,7 +53,7 @@ LINEAR_SOLVER_ITER= 1000
 LINEAR_SOLVER_RESTART_FREQUENCY= 100
 %
 % Convergence criteria ------------------------------------------------- %
-EXT_ITER= 1
+OUTER_ITER= 1
 % interaction
 FSI_ITER= 1
 % if running from scratch this helps a bunch
diff --git a/TestCases/fea_fsi/MixElemsKnowles/config.cfg b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
index 223f45237ac8..8bd5eb9c8728 100644
--- a/TestCases/fea_fsi/MixElemsKnowles/config.cfg
+++ b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
@@ -53,4 +53,4 @@ MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 RESTART_SOL= YES
-
+SOLUTION_FILENAME= solution_structure.dat
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
index 4fa5ac0d0a11..f4c5d74f1101 100755
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
@@ -104,7 +104,7 @@ def main():
     elif (options.nZone == 2) and (options.fsi):
       SU2Driver = pysu2.CFSIDriver(options.filename, options.nZone, comm);
     else:
-      SU2Driver = pysu2.CFluidDriver(options.filename, options.nZone, comm);
+      SU2Driver = pysu2.CSinglezoneDriver(options.filename, options.nZone, comm);
   except TypeError as exception:
     print('A TypeError occured in pysu2.CDriver : ',exception)
     if options.with_MPI == True:
@@ -152,7 +152,7 @@ def main():
 
   while (TimeIter < nTimeIter):
     # Time iteration preprocessing
-    SU2Driver.PreprocessExtIter(TimeIter)
+    SU2Driver.Preprocess(TimeIter)
     # Define the homogeneous unsteady wall temperature on the structure (user defined)
     WallTemp = 293.0 + 57.0*sin(2*pi*time)
     # Set this temperature to all the vertices on the specified CHT marker
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index a19ea77f6669..776f6a89f8c6 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -46,8 +46,6 @@ DISCARD_INFILES= NO
 %                                       psf = lbf/ft^2, Density = slug/ft^3, 
 %                                       Speed = ft/s, Equiv. Area = ft^2 )
 SYSTEM_MEASUREMENTS= SI
-
-SINGLEZONE_DRIVER=NO
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -177,7 +175,7 @@ MAX_TIME= 1.0
 UNST_CFL_NUMBER= 0.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 10
+INNER_ITER= 10
 %
 % Iteration number to begin unsteady restarts
 RESTART_ITER= 0
@@ -549,3 +547,6 @@ WRT_BINARY_RESTART= YES
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
+%
+% Screen output
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)

From d984aac8ec576ab87fec36fc40613004720c7b6d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 11:54:00 +0200
Subject: [PATCH 343/539] Removed old InitSlidingState routine

---
 SU2_CFD/include/solver_structure.hpp    | 24 -------------
 SU2_CFD/include/solver_structure.inl    |  2 --
 SU2_CFD/src/solver_direct_mean.cpp      | 47 +++++++++++++++----------
 SU2_CFD/src/solver_direct_mean_inc.cpp  | 46 +++++++++++++++---------
 SU2_CFD/src/solver_direct_turbulent.cpp | 44 ++++++++++++++---------
 TestCases/serial_regression.py          |  2 +-
 6 files changed, 87 insertions(+), 78 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index c48d7a152462..d5b9cdbe8010 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -1233,12 +1233,6 @@ class CSolver {
    */
   virtual void SetnSlidingStates(unsigned short val_marker, unsigned long val_vertex, int value);
 
-  /*!
-   * \brief Allocate the sliding state arrays.
-   * \param[in] config - Definition of the particular problem.
-   */
-  virtual void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
-  
   /*!
    * \brief Set the conjugate heat variables.
    * \param[in] val_marker        - marker index
@@ -5367,12 +5361,6 @@ class CEulerSolver : public CSolver {
   */
   su2double GetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index);
 
-  /*!
-   * \brief Allocate the sliding state arrays.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
-  
   /*!
    * \brief Provide the non dimensional lift coefficient (inviscid contribution).
    * \param val_marker Surface where the coefficient is going to be computed.
@@ -8190,12 +8178,6 @@ class CIncEulerSolver : public CSolver {
    */
   int GetnSlidingStates(unsigned short val_marker, unsigned long val_vertex);
 
-  /*!
-   * \brief Allocate the sliding state arrays.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
-  
   /*!
    * \brief Get the outer state for fluid interface nodes.
    * \param[in] val_marker - marker index
@@ -9354,12 +9336,6 @@ class CTurbSolver : public CSolver {
    */
   int GetnSlidingStates(unsigned short val_marker, unsigned long val_vertex);
 
-  /*!
-   * \brief Allocate the sliding state arrays.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker);  
-  
   /*!
    * \brief Set custom turbulence variables at the vertex of an inlet.
    * \param[in] iMarker - Marker identifier.
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index 55d12964e8a6..c04047a4f7c2 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -2349,8 +2349,6 @@ inline void CIncEulerSolver::SetSlidingState(unsigned short val_marker, unsigned
   SlidingState[val_marker][val_vertex][val_state][donor_index] = component;
 }
 
-inline void CSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker) {}
-
 inline void CSolver::SetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index, su2double component){ }
 
 inline su2double CEulerSolver::GetSlidingState(unsigned short val_marker, unsigned long val_vertex, unsigned short val_state, unsigned long donor_index) { return SlidingState[val_marker][val_vertex][val_state][donor_index]; }
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 2c4494f36e59..b5e539384a8a 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -780,6 +780,21 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   for (iMarker = 0; iMarker < nMarker; iMarker++){
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
+
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
+
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*--- Initialize the solution to the far-field state everywhere. ---*/
@@ -14117,24 +14132,6 @@ void CEulerSolver::GatherInOutAverageValues(CConfig *config, CGeometry *geometry
   }
 }
 
-void CEulerSolver::InitSlidingState(CConfig* config, CGeometry* geometry, unsigned short iMarker){
-  
-  
-  unsigned long iPoint;
-  unsigned short iVar;
-
-  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-  
-  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-    
-    SlidingStateNodes[iMarker][iPoint] = 0;
-    for (iVar = 0; iVar < nPrimVar+1; iVar++)
-      SlidingState[iMarker][iPoint][iVar] = NULL;
-  }
-}
-
 CNSSolver::CNSSolver(void) : CEulerSolver() {
   
   /*--- Basic array initialization ---*/
@@ -14843,6 +14840,20 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
     
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
+
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*--- Initialize the solution to the far-field state everywhere. ---*/
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 4638f2ef1a4d..da7949bbd39f 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -540,6 +540,21 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   for (iMarker = 0; iMarker < nMarker; iMarker++){
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
+
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
+
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*--- Initialize the cauchy critera array for fixed CL mode ---*/
@@ -6726,23 +6741,6 @@ void CIncEulerSolver::SetFreeStream_Solution(CConfig *config){
   }
 }
 
-void CIncEulerSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker){
-  
-  unsigned long iPoint;
-  unsigned short iVar;
-
-  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-  
-  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-    
-    SlidingStateNodes[iMarker][iPoint] = 0;
-    for (iVar = 0; iVar < nPrimVar+1; iVar++)
-      SlidingState[iMarker][iPoint][iVar] = NULL;
-  }
-}
-
 CIncNSSolver::CIncNSSolver(void) : CIncEulerSolver() {
   
   /*--- Basic array initialization ---*/
@@ -7271,7 +7269,21 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
+    
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
 
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*--- Initialize the cauchy critera array for fixed CL mode ---*/
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index 15d9715cf744..c0360e23d4ad 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -751,22 +751,6 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
   
 }
 
-void CTurbSolver::InitSlidingState(CConfig *config, CGeometry *geometry, unsigned short iMarker){
-  
-  unsigned long iPoint;
-  unsigned short iVar;
-
-  SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
-  SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
-  
-  for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
-    SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
-    
-    SlidingStateNodes[iMarker][iPoint] = 0;
-    for (iVar = 0; iVar < nPrimVar+1; iVar++)
-      SlidingState[iMarker][iPoint][iVar] = NULL;
-  }
-}
 
 void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
 
@@ -1097,6 +1081,20 @@ CTurbSASolver::CTurbSASolver(CGeometry *geometry, CConfig *config, unsigned shor
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
     
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
+
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*-- Allocation of inlets has to happen in derived classes (not CTurbSolver),
@@ -3416,7 +3414,21 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh
 
     SlidingState[iMarker]      = NULL;
     SlidingStateNodes[iMarker] = NULL;
+    
+    if (config->GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE){
 
+      SlidingState[iMarker]       = new su2double**[geometry->GetnVertex(iMarker)];
+      SlidingStateNodes[iMarker]  = new int        [geometry->GetnVertex(iMarker)];
+
+      for (iPoint = 0; iPoint < geometry->GetnVertex(iMarker); iPoint++){
+        SlidingState[iMarker][iPoint] = new su2double*[nPrimVar+1];
+
+        SlidingStateNodes[iMarker][iPoint] = 0;
+        for (iVar = 0; iVar < nPrimVar+1; iVar++)
+          SlidingState[iMarker][iPoint][iVar] = NULL;
+      }
+
+    }
   }
 
   /*-- Allocation of inlets has to happen in derived classes (not CTurbSolver),
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 1a8b4657a5ec..db1d4fbc1b9f 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -800,7 +800,7 @@ def main():
     aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
     aeroelastic.su2_exec  = "SU2_CFD"
     aeroelastic.timeout   = 1600
-    aeroelastic.tol       = 0.000001
+    aeroelastic.tol       = 0.00001
     aeroelastic.unsteady  = True
     aeroelastic.new_output = True
     test_list.append(aeroelastic) 

From c18c962b39b3941aa445db11a91e21cd6931459a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 14:36:14 +0200
Subject: [PATCH 344/539] Fixing test cases

---
 TestCases/parallel_regression.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 1346bab1c45b..b5b5666d8de1 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -863,7 +863,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 5
-    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631532] #last 4 columns
+    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631539] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -941,7 +941,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.720012, -1.607989] #last 4 columns
+    bars_SST_2D.test_vals = [13.000000, -0.719501, -1.608959] #last 4 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1098,7 +1098,7 @@ def main():
     pywrapper_unsteadyCHT.timeout       = 1600
     pywrapper_unsteadyCHT.tol           = 0.00001
     pywrapper_unsteadyCHT.unsteady      = True
-    pywrapper_unsteadyCHT.new_output    = False
+    pywrapper_unsteadyCHT.new_output    = True
     test_list.append(pywrapper_unsteadyCHT)
 
     # Rigid motion

From 41fdf15406a90283e5e66cf9bb5117e8f3147b97 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 15:59:42 +0200
Subject: [PATCH 345/539] Changed offset cache implementation

---
 SU2_CFD/include/output/COutput.hpp        |  3 ++-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp | 14 +----------
 SU2_CFD/src/output/COutput.cpp            | 30 ++++++++++++++---------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 96f55211dfba..8b992a632373 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -147,7 +147,8 @@ class COutput {
   std::vector<string>                           VolumeOutput_List;
   std::vector<short>                            Offset_Cache;
   unsigned short                                Offset_Cache_Index;
-  bool                                          Offset_Cache_Checked;
+  bool                                          Offset_Cache_Checked,
+                                                Build_Offset_Cache;
   
   std::vector<string> RequestedHistoryFields;
   unsigned short nRequestedHistoryFields;
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 5aa23e4077d0..5cabdbdc8988 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -332,19 +332,7 @@ void CAdjFlowCompOutput::SetVolumeOutputFields(CConfig *config){
     }
   }
   /// END_GROUP
-  
-  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
-  if (config->GetGrid_Movement()){
-    /// DESCRIPTION: Grid velocity x-component.
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
-    /// DESCRIPTION: Grid velocity y-component.
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
-    if (nDim == 3)    
-      /// DESCRIPTION: Grid velocity z-component.
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
-  }
-  /// END_GROUP
-  
+
   /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
   /// DESCRIPTION: Residual of the adjoint density.
   AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 7d6d98cde7eb..9db1e904b0f3 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -139,6 +139,8 @@ COutput::COutput(CConfig *config) {
   Convergence_FSI    = false;
   Convergence_FullMG = false;
   
+  Build_Offset_Cache = false;
+  
 }
 
 COutput::~COutput(void) {
@@ -1173,9 +1175,13 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
       for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
         
-        LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
+        if (jPoint == 0){
+          Build_Offset_Cache = true;
+        } else {
+          Build_Offset_Cache = false;
+        }
         
-        CheckOffsetCache();
+        LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
         jPoint++;
         
@@ -1186,10 +1192,18 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
       
+      /*--- Build the offset cache if it is the first point --- */
+      
+      if (iPoint == 0){
+        Build_Offset_Cache = true;
+      } else {
+        Build_Offset_Cache = false;
+      }
+      
       /*--- Check for halos & write only if requested ---*/
       /*--- Load the volume data into the Local_Data() array. --- */
       
-      LoadVolumeData(config, geometry, solver, jPoint);
+      LoadVolumeData(config, geometry, solver, iPoint);
 
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
         iVertex = geometry->node[iPoint]->GetVertex(iMarker);
@@ -1197,22 +1211,16 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
           
           /*--- Load the surface data into the Local_Data() array. --- */
           
-          LoadSurfaceData(config, geometry, solver, jPoint, iMarker, iVertex);
+          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
         }
-        
       } 
-      
-      CheckOffsetCache();
-      
-      jPoint++;
     }
   }
-
 }
 
 void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
   
-  if (VolumeOutput_List.size() != Offset_Cache.size()){ 
+  if (Build_Offset_Cache){ 
     
     /*--- Build up the offset cache to speed up subsequent 
      * calls of this routine since the order of calls is 

From f1167dd2db3d3934450ed34e70537d8a6979ffac Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 15:59:58 +0200
Subject: [PATCH 346/539] Updated some test cases

---
 TestCases/serial_regression.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index c2c61e9fa2c8..dfded41afdfe 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1011,7 +1011,7 @@ def main():
     bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
     bars_SST_2D.cfg_file  = "bars.cfg"
     bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [13.000000, -0.720012, -1.607989] #last 3 columns
+    bars_SST_2D.test_vals = [13.000000, -0.719501, -1.608959] #last 3 columns
     bars_SST_2D.su2_exec  = "SU2_CFD"
     bars_SST_2D.timeout   = 1600
     bars_SST_2D.tol       = 0.00001
@@ -1099,10 +1099,11 @@ def main():
     airfoilRBF           = TestCase('airfoil_fsi_rbf')
     airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
     airfoilRBF.cfg_file  = "config.cfg"
-    airfoilRBF.test_iter = 29
-    airfoilRBF.test_vals = [-13.228126, -3.738614, -11.639760, 1404500.0] #last 4 columns
+    airfoilRBF.test_iter = 0
+    airfoilRBF.test_vals = [0.000000, 1.442130, -2.231734] #last 4 columns
     airfoilRBF.su2_exec  = "SU2_CFD"
     airfoilRBF.timeout   = 1600
+    airfoilRBF.multizone = True
     airfoilRBF.tol       = 0.00001
     test_list.append(airfoilRBF)
    

From af0598e5fb21db99ccfd1a8f99a71a7ab1f7ce79 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 16:36:45 +0200
Subject: [PATCH 347/539] Fixed reading of surface_adjoint.csv for SU2_DOT

---
 Common/src/geometry_structure.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 516368a46093..e473067bd550 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -16017,22 +16017,38 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     
     /*--- Read extra inofmration ---*/
     
-    getline(Surface_file, text_line);
-    text_line.erase (0,9);
-    su2double AoASens = atof(text_line.c_str());
-    config->SetAoA_Sens(AoASens);
+//    getline(Surface_file, text_line);
+//    text_line.erase (0,9);
+//    su2double AoASens = atof(text_line.c_str());
+//    config->SetAoA_Sens(AoASens);
     
     /*--- File header ---*/
     
     getline(Surface_file, text_line);
     
+    vector<string> split_line;
+    
+    char delimiter = ',';
+    split_line = PrintingToolbox::split(text_line, delimiter);
+    
+    std::vector<string>::iterator it = std::find(split_line.begin(), split_line.end(), "\"Surface_Sensitivity\"");
+    
+    if (it == split_line.end()){
+      SU2_MPI::Error("Surface sensitivity not found in file.", CURRENT_FUNCTION);
+    }
+    
+    int sens_index = std::distance(split_line.begin(), it);
+    
     while (getline(Surface_file, text_line)) {
       for (icommas = 0; icommas < 50; icommas++) {
         position = text_line.find( ",", 0 );
         if (position!=string::npos) text_line.erase (position,1);
       }
       stringstream  point_line(text_line);
-      point_line >> iPoint >> Sensitivity;
+      point_line >> iPoint;
+      
+      for (int i = 1; i <= sens_index; i++)
+        point_line >> Sensitivity;
       
       if (PointInDomain[iPoint]) {
         

From 8d729fe30d96291576a08368375bf4753d0fcabf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 18:07:20 +0200
Subject: [PATCH 348/539] Further change to offset cache ..

---
 SU2_CFD/src/output/COutput.cpp | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9db1e904b0f3..3dcee310c5c1 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1156,7 +1156,6 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   /*--- Reset the offset cache and index --- */
   Offset_Cache_Index = 0;
   Offset_Cache.clear();
-  Offset_Cache_Checked = false;
   
   if (fem_output){
     
@@ -1205,16 +1204,27 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       
       LoadVolumeData(config, geometry, solver, iPoint);
 
-      for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-        iVertex = geometry->node[iPoint]->GetVertex(iMarker);
-        if (iVertex != -1){ 
-          
-          /*--- Load the surface data into the Local_Data() array. --- */
-          
-          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
-        }
-      } 
     }
+    
+    /*--- Reset the offset cache and index --- */
+    Offset_Cache_Index = 0;
+    Offset_Cache.clear();    
+    
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
+        
+        if (iVertex == 0){
+          Build_Offset_Cache = true;
+        } else {
+          Build_Offset_Cache = false;
+        }
+        
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        
+        LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+        
+      }   
+    } 
   }
 }
 

From 260e76986d224df818781e1ff3b835989b1e7960 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 16 Jul 2019 18:24:57 +0200
Subject: [PATCH 349/539] Further changes to test cases

---
 .../multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg         | 1 +
 .../multiobjective_wedge/inv_wedge_ROE_multiobj.cfg           | 2 +-
 .../multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg     | 1 +
 .../multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg     | 1 +
 TestCases/parallel_regression.py                              | 4 ++--
 TestCases/serial_regression.py                                | 4 ++--
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 531eb0b3b28c..fdac067f0bf5 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -409,3 +409,4 @@ OPT_BOUND_LOWER= -0.1
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
 
+HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 7742afbf7673..b4dae58c34f6 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -409,4 +409,4 @@ OPT_BOUND_LOWER= -0.1
 %
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
-
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 3b218cafe20d..94b6dc3940bb 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -410,3 +410,4 @@ OPT_BOUND_LOWER= -0.1
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
 
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 0d339e8dbc3c..cfa729b8d3cc 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -412,3 +412,4 @@ OPT_BOUND_LOWER= -0.1
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
 
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index b5b5666d8de1..bfb077006bc3 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -928,7 +928,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [-1.124271, 4.605462, 0.000000, 0.000000] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208652, 1.128007] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "parallel_computation.py -f"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1093,7 +1093,7 @@ def main():
     pywrapper_unsteadyCHT.cfg_dir       = "py_wrapper/flatPlate_unsteady_CHT"
     pywrapper_unsteadyCHT.cfg_file      = "unsteady_CHT_FlatPlate_Conf.cfg"
     pywrapper_unsteadyCHT.test_iter     = 5
-    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.259805, 0.000064, 0.144178] #last 4 columns
+    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.263342, -0.000029, 0.145689] #last 4 columns
     pywrapper_unsteadyCHT.su2_exec      = "mpirun -np 2 python launch_unsteady_CHT_FlatPlate.py --parallel -f"
     pywrapper_unsteadyCHT.timeout       = 1600
     pywrapper_unsteadyCHT.tol           = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index dfded41afdfe..a9fae4d91564 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1543,7 +1543,7 @@ def main():
     pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     pywrapper_fsi2d.cfg_file  = "configFSI.cfg"
     pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
+    pywrapper_fsi2d.test_vals = [2.000000, 0.000000, -4.017814, -6.059791] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
     pywrapper_fsi2d.new_output  = True
     pywrapper_fsi2d.timeout   = 1600
@@ -1570,7 +1570,7 @@ def main():
     pywrapper_rigidMotion.cfg_dir       = "py_wrapper/flatPlate_rigidMotion"
     pywrapper_rigidMotion.cfg_file      = "flatPlate_rigidMotion_Conf.cfg"
     pywrapper_rigidMotion.test_iter     = 5
-    pywrapper_rigidMotion.test_vals     = [-4.691612, -2.206047, -2.288896, 0.777467] #last 4 columns
+    pywrapper_rigidMotion.test_vals     = [-1.598116, 2.259671, -0.040632, 0.144135] #last 4 columns
     pywrapper_rigidMotion.su2_exec      = "python launch_flatPlate_rigidMotion.py -f"
     pywrapper_rigidMotion.new_output      = True
     pywrapper_rigidMotion.timeout       = 1600

From 02db0eb4b0787cfafc2087b909b78f6d0b4cf52b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Jul 2019 12:13:35 +0200
Subject: [PATCH 350/539] Added files to meson

---
 Common/src/meson.build                  |    8 +-
 SU2_CFD/src/output/output_cgns.cpp      |  517 --------
 SU2_CFD/src/output/output_csv.cpp       |  143 --
 SU2_CFD/src/output/output_fieldview.cpp |  783 -----------
 SU2_CFD/src/output/output_paraview.cpp  | 1585 -----------------------
 SU2_CFD/src/output/output_su2.cpp       |  438 -------
 SU2_CFD/src/output/output_tecplot.cpp   |  932 -------------
 7 files changed, 2 insertions(+), 4404 deletions(-)
 delete mode 100644 SU2_CFD/src/output/output_cgns.cpp
 delete mode 100644 SU2_CFD/src/output/output_csv.cpp
 delete mode 100644 SU2_CFD/src/output/output_fieldview.cpp
 delete mode 100644 SU2_CFD/src/output/output_paraview.cpp
 delete mode 100644 SU2_CFD/src/output/output_su2.cpp
 delete mode 100644 SU2_CFD/src/output/output_tecplot.cpp

diff --git a/Common/src/meson.build b/Common/src/meson.build
index 0fb116a681c7..089c09cbada6 100644
--- a/Common/src/meson.build
+++ b/Common/src/meson.build
@@ -1,10 +1,8 @@
 common_include = include_directories('./')
 common_src =files(['geometry_structure_fem_part.cpp',
            'primal_grid_structure.cpp',
-           'linear_solvers_structure.cpp',
            'graph_coloring_structure.cpp',
            'fem_geometry_structure.cpp',
-           'linear_solvers_structure_b.cpp',
            'fem_integration_rules.cpp',
            'config_structure.cpp',
            'dual_grid_structure.cpp',
@@ -18,18 +16,16 @@ common_src =files(['geometry_structure_fem_part.cpp',
            'fem_wall_distance.cpp',
            'grid_adaptation_structure.cpp',
            'element_linear.cpp',
-           'vector_structure.cpp',
            'fem_gauss_jacobi_quadrature.cpp',
            'gauss_structure.cpp',
            'wall_model.cpp',
            'adt_structure.cpp',
            'interpolation_structure.cpp',
            'mpi_structure.cpp',
-           'fem_cgns_elements.cpp',
-           'matrix_structure.cpp'])
+           'fem_cgns_elements.cpp'])
 
 subdir('toolboxes')
-
+subdir('linear_algebra')
 common     = static_library('SU2Common', 
                             common_src,
                             install : false, 
diff --git a/SU2_CFD/src/output/output_cgns.cpp b/SU2_CFD/src/output/output_cgns.cpp
deleted file mode 100644
index 2a5334b3da77..000000000000
--- a/SU2_CFD/src/output/output_cgns.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-/*!
- * \file output_cgns.cpp
- * \brief Main subroutines for output solver information
- * \author T. Economon, M. Colonno
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/COutput.hpp"
-
-void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned short iZone) {
-  
-#ifdef HAVE_CGNS
-  
-  /*--- local CGNS variables ---*/
-  int cgns_file, cgns_coord, element_dims, physical_dims, cgns_err;
-  unsigned long iExtIter = config->GetExtIter();
-  string base_file, buffer, elements_name;
-  stringstream name, results_file;
-  bool unsteady = config->GetUnsteady_Simulation();
-  cgsize_t isize[3][1];
-  
-  /*--- Create CGNS base file name ---*/
-  base_file = config->GetVolume_FileName();
-  
-  /*--- Add CGNS extension. ---*/
-  base_file = base_file.append(".cgns");
-  
-  /*--- Create CGNS results file name ---*/
-  if (unsteady) {
-    
-    buffer = config->GetVolume_FileName();
-    
-    results_file.str(string()); results_file << buffer;
-    if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
-    if (((int)iExtIter >= 10) && ((int)iExtIter < 100))    results_file << "_000" << iExtIter;
-    if (((int)iExtIter >= 100) && ((int)iExtIter < 1000))    results_file << "_00" << iExtIter;
-    if (((int)iExtIter >= 1000) && ((int)iExtIter < 10000))  results_file << "_0" << iExtIter;
-    if ((int)iExtIter >= 10000)              results_file << iExtIter;
-    results_file << ".cgns";
-  }
-  
-  /*--- Write base file if not already done ---*/
-  if (!wrote_base_file) {
-    
-    /*--- Write base file ---*/
-    cgns_err = cg_open((char *)base_file.c_str(), CG_MODE_MODIFY, &cgns_file);
-    if (cgns_err) cg_error_print();
-    
-    element_dims = geometry->GetnDim();    // Currently (release 2.0) only all-2D or all-3D zones permitted
-    physical_dims = element_dims;
-    
-    isize[0][0] = (cgsize_t)nGlobal_Poin;        // vertex size
-    isize[1][0] = (cgsize_t)nGlobal_Elem;        // cell size
-    isize[2][0] = 0;            // boundary vertex size (zero if elements not sorted)
-    
-    cgns_err = cg_goto(cgns_file, cgns_base,"Zone_t", cgns_zone,"end");
-    if (cgns_err) cg_error_print();
-
-    
-    /*--- write CGNS node coordinates ---*/
-    cgns_err = cg_coord_write(cgns_file, cgns_base, cgns_zone, RealDouble,"CoordinateX", Coords[0], &cgns_coord);
-    if (cgns_err) cg_error_print();
-    cgns_err = cg_coord_write(cgns_file, cgns_base, cgns_zone, RealDouble,"CoordinateY", Coords[1], &cgns_coord);
-    if (cgns_err) cg_error_print();
-    if (geometry->GetnDim() == 3) {
-      cgns_err = cg_coord_write(cgns_file, cgns_base, cgns_zone, RealDouble,"CoordinateZ", Coords[2], &cgns_coord);
-      if (cgns_err) cg_error_print();
-    }
-    
-    cgns_err = cg_close(cgns_file);
-    if (cgns_err) cg_error_print();
-    
-        wrote_base_file = true;
-    
-  }
-  
-  /*--- Set up results file for this time step if necessary ---*/
-  if (unsteady) {
-    
-    cgns_err = cg_open((char *)results_file.str().c_str(), CG_MODE_WRITE, &cgns_file);
-
-    element_dims = geometry->GetnDim();    // Currently only all-2D or all-3D zones permitted
-    physical_dims = element_dims;
-
-    /*--- write CGNS base data (one base assumed currently) ---*/
-    cgns_err = cg_base_write(cgns_file,"SU2 Base", element_dims, physical_dims, &cgns_base_results);
-    if (cgns_err) cg_error_print();
-
-    isize[0][0] = (cgsize_t)geometry->GetGlobal_nPointDomain();        // vertex size
-    isize[1][0] = (cgsize_t)nGlobal_Elem;        // cell size
-    isize[2][0] = 0;            // boundary vertex size (zero if elements not sorted)
-
-    /*--- write CGNS zone data ---*/
-    cgns_err = cg_zone_write(cgns_file, cgns_base_results,"SU2 Zone", isize[0],Unstructured, &cgns_zone_results);
-    if (cgns_err) cg_error_print();
-
-    cgns_err = cg_goto(cgns_file, cgns_base_results,"Zone_t", cgns_zone_results,"end");
-    if (cgns_err) cg_error_print();
-
-    /*--- Write CGNS node coordinates, if appliciable ---*/
-    if (config->GetGrid_Movement()) {
-      
-      /*--- write CGNS node coordinates ---*/
-      cgns_err = cg_coord_write(cgns_file, cgns_base_results, cgns_zone_results, RealDouble,"x", Coords[0], &cgns_coord);
-      if (cgns_err) cg_error_print();
-      cgns_err = cg_coord_write(cgns_file, cgns_base_results, cgns_zone_results, RealDouble,"y", Coords[1], &cgns_coord);
-      if (cgns_err) cg_error_print();
-      if (geometry->GetnDim() == 3) {
-        cgns_err = cg_coord_write(cgns_file, cgns_base_results, cgns_zone_results, RealDouble,"z", Coords[2], &cgns_coord);
-        if (cgns_err) cg_error_print();
-      }
-    }
-    else {
-      /*--- Write a CGNS link for the node coordinates ---*/
-      cgns_err = cg_link_write("GridCoordinates",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/GridCoordinates");
-      if (cgns_err) cg_error_print();
-    }
-    
-    /*--- Write a CGNS link for each element type connectivity ---*/
-    if (nGlobal_Tria > 0) cgns_err = cg_link_write("Triangle Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Triangle Elements");
-    if (nGlobal_Quad > 0) cgns_err = cg_link_write("Quadrilateral Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Quadrilateral Elements");
-    if (nGlobal_Tetr > 0) cgns_err = cg_link_write("Tetrahedral Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Tetrahedral Elements");
-    if (nGlobal_Hexa > 0) cgns_err = cg_link_write("Hexahedral Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Hexahedral Elements");
-    if (nGlobal_Pyra > 0) cgns_err = cg_link_write("Pyramid Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Pyramid Elements");
-    if (nGlobal_Pris > 0) cgns_err = cg_link_write("Prism Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Prism Elements");
-    if (nGlobal_Line > 0) cgns_err = cg_link_write("Line Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Line Elements");
-    if (cgns_err) cg_error_print();
-
-    
-    /*--- Close CGNS file ---*/
-    cgns_err = cg_close(cgns_file);
-    if (cgns_err) cg_error_print();
-    
-  }
-
-
-  
-#else // Not built with CGNS support
-  
-  cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; 
-  
-#endif
-  
-}
-
-void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigned short iZone) {
-  
-#ifdef HAVE_CGNS
-  
-  /*--- local CGNS variables ---*/
-  int cgns_file, element_dims, physical_dims, cgns_err;
-  int cgns_section;
-  unsigned long iExtIter = config->GetExtIter();
-  string base_file, buffer, elements_name;
-  stringstream name, results_file;
-  bool unsteady = config->GetUnsteady_Simulation();
-  cgsize_t isize[3][1], elem_start, elem_end;
-  
-  /*--- Create CGNS base file name ---*/
-  base_file = config->GetVolume_FileName();
-  
-  /*--- Add CGNS extension. ---*/
-  base_file = base_file.append(".cgns");
-  
-  /*--- Create CGNS results file name ---*/
-  if (unsteady) {
-    
-    buffer = config->GetVolume_FileName();
-    
-    results_file.str(string()); results_file << buffer;
-    if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
-    if (((int)iExtIter >= 10) && ((int)iExtIter < 100))    results_file << "_000" << iExtIter;
-    if (((int)iExtIter >= 100) && ((int)iExtIter < 1000))    results_file << "_00" << iExtIter;
-    if (((int)iExtIter >= 1000) && ((int)iExtIter < 10000))  results_file << "_0" << iExtIter;
-    if ((int)iExtIter >= 10000)              results_file << iExtIter;
-    results_file << ".cgns";
-  }
-  
-  /*--- Write base file if not already done ---*/
-  if (!wrote_base_file) {
-    
-    /*--- Write base file ---*/
-    cgns_err = cg_open((char *)base_file.c_str(), CG_MODE_WRITE, &cgns_file);
-    if (cgns_err) cg_error_print();
-    
-    element_dims = geometry->GetnDim();    // Currently only all-2D or all-3D zones permitted
-    physical_dims = element_dims;
-    
-    /*--- write CGNS base data (one base assumed currently) ---*/
-    cgns_err = cg_base_write(cgns_file,"SU2 Base", element_dims, physical_dims, &cgns_base);
-    if (cgns_err) cg_error_print();
-    
-    /*--- write CGNS descriptor data ---*/
-    cgns_err = cg_goto(cgns_file, cgns_base,"end");
-    if (cgns_err) cg_error_print();
-    
-    cgns_err = cg_equationset_write(physical_dims);
-    if (cgns_err) cg_error_print();
-    
-    /*--- Write governing equations to CGNS file ---*/
-    cgns_err = cg_goto(cgns_file, cgns_base,"FlowEquationSet_t",1,"end");
-    if (cgns_err) cg_error_print();
-    switch (config->GetKind_Solver()) {
-      case EULER:
-        cgns_err = cg_governing_write(Euler); break;
-      case NAVIER_STOKES:
-        cgns_err = cg_governing_write(NSLaminar); break;
-      case RANS:
-        cgns_err = cg_governing_write(NSTurbulent); break;
-      default:
-        break; // cgns_err = cg_governing_write(CG_UserDefined);
-    }
-    if (cgns_err) cg_error_print();
-    
-    if (unsteady) cgns_err = cg_simulation_type_write(cgns_file, cgns_base, TimeAccurate);
-    else cgns_err = cg_simulation_type_write(cgns_file, cgns_base, NonTimeAccurate);
-    if (cgns_err) cg_error_print();
-    
-    cgns_err = cg_descriptor_write("Solver Information","SU2");
-    if (cgns_err) cg_error_print();
-    
-    isize[0][0] = (cgsize_t)geometry->GetGlobal_nPointDomain(); //;        // vertex size
-    isize[1][0] = (cgsize_t)nGlobal_Elem;        // cell size
-    isize[2][0] = 0;            // boundary vertex size (zero if elements not sorted)
-    
-    /*--- write CGNS zone data ---*/
-    cgns_err = cg_zone_write(cgns_file, cgns_base,"SU2 Zone", isize[0],Unstructured, &cgns_zone);
-    if (cgns_err) cg_error_print();
-
-    cgns_err = cg_goto(cgns_file, cgns_base,"Zone_t", cgns_zone,"end");
-    if (cgns_err) cg_error_print();
-    
-        /*--- Reference Note: CGNS element type list:
-     NODE, BAR_2, BAR_3, TRI_3, TRI_6, QUAD_4, QUAD_8, QUAD_9, TETRA_4, TETRA_10, PYRA_5,
-     PYRA_14, PENTA_6, PENTA_15, PENTA_18, HEXA_8, HEXA_20, HEXA_27, MIXED, PYRA_13, NGON_n, NFACE_n ---*/
-    
-    /*--- Write a CGNS section for each element type ---*/
-    // ier = cg_section_write(int fn, int B, int Z, char *ElementSectionName, ElementType_t type,
-    // cgsize_t start, cgsize_t end, int nbndry, cgsize_t *Elements, int *S);
-    
-    if (nGlobal_Tria > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Tria;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,
-                                  "Triangle Elements", TRI_3, elem_start, elem_end,
-                                  0,(cgsize_t *)Conn_Tria, &cgns_section);
-    }
-    if (nGlobal_Quad > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Quad;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Quadrilateral Elements", QUAD_4,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Quad, &cgns_section);
-    }
-    if (nGlobal_Tetr > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Tetr;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Tetrahedral Elements", TETRA_4,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Tetr, &cgns_section);
-    }
-    if (nGlobal_Hexa > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Hexa;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Hexahedral Elements", HEXA_8,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Hexa, &cgns_section);
-    }
-    if (nGlobal_Pyra > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Pyra;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Pyramid Elements", PYRA_5,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Pyra, &cgns_section);
-    }
-    if (nGlobal_Pris > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Pris;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Prism Elements", PENTA_6,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Pris, &cgns_section);
-    }
-    if (nGlobal_Line > 0) {
-      elem_start = 1; elem_end = (int)nGlobal_Line;
-      cgns_err = cg_section_write(cgns_file, cgns_base, cgns_zone,"Line Elements", BAR_2,
-                                  elem_start, elem_end,0,(cgsize_t *)Conn_Line, &cgns_section);
-    }
-    if (cgns_err) cg_error_print();
-    
-    
-    cgns_err = cg_close(cgns_file);
-    if (cgns_err) cg_error_print();
-    
-  }
-  
-#else // Not built with CGNS support
-  
-  cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; 
-  
-#endif
-  
-}
-
-void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned short iZone) {
-  
-#ifdef HAVE_CGNS
-  
-  /*--- local CGNS variables ---*/
-  int cgns_file, cgns_flow, cgns_field, cgns_err;
-//  int element_dims;
-  unsigned long jVar, iVar, iExtIter = config->GetExtIter();
-  string base_file, buffer, elements_name;
-  stringstream name, results_file;
-  bool unsteady = config->GetUnsteady_Simulation();
-  
-  bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
-  
-  /*--- Create CGNS base file name ---*/
-  base_file = config->GetVolume_FileName();
-  
-  /*--- Add CGNS extension. ---*/
-  base_file = base_file.append(".cgns");
-  
-  /*--- Create CGNS results file name ---*/
-  if (unsteady) {
-    
-    buffer = config->GetVolume_FileName();
-    
-    results_file.str(string()); results_file << buffer;
-    if (((int)iExtIter >= 0) && ((int)iExtIter < 10))      results_file << "_0000" << iExtIter;
-    if (((int)iExtIter >= 10) && ((int)iExtIter < 100))    results_file << "_000" << iExtIter;
-    if (((int)iExtIter >= 100) && ((int)iExtIter < 1000))    results_file << "_00" << iExtIter;
-    if (((int)iExtIter >= 1000) && ((int)iExtIter < 10000))  results_file << "_0" << iExtIter;
-    if ((int)iExtIter >= 10000)              results_file << iExtIter;
-    results_file << ".cgns";
-  }
-    
-    if (!unsteady) {
-      
-      /*--- Write base file ---*/
-      cgns_err = cg_open((char *)base_file.c_str(), CG_MODE_MODIFY, &cgns_file);
-      if (cgns_err) cg_error_print();
-      
-//      element_dims = geometry->GetnDim();    // Currently (release 2.0) only all-2D or all-3D zones permitted
-      
-      /*--- write CGNS descriptor data ---*/
-      cgns_err = cg_goto(cgns_file, cgns_base,"end");
-      if (cgns_err) cg_error_print();
-      
-      /*--- Create a CGNS solution node ---*/
-      cgns_err = cg_sol_write(cgns_file, cgns_base, cgns_zone,"Solution", Vertex, &cgns_flow);
-      if (cgns_err) cg_error_print();
-      
-      cgns_err = cg_goto(cgns_file, cgns_base,"Zone_t", cgns_zone,"FlowSolution_t", cgns_flow,"end");
-      if (cgns_err) cg_error_print();
-      
-      cgns_err = cg_gridlocation_write(Vertex);
-      if (cgns_err) cg_error_print();
-    }
-
-    
-    //wrote_CGNS_base = true;
-    else {
-  
-  /*--- Set up results file for this time step if necessary ---*/
-    
-    cgns_err = cg_open((char *)results_file.str().c_str(), CG_MODE_MODIFY, &cgns_file);
-    
-//    element_dims = geometry->GetnDim();    // Currently (release 2.0) only all-2D or all-3D zones permitted
-//    
-//    /*--- write CGNS base data (one base assumed currently) ---*/
-//    cgns_err = cg_base_write(cgns_file,"SU2 Base", element_dims, physical_dims, &cgns_base);
-//    if (cgns_err) cg_error_print();
-        
-//    /*--- write CGNS zone data ---*/
-//    cgns_err = cg_zone_write(cgns_file, cgns_base,"SU2 Zone", isize[0],Unstructured, &cgns_zone);
-//    if (cgns_err) cg_error_print();
-    
-    cgns_err = cg_goto(cgns_file, cgns_base_results,"Zone_t", cgns_zone_results,"end");
-    if (cgns_err) cg_error_print();
-    
-    /*--- Write a CGNS solution node for this time step ---*/
-    cgns_err = cg_sol_write(cgns_file, cgns_base_results, cgns_zone_results,"Solution", Vertex, &cgns_flow);
-    if (cgns_err) cg_error_print();
-    
-    cgns_err = cg_goto(cgns_file, cgns_base_results,"Zone_t", cgns_zone_results,"FlowSolution_t", cgns_flow,"end");
-    if (cgns_err) cg_error_print();
-    
-    cgns_err = cg_gridlocation_write(Vertex);
-    if (cgns_err) cg_error_print();
-    
-      cgns_base = cgns_base_results;
-      cgns_zone = cgns_zone_results;
-  }
-//  else {
-//    
-//    /*--- Open CGNS file for soltuion writing ---*/
-//    cgns_err = cg_open((char *)base_file.c_str(), CG_MODE_MODIFY, &cgns_file);
-//    cgns_base = 1; cgns_zone = 1; cgns_flow = 1;  // fix for multiple zones
-//    
-//  }
-  
-  /*  Reference Note on solution variables:
-   index 0 --> (nVar_Consv-1)      = Conservative Variables
-   nVar_Consv --> (2*nVar_Consv-1)    = Conservative Variable Residuals
-   (2*nVar_Consv-1)+          = Additional p, M, T, laminar, eddy depending on solver used */
-  
-  /*--- Write conservative variables to CGNS file ---*/
-  for (iVar = 0; iVar < nVar_Consv; iVar++) {
-    name.str(string()); name << "Conservative Variable " << iVar+1;
-    cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,(char *)name.str().c_str(), Data[iVar], &cgns_field);
-    if (cgns_err) cg_error_print();
-  }
-  
-  /*--- Write primitive variable residuals to CGNS file ---*/
-  if (config->GetWrt_Limiters()) {
-    for (jVar = 0; jVar < nVar_Consv; jVar++) {
-      name.str(string()); name << "Primitive Limiter " << jVar+1;
-      cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,(char *)name.str().c_str(), Data[iVar], &cgns_field); iVar++;
-      if (cgns_err) cg_error_print();
-    }
-  }
-  
-  /*--- Write conservative variable residuals to CGNS file ---*/
-  if (config->GetWrt_Residuals()) {
-    for (jVar = 0; jVar < nVar_Consv; jVar++) {
-      name.str(string()); name << "Conservative Residual " << jVar+1;
-      cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,(char *)name.str().c_str(), Data[iVar], &cgns_field); iVar++;
-      if (cgns_err) cg_error_print();
-    }
-  }
-  
-  /*--- Write grid velocities to CGNS file, if applicable ---*/
-  if (config->GetGrid_Movement()) {
-    cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Grid Velocity X", Data[iVar], &cgns_field); iVar++;
-    if (cgns_err) cg_error_print();
-    cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Grid Velocity Y", Data[iVar], &cgns_field); iVar++;
-    if (cgns_err) cg_error_print();
-    if (geometry->GetnDim() == 3) {
-      cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Grid Velocity Z", Data[iVar], &cgns_field); iVar++;
-      if (cgns_err) cg_error_print();
-    }
-  }
-  
-  if (compressible) {
-    switch (config->GetKind_Solver()) {
-        
-        /*--- Write pressure and Mach data to CGNS file ---*/
-      case EULER:
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Pressure", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Mach", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        break;
-        
-        /*--- Write temperature and laminar viscosity to CGNS file, if applicable ---*/
-      case NAVIER_STOKES:
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Pressure", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Mach", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Temperature", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Viscosity", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        break;
-        
-        /*--- Write eddy viscosity to CGNS file, if applicable ---*/
-      case RANS:
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Pressure", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Mach", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Temperature", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Viscosity", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        cgns_err = cg_field_write(cgns_file, cgns_base, cgns_zone, cgns_flow, RealDouble,"Eddy Viscosity", Data[iVar], &cgns_field); iVar++;
-        if (cgns_err) cg_error_print();
-        break;
-        
-      default:
-        SU2_MPI::Error("Unrecognized equation type", CURRENT_FUNCTION);
-        break;
-      }
-  }  
-  
-  /*--- Close CGNS file ---*/
-  cgns_err = cg_close(cgns_file);
-  if (cgns_err) cg_error_print();
-  
-#else // Not built with CGNS support
-  
-  cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; 
-  
-#endif
-  
-}
diff --git a/SU2_CFD/src/output/output_csv.cpp b/SU2_CFD/src/output/output_csv.cpp
deleted file mode 100644
index 96bdb65a2df4..000000000000
--- a/SU2_CFD/src/output/output_csv.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "../../include/output/COutput.hpp"
-
-void COutput::WriteSurface_CSV(CConfig *config, CGeometry *geometry){
-  
-  /*--- Routine to write the surface CSV files (ASCII). We
-   assume here that, as an ASCII file, it is safer to merge the
-   surface data onto the master rank for writing for 2 reasons:
-   (a) as a surface file, the amount of data should be much less
-   than the volume solution, and (b) writing ASCII files in parallel
-   requires serializing the IO calls with barriers, which ruins
-   the performance at moderate to high rank counts. ---*/
-  
-  unsigned short iVar;
-  
-  int iProcessor, nProcessor = size;
-  
-  unsigned long iPoint, index;
-  unsigned long Buffer_Send_nVertex[1], *Buffer_Recv_nVertex = NULL;
-  unsigned long nLocalVertex_Surface = 0, MaxLocalVertex_Surface = 0;
-  
-  string filename = config->GetFilename(SurfaceFilename, ".csv");
-  
-  ofstream Surf_file;
-  Surf_file.precision(15);
-  
-  /*--- Find the max number of surface vertices among all
-   partitions so we can set up buffers. The master node will handle
-   the writing of the CSV file after gathering all of the data. ---*/
-  
-  nLocalVertex_Surface   = nSurf_Poin_Par;
-  Buffer_Send_nVertex[0] = nLocalVertex_Surface;
-  if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long[nProcessor];
-  
-  /*--- Communicate the number of local vertices on each partition
-   to the master node with collective calls. ---*/
-  
-  SU2_MPI::Allreduce(&nLocalVertex_Surface, &MaxLocalVertex_Surface, 1,
-                     MPI_UNSIGNED_LONG, MPI_MAX, MPI_COMM_WORLD);
-  
-  SU2_MPI::Gather(&Buffer_Send_nVertex, 1, MPI_UNSIGNED_LONG,
-                  Buffer_Recv_nVertex,  1, MPI_UNSIGNED_LONG,
-                  MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- Allocate buffers for send/recv of the data and global IDs. ---*/
-  
-  su2double *bufD_Send = new su2double[MaxLocalVertex_Surface*GlobalField_Counter];
-  su2double *bufD_Recv = NULL;
-  
-  unsigned long *bufL_Send = new unsigned long [MaxLocalVertex_Surface];
-  unsigned long *bufL_Recv = NULL;
-  
-  /*--- Load send buffers with the local data on this rank. ---*/
-  
-  index = 0;
-  for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-    
-    /*--- Global index values. ---*/
-    
-    bufL_Send[iPoint] = Renumber2Global[iPoint];
-    
-    /*--- Solution data. ---*/
-    
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++){
-      bufD_Send[index] = Parallel_Surf_Data[iVar][iPoint];
-      index++;
-    }
-    
-  }
-  
-  /*--- Only the master rank allocates buffers for the recv. ---*/
-  
-  if (rank == MASTER_NODE) {
-    bufD_Recv = new su2double[nProcessor*MaxLocalVertex_Surface*GlobalField_Counter];
-    bufL_Recv = new unsigned long[nProcessor*MaxLocalVertex_Surface];
-  }
-  
-  /*--- Collective comms of the solution data and global IDs. ---*/
-  
-  SU2_MPI::Gather(bufD_Send, (int)MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE,
-                  bufD_Recv, (int)MaxLocalVertex_Surface*GlobalField_Counter, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-  
-  SU2_MPI::Gather(bufL_Send, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG,
-                  bufL_Recv, (int)MaxLocalVertex_Surface, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*--- The master rank alone writes the surface CSV file. ---*/
-  
-  if (rank == MASTER_NODE) {
-    
-    /*--- Open the CSV file and write the header with variable names. ---*/
-    
-    Surf_file.open(filename.c_str(), ios::out);
-    Surf_file << "\"Point\",";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      Surf_file << "\"" << Variable_Names[iVar] << "\",";
-    }
-    Surf_file << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    
-    /*--- Loop through all of the collected data and write each node's values ---*/
-    
-    for (iProcessor = 0; iProcessor < nProcessor; iProcessor++) {
-      for (iPoint = 0; iPoint < Buffer_Recv_nVertex[iProcessor]; iPoint++) {
-        
-        /*--- Current index position for global index access. ---*/
-        
-        index  = iProcessor*MaxLocalVertex_Surface + iPoint;
-        
-        /*--- Write global index values. ---*/
-        
-        Surf_file << bufL_Recv[index] << ", ";
-        
-        /*--- Reset index for solution data access. ---*/
-        
-        index  = (iProcessor*MaxLocalVertex_Surface*GlobalField_Counter +
-                  iPoint*GlobalField_Counter);
-        
-        /*--- Write the solution data for each field variable. ---*/
-        
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++){
-          Surf_file << scientific << bufD_Recv[index + iVar];
-          if (iVar != GlobalField_Counter -1) Surf_file << ", ";
-        }
-        Surf_file << endl;
-        
-      }
-    }
-    
-    /*--- Close the file. ---*/
-    
-    Surf_file.close();
-    
-  }
-  
-  /*--- Free temporary memory. ---*/
-  
-  if (rank == MASTER_NODE) {
-    delete [] bufL_Recv;
-    delete [] bufD_Recv;
-    delete [] Buffer_Recv_nVertex;
-  }
-  delete [] bufL_Send;
-  delete [] bufD_Send;
-  
-}
diff --git a/SU2_CFD/src/output/output_fieldview.cpp b/SU2_CFD/src/output/output_fieldview.cpp
deleted file mode 100644
index 7b8bb953d9ba..000000000000
--- a/SU2_CFD/src/output/output_fieldview.cpp
+++ /dev/null
@@ -1,783 +0,0 @@
-/*!
- * \file output_fieldview.cpp
- * \brief Main subroutines for output solver information.
- * \author F. Palacios, T. Economon, M. Colonno
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/COutput.hpp"
-
-void COutput::SetFieldViewASCII(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone) {
-  
-  unsigned short iDim, iVar, nDim = geometry->GetnDim(), ngrids = 1, nbvars, nvars;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  
-  unsigned long iPoint, iElem, iNode, nbfaces;
-  
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-
-  bool grid_movement  = config->GetGrid_Movement();
-
-  char cstr[200], buffer[50];
-  string filename, FieldName;
-  
-  /*--- Write file name with extension ---*/
-  
-  if (adjoint) filename = config->GetAdj_FileName();
-  else filename = config->GetVolume_FileName();
-  
-//  if (Kind_Solver == FEM_ELASTICITY)
-//    filename = config->GetStructure_FileName().c_str();
-  
-//  if (Kind_Solver == HEAT_EQUATION_FVM)
-//    filename = config->GetHeat_FileName().c_str();
-  
-
-  if (config->GetKind_SU2() == SU2_DOT) {
-    filename = config->GetVolSens_FileName().c_str();
-  }
-  
-  strcpy (cstr, filename.c_str());
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-  
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS) &&
-      (val_nZone > 1) && (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-//
-//  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-//
-//    if (config->GetKind_SU2() == SU2_SOL) { val_iZone = iExtIter; }
-//
-//    if (SU2_TYPE::Int(val_iZone) < 10) SPRINTF (buffer, "_0000%d.uns", SU2_TYPE::Int(val_iZone));
-//    if ((SU2_TYPE::Int(val_iZone) >= 10) && (SU2_TYPE::Int(val_iZone) < 100)) SPRINTF (buffer, "_000%d.uns", SU2_TYPE::Int(val_iZone));
-//    if ((SU2_TYPE::Int(val_iZone) >= 100) && (SU2_TYPE::Int(val_iZone) < 1000)) SPRINTF (buffer, "_00%d.uns", SU2_TYPE::Int(val_iZone));
-//    if ((SU2_TYPE::Int(val_iZone) >= 1000) && (SU2_TYPE::Int(val_iZone) < 10000)) SPRINTF (buffer, "_0%d.uns", SU2_TYPE::Int(val_iZone));
-//    if (SU2_TYPE::Int(val_iZone) >= 10000) SPRINTF (buffer, "_%d.uns", SU2_TYPE::Int(val_iZone));
-//
-//  }
-//  else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-//    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.uns", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.uns", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.uns", SU2_TYPE::Int(iExtIter));
-//    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.uns", SU2_TYPE::Int(iExtIter));
-//    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.uns", SU2_TYPE::Int(iExtIter));
-//  }
-  else { SPRINTF (buffer, ".uns"); }
-  
-  strcat(cstr, buffer);
-  
-  /*--- Open FieldView ASCII file and write the header ---*/
-  
-  ofstream FieldView_File;
-  FieldView_File.open(cstr, ios::out);
-  FieldView_File.precision(6);
-  
-  FieldView_File << "FIELDVIEW 3 0" << endl;
-  
-  /*--- Output constants for time, fsmach, alpha and re. ---*/
-  
-  FieldView_File << "Constants" << endl;
-  FieldView_File << config->GetExtIter() <<"\t"<< config->GetMach() <<"\t"<< config->GetAoA() <<"\t"<< config->GetReynolds() << endl;
-  
-  /*--- Output the number of grids. ---*/
-  
-  FieldView_File << "Grids\t" << ngrids << endl;
-  
-  /*--- Output the table of boundary types, starting with the number of types.
-   Note that this differs from the binary/unformatted specification.
-   Each boundary type name is preceded by 3 integer flags.
-   The first flag indicates whether this boundary type is a wall.
-   A flag value of 1 indicates a wall, and a value of 0 indicates
-   a non-wall.  Walls are significant for streamline calculation.
-   The second flag indicates whether the boundary type has surface
-   results.  A value of 1 means surface results will be present for
-   this boundary type (if any boundary variables are specified in the
-   Boundary Variable Names section below).  A value of 0 means no surface
-   results will be present.
-   The third flag indicates whether boundary faces of this type have
-   consistent "clockness" for the purpose of calculating a surface
-   normal.  A value of 1 means that all faces of this type are
-   written following a "right hand rule" for clockness.  In other
-   words, if the vertices are written on counter-clockwise:
-   4 --- 3
-   |     |
-   1 --- 2
-   then the normal to the face is pointing towards you (not away
-   from you).  A value of 0 means that the faces do not have any
-   consistent clockness.  The "clockness" of surface normals is
-   only used for calculating certain special surface integrals
-   that involve surface normals.  If the surface normals flag
-   is 0, these special integrals will not be available. ---*/
-  
-  FieldView_File << "Boundary Table\t1" << endl;
-  FieldView_File << "1\t0\t1\tMARKER_PLOTTING" << endl;
-  
-  /*--- Output the table of variable names, starting with the number of
-   variables.  The number of variables can be zero.
-   Note that vector variables are specified by a ';' and vector name
-   following the first scalar name of 3 scalar components of the
-   vector.  If writing 2-D results, the third component must still
-   be provided here, and its values must be written in the variables
-   section below (typically padded with zeros.) ---*/
-  
-  if ((config->GetKind_SU2() == SU2_SOL) || (config->GetKind_SU2() == SU2_DOT)) {
-    
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class. ---*/
-    
-    nvars = nVar_Total-nDim;
-    
-    FieldView_File << "Variable Names\t" << nvars << endl;
-    
-    for (unsigned short iField = 1+nDim; iField < config->fields.size(); iField++) {
-      
-      /*--- Remove all su2double-quote characters ---*/
-      
-      FieldName = config->fields[iField];
-      
-      FieldName.erase(
-                      remove(FieldName.begin(), FieldName.end(), '\"' ),
-                      FieldName.end()
-                      );
-      
-      FieldView_File << FieldName << endl;
-    }
-    
-    /*--- SU2 does not generate boundary variables ---*/
-    
-    nbvars = 0;
-    FieldView_File << "Boundary Variable Names\t" << nbvars << endl;
-    
-  }
-  
-  else {
-    
-    nvars = nVar_Total;
-    
-    FieldView_File << "Variable Names\t" << nvars << endl;
-    
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-      FieldView_File << "Conservative_" << iVar+1 << endl;
-    }
-    
-    /*--- Add names for any extra variables (this will need to be adjusted). ---*/
-
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        FieldView_File << "Limiter_" << iVar+1 << endl;
-      }
-    }
-    
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        FieldView_File << "Residual_" << iVar+1 << endl;
-      }
-    }
-    
-    if (grid_movement) {
-      if (nDim == 2) FieldView_File << "Grid_Velx\nGrid_Vely" << endl;
-      else FieldView_File << "Grid_Velx\nGrid_Vely\nGrid_Velz" << endl;
-    }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      FieldView_File << "Pressure\nTemperature\nPressure_Coefficient\nMach" << endl;
-    }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      FieldView_File << "Laminar_Viscosity\nSkin_Friction_Coefficient\nHeat_Flux\nY_Plus" << endl;
-    }
-    
-    if (Kind_Solver == RANS) {
-      FieldView_File << "Eddy_Viscosity" << endl;
-    }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-        FieldView_File << "Sharp_Edge_Dist" << endl;
-      }
-    }
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               ) ) {
-      FieldView_File << "Surface_Sensitivity\nSolution_Sensor" << endl;
-    }
-
-    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_RANS               ) ) {
-      if (nDim == 2) FieldView_File << "Surface_Sensitivity\nSensitivity_x\nSensitivity_y" << endl;
-      else FieldView_File << "Surface_Sensitivity\nSensitivity_x\nSensitivity_y\nSensitivity_z" << endl;
-    }
-    
-    /*--- SU2 does not generate boundary variables ---*/
-    
-    nbvars = 0;
-    FieldView_File << "Boundary Variable Names\t" << nbvars << endl;
-    
-  }
-  
-  /*--- Output the node definition section for this grid
-   Output the X, Y, Z coordinates of successive nodes.
-   Note that this differs from the binary/unformatted specification. ---*/
-  
-  if (nDim == 3) {
-    
-    FieldView_File << "Nodes\t" << nGlobal_Poin << endl;
-
-    for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-      if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Coords[iDim][iPoint] << "\t";
-      }
-      else {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Data[iDim][iPoint] << "\t";
-      }
-      FieldView_File << endl;
-    }
-    
-  }
-  
-  else {
-    
-    FieldView_File << "Nodes\t" << nGlobal_Poin*2 << endl;
-
-    for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-      if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Coords[iDim][iPoint] << "\t";
-      }
-      else {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Data[iDim][iPoint] << "\t";
-      }
-      FieldView_File << scientific << "0.0" << endl;
-    }
-    for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-      if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Coords[iDim][iPoint] << "\t";
-      }
-      else {
-        for (iDim = 0; iDim < nDim; iDim++)
-          FieldView_File << scientific << Data[iDim][iPoint] << "\t";
-      }
-      FieldView_File << scientific << "-1E-10" << endl;
-    }
-    
-  }
-  
-  /*--- Output the boundary face definitions.
-   Note that this differs from the binary/unformatted specification.
-   Each face is preceded by an index into the boundary table at the
-   top of the file and the number of face vertices, 3 or 4.
-   All faces here have 4 vertices.  If the face is triangular,
-   the last vertex should be zero.
-   TIP: FIELDVIEW assumes that boundary faces are not in random
-   order.  It assumes that faces of the same type tend to occur
-   in groups.  If your boundary faces are in random order, you
-   may want to output them one boundary type at a time.  This
-   will give you better performance (less memory, greater speed)
-   in FIELDVIEW. ---*/
-  
-  
-  if (nDim ==2) {
-    
-    nbfaces = nGlobal_Tria + nGlobal_Quad;
-    
-    FieldView_File << "Boundary Faces\t" << nbfaces << endl;
-
-    for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      FieldView_File <<"1\t3\t"<< Conn_Tria[iNode+0] << "\t";
-      FieldView_File << Conn_Tria[iNode+1] << "\t";
-      FieldView_File << Conn_Tria[iNode+2] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      FieldView_File <<"1\t4\t"<< Conn_Quad[iNode+0] << "\t";
-      FieldView_File << Conn_Quad[iNode+1] << "\t";
-      FieldView_File << Conn_Quad[iNode+2] << "\t";
-      FieldView_File << Conn_Quad[iNode+3] << "\n";
-    }
-    
-  }
-  
-  if (nDim ==3) {
-    
-    nbfaces = nGlobal_BoundTria + nGlobal_BoundQuad;
-    
-    FieldView_File << "Boundary Faces\t" << nbfaces << endl;
-    
-    for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      FieldView_File << "1\t3\t" << Conn_BoundTria[iNode+0] << "\t";
-      FieldView_File << Conn_BoundTria[iNode+1] << "\t";
-      FieldView_File << Conn_BoundTria[iNode+2] << "\n";
-    }
-    
-    for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      FieldView_File << "1\t4\t" << Conn_BoundQuad[iNode+0] << "\t";
-      FieldView_File << Conn_BoundQuad[iNode+1] << "\t";
-      FieldView_File << Conn_BoundQuad[iNode+2] << "\t";
-      FieldView_File << Conn_BoundQuad[iNode+3] << "\n";
-    }
-    
-  }
-
-  
-  /*--- Output the elements section for this grid.
-   Note that this differs from the binary/unformatted specification.
-   It contains the headers and node definitions of all elements.
-   In this example, each element starts with 2 for type 'hex',
-   with a subtype of 1 (the only subtype currently supported).
-   This is followed by the node indices for the element. ---*/
-  
-  
-  FieldView_File << "Elements" << endl;
-  
-  for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    FieldView_File <<"3\t1\t"<< Conn_Tria[iNode+0] << "\t";
-    FieldView_File << Conn_Tria[iNode+1] << "\t";
-    FieldView_File << Conn_Tria[iNode+2] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Tria[iNode+0] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Tria[iNode+1] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Tria[iNode+2] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    FieldView_File <<"2\t1\t"<< Conn_Quad[iNode+0] << "\t";
-    FieldView_File << Conn_Quad[iNode+1] << "\t";
-    FieldView_File << Conn_Quad[iNode+2] << "\t";
-    FieldView_File << Conn_Quad[iNode+3] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Quad[iNode+0] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Quad[iNode+1] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Quad[iNode+2] << "\t";
-    FieldView_File << nGlobal_Poin+Conn_Quad[iNode+3] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-    iNode = iElem*N_POINTS_TETRAHEDRON;
-    FieldView_File <<"1\t1\t"<< Conn_Tetr[iNode+0] << "\t" << Conn_Tetr[iNode+1] << "\t";
-    FieldView_File << Conn_Tetr[iNode+2] << "\t" << Conn_Tetr[iNode+3] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-    iNode = iElem*N_POINTS_HEXAHEDRON;
-    FieldView_File <<"2\t1\t"<< Conn_Hexa[iNode+0] << "\t" << Conn_Hexa[iNode+1] << "\t";
-    FieldView_File << Conn_Hexa[iNode+2] << "\t" << Conn_Hexa[iNode+3] << "\t";
-    FieldView_File << Conn_Hexa[iNode+4] << "\t" << Conn_Hexa[iNode+5] << "\t";
-    FieldView_File << Conn_Hexa[iNode+6] << "\t" << Conn_Hexa[iNode+7] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-    iNode = iElem*N_POINTS_PRISM;
-    FieldView_File <<"3\t1\t"<< Conn_Pris[iNode+0] << "\t" << Conn_Pris[iNode+1] << "\t";
-    FieldView_File << Conn_Pris[iNode+2] << "\t" << Conn_Pris[iNode+3] << "\t";
-    FieldView_File << Conn_Pris[iNode+4] << "\t" << Conn_Pris[iNode+5] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-    iNode = iElem*N_POINTS_PYRAMID;
-    FieldView_File <<"4\t1\t"<< Conn_Pyra[iNode+0] << "\t" << Conn_Pyra[iNode+1] << "\t";
-    FieldView_File << Conn_Pyra[iNode+2] << "\t" << Conn_Pyra[iNode+3] << "\t";
-    FieldView_File << Conn_Pyra[iNode+4] << "\n";
-  }
-  
-  /*--- Output the variables data for this grid.
-   Note that all of the data for the first variable is output
-   before any of the data for the second variable.
-   You should skip this section if the number of variables is zero.
-   The variables must be in the same order as the "Variable Names"
-   section. ---*/
-  
-  FieldView_File << "Variables" << endl;
-  
-  /*--- Loop over the vars/residuals and write the values to file ---*/
-  
-  if ((config->GetKind_SU2() != SU2_SOL) && (config->GetKind_SU2() != SU2_DOT)) {
-    for (iVar = 0; iVar < nvars; iVar++) {
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        FieldView_File << scientific << Data[iVar][iPoint] << endl;
-      }
-      if (nDim == 2) {
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          FieldView_File << scientific << Data[iVar][iPoint] << endl;
-        }
-      }
-    }
-  }
-  else {
-    for (iVar = 0; iVar < nvars; iVar++) {
-      for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-        FieldView_File << scientific << Data[iVar+nDim][iPoint] << endl;
-      }
-      if (nDim == 2) {
-        for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-          FieldView_File << scientific << Data[iVar+nDim][iPoint] << endl;
-        }
-      }
-    }
-  }
-  
-  /*--- Output the boundary variables data for this grid.
-   Note that all of the data for the first variable is output
-   before any of the data for the second variable.
-   Remember that the Boundary Table above has a "surface results
-   flag" indicating which boundary types have surface results.
-   The data should be written in the same order as the faces in
-   the Boundary Faces section, skipping over faces whose boundary
-   type has a surface results flag of zero (false).
-   For each variable, you should write one number per boundary face.
-   You should skip this section if the number of boundary
-   variables is zero. ---*/
-  
-  FieldView_File << "Boundary Variables" << endl;
-  
-  
-  FieldView_File.close();
-  
-}
-
-void COutput::SetFieldViewASCII_Mesh(CConfig *config, CGeometry *geometry) { }
-
-void COutput::SetFieldViewBinary(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone) {
-  
-  unsigned short iDim, iVar, nDim = geometry->GetnDim(), ngrids = 1, nbvars, nvars;
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  
-  unsigned long iPoint, iElem, iNode, nbfaces;
-  unsigned long iExtIter = config->GetExtIter();
-  bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  
-  char cstr[200], buffer[50];
-  string filename;
-  
-  /*--- Write file name with extension ---*/
-  
-  if (adjoint) filename = config->GetAdj_FileName();
-  else filename = config->GetVolume_FileName();
-  
-//  if (Kind_Solver == FEM_ELASTICITY)
-//    filename = config->GetStructure_FileName().c_str();
-  
-//  if (Kind_Solver == HEAT_EQUATION_FVM)
-//    filename = config->GetHeat_FileName().c_str();
-  
-  
-  strcpy (cstr, filename.c_str());
-  
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-  
-  if ((Kind_Solver == EULER || Kind_Solver == NAVIER_STOKES || Kind_Solver == RANS ||
-       Kind_Solver == ADJ_EULER || Kind_Solver == ADJ_NAVIER_STOKES || Kind_Solver == ADJ_RANS) &&
-      (val_nZone > 1) && (config->GetUnsteady_Simulation() != HARMONIC_BALANCE)) {
-    SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-    strcat(cstr, buffer);
-  }
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    
-    if (config->GetKind_SU2() == SU2_SOL) { val_iZone = iExtIter; }
-    
-    if (SU2_TYPE::Int(val_iZone) < 10) SPRINTF (buffer, "_0000%d.uns", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 10) && (SU2_TYPE::Int(val_iZone) < 100)) SPRINTF (buffer, "_000%d.uns", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 100) && (SU2_TYPE::Int(val_iZone) < 1000)) SPRINTF (buffer, "_00%d.uns", SU2_TYPE::Int(val_iZone));
-    if ((SU2_TYPE::Int(val_iZone) >= 1000) && (SU2_TYPE::Int(val_iZone) < 10000)) SPRINTF (buffer, "_0%d.uns", SU2_TYPE::Int(val_iZone));
-    if (SU2_TYPE::Int(val_iZone) >= 10000) SPRINTF (buffer, "_%d.uns", SU2_TYPE::Int(val_iZone));
-    
-  }
-  else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d.uns", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.uns", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.uns", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.uns", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.uns", SU2_TYPE::Int(iExtIter));
-  }
-  else { SPRINTF (buffer, ".uns"); }
-  
-  strcat(cstr, buffer);
-  
-  /*--- Open FieldView ASCII file and write the header ---*/
-  
-  ofstream FieldView_File;
-  FieldView_File.open(cstr, ios::out);
-  FieldView_File.precision(6);
-  
-  FieldView_File << "FIELDVIEW 3 0" << endl;
-  
-  /*--- Output constants for time, fsmach, alpha and re. ---*/
-  
-  FieldView_File << "Constants" << endl;
-  FieldView_File << config->GetExtIter() <<"\t"<< config->GetMach() <<"\t"<< config->GetAoA() <<"\t"<< config->GetReynolds() << endl;
-  
-  /*--- Output the number of grids. ---*/
-  
-  FieldView_File << "Grids\t" << ngrids << endl;
-  
-  /*--- Output the table of boundary types, starting with the number of types.
-   Note that this differs from the binary/unformatted specification.
-   Each boundary type name is preceded by 3 integer flags.
-   The first flag indicates whether this boundary type is a wall.
-   A flag value of 1 indicates a wall, and a value of 0 indicates
-   a non-wall.  Walls are significant for streamline calculation.
-   The second flag indicates whether the boundary type has surface
-   results.  A value of 1 means surface results will be present for
-   this boundary type (if any boundary variables are specified in the
-   Boundary Variable Names section below).  A value of 0 means no surface
-   results will be present.
-   The third flag indicates whether boundary faces of this type have
-   consistent "clockness" for the purpose of calculating a surface
-   normal.  A value of 1 means that all faces of this type are
-   written following a "right hand rule" for clockness.  In other
-   words, if the vertices are written on counter-clockwise:
-   4 --- 3
-   |     |
-   1 --- 2
-   then the normal to the face is pointing towards you (not away
-   from you).  A value of 0 means that the faces do not have any
-   consistent clockness.  The "clockness" of surface normals is
-   only used for calculating certain special surface integrals
-   that involve surface normals.  If the surface normals flag
-   is 0, these special integrals will not be available. ---*/
-  
-  FieldView_File << "Boundary Table\t1" << endl;
-  FieldView_File << "1\t0\t1\tMARKER_PLOTTING" << endl;
-  
-  /*--- Output the table of variable names, starting with the number of
-   variables.  The number of variables can be zero.
-   Note that vector variables are specified by a ';' and vector name
-   following the first scalar name of 3 scalar components of the
-   vector.  If writing 2-D results, the third component must still
-   be provided here, and its values must be written in the variables
-   section below (typically padded with zeros.) ---*/
-  
-  if (config->GetKind_SU2() == SU2_SOL) {
-    
-    /*--- If SU2_SOL called this routine, we already have a set of output
-     variables with the appropriate string tags stored in the config class. ---*/
-    
-    nvars = config->fields.size() - 1 - nDim;
-    
-    FieldView_File << "Variable Names\t" << nvars << endl;
-    
-    for (unsigned short iField = 1+nDim; iField < config->fields.size(); iField++) {
-      FieldView_File << config->fields[iField] << endl;
-    }
-    
-    /*--- SU2 does not generate boundary variables ---*/
-    
-    nbvars = 0;
-    FieldView_File << "Boundary Variable Names\t" << nbvars << endl;
-    
-  }
-  
-  else {
-    
-    nvars = nVar_Consv + nDim;
-    
-    FieldView_File << "Variable Names\t" << nvars-nDim << endl;
-    
-    for (iVar = 0; iVar < nVar_Consv; iVar++) {
-      FieldView_File << "Conservative_" << iVar+1 << endl;
-    }
-    
-    /*--- SU2 does not generate boundary variables ---*/
-    
-    nbvars = 0;
-    FieldView_File << "Boundary Variable Names\t" << nbvars << endl;
-    
-  }
-  
-  /*--- Output the node definition section for this grid ---*/
-  
-  FieldView_File << "Nodes\t" << nGlobal_Poin << endl;
-  
-  /*--- Output the X, Y, Z coordinates of successive nodes.
-   Note that this differs from the binary/unformatted specification. ---*/
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (config->GetKind_SU2() != SU2_SOL) {
-      for (iDim = 0; iDim < nDim; iDim++)
-        FieldView_File << scientific << Coords[iDim][iPoint] << "\t";
-    }
-    else {
-      for (iVar = 0; iVar < nVar_Total; iVar++)
-        FieldView_File << scientific << Data[iVar][iPoint] << "\t";
-    }
-    FieldView_File << endl;
-    
-  }
-  
-  /*--- Output the boundary face definitions.
-   Note that this differs from the binary/unformatted specification.
-   Each face is preceded by an index into the boundary table at the
-   top of the file and the number of face vertices, 3 or 4.
-   All faces here have 4 vertices.  If the face is triangular,
-   the last vertex should be zero.
-   TIP: FIELDVIEW assumes that boundary faces are not in random
-   order.  It assumes that faces of the same type tend to occur
-   in groups.  If your boundary faces are in random order, you
-   may want to output them one boundary type at a time.  This
-   will give you better performance (less memory, greater speed)
-   in FIELDVIEW. ---*/
-  
-  nbfaces = nGlobal_Line + nGlobal_BoundTria + nGlobal_BoundQuad;
-  
-  FieldView_File << "Boundary Faces\t" << nbfaces << endl;
-  
-  for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-    iNode = iElem*N_POINTS_LINE;
-    FieldView_File << "1\t2\t" << Conn_Line[iNode+0] << "\t";
-    FieldView_File << "1\t2\t" << Conn_Line[iNode+1] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    FieldView_File << "1\t3\t" << Conn_BoundTria[iNode+0] << "\t";
-    FieldView_File << Conn_BoundTria[iNode+1] << "\t";
-    FieldView_File << Conn_BoundTria[iNode+2] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    FieldView_File << "1\t4\t" << Conn_BoundQuad[iNode+0] << "\t";
-    FieldView_File << Conn_BoundQuad[iNode+1] << "\t";
-    FieldView_File << Conn_BoundQuad[iNode+2] << "\t";
-    FieldView_File << Conn_BoundQuad[iNode+3] << "\n";
-  }
-  
-  /*--- Output the elements section for this grid.
-   Note that this differs from the binary/unformatted specification.
-   It contains the headers and node definitions of all elements.
-   In this example, each element starts with 2 for type 'hex',
-   with a subtype of 1 (the only subtype currently supported).
-   This is followed by the node indices for the element. ---*/
-  
-  
-  FieldView_File << "Elements" << endl;
-  
-  for (iElem = 0; iElem < nGlobal_Tria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    FieldView_File <<"2\t1\t"<< Conn_Tria[iNode+0] << "\t";
-    FieldView_File << Conn_Tria[iNode+1] << "\t";
-    FieldView_File << Conn_Tria[iNode+2] << "\t";
-    FieldView_File << Conn_Tria[iNode+2] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Quad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    FieldView_File <<"2\t1\t"<< Conn_Quad[iNode+0] << "\t";
-    FieldView_File << Conn_Quad[iNode+1] << "\t";
-    FieldView_File << Conn_Quad[iNode+2] << "\t";
-    FieldView_File << Conn_Quad[iNode+3] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Tetr; iElem++) {
-    iNode = iElem*N_POINTS_TETRAHEDRON;
-    FieldView_File <<"1\t1\t"<< Conn_Tetr[iNode+0] << "\t" << Conn_Tetr[iNode+1] << "\t";
-    FieldView_File << Conn_Tetr[iNode+2] << "\t" << Conn_Tetr[iNode+2] << "\t";
-    FieldView_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\t";
-    FieldView_File << Conn_Tetr[iNode+3] << "\t" << Conn_Tetr[iNode+3] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Hexa; iElem++) {
-    iNode = iElem*N_POINTS_HEXAHEDRON;
-    FieldView_File <<"2\t1\t"<< Conn_Hexa[iNode+0] << "\t" << Conn_Hexa[iNode+1] << "\t";
-    FieldView_File << Conn_Hexa[iNode+2] << "\t" << Conn_Hexa[iNode+3] << "\t";
-    FieldView_File << Conn_Hexa[iNode+4] << "\t" << Conn_Hexa[iNode+5] << "\t";
-    FieldView_File << Conn_Hexa[iNode+6] << "\t" << Conn_Hexa[iNode+7] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Pris; iElem++) {
-    iNode = iElem*N_POINTS_PRISM;
-    FieldView_File <<"3\t1\t"<< Conn_Pris[iNode+0] << "\t" << Conn_Pris[iNode+1] << "\t";
-    FieldView_File << Conn_Pris[iNode+1] << "\t" << Conn_Pris[iNode+2] << "\t";
-    FieldView_File << Conn_Pris[iNode+3] << "\t" << Conn_Pris[iNode+4] << "\t";
-    FieldView_File << Conn_Pris[iNode+4] << "\t" << Conn_Pris[iNode+5] << "\n";
-  }
-  
-  for (iElem = 0; iElem < nGlobal_Pyra; iElem++) {
-    iNode = iElem*N_POINTS_PYRAMID;
-    FieldView_File <<"4\t1\t"<< Conn_Pyra[iNode+0] << "\t" << Conn_Pyra[iNode+1] << "\t";
-    FieldView_File << Conn_Pyra[iNode+2] << "\t" << Conn_Pyra[iNode+3] << "\t";
-    FieldView_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\t";
-    FieldView_File << Conn_Pyra[iNode+4] << "\t" << Conn_Pyra[iNode+4] << "\n";
-  }
-  
-  /*--- Output the variables data for this grid.
-   Note that all of the data for the first variable is output
-   before any of the data for the second variable.
-   You should skip this section if the number of variables is zero.
-   The variables must be in the same order as the "Variable Names"
-   section. ---*/
-  
-  FieldView_File << "Variables" << endl;
-  
-  /*--- Loop over the vars/residuals and write the values to file ---*/
-  for (iVar = nDim; iVar < nVar_Total; iVar++) {
-    for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-      FieldView_File << scientific << Data[iVar][iPoint] << endl;
-    }
-  }
-  
-  /*--- Output the boundary variables data for this grid.
-   Note that all of the data for the first variable is output
-   before any of the data for the second variable.
-   Remember that the Boundary Table above has a "surface results
-   flag" indicating which boundary types have surface results.
-   The data should be written in the same order as the faces in
-   the Boundary Faces section, skipping over faces whose boundary
-   type has a surface results flag of zero (false).
-   For each variable, you should write one number per boundary face.
-   You should skip this section if the number of boundary
-   variables is zero. ---*/
-  
-  FieldView_File << "Boundary Variables" << endl;
-  
-  
-  FieldView_File.close();
-
-}
-
-void COutput::SetFieldViewBinary_Mesh(CConfig *config, CGeometry *geometry) { }
diff --git a/SU2_CFD/src/output/output_paraview.cpp b/SU2_CFD/src/output/output_paraview.cpp
deleted file mode 100644
index 9483290f3b53..000000000000
--- a/SU2_CFD/src/output/output_paraview.cpp
+++ /dev/null
@@ -1,1585 +0,0 @@
-/*!
- * \file output_paraview.cpp
- * \brief Main subroutines for the output of ParaView visualization files.
- * \author F. Palacios, T. Economon, E. van der Weide
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/COutput.hpp"
-
-/*--- Subroutine to swap bytes, in case we need to convert to
- big endian, which is expected for ParaView binary legacy format. ---*/
-
-void SwapBytes(char *buffer,
-               size_t nBytes,
-               unsigned long nVar) {
-  
-  /*--- Store half the number of bytes in kk. ---*/
-  
-  const int kk = (int)nBytes/2;
-  
-  /*--- Loop over the number of variables in the buffer. ---*/
-  
-  for (int j = 0; j < (int)nVar; j++) {
-    
-    /*--- Initialize ii and jj, which are used to store the
-     indices of the bytes to be swapped. ---*/
-    
-    int ii = j*(int)nBytes;
-    int jj = ii + (int)nBytes - 1;
-    
-    /*--- Swap the bytes. ---*/
-    
-    for (int i = 0; i < kk; i++) {
-      char tmp   = buffer[jj];
-      buffer[jj] = buffer[ii];
-      buffer[ii] = tmp;
-      
-      ii++;
-      jj--;
-      
-    }
-  }
-}
-
-void COutput::WriteParaViewASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-
-  unsigned short iDim, nDim = geometry->GetnDim();
-
-  unsigned long iPoint, iElem, iNode;
-
-  unsigned long nSurf_Elem_Storage;
-  unsigned long nGlobal_Elem_Storage;
-
-  string filename, fieldname;
-  ofstream Paraview_File;
-
-  int iProcessor;
-  
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".vtk");
-  else filename          = config->GetFilename(VolumeFilename, ".vtk");
-
-
-  /*--- Open Paraview ASCII file and write the header. ---*/
-
-    if (rank == MASTER_NODE) {
-  Paraview_File.open(filename.c_str(), ios::out);
-  Paraview_File.precision(6);
-  Paraview_File << "# vtk DataFile Version 3.0\n";
-  Paraview_File << "vtk output\n";
-  Paraview_File << "ASCII\n";
-  Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
-
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "POINTS "<< nGlobal_Surf_Poin <<" double\n";
-  else Paraview_File << "POINTS "<< nGlobal_Poin_Par <<" double\n";
-
-    }
-
-  Paraview_File.close();
-
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-  /*--- Each processor opens the file. ---*/
-
-  Paraview_File.open(filename.c_str(), ios::out | ios::app);
-
-  /*--- Write surface and volumetric point coordinates. ---*/
-
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-
-      /*--- Write the node data from this proc ---*/
-
-      if (surf_sol) {
-        for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Parallel_Surf_Data[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-      } else {
-
-        for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-          for (iDim = 0; iDim < nDim; iDim++)
-            Paraview_File << scientific << Parallel_Data[iDim][iPoint] << "\t";
-          if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-        }
-      }
-    }
-    Paraview_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-
-  /*--- Reduce the total number of each element. ---*/
-
-  unsigned long nTot_Line, nTot_BoundTria, nTot_BoundQuad, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-#ifdef HAVE_MPI
-  SU2_MPI::Reduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_BoundTria, &nTot_BoundTria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_BoundQuad, &nTot_BoundQuad, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-
-  SU2_MPI::Reduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_Quad, &nTot_Quad, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_Tetr, &nTot_Tetr, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_Hexa, &nTot_Hexa, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_Pris, &nTot_Pris, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  SU2_MPI::Reduce(&nParallel_Pyra, &nTot_Pyra, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-#else
-  nTot_Line      = nParallel_Line;
-  nTot_BoundTria = nParallel_BoundTria;
-  nTot_BoundQuad = nParallel_BoundQuad;
-
-  nTot_Tria = nParallel_Tria;
-  nTot_Quad = nParallel_Quad;
-  nTot_Tetr = nParallel_Tetr;
-  nTot_Hexa = nParallel_Hexa;
-  nTot_Pris = nParallel_Pris;
-  nTot_Pyra = nParallel_Pyra;
-#endif
-
-  if (rank == MASTER_NODE) {
-
-  /*--- Write the header ---*/
-  nSurf_Elem_Storage = nTot_Line*3 +nTot_BoundTria*4 + nTot_BoundQuad*5;
-  nGlobal_Elem_Storage = nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 + nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6;
-
-  if (surf_sol) Paraview_File << "\nCELLS " << nSurf_Elem_Par << "\t" << nSurf_Elem_Storage << "\n";
-  else Paraview_File << "\nCELLS " << nGlobal_Elem_Par << "\t" << nGlobal_Elem_Storage << "\n";
-
-  }
-
-  Paraview_File.flush();
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-  /*--- Write connectivity data. ---*/
-
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-
-  if (surf_sol) {
-
-    for (iElem = 0; iElem < nParallel_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      Paraview_File << N_POINTS_LINE << "\t";
-      Paraview_File << Conn_BoundLine_Par[iNode+0]-1 << "\t";
-      Paraview_File << Conn_BoundLine_Par[iNode+1]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << Conn_BoundTria_Par[iNode+0]-1 << "\t";
-      Paraview_File << Conn_BoundTria_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_BoundTria_Par[iNode+2]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << Conn_BoundQuad_Par[iNode+0]-1 << "\t";
-      Paraview_File << Conn_BoundQuad_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_BoundQuad_Par[iNode+2]-1 << "\t";
-      Paraview_File << Conn_BoundQuad_Par[iNode+3]-1 << "\t";
-    }
-
-  }
-  else {
-
-    for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      Paraview_File << N_POINTS_TRIANGLE << "\t";
-      Paraview_File << Conn_Tria_Par[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Tria_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tria_Par[iNode+2]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-      Paraview_File << Conn_Quad_Par[iNode+0]-1 << "\t";
-      Paraview_File << Conn_Quad_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Quad_Par[iNode+2]-1 << "\t";
-      Paraview_File << Conn_Quad_Par[iNode+3]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      Paraview_File << N_POINTS_TETRAHEDRON << "\t";
-      Paraview_File << Conn_Tetr_Par[iNode+0]-1 << "\t" << Conn_Tetr_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Tetr_Par[iNode+2]-1 << "\t" << Conn_Tetr_Par[iNode+3]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      Paraview_File << N_POINTS_HEXAHEDRON << "\t";
-      Paraview_File << Conn_Hexa_Par[iNode+0]-1 << "\t" << Conn_Hexa_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Hexa_Par[iNode+2]-1 << "\t" << Conn_Hexa_Par[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Hexa_Par[iNode+4]-1 << "\t" << Conn_Hexa_Par[iNode+5]-1 << "\t";
-      Paraview_File << Conn_Hexa_Par[iNode+6]-1 << "\t" << Conn_Hexa_Par[iNode+7]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      Paraview_File << N_POINTS_PRISM << "\t";
-      Paraview_File << Conn_Pris_Par[iNode+0]-1 << "\t" << Conn_Pris_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pris_Par[iNode+2]-1 << "\t" << Conn_Pris_Par[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pris_Par[iNode+4]-1 << "\t" << Conn_Pris_Par[iNode+5]-1 << "\t";
-    }
-
-    for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      Paraview_File << N_POINTS_PYRAMID << "\t";
-      Paraview_File << Conn_Pyra_Par[iNode+0]-1 << "\t" << Conn_Pyra_Par[iNode+1]-1 << "\t";
-      Paraview_File << Conn_Pyra_Par[iNode+2]-1 << "\t" << Conn_Pyra_Par[iNode+3]-1 << "\t";
-      Paraview_File << Conn_Pyra_Par[iNode+4]-1 << "\t";
-    }
-  }
-    }    Paraview_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-
-    if (rank == MASTER_NODE) {
-
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "\nCELL_TYPES " << nSurf_Elem_Par << "\n";
-  else Paraview_File << "\nCELL_TYPES " << nGlobal_Elem_Par << "\n";
-    }
-
-  Paraview_File.flush();
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      if (surf_sol) {
-        for (iElem = 0; iElem < nParallel_Line; iElem++) Paraview_File << "3\t";
-        for (iElem = 0; iElem < nParallel_BoundTria; iElem++) Paraview_File << "5\t";
-        for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) Paraview_File << "9\t";
-      }
-      else {
-        for (iElem = 0; iElem < nParallel_Tria; iElem++) Paraview_File << "5\t";
-        for (iElem = 0; iElem < nParallel_Quad; iElem++) Paraview_File << "9\t";
-        for (iElem = 0; iElem < nParallel_Tetr; iElem++) Paraview_File << "10\t";
-        for (iElem = 0; iElem < nParallel_Hexa; iElem++) Paraview_File << "12\t";
-        for (iElem = 0; iElem < nParallel_Pris; iElem++) Paraview_File << "13\t";
-        for (iElem = 0; iElem < nParallel_Pyra; iElem++) Paraview_File << "14\t";
-      }
-    }    Paraview_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-    if (rank == MASTER_NODE) {
-  /*--- Write the header ---*/
-  if (surf_sol) Paraview_File << "\nPOINT_DATA "<< nGlobal_Surf_Poin <<"\n";
-  else Paraview_File << "\nPOINT_DATA "<< nGlobal_Poin_Par <<"\n";
-
-    }
-
-  Paraview_File.flush();
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-  unsigned short varStart = 2;
-  if (nDim == 3) varStart++;
-
-  /*--- Need to adjust container location to avoid PointID tag and coords. ---*/
-  unsigned short VarCounter = varStart;
-
-  for (unsigned short iField = varStart; iField < Variable_Names.size(); iField++) {
-
-    fieldname = Variable_Names[iField];
-
-    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'), fieldname.end());
-
-    bool output_variable = true, isVector = false;
-    size_t found = Variable_Names[iField].find("_x");
-    if (found!=string::npos) {
-      output_variable = true;
-      isVector = true;
-    }
-    found = Variable_Names[iField].find("_y");
-    if (found!=string::npos) {
-      output_variable = false;
-      //skip
-      Paraview_File.flush();
-#ifdef HAVE_MPI
-      SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-      VarCounter++;
-    }
-found = Variable_Names[iField].find("_z");
-    if (found!=string::npos) {
-      output_variable = false;
-      //skip
-      Paraview_File.flush();
-#ifdef HAVE_MPI
-      SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-      VarCounter++;
-    }
-
-    if (output_variable && isVector) {
-
-      fieldname.erase(fieldname.end()-2,fieldname.end());
-
-      if (rank == MASTER_NODE) {
-        Paraview_File << "\nVECTORS " << fieldname << " double\n";
-      }
-
-      Paraview_File.flush();
-#ifdef HAVE_MPI
-      SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-      /*--- Write surface and volumetric point coordinates. ---*/
-
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        if (rank == iProcessor) {
-
-          /*--- Write the node data from this proc ---*/
-
-          if (surf_sol) {
-            for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-              /*--- Loop over the vars/residuals and write the values to file ---*/
-              Paraview_File << scientific << Parallel_Surf_Data[VarCounter+0][iPoint] << "\t" << Parallel_Surf_Data[VarCounter+1][iPoint] << "\t";
-              if (nDim == 3) Paraview_File << scientific << Parallel_Surf_Data[VarCounter+2][iPoint] << "\t";
-              if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-            }
-          } else {
-            for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-              Paraview_File << scientific << Parallel_Data[VarCounter+0][iPoint] << "\t" << Parallel_Data[VarCounter+1][iPoint] << "\t";
-              if (nDim == 3) Paraview_File << scientific << Parallel_Data[VarCounter+2][iPoint] << "\t";
-              if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
-            }
-          }
-        }
-        Paraview_File.flush();
-#ifdef HAVE_MPI
-        SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-      }
-
-      VarCounter++;
-
-    } else if (output_variable) {
-
-      if (rank == MASTER_NODE) {
-
-        Paraview_File << "\nSCALARS " << fieldname << " double 1\n";
-        Paraview_File << "LOOKUP_TABLE default\n";
-      }
-
-      Paraview_File.flush();
-#ifdef HAVE_MPI
-      SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-      /*--- Write surface and volumetric point coordinates. ---*/
-
-      for (iProcessor = 0; iProcessor < size; iProcessor++) {
-        if (rank == iProcessor) {
-
-          /*--- Write the node data from this proc ---*/
-
-          if (surf_sol) {
-            for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-              Paraview_File << scientific << Parallel_Surf_Data[VarCounter][iPoint] << "\t";
-            }
-          } else {
-            for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-              Paraview_File << scientific << Parallel_Data[VarCounter][iPoint] << "\t";
-            }
-          }
-        }
-        Paraview_File.flush();
-#ifdef HAVE_MPI
-        SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-      }
-      
-      VarCounter++;
-    }
-
-  }
-
-  Paraview_File.close();
-  
-}
-
-void COutput::WriteParaViewBinary_Parallel(CConfig *config,
-                                           CGeometry *geometry,
-                                           unsigned short val_iZone,
-                                           unsigned short val_nZone,
-                                           bool surf_sol) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  
-  unsigned long iPoint, iElem, iNode;
-  
-  string filename, fieldname;
-  ofstream Paraview_File;
-    
-  int MAX_STRING_LENGTH = 255;
-  char str_buf[MAX_STRING_LENGTH], fname[100];
-  
-  const int NCOORDS = 3;
-  
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".vtk");
-  else filename          = config->GetFilename(VolumeFilename, ".vtk");
-
-  strcpy(fname, filename.c_str());
-  
-  /*--- Check for big endian. We have to swap bytes otherwise. ---*/
-  
-  bool BigEndian;
-  union {int i; char c[4];} val;
-  val.i = 0x76543210;
-  if (val.c[0] == 0x10) BigEndian = false;
-  else BigEndian = true;
-  
-  /*--- Serial implementation in case we have not compiled with MPI. ---*/
-  
-#ifndef HAVE_MPI
-  
-  FILE* fhw;
-  fhw = fopen(fname, "wb");
-  
-  unsigned long iNode2;
-  unsigned long nSurf_Elem_Storage;
-  unsigned long nGlobal_Elem_Storage;
-  
-  /*--- Error check for opening the file. ---*/
-  
-  if (!fhw) {
-    SU2_MPI::Error(string("Unable to open VTK binary legacy file ") +
-                   filename, CURRENT_FUNCTION);
-  }
-  
-  /*--- File header written in ASCII. ---*/
-  
-  strcpy(str_buf, "# vtk DataFile Version 3.0\n");
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  strcpy(str_buf, "vtk output\n");
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  strcpy(str_buf, "BINARY\n");
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  /*--- Write the point coordinates. ---*/
-  
-  unsigned long GlobalPoint;
-  su2double **Data;
-  if (surf_sol) {
-    GlobalPoint  = nSurf_Poin_Par;
-    Data         = Parallel_Surf_Data;
-  } else {
-    GlobalPoint  = nGlobal_Poin_Par;
-    Data         = Parallel_Data;
-  }
-  
-  SPRINTF(str_buf, "POINTS %i float\n", (int)GlobalPoint);
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  /*--- Load/write the 1D buffer of point coordinates. ---*/
-  
-  float *coord_buf = new float[GlobalPoint*NCOORDS];
-  for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
-    for (iDim = 0; iDim < NCOORDS; iDim++) {
-      if (nDim == 2 && iDim == 2) {
-        coord_buf[iPoint*NCOORDS + iDim] = 0.0;
-      } else {
-        float val = (float)SU2_TYPE::GetValue(Data[iDim][iPoint]);
-        coord_buf[iPoint*NCOORDS + iDim] = val;
-      }
-    }
-  }
-  if (!BigEndian) SwapBytes((char *)coord_buf, sizeof(float), 3*GlobalPoint);
-  
-  fwrite(coord_buf, sizeof(float), 3*GlobalPoint, fhw);
-  delete [] coord_buf;
-  
-  /*--- Write the connectivity data. ---*/
-  
-  unsigned long nTot_Line, nTot_BoundTria, nTot_BoundQuad;
-  nTot_Line      = nParallel_Line;
-  nTot_BoundTria = nParallel_BoundTria;
-  nTot_BoundQuad = nParallel_BoundQuad;
-  nSurf_Elem_Storage = nTot_Line*3 +nTot_BoundTria*4 + nTot_BoundQuad*5;
-  
-  unsigned long nTot_Tria, nTot_Quad;
-  unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  nTot_Tria = nParallel_Tria;
-  nTot_Quad = nParallel_Quad;
-  nTot_Tetr = nParallel_Tetr;
-  nTot_Hexa = nParallel_Hexa;
-  nTot_Pris = nParallel_Pris;
-  nTot_Pyra = nParallel_Pyra;
-  nGlobal_Elem_Storage = (nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 +
-                          nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6);
-  
-  int *conn_buf = NULL;
-  
-  if (surf_sol) {
-    SPRINTF (str_buf, "\nCELLS %i %i\n", (int)nSurf_Elem_Par,
-             (int)nSurf_Elem_Storage);
-    fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-    conn_buf = new int[nSurf_Elem_Par*(N_POINTS_QUADRILATERAL+1)];
-  } else {
-    SPRINTF (str_buf, "\nCELLS %i %i\n", (int)nGlobal_Elem_Par,
-             (int)nGlobal_Elem_Storage);
-    fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-    conn_buf = new int[nGlobal_Elem_Par*(N_POINTS_HEXAHEDRON+1)];
-  }
-  
-  /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
-  
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nParallel_Line; iElem++) {
-      iNode  = iElem*N_POINTS_LINE;
-      iNode2 = iElem*(N_POINTS_LINE+1);
-      conn_buf[iNode2+0] = N_POINTS_LINE;
-      conn_buf[iNode2+1] = Conn_BoundLine_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_BoundLine_Par[iNode+1]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                nParallel_Line*(N_POINTS_LINE+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Line*(N_POINTS_LINE+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-      iNode  = iElem*N_POINTS_TRIANGLE;
-      iNode2 = iElem*(N_POINTS_TRIANGLE+1);
-      conn_buf[iNode2+0] = N_POINTS_TRIANGLE;
-      conn_buf[iNode2+1] = Conn_BoundTria_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_BoundTria_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_BoundTria_Par[iNode+2]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                nParallel_BoundTria*(N_POINTS_TRIANGLE+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_BoundTria*(N_POINTS_TRIANGLE+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-      iNode  = iElem*N_POINTS_QUADRILATERAL;
-      iNode2 = iElem*(N_POINTS_QUADRILATERAL+1);
-      conn_buf[iNode2+0] = N_POINTS_QUADRILATERAL;
-      conn_buf[iNode2+1] = Conn_BoundQuad_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_BoundQuad_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_BoundQuad_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_BoundQuad_Par[iNode+3]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                nParallel_BoundQuad*(N_POINTS_QUADRILATERAL+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_BoundQuad*(N_POINTS_QUADRILATERAL+1), fhw);
-    
-  } else {
-    
-    for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-      iNode  = iElem*N_POINTS_TRIANGLE;
-      iNode2 = iElem*(N_POINTS_TRIANGLE+1);
-      conn_buf[iNode2+0] = N_POINTS_TRIANGLE;
-      conn_buf[iNode2+1] = Conn_Tria_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Tria_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Tria_Par[iNode+2]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Tria*(N_POINTS_TRIANGLE+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Tria*(N_POINTS_TRIANGLE+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-      iNode  = iElem*N_POINTS_QUADRILATERAL;
-      iNode2 = iElem*(N_POINTS_QUADRILATERAL+1);
-      conn_buf[iNode2+0] = N_POINTS_QUADRILATERAL;
-      conn_buf[iNode2+1] = Conn_Quad_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Quad_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Quad_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_Quad_Par[iNode+3]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Quad*(N_POINTS_QUADRILATERAL+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Quad*(N_POINTS_QUADRILATERAL+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-      iNode  = iElem*N_POINTS_TETRAHEDRON;
-      iNode2 = iElem*(N_POINTS_TETRAHEDRON+1);
-      conn_buf[iNode2+0] = N_POINTS_TETRAHEDRON;
-      conn_buf[iNode2+1] = Conn_Tetr_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Tetr_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Tetr_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_Tetr_Par[iNode+3]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Tetr*(N_POINTS_TETRAHEDRON+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Tetr*(N_POINTS_TETRAHEDRON+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-      iNode  = iElem*N_POINTS_HEXAHEDRON;
-      iNode2 = iElem*(N_POINTS_HEXAHEDRON+1);
-      conn_buf[iNode2+0] = N_POINTS_HEXAHEDRON;
-      conn_buf[iNode2+1] = Conn_Hexa_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Hexa_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Hexa_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_Hexa_Par[iNode+3]-1;
-      conn_buf[iNode2+5] = Conn_Hexa_Par[iNode+4]-1;
-      conn_buf[iNode2+6] = Conn_Hexa_Par[iNode+5]-1;
-      conn_buf[iNode2+7] = Conn_Hexa_Par[iNode+6]-1;
-      conn_buf[iNode2+8] = Conn_Hexa_Par[iNode+7]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Hexa*(N_POINTS_HEXAHEDRON+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Hexa*(N_POINTS_HEXAHEDRON+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-      iNode  = iElem*N_POINTS_PRISM;
-      iNode2 = iElem*(N_POINTS_PRISM+1);
-      conn_buf[iNode2+0] = N_POINTS_PRISM;
-      conn_buf[iNode2+1] = Conn_Pris_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Pris_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Pris_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_Pris_Par[iNode+3]-1;
-      conn_buf[iNode2+5] = Conn_Pris_Par[iNode+4]-1;
-      conn_buf[iNode2+6] = Conn_Pris_Par[iNode+5]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Pris*(N_POINTS_PRISM+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Pris*(N_POINTS_PRISM+1), fhw);
-    
-    for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-      iNode  = iElem*N_POINTS_PYRAMID;
-      iNode2 = iElem*(N_POINTS_PYRAMID+1);
-      conn_buf[iNode2+0] = N_POINTS_PYRAMID;
-      conn_buf[iNode2+1] = Conn_Pyra_Par[iNode+0]-1;
-      conn_buf[iNode2+2] = Conn_Pyra_Par[iNode+1]-1;
-      conn_buf[iNode2+3] = Conn_Pyra_Par[iNode+2]-1;
-      conn_buf[iNode2+4] = Conn_Pyra_Par[iNode+3]-1;
-      conn_buf[iNode2+5] = Conn_Pyra_Par[iNode+4]-1;
-    }
-    if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
-                              nParallel_Pyra*(N_POINTS_PYRAMID+1));
-    fwrite(conn_buf, sizeof(int),
-           nParallel_Pyra*(N_POINTS_PYRAMID+1), fhw);
-    
-  }
-  
-  if (conn_buf != NULL) delete [] conn_buf;
-  
-  /*--- Load/write the cell type for all elements in the file. ---*/
-  
-  if (surf_sol) {
-    SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(nSurf_Elem_Par));
-    fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  } else {
-    SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(nGlobal_Elem_Par));
-    fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  }
-  
-  int *type_buf = NULL;
-  if (surf_sol) {
-    
-    type_buf = new int[nSurf_Elem_Par];
-    
-    for (iElem = 0; iElem < nParallel_Line; iElem++) {
-      type_buf[iElem] = LINE;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Line);
-    fwrite(type_buf, sizeof(int), nParallel_Line, fhw);
-    
-    for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-      type_buf[iElem] = TRIANGLE;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_BoundTria);
-    fwrite(type_buf, sizeof(int), nParallel_BoundTria, fhw);
-    
-    for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-      type_buf[iElem] = QUADRILATERAL;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_BoundQuad);
-    fwrite(type_buf, sizeof(int), nParallel_BoundQuad, fhw);
-    
-  } else {
-    
-    type_buf = new int[nGlobal_Elem_Par];
-    
-    for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-      type_buf[iElem] = TRIANGLE;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Tria);
-    fwrite(type_buf, sizeof(int), nParallel_Tria, fhw);
-    
-    for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-      type_buf[iElem] = QUADRILATERAL;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Quad);
-    fwrite(type_buf, sizeof(int), nParallel_Quad, fhw);
-    
-    for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-      type_buf[iElem] = TETRAHEDRON;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Tetr);
-    fwrite(type_buf, sizeof(int), nParallel_Tetr, fhw);
-    
-    for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-      type_buf[iElem] = HEXAHEDRON;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Hexa);
-    fwrite(type_buf, sizeof(int), nParallel_Hexa, fhw);
-    
-    for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-      type_buf[iElem] = PRISM;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Pris);
-    fwrite(type_buf, sizeof(int), nParallel_Pris, fhw);
-    
-    for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-      type_buf[iElem] = PYRAMID;
-    }
-    if (!BigEndian)
-      SwapBytes((char *)type_buf, sizeof(int), nParallel_Pyra);
-    fwrite(type_buf, sizeof(int), nParallel_Pyra, fhw);
-    
-  }
-  
-  if (type_buf != NULL) delete [] type_buf;
-  
-  /*--- Now write the scalar and vector data (reuse the counts above). ---*/
-  
-  SPRINTF (str_buf, "\nPOINT_DATA %i\n", (int)GlobalPoint);
-  fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-  
-  unsigned short varStart = 2;
-  if (nDim == 3) varStart++;
-  
-  /*--- Need to adjust container location to avoid PointID tag and coords. ---*/
-  
-  unsigned short iField, VarCounter = varStart;
-  for (iField = varStart; iField < Variable_Names.size(); iField++) {
-    
-    fieldname = Variable_Names[iField];
-    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'),
-                    fieldname.end());
-    
-    bool output_variable = true, isVector = false;
-    size_t found = Variable_Names[iField].find("_x");
-    if (found!=string::npos) {
-      output_variable = true;
-      isVector = true;
-    }
-    found = Variable_Names[iField].find("_y");
-    if (found!=string::npos) {
-      //skip
-      output_variable = false;
-      VarCounter++;
-    }
-    found = Variable_Names[iField].find("_z");
-    if (found!=string::npos) {
-      //skip
-      output_variable = false;
-      VarCounter++;
-    }
-    
-    if (output_variable && isVector) {
-      
-      fieldname.erase(fieldname.end()-2,fieldname.end());
-      SPRINTF (str_buf, "\nVECTORS %s float\n", fieldname.c_str());
-      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-      
-      /*--- Prepare the 1D data buffer on this rank. ---*/
-      
-      float *vec_buf = new float[GlobalPoint*NCOORDS];
-      
-      /*--- For now, create a temp 1D buffer to load up the data for writing.
-       This will be replaced with a derived data type most likely. ---*/
-      
-      float val = 0.0;
-      for (iPoint = 0; iPoint < GlobalPoint; iPoint++)
-        for (iDim = 0; iDim < NCOORDS; iDim++) {
-          if (nDim == 2 && iDim == 2) {
-            vec_buf[iPoint*NCOORDS + iDim] = 0.0;
-          } else {
-            val = (float)SU2_TYPE::GetValue(Data[VarCounter+iDim][iPoint]);
-            vec_buf[iPoint*NCOORDS + iDim] = val;
-          }
-        }
-      if (!BigEndian)
-        SwapBytes((char *)vec_buf, sizeof(float), NCOORDS*GlobalPoint);
-      fwrite(vec_buf, sizeof(float), NCOORDS*GlobalPoint, fhw);
-      
-      delete [] vec_buf;
-      
-      VarCounter++;
-      
-    } else if (output_variable) {
-      
-      SPRINTF (str_buf, "\nSCALARS %s float 1\n", fieldname.c_str());
-      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-      
-      SPRINTF (str_buf, "LOOKUP_TABLE default\n");
-      fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
-      
-      /*--- Prepare the 1D data buffer on this rank. ---*/
-      
-      float *scalar_buf = new float[GlobalPoint];
-      
-      /*--- For now, create a temp 1D buffer to load up the data for writing.
-       This will be replaced with a derived data type most likely. ---*/
-      
-      for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(Data[VarCounter][iPoint]);
-        scalar_buf[iPoint] = val;
-      }
-      if (!BigEndian)
-        SwapBytes((char *)scalar_buf, sizeof(float), GlobalPoint);
-      fwrite(scalar_buf, sizeof(float), GlobalPoint, fhw);
-      
-      delete [] scalar_buf;
-      
-      VarCounter++;
-    }
-    
-  }
-  
-  /*--- Close the file. ---*/
-  
-  fclose(fhw);
-  
-#else
-  
-  /*--- Parallel binary output using MPI I/O. ---*/
-  
-  MPI_File fhw;
-  SU2_MPI::Status status;
-  MPI_Datatype etype, filetype;
-  MPI_Offset disp, disp2;
-  int ierr;
-  
-  /*--- All ranks open the file using MPI. Here, we try to open the file with
-   exclusive so that an error is generated if the file exists. We always want
-   to write a fresh output file, so we delete any existing files and create
-   a new one. ---*/
-  
-  ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                       MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                       MPI_INFO_NULL, &fhw);
-  if (ierr != MPI_SUCCESS)  {
-    MPI_File_close(&fhw);
-    if (rank == 0)
-      MPI_File_delete(fname, MPI_INFO_NULL);
-    ierr = MPI_File_open(MPI_COMM_WORLD, fname,
-                         MPI_MODE_CREATE|MPI_MODE_EXCL|MPI_MODE_WRONLY,
-                         MPI_INFO_NULL, &fhw);
-  }
-  
-  /*--- Error check opening the file. ---*/
-  
-  if (ierr) {
-    SU2_MPI::Error(string("Unable to open VTK binary legacy file ") +
-                   string(fname), CURRENT_FUNCTION);
-  }
-  
-  /*--- Set pointer to our output data for simplicity. ---*/
-  
-  su2double **Data;
-  if (surf_sol) {
-    Data = Parallel_Surf_Data;
-  } else {
-    Data = Parallel_Data;
-  }
-  
-  /*--- Write the initial strings to the file. Only the master will
-   write the header lines, but all ranks will store the offsets. ---*/
-  
-  disp = 0;
-  strcpy(str_buf, "# vtk DataFile Version 3.0\n");
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  strcpy(str_buf, "vtk output\n");
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  strcpy(str_buf, "BINARY\n");
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  strcpy(str_buf, "DATASET UNSTRUCTURED_GRID\n");
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  /*--- Communicate the number of total points that will be
-   written by each rank. After this communication, each proc knows how
-   many poinnts will be written before its location in the file and the
-   offsets can be correctly set. ---*/
-  
-  unsigned long myPoint, GlobalPoint;
-  if (surf_sol) {
-    GlobalPoint = nGlobal_Surf_Poin;
-    myPoint     = nSurf_Poin_Par;
-  } else {
-    GlobalPoint = nGlobal_Poin_Par;
-    myPoint     = nParallel_Poin;
-  }
-  
-  int *nPoint_Snd = new int[size+1];
-  int *nPoint_Cum = new int[size+1];
-  
-  nPoint_Snd[0] = 0; nPoint_Cum[0] = 0;
-  for (int ii=1; ii < size; ii++) {
-    nPoint_Snd[ii] = myPoint; nPoint_Cum[ii] = 0;
-  }
-  nPoint_Snd[size] = myPoint; nPoint_Cum[size] = 0;
-  
-  /*--- Communicate the local counts to all ranks for building offsets. ---*/
-  
-  SU2_MPI::Alltoall(&(nPoint_Snd[1]), 1, MPI_INT,
-                    &(nPoint_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
-  
-  /*--- Put the counters into cumulative storage format. ---*/
-  
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Cum[ii+1] += nPoint_Cum[ii];
-  }
-  
-  SPRINTF(str_buf, "POINTS %i float\n", SU2_TYPE::Int(GlobalPoint));
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  /*--- Load/write the 1D buffer of point coordinates. Note that we
-   always have 3 coordinate dimensions, even for 2D problems. ---*/
-  
-  float *coord_buf = new float[myPoint*NCOORDS];
-  for (iPoint = 0; iPoint < myPoint; iPoint++) {
-    for (iDim = 0; iDim < NCOORDS; iDim++) {
-      if (nDim == 2 && iDim == 2) {
-        coord_buf[iPoint*NCOORDS + iDim] = 0.0;
-      } else {
-        float val = (float)SU2_TYPE::GetValue(Data[iDim][iPoint]);
-        coord_buf[iPoint*NCOORDS + iDim] = val;
-      }
-    }
-  }
-  if (!BigEndian) SwapBytes((char *)coord_buf, sizeof(float), myPoint*NCOORDS);
-
-  /*--- We will write the point coordinates as floats. ---*/
-  
-  etype = MPI_FLOAT;
-  
-  /*--- Define a derived datatype for this ranks contiguous
-   chunk of data that will be placed in the file. ---*/
-  
-  MPI_Type_contiguous(myPoint*NCOORDS, MPI_FLOAT, &filetype);
-  MPI_Type_commit(&filetype);
-  
-  /*--- Compute the offset for this rank's linear partition of the
-   data in bytes. ---*/
-  
-  disp2 = disp + NCOORDS*nPoint_Cum[rank]*sizeof(float);
-  
-  /*--- Set the view for the MPI file write, i.e., describe the
-   location in the file that this rank "sees" for writing its
-   piece of the file. ---*/
-  
-  MPI_File_set_view(fhw, disp2, etype, filetype,
-                    (char*)"native", MPI_INFO_NULL);
-  
-  /*--- Collective call for all ranks to write simultaneously. ---*/
-  
-  MPI_File_write_all(fhw, coord_buf, myPoint*NCOORDS, MPI_FLOAT, &status);
-  
-  /*--- Update the displacement position for MPI IO. ---*/
-  
-  disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
-  
-  /*--- Free the derived datatype and coordinate array. ---*/
-  
-  MPI_Type_free(&filetype);
-  delete [] coord_buf;
-  
-  /*--- Compute our local number of elements, the required storage,
-   and reduce the total number of elements and storage globally. ---*/
-  
-  unsigned long nTot_Line, nTot_BoundTria, nTot_BoundQuad;
-  unsigned long nTot_Tria, nTot_Quad;
-  unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  unsigned long myElem, myElemStorage, GlobalElem, GlobalElemStorage;
-  
-  if (surf_sol) {
-    
-    SU2_MPI::Allreduce(&nParallel_Line,      &nTot_Line,      1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_BoundTria, &nTot_BoundTria, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_BoundQuad, &nTot_BoundQuad, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    
-    myElem        = (nParallel_Line   + nParallel_BoundTria   +
-                     nParallel_BoundQuad);
-    myElemStorage = (nParallel_Line*3 + nParallel_BoundTria*4 +
-                     nParallel_BoundQuad*5);
-    
-    GlobalElem        = nTot_Line   + nTot_BoundTria   + nTot_BoundQuad;
-    GlobalElemStorage = nTot_Line*3 + nTot_BoundTria*4 + nTot_BoundQuad*5;
-    
-  } else {
-    
-    SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_Quad, &nTot_Quad, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_Tetr, &nTot_Tetr, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_Hexa, &nTot_Hexa, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_Pris, &nTot_Pris, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Allreduce(&nParallel_Pyra, &nTot_Pyra, 1,
-                       MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    
-    myElem        = (nParallel_Tria + nParallel_Quad + nParallel_Tetr +
-                     nParallel_Hexa + nParallel_Pris + nParallel_Pyra);
-    myElemStorage = (nParallel_Tria*4 + nParallel_Quad*5 + nParallel_Tetr*5 +
-                     nParallel_Hexa*9 + nParallel_Pris*7 + nParallel_Pyra*6);
-    
-    GlobalElem        = (nTot_Tria   + nTot_Quad   + nTot_Tetr   +
-                         nTot_Hexa   + nTot_Pris   + nTot_Pyra);
-    GlobalElemStorage = (nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 +
-                         nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6);
-    
-  }
-  
-  /*--- Communicate the number of total cells/storage that will be
-   written by each rank. After this communication, each proc knows how
-   many cells will be written before its location in the file and the
-   offsets can be correctly set. ---*/
-  
-  int *nElem_Snd = new int[size+1]; int *nElemStorage_Snd = new int[size+1];
-  int *nElem_Cum = new int[size+1]; int *nElemStorage_Cum = new int[size+1];
-  
-  nElem_Snd[0] = 0; nElemStorage_Snd[0] = 0;
-  nElem_Cum[0] = 0; nElemStorage_Cum[0] = 0;
-  for (int ii=1; ii < size; ii++) {
-    nElem_Snd[ii] = myElem; nElemStorage_Snd[ii] = myElemStorage;
-    nElem_Cum[ii] = 0;      nElemStorage_Cum[ii] = 0;
-  }
-  nElem_Snd[size] = myElem; nElemStorage_Snd[size] = myElemStorage;
-  nElem_Cum[size] = 0;      nElemStorage_Cum[size] = 0;
-  
-  /*--- Communicate the local counts to all ranks for building offsets. ---*/
-  
-  SU2_MPI::Alltoall(&(nElem_Snd[1]), 1, MPI_INT,
-                    &(nElem_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
-  
-  SU2_MPI::Alltoall(&(nElemStorage_Snd[1]), 1, MPI_INT,
-                    &(nElemStorage_Cum[1]), 1, MPI_INT, MPI_COMM_WORLD);
-  
-  /*--- Put the counters into cumulative storage format. ---*/
-  
-  for (int ii = 0; ii < size; ii++) {
-    nElem_Cum[ii+1]        += nElem_Cum[ii];
-    nElemStorage_Cum[ii+1] += nElemStorage_Cum[ii];
-  }
-  
-  /*--- Reset the file view before writing the next ASCII line for cells. ---*/
-  
-  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                    (char*)"native", MPI_INFO_NULL);
-  SPRINTF(str_buf, "\nCELLS %i %i\n", SU2_TYPE::Int(GlobalElem),
-          SU2_TYPE::Int(GlobalElemStorage));
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
-  
-  int *conn_buf = new int[myElemStorage];
-  unsigned long iStorage = 0;
-  
-  if (surf_sol) {
-    
-    for (iElem = 0; iElem < nParallel_Line; iElem++) {
-      iNode  = iElem*N_POINTS_LINE;
-      conn_buf[iStorage+0] = N_POINTS_LINE;
-      conn_buf[iStorage+1] = Conn_BoundLine_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_BoundLine_Par[iNode+1]-1;
-      iStorage += (N_POINTS_LINE+1);
-    }
-    
-    for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-      iNode  = iElem*N_POINTS_TRIANGLE;
-      conn_buf[iStorage+0] = N_POINTS_TRIANGLE;
-      conn_buf[iStorage+1] = Conn_BoundTria_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_BoundTria_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_BoundTria_Par[iNode+2]-1;
-      iStorage += (N_POINTS_TRIANGLE+1);
-    }
-    
-    for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-      iNode  = iElem*N_POINTS_QUADRILATERAL;
-      conn_buf[iStorage+0] = N_POINTS_QUADRILATERAL;
-      conn_buf[iStorage+1] = Conn_BoundQuad_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_BoundQuad_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_BoundQuad_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_BoundQuad_Par[iNode+3]-1;
-      iStorage += (N_POINTS_QUADRILATERAL+1);
-    }
-    
-  } else {
-    
-    for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-      iNode  = iElem*N_POINTS_TRIANGLE;
-      conn_buf[iStorage+0] = N_POINTS_TRIANGLE;
-      conn_buf[iStorage+1] = Conn_Tria_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Tria_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Tria_Par[iNode+2]-1;
-      iStorage += (N_POINTS_TRIANGLE+1);
-    }
-    
-    for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-      iNode  = iElem*N_POINTS_QUADRILATERAL;
-      conn_buf[iStorage+0] = N_POINTS_QUADRILATERAL;
-      conn_buf[iStorage+1] = Conn_Quad_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Quad_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Quad_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_Quad_Par[iNode+3]-1;
-      iStorage += (N_POINTS_QUADRILATERAL+1);
-      
-    }
-    
-    for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-      iNode  = iElem*N_POINTS_TETRAHEDRON;
-      conn_buf[iStorage+0] = N_POINTS_TETRAHEDRON;
-      conn_buf[iStorage+1] = Conn_Tetr_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Tetr_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Tetr_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_Tetr_Par[iNode+3]-1;
-      iStorage += (N_POINTS_TETRAHEDRON+1);
-      
-    }
-    
-    for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-      iNode  = iElem*N_POINTS_HEXAHEDRON;
-      conn_buf[iStorage+0] = N_POINTS_HEXAHEDRON;
-      conn_buf[iStorage+1] = Conn_Hexa_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Hexa_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Hexa_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_Hexa_Par[iNode+3]-1;
-      conn_buf[iStorage+5] = Conn_Hexa_Par[iNode+4]-1;
-      conn_buf[iStorage+6] = Conn_Hexa_Par[iNode+5]-1;
-      conn_buf[iStorage+7] = Conn_Hexa_Par[iNode+6]-1;
-      conn_buf[iStorage+8] = Conn_Hexa_Par[iNode+7]-1;
-      iStorage += (N_POINTS_HEXAHEDRON+1);
-    }
-    
-    for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-      iNode  = iElem*N_POINTS_PRISM;
-      conn_buf[iStorage+0] = N_POINTS_PRISM;
-      conn_buf[iStorage+1] = Conn_Pris_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Pris_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Pris_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_Pris_Par[iNode+3]-1;
-      conn_buf[iStorage+5] = Conn_Pris_Par[iNode+4]-1;
-      conn_buf[iStorage+6] = Conn_Pris_Par[iNode+5]-1;
-      iStorage += (N_POINTS_PRISM+1);
-    }
-    
-    for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-      iNode  = iElem*N_POINTS_PYRAMID;
-      conn_buf[iStorage+0] = N_POINTS_PYRAMID;
-      conn_buf[iStorage+1] = Conn_Pyra_Par[iNode+0]-1;
-      conn_buf[iStorage+2] = Conn_Pyra_Par[iNode+1]-1;
-      conn_buf[iStorage+3] = Conn_Pyra_Par[iNode+2]-1;
-      conn_buf[iStorage+4] = Conn_Pyra_Par[iNode+3]-1;
-      conn_buf[iStorage+5] = Conn_Pyra_Par[iNode+4]-1;
-      iStorage += (N_POINTS_PYRAMID+1);
-    }
-    
-  }
-  if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int), myElemStorage);
-  
-  /*--- We write the connectivity with MPI_INTs. ---*/
-  
-  etype = MPI_INT;
-  
-  /*--- Define a derived datatype for this ranks contiguous
-   chunk of data that will be placed in the file. ---*/
-  
-  MPI_Type_contiguous(myElemStorage, MPI_INT, &filetype);
-  MPI_Type_commit(&filetype);
-  
-  /*--- Compute the offset for this rank's linear partition of the
-   data in bytes. ---*/
-  
-  disp2 = (disp + nElemStorage_Cum[rank]*sizeof(int));
-  
-  /*--- Set the view for the MPI file write, i.e., describe the
-   location in the file that this rank "sees" for writing its
-   piece of the file. ---*/
-  
-  MPI_File_set_view(fhw, disp2, etype, filetype,
-                    (char*)"native", MPI_INFO_NULL);
-  
-  /*--- Collective call for all ranks to write simultaneously. ---*/
-  
-  MPI_File_write_all(fhw, conn_buf, myElemStorage, MPI_INT, &status);
-  
-  /*--- Update the displacement position for MPI IO. ---*/
-  
-  disp += nElemStorage_Cum[size]*sizeof(int);
-  
-  /*--- Free the derived datatype. ---*/
-  
-  MPI_Type_free(&filetype);
-  delete [] conn_buf;
-  
-  /*--- Load/write the cell type for all elements in the file. ---*/
-  
-  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                    (char*)"native", MPI_INFO_NULL);
-  SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(GlobalElem));
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  int *type_buf = new int[myElem];
-  unsigned long jElem = 0;
-  
-  if (surf_sol) {
-    for (iElem = 0; iElem < nParallel_Line; iElem++) {
-      type_buf[jElem] = LINE; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-      type_buf[jElem] = TRIANGLE; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-      type_buf[jElem] = QUADRILATERAL; jElem++;
-    }
-  } else {
-    for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-      type_buf[jElem] = TRIANGLE; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-      type_buf[jElem] = QUADRILATERAL; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-      type_buf[jElem] = TETRAHEDRON; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-      type_buf[jElem] = HEXAHEDRON; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-      type_buf[jElem] = PRISM; jElem++;
-    }
-    for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-      type_buf[jElem] = PYRAMID; jElem++;
-    }
-  }
-  if (!BigEndian) SwapBytes((char *)type_buf, sizeof(int), myElem);
-
-  /*--- We write the cell types with MPI_INTs. ---*/
-  
-  etype = MPI_INT;
-  
-  /*--- Define a derived datatype for this ranks contiguous
-   chunk of data that will be placed in the file. ---*/
-  
-  MPI_Type_contiguous(myElem, MPI_INT, &filetype);
-  MPI_Type_commit(&filetype);
-  
-  /*--- Compute the offset for this rank's linear partition of the
-   data in bytes. ---*/
-  
-  disp2 = (disp + nElem_Cum[rank]*sizeof(int));
-  
-  /*--- Set the view for the MPI file write, i.e., describe the
-   location in the file that this rank "sees" for writing its
-   piece of the file. ---*/
-  
-  MPI_File_set_view(fhw, disp2, etype, filetype,
-                    (char*)"native", MPI_INFO_NULL);
-  
-  /*--- Collective call for all ranks to write simultaneously. ---*/
-  
-  MPI_File_write_all(fhw, type_buf, myElem, MPI_INT, &status);
-  
-  /*--- Update the displacement position for MPI IO. ---*/
-  
-  disp += nElem_Cum[size]*sizeof(int);
-  
-  /*--- Free the derived datatype. ---*/
-  
-  MPI_Type_free(&filetype);
-  if (type_buf != NULL) delete [] type_buf;
-  
-  /*--- Now write the scalar and vector point data. ---*/
-  
-  MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                    (char*)"native", MPI_INFO_NULL);
-  SPRINTF (str_buf, "\nPOINT_DATA %i\n", SU2_TYPE::Int(GlobalPoint));
-  if (rank == MASTER_NODE)
-    MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                      MPI_CHAR, MPI_STATUS_IGNORE);
-  disp += strlen(str_buf)*sizeof(char);
-  
-  /*--- Adjust container start location to avoid point coords. ---*/
-  
-  unsigned short varStart = 2;
-  if (nDim == 3) varStart++;
-  
-  /*--- Loop over all variables that have been registered in the output. ---*/
-  
-  unsigned short iField, VarCounter = varStart;
-  for (iField = varStart; iField < Variable_Names.size(); iField++) {
-    
-    fieldname = Variable_Names[iField];
-    fieldname.erase(remove(fieldname.begin(), fieldname.end(), '"'),
-                    fieldname.end());
-    
-    /*--- Check whether this field is a vector or scalar. ---*/
-    
-    bool output_variable = true, isVector = false;
-    size_t found = Variable_Names[iField].find("_x");
-    if (found!=string::npos) {
-      output_variable = true;
-      isVector        = true;
-    }
-    found = Variable_Names[iField].find("_y");
-    if (found!=string::npos) {
-      /*--- We have found a vector, so skip the Y component. ---*/
-      output_variable = false;
-      VarCounter++;
-    }
-    found = Variable_Names[iField].find("_z");
-    if (found!=string::npos) {
-      /*--- We have found a vector, so skip the Z component. ---*/
-      output_variable = false;
-      VarCounter++;
-    }
-    
-    /*--- Write the point data as an <X,Y,Z> vector or a scalar. ---*/
-    
-    if (output_variable && isVector) {
-      
-      /*--- Adjust the string name to remove the leading "X-" ---*/
-      
-      fieldname.erase(fieldname.end()-2,fieldname.end());
-      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                        (char*)"native", MPI_INFO_NULL);
-      SPRINTF (str_buf, "\nVECTORS %s float\n", fieldname.c_str());
-      if (rank == MASTER_NODE)
-        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                          MPI_CHAR, MPI_STATUS_IGNORE);
-      disp += strlen(str_buf)*sizeof(char);
-      
-      /*--- Prepare the 1D data buffer on this rank. ---*/
-      
-      float *vec_buf = new float[myPoint*NCOORDS];
-      
-      /*--- Load up the buffer for writing this rank's vector data. ---*/
-      
-      float val = 0.0;
-      for (iPoint = 0; iPoint < myPoint; iPoint++) {
-        for (iDim = 0; iDim < NCOORDS; iDim++) {
-          if (nDim == 2 && iDim == 2) {
-            vec_buf[iPoint*NCOORDS + iDim] = 0.0;
-          } else {
-            val = (float)SU2_TYPE::GetValue(Data[VarCounter+iDim][iPoint]);
-            vec_buf[iPoint*NCOORDS + iDim] = val;
-          }
-        }
-      }
-      if (!BigEndian)
-        SwapBytes((char *)vec_buf, sizeof(float), myPoint*NCOORDS);
-
-      /*--- We will write the point data as floats. ---*/
-      
-      etype = MPI_FLOAT;
-      
-      /*--- Define a derived datatype for this ranks contiguous
-       chunk of data that will be placed in the file. ---*/
-      
-      MPI_Type_contiguous(myPoint*NCOORDS, MPI_FLOAT, &filetype);
-      MPI_Type_commit(&filetype);
-      
-      /*--- Compute the offset for this rank's linear partition of the
-       data in bytes. ---*/
-      
-      disp2 = disp + NCOORDS*nPoint_Cum[rank]*sizeof(float);
-      
-      /*--- Set the view for the MPI file write, i.e., describe the
-       location in the file that this rank "sees" for writing its
-       piece of the file. ---*/
-      
-      MPI_File_set_view(fhw, disp2, etype, filetype,
-                        (char*)"native", MPI_INFO_NULL);
-      
-      /*--- Collective call for all ranks to write simultaneously. ---*/
-      
-      MPI_File_write_all(fhw, vec_buf, myPoint*NCOORDS, MPI_FLOAT, &status);
-      
-      /*--- Update the displacement position for MPI IO. ---*/
-      
-      disp += NCOORDS*nPoint_Cum[size]*sizeof(float);
-      
-      /*--- Free the derived datatype and coordinate array. ---*/
-      
-      MPI_Type_free(&filetype);
-      delete [] vec_buf; vec_buf = NULL;
-      
-      VarCounter++;
-      
-    } else if (output_variable) {
-      
-      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                        (char*)"native", MPI_INFO_NULL);
-      SPRINTF (str_buf, "\nSCALARS %s float 1\n", fieldname.c_str());
-      if (rank == MASTER_NODE)
-        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                          MPI_CHAR, MPI_STATUS_IGNORE);
-      disp += strlen(str_buf)*sizeof(char);
-      
-      MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE,
-                        (char*)"native", MPI_INFO_NULL);
-      SPRINTF (str_buf, "LOOKUP_TABLE default\n");
-      if (rank == MASTER_NODE)
-        MPI_File_write_at(fhw, disp, str_buf, strlen(str_buf),
-                          MPI_CHAR, MPI_STATUS_IGNORE);
-      disp += strlen(str_buf)*sizeof(char);
-      
-      /*--- Prepare the 1D data buffer on this rank. ---*/
-      
-      float *scalar_buf = new float[myPoint];
-      
-      /*--- For now, create a temp 1D buffer to load up the data for writing.
-       This will be replaced with a derived data type most likely. ---*/
-      
-      for (iPoint = 0; iPoint < myPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(Data[VarCounter][iPoint]);
-        scalar_buf[iPoint] = val;
-      }
-      if (!BigEndian) SwapBytes((char *)scalar_buf, sizeof(float), myPoint);
-      
-      /*--- We will write the point data as floats. ---*/
-      
-      etype = MPI_FLOAT;
-      
-      /*--- Define a derived datatype for this ranks contiguous
-       chunk of data that will be placed in the file. ---*/
-      
-      MPI_Type_contiguous(myPoint, MPI_FLOAT, &filetype);
-      MPI_Type_commit(&filetype);
-      
-      /*--- Compute the offset for this rank's linear partition of the
-       data in bytes. ---*/
-      
-      disp2 = disp + nPoint_Cum[rank]*sizeof(float);
-      
-      /*--- Set the view for the MPI file write, i.e., describe the
-       location in the file that this rank "sees" for writing its
-       piece of the file. ---*/
-      
-      MPI_File_set_view(fhw, disp2, etype, filetype,
-                        (char*)"native", MPI_INFO_NULL);
-      
-      /*--- Collective call for all ranks to write simultaneously. ---*/
-      
-      MPI_File_write_all(fhw, scalar_buf, myPoint, MPI_FLOAT, &status);
-      
-      /*--- Update the displacement position for MPI IO. ---*/
-      
-      disp += nPoint_Cum[size]*sizeof(float);
-      
-      /*--- Free the derived datatype and coordinate array. ---*/
-      
-      MPI_Type_free(&filetype);
-      delete [] scalar_buf; scalar_buf = NULL;
-      
-      VarCounter++;
-    }
-    
-  }
-  
-  /*--- All ranks close the file after writing. ---*/
-  
-  MPI_File_close(&fhw);
-  
-  /*--- Delete the offset counters that we needed for MPI IO. ---*/
-  
-  delete [] nElem_Snd;        delete [] nElem_Cum;
-  delete [] nElemStorage_Snd; delete [] nElemStorage_Cum;
-  delete [] nPoint_Snd;       delete [] nPoint_Cum;
-  
-#endif
-  
-}
diff --git a/SU2_CFD/src/output/output_su2.cpp b/SU2_CFD/src/output/output_su2.cpp
deleted file mode 100644
index d9c0dec661a6..000000000000
--- a/SU2_CFD/src/output/output_su2.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*!
- * \file output_su2.cpp
- * \brief Main subroutines for output solver information.
- * \author F. Palacios, T. Economon, M. Colonno
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/COutput.hpp"
-
-void COutput::SetSU2_MeshASCII(CConfig *config, CGeometry *geometry) {
-  
-  unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], iNode, offset, nElem;
-  unsigned short iMarker, iDim, nDim = geometry->GetnDim(), iChar, VTK_Type, nMarker_;
-  short SendTo;
-  ifstream input_file;
-  string filename, Grid_Marker, text_line, Marker_Tag, str;
-  string::size_type position;
-  int iProcessor;
-  
-  ofstream output_file;
-  char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
-  
-  filename = VolumeFilename;
-  unsigned short lastindex = filename.find_last_of(".");
-  filename = filename.substr(0, lastindex);
-  filename += string(".su2");
-  
-
-
-  /*--- Special cases where a number needs to be appended to the file name. ---*/
-
-  filename = config->GetMultizone_FileName(filename, config->GetiZone(), ".su2");
-
-  strcpy (out_file, filename.c_str());
-  strcpy (cstr, out_file); 
-  
-  if (rank == MASTER_NODE){
-    
-    
-    output_file.open(cstr, ios::out);
-    
-    if (config->GetnZone() > 1){
-      output_file << "IZONE= " << config->GetiZone()+1 << endl;
-    }
-    
-    /*--- Write dimensions data. ---*/
-    
-    output_file << "NDIME= " << nDim << endl;
-    
-    /*--- Write the angle of attack offset. ---*/
-    
-    output_file << "AOA_OFFSET= " << config->GetAoA_Offset() << endl;
-    
-    /*--- Write the angle of attack offset. ---*/
-    
-    output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
-    
-    output_file << "NELEM= " << nGlobal_Elem_Par<< endl;
-    
-    output_file.close();
-  }
-  
-  output_file.open(cstr, ios::out | ios::app);
-  output_file.precision(15);
-  nElem = 0;
-  offset = 0;
-  
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-        iNode = iElem*N_POINTS_TRIANGLE;
-        output_file << "5\t";                
-        output_file << Conn_Tria_Par[iNode+0]-1 << "\t";
-        output_file << Conn_Tria_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Tria_Par[iNode+2]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }
-      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-        iNode = iElem*N_POINTS_QUADRILATERAL;
-        output_file << "9\t";
-        output_file << Conn_Quad_Par[iNode+0]-1 << "\t"; output_file << Conn_Quad_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Quad_Par[iNode+2]-1 << "\t"; output_file << Conn_Quad_Par[iNode+3]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }
-      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-        iNode = iElem*N_POINTS_TETRAHEDRON;
-        output_file << "10\t";
-        output_file << Conn_Tetr_Par[iNode+0]-1 << "\t" << Conn_Tetr_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Tetr_Par[iNode+2]-1 << "\t" << Conn_Tetr_Par[iNode+3]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }  
-      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-        iNode = iElem*N_POINTS_HEXAHEDRON;
-        output_file << "12\t";
-        output_file << Conn_Hexa_Par[iNode+0]-1 << "\t" << Conn_Hexa_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Hexa_Par[iNode+2]-1 << "\t" << Conn_Hexa_Par[iNode+3]-1 << "\t";
-        output_file << Conn_Hexa_Par[iNode+4]-1 << "\t" << Conn_Hexa_Par[iNode+5]-1 << "\t";
-        output_file << Conn_Hexa_Par[iNode+6]-1 << "\t" << Conn_Hexa_Par[iNode+7]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }
-      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-        iNode = iElem*N_POINTS_PRISM;
-        output_file << "13\t";
-        output_file << Conn_Pris_Par[iNode+0]-1 << "\t" << Conn_Pris_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Pris_Par[iNode+2]-1 << "\t" << Conn_Pris_Par[iNode+3]-1 << "\t";
-        output_file << Conn_Pris_Par[iNode+4]-1 << "\t" << Conn_Pris_Par[iNode+5]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }
-      
-      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-        iNode = iElem*N_POINTS_PYRAMID;
-        output_file << "14\t";
-        output_file << Conn_Pyra_Par[iNode+0]-1 << "\t" << Conn_Pyra_Par[iNode+1]-1 << "\t";
-        output_file << Conn_Pyra_Par[iNode+2]-1 << "\t" << Conn_Pyra_Par[iNode+3]-1 << "\t";
-        output_file << Conn_Pyra_Par[iNode+4]-1 << "\t";
-        output_file << nElem + offset << "\n"; nElem++;
-      }
-    }
-    output_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&nElem, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);    
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-  
-  /*--- Write the node coordinates ---*/
-  if (rank == MASTER_NODE){
-    output_file << "NPOIN= " << nGlobal_Poin_Par;
-    if (geometry->GetGlobal_nPointDomain() != nGlobal_Poin_Par)
-      output_file << "\t" << geometry->GetGlobal_nPointDomain();
-    output_file << endl;
-    output_file.flush();    
-  }
-  
-  
-  unsigned long Global_Index, myPoint = 0;
-  offset = 0;
-  
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-        
-        /*--- Global Index of the current point. (note outer loop over procs) ---*/
-        
-        Global_Index = iPoint + offset;
-        
-        /*--- Only write original domain points, i.e., exclude any periodic
-         or halo nodes, even if they are output in the viz. files. ---*/
-        
-        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-          
-          /*--- Loop over the variables and write the values to file ---*/
-          
-          for (iDim = 0; iDim < nDim; iDim++) {
-            output_file << scientific << Parallel_Data[iDim][iPoint] << "\t";
-          }
-          
-          /*--- Write global index. (note outer loop over procs) ---*/
-          
-          output_file << Global_Index << "\t";
-          myPoint++;
-          
-          output_file << "\n";
-        }
-      }
-    }
-    /*--- Flush the file and wait for all processors to arrive. ---*/
-    output_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-  output_file.close();
-  
-  if (rank == MASTER_NODE){
-    
-    output_file.open(cstr, ios::out | ios::app);
-    
-    /*--- Read the boundary information ---*/
-    
-    str = "boundary.dat";
-    
-    str = config->GetMultizone_FileName(str, config->GetiZone(), ".dat");
-    
-    input_file.open(str.c_str(), ios::out);
-    
-    /*--- Read grid file with format SU2 ---*/
-    
-    while (getline (input_file, text_line)) {
-      
-      /*--- Write the physical boundaries ---*/
-      
-      position = text_line.find ("NMARK=",0);
-      if (position != string::npos) {
-        
-        text_line.erase (0,6); nMarker_ = atoi(text_line.c_str());
-        output_file << "NMARK= " << nMarker_ << endl;
-        
-        for (iMarker = 0 ; iMarker < nMarker_; iMarker++) {
-          
-          getline (input_file, text_line);
-          text_line.erase (0,11);
-          string::size_type position;
-          for (iChar = 0; iChar < 20; iChar++) {
-            position = text_line.find( " ", 0 );
-            if (position != string::npos) text_line.erase (position,1);
-            position = text_line.find( "\r", 0 );
-            if (position != string::npos) text_line.erase (position,1);
-            position = text_line.find( "\n", 0 );
-            if (position != string::npos) text_line.erase (position,1);
-          }
-          Marker_Tag = text_line.c_str();
-          
-          /*--- Standart physical boundary ---*/
-          
-          getline (input_file, text_line);
-          
-          text_line.erase (0,13); nElem_Bound_ = atoi(text_line.c_str());
-          output_file << "MARKER_TAG= " << Marker_Tag << endl;
-          output_file << "MARKER_ELEMS= " << nElem_Bound_<< endl;
-          getline (input_file, text_line);
-          
-          text_line.erase (0,8); SendTo = atoi(text_line.c_str());
-          
-          if (Marker_Tag == "SEND_RECEIVE"){
-            output_file << "SEND_TO= " << SendTo << endl;
-          }
-          for (iElem_Bound = 0; iElem_Bound < nElem_Bound_; iElem_Bound++) {
-            
-            getline(input_file, text_line);
-            istringstream bound_line(text_line);
-            
-            bound_line >> VTK_Type;
-            output_file << VTK_Type;
-            
-            switch(VTK_Type) {
-            case LINE:
-              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
-              output_file << "\t" << vnodes_edge[0] << "\t" << vnodes_edge[1] << endl;
-              break;
-            case TRIANGLE:
-              bound_line >> vnodes_triangle[0]; bound_line >> vnodes_triangle[1]; bound_line >> vnodes_triangle[2];
-              output_file << "\t" << vnodes_triangle[0] << "\t" << vnodes_triangle[1] << "\t" << vnodes_triangle[2] << endl;
-              break;
-            case QUADRILATERAL:
-              bound_line >> vnodes_quad[0]; bound_line >> vnodes_quad[1]; bound_line >> vnodes_quad[2]; bound_line >> vnodes_quad[3];
-              output_file << "\t" << vnodes_quad[0] << "\t" << vnodes_quad[1] << "\t" << vnodes_quad[2] << "\t" << vnodes_quad[3] << endl;
-              break;
-            case VERTEX:
-              bound_line >> vnodes_edge[0]; bound_line >> vnodes_edge[1];
-              output_file << "\t" << vnodes_edge[0] <<  "\t" << vnodes_edge[1] <<endl;
-              break;
-            }
-          }
-        }
-      }
-      
-    }
-    
-    input_file.close();
-    
-//    remove(str.c_str());
-    
-    output_file.close();
-  }
-
-}
-
-void COutput::SetSU2_MeshBinary(CConfig *config, CGeometry *geometry) { }
-
-void COutput::WriteCoordinates_Binary(CConfig *config, CGeometry *geometry, unsigned short val_iZone) {
-  
-  unsigned short iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint;
-  char cstr[200];
-  
-  /*--- Prepare the file name. ---*/
-  
-  strcpy(cstr, "coordinates");
-  if (config->GetnZone() > 1){
-    char appstr[200];
-    SPRINTF(appstr, "_%u", val_iZone);
-    strcat(cstr, appstr);
-  }
-  strcat(cstr,".dat");
-  
-  /*--- Prepare the first ints containing the counts. The first is a
-   the total number of points written. The second is the dimension.
-   We know the rest of the file will contain the coords (nPoints*nDim). ---*/
-  
-  int var_buf_size = 2;
-  int var_buf[2]   = {(int)nGlobal_Poin, nDim};
-  
-  /*--- Prepare the 1D data buffer on this rank. ---*/
-  
-  passivedouble *buf = new passivedouble[nGlobal_Poin*nDim];
-  
-  /*--- For now, create a temp 1D buffer to load up the data for writing.
-   This will be replaced with a derived data type most likely. ---*/
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++)
-    for (iDim = 0; iDim < nDim; iDim++)
-      buf[iPoint*nDim+iDim] = SU2_TYPE::GetValue(Coords[iDim][iPoint]);
-  
-  /*--- Write the binary file. Everything is done in serial, as only the
-   master node has the data and enters this routine. ---*/
-  
-  FILE* fhw;
-  fhw = fopen(cstr, "wb");
-  
-  /*--- Error check for opening the file. ---*/
-  
-  if (!fhw) {
-    SU2_MPI::Error(string("Unable to open binary coordinates file ") +
-                   string(cstr), CURRENT_FUNCTION);
-  }
-  
-  /*--- First, write the number of variables and points. ---*/
-  
-  fwrite(var_buf, var_buf_size, sizeof(int), fhw);
-  
-  /*--- Call to write the entire restart file data in binary in one shot. ---*/
-  
-  fwrite(buf, nGlobal_Poin*nDim, sizeof(passivedouble), fhw);
-  
-  /*--- Close the file. ---*/
-  
-  fclose(fhw);
-  
-  /*--- Release buffer memory. ---*/
-  
-  delete [] buf;
-  
-}
-
-void COutput::WriteProjectedSensitivity(CConfig *config,
-                                        CGeometry *geometry,
-                                        unsigned short val_iZone,
-                                        unsigned short val_nZone) {
-  
-  unsigned short iVar;
-  unsigned long iPoint, iElem, iNode;
-  unsigned long *LocalIndex = NULL;
-  bool *SurfacePoint = NULL;
-  string filename, fieldname;
-  
-  filename = config->GetDV_Sens_Filename();
-  
-  ofstream Sens_File;
-  Sens_File.open(filename.c_str(), ios::out);
-  Sens_File.precision(15);
-  
-  /*--- This is surface output, so print only the points
-   that are in the element list. Change the numbering. ---*/
-  
-  LocalIndex   = new unsigned long [nGlobal_Poin+1];
-  SurfacePoint = new bool [nGlobal_Poin+1];
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++)
-    SurfacePoint[iPoint] = false;
-  
-  for (iElem = 0; iElem < nGlobal_Line; iElem++) {
-    iNode = iElem*N_POINTS_LINE;
-    SurfacePoint[Conn_Line[iNode+0]] = true;
-    SurfacePoint[Conn_Line[iNode+1]] = true;
-  }
-  for (iElem = 0; iElem < nGlobal_BoundTria; iElem++) {
-    iNode = iElem*N_POINTS_TRIANGLE;
-    SurfacePoint[Conn_BoundTria[iNode+0]] = true;
-    SurfacePoint[Conn_BoundTria[iNode+1]] = true;
-    SurfacePoint[Conn_BoundTria[iNode+2]] = true;
-  }
-  for (iElem = 0; iElem < nGlobal_BoundQuad; iElem++) {
-    iNode = iElem*N_POINTS_QUADRILATERAL;
-    SurfacePoint[Conn_BoundQuad[iNode+0]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+1]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+2]] = true;
-    SurfacePoint[Conn_BoundQuad[iNode+3]] = true;
-  }
-  
-  nSurf_Poin = 0;
-  for (iPoint = 0; iPoint < nGlobal_Poin+1; iPoint++) {
-    LocalIndex[iPoint] = 0;
-    if (SurfacePoint[iPoint]) {nSurf_Poin++; LocalIndex[iPoint] = nSurf_Poin;}
-  }
-  
-  /*--- Write surface x,y,z and surface dJ/dx, dJ/dy, dJ/dz data. ---*/
-  
-  for (iPoint = 0; iPoint < nGlobal_Poin; iPoint++) {
-    
-    if (LocalIndex[iPoint+1] != 0) {
-      
-      /*--- Write the node coordinates and the sensitivities. Note that
-       we subtract 2 from the fields list to ignore the initial ID and
-       final sens.normal value in the Data array. ---*/
-      
-      for (iVar = 0; iVar < config->fields.size()-2; iVar++)
-      Sens_File << scientific << Data[iVar][iPoint] << "\t";
-      Sens_File << scientific << "\n";
-      
-    }
-  }
-  
-}
-
diff --git a/SU2_CFD/src/output/output_tecplot.cpp b/SU2_CFD/src/output/output_tecplot.cpp
deleted file mode 100644
index 3b87f863b9c8..000000000000
--- a/SU2_CFD/src/output/output_tecplot.cpp
+++ /dev/null
@@ -1,932 +0,0 @@
-/*!
- * \file output_tecplot.cpp
- * \brief Main subroutines for output solver information.
- * \author F. Palacios, T. Economon, M. Colonno
- * \version 6.2.0 "Falcon"
- *
- * The current SU2 release has been coordinated by the
- * SU2 International Developers Society <www.su2devsociety.org>
- * with selected contributions from the open-source community.
- *
- * The main research teams contributing to the current release are:
- *  - Prof. Juan J. Alonso's group at Stanford University.
- *  - Prof. Piero Colonna's group at Delft University of Technology.
- *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
- *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
- *  - Prof. Rafael Palacios' group at Imperial College London.
- *  - Prof. Vincent Terrapon's group at the University of Liege.
- *  - Prof. Edwin van der Weide's group at the University of Twente.
- *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
- *
- * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
- *                      Tim Albring, and the SU2 contributors.
- *
- * SU2 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, or (at your option) any later version.
- *
- * SU2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../../include/output/COutput.hpp"
-
-void COutput::WriteTecplotASCII_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-  
-  unsigned short iVar, nDim = geometry->GetnDim();
-  
-  unsigned long iPoint, iElem, iNode;
-  unsigned long iExtIter = config->GetExtIter();
-  
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
-    iExtIter = config->GetiInst();
-  }
-  
-  int iProcessor;
-
-  ofstream Tecplot_File;
-  
-  string filename;
-  
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".dat");
-  else filename          = config->GetFilename(VolumeFilename, ".dat");
-  
-  /*--- Open Tecplot ASCII file and write the header. ---*/
-  
-  if (rank == MASTER_NODE) {
-    Tecplot_File.open(filename.c_str(), ios::out);
-    Tecplot_File.precision(6);
-    if (surf_sol) Tecplot_File << "TITLE = \"Visualization of the surface solution\"" << endl;
-    else Tecplot_File << "TITLE = \"Visualization of the volumetric solution\"" << endl;
-    
-    Tecplot_File << "VARIABLES = ";
-    for (iVar = 0; iVar < Variable_Names.size()-1; iVar++) {
-      Tecplot_File << "\"" << Variable_Names[iVar] << "\",";
-    }
-    Tecplot_File << "\"" << Variable_Names[Variable_Names.size()-1] << "\"" << endl;
-    
-    /*--- Write the header ---*/
-    
-    Tecplot_File << "ZONE ";
-    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
-    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-      /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-      su2double period = config->GetHarmonicBalance_Period();
-      su2double deltaT = period/(su2double)(config->GetnTimeInstances());
-      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
-    }
-    if (nDim == 2) {
-      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
-      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-    } else {
-      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
-    }
-
-    Tecplot_File.close();
-    
-  }
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  
-  /*--- Each processor opens the file. ---*/
-  
-  Tecplot_File.open(filename.c_str(), ios::out | ios::app);
-  
-  /*--- Write surface and volumetric solution data. ---*/
-  
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      
-        /*--- Write the node data from this proc ---*/
-        
-        if (surf_sol) {
-            for (iPoint = 0; iPoint < nSurf_Poin_Par; iPoint++) {
-        for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-          Tecplot_File << scientific << Parallel_Surf_Data[iVar][iPoint] << "\t";
-        Tecplot_File << endl;
-            
-          }
-        } else {
-          
-           for (iPoint = 0; iPoint < nParallel_Poin; iPoint++) {
-          for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-            Tecplot_File << scientific << Parallel_Data[iVar][iPoint] << "\t";
-          Tecplot_File << endl;
-        }
-      }
-    }
-    Tecplot_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-  /*--- Write connectivity data. ---*/
-  
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
-    if (rank == iProcessor) {
-      
-      if (surf_sol) {
-        
-        for (iElem = 0; iElem < nParallel_Line; iElem++) {
-          iNode = iElem*N_POINTS_LINE;
-          Tecplot_File << Conn_BoundLine_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundLine_Par[iNode+1] << "\n";
-        }
-        
-        for (iElem = 0; iElem < nParallel_BoundTria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          Tecplot_File << Conn_BoundTria_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+1] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\t";
-          Tecplot_File << Conn_BoundTria_Par[iNode+2] << "\n";
-        }
-        
-        for (iElem = 0; iElem < nParallel_BoundQuad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          Tecplot_File << Conn_BoundQuad_Par[iNode+0] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+1] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+2] << "\t";
-          Tecplot_File << Conn_BoundQuad_Par[iNode+3] << "\n";
-        }
-        
-      } else {
-        
-      for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-        iNode = iElem*N_POINTS_TRIANGLE;
-        Tecplot_File << Conn_Tria_Par[iNode+0] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Tria_Par[iNode+2] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-        iNode = iElem*N_POINTS_QUADRILATERAL;
-        Tecplot_File << Conn_Quad_Par[iNode+0] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Quad_Par[iNode+3] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-        iNode = iElem*N_POINTS_TETRAHEDRON;
-        Tecplot_File << Conn_Tetr_Par[iNode+0] << "\t" << Conn_Tetr_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+2] << "\t" << Conn_Tetr_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Tetr_Par[iNode+3] << "\t" << Conn_Tetr_Par[iNode+3] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-        iNode = iElem*N_POINTS_HEXAHEDRON;
-        Tecplot_File << Conn_Hexa_Par[iNode+0] << "\t" << Conn_Hexa_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+2] << "\t" << Conn_Hexa_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+4] << "\t" << Conn_Hexa_Par[iNode+5] << "\t";
-        Tecplot_File << Conn_Hexa_Par[iNode+6] << "\t" << Conn_Hexa_Par[iNode+7] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-        iNode = iElem*N_POINTS_PRISM;
-        Tecplot_File << Conn_Pris_Par[iNode+0] << "\t" << Conn_Pris_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+1] << "\t" << Conn_Pris_Par[iNode+2] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+3] << "\t" << Conn_Pris_Par[iNode+4] << "\t";
-        Tecplot_File << Conn_Pris_Par[iNode+4] << "\t" << Conn_Pris_Par[iNode+5] << "\n";
-      }
-      
-      for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-        iNode = iElem*N_POINTS_PYRAMID;
-        Tecplot_File << Conn_Pyra_Par[iNode+0] << "\t" << Conn_Pyra_Par[iNode+1] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+2] << "\t" << Conn_Pyra_Par[iNode+3] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\t";
-        Tecplot_File << Conn_Pyra_Par[iNode+4] << "\t" << Conn_Pyra_Par[iNode+4] << "\n";
-      }
-      }
-      
-    }
-    Tecplot_File.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-  }
-  
-  Tecplot_File.close();
-  
-}
-
-#ifdef HAVE_MPI
-
-namespace
-{
-
-/*!
- * \brief Calculate the partitioning of nodes to determine:
- * (a) For a given global node number, to which partition does it belong and what is its local node number; and
- * (b) How many nodes are held by each partition.
- */
-class NodePartitioner {
-public:
-  /*!
-   * \param[in] global_num_nodes - The total number of nodes being output
-   * \param[in] num_ranks - The number of MPI ranks involved in the output
-   */
-  NodePartitioner(unsigned long global_num_nodes, int num_ranks)
-    : m_num_ranks(num_ranks) {
-    /* rank i has (1-based) global nodes m_node_range[i] + 1 through m_node_range[i + 1] */
-    unsigned long nodes_per_rank = global_num_nodes / num_ranks;
-    unsigned long num_extra_nodes = global_num_nodes - nodes_per_rank * num_ranks;
-    m_node_range.resize(num_ranks + 1);
-    m_node_range[0] = 0;
-    for (int ii = 1; ii <= num_ranks; ii++) {
-      m_node_range[ii] = m_node_range[ii - 1] + nodes_per_rank;
-      if (num_extra_nodes > 0) {
-        ++m_node_range[ii];
-        --num_extra_nodes;
-      }
-    }
-    assert(m_node_range[num_ranks] == global_num_nodes);
-  }
-
-  /*!
-   * \brief Determine the MPI rank that owns a global node number and its corresponding local node number.
-   * \param global_node_number[in] - The global node number; global node numbers are sequential across all MPI ranks.
-   * \param owning_rank[out] - The MPI rank that owns (will output) the global node
-   * \param node_number[out] - The rank-local node number for the given global node number
-   */
-  void GetOwningRankAndNodeNumber(unsigned long global_node_number, int &owning_rank, unsigned long &node_number)
-  {
-    owning_rank = static_cast<int>(global_node_number / m_node_range[1]);
-    if (owning_rank >= m_num_ranks)
-      owning_rank = m_num_ranks - 1;
-    while(global_node_number > m_node_range[owning_rank + 1])
-      ++owning_rank;
-    while(global_node_number <= m_node_range[owning_rank])
-      --owning_rank;
-    node_number = global_node_number - m_node_range[owning_rank];
-  }
-
-  /*!
-   * \brief Determine the number of nodes to be output by a particular rank
-   * \param which_rank[in] - The MPI rank
-   * \ret - The number of nodes that will be output by the give MPI rank.
-   */
-  int64_t GetRankNumNodes(int which_rank)
-  {
-    return static_cast<int64_t>(m_node_range[which_rank + 1] - m_node_range[which_rank]);
-  }
-
-private:
-  int m_num_ranks;
-  vector<unsigned long> m_node_range;
-};
-
-int64_t GetHaloNodeNumber(unsigned long global_node_number, unsigned long last_local_node, vector<unsigned long> const &halo_node_list)
-{
-  vector<unsigned long>::const_iterator it = lower_bound(halo_node_list.begin(), halo_node_list.end(), global_node_number);
-  assert(it != halo_node_list.end());
-  assert(*it == global_node_number);
-  /* When C++11 is universally available, replace the following mouthful with "auto" */
-  iterator_traits<vector<unsigned long>::const_iterator>::difference_type offset = distance(halo_node_list.begin(), it);
-  assert(offset >= 0);
-  return (int64_t)(last_local_node + offset + 1);
-}
-
-} /* namespace */
-
-#endif /* HAVE_MPI */
-
-void COutput::WriteTecplotBinary_Parallel(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone, bool surf_sol) {
-
-#ifdef HAVE_TECIO
-  
-  /*--- Open Tecplot binary file. ---*/
-  
-  string filename;
-  
-  if (surf_sol) filename = config->GetFilename(SurfaceFilename, ".szplt");
-  else filename          = config->GetFilename(VolumeFilename, ".szplt");
-
-  
-  string data_set_title = surf_sol
-    ? "Visualization of the surface solution"
-    : "Visualization of the volumetric solution";
-
-  ostringstream tecplot_variable_names;
-  for (size_t iVar = 0; iVar < Variable_Names.size()-1; ++iVar) {
-    tecplot_variable_names << Variable_Names[iVar] << ",";
-  }
-  tecplot_variable_names << Variable_Names[Variable_Names.size()-1];
-
-  void* file_handle = NULL;
-  int32_t err = tecFileWriterOpen(filename.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
-    FILEFORMAT_SZL, FILETYPE_FULL, (int32_t)FieldDataType_Double, NULL, &file_handle);
-  if (err) cout << "Error opening Tecplot file '" << filename << "'" << endl;
-
-#ifdef HAVE_MPI
-  err = tecMPIInitialize(file_handle, MPI_COMM_WORLD, MASTER_NODE);
-  if (err) cout << "Error initializing Tecplot parallel output." << endl;
-#endif
-  
-  /*--- Define the zone(s). For 2D, and for 3D surfaces, each rank outputs a separate zone. ---*/
-
-  int64_t num_nodes;
-  int64_t num_cells;
-  int32_t zone_type;
-  if (surf_sol) {
-    num_nodes = static_cast<int64_t>(nGlobal_Surf_Poin);
-    num_cells = static_cast<int64_t>(nSurf_Elem_Par);
-    if (geometry->GetnDim() == 2) 
-      zone_type = ZONETYPE_FELINESEG;
-    else
-      zone_type = ZONETYPE_FEQUADRILATERAL;
-  } else {
-    num_nodes = static_cast<int64_t>(nGlobal_Poin_Par);
-    num_cells = static_cast<int64_t>(nGlobal_Elem_Par);
-    if (geometry->GetnDim() == 2)
-      zone_type = ZONETYPE_FEQUADRILATERAL;
-    else
-      zone_type = ZONETYPE_FEBRICK;
-  }
-
-  bool is_unsteady = false;
-  passivedouble solution_time = 0.0;
-  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    is_unsteady = true;
-    solution_time = SU2_TYPE::GetValue(config->GetDelta_UnstTime()*config->GetExtIter());
-  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-    is_unsteady = true;
-    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-    passivedouble period = SU2_TYPE::GetValue(config->GetHarmonicBalance_Period());
-    passivedouble deltaT = period/SU2_TYPE::GetValue(config->GetnTimeInstances());
-    solution_time = deltaT*val_iZone;
-  }
-
-  int32_t zone;
-  vector<int32_t> value_locations(GlobalField_Counter, 1); /* Nodal variables. */
-  err = tecZoneCreateFE(file_handle, "Zone", zone_type, num_nodes, num_cells, NULL, NULL, &value_locations[0], NULL, 0, 0, 0, &zone);
-  if (err) cout << rank << ": Error creating Tecplot zone." << endl;
-  if (is_unsteady) {
-    err = tecZoneSetUnsteadyOptions(file_handle, zone, solution_time, config->GetExtIter() + 1);
-    if (err) cout << rank << ": Error setting Tecplot zone unsteady options." << std::endl;
-  }
-
-#ifdef HAVE_MPI
-
-  unsigned short iVar;
-  NodePartitioner node_partitioner(num_nodes, size);
-  set<unsigned long> halo_nodes;
-  vector<unsigned long> sorted_halo_nodes;
-  vector<passivedouble> halo_var_data;
-  vector<int> num_nodes_to_receive(size, 0);
-  vector<int> values_to_receive_displacements(size);
-
-  if (zone_type == ZONETYPE_FEBRICK) {
-
-    /* We output a single, partitioned zone where each rank outputs one partition. */
-    vector<int32_t> partition_owners;
-    partition_owners.reserve(size);
-    for (int32_t iRank = 0; iRank < size; ++iRank)
-      partition_owners.push_back(iRank);
-    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, size, &partition_owners[0]);
-    if (err) cout << rank << ": Error assigning MPI ranks for Tecplot zone partitions." << endl;
-  
-    /* Gather a list of nodes we refer to but are not outputting. */
-
-    for (unsigned long i = 0; i < nParallel_Tria * N_POINTS_TRIANGLE; ++i)
-      if ((unsigned long)Conn_Tria_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tria_Par[i])
-        halo_nodes.insert(Conn_Tria_Par[i]);
-  
-    for (unsigned long i = 0; i < nParallel_Quad * N_POINTS_QUADRILATERAL; ++i)
-      if ((unsigned long)Conn_Quad_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Quad_Par[i])
-        halo_nodes.insert(Conn_Quad_Par[i]);
- 
-    for (unsigned long i = 0; i < nParallel_Tetr * N_POINTS_TETRAHEDRON; ++i)
-      if ((unsigned long)Conn_Tetr_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Tetr_Par[i])
-        halo_nodes.insert(Conn_Tetr_Par[i]);
-
-    for (unsigned long i = 0; i < nParallel_Hexa * N_POINTS_HEXAHEDRON; ++i)
-      if ((unsigned long)Conn_Hexa_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Hexa_Par[i])
-        halo_nodes.insert(Conn_Hexa_Par[i]);
-      
-    for (unsigned long i = 0; i < nParallel_Pris * N_POINTS_PRISM; ++i)
-      if ((unsigned long)Conn_Pris_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pris_Par[i])
-        halo_nodes.insert(Conn_Pris_Par[i]);
-    
-    for (unsigned long i = 0; i < nParallel_Pyra * N_POINTS_PYRAMID; ++i)
-      if ((unsigned long)Conn_Pyra_Par[i] <= beg_node[rank] || end_node[rank] < (unsigned long)Conn_Pyra_Par[i])
-        halo_nodes.insert(Conn_Pyra_Par[i]);
-
-    /* Sorted list of halo nodes for this MPI rank. */
-    sorted_halo_nodes.assign(halo_nodes.begin(), halo_nodes.end());
-        
-    /* Have to include all nodes our cells refer to or TecIO will barf, so add the halo node count to the number of local nodes. */
-    int64_t partition_num_nodes = end_node[rank] - beg_node[rank] + static_cast<int64_t>(halo_nodes.size());
-    int64_t partition_num_cells = nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
-
-    /*--- We effectively tack the halo nodes onto the end of the node list for this partition.
-      TecIO will later replace them with references to nodes in neighboring partitions. */
-    size_t num_halo_nodes = sorted_halo_nodes.size();
-    vector<int64_t> halo_node_local_numbers(max((size_t)1, num_halo_nodes)); /* Min size 1 to avoid crashes when we access these vectors below. */
-    vector<int32_t> neighbor_partitions(max((size_t)1, num_halo_nodes));
-    vector<int64_t> neighbor_nodes(max((size_t)1, num_halo_nodes));
-    for(int64_t i = 0; i < static_cast<int64_t>(num_halo_nodes); ++i) {
-      halo_node_local_numbers[i] = end_node[rank] - beg_node[rank] + i + 1;
-      int owning_rank;
-      unsigned long node_number;
-      node_partitioner.GetOwningRankAndNodeNumber(sorted_halo_nodes[i], owning_rank, node_number);
-      neighbor_partitions[i] = owning_rank + 1; /* Partition numbers are 1-based. */
-      neighbor_nodes[i] = static_cast<int64_t>(node_number);
-    }
-    err = tecFEPartitionCreate64(file_handle, zone, rank + 1, partition_num_nodes, partition_num_cells,
-      static_cast<int64_t>(num_halo_nodes), &halo_node_local_numbers[0], &neighbor_partitions[0], &neighbor_nodes[0], 0, NULL);
-    if (err) cout << rank << ": Error creating Tecplot zone partition." << endl;
-
-    /* Gather halo node data. First, tell each rank how many nodes' worth of data we need from them. */
-    for (size_t i = 0; i < num_halo_nodes; ++i)
-      ++num_nodes_to_receive[neighbor_partitions[i] - 1];
-    vector<int> num_nodes_to_send(size);
-    SU2_MPI::Alltoall(&num_nodes_to_receive[0], 1, MPI_INT, &num_nodes_to_send[0], 1, MPI_INT, MPI_COMM_WORLD);
-
-    /* Now send the global node numbers whose data we need,
-       and receive the same from all other ranks.
-       Each rank has globally consecutive node numbers,
-       so we can just parcel out sorted_halo_nodes for send. */
-    vector<int> nodes_to_send_displacements(size);
-    vector<int> nodes_to_receive_displacements(size);
-    nodes_to_send_displacements[0] = 0;
-    nodes_to_receive_displacements[0] = 0;
-    for(int iRank = 1; iRank < size; ++iRank) {
-      nodes_to_send_displacements[iRank] = nodes_to_send_displacements[iRank - 1] + num_nodes_to_send[iRank - 1];
-      nodes_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank - 1] + num_nodes_to_receive[iRank - 1];
-    }
-    int total_num_nodes_to_send = nodes_to_send_displacements[size - 1] + num_nodes_to_send[size - 1];
-    vector<unsigned long> nodes_to_send(max(1, total_num_nodes_to_send));
-
-    /* The terminology gets a bit confusing here. We're sending the node numbers
-       (sorted_halo_nodes) whose data we need to receive, and receiving
-       lists of nodes whose data we need to send. */
-    if (sorted_halo_nodes.empty()) sorted_halo_nodes.resize(1); /* Avoid crash. */
-    SU2_MPI::Alltoallv(&sorted_halo_nodes[0], &num_nodes_to_receive[0], &nodes_to_receive_displacements[0], MPI_UNSIGNED_LONG,
-                       &nodes_to_send[0],     &num_nodes_to_send[0],    &nodes_to_send_displacements[0],    MPI_UNSIGNED_LONG,
-                       MPI_COMM_WORLD);
-    
-    /* Now actually send and receive the data */
-    vector<passivedouble> data_to_send(max(1, total_num_nodes_to_send * GlobalField_Counter));
-    halo_var_data.resize(max((size_t)1, GlobalField_Counter * num_halo_nodes));
-    vector<int> num_values_to_send(size);
-    vector<int> values_to_send_displacements(size);
-    vector<int> num_values_to_receive(size);
-    size_t index = 0;
-    for(int iRank = 0; iRank < size; ++iRank) {
-      /* We send and receive GlobalField_Counter values per node. */
-      num_values_to_send[iRank]              = num_nodes_to_send[iRank] * GlobalField_Counter;
-      values_to_send_displacements[iRank]    = nodes_to_send_displacements[iRank] * GlobalField_Counter;
-      num_values_to_receive[iRank]           = num_nodes_to_receive[iRank] * GlobalField_Counter;
-      values_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank] * GlobalField_Counter;
-      for(iVar = 0; iVar < GlobalField_Counter; ++iVar)
-        for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
-          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - beg_node[rank] - 1;
-          data_to_send[index++] = SU2_TYPE::GetValue(Parallel_Data[iVar][node_offset]);
-        }
-    }
-    SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
-                       &halo_var_data[0], &num_values_to_receive[0], &values_to_receive_displacements[0], MPI_DOUBLE,
-                       MPI_COMM_WORLD);
-  }
-  else {
-    /* Zone will be gathered to and output by MASTER_NODE */
-    int32_t partition_owner = MASTER_NODE;
-    err = tecZoneMapPartitionsToMPIRanks(file_handle, zone, 1, &partition_owner);
-  }
-
-  /*--- Write surface and volumetric solution data. ---*/
-  
-  if (zone_type == ZONETYPE_FEBRICK) {
-    std::vector<passivedouble> values_to_write(nParallel_Poin);
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nParallel_Poin; ++i)
-        values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, nParallel_Poin, &values_to_write[0]);
-      if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
-      for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
-        if (num_nodes_to_receive[iRank] > 0) {
-          int var_data_offset = values_to_receive_displacements[iRank] + num_nodes_to_receive[iRank] * iVar;
-          err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, static_cast<int64_t>(num_nodes_to_receive[iRank]), &halo_var_data[var_data_offset]);
-          if (err) cout << rank << ": Error outputting Tecplot halo values." << endl;
-        }
-      }
-    }
-  } else {
-    if (rank == MASTER_NODE) {
-      vector<passivedouble> var_data;
-      vector<unsigned long> num_surface_points(size);
-      if (surf_sol)
-        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, &num_surface_points[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      for(int iRank = 0; iRank < size; ++iRank) {
-        int64_t rank_num_points;
-        if (surf_sol)
-          rank_num_points = num_surface_points[iRank];
-        else
-          rank_num_points = node_partitioner.GetRankNumNodes(iRank);
-        if (rank_num_points > 0) {
-          if (iRank == rank) { /* Output local data. */
-            std::vector<passivedouble> values_to_write;
-            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-              if (surf_sol) {
-                values_to_write.resize(nSurf_Poin_Par);
-                for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]);
-                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &values_to_write[0]);
-              }
-              else {
-                values_to_write.resize(rank_num_points);
-                for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
-                  values_to_write[i] = SU2_TYPE::GetValue(Parallel_Data[iVar][i]);
-                err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]);
-              }
-              if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
-            }
-          }
-          else { /* Receive data from other rank. */
-            var_data.resize(max((int64_t)1, GlobalField_Counter * rank_num_points));
-            SU2_MPI::Recv(&var_data[0], GlobalField_Counter * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
-            for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-              err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &var_data[iVar * rank_num_points]);
-              if (err) cout << rank << ": Error outputting Tecplot surface variable values." << endl;
-            }
-          }
-        }
-      }
-    }
-    else { /* Send data to MASTER_NODE */
-      if (surf_sol)
-        SU2_MPI::Gather(&nSurf_Poin_Par, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<passivedouble> var_data;
-      size_t var_data_size = GlobalField_Counter * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
-      var_data.reserve(var_data_size);
-      for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++)
-        if (surf_sol)
-          for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-            var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
-        else
-          for(unsigned long i = 0; i < nParallel_Poin; ++i)
-            var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
-      if (var_data.size() > 0)
-        SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
-    }
-  }
-
-#else
-
-  unsigned short iVar;
-
-  vector<passivedouble> var_data;
-  size_t var_data_size = nVar_Par * (surf_sol ? nSurf_Poin_Par : nParallel_Poin);
-  var_data.reserve(var_data_size);
-  
-  if (surf_sol) {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nSurf_Poin_Par; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Surf_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nSurf_Poin_Par, &var_data[iVar * nSurf_Poin_Par]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
-  } else {
-    for (iVar = 0; err == 0 && iVar < GlobalField_Counter; iVar++) {
-      for(unsigned long i = 0; i < nParallel_Poin; ++i)
-        var_data.push_back(SU2_TYPE::GetValue(Parallel_Data[iVar][i]));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, nParallel_Poin, &var_data[iVar * nParallel_Poin]);
-      if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
-    }
-  }
-
-#endif /* HAVE_MPI */
-  
-  /*--- Write connectivity data. ---*/
-
-  unsigned long iElem, iNode;
-  
-#ifdef HAVE_MPI
-  if (zone_type == ZONETYPE_FEBRICK) {
-
-    int64_t nodes[8];
-
-    /**
-     *  Each rank writes node numbers relative to the partition it is outputting (starting with node number 1).
-     *  Ghost (halo) nodes identified above are numbered sequentially just beyond the end of the actual, local nodes.
-     *  Note that beg_node and end_node refer to zero-based node numbering, but Conn_* contain one-based node numbers.
-     */
-#define MAKE_LOCAL(n) beg_node[rank] < (unsigned long)n && (unsigned long)n <= end_node[rank] \
-  ? (int64_t)((unsigned long)n - beg_node[rank]) \
-  : GetHaloNodeNumber(n, end_node[rank] - beg_node[rank], sorted_halo_nodes)
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      nodes[0] = MAKE_LOCAL(Conn_Tetr_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Tetr_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Tetr_Par[iNode+2]);
-      nodes[3] = nodes[2];
-      nodes[4] = MAKE_LOCAL(Conn_Tetr_Par[iNode+3]);
-      nodes[5] = nodes[4];
-      nodes[6] = nodes[4];
-      nodes[7] = nodes[4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      nodes[0] = MAKE_LOCAL(Conn_Hexa_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Hexa_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Hexa_Par[iNode+2]);
-      nodes[3] = MAKE_LOCAL(Conn_Hexa_Par[iNode+3]);
-      nodes[4] = MAKE_LOCAL(Conn_Hexa_Par[iNode+4]);
-      nodes[5] = MAKE_LOCAL(Conn_Hexa_Par[iNode+5]);
-      nodes[6] = MAKE_LOCAL(Conn_Hexa_Par[iNode+6]);
-      nodes[7] = MAKE_LOCAL(Conn_Hexa_Par[iNode+7]);
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      nodes[0] = MAKE_LOCAL(Conn_Pris_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Pris_Par[iNode+1]);
-      nodes[2] = nodes[1];
-      nodes[3] = MAKE_LOCAL(Conn_Pris_Par[iNode+2]);
-      nodes[4] = MAKE_LOCAL(Conn_Pris_Par[iNode+3]);
-      nodes[5] = MAKE_LOCAL(Conn_Pris_Par[iNode+4]);
-      nodes[6] = nodes[5];
-      nodes[7] = MAKE_LOCAL(Conn_Pris_Par[iNode+5]);
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-    
-    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      nodes[0] = MAKE_LOCAL(Conn_Pyra_Par[iNode+0]);
-      nodes[1] = MAKE_LOCAL(Conn_Pyra_Par[iNode+1]);
-      nodes[2] = MAKE_LOCAL(Conn_Pyra_Par[iNode+2]);
-      nodes[3] = MAKE_LOCAL(Conn_Pyra_Par[iNode+3]);
-      nodes[4] = MAKE_LOCAL(Conn_Pyra_Par[iNode+4]);
-      nodes[5] = nodes[4];
-      nodes[6] = nodes[4];
-      nodes[7] = nodes[4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-  } else {
-    if (rank == MASTER_NODE) {
-
-      /* Non-hexahedral output by the master node. Output local data directly, and gather other data from the other ranks. */
-
-      int64_t nodes[4];
-
-      vector<unsigned long> connectivity_sizes(size);
-      unsigned long unused = 0;
-      SU2_MPI::Gather(&unused, 1, MPI_UNSIGNED_LONG, &connectivity_sizes[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<int64_t> connectivity;
-      for(int iRank = 0; iRank < size; ++iRank) {
-        if (iRank == rank) {
-          if (surf_sol) {
-            for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-              iNode = iElem*N_POINTS_LINE;
-              nodes[0] = Conn_BoundLine_Par[iNode+0];
-              nodes[1] = Conn_BoundLine_Par[iNode+1];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 2, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          
-            for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-              iNode = iElem*N_POINTS_TRIANGLE;
-              nodes[0] = Conn_BoundTria_Par[iNode+0];
-              nodes[1] = Conn_BoundTria_Par[iNode+1];
-              nodes[2] = Conn_BoundTria_Par[iNode+2];
-              nodes[3] = Conn_BoundTria_Par[iNode+2];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          
-            for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-              iNode = iElem*N_POINTS_QUADRILATERAL;
-              nodes[0] = Conn_BoundQuad_Par[iNode+0];
-              nodes[1] = Conn_BoundQuad_Par[iNode+1];
-              nodes[2] = Conn_BoundQuad_Par[iNode+2];
-              nodes[3] = Conn_BoundQuad_Par[iNode+3];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          } else {
-            for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-              iNode = iElem*N_POINTS_TRIANGLE;
-              nodes[0] = Conn_Tria_Par[iNode+0];
-              nodes[1] = Conn_Tria_Par[iNode+1];
-              nodes[2] = Conn_Tria_Par[iNode+2];
-              nodes[3] = Conn_Tria_Par[iNode+2];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-        
-            for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-              iNode = iElem*N_POINTS_QUADRILATERAL;
-              nodes[0] = Conn_Quad_Par[iNode+0];
-              nodes[1] = Conn_Quad_Par[iNode+1];
-              nodes[2] = Conn_Quad_Par[iNode+2];
-              nodes[3] = Conn_Quad_Par[iNode+3];
-              err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
-              if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-            }
-          }
-        } else { /* Receive node map and write out. */
-          connectivity.resize(max((unsigned long)1, connectivity_sizes[iRank]));
-          SU2_MPI::Recv(&connectivity[0], connectivity_sizes[iRank], MPI_UNSIGNED_LONG, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
-          err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, connectivity_sizes[iRank], &connectivity[0]);
-          if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-        }
-      }
-    } else {
-
-      /* Non-hexahedral output by non-master node. Send what we've got to the master node. */
-
-      unsigned long connectivity_size;
-      if (surf_sol)
-        connectivity_size = 2 * nParallel_Line + 4 * nParallel_BoundTria + 4 * nParallel_BoundQuad;
-      else
-        connectivity_size = 4 * (nParallel_Tria + nParallel_Quad);
-      SU2_MPI::Gather(&connectivity_size, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
-      vector<int64_t> connectivity;
-      connectivity.reserve(connectivity_size);
-      if (surf_sol) {
-        for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-          iNode = iElem*N_POINTS_LINE;
-          connectivity.push_back(Conn_BoundLine_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundLine_Par[iNode+1]);
-        }
-      
-        for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          connectivity.push_back(Conn_BoundTria_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+1]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
-          connectivity.push_back(Conn_BoundTria_Par[iNode+2]);
-        }
-      
-        for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+0]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+1]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+2]);
-          connectivity.push_back(Conn_BoundQuad_Par[iNode+3]);
-        }
-      } else {
-        for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-          iNode = iElem*N_POINTS_TRIANGLE;
-          connectivity.push_back(Conn_Tria_Par[iNode+0]);
-          connectivity.push_back(Conn_Tria_Par[iNode+1]);
-          connectivity.push_back(Conn_Tria_Par[iNode+2]);
-          connectivity.push_back(Conn_Tria_Par[iNode+2]);
-        }
-    
-        for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-          iNode = iElem*N_POINTS_QUADRILATERAL;
-          connectivity.push_back(Conn_Quad_Par[iNode+0]);
-          connectivity.push_back(Conn_Quad_Par[iNode+1]);
-          connectivity.push_back(Conn_Quad_Par[iNode+2]);
-          connectivity.push_back(Conn_Quad_Par[iNode+3]);
-        }
-      }
-      if (connectivity.empty()) connectivity.resize(1); /* Avoid crash */
-      SU2_MPI::Send(&connectivity[0], connectivity_size, MPI_UNSIGNED_LONG, MASTER_NODE, rank, MPI_COMM_WORLD);
-    }
-  }
-#else
-  if (surf_sol) {
-
-    int64_t nodes[4];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-      iNode = iElem*N_POINTS_LINE;
-      nodes[0] = Conn_BoundLine_Par[iNode+0];
-      nodes[1] = Conn_BoundLine_Par[iNode+1];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 2, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundTria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_BoundTria_Par[iNode+0];
-      nodes[1] = Conn_BoundTria_Par[iNode+1];
-      nodes[2] = Conn_BoundTria_Par[iNode+2];
-      nodes[3] = Conn_BoundTria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-        
-    for (iElem = 0; err == 0 && iElem < nParallel_BoundQuad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_BoundQuad_Par[iNode+0];
-      nodes[1] = Conn_BoundQuad_Par[iNode+1];
-      nodes[2] = Conn_BoundQuad_Par[iNode+2];
-      nodes[3] = Conn_BoundQuad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-  } else {
-
-    int64_t nodes[8];
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-      iNode = iElem*N_POINTS_TRIANGLE;
-      nodes[0] = Conn_Tria_Par[iNode+0];
-      nodes[1] = Conn_Tria_Par[iNode+1];
-      nodes[2] = Conn_Tria_Par[iNode+2];
-      nodes[3] = Conn_Tria_Par[iNode+2];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-      iNode = iElem*N_POINTS_QUADRILATERAL;
-      nodes[0] = Conn_Quad_Par[iNode+0];
-      nodes[1] = Conn_Quad_Par[iNode+1];
-      nodes[2] = Conn_Quad_Par[iNode+2];
-      nodes[3] = Conn_Quad_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      iNode = iElem*N_POINTS_TETRAHEDRON;
-      nodes[0] = Conn_Tetr_Par[iNode+0];
-      nodes[1] = Conn_Tetr_Par[iNode+1];
-      nodes[2] = Conn_Tetr_Par[iNode+2];
-      nodes[3] = Conn_Tetr_Par[iNode+2];
-      nodes[4] = Conn_Tetr_Par[iNode+3];
-      nodes[5] = Conn_Tetr_Par[iNode+3];
-      nodes[6] = Conn_Tetr_Par[iNode+3];
-      nodes[7] = Conn_Tetr_Par[iNode+3];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-
-    for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      iNode = iElem*N_POINTS_HEXAHEDRON;
-      nodes[0] = Conn_Hexa_Par[iNode+0];
-      nodes[1] = Conn_Hexa_Par[iNode+1];
-      nodes[2] = Conn_Hexa_Par[iNode+2];
-      nodes[3] = Conn_Hexa_Par[iNode+3];
-      nodes[4] = Conn_Hexa_Par[iNode+4];
-      nodes[5] = Conn_Hexa_Par[iNode+5];
-      nodes[6] = Conn_Hexa_Par[iNode+6];
-      nodes[7] = Conn_Hexa_Par[iNode+7];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-    for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      iNode = iElem*N_POINTS_PRISM;
-      nodes[0] = Conn_Pris_Par[iNode+0];
-      nodes[1] = Conn_Pris_Par[iNode+1];
-      nodes[2] = Conn_Pris_Par[iNode+1];
-      nodes[3] = Conn_Pris_Par[iNode+2];
-      nodes[4] = Conn_Pris_Par[iNode+3];
-      nodes[5] = Conn_Pris_Par[iNode+4];
-      nodes[6] = Conn_Pris_Par[iNode+4];
-      nodes[7] = Conn_Pris_Par[iNode+5];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-    
-    for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      iNode = iElem*N_POINTS_PYRAMID;
-      nodes[0] = Conn_Pyra_Par[iNode+0];
-      nodes[1] = Conn_Pyra_Par[iNode+1];
-      nodes[2] = Conn_Pyra_Par[iNode+2];
-      nodes[3] = Conn_Pyra_Par[iNode+3];
-      nodes[4] = Conn_Pyra_Par[iNode+4];
-      nodes[5] = Conn_Pyra_Par[iNode+4];
-      nodes[6] = Conn_Pyra_Par[iNode+4];
-      nodes[7] = Conn_Pyra_Par[iNode+4];
-      err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
-      if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
-    }
-      
-  }
-
-#endif
-  
-  err = tecFileWriterClose(&file_handle);
-  if (err) cout << rank << ": Error finishing Tecplot file output." << endl;
-  
-#endif /* HAVE_TECIO */
-
-}

From b197aae95284969c60ccc727eace7c7da5202353 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 17 Jul 2019 12:14:51 +0200
Subject: [PATCH 351/539] Added total flow coeff values

---
 SU2_CFD/src/output/CFlowCompOutput.cpp        |   8 ++
 SU2_CFD/src/output/CFlowOutput.cpp            | 117 ++++++++++++++----
 .../output/filewriter/CSU2MeshFileWriter.cpp  |   8 +-
 .../inv_wedge_ROE_multiobj.cfg                |   2 +-
 .../inv_wedge_ROE_multiobj_1surf.cfg          |   2 +-
 .../inv_wedge_ROE_multiobj_combo.cfg          |   2 +-
 6 files changed, 113 insertions(+), 26 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 7138379f460e..7c624ace7c3b 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -269,6 +269,10 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   /*--- Add Cp diff fields ---*/
   
   Add_CpInverseDesignOutput(config);
+  
+  /*--- Add combo obj value --- */
+  
+  AddHistoryOutput("COMBO", "ComboObj", FORMAT_SCIENTIFIC, "COMBO", TYPE_COEFFICIENT);
 }
 
 void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
@@ -617,6 +621,10 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   
   Set_CpInverseDesign(flow_solver, geometry, config);
   
+  /*--- Set combo obj value --- */
+  
+  SetHistoryOutputValue("COMBO", flow_solver->GetTotal_ComboObj());
+  
 }
 
 su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 4e1d68ae5b79..e1e763ca8908 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -47,6 +47,38 @@ CFlowOutput::~CFlowOutput(void){}
 
 void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   
+  
+  /// DESCRIPTION: Average mass flow    
+  AddHistoryOutput("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Mach number      
+  AddHistoryOutput("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Temperature        
+  AddHistoryOutput("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Pressure  
+  AddHistoryOutput("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Density  
+  AddHistoryOutput("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average Enthalpy  
+  AddHistoryOutput("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average velocity in normal direction of the surface
+  AddHistoryOutput("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Flow uniformity 
+  AddHistoryOutput("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary strength
+  AddHistoryOutput("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Momentum distortion  
+  AddHistoryOutput("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Secondary over uniformity 
+  AddHistoryOutput("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total temperature  
+  AddHistoryOutput("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Average total pressure   
+  AddHistoryOutput("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Pressure drop    
+  AddHistoryOutput("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  /// END_GROUP
+  
+  
   /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Surface values on non-solid markers.
   vector<string> Marker_Analyze;
   for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config->GetnMarker_Analyze(); iMarker_Analyze++){
@@ -54,33 +86,33 @@ void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   }  
   
   /// DESCRIPTION: Average mass flow    
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Mach number      
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Temperature        
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Pressure  
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Density  
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Secondary strength
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average total temperature  
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Average total pressure   
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// DESCRIPTION: Pressure drop    
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "SURFACE_OUTPUT", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
   /// END_GROUP
   
 }
@@ -123,6 +155,21 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
   su2double  *Surface_Area              = new su2double[nMarker];
   su2double  *Surface_MassFlow_Abs      = new su2double[nMarker];
   
+  su2double  Tot_Surface_MassFlow          = 0.0;
+  su2double  Tot_Surface_Mach              = 0.0;
+  su2double  Tot_Surface_Temperature       = 0.0;
+  su2double  Tot_Surface_Density           = 0.0;
+  su2double  Tot_Surface_Enthalpy          = 0.0;
+  su2double  Tot_Surface_NormalVelocity    = 0.0;
+  su2double  Tot_Surface_StreamVelocity2   = 0.0;
+  su2double  Tot_Surface_TransvVelocity2   = 0.0;
+  su2double  Tot_Surface_Pressure          = 0.0;
+  su2double  Tot_Surface_TotalTemperature  = 0.0;
+  su2double  Tot_Surface_TotalPressure     = 0.0;
+  su2double  Tot_Momentum_Distortion       = 0.0;
+  su2double  Tot_SecondOverUniformity      = 0.0;
+  su2double  Tot_Surface_PressureDrop      = 0.0;
+  
   /*--- Compute the numerical fan face Mach number, and the total area of the inflow ---*/
   
   for (iMarker = 0; iMarker < nMarker; iMarker++) {
@@ -421,42 +468,55 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
     su2double MassFlow = Surface_MassFlow_Total[iMarker_Analyze] * config->GetDensity_Ref() * config->GetVelocity_Ref();
     if (config->GetSystemMeasurements() == US) MassFlow *= 32.174;
     SetHistoryOutputPerSurfaceValue("AVG_MASSFLOW", MassFlow, iMarker_Analyze);
+    Tot_Surface_MassFlow += MassFlow;
     
     su2double Mach = Surface_Mach_Total[iMarker_Analyze];
     SetHistoryOutputPerSurfaceValue("AVG_MACH", Mach, iMarker_Analyze);
+    Tot_Surface_Mach += Mach;
     
     su2double Temperature = Surface_Temperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_TEMP", Temperature, iMarker_Analyze);
+    Tot_Surface_Temperature += Temperature;
     
     su2double Pressure = Surface_Pressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_PRESS", Pressure, iMarker_Analyze);
-
+    Tot_Surface_Pressure += Pressure;
+    
     su2double Density = Surface_Density_Total[iMarker_Analyze] * config->GetDensity_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_DENSITY", Density, iMarker_Analyze);
+    Tot_Surface_Density += Density;
     
     su2double Enthalpy = Surface_Enthalpy_Total[iMarker_Analyze];
     SetHistoryOutputPerSurfaceValue("AVG_ENTHALPY", Enthalpy, iMarker_Analyze);
+    Tot_Surface_Enthalpy += Enthalpy;
     
     su2double NormalVelocity = Surface_NormalVelocity_Total[iMarker_Analyze] * config->GetVelocity_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_NORMALVEL", NormalVelocity, iMarker_Analyze);
-
+    Tot_Surface_NormalVelocity += NormalVelocity;
+    
     su2double Uniformity = sqrt(Surface_StreamVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
     SetHistoryOutputPerSurfaceValue("UNIFORMITY", Uniformity, iMarker_Analyze);
-
+    Tot_Surface_StreamVelocity2 += Uniformity;
+    
     su2double SecondaryStrength = sqrt(Surface_TransvVelocity2_Total[iMarker_Analyze]) * config->GetVelocity_Ref();
     SetHistoryOutputPerSurfaceValue("SECONDARY_STRENGTH", SecondaryStrength, iMarker_Analyze);
-
+    Tot_Surface_TransvVelocity2 += SecondaryStrength;
+    
     su2double MomentumDistortion = Surface_MomentumDistortion_Total[iMarker_Analyze];
     SetHistoryOutputPerSurfaceValue("MOMENTUM_DISTORTION", MomentumDistortion, iMarker_Analyze);
-
+    Tot_Momentum_Distortion += MomentumDistortion;
+    
     su2double SecondOverUniform = SecondaryStrength/Uniformity;
     SetHistoryOutputPerSurfaceValue("SECONDARY_OVER_UNIFORMITY", SecondOverUniform, iMarker_Analyze);
-
+    Tot_SecondOverUniformity += SecondOverUniform;
+    
     su2double TotalTemperature = Surface_TotalTemperature_Total[iMarker_Analyze] * config->GetTemperature_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_TOTALTEMP", TotalTemperature, iMarker_Analyze);
+    Tot_Surface_TotalTemperature += TotalTemperature;
     
     su2double TotalPressure = Surface_TotalPressure_Total[iMarker_Analyze] * config->GetPressure_Ref();
     SetHistoryOutputPerSurfaceValue("AVG_TOTALPRESS", TotalPressure, iMarker_Analyze);
+    Tot_Surface_TotalPressure += TotalPressure;
     
   }
 
@@ -474,8 +534,23 @@ void CFlowOutput::SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfi
       config->SetSurface_PressureDrop(iMarker_Analyze, Pressure_Drop);
     } 
     SetHistoryOutputPerSurfaceValue("PRESSURE_DROP",  Pressure_Drop, iMarker_Analyze);
-    
+    Tot_Surface_PressureDrop += Pressure_Drop;
   }
+  
+  SetHistoryOutputValue("AVG_MASSFLOW", Tot_Surface_MassFlow);
+  SetHistoryOutputValue("AVG_MACH", Tot_Surface_Mach);
+  SetHistoryOutputValue("AVG_TEMP", Tot_Surface_Temperature);  
+  SetHistoryOutputValue("AVG_PRESS", Tot_Surface_Pressure);
+  SetHistoryOutputValue("AVG_DENSITY", Tot_Surface_Density);
+  SetHistoryOutputValue("AVG_ENTHALPY", Tot_Surface_Enthalpy);
+  SetHistoryOutputValue("AVG_NORMALVEL", Tot_Surface_Enthalpy);
+  SetHistoryOutputValue("UNIFORMITY", Tot_Surface_StreamVelocity2);
+  SetHistoryOutputValue("SECONDARY_STRENGTH", Tot_Surface_TransvVelocity2);
+  SetHistoryOutputValue("MOMENTUM_DISTORTION", Tot_Momentum_Distortion);
+  SetHistoryOutputValue("SECONDARY_OVER_UNIFORMITY", Tot_SecondOverUniformity);
+  SetHistoryOutputValue("AVG_TOTALTEMP", Tot_Surface_TotalTemperature);
+  SetHistoryOutputValue("AVG_TOTALPRESS", Tot_Surface_TotalPressure);
+  SetHistoryOutputValue("PRESSURE_DROP",  Tot_Surface_PressureDrop);
 
   if ((rank == MASTER_NODE) && !config->GetDiscrete_Adjoint() && output) {
     
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 96a69158fb78..a49d319c16a9 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -192,7 +192,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
     
     /*--- Read the boundary information ---*/
     
-    if (nZone > 1){
+    if (nZone == 1){
       str = "boundary";
     } else {
       str = "boundary_" + PrintingToolbox::to_string(iZone);
@@ -201,6 +201,10 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
     str += ".dat";
     
     input_file.open(str.c_str(), ios::out);
+        
+    if (!input_file.is_open()){
+      SU2_MPI::Error(string("Cannot find ") + str, CURRENT_FUNCTION);
+    }
     
     /*--- Read grid file with format SU2 ---*/
     
@@ -213,7 +217,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
         
         text_line.erase (0,6); nMarker_ = atoi(text_line.c_str());
         output_file << "NMARK= " << nMarker_ << endl;
-        
+                
         for (iMarker = 0 ; iMarker < nMarker_; iMarker++) {
           
           getline (input_file, text_line);
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index b4dae58c34f6..2fc0b00cffee 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -409,4 +409,4 @@ OPT_BOUND_LOWER= -0.1
 %
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
-HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, FLOW_COEFF, COMBO)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 94b6dc3940bb..2b42ed51fb01 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -410,4 +410,4 @@ OPT_BOUND_LOWER= -0.1
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
 
-HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, FLOW_COEFF, COMBO)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index cfa729b8d3cc..e692c04a69f1 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -412,4 +412,4 @@ OPT_BOUND_LOWER= -0.1
 % Optimization design variables, separated by semicolons
 DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
 
-HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, SURFACE_OUTPUT)
+HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, FLOW_COEFF, COMBO)

From 4a06430d0c5a576a3c60f1dd5dca7ff47feccc97 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:17:35 +0200
Subject: [PATCH 352/539] Added linear algebra files

---
 Common/src/meson.build | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Common/src/meson.build b/Common/src/meson.build
index 0fb116a681c7..d7afc84b5b45 100644
--- a/Common/src/meson.build
+++ b/Common/src/meson.build
@@ -1,10 +1,8 @@
 common_include = include_directories('./')
 common_src =files(['geometry_structure_fem_part.cpp',
            'primal_grid_structure.cpp',
-           'linear_solvers_structure.cpp',
            'graph_coloring_structure.cpp',
            'fem_geometry_structure.cpp',
-           'linear_solvers_structure_b.cpp',
            'fem_integration_rules.cpp',
            'config_structure.cpp',
            'dual_grid_structure.cpp',
@@ -18,16 +16,15 @@ common_src =files(['geometry_structure_fem_part.cpp',
            'fem_wall_distance.cpp',
            'grid_adaptation_structure.cpp',
            'element_linear.cpp',
-           'vector_structure.cpp',
            'fem_gauss_jacobi_quadrature.cpp',
            'gauss_structure.cpp',
            'wall_model.cpp',
            'adt_structure.cpp',
            'interpolation_structure.cpp',
            'mpi_structure.cpp',
-           'fem_cgns_elements.cpp',
-           'matrix_structure.cpp'])
+           'fem_cgns_elements.cpp'])
 
+subdir('linear_algebra')
 subdir('toolboxes')
 
 common     = static_library('SU2Common', 

From bf105c87686f4336c1417cdb8f8ad41e2e3f99f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:22:01 +0200
Subject: [PATCH 353/539] Enabled travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ad76c959f923..9e1363e85fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ notifications:
   
 branches:
     only:
-        - develop
+        - meson_build
 
 python:
     - 3.6

From 46fb11d88ae9bf814be0e3c5fa0aeb7abcdaef63 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:30:26 +0200
Subject: [PATCH 354/539] small change to travis

---
 .travis.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e1363e85fcc..8b7a11fb7569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,19 +26,19 @@ env:
         CXXFLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="meson build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -68,14 +68,12 @@ install:
     - cd externals/ninja
     - python configure.py --bootstrap
     - cd $TRAVIS_BUILD_DIR
-    - export PATH=$TRAVIS_BUILD_DIR/externals/ninja:$PATH
+    - export PATH=$TRAVIS_BUILD_DIR/externals/ninja:$TRAVIS_BUILD_DIR/externals/meson:$PATH
 
     # Compile and install SU2
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
-    - touch Common/src/config_structure.cpp
-    - echo $PATH
     - ninja -v -C build install
 
     # Add environmental variables according to the configure step

From d2ac9b74e450bfd988a54cb1e06c265d0b198169 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:34:15 +0200
Subject: [PATCH 355/539] Adding missing file meson file

---
 Common/src/linear_algebra/meson.build | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Common/src/linear_algebra/meson.build

diff --git a/Common/src/linear_algebra/meson.build b/Common/src/linear_algebra/meson.build
new file mode 100644
index 000000000000..6fb9ccc539e8
--- /dev/null
+++ b/Common/src/linear_algebra/meson.build
@@ -0,0 +1,4 @@
+common_src += files(['CSysSolve_b.cpp',
+                     'CSysSolve.cpp',
+                     'CSysVector.cpp',
+                     'CSysMatrix.cpp'])

From 2d6a0e4ce5d9df8d7360134d4ee0bdb6451ba55a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:38:59 +0200
Subject: [PATCH 356/539] Adding missing file meson file

---
 Common/src/toolboxes/MMS/meson.build | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 Common/src/toolboxes/MMS/meson.build

diff --git a/Common/src/toolboxes/MMS/meson.build b/Common/src/toolboxes/MMS/meson.build
new file mode 100644
index 000000000000..812fe92b9fd6
--- /dev/null
+++ b/Common/src/toolboxes/MMS/meson.build
@@ -0,0 +1,13 @@
+common_src += files(['CInviscidVortexSolution.cpp',
+           'CIncTGVSolution.cpp',
+           'CMMSIncNSSolution.cpp',
+           'CMMSIncEulerSolution.cpp',
+           'CRinglebSolution.cpp',
+           'CMMSNSTwoHalfSpheresSolution.cpp',
+           'CNSUnitQuadSolution.cpp',
+           'CMMSNSUnitQuadSolution.cpp',
+           'CMMSNSTwoHalfCirclesSolution.cpp',
+           'CTGVSolution.cpp',
+           'CMMSNSUnitQuadSolutionWallBC.cpp',
+           'CVerificationSolution.cpp',
+           'CUserDefinedSolution.cpp'])

From 8a6c7709dae9e7d5dfd4b6340e7683f3a94f2a62 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 11:48:15 +0200
Subject: [PATCH 357/539] Removed dependency of constructor of COutput on
 geometry

---
 .../include/output/CAdjElasticityOutput.hpp   |  4 +-
 SU2_CFD/include/output/CAdjFlowIncOutput.hpp  |  6 +-
 SU2_CFD/include/output/CAdjFlowOutput.hpp     |  6 +-
 SU2_CFD/include/output/CAdjHeatOutput.hpp     |  3 +-
 SU2_CFD/include/output/CBaselineOutput.hpp    |  2 +-
 SU2_CFD/include/output/CDriverOutput.hpp      |  2 +-
 SU2_CFD/include/output/CElasticityOutput.hpp  |  4 +-
 SU2_CFD/include/output/CFlowCompFEMOutput.hpp |  4 +-
 SU2_CFD/include/output/CFlowCompOutput.hpp    |  2 +-
 SU2_CFD/include/output/CFlowIncOutput.hpp     |  4 +-
 SU2_CFD/include/output/CFlowOutput.hpp        |  2 +-
 SU2_CFD/include/output/CHeatOutput.hpp        |  2 +-
 SU2_CFD/include/output/CMeshOutput.hpp        |  2 +-
 SU2_CFD/include/output/COutput.hpp            |  4 +-
 .../output/filewriter/CParallelDataSorter.hpp |  6 ++
 SU2_CFD/src/driver_adjoint_singlezone.cpp     | 10 ++--
 SU2_CFD/src/driver_structure.cpp              | 30 +++++-----
 SU2_CFD/src/output/CAdjElasticityOutput.cpp   |  4 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |  6 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |  6 +-
 SU2_CFD/src/output/CAdjHeatOutput.cpp         |  4 +-
 SU2_CFD/src/output/CBaselineOutput.cpp        |  4 +-
 SU2_CFD/src/output/CDriverOutput.cpp          |  2 +-
 SU2_CFD/src/output/CElasticityOutput.cpp      |  4 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     | 35 ++---------
 SU2_CFD/src/output/CFlowCompOutput.cpp        | 32 ++--------
 SU2_CFD/src/output/CFlowIncOutput.cpp         | 30 +---------
 SU2_CFD/src/output/CFlowOutput.cpp            |  2 +-
 SU2_CFD/src/output/CHeatOutput.cpp            |  4 +-
 SU2_CFD/src/output/CMeshOutput.cpp            |  4 +-
 SU2_CFD/src/output/COutput.cpp                | 58 +++++--------------
 SU2_DEF/src/SU2_DEF.cpp                       |  4 +-
 SU2_DOT/src/SU2_DOT.cpp                       |  4 +-
 SU2_SOL/src/SU2_SOL.cpp                       | 32 +++++-----
 34 files changed, 109 insertions(+), 219 deletions(-)

diff --git a/SU2_CFD/include/output/CAdjElasticityOutput.hpp b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
index 699421bcf727..22eff41d4d7b 100644
--- a/SU2_CFD/include/output/CAdjElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
@@ -47,7 +47,7 @@
  */
 class CAdjElasticityOutput : public COutput {
 private:
-  unsigned short nVar_FEM, nDim;
+  unsigned short nVar_FEM;
 
 public:
 
@@ -57,7 +57,7 @@ class CAdjElasticityOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjElasticityOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
index 4eef942ca061..fc8a12ae39a3 100644
--- a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
@@ -50,7 +50,7 @@ class CAdjFlowIncOutput : public COutput {
   
   bool cont_adj;
 
-  unsigned short nDim, turb_model;
+  unsigned short turb_model;
   bool heat, weakly_coupled_heat;
   
 public:
@@ -60,7 +60,7 @@ class CAdjFlowIncOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjFlowIncOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
@@ -116,4 +116,4 @@ class CAdjFlowIncOutput : public COutput {
    */
   bool SetUpdate_Averages(CConfig *config);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CAdjFlowOutput.hpp b/SU2_CFD/include/output/CAdjFlowOutput.hpp
index 52b2d3f08edf..ca2e86718e71 100644
--- a/SU2_CFD/include/output/CAdjFlowOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowOutput.hpp
@@ -49,7 +49,7 @@ class CAdjFlowCompOutput : public COutput {
 private:
 
   bool cont_adj;
-  unsigned short nDim, turb_model;
+  unsigned short turb_model;
   
 public:
 
@@ -58,7 +58,7 @@ class CAdjFlowCompOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjFlowCompOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjFlowCompOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
@@ -115,4 +115,4 @@ class CAdjFlowCompOutput : public COutput {
    */
   bool SetUpdate_Averages(CConfig *config);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CAdjHeatOutput.hpp b/SU2_CFD/include/output/CAdjHeatOutput.hpp
index b82f3b6d954e..9ba70f9c5ce0 100644
--- a/SU2_CFD/include/output/CAdjHeatOutput.hpp
+++ b/SU2_CFD/include/output/CAdjHeatOutput.hpp
@@ -47,7 +47,6 @@
  */
 class CAdjHeatOutput : public COutput {
 private:
-  unsigned short nDim;
 
 public:
 
@@ -57,7 +56,7 @@ class CAdjHeatOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CAdjHeatOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CBaselineOutput.hpp b/SU2_CFD/include/output/CBaselineOutput.hpp
index 93e21c27ec87..98f9b4928a95 100644
--- a/SU2_CFD/include/output/CBaselineOutput.hpp
+++ b/SU2_CFD/include/output/CBaselineOutput.hpp
@@ -53,7 +53,7 @@ class CBaselineOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short iZone);
+  CBaselineOutput(CConfig *config, unsigned short nDim, CSolver *solver);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CDriverOutput.hpp b/SU2_CFD/include/output/CDriverOutput.hpp
index 8a2a5bbd4bc6..c0b24ddf9c5d 100644
--- a/SU2_CFD/include/output/CDriverOutput.hpp
+++ b/SU2_CFD/include/output/CDriverOutput.hpp
@@ -73,7 +73,7 @@ class CDriverOutput : public COutput {
   /*!
    * \brief Constructor of the class.
    */
-  CDriverOutput(CConfig *driver_config, CConfig** config);
+  CDriverOutput(CConfig *driver_config, CConfig** config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CElasticityOutput.hpp b/SU2_CFD/include/output/CElasticityOutput.hpp
index 1b51384d2bf7..c1ceba962e4c 100644
--- a/SU2_CFD/include/output/CElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CElasticityOutput.hpp
@@ -61,7 +61,7 @@ class CElasticityOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CElasticityOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
@@ -113,4 +113,4 @@ class CElasticityOutput : public COutput {
    */
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
index 0ce15c944b22..0c7d14b32ba1 100644
--- a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
@@ -64,7 +64,7 @@ class CFlowCompFEMOutput : public CFlowOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+  CFlowCompFEMOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
@@ -135,4 +135,4 @@ class CFlowCompFEMOutput : public CFlowOutput {
    */
   bool SetUpdate_Averages(CConfig *config);
   
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CFlowCompOutput.hpp b/SU2_CFD/include/output/CFlowCompOutput.hpp
index 2e02c9c49cd7..053c7084dc82 100644
--- a/SU2_CFD/include/output/CFlowCompOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompOutput.hpp
@@ -60,7 +60,7 @@ class CFlowCompOutput : public CFlowOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver** solver, unsigned short iZone);
+  CFlowCompOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CFlowIncOutput.hpp b/SU2_CFD/include/output/CFlowIncOutput.hpp
index eff4819fdd43..f29da459209b 100644
--- a/SU2_CFD/include/output/CFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CFlowIncOutput.hpp
@@ -61,7 +61,7 @@ class CFlowIncOutput : public CFlowOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short iZone);
+  CFlowIncOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
@@ -130,4 +130,4 @@ class CFlowIncOutput : public CFlowOutput {
    */
   bool SetUpdate_Averages(CConfig *config);
   
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index f21c8bf3677f..d02ff7b0987d 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -48,7 +48,7 @@ class CFlowOutput : public COutput{
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config);
+  CFlowOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CHeatOutput.hpp b/SU2_CFD/include/output/CHeatOutput.hpp
index 90e07ceb02c8..5e2decb2e5d6 100644
--- a/SU2_CFD/include/output/CHeatOutput.hpp
+++ b/SU2_CFD/include/output/CHeatOutput.hpp
@@ -57,7 +57,7 @@ class CHeatOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CHeatOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/CMeshOutput.hpp b/SU2_CFD/include/output/CMeshOutput.hpp
index 002f6bbd49e4..3ecd402e8a52 100644
--- a/SU2_CFD/include/output/CMeshOutput.hpp
+++ b/SU2_CFD/include/output/CMeshOutput.hpp
@@ -53,7 +53,7 @@ class CMeshOutput : public COutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short iZone);
+  CMeshOutput(CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 8b992a632373..63b8b07d4ab8 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -193,7 +193,7 @@ class COutput {
   /*! 
    * \brief Constructor of the class. 
    */
-  COutput(CConfig *config);
+  COutput(CConfig *config, unsigned short nDim);
   
   /*! 
    * \brief Destructor of the class. 
@@ -205,7 +205,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void PreprocessVolumeOutput(CConfig *config, CGeometry *geometry);   
+  void PreprocessVolumeOutput(CConfig *config);   
   
   /*!
    * \brief Load the data from the solvers into the local data array and sort it for the linear partitioning.
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 6189dc17d62d..d51245ec2cc0 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -73,6 +73,12 @@ class CParallelDataSorter{
    */
   unsigned long GetnPoints(){return nParallel_Poin;}
   
+  /*!
+   * \brief Get the number of points to sort.
+   * \return local number of points.
+   */
+  unsigned long GetnLocalPointSort(){return nLocalPoint_Sort;}
+  
   /*!
    * \brief Get the global number of points (accumulated from all ranks)
    * \return Global number of points.
diff --git a/SU2_CFD/src/driver_adjoint_singlezone.cpp b/SU2_CFD/src/driver_adjoint_singlezone.cpp
index 8a376cf4c1a6..9802773201d4 100644
--- a/SU2_CFD/src/driver_adjoint_singlezone.cpp
+++ b/SU2_CFD/src/driver_adjoint_singlezone.cpp
@@ -77,8 +77,8 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
       cout << "Direct iteration: Euler/Navier-Stokes/RANS equation." << endl;
     if (turbo) direct_iteration = new CTurboIteration(config);
     else       direct_iteration = new CFluidIteration(config);
-    if (compressible) direct_output = new CFlowCompOutput(config, geometry, solver, ZONE_0);
-    else direct_output = new CFlowIncOutput(config, geometry, solver, ZONE_0);
+    if (compressible) direct_output = new CFlowCompOutput(config, nDim);
+    else direct_output = new CFlowIncOutput(config, nDim);
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
@@ -87,7 +87,7 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: Euler/Navier-Stokes/RANS equation." << endl;
     direct_iteration = new CFEMFluidIteration(config);
-    direct_output = new CFlowCompFEMOutput(config, geometry, solver, ZONE_0);
+    direct_output = new CFlowCompFEMOutput(config, nDim);
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
@@ -96,7 +96,7 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: elasticity equation." << endl;
     direct_iteration = new CFEAIteration(config);
-    direct_output = new CElasticityOutput(config, geometry, ZONE_0);
+    direct_output = new CElasticityOutput(config, nDim);
     MainVariables = FEA_DISP_VARS;
     SecondaryVariables = NONE;
     break;
@@ -105,7 +105,7 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
     if (rank == MASTER_NODE)
       cout << "Direct iteration: heat equation." << endl;
     direct_iteration = new CHeatIteration(config);
-    direct_output = new CHeatOutput(config, geometry, ZONE_0);    
+    direct_output = new CHeatOutput(config, nDim);    
     MainVariables = FLOW_CONS_VARS;
     SecondaryVariables = MESH_COORDS;
     break;
diff --git a/SU2_CFD/src/driver_structure.cpp b/SU2_CFD/src/driver_structure.cpp
index a9aef19e4748..e3026093a556 100644
--- a/SU2_CFD/src/driver_structure.cpp
+++ b/SU2_CFD/src/driver_structure.cpp
@@ -127,6 +127,9 @@ CDriver::CDriver(char* confFile,
    and it is determined whether a problem is single physics or multiphysics. . ---*/
 
   Input_Preprocessing(MPICommunicator);
+  
+  if (rank == MASTER_NODE) cout << endl << "-------------------------- Output Preprocessing ---------------------------" << endl;
+  Output_Preprocessing();  
 
   /*--- Preprocessing of the geometry for all zones. In this routine, the edge-
    based data structure is constructed, i.e. node and cell neighbors are
@@ -503,9 +506,6 @@ CDriver::CDriver(char* confFile,
   if (rank == MASTER_NODE) cout << endl << "---------------------- Python Interface Preprocessing ---------------------" << endl;
   PythonInterface_Preprocessing();
 
-  if (rank == MASTER_NODE) cout << endl << "-------------------------- Output Preprocessing ---------------------------" << endl;
-  Output_Preprocessing();
-
 //  output = new COutput(config_container[ZONE_0]);
 
   if  ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()) || 
@@ -3734,21 +3734,21 @@ void CDriver::Output_Preprocessing(){
       if (rank == MASTER_NODE)
         cout << ": Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE)
-        output[iZone] = new CFlowCompOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CFlowCompOutput(config_container[iZone], nDim);
       else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE)
-        output[iZone] = new CFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CFlowIncOutput(config_container[iZone], nDim);
       break;
 
     case HEAT_EQUATION_FVM:
       if (rank == MASTER_NODE)
         cout << ": heat output structure." << endl;
-      output[iZone] = new CHeatOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CHeatOutput(config_container[iZone], nDim);
       break;
 
     case FEM_ELASTICITY:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      output[iZone] = new CElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CElasticityOutput(config_container[iZone], nDim);
       break;
       
     case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
@@ -3756,45 +3756,45 @@ void CDriver::Output_Preprocessing(){
       if (rank == MASTER_NODE)
         cout << ": adjoint Euler/Navier-Stokes/RANS output structure." << endl;
       if (config_container[iZone]->GetKind_Regime() == COMPRESSIBLE){      
-        output[iZone] = new CAdjFlowCompOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CAdjFlowCompOutput(config_container[iZone], nDim);
       } else if (config_container[iZone]->GetKind_Regime() == INCOMPRESSIBLE){
-        output[iZone] = new CAdjFlowIncOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+        output[iZone] = new CAdjFlowIncOutput(config_container[iZone], nDim);
       }
       break;
 
     case DISC_ADJ_FEM:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint FEA output structure." << endl;
-      output[iZone] = new CAdjElasticityOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CAdjElasticityOutput(config_container[iZone], nDim);
       break;
       
     case DISC_ADJ_HEAT:
       if (rank == MASTER_NODE)
         cout << ": discrete adjoint heat output structure." << endl;
-      output[iZone] = new CAdjHeatOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CAdjHeatOutput(config_container[iZone], nDim);
       break;
       
     case FEM_EULER: case FEM_LES: case FEM_RANS: case FEM_NAVIER_STOKES:
       if (rank == MASTER_NODE)
         cout << ": FEM output structure." << endl;
-      output[iZone] = new CFlowCompFEMOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0], solver_container[iZone][INST_0][MESH_0], iZone);
+      output[iZone] = new CFlowCompFEMOutput(config_container[iZone], nDim);
       break;
       
     default:
       if (rank == MASTER_NODE)
         cout << ": default output structure." << endl;
-      output[iZone] = new COutput(config_container[iZone]);
+      output[iZone] = new COutput(config_container[iZone], nDim);
       break;
     }
     
     output[iZone]->PreprocessHistoryOutput(config_container[iZone]);
     
-    output[iZone]->PreprocessVolumeOutput(config_container[iZone], geometry_container[iZone][INST_0][MESH_0]);
+    output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
 
   }
 
   if (driver_config->GetMultizone_Problem()){
-    driver_output = new CDriverOutput(driver_config, config_container);
+    driver_output = new CDriverOutput(driver_config, config_container, nDim);
     driver_output->PreprocessMultizoneHistoryOutput(output, config_container);
   }
   
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index d1cc33af5543..1671d788fe6e 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -49,8 +49,6 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, CGeometry *geometry,
   if (linear_analysis) nVar_FEM = nDim;
   if (nonlinear_analysis) nVar_FEM = 3;
   
-  nDim = geometry->GetnDim();
-
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 5cabdbdc8988..1db6428e1d3a 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -40,10 +40,8 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-  
-  nDim = geometry->GetnDim();
- 
+CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+   
   turb_model = config->GetKind_Turb_Model();
   
   cont_adj = config->GetContinuous_Adjoint();
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 32f847056eb0..43a7675115e2 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -40,12 +40,10 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
   
   cont_adj = config->GetContinuous_Adjoint();
-  
-  nDim = geometry->GetnDim();
- 
+   
   turb_model = config->GetKind_Turb_Model();
   
   heat = config->GetEnergy_Equation();
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index e505b4fca74f..08e5dc9f5dc2 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -40,10 +40,8 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjHeatOutput::CAdjHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
   
-  nDim = geometry->GetnDim();
-
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 4bf1faa2a59a..68442891f6c7 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -41,9 +41,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CBaselineOutput::CBaselineOutput(CConfig *config, CGeometry *geometry, CSolver *solver, unsigned short val_iZone) : COutput(config) {
-
-  nDim = geometry->GetnDim();
+CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver* solver) : COutput(config, nDim) {
   
   unsigned short iField = 0;
 
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 56a2eb96d59a..ccde411614d3 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -37,7 +37,7 @@
 
 #include "../../include/output/CDriverOutput.hpp"
 
-CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config) : COutput(driver_config) {
+CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned short nDim) : COutput(driver_config, nDim) {
 
   unsigned short iZone = 0;
   rank = SU2_MPI::GetRank();
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 9d7ab5add6ea..ede99006b893 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -40,14 +40,12 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CElasticityOutput::CElasticityOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
+CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
 
   linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   dynamic = (config->GetTime_Domain() || (config->GetDynamic_Analysis() == DYNAMIC));  // Dynamic analysis.
   
-  nDim = geometry->GetnDim();
-
   /*--- Initialize number of variables ---*/
   if (linear_analysis) nVar_FEM = nDim;
   if (nonlinear_analysis) nVar_FEM = 3;
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 020d6ec48714..d29beb240e12 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -40,39 +40,12 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
-
-  nDim = geometry->GetnDim();  
-  
-  nVar = solver[FLOW_SOL]->GetnVar();
-  
+CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
+    
   turb_model = config->GetKind_Turb_Model();
   
   grid_movement = config->GetGrid_Movement(); 
   
-  su2double Gas_Constant, Mach2Vel, Mach_Motion;
-  unsigned short iDim;
-  su2double Gamma = config->GetGamma();
-      
-  /*--- Set the non-dimensionalization for coefficients. ---*/
-  
-  RefArea = config->GetRefArea();
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-  }
-  else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
@@ -225,7 +198,9 @@ void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
 void CFlowCompFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){
   
   unsigned short iDim;
-  
+
+  unsigned short nVar = solver[FLOW_SOL]->GetnVar();
+    
   /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
    geometrical information for the FEM DG solver. ---*/
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 7c624ace7c3b..5a684a458bce 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -40,37 +40,12 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowCompOutput::CFlowCompOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
-
-  nDim = geometry->GetnDim();  
+CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
   
   turb_model = config->GetKind_Turb_Model();
   
   grid_movement = config->GetGrid_Movement(); 
-  
-  su2double Gas_Constant, Mach2Vel, Mach_Motion;
-  unsigned short iDim;
-  su2double Gamma = config->GetGamma();
-      
-  /*--- Set the non-dimensionalization for coefficients. ---*/
-  
-  RefArea = config->GetRefArea();
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-  }
-  else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  
+
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
@@ -438,7 +413,8 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   SetVolumeOutputValue("PRESSURE", iPoint, Node_Flow->GetPressure());
   SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
   SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
-  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
+  su2double factor = 1.0/(0.5*config->GetDensity_Ref()*config->GetVelocity_Ref()*config->GetVelocity_Ref());
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_Ref())/factor);
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 9b18c570575c..43e3674fd42a 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -40,39 +40,14 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowIncOutput::CFlowIncOutput(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned short val_iZone) : CFlowOutput(config) {
-
-  nDim = geometry->GetnDim();
+CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
   
   turb_model = config->GetKind_Turb_Model();
   
   heat = config->GetEnergy_Equation();
   
   weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
-  
-  su2double Gas_Constant, Mach2Vel, Mach_Motion;
-  unsigned short iDim;
-  su2double Gamma = config->GetGamma();
       
-  /*--- Set the non-dimensionalization for coefficients. ---*/
-  
-  RefArea = config->GetRefArea();
-  
-  if (grid_movement) {
-    Gas_Constant = config->GetGas_ConstantND();
-    Mach2Vel = sqrt(Gamma*Gas_Constant*config->GetTemperature_FreeStreamND());
-    Mach_Motion = config->GetMach_Motion();
-    RefVel2 = (Mach_Motion*Mach2Vel)*(Mach_Motion*Mach2Vel);
-  }
-  else {
-    RefVel2 = 0.0;
-    for (iDim = 0; iDim < nDim; iDim++)
-      RefVel2  += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);
-  }
-  RefDensity  = solver[FLOW_SOL]->GetDensity_Inf();
-  RefPressure = solver[FLOW_SOL]->GetPressure_Inf();
-  factor = 1.0 / (0.5*RefDensity*RefArea*RefVel2);
-  
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
@@ -502,7 +477,8 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
       SetVolumeOutputValue("GRID_VELOCITY-Z", iPoint, Node_Geo->GetGridVel()[2]);
   }
   
-  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - RefPressure)*factor*RefArea);
+  su2double factor = 1.0/(0.5*config->GetDensity_Ref()*config->GetVelocity_Ref()*config->GetVelocity_Ref()); 
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_Ref())/factor);
   SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetDensity());
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index e1e763ca8908..00812a1dc443 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -38,7 +38,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config) : COutput (config){
+CFlowOutput::CFlowOutput(CConfig *config, unsigned short nDim) : COutput (config, nDim){
   
 }
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 0bad6152c2eb..5d81e0b682f2 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -39,9 +39,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CHeatOutput::CHeatOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  nDim = geometry->GetnDim();
+CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
 
   multizone = config->GetMultizone_Problem();
 
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index 7b6d24265d30..fbc8b09b2c59 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -38,9 +38,7 @@
 #include "../../include/output/CMeshOutput.hpp"
 #include "../../../Common/include/geometry_structure.hpp"
 
-CMeshOutput::CMeshOutput(CConfig *config, CGeometry *geometry, unsigned short val_iZone) : COutput(config) {
-
-  nDim = geometry->GetnDim();
+CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 3dcee310c5c1..2a2306992e77 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -53,8 +53,9 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-COutput::COutput(CConfig *config) {
+COutput::COutput(CConfig *config, unsigned short nDim) {
   
+  this->nDim = nDim;
   
   if((!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()) 
      || config->GetBoolTurbomachinery() || config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
@@ -342,13 +343,6 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
 
 void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_container){
   
-  /*--- Collect that data defined in the subclasses from the different processors ---*/
-  
-  if (rank == MASTER_NODE)
-    cout << endl << "Loading solution output data locally on each rank." << endl;
-  
-  CollectVolumeData(config, geometry, solver_container);
- 
   /*---- Construct a data sorter object to partition and distribute
    *  the local data into linear chunks across the processors ---*/
   
@@ -360,7 +354,19 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
     
     data_sorter = new CFVMDataSorter(config, geometry, GlobalField_Counter, Local_Data);
     
-  }
+  }  
+
+  /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
+   * before writing it to file ---*/
+   
+  Local_Data.resize(data_sorter->GetnLocalPointSort(), std::vector<su2double>(GlobalField_Counter, 0.0));
+  
+  /*--- Collect that data defined in the subclasses from the different processors ---*/
+  
+  if (rank == MASTER_NODE)
+    cout << endl << "Loading solution output data locally on each rank." << endl;
+  
+  CollectVolumeData(config, geometry, solver_container);
   
   /*--- Sort the data, needed for volume and surface output ---*/
   
@@ -1033,7 +1039,7 @@ void COutput::CheckHistoryOutput(){
   }
 }
 
-void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
+void COutput::PreprocessVolumeOutput(CConfig *config){
 
 //  /*--- Make sure that coordinates are always in the volume output --- */
   
@@ -1113,38 +1119,6 @@ void COutput::PreprocessVolumeOutput(CConfig *config, CGeometry *geometry){
     cout << endl;
   }
   
-  unsigned long nPoint = 0;
-  
-  if (fem_output){
-    
-    /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-    
-    CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-    
-    unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-    
-    CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-    
-    /*--- Access the solution by looping over the owned volume elements. ---*/
-    
-    for(unsigned long l=0; l<nVolElemOwned; ++l) {
-      
-      for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {        
-       
-        nPoint++;
-        
-      }
-    }
-  } else {
-    nPoint = geometry->GetnPoint();
-  }
-  
-  /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
-   * before writing it to file ---*/
-   
-  Local_Data.resize(nPoint, std::vector<su2double>(GlobalField_Counter, 0.0));
-  
 }
 
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 5d25bddd2795..17e117b28360 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -218,11 +218,11 @@ int main(int argc, char *argv[]) {
     
     /*--- Allocate the mesh output ---*/
     
-    output[iZone] = new CMeshOutput(config_container[iZone], geometry_container[iZone], iZone);
+    output[iZone] = new CMeshOutput(config_container[iZone], geometry_container[iZone]->GetnDim());
     
     /*--- Preprocess the volume output ---*/
     
-    output[iZone]->PreprocessVolumeOutput(config_container[iZone], geometry_container[iZone]);    
+    output[iZone]->PreprocessVolumeOutput(config_container[iZone]);    
     
 
   }
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 6d9907026111..902586916804 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -986,8 +986,8 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
       }
     }
     
-    output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0], solver, iZone);
-    output->PreprocessVolumeOutput(config[iZone], geometry[iZone][INST_0]);
+    output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0]->GetnDim(), solver);
+    output->PreprocessVolumeOutput(config[iZone]);
     
     /*--- Load the data --- */
     
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 4901aa44dc48..6bd66e8b45a3 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -288,8 +288,8 @@ int main(int argc, char *argv[]) {
         config_container[iZone]->SetExtIter(TimeIter);
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         
-        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
-        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
         
       }
 
@@ -347,8 +347,8 @@ int main(int argc, char *argv[]) {
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
-        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
-        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
       
       }
       for (iZone = 0; iZone < nZone; iZone++){
@@ -434,8 +434,8 @@ int main(int argc, char *argv[]) {
                                iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
-          output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0], solver_container[ZONE_0][INST_0], ZONE_0);
-          output[ZONE_0]->PreprocessVolumeOutput(config_container[ZONE_0],geometry_container[ZONE_0][INST_0]);
+          output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
+          output[ZONE_0]->PreprocessVolumeOutput(config_container[ZONE_0]);
          
           SolutionInstantiatedFlow = true;
         }
@@ -450,8 +450,8 @@ int main(int argc, char *argv[]) {
                                iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                iExtIter+1 == config_container[ZONE_1]->GetnExtIter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
-          output[ZONE_1] = new CBaselineOutput(config_container[ZONE_1], geometry_container[ZONE_1][INST_0], solver_container[ZONE_1][INST_0], ZONE_1);
-          output[ZONE_1]->PreprocessVolumeOutput(config_container[ZONE_1],geometry_container[ZONE_1][INST_0]);
+          output[ZONE_1] = new CBaselineOutput(config_container[ZONE_1], geometry_container[ZONE_1][INST_0]->GetnDim(), solver_container[ZONE_1][INST_0]);
+          output[ZONE_1]->PreprocessVolumeOutput(config_container[ZONE_1]);
           SolutionInstantiatedFEM = true;
         }
           solver_container[ZONE_1][INST_0]->LoadRestart_FSI(geometry_container[ZONE_1][INST_0], config_container[ZONE_1], SU2_TYPE::Int(MESH_0));
@@ -606,8 +606,8 @@ int main(int argc, char *argv[]) {
                                                                                   iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                                                                   iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
-                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
-                  output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
+                  output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
                   
                   SolutionInstantiated[iZone] = true;
                 }
@@ -652,8 +652,8 @@ int main(int argc, char *argv[]) {
           /*--- Either instantiate the solution class or load a restart file. ---*/
           solver_container[iZone][iInst] = new CBaselineSolver(geometry_container[iZone][iInst], config_container[iZone]);
           solver_container[iZone][iInst]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
-          output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][iInst], solver_container[iZone][iInst], iZone);          
-          output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][iInst]);
+          output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][iInst]->GetnDim(), solver_container[iZone][iInst]);          
+          output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
 
           /*--- Print progress in solution writing to the screen. ---*/
           if (rank == MASTER_NODE) {
@@ -725,8 +725,8 @@ int main(int argc, char *argv[]) {
                                        iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
                                        iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
-                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
-                  output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+                  output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
+                  output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
                   
                   SolutionInstantiated = true;
                 }
@@ -768,8 +768,8 @@ int main(int argc, char *argv[]) {
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
-        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0], solver_container[iZone][INST_0], iZone);
-        output[iZone]->PreprocessVolumeOutput(config_container[iZone],geometry_container[iZone][INST_0]);
+        output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
+        output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
         
       }
       

From cbb8f950b769f27d2e724f4363f1b184a64c6c2d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 14:57:10 +0200
Subject: [PATCH 358/539] Added description field to history output fields

---
 SU2_CFD/include/output/COutput.hpp          | 14 ++--
 SU2_CFD/src/output/CAdjElasticityOutput.cpp | 10 +--
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp   | 58 ++++++++---------
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp    | 62 +++++++++---------
 SU2_CFD/src/output/CAdjHeatOutput.cpp       |  6 +-
 SU2_CFD/src/output/CDriverOutput.cpp        |  6 +-
 SU2_CFD/src/output/CElasticityOutput.cpp    | 26 ++++----
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp   | 22 +++----
 SU2_CFD/src/output/CFlowCompOutput.cpp      | 70 ++++++++++----------
 SU2_CFD/src/output/CFlowIncOutput.cpp       | 62 +++++++++---------
 SU2_CFD/src/output/CFlowOutput.cpp          | 52 +++++++--------
 SU2_CFD/src/output/CHeatOutput.cpp          | 14 ++--
 SU2_CFD/src/output/COutput.cpp              | 71 +++++++++++++++++----
 13 files changed, 263 insertions(+), 210 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 63b8b07d4ab8..5b7d051b6f1d 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -120,9 +120,10 @@ class COutput {
     unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
     string              OutputGroup;  /*!< \brief The group this field belongs to. */
     unsigned short      FieldType;
+    string              Description;
     HistoryOutputField() {}           /*!< \brief Default constructor. */
-    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype):
-      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype){}
+    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype, string description):
+      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype), Description(description){}
   };
   
   /** \brief Structure to store information for a volume output field.
@@ -376,6 +377,8 @@ class COutput {
   bool GetConvergence() {return Convergence;}
 
   void SetConvergence(bool conv) {Convergence = conv;}
+  
+  void PrintHistoryFields();
 
 protected:
   
@@ -423,10 +426,11 @@ class COutput {
    * \param[in] field_name - Header that is printed on screen and in the history file.
    * \param[in] format - The screen printing format (::ScreenOutputFormat).
    * \param[in] groupname - The name of the group this field belongs to.
+   * \param[in] description - A description of the field.
    * \param[in] field_type - The type of the field (::HistoryFieldType).
    */
-  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, unsigned short field_type = TYPE_DEFAULT ){
-    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type);
+  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, string description, unsigned short field_type = TYPE_DEFAULT ){
+    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type, description);
     HistoryOutput_List.push_back(name);
   }
   
@@ -456,7 +460,7 @@ class COutput {
     if (marker_names.size() != 0){
       HistoryOutputPerSurface_List.push_back(name);
       for (unsigned short i = 0; i < marker_names.size(); i++){
-        HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type));
+        HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type, ""));
       }
     }
   }
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 1671d788fe6e..3c2301e26e08 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -108,13 +108,13 @@ CAdjElasticityOutput::~CAdjElasticityOutput(void) {
 void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Residuals
-  AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS");
-  AddHistoryOutput("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS");
+  AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS", "");
+  AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS", "");
+  AddHistoryOutput("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS", "");
   
   //Sensitivities
-  AddHistoryOutput("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY");
-  AddHistoryOutput("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY");
+  AddHistoryOutput("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY", "");
+  AddHistoryOutput("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY", "");
 
   
 }
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 1db6428e1d3a..d3cc8ad1831f 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -111,26 +111,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
-  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint energy.
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);   
       break;
     default: break;
     }
@@ -139,26 +139,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint density.
-  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint energy.
-  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -168,26 +168,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   ///  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The Block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: BGSimum residual of the adjoint density.
-  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: BGSimum residual of the adjoint momentum x-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the adjoint momentum y-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the adjoint momentum z-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the adjoint energy.
-  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
       /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -197,15 +197,15 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 43a7675115e2..a83c01a11a0d 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -115,26 +115,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity x-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity y-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);   
       break;
     default: break;
     }
@@ -143,26 +143,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity y-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity z-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);   
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -171,26 +171,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: BGSimum residual of the adjoint Pressure.
-  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: BGSimum residual of the adjoint Velocity x-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the adjoint Velocity y-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the adjoint Velocity z-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
   /// DESCRIPTION: BGSimum residual of the temperature.
-  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);      
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);   
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);   
       /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -200,19 +200,19 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the inlet velocity.
-  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the outlet pressure.
-  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 08e5dc9f5dc2..63528b9ec85b 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -104,17 +104,17 @@ void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
   /// END_GROUP
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
 
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index ccde411614d3..353b88d037ad 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -129,9 +129,9 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
   string name, header, group;
 
   if (config[ZONE_0]->GetTime_Domain()){
-    AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER");
+    AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER", "");
   }
-  AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER");
+  AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER", "");
   
   
   /*--- Set the fields ---*/
@@ -152,7 +152,7 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
         header = ZoneHistoryFields[ZoneHistoryNames[iField]].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
         group  = ZoneHistoryFields[ZoneHistoryNames[iField]].OutputGroup + "[" + PrintingToolbox::to_string(iZone) + "]";
         
-        AddHistoryOutput(name, header, ZoneHistoryFields[ZoneHistoryNames[iField]].ScreenFormat, group, ZoneHistoryFields[ZoneHistoryNames[iField]].FieldType );
+        AddHistoryOutput(name, header, ZoneHistoryFields[ZoneHistoryNames[iField]].ScreenFormat, group, "", ZoneHistoryFields[ZoneHistoryNames[iField]].FieldType );
       }
     }
   }
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index ede99006b893..83a608aaf034 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -152,25 +152,25 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "");
   
   // Residuals
 
-  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
 
-  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
 
-  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
 
-  AddHistoryOutput("VMS",            "VonMises", FORMAT_SCIENTIFIC, "VMS");
-  AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "LOAD_INCREMENT");
-  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "LOAD_RAMP");
+  AddHistoryOutput("VMS",            "VonMises", FORMAT_SCIENTIFIC, "", "VMS");
+  AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "", "LOAD_INCREMENT");
+  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "", "LOAD_RAMP");
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index d29beb240e12..cff6a2d86a73 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -113,32 +113,32 @@ void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
-  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum x-component.
-  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum y-component.
-  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the energy.
-  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", "", TYPE_RESIDUAL);
   /// END_GROUP
    
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", "", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", "", TYPE_RESIDUAL);
   /// END_GROUP
    
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "");
  
   /*--- Add analyze surface history fields --- */
   
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 5a684a458bce..d6576e5801fb 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -111,26 +111,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
-  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the density.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum x-component.
-  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum y-component.
-  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the energy.
-  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the energy.", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISSIPATION", "rms[w]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", TYPE_RESIDUAL);
     break;
   default: break;
   }
@@ -138,26 +138,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
    
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the density.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,"MAX_RES", "Maximum residual of the z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the energy.", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", TYPE_RESIDUAL); 
     break;
   default: break;
   }
@@ -165,26 +165,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", "BGS residual of the density.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the momentum x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the momentum y-component.",  TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the z-component.",  TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the energy.",  TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).",  TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).",  TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", TYPE_RESIDUAL); 
     break;
   default: break;
   }
@@ -203,33 +203,33 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
    
 
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver.");
  
   /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
   /// DESCRIPTION: Aero CD drag
-  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Aero CD drag", TYPE_COEFFICIENT);
   /// DESCRIPTION: Solid CD drag  
-  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Solid CD drag ", TYPE_COEFFICIENT);
   /// DESCRIPTION: Radial distortion 
-  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Radial distortion ", TYPE_COEFFICIENT);
   /// DESCRIPTION: Circumferential distortion
-  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", TYPE_COEFFICIENT);
+  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Circumferential distortion", TYPE_COEFFICIENT);
   /// END_GROUP
   
   /// BEGIN_GROUP: ROTATING_FRAME, DESCRIPTION: Coefficients related to a rotating frame of reference.
   /// DESCRIPTION: Merit  
-  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME", "Merit", TYPE_COEFFICIENT);
   /// DESCRIPTION: CT 
-  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", "CT", TYPE_COEFFICIENT);
   /// DESCRIPTION: CQ  
-  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", TYPE_COEFFICIENT);
+  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", "CQ", TYPE_COEFFICIENT);
   /// END_GROUP
   
   /// BEGIN_GROUP: EQUIVALENT_AREA, DESCRIPTION: Equivalent area.  
   /// DESCRIPTION: Equivalent area    
-  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
+  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", "Equivalent area", TYPE_COEFFICIENT);
   /// DESCRIPTION: Nearfield obj. function      
-  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", TYPE_COEFFICIENT);
+  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", "Nearfield obj. function ", TYPE_COEFFICIENT);
   /// END_GROUP
   /// 
   
@@ -247,7 +247,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /*--- Add combo obj value --- */
   
-  AddHistoryOutput("COMBO", "ComboObj", FORMAT_SCIENTIFIC, "COMBO", TYPE_COEFFICIENT);
+  AddHistoryOutput("COMBO", "ComboObj", FORMAT_SCIENTIFIC, "COMBO", "Combined obj. function value.", TYPE_COEFFICIENT);
 }
 
 void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 43e3674fd42a..1fc754ed2f18 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -109,26 +109,26 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the pressure.
-  AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the pressure.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity x-component.  
-  AddHistoryOutput("RMS_VELOCITY-X", "rms[U]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-X", "rms[U]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity y-component.  
-  AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity z-component.  
-  if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the temperature.", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", TYPE_RESIDUAL);
     break;
   default: break;
   }
@@ -136,26 +136,28 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
-  AddHistoryOutput("MAX_PRESSURE",   "max[P]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_PRESSURE",   "max[P]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the pressure.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   
-  AddHistoryOutput("MAX_VELOCITY-X", "max[U]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-X", "max[U]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity y-component.   
-  AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity z-component.   
-  if (nDim == 3) AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", TYPE_RESIDUAL);
+  if (nDim == 3) 
+    AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  if (heat || weakly_coupled_heat) AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+  if (heat || weakly_coupled_heat) 
+    AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", "Root-mean square residual of the temperature.", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL); 
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", TYPE_RESIDUAL); 
     break;
   default: break;
   }
@@ -163,26 +165,28 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block-gauss seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
-  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the pressure.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   
-  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity y-component.   
-  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity z-component.   
-  if (nDim == 3) AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", TYPE_RESIDUAL);
+  if (nDim == 3) 
+    AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  if (heat || weakly_coupled_heat) AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  if (heat || weakly_coupled_heat) 
+    AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", "BGS residual of the temperature.", TYPE_RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
   case SST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL); 
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", TYPE_RESIDUAL); 
     break;
   default: break;
   }
@@ -190,17 +194,17 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
   /// DESCRIPTION: Total heatflux
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
   /// DESCRIPTION: Maximal heatflux  
-  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
   /// DESCRIPTION: Temperature
-  AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
   /// END_GROUP
   
   /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC, "AOA");
+  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC,"AOA", "Angle of attack");
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER,    "LINSOL_ITER");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver");
   
   /*--- Add analyze surface history fields --- */
   
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 00812a1dc443..12830f87c4aa 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -49,33 +49,33 @@ void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   
   
   /// DESCRIPTION: Average mass flow    
-  AddHistoryOutput("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average mass flow on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Mach number      
-  AddHistoryOutput("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average mach number on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Temperature        
-  AddHistoryOutput("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average temperature on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Pressure  
-  AddHistoryOutput("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average pressure on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Density  
-  AddHistoryOutput("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average density on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutput("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average enthalpy on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutput("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average normal velocity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutput("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total flow uniformity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Secondary strength
-  AddHistoryOutput("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total secondary strength on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutput("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total momentum distortion on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutput("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total secondary over uniformity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average total temperature  
-  AddHistoryOutput("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average total temperature all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Average total pressure   
-  AddHistoryOutput("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average total pressure on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// DESCRIPTION: Pressure drop    
-  AddHistoryOutput("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total pressure drop on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
   /// END_GROUP
   
   
@@ -685,25 +685,25 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
   
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", "Total drag coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", "Total lift coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", "Total momentum x-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", "Total momentum y-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", "Total momentum z-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", "Total force x-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", "Total force y-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", "Total force z-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
   /// END_GROUP  
   
   /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
@@ -734,7 +734,7 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
   /// END_GROUP 
 
   /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA", "AoA", FORMAT_SCIENTIFIC, "AOA");
+  AddHistoryOutput("AOA", "AoA", FORMAT_SCIENTIFIC, "AOA", "Angle of attack");
 }
 
 void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
@@ -782,7 +782,7 @@ void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solv
 
 void CFlowOutput::Add_CpInverseDesignOutput(CConfig *config){
   
-  AddHistoryOutput("CP_DIFF", "Cp_Diff", FORMAT_FIXED, "CP_DIFF");
+  AddHistoryOutput("CP_DIFF", "Cp_Diff", FORMAT_FIXED, "CP_DIFF", "Cp difference for inverse design");
   
 }
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 5d81e0b682f2..747fd2d2cf1a 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -112,15 +112,15 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
 
 void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Linear solver iterations");
   
-  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", "Root mean square residual of the temperature", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the temperature", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", "Block-Gauss seidel residual of the temperature", TYPE_RESIDUAL);
   
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
-  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
-  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximal heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", "Total average temperature on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
   
 }
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 2a2306992e77..4dec8a6e58b8 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -563,7 +563,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   file_writer->Write_Data(config->GetFilename(FileName, ""), data_sorter);
   
   if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
-    cout << "Wrote " << file_writer->Get_Filesize()/1.0e6 << " MB to disk in ";
+    cout << "Wrote " << file_writer->Get_Filesize()/(1.0e6) << " MB to disk in ";
     cout << file_writer->Get_UsedTime() << " s. (" << file_writer->Get_Bandwidth() << " MB/s)." << endl;
   }
   
@@ -1308,23 +1308,23 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, TYPE_AUTO_RESIDUAL);
+      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, "", TYPE_AUTO_RESIDUAL);
       Average[currentField.OutputGroup] = true;
     }
     if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup);
-      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup);  
-      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup);  
+      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup, "");
+      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup, "");  
+      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup, "");  
     }
   }
   
   if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "RESIDUAL");
+    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "RESIDUAL", "");
   }
   
    map<string, bool>::iterator it = Average.begin();
    for (it = Average.begin(); it != Average.end(); it++){
-     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES", TYPE_AUTO_RESIDUAL);
+     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES", "", TYPE_AUTO_RESIDUAL);
    }
   
 }
@@ -1448,21 +1448,21 @@ void COutput::SetCommonHistoryFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER", "Time iteration index"); 
   /// DESCRIPTION: The outer iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER"); 
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER", "Outer iteration index"); 
   /// DESCRIPTION: The inner iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER"); 
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER", "Inner iteration index"); 
   /// END_GROUP
   
   /// BEGIN_GROUP: TIME_DOMAIN, DESCRIPTION: Time integration information
   /// Description: The current time
-  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_FIXED, "TIME_DOMAIN");
+  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_FIXED, "TIME_DOMAIN", "Current physical time (s)");
   /// Description: The current time step
-  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_FIXED, "TIME_DOMAIN");
+  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_FIXED, "TIME_DOMAIN", "Current time step (s)");
  
   /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(sec)", FORMAT_SCIENTIFIC, "PHYS_TIME"); 
+  AddHistoryOutput("PHYS_TIME",   "Time(sec)", FORMAT_SCIENTIFIC, "PHYS_TIME", "Average wall-clock time"); 
   
 }
 
@@ -1488,3 +1488,48 @@ void COutput::LoadCommonHistoryData(CConfig *config){
   
 }
 
+
+void COutput::PrintHistoryFields(){ 
+  
+  if (rank == MASTER_NODE){
+    
+    PrintingToolbox::CTablePrinter HistoryFieldTable(&std::cout);
+    
+    unsigned short NameSize = 0, GroupSize = 0, DescrSize = 0;
+    
+    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+      
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      
+      if (Field.Description != ""){
+        if (HistoryOutput_List[iField].size() > NameSize){
+          NameSize = HistoryOutput_List[iField].size();
+        }
+        if (Field.OutputGroup.size() > GroupSize){
+          GroupSize = Field.OutputGroup.size();
+        }
+        if (Field.Description.size() > DescrSize){
+          DescrSize = Field.Description.size();
+        }
+      }
+    }
+    
+    HistoryFieldTable.AddColumn("Name", NameSize);
+    HistoryFieldTable.AddColumn("Group Name", GroupSize);
+    HistoryFieldTable.AddColumn("Description", DescrSize);
+    HistoryFieldTable.SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+    
+    HistoryFieldTable.PrintHeader();
+    
+    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+      
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      
+      if (Field.Description != "")
+        HistoryFieldTable << HistoryOutput_List[iField] << Field.OutputGroup << Field.Description;
+      
+    }
+    
+    HistoryFieldTable.PrintFooter();
+  }
+}

From 47afa9db1003ffd74df16a90969fdbae7344a5f6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 16:17:15 +0200
Subject: [PATCH 359/539] Changed order of automatically generated output
 fields

---
 SU2_CFD/src/output/COutput.cpp | 37 ++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 4dec8a6e58b8..9e1729f3f867 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1308,25 +1308,40 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
     HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, "", TYPE_AUTO_RESIDUAL);
+      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, "Relative residual.", TYPE_AUTO_RESIDUAL);
       Average[currentField.OutputGroup] = true;
     }
+  }
+  
+  map<string, bool>::iterator it = Average.begin();
+  for (it = Average.begin(); it != Average.end(); it++){
+    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
+  }  
+  
+  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
     if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup, "");
-      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup, "");  
-      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup, "");  
+      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup, "Time averaged values.", TYPE_AUTO_COEFFICIENT);
     }
   }
-  
-  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "RESIDUAL", "");
+  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
+    if (currentField.FieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup, "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+    }
   }
   
-   map<string, bool>::iterator it = Average.begin();
-   for (it = Average.begin(); it != Average.end(); it++){
-     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_RES", "", TYPE_AUTO_RESIDUAL);
-   }
+  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
+    if (currentField.FieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup, "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+    }
+  }
   
+  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
+    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY","Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
+  }
+
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  

From c7dbb8c14417c65ec6cc8be1a44c601abd4672de Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 16:17:46 +0200
Subject: [PATCH 360/539] Added automatically generated fields to printing of
 possible fields

---
 SU2_CFD/src/driver_dummy.cpp   |  3 ++
 SU2_CFD/src/output/COutput.cpp | 66 ++++++++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/driver_dummy.cpp b/SU2_CFD/src/driver_dummy.cpp
index c54ee1b26831..2ed39c943bd9 100644
--- a/SU2_CFD/src/driver_dummy.cpp
+++ b/SU2_CFD/src/driver_dummy.cpp
@@ -19,4 +19,7 @@ void CDummyDriver::StartSolver(){
     cout << "No solver started. DRY_RUN option enabled. " << endl;
     cout << "--------------------------------------------" << endl;
   }
+  
+  output[ZONE_0]->PrintHistoryFields();
+  
 }
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9e1729f3f867..23d5619efeb0 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1529,8 +1529,11 @@ void COutput::PrintHistoryFields(){
       }
     }
     
+    cout << "Output fields for the current configuration: " << endl;
+    
     HistoryFieldTable.AddColumn("Name", NameSize);
     HistoryFieldTable.AddColumn("Group Name", GroupSize);
+    HistoryFieldTable.AddColumn("Type",5);
     HistoryFieldTable.AddColumn("Description", DescrSize);
     HistoryFieldTable.SetAlign(PrintingToolbox::CTablePrinter::LEFT);
     
@@ -1540,11 +1543,68 @@ void COutput::PrintHistoryFields(){
       
       HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
       
-      if (Field.Description != "")
-        HistoryFieldTable << HistoryOutput_List[iField] << Field.OutputGroup << Field.Description;
-      
+      if (Field.FieldType == TYPE_DEFAULT || Field.FieldType == TYPE_COEFFICIENT || Field.FieldType == TYPE_RESIDUAL){
+        string type;
+        switch (Field.FieldType) {
+          case TYPE_COEFFICIENT:
+            type = "C";
+            break;
+          case TYPE_RESIDUAL:
+            type = "R";
+            break;
+          default:
+            type = "D";
+            break;
+        }
+        
+        if (Field.Description != "")
+          HistoryFieldTable << HistoryOutput_List[iField] << Field.OutputGroup << type << Field.Description;
+        
+      }
     }
     
     HistoryFieldTable.PrintFooter();
+    
+    cout << "Type legend: Default (D), Residual (R), Coefficient (C)" << endl;
+    
+    cout << "Generated output fields (only first field of every group is shown):" << endl;
+    
+    PrintingToolbox::CTablePrinter ModifierTable(&std::cout);
+    
+    ModifierTable.AddColumn("Name", NameSize);
+    ModifierTable.AddColumn("Group Name", GroupSize);
+    ModifierTable.AddColumn("Type",5);
+    ModifierTable.AddColumn("Description", DescrSize);
+    ModifierTable.SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+    ModifierTable.PrintHeader();
+    
+    std::map<string, bool> GroupVisited;
+    
+    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+      
+      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      
+      if ((Field.FieldType == TYPE_AUTO_COEFFICIENT || Field.FieldType == TYPE_AUTO_RESIDUAL) && (GroupVisited.count(Field.OutputGroup) == 0)){
+        string type;
+        switch (Field.FieldType) {
+          case TYPE_AUTO_COEFFICIENT:
+            type = "AC";
+            break;
+          case TYPE_AUTO_RESIDUAL:
+            type = "AR";
+            break;
+          default:
+            type = "AD";
+            break;
+        }
+        
+        if (Field.Description != "")
+          ModifierTable << HistoryOutput_List[iField] << Field.OutputGroup << type << Field.Description;
+        
+        GroupVisited[Field.OutputGroup] = true;
+      }
+    }   
+    ModifierTable.PrintFooter();
+
   }
 }

From 0fe1bf07fb5ff3ca4061996d9ed3257ffc742b77 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 16:17:54 +0200
Subject: [PATCH 361/539] Added files to meson

---
 SU2_CFD/src/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index ad741075fa2c..502e6ceb912e 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -40,7 +40,8 @@ su2_cfd_src = files(['driver_adjoint_singlezone.cpp',
                      'transfer_structure.cpp',
                      'solver_adjoint_discrete.cpp',
                      'numerics_direct_elasticity_nonlinear.cpp',
-                     'SU2_CFD.cpp'])
+                     'SU2_CFD.cpp',
+                     'driver_dummy.cpp'])
 
 su2_cfd_src += files(['output/CAdjElasticityOutput.cpp',
                       'output/CAdjFlowCompOutput.cpp',

From 6e5d7449f011c26b02c3d046f3909c6dd48f9bf7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 16:51:25 +0200
Subject: [PATCH 362/539] Added further description

---
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp | 74 ++++++++++-----------
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp  | 80 +++++++++++------------
 SU2_CFD/src/output/CAdjHeatOutput.cpp     |  9 ++-
 SU2_CFD/src/output/CFlowCompOutput.cpp    | 14 +++-
 4 files changed, 93 insertions(+), 84 deletions(-)

diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index d3cc8ad1831f..bad823d32349 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -111,26 +111,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
-  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint density.", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint energy.
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint energy.", TYPE_RESIDUAL); 
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", " Root-mean square residual of the adjoint dissipation.", TYPE_RESIDUAL);   
       break;
     default: break;
     }
@@ -139,26 +139,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint density.
-  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint density.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum x-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum y-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum z-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint energy.
-  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint energy.", TYPE_RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -167,27 +167,27 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
  
   
   ///  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The Block Gauss Seidel residuals of the SOLUTION variables. 
-  /// DESCRIPTION: BGSimum residual of the adjoint density.
-  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGSimum residual of the adjoint momentum x-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the adjoint momentum y-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the adjoint momentum z-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the adjoint energy.
-  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint density.
+  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint density.", TYPE_RESIDUAL);
+  /// DESCRIPTION: BGS residual of the adjoint momentum x-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum x-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint momentum y-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum y-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint momentum z-component
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum z-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint energy.
+  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint energy.", TYPE_RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);      
+      /// DESCRIPTION: BGS residual of the adjoint nu tilde.
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
-      /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
-      /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
+      /// DESCRIPTION: BGS residual of the adjoint kinetic energy.
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
+      /// DESCRIPTION: BGS residual of the adjoint dissipation.
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -197,15 +197,15 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the Mach number (only of compressible solver).", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field temperature.", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index a83c01a11a0d..128bc28b1c26 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -115,26 +115,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Pressure.", TYPE_RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity x-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity x-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity y-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity y-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity z-component.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", " Root-mean square residual of the adjoint temperature.", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", TYPE_RESIDUAL); 
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint dissipation.", TYPE_RESIDUAL);   
       break;
     default: break;
     }
@@ -143,26 +143,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Pressure.", TYPE_RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity x-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity y-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity y-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity z-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity z-component", TYPE_RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the temperature.", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);   
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", TYPE_RESIDUAL);   
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -170,27 +170,27 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   /// END_GROUP
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
-  /// DESCRIPTION: BGSimum residual of the adjoint Pressure.
-  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
-  /// DESCRIPTION: BGSimum residual of the adjoint Velocity x-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the adjoint Velocity y-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the adjoint Velocity z-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
-  /// DESCRIPTION: BGSimum residual of the temperature.
-  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);
+  /// DESCRIPTION: BGS residual of the adjoint Pressure.
+  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Pressure.", TYPE_RESIDUAL);
+  /// DESCRIPTION: BGS residual of the adjoint Velocity x-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity x-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint Velocity y-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity y-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the adjoint Velocity z-component
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity z-component", TYPE_RESIDUAL); 
+  /// DESCRIPTION: BGS residual of the temperature.
+  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", TYPE_RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
-      /// DESCRIPTION: BGSimum residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);      
+      /// DESCRIPTION: BGS residual of the adjoint nu tilde.
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
       break;  
     case SST:
-      /// DESCRIPTION: BGSimum residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL);   
-      /// DESCRIPTION: BGSimum residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "", TYPE_RESIDUAL); 
+      /// DESCRIPTION: BGS residual of the adjoint kinetic energy.
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", TYPE_RESIDUAL);   
+      /// DESCRIPTION: BGS residual of the adjoint dissipation.
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", TYPE_RESIDUAL); 
       break;
     default: break;
     }
@@ -200,19 +200,15 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
-  /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the far-field temperature.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the inlet velocity.
-  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the inlet velocity.", TYPE_COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the outlet pressure.
-  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the outlet pressure.", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
@@ -303,8 +299,6 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   }
   
   SetHistoryOutputValue("SENS_GEO", adjflow_solver->GetTotal_Sens_Geo());
-  SetHistoryOutputValue("SENS_AOA", adjflow_solver->GetTotal_Sens_AoA());
-  SetHistoryOutputValue("SENS_MACH", adjflow_solver->GetTotal_Sens_Mach());
   SetHistoryOutputValue("SENS_PRESS", adjflow_solver->GetTotal_Sens_Press());
   SetHistoryOutputValue("SENS_TEMP", adjflow_solver->GetTotal_Sens_Temp());
   SetHistoryOutputValue("SENS_VEL_IN", adjflow_solver->GetTotal_Sens_ModVel());
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 63528b9ec85b..5cfc0cc4e32c 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -104,17 +104,20 @@ void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", "", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint temperature.", TYPE_RESIDUAL); 
   /// END_GROUP
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint temperature.", TYPE_RESIDUAL);
 
+  /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
+  /// DESCRIPTION: Maximum residual of the adjoint Pressure.
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", TYPE_RESIDUAL);
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index d6576e5801fb..19b26f6ba890 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -231,7 +231,15 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Nearfield obj. function      
   AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", "Nearfield obj. function ", TYPE_COEFFICIENT);
   /// END_GROUP
-  /// 
+
+  ///   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
+  /// DESCRIPTION: Total heatflux
+  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Maximal heatflux  
+  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  /// DESCRIPTION: Temperature
+  AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  /// END_GROUP
   
   /*--- Add analyze surface history fields --- */
   
@@ -583,6 +591,10 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
     }
   }
   
+  SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
+  SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
+  SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
+  
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
  
   /*--- Set the analyse surface history values --- */

From 5f29ffcf94a989a2e370096f65a97ab4515bf6f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 19 Jul 2019 18:09:03 +0200
Subject: [PATCH 363/539] Removed unused array

---
 SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index a0908ca8e002..d5315548022a 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1252,10 +1252,7 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   
   unsigned long *index = new unsigned long[size];
   for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
-  
-  unsigned long *haloIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
-  
+
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   

From 613d04064953a79d9f5bc0d0f812aaef49e00e03 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 11:49:12 +0200
Subject: [PATCH 364/539] Enabled caching again

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8b7a11fb7569..b3eb8e54cdb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@
 dist: trusty
 sudo: required
 
-language: python
+language: c++
+
+cache: ccache
 
 compiler:
     - gcc

From 89df513c6ad1d1a058ea2de3a8e908541523f96a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 16:45:03 +0200
Subject: [PATCH 365/539] Added compilation of SU2_DOT_AD

---
 SU2_DOT/src/meson.build | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/SU2_DOT/src/meson.build b/SU2_DOT/src/meson.build
index b3c789f58722..1e7348aaa328 100644
--- a/SU2_DOT/src/meson.build
+++ b/SU2_DOT/src/meson.build
@@ -16,3 +16,23 @@ su2_dot = executable('SU2_DOT',
 		     objects : su2_cfd_obj,
 		     cpp_args : su2_cpp_args)
 
+if get_option('enable-autodiff')
+  su2_dot_src_ad = ['SU2_DOT.cpp']
+  su2_cfd_obj_ad = su2_cfd_ad.extract_objects(['solver_structure.cpp',
+                                       'output_structure.cpp',
+                                       'output_cgns.cpp',
+                                       'output_fieldview.cpp',
+                                       'output_paraview.cpp',
+                                       'output_tecplot.cpp',
+                                       'output_su2.cpp',                   
+				       'variables/CBaselineVariable.cpp',
+				       'variables/CVariable.cpp'])
+
+  su2_dot_ad = executable('SU2_DOT_AD',
+                     su2_dot_src_ad, 
+                     install: true,
+		     dependencies: [su2_deps, codi_dep, commonAD_dep], 
+		     objects : su2_cfd_obj_ad,
+		     cpp_args : [su2_cpp_args, codi_rev_args])
+
+endif

From 61c8505e7102804c4eccea5611e4c0837f7412c8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 16:46:10 +0200
Subject: [PATCH 366/539] Fixes for direct diff

---
 SU2_CFD/src/meson.build | 2 +-
 meson.build             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index 10abf1dc2b94..48b72118d6fb 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -83,7 +83,7 @@ if get_option('enable-autodiff')
 endif
 
 if get_option('enable-directdiff')
-  su2_cfd_dd = executable('SU2_CFD_DD',
+  su2_cfd_dd = executable('SU2_CFD_DIRECTDIFF',
                           su2_cfd_src,
 			  install : true, 
 			  dependencies : [su2_deps, codi_dep, commonDD_dep], 
diff --git a/meson.build b/meson.build
index a9ee0724519d..72a43df16793 100644
--- a/meson.build
+++ b/meson.build
@@ -51,7 +51,7 @@ if mpi_dep[0].found() and mpi_dep[1].found() and get_option('enable-mpi')
   su2_cpp_args += '-DHAVE_PARMETIS' 
   
   # add medi dependency
-  if get_option('enable-autodiff')
+  if get_option('enable-autodiff') or get_option('enable-directdiff')
     codi_dep += declare_dependency(include_directories: ['externals/medi/include', 'externals/medi/src'])
   endif
 endif

From 966fa8443557847dd0efaaa59518f5868924362f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 20:26:08 +0200
Subject: [PATCH 367/539] Changed optimization level to 2

---
 .travis.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0701e9a31fd..379861e9fcd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,23 +24,21 @@ python:
     - 3.6
 
 env:
-    global:
-        CXXFLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-empty-body -Wno-format-security" 
     matrix:
         # Serial build and test
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
+        - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false"
           TEST_SCRIPT=serial_regression.py
 
         # Parallel build and test
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+        - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-mpi=false -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
         # Parallel build and test for AD:
-        - CONFIGURE_COMMAND="meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+        - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:

From 46bc0dd1d7f805fa16ff666d894a4c97f9e7cc34 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 20:42:30 +0200
Subject: [PATCH 368/539] Changed optimization level to 2

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 379861e9fcd5..db03c28fa6ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,7 @@ install:
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
+    - meson build --reconfigure --optimization=2
     - ninja -v -C build install
 
     # Add environmental variables according to the configure step

From b330e40c9249b7e417ec03e1b6595e6a759878b7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 23 Jul 2019 20:46:52 +0200
Subject: [PATCH 369/539] Fix meson call

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db03c28fa6ce..0694c9d12ee6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ install:
     - echo $TRAVIS_BUILD_DIR
     - echo $CONFIGURE_COMMAND
     - $CONFIGURE_COMMAND
-    - meson build --reconfigure --optimization=2
+    - meson.py build --reconfigure --optimization=2
     - ninja -v -C build install
 
     # Add environmental variables according to the configure step

From fc4434470c64373708b0a14f0de3c7d4c52059d3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Jul 2019 11:27:43 +0200
Subject: [PATCH 370/539] Explicitely forcing meson to use mpicxx and mpicc

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0694c9d12ee6..cc093bc9b1d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,8 @@ env:
 
         # Parallel build and test
         - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
+          CC=mpicc
+          CXX=mpicxx
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
@@ -39,6 +41,8 @@ env:
 
         # Parallel build and test for AD:
         - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
+          CC=mpicc
+          CXX=mpicxx
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -60,8 +64,8 @@ before_install:
     - conda install -q -c anaconda python=$TRAVIS_PYTHON_VERSION numpy scipy mpi4py swig
 
     # to avoid interference with MPI
-    - test -n $CC  && unset CC
-    - test -n $CXX && unset CXX
+    #- test -n $CC  && unset CC
+    #- test -n $CXX && unset CXX
 
 install:
     # build ninja

From baad3d6050541b73d1d90cf637aa34fe426db846 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Jul 2019 11:28:17 +0200
Subject: [PATCH 371/539] Moved legacy output to turbo and HB driver

---
 Common/src/geometry_structure.cpp   |  1 +
 SU2_CFD/include/drivers/CDriver.hpp |  5 ++-
 SU2_CFD/src/drivers/CDriver.cpp     | 63 +++++++++++++++++++----------
 SU2_CFD/src/output/COutput.cpp      |  7 +---
 SU2_CFD/src/solver_structure.cpp    |  3 ++
 5 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index b40d1f2ace50..f93c04459182 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -20145,6 +20145,7 @@ CDummyGeometry::CDummyGeometry(CConfig *config){
   
   nDim = CConfig::GetnDim(config->GetMesh_FileName(), config->GetMesh_FileFormat());
   
+  config->SetnSpanWiseSections(0);
 }
 
 CDummyGeometry::~CDummyGeometry(){}
diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index d61615a2f3f6..122fcd3861af 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -828,6 +828,9 @@ class CFluidDriver : public CDriver {
  * \author S. Vitale
  */
 class CTurbomachineryDriver : public CFluidDriver {
+private:
+  COutputLegacy* output_legacy;
+  
 public:
 
   /*!
@@ -880,7 +883,7 @@ class CTurbomachineryDriver : public CFluidDriver {
 class CHBDriver : public CDriver {
 
 private:
-
+  COutputLegacy* output_legacy;
   unsigned short nInstHB;
   su2double **D; /*!< \brief Harmonic Balance operator. */
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 8b8033dc0cd1..48d8a3359282 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3661,24 +3661,7 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
     driver_output->PreprocessMultizoneHistoryOutput(output, config);
   }
   
-  /*--- LEGACY OUTPUT (going to be removed soon) --- */
-  
-  if  ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()) || 
-       config_container[ZONE_0]->GetBoolTurbomachinery() || config_container[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE){
-    /*--- Open the convergence history file ---*/
-    ConvHist_file = NULL;
-    ConvHist_file = new ofstream*[nZone];
-    for (iZone = 0; iZone < nZone; iZone++) {
-      ConvHist_file[iZone] = NULL;
-      if (rank == MASTER_NODE){
-        ConvHist_file[iZone] = new ofstream[nInst[iZone]];
-        for (iInst = 0; iInst < nInst[iZone]; iInst++) {
-          output[iZone]->GetLegacyOutput()->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
-          config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
-        }
-      }
-    }
-  }
+
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
     ExtIter = config_container[ZONE_0]->GetRestart_Iter();
@@ -4239,7 +4222,26 @@ void CFluidDriver::DynamicMeshUpdate(unsigned long ExtIter) {
 
 CTurbomachineryDriver::CTurbomachineryDriver(char* confFile, unsigned short val_nZone,
                                              SU2_Comm MPICommunicator):
-                                             CFluidDriver(confFile, val_nZone, MPICommunicator) { }
+                                             CFluidDriver(confFile, val_nZone, MPICommunicator) {
+  
+  output_legacy = new COutputLegacy(config_container[ZONE_0]);
+  
+  /*--- LEGACY OUTPUT (going to be removed soon) --- */
+  
+  /*--- Open the convergence history file ---*/
+  ConvHist_file = NULL;
+  ConvHist_file = new ofstream*[nZone];
+  for (iZone = 0; iZone < nZone; iZone++) {
+    ConvHist_file[iZone] = NULL;
+    if (rank == MASTER_NODE){
+      ConvHist_file[iZone] = new ofstream[nInst[iZone]];
+      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+        output_legacy->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
+        config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
+      }
+    }
+  }
+}
 
 CTurbomachineryDriver::~CTurbomachineryDriver(void) { }
 
@@ -4307,7 +4309,7 @@ void CTurbomachineryDriver::SetTurboPerformance(unsigned short targetZone){
 
   /* --- compute turboperformance for each stage and the global machine ---*/
 
-  output_container[ZONE_0]->GetLegacyOutput()->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
+ output_legacy->ComputeTurboPerformance(solver_container[targetZone][INST_0][MESH_0][FLOW_SOL], geometry_container[targetZone][INST_0][MESH_0], config_container[targetZone]);
 
 }
 
@@ -4346,7 +4348,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInst[iZone]; iInst++)    
-      output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+      output_legacy->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
           config_container, integration_container, false, UsedTime, iZone, iInst);
   }
 
@@ -4471,7 +4473,24 @@ CHBDriver::CHBDriver(char* confFile,
   D = NULL;
   /*--- allocate dynamic memory for the Harmonic Balance operator ---*/
   D = new su2double*[nInstHB]; for (kInst = 0; kInst < nInstHB; kInst++) D[kInst] = new su2double[nInstHB];
-
+  
+  output_legacy = new COutputLegacy(config_container[ZONE_0]);
+  
+  /*--- Open the convergence history file ---*/
+  ConvHist_file = NULL;
+  ConvHist_file = new ofstream*[nZone];
+  for (iZone = 0; iZone < nZone; iZone++) {
+    ConvHist_file[iZone] = NULL;
+    if (rank == MASTER_NODE){
+      ConvHist_file[iZone] = new ofstream[nInst[iZone]];
+      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+        output_legacy->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
+        config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
+      }
+    }
+  }
+  
+  
 }
 
 CHBDriver::~CHBDriver(void) {
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 23d5619efeb0..2780452d6033 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -56,12 +56,7 @@
 COutput::COutput(CConfig *config, unsigned short nDim) {
   
   this->nDim = nDim;
-  
-  if((!config->GetMultizone_Problem() && !config->GetSinglezone_Driver()) 
-     || config->GetBoolTurbomachinery() || config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
-    output_legacy = new COutputLegacy(config);
-  }
-  
+
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 88d908d4c10e..5acb14f8c6e5 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -121,6 +121,9 @@ CSolver::CSolver(void) {
   rotate_periodic   = false;
   implicit_periodic = false;
   
+  nPrimVarGrad = 0;
+  nPrimVar     = 0;
+  
 }
 
 CSolver::~CSolver(void) {

From f7f8cdf458ff99eeefb08b676509e77f7104c3ba Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Jul 2019 15:17:41 +0200
Subject: [PATCH 372/539] Another try

---
 .travis.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc093bc9b1d1..a48a037afc1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,6 @@ env:
 
         # Parallel build and test
         - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
-          CC=mpicc
-          CXX=mpicxx
           TEST_SCRIPT=parallel_regression.py
 
         # Serial build and test for AD
@@ -41,8 +39,6 @@ env:
 
         # Parallel build and test for AD:
         - CONFIGURE_COMMAND="meson.py build --optimization=2 --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true -Denable-directdiff=true"
-          CC=mpicc
-          CXX=mpicxx
           TEST_SCRIPT=parallel_regression_AD.py
 
 before_install:
@@ -51,7 +47,7 @@ before_install:
 
     # Install the necessary packages using apt-get with sudo
     - sudo apt-get update -qq
-    - sudo apt-get install -qq build-essential libopenmpi-dev
+    - sudo apt-get install -qq build-essential mpich
  
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
@@ -64,8 +60,8 @@ before_install:
     - conda install -q -c anaconda python=$TRAVIS_PYTHON_VERSION numpy scipy mpi4py swig
 
     # to avoid interference with MPI
-    #- test -n $CC  && unset CC
-    #- test -n $CXX && unset CXX
+    - test -n $CC  && unset CC
+    - test -n $CXX && unset CXX
 
 install:
     # build ninja

From dc310d344de06108f27b86139e443b9db60f41a8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Jul 2019 15:36:20 +0200
Subject: [PATCH 373/539] Fixing delete of conv. history file

---
 SU2_CFD/src/drivers/CDriver.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 48d8a3359282..5e91ef3e9e9b 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -333,15 +333,6 @@ void CDriver::Postprocessing() {
       cout << "Warning: there are " << config_container[ZONE_0]->GetNonphysical_Points() << " non-physical points in the solution." << endl;
     if (config_container[ZONE_0]->GetNonphysical_Reconstr() > 0)
       cout << "Warning: " << config_container[ZONE_0]->GetNonphysical_Reconstr() << " reconstructed states for upwinding are non-physical." << endl;
-
-    /*--- Close the convergence history file. ---*/
-    for (iZone = 0; iZone < nZone; iZone++) {
-      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
-        ConvHist_file[iZone][iInst].close();
-      }
-      delete [] ConvHist_file[iZone];
-    }
-
   }
   delete [] ConvHist_file;
 
@@ -4243,7 +4234,16 @@ CTurbomachineryDriver::CTurbomachineryDriver(char* confFile, unsigned short val_
   }
 }
 
-CTurbomachineryDriver::~CTurbomachineryDriver(void) { }
+CTurbomachineryDriver::~CTurbomachineryDriver(void) {
+  /*--- Close the convergence history file. ---*/
+  for (iZone = 0; iZone < nZone; iZone++) {
+    for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+      ConvHist_file[iZone][iInst].close();
+    }
+    delete [] ConvHist_file[iZone];
+  }
+  
+}
 
 void CTurbomachineryDriver::Run() {
 
@@ -4500,6 +4500,13 @@ CHBDriver::~CHBDriver(void) {
   /*--- delete dynamic memory for the Harmonic Balance operator ---*/
   for (kInst = 0; kInst < nInstHB; kInst++) if (D[kInst] != NULL) delete [] D[kInst];
   if (D[kInst] != NULL) delete [] D;
+  /*--- Close the convergence history file. ---*/
+  for (iZone = 0; iZone < nZone; iZone++) {
+    for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+      ConvHist_file[iZone][iInst].close();
+    }
+    delete [] ConvHist_file[iZone];
+  }
 
 }
 

From 689ecf5e198a348bfb65f0774c9e588478077206 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 24 Jul 2019 16:14:49 +0200
Subject: [PATCH 374/539] Adding libmpich-dev

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a48a037afc1b..e6297ebf7cf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ before_install:
 
     # Install the necessary packages using apt-get with sudo
     - sudo apt-get update -qq
-    - sudo apt-get install -qq build-essential mpich
+    - sudo apt-get install -qq build-essential mpich libmpich-dev
  
     # Install Python dependencies
     # http://conda.pydata.org/docs/travis.html#the-travis-yml-file

From 055c369029c44a239ec7c1d5da37bb418e097d5a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 31 Jul 2019 11:07:46 +0200
Subject: [PATCH 375/539] Added description field to volume output fields

---
 SU2_CFD/include/output/COutput.hpp          |  12 ++-
 SU2_CFD/src/output/CAdjElasticityOutput.cpp |  21 ++--
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp   |  52 +++++-----
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp    |  67 ++++++-------
 SU2_CFD/src/output/CAdjHeatOutput.cpp       |  25 +++--
 SU2_CFD/src/output/CBaselineOutput.cpp      |  11 +--
 SU2_CFD/src/output/CElasticityOutput.cpp    |  38 ++++----
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp   |  51 ++++------
 SU2_CFD/src/output/CFlowCompOutput.cpp      | 103 +++++++++++---------
 SU2_CFD/src/output/CFlowIncOutput.cpp       |  94 +++++++++---------
 SU2_CFD/src/output/CHeatOutput.cpp          |  10 +-
 SU2_CFD/src/output/CMeshOutput.cpp          |   6 +-
 12 files changed, 240 insertions(+), 250 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 5646683e0852..5a45700fea9b 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -135,9 +135,10 @@ class COutput {
     string FieldName;          /*!< \brief The name of the field, i.e. the name that is printed in the file header.*/
     int    Offset;             /*!< \brief This value identifies the position of the values of this field at each node in the ::Local_Data array. */
     string OutputGroup;        /*!< \brief The group this field belongs to. */
+    string Description;    
     VolumeOutputField () {}    /*!< \brief Default constructor. */
-    VolumeOutputField(string fieldname, int offset, string volumeoutputgroup):
-      FieldName(fieldname), Offset(offset), OutputGroup(volumeoutputgroup){}
+    VolumeOutputField(string fieldname, int offset, string volumeoutputgroup, string description):
+      FieldName(fieldname), Offset(offset), OutputGroup(volumeoutputgroup), Description(description){}
   };
 
   std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */
@@ -380,6 +381,8 @@ class COutput {
   void SetConvergence(bool conv) {Convergence = conv;}
   
   void PrintHistoryFields();
+  
+  void PrintVolumeFields();
 
 protected:
   
@@ -485,9 +488,10 @@ class COutput {
    * \param[in] name - Name for referencing it (in the config file and in the code).
    * \param[in] field_name - Header that is printed in the output files.
    * \param[in] groupname - The name of the group this field belongs to.
+   * \param[in] description - Description of the volume field.
    */
-  inline void AddVolumeOutput(string name, string field_name, string groupname){
-    VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname);
+  inline void AddVolumeOutput(string name, string field_name, string groupname, string description){
+    VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname, description);
     VolumeOutput_List.push_back(name);
   }
   
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 3c2301e26e08..3c55ed85cff6 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -166,13 +166,20 @@ void CAdjElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry,
 void CAdjElasticityOutput::SetVolumeOutputFields(CConfig *config){
 
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-
-  AddVolumeOutput("SENSITIVITY-X",    "Sensitivity_x", "SOLUTION");
-  AddVolumeOutput("SENSITIVITY-Y",    "Sensitivity_y", "SOLUTION");
-  if (nDim == 3) AddVolumeOutput("SENSITIVITY-Z", "Sensitivity_z", "SOLUTION");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
 
+  /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
+  /// DESCRIPTION: Sensitivity x-component.
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY", "x-component of the sensitivity vector"); 
+  /// DESCRIPTION: Sensitivity y-component.
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY", "y-component of the sensitivity vector");
+  if (nDim == 3)
+    /// DESCRIPTION: Sensitivity z-component.
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY", "z-component of the sensitivity vector");   
+  /// DESCRIPTION: Sensitivity in normal direction.
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY", "sensitivity in normal direction"); 
+  /// END_GROUP
 }
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index bad823d32349..c543b7748ed1 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -292,39 +292,35 @@ void CAdjFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
 
 void CAdjFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
-  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
-  /// DESCRIPTION: x coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
-  /// DESCRIPTION: y coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    /// DESCRIPTION: z coordinates of the mesh nodes.
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  /// END_GROUP
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
   
   /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
   /// DESCRIPTION: Adjoint density.
-  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "SOLUTION"); 
+  AddVolumeOutput("ADJ_DENSITY",    "Adjoint_Density",    "SOLUTION", "Adjoint density"); 
   /// DESCRIPTION: Adjoint momentum x-component.
-  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION"); 
+  AddVolumeOutput("ADJ_MOMENTUM-X", "Adjoint_Momentum_x", "SOLUTION", "x-component of the adjoint momentum vector"); 
   /// DESCRIPTION: Adjoint momentum y-component.
-  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION"); 
+  AddVolumeOutput("ADJ_MOMENTUM-Y", "Adjoint_Momentum_y", "SOLUTION", "y-component of the adjoint momentum vector"); 
   if (nDim == 3)
     /// DESCRIPTION: Adjoint momentum z-component.
-    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION"); 
+    AddVolumeOutput("ADJ_MOMENTUM-Z", "Adjoint_Momentum_z", "SOLUTION", "z-component of the adjoint momentum vector"); 
   /// DESCRIPTION: Adjoint energy.
-  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION");           
+  AddVolumeOutput("ADJ_ENERGY", "Adjoint_Energy", "SOLUTION", "Adjoint energy");           
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Adjoint nu tilde.
-      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
+      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION", "Adjoint Spalart-Allmaras variable"); 
       break;  
     case SST:
       /// DESCRIPTION: Adjoint kinetic energy.
-      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION");
+      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION", "Adjoint kinetic energy");
       /// DESCRIPTION: Adjoint dissipation.
-      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
+      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION", "Adjoint rate of dissipation");  
       break;
     default: break;
     }
@@ -333,27 +329,27 @@ void CAdjFlowCompOutput::SetVolumeOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
   /// DESCRIPTION: Residual of the adjoint density.
-  AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_DENSITY",    "Residual_Adjoint_Density",    "RESIDUAL", "Residual of the adjoint density");  
   /// DESCRIPTION: Residual of the adjoint momentum x-component.
-  AddVolumeOutput("RES_ADJ_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_MOMENTUM-X", "Residual_Adjoint_Momentum_x", "RESIDUAL", "Residual of the adjoint x-momentum");  
   /// DESCRIPTION: Residual of the adjoint momentum y-component.
-  AddVolumeOutput("RES_ADJ_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_MOMENTUM-Y", "Residual_Adjoint_Momentum_y", "RESIDUAL", "Residual of the adjoint y-momentum");  
   if (nDim == 3)
     /// DESCRIPTION: Residual of the adjoint momentum z-component.
-    AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL"); 
+    AddVolumeOutput("RES_ADJ_MOMENTUM-Z", "Residual_Adjoint_Momentum_z", "RESIDUAL", "Residual of the adjoint z-momentum"); 
   /// DESCRIPTION: Residual of the adjoint energy. 
-  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
+  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL", "Residual of the adjoint energy");            
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Residual of the nu tilde. 
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL", "Residual of the Spalart-Allmaras variable"); 
       break;  
     case SST:
       /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL", "Residual of the turb. kinetic energy");
       /// DESCRIPTION: Residual of the adjoint dissipation.
-      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
+      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL", "Residual of the rate of dissipation");
       break;
     default: break;
     }
@@ -362,14 +358,14 @@ void CAdjFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
   /// DESCRIPTION: Sensitivity x-component.
-  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY", "x-component of the sensitivity vector"); 
   /// DESCRIPTION: Sensitivity y-component.
-  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY", "y-component of the sensitivity vector");
   if (nDim == 3)
     /// DESCRIPTION: Sensitivity z-component.
-    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY", "z-component of the sensitivity vector");   
   /// DESCRIPTION: Sensitivity in normal direction.
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY", "sensitivity in normal direction"); 
   /// END_GROUP
  
 }
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 128bc28b1c26..fa4f23c16b87 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -308,83 +308,76 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
 
 void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
-  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
-  /// DESCRIPTION: x coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
-  /// DESCRIPTION: y coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    /// DESCRIPTION: z coordinates of the mesh nodes.
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  /// END_GROUP
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
   
   /// BEGIN_GROUP: SOLUTION, DESCRIPTION: The SOLUTION variables of the adjoint solver.
   /// DESCRIPTION: Adjoint Pressure.
-  AddVolumeOutput("ADJ_PRESSURE",    "Adjoint_Pressure",    "SOLUTION"); 
+  AddVolumeOutput("ADJ_PRESSURE",    "Adjoint_Pressure",    "SOLUTION", "Adjoint pressure"); 
   /// DESCRIPTION: Adjoint Velocity x-component.
-  AddVolumeOutput("ADJ_VELOCITY-X", "Adjoint_Velocity_x", "SOLUTION"); 
+  AddVolumeOutput("ADJ_VELOCITY-X", "Adjoint_Velocity_x", "SOLUTION", "x-component of the adjoint velocity vector"); 
   /// DESCRIPTION: Adjoint Velocity y-component.
-  AddVolumeOutput("ADJ_VELOCITY-Y", "Adjoint_Velocity_y", "SOLUTION"); 
+  AddVolumeOutput("ADJ_VELOCITY-Y", "Adjoint_Velocity_y", "SOLUTION", "y-component of the adjoint velocity vector"); 
   if (nDim == 3)
     /// DESCRIPTION: Adjoint Velocity z-component.
-    AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "SOLUTION"); 
+    AddVolumeOutput("ADJ_VELOCITY-Z", "Adjoint_Velocity_z", "SOLUTION", "z-component of the adjoint velocity vector"); 
  
   if (weakly_coupled_heat || heat){
-    AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION");
+    AddVolumeOutput("ADJ_HEAT", "Adjoint_Heat", "SOLUTION",  "Adjoint heat");
   }
 
   if (!config->GetFrozen_Visc_Disc()){    
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Adjoint nu tilde.
-      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION"); 
+      AddVolumeOutput("ADJ_NU_TILDE", "Adjoint_Nu_Tilde", "SOLUTION", "Adjoint Spalart-Allmaras variable"); 
       break;  
     case SST:
       /// DESCRIPTION: Adjoint kinetic energy.
-      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION"); 
+      AddVolumeOutput("ADJ_TKE", "Adjoint_TKE", "SOLUTION", "Adjoint turbulent kinetic energy"); 
       /// DESCRIPTION: Adjoint dissipation.
-      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION");  
+      AddVolumeOutput("ADJ_DISSIPATION", "Adjoint_Omega", "SOLUTION", "Adjoint rate of dissipation");  
       break;
     default: break;
     }
   }
   /// END_GROUP
   
-  /// BEGIN_GROUP: GRID_VELOCITY, DESCRIPTION: The grid velocity in case of a moving grid.  
+  // Grid velocity
   if (config->GetGrid_Movement()){
-    /// DESCRIPTION: Grid velocity x-component.
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY"); 
-    /// DESCRIPTION: Grid velocity y-component.
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY"); 
-    if (nDim == 3)    
-      /// DESCRIPTION: Grid velocity z-component.
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY"); 
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
+    if (nDim == 3 ) 
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY", "z-component of the grid velocity vector");
   }
-  /// END_GROUP
   
   /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the SOLUTION variables. 
   /// DESCRIPTION: Residual of the adjoint Pressure.
-  AddVolumeOutput("RES_ADJ_PRESSURE",    "Residual_Adjoint_Pressure",    "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_PRESSURE",    "Residual_Adjoint_Pressure",    "RESIDUAL", "Residual of the adjoint pressure");  
   /// DESCRIPTION: Residual of the adjoint Velocity x-component.
-  AddVolumeOutput("RES_ADJ_VELOCITY-X", "Residual_Adjoint_Velocity_x", "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_VELOCITY-X", "Residual_Adjoint_Velocity_x", "RESIDUAL", "Residual of the adjoint x-velocity");  
   /// DESCRIPTION: Residual of the adjoint Velocity y-component.
-  AddVolumeOutput("RES_ADJ_VELOCITY-Y", "Residual_Adjoint_Velocity_y", "RESIDUAL");  
+  AddVolumeOutput("RES_ADJ_VELOCITY-Y", "Residual_Adjoint_Velocity_y", "RESIDUAL", "Residual of the adjoint y-velocity");  
   if (nDim == 3)
     /// DESCRIPTION: Residual of the adjoint Velocity z-component.
-    AddVolumeOutput("RES_ADJ_Velocity-Z", "Residual_Adjoint_Velocity_z", "RESIDUAL"); 
+    AddVolumeOutput("RES_ADJ_Velocity-Z", "Residual_Adjoint_Velocity_z", "RESIDUAL", "Residual of the adjoint z-velocity"); 
   /// DESCRIPTION: Residual of the adjoint energy. 
-  AddVolumeOutput("RES_ADJ_ENERGY", "Residual_Adjoint_Energy", "RESIDUAL");            
+  AddVolumeOutput("RES_ADJ_HEAT", "Residual_Adjoint_Heat", "RESIDUAL", "Residual of the adjoint heat");            
   if (!config->GetFrozen_Visc_Disc()){      
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Residual of the nu tilde. 
-      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL"); 
+      AddVolumeOutput("RES_ADJ_NU_TILDE", "Residual_Adjoint_Nu_Tilde", "RESIDUAL", "Residual of the adjoint Spalart-Allmaras variable"); 
       break;  
     case SST:
       /// DESCRIPTION: Residual of the adjoint kinetic energy. 
-      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL");    
+      AddVolumeOutput("RES_ADJ_TKE", "Residual_Adjoint_TKE", "RESIDUAL", "Residual of the adjoint turb. kinetic energy");    
       /// DESCRIPTION: Residual of the adjoint dissipation.
-      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL");
+      AddVolumeOutput("RES_ADJ_DISSIPATION", "Residual_Adjoint_Omega", "RESIDUAL", "Residual of adjoint rate of dissipation");
       break;
     default: break;
     }
@@ -393,14 +386,14 @@ void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
   /// DESCRIPTION: Sensitivity x-component.
-  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY", "x-component of the sensitivity vector"); 
   /// DESCRIPTION: Sensitivity y-component.
-  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY", "y-component of the sensitivity vector");
   if (nDim == 3)
     /// DESCRIPTION: Sensitivity z-component.
-    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY", "z-component of the sensitivity vector");   
   /// DESCRIPTION: Sensitivity in normal direction.
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY", "sensitivity in normal direction"); 
   /// END_GROUP
  
 }
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 5cfc0cc4e32c..e50c6a57e177 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -140,37 +140,34 @@ void CAdjHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 
 void CAdjHeatOutput::SetVolumeOutputFields(CConfig *config){
   
-  /// BEGIN_GROUP: COORDINATES, DESCRIPTION: Coordinates of the mesh nodes.
-  /// DESCRIPTION: x coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-X", "x", "COORDINATES"); 
-  /// DESCRIPTION: y coordinates of the mesh nodes.
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  // Grid coordinates
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    /// DESCRIPTION: z coordinates of the mesh nodes.
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  /// END_GROUP
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
+
   
   /// BEGIN_GROUP: CONSERVATIVE, DESCRIPTION: The conservative variables of the adjoint solver.
   /// DESCRIPTION: Adjoint Pressure.
-  AddVolumeOutput("ADJ_TEMPERATURE",    "Adjoint_Temperature",    "SOLUTION");
+  AddVolumeOutput("ADJ_TEMPERATURE",    "Adjoint_Temperature",    "SOLUTION" ,"Adjoint Temperature");
   /// END_GROUP
   
   
   /// BEGIN_GROUP: RESIDUAL, DESCRIPTION: Residuals of the conservative variables. 
   /// DESCRIPTION: Residual of the adjoint Pressure.
-  AddVolumeOutput("RES_ADJ_TEMPERATURE",    "Residual_Adjoint_Temperature",    "RESIDUAL");
+  AddVolumeOutput("RES_ADJ_TEMPERATURE",    "Residual_Adjoint_Temperature",    "RESIDUAL", "Residual of the Adjoint Temperature");
   /// END_GROUP
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Geometrical sensitivities of the current objective function.
   /// DESCRIPTION: Sensitivity x-component.
-  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY_X", "Sensitivity_x", "SENSITIVITY", "x-component of the sensitivity vector"); 
   /// DESCRIPTION: Sensitivity y-component.
-  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY");
+  AddVolumeOutput("SENSITIVITY_Y", "Sensitivity_y", "SENSITIVITY", "y-component of the sensitivity vector");
   if (nDim == 3)
     /// DESCRIPTION: Sensitivity z-component.
-    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY");   
+    AddVolumeOutput("SENSITIVITY_Z", "Sensitivity_z", "SENSITIVITY", "z-component of the sensitivity vector");   
   /// DESCRIPTION: Sensitivity in normal direction.
-  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY"); 
+  AddVolumeOutput("SENSITIVITY", "Surface_Sensitivity", "SENSITIVITY", "sensitivity in normal direction"); 
   /// END_GROUP
  
 }
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 68442891f6c7..80a5b419f374 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -92,16 +92,15 @@ void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
   }
   
   // Grid coordinates
-  
-  AddVolumeOutput(RequestedVolumeFields[0], RequestedVolumeFields[0], "COORDINATES");
-  AddVolumeOutput(RequestedVolumeFields[1], RequestedVolumeFields[1], "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput(RequestedVolumeFields[2], RequestedVolumeFields[2], "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
 
   // Add all the remaining fields
   
   for (iField = nDim; iField < nRequestedVolumeFields; iField++){
-    AddVolumeOutput(RequestedVolumeFields[iField], RequestedVolumeFields[iField], "SOLUTION");
+    AddVolumeOutput(RequestedVolumeFields[iField], RequestedVolumeFields[iField], "SOLUTION","");
   }
   
 }
@@ -122,4 +121,4 @@ void CBaselineOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
     SetVolumeOutputValue(RequestedVolumeFields[iField], iPoint, Node_Sol->GetSolution(iField));
   }
   
-}
\ No newline at end of file
+}
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 8ecac2ee8ed9..6776ebaa3cd4 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -213,36 +213,36 @@ void CElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSo
 void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
 
-  AddVolumeOutput("DISPLACEMENT-X",    "Displacement_x", "SOLUTION");
-  AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "SOLUTION");
-  if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "SOLUTION");
+  AddVolumeOutput("DISPLACEMENT-X",    "Displacement_x", "SOLUTION", "x-component of the displacement vector");
+  AddVolumeOutput("DISPLACEMENT-Y",    "Displacement_y", "SOLUTION", "y-component of the displacement vector");
+  if (nDim == 3) AddVolumeOutput("DISPLACEMENT-Z", "Displacement_z", "SOLUTION", "z-component of the displacement vector");
   
   if(dynamic){
-    AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY");
-    AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY");
-    if (nDim == 3) AddVolumeOutput("VELOCITY-Z", "Velocity_z", "VELOCITY");
+    AddVolumeOutput("VELOCITY-X",    "Velocity_x", "VELOCITY", "x-component of the velocity vector");
+    AddVolumeOutput("VELOCITY-Y",    "Velocity_y", "VELOCITY", "y-component of the velocity vector");
+    if (nDim == 3) AddVolumeOutput("VELOCITY-Z", "Velocity_z", "VELOCITY", "z-component of the velocity vector");
     
-    AddVolumeOutput("ACCELERATION-X",    "Acceleration_x", "ACCELERATION");
-    AddVolumeOutput("ACCELERATION-Y",    "Acceleration_y", "ACCELERATION");
-    if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "ACCELERATION");
+    AddVolumeOutput("ACCELERATION-X",    "Acceleration_x", "ACCELERATION", "x-component of the acceleration vector");
+    AddVolumeOutput("ACCELERATION-Y",    "Acceleration_y", "ACCELERATION", "y-component of the acceleration vector");
+    if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "ACCELERATION", "z-component of the acceleration vector");
   }
   
-  AddVolumeOutput("STRESS-XX",    "Sxx", "STRESS");
-  AddVolumeOutput("STRESS-YY",    "Syy", "STRESS");
-  AddVolumeOutput("STRESS-XY",    "Sxy", "STRESS");
+  AddVolumeOutput("STRESS-XX",    "Sxx", "STRESS", "x-component of the normal stress vector");
+  AddVolumeOutput("STRESS-YY",    "Syy", "STRESS", "y-component of the normal stress vector");
+  AddVolumeOutput("STRESS-XY",    "Sxy", "STRESS", "xy shear stress component");
   
   if (nDim == 3) {
-    AddVolumeOutput("STRESS-ZZ",    "Szz", "STRESS");
-    AddVolumeOutput("STRESS-XZ",    "Sxz", "STRESS");
-    AddVolumeOutput("STRESS-YZ",    "Syz", "STRESS");
+    AddVolumeOutput("STRESS-ZZ",    "Szz", "STRESS", "z-component of the normal stress vector");
+    AddVolumeOutput("STRESS-XZ",    "Sxz", "STRESS", "xz shear stress component");
+    AddVolumeOutput("STRESS-YZ",    "Syz", "STRESS", "yz shear stress component");
   }
     
-  AddVolumeOutput("VON_MISES_STRESS", "Von_Mises_Stress", "STRESS");
+  AddVolumeOutput("VON_MISES_STRESS", "Von_Mises_Stress", "STRESS", "von-Mises stress");
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index e44ed0c5f824..1dd82b20f27c 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -153,45 +153,30 @@ void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
 void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  
-  // Solution variables
-  AddVolumeOutput("DENSITY",    "Density",    "SOLUTION");
-  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "SOLUTION");
-  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "SOLUTION");
-  if (nDim == 3)
-    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "SOLUTION");
-  AddVolumeOutput("ENERGY",     "Energy",     "SOLUTION");  
-  
-  // Turbulent Residuals
-  switch(config->GetKind_Turb_Model()){
-  case SST:
-    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
-    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
-    break;
-  case SA: case SA_COMP: case SA_E: 
-  case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
-    break;
-  case NONE:
-    break;
-  }
-  
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
+
+  // SOLUTION variables
+  AddVolumeOutput("PRESSURE",   "Pressure",   "SOLUTION", "Pressure");
+  AddVolumeOutput("VELOCITY-X", "Velocity_x", "SOLUTION", "x-component of the velocity vector");
+  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "SOLUTION", "y-component of the velocity vector");
+  if (nDim == 3) 
+    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "SOLUTION", "z-component of the velocity vector");
+
   // Primitive variables
-  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE");
-  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE");
-  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE");
-  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
-  
+  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE", "Pressure");
+  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE", "Temperature");
+  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE", "Mach number");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE", "Pressure coefficient");
+
   if (config->GetKind_Solver() == FEM_NAVIER_STOKES){
-    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE"); 
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
   }
   
   if (config->GetKind_Solver() == FEM_LES && (config->GetKind_SGS_Model() != IMPLICIT_LES)) {
-    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
   }
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 19b26f6ba890..a70009778c32 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -261,120 +261,129 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
-  
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
+
   // Solution variables
-  AddVolumeOutput("DENSITY",    "Density",    "SOLUTION");
-  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "SOLUTION");
-  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "SOLUTION");
+  AddVolumeOutput("DENSITY",    "Density",    "SOLUTION", "Density");
+  AddVolumeOutput("MOMENTUM-X", "Momentum_x", "SOLUTION", "x-component of the momentum vector");
+  AddVolumeOutput("MOMENTUM-Y", "Momentum_y", "SOLUTION", "y-component of the momentum vector");
   if (nDim == 3)
-    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "SOLUTION");
-  AddVolumeOutput("ENERGY",     "Energy",     "SOLUTION");  
+    AddVolumeOutput("MOMENTUM-Z", "Momentum_z", "SOLUTION", "z-component of the momentum vector");
+  AddVolumeOutput("ENERGY",     "Energy",     "SOLUTION", "Energy");  
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
-    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
+    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION", "Turbulent kinetic energy");
+    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION", "Rate of dissipation");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION", "Spalart-Allmaras variable");
     break;
   case NONE:
     break;
   }
   
+  // Grid velocity
+  if (config->GetGrid_Movement()){
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
+    if (nDim == 3 ) 
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY", "z-component of the grid velocity vector");
+  }
+  
   // Primitive variables
-  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE");
-  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE");
-  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE");
-  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
+  AddVolumeOutput("PRESSURE",    "Pressure",                "PRIMITIVE", "Pressure");
+  AddVolumeOutput("TEMPERATURE", "Temperature",             "PRIMITIVE", "Temperature");
+  AddVolumeOutput("MACH",        "Mach",                    "PRIMITIVE", "Mach number");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE", "Pressure coefficient");
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
     
-    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE");
-    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE", "x-component of the skin friction vector");
+    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE", "y-component of the skin friction vector");
     if (nDim == 3)
-      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE");
+      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE", "z-component of the skin friction vector");
     
-    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
-    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE", "Heat-flux");
+    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE", "Non-dim. wall distance (Y-Plus)");
     
   }
   
   if (config->GetKind_Solver() == RANS) {
-    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY", "Intermittency");
   }
 
   //Residuals
-  AddVolumeOutput("RES_DENSITY", "Residual_Density", "RESIDUAL");
-  AddVolumeOutput("RES_MOMENTUM-X", "Residual_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RES_MOMENTUM-Y", "Residual_Momentum_y", "RESIDUAL");
+  AddVolumeOutput("RES_DENSITY", "Residual_Pressure", "RESIDUAL", "Residual of the density");
+  AddVolumeOutput("RES_MOMENTUM-X", "Residual_Momentum_x", "RESIDUAL", "Residual of the x-momentum component");
+  AddVolumeOutput("RES_MOMENTUM-Y", "Residual_Momentum_y", "RESIDUAL", "Residual of the y-momentum component");
   if (nDim == 3)
-    AddVolumeOutput("RES_MOMENTUM-Z", "Residual_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RES_ENERGY", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RES_MOMENTUM-Z", "Residual_Momentum_z", "RESIDUAL", "Residual of the z-momentum component");
+  AddVolumeOutput("RES_ENERGY", "Residual_Energy", "RESIDUAL", "Residual of the energy");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL", "Residual of turbulent kinetic energy");
+    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL", "Residual of the rate of dissipation");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL", "Residual of the Spalart-Allmaras variable");
     break;
   case NONE:
     break;
   }
   
   // Limiter values
-  AddVolumeOutput("LIMITER_DENSITY", "Limiter_Density", "LIMITER");
-  AddVolumeOutput("LIMITER_MOMENTUM-X", "Limiter_Momentum_x", "LIMITER");
-  AddVolumeOutput("LIMITER_MOMENTUM-Y", "Limiter_Momentum_y", "LIMITER");
+  AddVolumeOutput("LIMITER_DENSITY", "Limiter_Density", "LIMITER", "Limiter value of the density");
+  AddVolumeOutput("LIMITER_MOMENTUM-X", "Limiter_Momentum_x", "LIMITER", "Limiter value of the x-momentum");
+  AddVolumeOutput("LIMITER_MOMENTUM-Y", "Limiter_Momentum_y", "LIMITER", "Limiter value of the y-momentum");
   if (nDim == 3)
-    AddVolumeOutput("LIMITER_MOMENTUM-Z", "Limiter_Momentum_z", "LIMITER");
-  AddVolumeOutput("LIMITER_ENERGY", "Limiter_Energy", "LIMITER");
+    AddVolumeOutput("LIMITER_MOMENTUM-Z", "Limiter_Momentum_z", "LIMITER", "Limiter value of the z-momentum");
+  AddVolumeOutput("LIMITER_ENERGY", "Limiter_Energy", "LIMITER", "Limiter value of the energy");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "LIMITER", "Limiter value of turb. kinetic energy");
+    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "LIMITER", "Limiter value of dissipation rate");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "LIMITER", "Limiter value of the Spalart-Allmaras variable");
     break;
   case NONE:
     break;
   }
+
   
   // Hybrid RANS-LES
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
-    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES");
+    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES", "DES length scale value");
+    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES", "Wall distance value");
   }
   
   // Roe Low Dissipation
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION", "Value of the Roe dissipation");
   }
   
   if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     if (nDim == 3){
-      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION");
-      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION");
+      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION", "x-component of the vorticity vector");
+      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION", "y-component of the vorticity vector");
     }
-    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION");
-    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION");  
+    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION", "z-component of the vorticity vector");
+    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");  
   }
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 1fc754ed2f18..e4ba6c2ba17c 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -307,28 +307,28 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
   
   // SOLUTION variables
-  AddVolumeOutput("PRESSURE",   "Pressure",   "SOLUTION");
-  AddVolumeOutput("VELOCITY-X", "Velocity_x", "SOLUTION");
-  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "SOLUTION");
+  AddVolumeOutput("PRESSURE",   "Pressure",   "SOLUTION", "Pressure");
+  AddVolumeOutput("VELOCITY-X", "Velocity_x", "SOLUTION", "x-component of the velocity vector");
+  AddVolumeOutput("VELOCITY-Y", "Velocity_y", "SOLUTION", "y-component of the velocity vector");
   if (nDim == 3) 
-    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "SOLUTION");
+    AddVolumeOutput("VELOCITY-Z", "Velocity_z", "SOLUTION", "z-component of the velocity vector");
   if (heat || weakly_coupled_heat) 
-    AddVolumeOutput("TEMPERATURE",  "Temperature","SOLUTION");  
+    AddVolumeOutput("TEMPERATURE",  "Temperature","SOLUTION", "Temperature");  
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION");
-    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION");
+    AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION", "Turbulent kinetic energy");
+    AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION", "Rate of dissipation");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION");
+    AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION", "Spalart–Allmaras variable");
     break;
   case NONE:
     break;
@@ -336,74 +336,74 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid velocity
   if (config->GetGrid_Movement()){
-    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY");
-    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY");
+    AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
+    AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
     if (nDim == 3 ) 
-      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY");
+      AddVolumeOutput("GRID_VELOCITY-Z", "Grid_Velocity_z", "GRID_VELOCITY", "z-component of the grid velocity vector");
   }
   
   // Primitive variables
-  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE");
-  AddVolumeOutput("DENSITY",        "Density",              "PRIMITIVE");
+  AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE", "Pressure coefficient");
+  AddVolumeOutput("DENSITY",        "Density",              "PRIMITIVE", "Density");
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
     
-    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE");
-    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE");
+    AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE", "x-component of the skin friction vector");
+    AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE", "y-component of the skin friction vector");
     if (nDim == 3)
-      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE");
+      AddVolumeOutput("SKIN_FRICTION-Z", "Skin_Friction_Coefficient_z", "PRIMITIVE", "z-component of the skin friction vector");
     
-    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE");
-    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE");
+    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE", "Heat-flux");
+    AddVolumeOutput("Y_PLUS", "Y_Plus", "PRIMITIVE", "Non-dim. wall distance (Y-Plus)");
     
   }
   
   if (config->GetKind_Solver() == RANS) {
-    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE");
+    AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
   }
   
   if (config->GetKind_Trans_Model() == BC){
-    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY");
+    AddVolumeOutput("INTERMITTENCY", "gamma_BC", "INTERMITTENCY", "Intermittency");
   }
 
   //Residuals
-  AddVolumeOutput("RES_PRESSURE", "Residual_Density", "RESIDUAL");
-  AddVolumeOutput("RES_VELOCITY-X", "Residual_Momentum_x", "RESIDUAL");
-  AddVolumeOutput("RES_VELOCITY-Y", "Residual_Momentum_y", "RESIDUAL");
+  AddVolumeOutput("RES_PRESSURE", "Residual_Pressure", "RESIDUAL", "Residual of the pressure");
+  AddVolumeOutput("RES_VELOCITY-X", "Residual_Velocity_x", "RESIDUAL", "Residual of the x-velocity component");
+  AddVolumeOutput("RES_VELOCITY-Y", "Residual_Velocity_y", "RESIDUAL", "Residual of the y-velocity component");
   if (nDim == 3)
-    AddVolumeOutput("RES_VELOCITY-Z", "Residual_Momentum_z", "RESIDUAL");
-  AddVolumeOutput("RES_TEMPERATURE", "Residual_Energy", "RESIDUAL");
+    AddVolumeOutput("RES_VELOCITY-Z", "Residual_Velocity_z", "RESIDUAL", "Residual of the z-velocity component");
+  AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL", "Residual of the temperature");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL");
-    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL");
+    AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL", "Residual of turbulent kinetic energy");
+    AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL", "Residual of the rate of dissipation.");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("RES_NU_TILDE", "Residual_Nu_Tilde", "RESIDUAL", "Residual of the Spalart–Allmaras variable");
     break;
   case NONE:
     break;
   }
   
   // Limiter values
-  AddVolumeOutput("LIMITER_PRESSURE", "Limiter_Pressure", "LIMITER");
-  AddVolumeOutput("LIMITER_VELOCITY-X", "Limiter_Velocity_x", "LIMITER");
-  AddVolumeOutput("LIMITER_VELOCITY-Y", "Limiter_Velocity_y", "LIMITER");
+  AddVolumeOutput("LIMITER_PRESSURE", "Limiter_Pressure", "LIMITER", "Limiter value of the pressure");
+  AddVolumeOutput("LIMITER_VELOCITY-X", "Limiter_Velocity_x", "LIMITER", "Limiter value of the x-velocity");
+  AddVolumeOutput("LIMITER_VELOCITY-Y", "Limiter_Velocity_y", "LIMITER", "Limiter value of the y-velocity");
   if (nDim == 3)
-    AddVolumeOutput("LIMITER_VELOCITY-Z", "Limiter_Velocity_z", "LIMITER");
-  AddVolumeOutput("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER");
+    AddVolumeOutput("LIMITER_VELOCITY-Z", "Limiter_Velocity_z", "LIMITER", "Limiter value of the z-velocity");
+  AddVolumeOutput("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER", "Limiter value of the temperature");
   
   switch(config->GetKind_Turb_Model()){
   case SST:
-    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "RESIDUAL");
-    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "RESIDUAL");
+    AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "LIMITER", "Limiter value of turb. kinetic energy.");
+    AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "LIMITER", "Limiter value of dissipation rate.");
     break;
   case SA: case SA_COMP: case SA_E: 
   case SA_E_COMP: case SA_NEG: 
-    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "RESIDUAL");
+    AddVolumeOutput("LIMITER_NU_TILDE", "Limiter_Nu_Tilde", "LIMITER", "Limiter value of Spalart–Allmaras variable.");
     break;
   case NONE:
     break;
@@ -411,22 +411,22 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   
   // Hybrid RANS-LES
   if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES){
-    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES");
-    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES");
+    AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES", "DES length scale value");
+    AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES", "Wall distance value");
   }
   
   // Roe Low Dissipation
   if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION");
+    AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION", "Value of the Roe dissipation");
   }
   
   if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     if (nDim == 3){
-      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION");
-      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION");
+      AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION", "x-component of the vorticity vector");
+      AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION", "y-component of the vorticity vector");
     }
-    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION");
-    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION");  
+    AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION", "z-component of the vorticity vector");
+    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");  
   }
 }
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 747fd2d2cf1a..f93f622d0f0c 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -128,16 +128,16 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
 void CHeatOutput::SetVolumeOutputFields(CConfig *config){
   
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES","z-component of the coordinate vector");
   
   // SOLUTION
-  AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION");
+  AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION", "Temperature");
 
   // Residuals  
-  AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL");
+  AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL", "RMS residual of the temperature");
   
 }
 
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index fbc8b09b2c59..7d4cdbae5fa1 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -63,10 +63,10 @@ CMeshOutput::~CMeshOutput(void) {
 void CMeshOutput::SetVolumeOutputFields(CConfig *config){
 
   // Grid coordinates
-  AddVolumeOutput("COORD-X", "x", "COORDINATES");
-  AddVolumeOutput("COORD-Y", "y", "COORDINATES");
+  AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput("COORD-Z", "z", "COORDINATES");
+    AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
 
   
 }

From a18ad78f2892c17d4bd0e56caf9d61179fa737cf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 31 Jul 2019 11:08:06 +0200
Subject: [PATCH 376/539] Small fixes

---
 SU2_CFD/src/drivers/CDriver.cpp                          | 9 ++++-----
 SU2_CFD/src/output/COutput.cpp                           | 4 ++--
 .../src/output/filewriter/CTecplotBinaryFileWriter.cpp   | 4 ++--
 externals/meson                                          | 2 +-
 externals/ninja                                          | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 45a78d0ed5b4..31436f58e396 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -1016,7 +1016,7 @@ void CDriver::Solver_Preprocessing(CConfig* config, CGeometry** geometry, CSolve
   unsigned short iSol;
   
   if (rank == MASTER_NODE)
-    cout << endl <<"------------------ Solver Preprocessing ( Zone " << config->GetiZone() <<" ) ------------------" << endl;
+    cout << endl <<"-------------------- Solver Preprocessing ( Zone " << config->GetiZone() <<" ) --------------------" << endl;
 
   solver = new CSolver**[config->GetnMGLevels()+1];
   
@@ -3576,10 +3576,9 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
   
   for (iZone = 0; iZone < nZone; iZone++){
 
-    /*--- Initial print to console for this zone. ---*/
-
-    if (rank == MASTER_NODE) cout << "Zone " << iZone;
-
+    if (rank == MASTER_NODE)
+      cout << endl <<"-------------------- Output Preprocessing ( Zone " << iZone <<" ) --------------------" << endl;
+   
     /*--- Loop over all zones and instantiate the physics iteration. ---*/
 
     switch (config[iZone]->GetKind_Solver()) {
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 2780452d6033..5330d41ad77e 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1120,7 +1120,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   
   unsigned short iMarker = 0;
   unsigned long iPoint = 0, jPoint = 0;
-  long iVertex = 0;
+  unsigned long iVertex = 0;
   
   /*--- Reset the offset cache and index --- */
   Offset_Cache_Index = 0;
@@ -1524,7 +1524,7 @@ void COutput::PrintHistoryFields(){
       }
     }
     
-    cout << "Output fields for the current configuration: " << endl;
+    cout << "Available output fields for the current configuration in " << MultiZoneHeaderString << ":" << endl;
     
     HistoryFieldTable.AddColumn("Name", NameSize);
     HistoryFieldTable.AddColumn("Group Name", GroupSize);
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 0e85e999a031..5402dcc64ed9 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -96,7 +96,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   num_nodes = static_cast<int64_t>(data_sorter->GetnPointsGlobal());
   num_cells = static_cast<int64_t>(data_sorter->GetnElem());
   if (nDim == 3){
-    if ((nTot_Quad >= 0 || nTot_Tria >= 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
+    if ((nTot_Quad > 0 || nTot_Tria > 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
       zone_type = ZONETYPE_FEQUADRILATERAL;
     }
     else {
@@ -104,7 +104,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     }
   }
   else {
-    if (nTot_Line >= 0 && (nTot_Tria + nTot_Quad == 0)){
+    if (nTot_Line > 0 && (nTot_Tria + nTot_Quad == 0)){
       zone_type = ZONETYPE_FELINESEG;
       
     }
diff --git a/externals/meson b/externals/meson
index c904d3eefe2a..e9bd7d49bdc8 160000
--- a/externals/meson
+++ b/externals/meson
@@ -1 +1 @@
-Subproject commit c904d3eefe2a01ca60027e2a5192e1f1c7ca5d9d
+Subproject commit e9bd7d49bdc8c630cca3bf4cc02c437841b6aaf6
diff --git a/externals/ninja b/externals/ninja
index e0bc2e5fd903..20b30dac6698 160000
--- a/externals/ninja
+++ b/externals/ninja
@@ -1 +1 @@
-Subproject commit e0bc2e5fd9036a31d507881e1383adde3672aaef
+Subproject commit 20b30dac6698d119e7797b34d6ed2c4ed8f48417

From ed6117264518d3b9fb8a1170ee412e1976ef0972 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 31 Jul 2019 11:09:03 +0200
Subject: [PATCH 377/539] Add print volume field routine

---
 SU2_CFD/src/drivers/CDummyDriver.cpp |  6 ++--
 SU2_CFD/src/output/COutput.cpp       | 47 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDummyDriver.cpp b/SU2_CFD/src/drivers/CDummyDriver.cpp
index 691c5db8a025..414f40d6e7ac 100644
--- a/SU2_CFD/src/drivers/CDummyDriver.cpp
+++ b/SU2_CFD/src/drivers/CDummyDriver.cpp
@@ -17,6 +17,8 @@ void CDummyDriver::StartSolver(){
     cout << "--------------------------------------------" << endl;
   }
   
-  output_container[ZONE_0]->PrintHistoryFields();
-  
+  for (iZone = 0; iZone < nZone; iZone++){
+    output_container[iZone]->PrintVolumeFields();
+    output_container[iZone]->PrintHistoryFields();
+  }
 }
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 5330d41ad77e..9755a2aacf99 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1603,3 +1603,50 @@ void COutput::PrintHistoryFields(){
 
   }
 }
+
+void COutput::PrintVolumeFields(){
+  
+  if (rank == MASTER_NODE){
+    
+    PrintingToolbox::CTablePrinter VolumeFieldTable(&std::cout);
+    
+    unsigned short NameSize = 0, GroupSize = 0, DescrSize = 0;
+    
+    for (unsigned short iField = 0; iField < VolumeOutput_List.size(); iField++){
+      
+      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField]];
+      
+      if (Field.Description != ""){
+        if (VolumeOutput_List[iField].size() > NameSize){
+          NameSize = VolumeOutput_List[iField].size();
+        }
+        if (Field.OutputGroup.size() > GroupSize){
+          GroupSize = Field.OutputGroup.size();
+        }
+        if (Field.Description.size() > DescrSize){
+          DescrSize = Field.Description.size();
+        }
+      }
+    }
+    
+    cout << "Available output fields for the current configuration in " << MultiZoneHeaderString << ":" << endl;
+    
+    VolumeFieldTable.AddColumn("Name", NameSize);
+    VolumeFieldTable.AddColumn("Group Name", GroupSize);
+    VolumeFieldTable.AddColumn("Description", DescrSize);
+    VolumeFieldTable.SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+    
+    VolumeFieldTable.PrintHeader();
+    
+    for (unsigned short iField = 0; iField < VolumeOutput_List.size(); iField++){
+      
+      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField]];
+
+      if (Field.Description != "")
+        VolumeFieldTable << VolumeOutput_List[iField] << Field.OutputGroup << Field.Description;
+      
+    }
+    
+    VolumeFieldTable.PrintFooter();
+  }
+}

From 9636e1420877c0ce895e42a7439b02209cd3515d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 1 Aug 2019 15:00:07 +0200
Subject: [PATCH 378/539] Adding cli11 deps

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index b27aac92baac..4e589b1014d9 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ pymod = import('python')
 python = pymod.find_installation()
 
 su2_cpp_args = []
-su2_deps     = []
+su2_deps     = [declare_dependency(include_directories: 'externals/CLI11')]
 
 default_warning_flags = ['-Wno-unused-parameter',
                          '-Wno-empty-body',

From cf15e96c1b00ae143295b79e0e60a0c15b9e11e7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 1 Aug 2019 16:51:26 +0200
Subject: [PATCH 379/539] Fixing offset cache

---
 SU2_CFD/src/output/COutput.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9755a2aacf99..7d82a2ade276 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1152,13 +1152,17 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
         jPoint++;
+       
+        /*--- Reset the cache index ---*/   
         
+        Offset_Cache_Index = 0;
+
       }
     }
     
   } else {
     
-    for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
+    for (iPoint = 0; iPoint < geometry->GetnPointDomain(); iPoint++) {
       
       /*--- Build the offset cache if it is the first point --- */
       
@@ -1172,6 +1176,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       /*--- Load the volume data into the Local_Data() array. --- */
       
       LoadVolumeData(config, geometry, solver, iPoint);
+      
+      /*--- Reset the cache index ---*/
+      
+      Offset_Cache_Index = 0;
 
     }
     
@@ -1190,8 +1198,13 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
         
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
         
-        LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+        if (geometry->node[iPoint]->GetDomain()) {
+          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+        }
+        
+        /*--- Reset the cache index ---*/ 
         
+        Offset_Cache_Index = 0;
       }   
     } 
   }
@@ -1222,9 +1235,6 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
     if (Offset != -1){
       Local_Data[iPoint][Offset] = value;
     }   
-    if (Offset_Cache_Index == Offset_Cache.size()){
-      Offset_Cache_Index = 0;
-    }
   }
   
 }

From bf65c6f598d2b26999d42ecf797242a905e09341 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 5 Aug 2019 13:44:14 +0200
Subject: [PATCH 380/539] Adapted some test case values

---
 TestCases/parallel_regression_AD.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
index 4aa4b65e6d6a..b39562ef4124 100644
--- a/TestCases/parallel_regression_AD.py
+++ b/TestCases/parallel_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [2.228982, 1.717042, 4.7258e+04, 0.0000e+00] #last 4 columns
+    discadj_arina2k.test_vals    = [-0.747330, -0.782632, 326.910000, 0.000000] #last 4 columns
     discadj_arina2k.su2_exec     = "parallel_computation.py -f"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001
@@ -120,7 +120,7 @@ def main():
     discadj_incomp_NACA0012.cfg_dir   = "disc_adj_incomp_euler/naca0012"
     discadj_incomp_NACA0012.cfg_file  = "incomp_NACA0012_disc.cfg"
     discadj_incomp_NACA0012.test_iter = 20
-    discadj_incomp_NACA0012.test_vals = [-3.595580, -2.549720, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_NACA0012.test_vals = [20.000000, -3.595580, -2.549720, 0.000000] #last 4 columns
     discadj_incomp_NACA0012.su2_exec  = "parallel_computation.py -f"
     discadj_incomp_NACA0012.timeout   = 1600
     discadj_incomp_NACA0012.tol       = 0.00001
@@ -135,7 +135,7 @@ def main():
     discadj_incomp_cylinder.cfg_dir   = "disc_adj_incomp_navierstokes/cylinder"
     discadj_incomp_cylinder.cfg_file  = "heated_cylinder.cfg"
     discadj_incomp_cylinder.test_iter = 20
-    discadj_incomp_cylinder.test_vals = [-2.104640, -2.004547, 0.0000e+00, 0.0000e+00] #last 4 columns
+    discadj_incomp_cylinder.test_vals = [20.000000, -2.104640, -2.004547, 0.0000e+00] #last 4 columns
     discadj_incomp_cylinder.su2_exec  = "parallel_computation.py -f"
     discadj_incomp_cylinder.timeout   = 1600
     discadj_incomp_cylinder.tol       = 0.00001
@@ -150,7 +150,7 @@ def main():
     discadj_incomp_turb_NACA0012_sa.cfg_dir   = "disc_adj_incomp_rans/naca0012"
     discadj_incomp_turb_NACA0012_sa.cfg_file  = "turb_naca0012_sa.cfg"
     discadj_incomp_turb_NACA0012_sa.test_iter = 10
-    discadj_incomp_turb_NACA0012_sa.test_vals = [-3.846036, -1.031071, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_turb_NACA0012_sa.test_vals = [10.000000, -3.846036, -1.031071, 0.000000] #last 4 columns
     discadj_incomp_turb_NACA0012_sa.su2_exec  = "parallel_computation.py -f"
     discadj_incomp_turb_NACA0012_sa.timeout   = 1600
     discadj_incomp_turb_NACA0012_sa.tol       = 0.00001
@@ -161,7 +161,7 @@ def main():
     discadj_incomp_turb_NACA0012_sst.cfg_dir   = "disc_adj_incomp_rans/naca0012"
     discadj_incomp_turb_NACA0012_sst.cfg_file  = "turb_naca0012_sst.cfg"
     discadj_incomp_turb_NACA0012_sst.test_iter = 10
-    discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845805, -2.415680, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845805, -2.415680, -8.430441, 0.000000] #last 4 columns
     discadj_incomp_turb_NACA0012_sst.su2_exec  = "parallel_computation.py -f"
     discadj_incomp_turb_NACA0012_sst.timeout   = 1600
     discadj_incomp_turb_NACA0012_sst.tol       = 0.00001
@@ -208,7 +208,7 @@ def main():
     discadj_trans_stator.cfg_dir   = "disc_adj_turbomachinery/transonic_stator_2D"
     discadj_trans_stator.cfg_file  = "transonic_stator.cfg" 
     discadj_trans_stator.test_iter = 79
-    discadj_trans_stator.test_vals = [-1.923936, -2.119783, -0.510181, -20.818266] #last 4 columns
+    discadj_trans_stator.test_vals = [79.000000,-1.923936, -2.119783] #last 4 columns
     discadj_trans_stator.su2_exec  = "parallel_computation.py -f"
     discadj_trans_stator.timeout   = 1600
     discadj_trans_stator.tol       = 0.00001
@@ -223,7 +223,7 @@ def main():
     discadj_fea.cfg_dir   = "disc_adj_fea"
     discadj_fea.cfg_file  = "configAD_fem.cfg" 
     discadj_fea.test_iter = 9
-    discadj_fea.test_vals = [-5.394766, -5.572142, -0.000364, -8.708700] #last 4 columns
+    discadj_fea.test_vals = [-5.394766, -5.572142, -0.000364, -8.708681] #last 4 columns
     discadj_fea.su2_exec  = "parallel_computation.py -f"
     discadj_fea.timeout   = 1600
     discadj_fea.tol       = 0.00001
@@ -238,7 +238,7 @@ def main():
     discadj_heat.cfg_dir   = "disc_adj_heat"
     discadj_heat.cfg_file  = "disc_adj_heat.cfg"
     discadj_heat.test_iter = 10
-    discadj_heat.test_vals = [3.183906, 0.923840, -223.197830, -2059.808372] #last 4 columns
+    discadj_heat.test_vals = [3.183906, 0.923840, -223.200000, -2059.800000] #last 4 columns
     discadj_heat.su2_exec  = "parallel_computation.py -f"
     discadj_heat.timeout   = 1600
     discadj_heat.tol       = 0.00001

From 391a1e50bddedf0940554b7b53557eba3ce6ce69 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 5 Aug 2019 13:44:36 +0200
Subject: [PATCH 381/539] Deactivated disc adj fsi cases for now

---
 TestCases/parallel_regression_AD.py | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
index b39562ef4124..ad221572b83c 100644
--- a/TestCases/parallel_regression_AD.py
+++ b/TestCases/parallel_regression_AD.py
@@ -248,16 +248,16 @@ def main():
     ### Coupled FSI Adjoint         ###
     ###################################
    
-    # Structural model
-    discadj_fsi           = TestCase('discadj_fsi')
-    discadj_fsi.cfg_dir   = "disc_adj_fsi"
-    discadj_fsi.cfg_file  = "configAD_fsi.cfg" 
-    discadj_fsi.test_iter = 3000
-    discadj_fsi.test_vals = [0.958848,-0.157183,0.658415,1.302076] #last 4 columns
-    discadj_fsi.su2_exec  = "parallel_computation.py -f"
-    discadj_fsi.timeout   = 1600
-    discadj_fsi.tol       = 0.00001
-    test_list.append(discadj_fsi)
+#    # Structural model
+#    discadj_fsi           = TestCase('discadj_fsi')
+#    discadj_fsi.cfg_dir   = "disc_adj_fsi"
+#    discadj_fsi.cfg_file  = "configAD_fsi.cfg" 
+#    discadj_fsi.test_iter = 3000
+#    discadj_fsi.test_vals = [0.958848,-0.157183,0.658415,1.302076] #last 4 columns
+#    discadj_fsi.su2_exec  = "parallel_computation.py -f"
+#    discadj_fsi.timeout   = 1600
+#    discadj_fsi.tol       = 0.00001
+#    test_list.append(discadj_fsi)
 
     ######################################
     ### RUN TESTS                      ###
@@ -285,16 +285,16 @@ def main():
     ### Coupled FSI Adjoint         ###
     ###################################
 
-    discadj_fsi2           = TestCase('discadj_fsi_airfoil')
-    discadj_fsi2.cfg_dir   = "disc_adj_fsi/Airfoil_2d"
-    discadj_fsi2.cfg_file  = "config.cfg"
-    discadj_fsi2.test_iter = 0
-    discadj_fsi2.su2_exec  = "parallel_computation.py"
-    discadj_fsi2.timeout   = 1600
-    discadj_fsi2.reference_file = "grad_young.opt.ref"
-    discadj_fsi2.test_file = "grad_young.opt"
-    pass_list.append(discadj_fsi2.run_filediff())
-    test_list.append(discadj_fsi2)
+#    discadj_fsi2           = TestCase('discadj_fsi_airfoil')
+#    discadj_fsi2.cfg_dir   = "disc_adj_fsi/Airfoil_2d"
+#    discadj_fsi2.cfg_file  = "config.cfg"
+#    discadj_fsi2.test_iter = 0
+#    discadj_fsi2.su2_exec  = "parallel_computation.py"
+#    discadj_fsi2.timeout   = 1600
+#    discadj_fsi2.reference_file = "grad_young.opt.ref"
+#    discadj_fsi2.test_file = "grad_young.opt"
+#    pass_list.append(discadj_fsi2.run_filediff())
+#    test_list.append(discadj_fsi2)
 
     # Tests summary
     print('==================================================================')

From fbae2d8b25a5a02de7d00f162da973ee6dbb6707 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 5 Aug 2019 13:52:19 +0200
Subject: [PATCH 382/539] Adapted some test case values (order of output has
 changed)

---
 TestCases/serial_regression_AD.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 1355f9872712..6b798ab6038b 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -105,7 +105,7 @@ def main():
     discadj_rans_naca0012_sst.cfg_dir   = "disc_adj_rans/naca0012"
     discadj_rans_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
     discadj_rans_naca0012_sst.test_iter = 10
-    discadj_rans_naca0012_sst.test_vals = [-0.491485, -7.124034, 0.109160, 0.000011] #last 4 columns
+    discadj_rans_naca0012_sst.test_vals = [-1.654903, -0.491485, 0.109160, 0.000011] #last 4 columns
     discadj_rans_naca0012_sst.su2_exec  = "SU2_CFD_AD"
     discadj_rans_naca0012_sst.timeout   = 1600
     discadj_rans_naca0012_sst.tol       = 0.00001
@@ -120,7 +120,7 @@ def main():
     discadj_incomp_NACA0012.cfg_dir   = "disc_adj_incomp_euler/naca0012"
     discadj_incomp_NACA0012.cfg_file  = "incomp_NACA0012_disc.cfg"
     discadj_incomp_NACA0012.test_iter = 20
-    discadj_incomp_NACA0012.test_vals = [-3.633197, -2.544956, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_NACA0012.test_vals = [20.000000, -3.633197, -2.544956, 0.000000] #last 4 columns
     discadj_incomp_NACA0012.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_NACA0012.timeout   = 1600
     discadj_incomp_NACA0012.tol       = 0.00001
@@ -135,7 +135,7 @@ def main():
     discadj_incomp_cylinder.cfg_dir   = "disc_adj_incomp_navierstokes/cylinder"
     discadj_incomp_cylinder.cfg_file  = "heated_cylinder.cfg"
     discadj_incomp_cylinder.test_iter = 20
-    discadj_incomp_cylinder.test_vals = [-2.374306, -2.371564, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_cylinder.test_vals = [20.000000, -2.374306, -2.371564, 0.000000] #last 4 columns
     discadj_incomp_cylinder.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_cylinder.timeout   = 1600
     discadj_incomp_cylinder.tol       = 0.00001
@@ -150,7 +150,7 @@ def main():
     discadj_incomp_turb_NACA0012_sa.cfg_dir   = "disc_adj_incomp_rans/naca0012"
     discadj_incomp_turb_NACA0012_sa.cfg_file  = "turb_naca0012_sa.cfg"
     discadj_incomp_turb_NACA0012_sa.test_iter = 10
-    discadj_incomp_turb_NACA0012_sa.test_vals = [-3.845979, -1.031094, 0.000000, 0.000000] #last 4 columns
+    discadj_incomp_turb_NACA0012_sa.test_vals = [10.000000, -3.845979, -1.031095, 0.000000] #last 4 columns
     discadj_incomp_turb_NACA0012_sa.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_turb_NACA0012_sa.timeout   = 1600
     discadj_incomp_turb_NACA0012_sa.tol       = 0.00001
@@ -161,7 +161,7 @@ def main():
     discadj_incomp_turb_NACA0012_sst.cfg_dir   = "disc_adj_incomp_rans/naca0012"
     discadj_incomp_turb_NACA0012_sst.cfg_file  = "turb_naca0012_sst.cfg"
     discadj_incomp_turb_NACA0012_sst.test_iter = 10
-    discadj_incomp_turb_NACA0012_sst.test_vals = [-2.416670, -8.430657,  0.0000e+00, 0.0000e+00] #last 4 columns
+    discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845759, -2.416670, -8.430657, 0.000000] #last 4 columns
     discadj_incomp_turb_NACA0012_sst.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_turb_NACA0012_sst.timeout   = 1600
     discadj_incomp_turb_NACA0012_sst.tol       = 0.00001
@@ -208,7 +208,7 @@ def main():
     discadj_fea.cfg_dir   = "disc_adj_fea"
     discadj_fea.cfg_file  = "configAD_fem.cfg" 
     discadj_fea.test_iter = 9
-    discadj_fea.test_vals = [-6.319841, -6.375512, -0.000364, -8.708700] #last 4 columns
+    discadj_fea.test_vals = [-6.319841, -6.375512, -0.000364, -8.708681] #last 4 columns
     discadj_fea.su2_exec  = "SU2_CFD_AD"
     discadj_fea.timeout   = 1600
     discadj_fea.tol       = 0.00001

From 96beced786223c5b308ea8a31d8d41a338bac140 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 5 Aug 2019 16:30:31 +0200
Subject: [PATCH 383/539] More fixes

---
 SU2_CFD/src/drivers/CDriver.cpp               | 48 +++++++++++--------
 .../filewriter/CParaviewBinaryFileWriter.cpp  |  9 +---
 TestCases/serial_regression.py                |  2 +
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index f99a26f9ea8a..51e55d73ad31 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3910,18 +3910,6 @@ bool CDriver::Monitor(unsigned long ExtIter) {
   runtime = new CConfig(runtime_file_name, config_container[ZONE_0]);
   runtime->SetExtIter(ExtIter);
   delete runtime;
-  
-  /*--- Update the convergence history file (serial and parallel computations). ---*/
-  
-  if (!fsi) {
-    for (iZone = 0; iZone < nZone; iZone++) {
-      for (iInst = 0; iInst < nInst[iZone]; iInst++)
-        if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver())
-            || config_container[iZone]->GetBoolTurbomachinery() || config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-        output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
-            config_container, integration_container, false, UsedTime, iZone, iInst);
-    }
-  }
 
   /*--- Evaluate the new CFL number (adaptive). ---*/
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
@@ -4233,14 +4221,16 @@ CTurbomachineryDriver::CTurbomachineryDriver(char* confFile, unsigned short val_
 }
 
 CTurbomachineryDriver::~CTurbomachineryDriver(void) {
-  /*--- Close the convergence history file. ---*/
-  for (iZone = 0; iZone < nZone; iZone++) {
-    for (iInst = 0; iInst < 1; iInst++) {
-      ConvHist_file[iZone][iInst].close();
+  if (rank == MASTER_NODE){
+    /*--- Close the convergence history file. ---*/
+    for (iZone = 0; iZone < nZone; iZone++) {
+      for (iInst = 0; iInst < 1; iInst++) {
+        ConvHist_file[iZone][iInst].close();
+      }
+      delete [] ConvHist_file[iZone];
     }
-    delete [] ConvHist_file[iZone];
+    delete [] ConvHist_file;  
   }
-  delete [] ConvHist_file;  
 }
 
 void CTurbomachineryDriver::Run() {
@@ -4275,8 +4265,16 @@ void CTurbomachineryDriver::Run() {
   if (rank == MASTER_NODE){
     SetTurboPerformance(ZONE_0);
   }
+  
+  /*--- Update the convergence history file (serial and parallel computations). ---*/
+  
 
-
+  for (iZone = 0; iZone < nZone; iZone++) {
+    for (iInst = 0; iInst < nInst[iZone]; iInst++)
+      output_legacy->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+                                         config_container, integration_container, false, UsedTime, iZone, iInst);
+  }
+  
 }
 
 void CTurbomachineryDriver::SetMixingPlane(unsigned short donorZone){
@@ -4499,6 +4497,7 @@ CHBDriver::~CHBDriver(void) {
   for (kInst = 0; kInst < nInstHB; kInst++) if (D[kInst] != NULL) delete [] D[kInst];
   if (D[kInst] != NULL) delete [] D;
   
+  if (rank == MASTER_NODE){
   /*--- Close the convergence history file. ---*/
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInstHB; iInst++) {
@@ -4507,7 +4506,9 @@ CHBDriver::~CHBDriver(void) {
     delete [] ConvHist_file[iZone];
   }
   delete [] ConvHist_file;
+  }
 }
+  
 
 void CHBDriver::Run() {
 
@@ -4523,6 +4524,15 @@ void CHBDriver::Run() {
     iteration_container[ZONE_0][iInst]->Iterate(output_container[ZONE_0], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
         surface_movement, grid_movement, FFDBox, ZONE_0, iInst);
+  
+  /*--- Update the convergence history file (serial and parallel computations). ---*/
+  
+
+  for (iZone = 0; iZone < nZone; iZone++) {
+    for (iInst = 0; iInst < nInst[iZone]; iInst++)
+      output_legacy->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
+                                         config_container, integration_container, false, UsedTime, iZone, iInst);
+  }
 
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 33d8e15cceb6..4ebec2eece00 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -59,7 +59,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   FILE* fhw;
   fhw = fopen(fname, "wb");
   
-  unsigned long iNode2, iNode;
+  unsigned long iNode2;
   unsigned long nGlobal_Elem_Storage;
   
   /*--- Error check for opening the file. ---*/
@@ -144,7 +144,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   
   for (iElem = 0; iElem < nTot_Line; iElem++) {
-    iNode  = iElem*N_POINTS_LINE;
     iNode2 = iElem*(N_POINTS_LINE+1);
     conn_buf[iNode2+0] = N_POINTS_LINE;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1;
@@ -158,7 +157,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Line*(N_POINTS_LINE+1);
   
   for (iElem = 0; iElem < nTot_Tria; iElem++) {
-    iNode  = iElem*N_POINTS_TRIANGLE;
     iNode2 = iElem*(N_POINTS_TRIANGLE+1);
     conn_buf[iNode2+0] = N_POINTS_TRIANGLE;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
@@ -172,7 +170,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Tria*(N_POINTS_TRIANGLE+1);
   
   for (iElem = 0; iElem < nTot_Quad; iElem++) {
-    iNode  = iElem*N_POINTS_QUADRILATERAL;
     iNode2 = iElem*(N_POINTS_QUADRILATERAL+1);
     conn_buf[iNode2+0] = N_POINTS_QUADRILATERAL;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
@@ -187,7 +184,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Quad*(N_POINTS_QUADRILATERAL+1);
   
   for (iElem = 0; iElem < nTot_Tetr; iElem++) {
-    iNode  = iElem*N_POINTS_TETRAHEDRON;
     iNode2 = iElem*(N_POINTS_TETRAHEDRON+1);
     conn_buf[iNode2+0] = N_POINTS_TETRAHEDRON;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
@@ -202,7 +198,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Tetr*(N_POINTS_TETRAHEDRON+1);
    
   for (iElem = 0; iElem < nTot_Hexa; iElem++) {
-    iNode  = iElem*N_POINTS_HEXAHEDRON;
     iNode2 = iElem*(N_POINTS_HEXAHEDRON+1);
     conn_buf[iNode2+0] = N_POINTS_HEXAHEDRON;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
@@ -221,7 +216,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Hexa*(N_POINTS_HEXAHEDRON+1);
   
   for (iElem = 0; iElem < nTot_Pris; iElem++) {
-    iNode  = iElem*N_POINTS_PRISM;
     iNode2 = iElem*(N_POINTS_PRISM+1);
     conn_buf[iNode2+0] = N_POINTS_PRISM;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
@@ -238,7 +232,6 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   file_size += sizeof(int)*nTot_Pris*(N_POINTS_PRISM+1);
   
   for (iElem = 0; iElem < nTot_Pyra; iElem++) {
-    iNode  = iElem*N_POINTS_PYRAMID;
     iNode2 = iElem*(N_POINTS_PYRAMID+1);
     conn_buf[iNode2+0] = N_POINTS_PYRAMID;
     conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index a9fae4d91564..c176e8c1d65e 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1546,6 +1546,8 @@ def main():
     pywrapper_fsi2d.test_vals = [2.000000, 0.000000, -4.017814, -6.059791] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
     pywrapper_fsi2d.new_output  = True
+    pywrapper_fsi2d.unsteady  = True
+    pywrapper_fsi2d.multizone   = True
     pywrapper_fsi2d.timeout   = 1600
     pywrapper_fsi2d.tol       = 0.00001
     test_list.append(pywrapper_fsi2d)

From ed0f8aa9dced35c4d75d56aead467b27afdbcc2b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 5 Aug 2019 17:24:34 +0200
Subject: [PATCH 384/539] Adapted value (test iter has changed)

---
 TestCases/serial_regression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index c176e8c1d65e..ae67a1966ea8 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1543,7 +1543,7 @@ def main():
     pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     pywrapper_fsi2d.cfg_file  = "configFSI.cfg"
     pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [2.000000, 0.000000, -4.017814, -6.059791] #last 4 columns
+    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641487] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
     pywrapper_fsi2d.new_output  = True
     pywrapper_fsi2d.unsteady  = True

From 416ee3c9e458cc14c6dc520ed958a1b707ad1b82 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 6 Aug 2019 19:40:33 +0200
Subject: [PATCH 385/539] Fixed severe bug in data sorter routines

---
 .travis.yml                                   |   2 +-
 .../output/filewriter/CFVMDataSorter.hpp      |   4 +
 SU2_CFD/src/output/COutput.cpp                |  48 ++-----
 .../src/output/filewriter/CFVMDataSorter.cpp  | 123 ++++++++++++++++--
 .../filewriter/CSurfaceFVMDataSorter.cpp      |  83 ++++++++++--
 5 files changed, 203 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 428f6d61f7fb..76bb5db7ef28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,7 @@ before_script:
     - cp -R ./TestData/* ./TestCases/
 
     # Get the tutorial cases
-    - git clone -b develop https://github.com/su2code/su2code.github.io ./Tutorials
+    - git clone -b feature_input_output https://github.com/su2code/su2code.github.io ./Tutorials
     
     # Enter the SU2/TestCases/ directory, which is now ready to run
     - cd TestCases/
diff --git a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
index 452595211539..ea1c0c2d51c8 100644
--- a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
@@ -7,6 +7,7 @@ class CFVMDataSorter : public CParallelDataSorter{
   
 private:
   std::vector<std::vector<su2double> >* Local_Data;
+  int* Local_Halo;
   
 public:
   CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data);
@@ -30,8 +31,11 @@ class CFVMDataSorter : public CParallelDataSorter{
   
   unsigned long GetGlobalIndex(unsigned long iPoint) { return beg_node[rank] + iPoint; }
   
+  bool GetHalo(unsigned long iPoint){return Local_Halo[iPoint];}
+  
 private:
   
+  void SetHaloPoints(CGeometry *geometry, CConfig *config);
   
   /*!
    * \brief Sort the connectivity for a single volume element type into a linear partitioning across all processors.
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 7d82a2ade276..2ae9e8dc4c9e 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1143,19 +1143,13 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
       for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
         
-        if (jPoint == 0){
-          Build_Offset_Cache = true;
-        } else {
-          Build_Offset_Cache = false;
-        }
+        Build_Offset_Cache = !Offset_Cache.size() ? true : false;
         
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
         jPoint++;
-       
-        /*--- Reset the cache index ---*/   
         
-        Offset_Cache_Index = 0;
+        CheckOffsetCache();        
 
       }
     }
@@ -1164,47 +1158,30 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     for (iPoint = 0; iPoint < geometry->GetnPointDomain(); iPoint++) {
       
-      /*--- Build the offset cache if it is the first point --- */
-      
-      if (iPoint == 0){
-        Build_Offset_Cache = true;
-      } else {
-        Build_Offset_Cache = false;
-      }
-      
       /*--- Check for halos & write only if requested ---*/
       /*--- Load the volume data into the Local_Data() array. --- */
       
+      Build_Offset_Cache = !Offset_Cache.size() ? true : false;
+
       LoadVolumeData(config, geometry, solver, iPoint);
-      
-      /*--- Reset the cache index ---*/
-      
-      Offset_Cache_Index = 0;
 
     }
     
     /*--- Reset the offset cache and index --- */
     Offset_Cache_Index = 0;
-    Offset_Cache.clear();    
+    Offset_Cache.clear(); 
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
       for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
-        
-        if (iVertex == 0){
-          Build_Offset_Cache = true;
-        } else {
-          Build_Offset_Cache = false;
-        }
-        
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        
-        if (geometry->node[iPoint]->GetDomain()) {
+  
+        if(geometry->node[iPoint]->GetDomain()){
+          
+          Build_Offset_Cache = !Offset_Cache.size() ? true : false;
+   
           LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+          
         }
-        
-        /*--- Reset the cache index ---*/ 
-        
-        Offset_Cache_Index = 0;
       }   
     } 
   }
@@ -1235,6 +1212,9 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
     if (Offset != -1){
       Local_Data[iPoint][Offset] = value;
     }   
+    if (Offset_Cache_Index == Offset_Cache.size()){
+      Offset_Cache_Index = 0;
+    }
   }
   
 }
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 68a5986d26d7..2d1b818050dc 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -8,6 +8,13 @@ CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
   nLocalPoint_Sort  = geometry->GetnPointDomain();
   
+  /*--- Search all send/recv boundaries on this partition for halo cells. In
+   particular, consider only the recv conditions (these are the true halo
+   nodes). Check the ranks of the processors that are communicating and
+   choose to keep only the halo cells from the higher rank processor. ---*/
+
+  SetHaloPoints(geometry, config);
+  
   /*--- Create a linear partition --- */
   
   CreateLinearPartition(nGlobalPoint_Sort);  
@@ -19,7 +26,42 @@ CFVMDataSorter::~CFVMDataSorter(){
   delete [] end_node;
   delete [] nPoint_Cum;
   delete [] nPoint_Lin;
-    
+  delete [] Local_Halo;
+  
+}
+
+void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
+  
+  unsigned long iPoint, Global_Index, iVertex;
+  unsigned short iMarker;
+  int SendRecv, RecvFrom;
+  bool notHalo;
+
+  Local_Halo = new int[geometry->GetnPoint()];
+  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  
+  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+    if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
+      SendRecv = config->GetMarker_All_SendRecv(iMarker);
+      RecvFrom = abs(SendRecv)-1;
+      
+      for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
+        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
+        
+        /*--- We need to keep one copy of overlapping halo cells. ---*/
+        
+        notHalo = ((SendRecv < 0) && (rank > RecvFrom));
+        
+        /*--- If we found either of these types of nodes, flag them to be kept. ---*/
+        
+        if (notHalo) {
+          Local_Halo[iPoint] = false;
+        }
+      }
+    }
+  }
 }
 
 void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
@@ -492,12 +534,21 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
     connSend[ii] = 0;
   
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
   unsigned long *index = new unsigned long[size];
   for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
   
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   
@@ -537,6 +588,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
           
           nElem_Flag[iProcessor] = ii;
           unsigned long nn = index[iProcessor];
+          unsigned long mm = haloIndex[iProcessor];          
           
           /*--- Load the connectivity values. ---*/
           
@@ -544,11 +596,19 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
             iPoint = geometry->elem[ii]->GetNode(kk);
             connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
             
+            /*--- Check if this is a halo node. If so, flag this element
+             as a halo cell. We will use this later to sort and remove
+             any duplicates from the connectivity list. Note that just checking 
+             whether the point is a halo point is not enough, since we want to keep
+             elements on one side of the send receive boundary. ---*/
+            
+            if (Local_Halo[iPoint]) haloSend[mm] = true;
           }
           
           /*--- Increment the index by the message length ---*/
           
           index[iProcessor]    += NODES_PER_ELEMENT;
+          haloIndex[iProcessor]++;
           
         }
       }
@@ -558,6 +618,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   /*--- Free memory after loading up the send buffer. ---*/
   
   delete [] index;
+  delete [] haloIndex;
   
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
@@ -569,10 +630,14 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
     connRecv[ii] = 0;
   
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
 #ifdef HAVE_MPI
 
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
   
   /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
@@ -605,6 +670,38 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
       iMessage++;
     }
   }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
 #endif
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
@@ -618,15 +715,17 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   mm = nElem_Recv[rank];
   ll = nElem_Send[rank];
   kk = nElem_Send[rank+1];
+    
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
   
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  int number = nSends;
+  int number = 2*nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = nRecvs;
+  number = 2*nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -642,11 +741,13 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
   int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    nElem_Total++;
-    for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-      Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-      count++;
-    }  
+    if (!haloRecv[ii]) {
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }  
+    }
   }
   
   /*--- Store the particular global element count in the class data,
@@ -686,6 +787,8 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   
   delete [] connSend;
   delete [] connRecv;
+  delete [] haloSend;
+  delete [] haloRecv;
   delete [] nElem_Recv;
   delete [] nElem_Send;
   delete [] nElem_Flag;
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index d5315548022a..778c5bffaa50 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1123,7 +1123,6 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   
   unsigned long iMarker;  
   
-  int *Local_Halo = NULL;
   int *Conn_Elem  = NULL;
   
 #ifdef HAVE_MPI
@@ -1247,12 +1246,21 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
     connSend[ii] = 0;
   
+  /*--- Allocate arrays for storing halo flags. ---*/
+  
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  for (int ii = 0; ii < nElem_Send[size]; ii++)
+    haloSend[ii] = false;
+  
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
   unsigned long *index = new unsigned long[size];
   for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
 
+  unsigned long *haloIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
+  
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   
@@ -1289,6 +1297,7 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
               
               nElem_Flag[iProcessor] = ii;
               unsigned long nn = index[iProcessor];
+              unsigned long mm = haloIndex[iProcessor];
               
               /*--- Load the connectivity values. ---*/
               
@@ -1296,11 +1305,19 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
                 iPoint = geometry->bound[iMarker][ii]->GetNode(kk);
                 connSend[nn] = geometry->node[iPoint]->GetGlobalIndex(); nn++;
                 
+                /*--- Check if this is a halo node. If so, flag this element
+                 as a halo cell. We will use this later to sort and remove
+                 any duplicates from the connectivity list. ---*/
+                
+                if (volume_sorter->GetHalo(iPoint)) haloSend[mm] = true;
+                
               }
               
               /*--- Increment the index by the message length ---*/
               
-              index[iProcessor]    += NODES_PER_ELEMENT;              
+              index[iProcessor]    += NODES_PER_ELEMENT;   
+              haloIndex[iProcessor]++;
+              
             }
           }
         }
@@ -1311,6 +1328,7 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   /*--- Free memory after loading up the send buffer. ---*/
   
   delete [] index;
+  delete [] haloIndex;
   
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
@@ -1321,13 +1339,17 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
   for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
     connRecv[ii] = 0;
-
+  
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
+  for (int ii = 0; ii < nElem_Recv[size]; ii++)
+    haloRecv[ii] = false;
+  
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
    and the flags for the halo cells. ---*/
   
-  send_req = new SU2_MPI::Request[nSends];
-  recv_req = new SU2_MPI::Request[nRecvs];
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
   
   /*--- Launch the non-blocking recv's for the connectivity. ---*/
   
@@ -1360,6 +1382,38 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
       iMessage++;
     }
   }
+  
+  /*--- Repeat the process to communicate the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Recv[ii+1] > nElem_Recv[ii])) {
+      int ll     = nElem_Recv[ii];
+      int kk     = nElem_Recv[ii+1] - nElem_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(haloRecv[ll]), count, MPI_UNSIGNED_SHORT, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the halo flags. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nElem_Send[ii+1] > nElem_Send[ii])) {
+      int ll = nElem_Send[ii];
+      int kk = nElem_Send[ii+1] - nElem_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(haloSend[ll]), count, MPI_UNSIGNED_SHORT, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
 #endif
   
   /*--- Copy my own rank's data into the recv buffer directly. ---*/
@@ -1374,14 +1428,16 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   ll = nElem_Send[rank];
   kk = nElem_Send[rank+1];
   
+  for (int nn=ll; nn<kk; nn++, mm++) haloRecv[mm] = haloSend[nn];
+  
   /*--- Wait for the non-blocking sends and recvs to complete. ---*/
   
 #ifdef HAVE_MPI
-  int number = nSends;
+  int number = 2*nSends;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, send_req, &ind, &status);
   
-  number = nRecvs;
+  number = 2*nRecvs;
   for (int ii = 0; ii < number; ii++)
     SU2_MPI::Waitany(number, recv_req, &ind, &status);
   
@@ -1397,10 +1453,12 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
   int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    nElem_Total++;
-    for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
-      Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
-      count++;
+    if (!haloRecv[ii]) {    
+      nElem_Total++;
+      for (int jj = 0; jj < NODES_PER_ELEMENT; jj++) {
+        Conn_Elem[count] = (int)connRecv[ii*NODES_PER_ELEMENT+jj] + 1;
+        count++;
+      }
     }
   }
 
@@ -1429,7 +1487,8 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   
   delete [] connSend;
   delete [] connRecv;
-  delete [] Local_Halo;
+  delete [] haloSend;
+  delete [] haloRecv;
   delete [] nElem_Recv;
   delete [] nElem_Send;
   delete [] nElem_Flag;

From bb40cd71c7c0ae7799683f1ac190ed38d9cf32b4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Aug 2019 16:02:36 +0200
Subject: [PATCH 386/539] Removed the use of Ext_Iter throughout the code.

Replaced it with appropriate use of Inner_Iter and Time_Iter.
---
 Common/include/config_structure.hpp           |  44 +-
 Common/include/config_structure.inl           |  14 -
 Common/include/grid_movement_structure.hpp    |   2 +-
 Common/src/config_structure.cpp               |  68 +--
 Common/src/geometry_structure.cpp             |  48 +-
 Common/src/grid_movement_structure.cpp        |  18 +-
 SU2_CFD/include/drivers/CDriver.hpp           |  34 +-
 SU2_CFD/include/drivers/CMultizoneDriver.hpp  |   4 +-
 SU2_CFD/include/drivers/CSinglezoneDriver.hpp |   6 +-
 SU2_CFD/include/integration_structure.hpp     |  47 +-
 SU2_CFD/include/integration_structure.inl     |  10 +-
 SU2_CFD/include/iteration_structure.hpp       |   6 +-
 SU2_CFD/include/solver_structure.hpp          |  16 +-
 SU2_CFD/include/solver_structure.inl          |   4 +-
 .../src/drivers/CDiscAdjSinglezoneDriver.cpp  |  19 +-
 SU2_CFD/src/drivers/CDriver.cpp               |  89 ++--
 SU2_CFD/src/drivers/CMultizoneDriver.cpp      |  31 +-
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     |  28 +-
 SU2_CFD/src/integration_structure.cpp         |  20 +-
 SU2_CFD/src/integration_time.cpp              |  63 +--
 SU2_CFD/src/iteration_structure.cpp           | 459 ++++++------------
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |   4 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |   4 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |   4 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp         |   4 +-
 SU2_CFD/src/output/COutput.cpp                |  19 +-
 SU2_CFD/src/output/output_physics.cpp         |   2 +-
 .../src/output/output_structure_legacy.cpp    |  74 +--
 SU2_CFD/src/python_wrapper_structure.cpp      |   8 +-
 SU2_CFD/src/solver_adjoint_discrete.cpp       |  10 +-
 SU2_CFD/src/solver_adjoint_elasticity.cpp     |   8 +-
 SU2_CFD/src/solver_adjoint_mean.cpp           |  26 +-
 SU2_CFD/src/solver_direct_elasticity.cpp      |  51 +-
 SU2_CFD/src/solver_direct_heat.cpp            |  29 +-
 SU2_CFD/src/solver_direct_mean.cpp            |  85 ++--
 SU2_CFD/src/solver_direct_mean_fem.cpp        |  19 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp        |  65 +--
 SU2_CFD/src/solver_direct_turbulent.cpp       |  23 +-
 SU2_CFD/src/solver_structure.cpp              |  54 +--
 SU2_SOL/src/SU2_SOL.cpp                       | 144 +++---
 40 files changed, 638 insertions(+), 1025 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 15ad9c852dd4..6457b01b623a 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -645,7 +645,6 @@ class CConfig {
   Wrt_Sol_Freq_DualTime,	/*!< \brief Writing solution frequency for Dual Time. */
   Wrt_Con_Freq,				/*!< \brief Writing convergence history frequency. */
   Wrt_Con_Freq_DualTime;				/*!< \brief Writing convergence history frequency. */
-  bool Wrt_Unsteady;  /*!< \brief Write unsteady data adding header and prefix. */
   bool Wrt_Dynamic;  		/*!< \brief Write dynamic data adding header and prefix. */
   bool Restart,	/*!< \brief Restart solution (for direct, adjoint, and linearized problems).*/
   Wrt_Binary_Restart,	/*!< \brief Write binary SU2 native restart files.*/
@@ -3017,12 +3016,6 @@ class CConfig {
    */
   void SetnMarker_All(unsigned short val_nmarker);
   
-  /*!
-   * \brief Get the number of external iterations.
-   * \return Number of external iterations.
-   */
-  unsigned long GetnExtIter(void);
-  
   /*!
    * \brief Get the number of internal iterations.
    * \return Number of internal iterations.
@@ -3059,20 +3052,6 @@ class CConfig {
    */
   su2double GetHarmonicBalance_Period(void);
   
-  /*!
-   * \brief Set the number of external iterations.
-   * \note This is important in no time depending methods, where only
-   *       one external iteration is needed.
-   * \param[in] val_niter - Set the number of external iterations.
-   */
-  void SetnExtIter(unsigned long val_niter);
-  
-  /*!
-   * \brief Set the current external iteration number.
-   * \param[in] val_iter - Current external iteration number.
-   */
-  void SetExtIter(unsigned long val_iter);
-  
   /*!
    * \brief Set the current external iteration number.
    * \param[in] val_iter - Current external iteration number.
@@ -3103,18 +3082,6 @@ class CConfig {
    */
   unsigned long GetTimeIter();
   
-  /*!
-   * \brief Set the current internal iteration number.
-   * \param[in] val_iter - Current external iteration number.
-   */
-  void SetIntIter(unsigned long val_iter);
-  
-  /*!
-   * \brief Get the current external iteration number.
-   * \return Current external iteration.
-   */
-  unsigned long GetExtIter(void);
-  
   /*!
    * \brief Get the current internal iteration number.
    * \return Current external iteration.
@@ -3133,13 +3100,6 @@ class CConfig {
    */
   unsigned long GetInnerIter(void);
   
-  
-  /*!
-   * \brief Get the current internal iteration number.
-   * \return Current internal iteration.
-   */
-  unsigned long GetIntIter(void);
-
   /*!
    * \brief Set the current physical time.
    * \param[in] val_t - Current physical time.
@@ -5412,7 +5372,7 @@ class CConfig {
    * \param[in] ext - the extension to be added.
    * \return The new filename
    */
-  string GetFilename(string filename, string ext);
+  string GetFilename(string filename, string ext, unsigned long Iter);
   
   /*!
    * \brief Append the zone index to the restart or the solution files.
@@ -6349,7 +6309,7 @@ class CConfig {
    * \param[in] val_solver - Solver of the simulation.
    * \param[in] val_system - Runtime system that we are solving.
    */
-  void SetGlobalParam(unsigned short val_solver, unsigned short val_system, unsigned long val_extiter);
+  void SetGlobalParam(unsigned short val_solver, unsigned short val_system);
   
   /*!
    * \brief Center of rotation for a rotational periodic boundary.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index c7b9185e7753..3c215ba36454 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -298,14 +298,10 @@ inline bool CConfig::GetContinuous_Adjoint(void) { return ContinuousAdjoint; }
 
 inline bool CConfig::GetViscous(void) { return Viscous; }
 
-inline unsigned long CConfig::GetnExtIter(void) { return nExtIter; }
-
 inline unsigned short CConfig::GetnTimeInstances(void) { return nTimeInstances; }
 
 inline su2double CConfig::GetHarmonicBalance_Period(void) { return HarmonicBalance_Period; }
 
-inline void CConfig::SetExtIter(unsigned long val_iter) { ExtIter = val_iter; }
-
 inline void CConfig::SetExtIter_OffSet(unsigned long val_iter) { ExtIter_OffSet = val_iter; }
 
 inline void CConfig::SetOuterIter(unsigned long val_iter) { OuterIter = val_iter; }
@@ -314,10 +310,6 @@ inline void CConfig::SetInnerIter(unsigned long val_iter) { InnerIter = val_iter
 
 inline void CConfig::SetTimeIter(unsigned long val_iter) { TimeIter = val_iter; }
 
-inline void CConfig::SetIntIter(unsigned long val_iter) { IntIter = val_iter; }
-
-inline unsigned long CConfig::GetExtIter(void) { return ExtIter; }
-
 inline unsigned long CConfig::GetExtIter_OffSet(void) { return ExtIter_OffSet; }
 
 inline unsigned long CConfig::GetOuterIter(void) { return OuterIter; }
@@ -326,8 +318,6 @@ inline unsigned long CConfig::GetInnerIter(void) { return InnerIter; }
 
 inline unsigned long CConfig::GetTimeIter(void) { return TimeIter; }
 
-inline unsigned long CConfig::GetIntIter(void) { return IntIter; }
-
 inline unsigned long CConfig::GetUnst_nIntIter(void) { return Unst_nIntIter; }
 
 inline unsigned long CConfig::GetDyn_nIntIter(void) { return Dyn_nIntIter; }
@@ -444,8 +434,6 @@ inline void CConfig::SetSemiSpan(su2double val_semispan) { SemiSpan = val_semisp
 
 inline void CConfig::SetDomainVolume(su2double val_volume) { DomainVolume = val_volume; }
 
-inline void CConfig::SetnExtIter(unsigned long val_niter) { nExtIter = val_niter; }
-
 inline su2double CConfig::GetMach(void) { return Mach; }
 
 inline su2double CConfig::GetGamma(void) { return Gamma; }
@@ -852,8 +840,6 @@ inline void CConfig::SetWrt_Con_Freq(unsigned long val_freq) { Wrt_Con_Freq = va
 
 inline unsigned long CConfig::GetWrt_Con_Freq_DualTime(void) { return Wrt_Con_Freq_DualTime; }
 
-inline bool CConfig::GetWrt_Unsteady(void) { return Wrt_Unsteady; }
-
 inline unsigned short CConfig::GetKind_Solver(void) { return Kind_Solver; }
 
 inline void CConfig::SetKind_Solver(unsigned short val_solver) { Kind_Solver = val_solver; }
diff --git a/Common/include/grid_movement_structure.hpp b/Common/include/grid_movement_structure.hpp
index 907a44632adb..fbe90a13d007 100644
--- a/Common/include/grid_movement_structure.hpp
+++ b/Common/include/grid_movement_structure.hpp
@@ -1652,7 +1652,7 @@ class CSurfaceMovement : public CGridMovement {
    * \param[in] iMarker_Monitoring - Marker we are monitoring.
    * \param[in] displacements - solution of typical section wing model.
 	 */
-    void AeroelasticDeform(CGeometry *geometry, CConfig *config, unsigned long ExtIter, unsigned short iMarker, unsigned short iMarker_Monitoring, vector<su2double>& displacements);
+    void AeroelasticDeform(CGeometry *geometry, CConfig *config, unsigned long TimeIter, unsigned short iMarker, unsigned short iMarker_Monitoring, vector<su2double>& displacements);
     
    /*!
 	 * \brief Deforms a 3-D flutter/pitching surface during an unsteady simulation.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 10f7f25cb21a..970538c82660 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1319,8 +1319,6 @@ void CConfig::SetConfig_Options() {
   addDoubleOption("CFL_REDUCTION_TURB", CFLRedCoeff_Turb, 1.0);
   /* DESCRIPTION: Reduction factor of the CFL coefficient in the turbulent adjoint problem */
   addDoubleOption("CFL_REDUCTION_ADJTURB", CFLRedCoeff_AdjTurb, 1.0);
-  /* DESCRIPTION: Number of total iterations */
-  addUnsignedLongOption("EXT_ITER", nExtIter, 0);
   /* DESCRIPTION: External iteration offset due to restart */
   addUnsignedLongOption("EXT_ITER_OFFSET", ExtIter_OffSet, 0);
   // these options share nRKStep as their size, which is not a good idea in general
@@ -2511,6 +2509,8 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
           if (!option_name.compare("COMPONENTALITY")) newString.append("COMPONENTALITY is now UQ_COMPONENT.\n");
           if (!option_name.compare("PERMUTE")) newString.append("PERMUTE is now UQ_PERMUTE.\n");
           if (!option_name.compare("URLX")) newString.append("URLX is now UQ_URLX.\n");
+          if (!option_name.compare("EXT_ITER")) newString.append("Option EXT_ITER is deprecated as of v7.0. Please use TIME_ITER, OUTER_ITER or ITER \n"
+                                                                 "to specify the number of time iterations, outer multizone iterations or iterations, respectively.");
 
           errorString.append(newString);
           err_count++;
@@ -3058,13 +3058,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   /*--- Initialize the ofstream ConvHistFile. ---*/
 //  ofstream ConvHistFile;
 
-  /*--- Decide whether we should be writing unsteady solution files. ---*/
-  
-  if (Unsteady_Simulation == STEADY ||
-      Unsteady_Simulation == HARMONIC_BALANCE)
- { Wrt_Unsteady = false; }
-  else { Wrt_Unsteady = true; }
-
   if (Kind_Solver == FEM_ELASTICITY) {
 
 	  if (Dynamic_Analysis == STATIC) { Wrt_Dynamic = false; }
@@ -3184,15 +3177,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Number of KIND_SURFACE_MOVEMENT must match number of MARKER_MOVING", CURRENT_FUNCTION);
   }
 
-  if (Time_Domain && Time_Step <= 0.0){
+  if (Time_Domain && Time_Step <= 0.0 && Unst_CFL == 0.0){
     SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
-  if (nExtIter != 0){
-    SU2_MPI::Error("Option EXT_ITER is deprecated as of v7.0. Please use TIME_ITER, OUTER_ITER or ITER \n"
-                   "to specify the number of time iterations, outer multizone iterations or iterations, respectively.", CURRENT_FUNCTION);
-  }
-  
   if (Unsteady_Simulation == TIME_STEPPING){
     nIter      = 1;
     nInnerIter  = 1;
@@ -3763,9 +3751,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   /*--- Evaluate when the Cl should be evaluated ---*/
   
-  Iter_Fixed_CL        = SU2_TYPE::Int(nExtIter / (su2double(Update_Alpha)+1));
-  Iter_Fixed_CM        = SU2_TYPE::Int(nExtIter / (su2double(Update_iH)+1));
-  Iter_Fixed_NetThrust = SU2_TYPE::Int(nExtIter / (su2double(Update_BCThrust)+1));
+  Iter_Fixed_CL        = SU2_TYPE::Int(nInnerIter / (su2double(Update_Alpha)+1));
+  Iter_Fixed_CM        = SU2_TYPE::Int(nInnerIter / (su2double(Update_iH)+1));
+  Iter_Fixed_NetThrust = SU2_TYPE::Int(nInnerIter / (su2double(Update_BCThrust)+1));
 
   /*--- Setting relaxation factor and CFL for the adjoint runs ---*/
 
@@ -3787,9 +3775,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     Kappa_Flow[1] = Kappa_AdjFlow[1];
   }
   
-  if (Iter_Fixed_CL == 0) { Iter_Fixed_CL = nExtIter+1; Update_Alpha = 0; }
-  if (Iter_Fixed_CM == 0) { Iter_Fixed_CM = nExtIter+1; Update_iH = 0; }
-  if (Iter_Fixed_NetThrust == 0) { Iter_Fixed_NetThrust = nExtIter+1; Update_BCThrust = 0; }
+  if (Iter_Fixed_CL == 0) { Iter_Fixed_CL = nInnerIter+1; Update_Alpha = 0; }
+  if (Iter_Fixed_CM == 0) { Iter_Fixed_CM = nInnerIter+1; Update_iH = 0; }
+  if (Iter_Fixed_NetThrust == 0) { Iter_Fixed_NetThrust = nInnerIter+1; Update_BCThrust = 0; }
 
   for (iCFL = 1; iCFL < nCFL; iCFL++)
     CFL[iCFL] = CFL[iCFL-1];
@@ -4068,7 +4056,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
         SU2_MPI::Error("Dynamic mesh movement currently not supported for the discrete adjoint solver.", CURRENT_FUNCTION);
       }
 
-      if (Unst_AdjointIter- long(nExtIter) < 0){
+      if (Unst_AdjointIter- long(nTimeIter) < 0){
         SU2_MPI::Error(string("Invalid iteration number requested for unsteady adjoint.\n" ) +
                        string("Make sure EXT_ITER is larger or equal than UNST_ADJOINT_ITER."),
                        CURRENT_FUNCTION);
@@ -4077,7 +4065,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       /*--- If the averaging interval is not set, we average over all time-steps ---*/
 
       if (Iter_Avg_Objective == 0.0) {
-        Iter_Avg_Objective = nExtIter;
+        Iter_Avg_Objective = nTimeIter;
       }
 
     }
@@ -4136,7 +4124,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   if (!ContinuousAdjoint & !DiscreteAdjoint) {
   	if ((Fixed_CL_Mode) || (Fixed_CM_Mode)) {
     ConvCriteria = RESIDUAL;
-  		nExtIter += Iter_dCL_dAlpha;
+  		nInnerIter += Iter_dCL_dAlpha;
   		OrderMagResidual = 24;
   		MinLogResidual = -24;
   	}
@@ -4365,8 +4353,8 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     if (Comm_Level == COMM_NONE)
       SU2_MPI::Error("COMM_LEVEL = NONE not yet implemented.", CURRENT_FUNCTION);
 
-    Wrt_Sol_Freq          = nExtIter+1;
-    Wrt_Sol_Freq_DualTime = nExtIter+1;
+    Wrt_Sol_Freq          = nTimeIter+1;
+    Wrt_Sol_Freq_DualTime = nTimeIter+1;
     
     /*--- Write only the restart. ---*/
     
@@ -6039,13 +6027,10 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
     cout << endl <<"------------------ Convergence Criteria  ( Zone "  << iZone << " ) ---------------------" << endl;
 
-    if (SinglezoneDriver){
-      cout << "Maximum number of solver subiterations: " << nIter <<"."<< endl;
-      cout << "Maximum number of physical time-steps: " << nTimeIter <<"."<< endl;
-    }
-    else{
-      cout << "Maximum number of iterations: " << nExtIter <<"."<< endl;
-    }
+    
+    cout << "Maximum number of solver subiterations: " << nInnerIter <<"."<< endl;
+    cout << "Maximum number of physical time-steps: " << nTimeIter <<"."<< endl;
+
 
     if (!fea){
 
@@ -7310,7 +7295,7 @@ CConfig::~CConfig(void) {
 
 }
 
-string CConfig::GetFilename(string filename, string ext){
+string CConfig::GetFilename(string filename, string ext, unsigned long Iter){
   
   /*--- Remove any extension --- */
   
@@ -7329,8 +7314,8 @@ string CConfig::GetFilename(string filename, string ext){
   if (GetnTimeInstances() > 1)
     filename = GetMultiInstance_FileName(filename, GetiInst(), ext);
 
-  if (GetWrt_Unsteady() || GetWrt_Dynamic()){
-    filename = GetUnsteady_FileName(filename, (int)GetExtIter(), ext);
+  if (GetTime_Domain()){
+    filename = GetUnsteady_FileName(filename, (int)Iter, ext);
   }
   
   return filename;
@@ -7349,7 +7334,7 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string e
 
   /*--- Append iteration number for unsteady cases ---*/
 
-  if ((Wrt_Unsteady) || (Wrt_Dynamic)) {
+  if ((Time_Domain) || (Wrt_Dynamic)) {
     unsigned short lastindex = UnstFilename.find_last_of(".");
     UnstFilename = UnstFilename.substr(0, lastindex);
     if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d", val_iter);
@@ -7523,13 +7508,12 @@ void CConfig::SetKind_ConvNumScheme(unsigned short val_kind_convnumscheme,
 }
 
 void CConfig::SetGlobalParam(unsigned short val_solver,
-                             unsigned short val_system,
-                             unsigned long val_extiter) {
+                             unsigned short val_system) {
 
   /*--- Set the simulation global time ---*/
   
-  Current_UnstTime = static_cast<su2double>(val_extiter)*Delta_UnstTime;
-  Current_UnstTimeND = static_cast<su2double>(val_extiter)*Delta_UnstTimeND;
+  Current_UnstTime = static_cast<su2double>(TimeIter)*Delta_UnstTime;
+  Current_UnstTimeND = static_cast<su2double>(TimeIter)*Delta_UnstTimeND;
 
   /*--- Set the solver methods ---*/
   
@@ -7665,7 +7649,7 @@ void CConfig::SetGlobalParam(unsigned short val_solver,
 
     case FEM_ELASTICITY:
 
-      Current_DynTime = static_cast<su2double>(val_extiter)*Delta_DynTime;
+      Current_DynTime = static_cast<su2double>(TimeIter)*Delta_DynTime;
 
       if (val_system == RUNTIME_FEA_SYS) {
         SetKind_ConvNumScheme(NONE, NONE, NONE, NONE, NONE, NONE);
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 8c98d74370d4..a8a6207da287 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -15957,28 +15957,28 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
   
   /*--- Time-average any unsteady surface sensitivities ---*/
   
-  unsigned long iExtIter, nExtIter;
+  unsigned long iTimeIter, nTimeIter;
   su2double delta_T, total_T;
-  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-    nExtIter = config->GetUnst_AdjointIter();
-    delta_T  = config->GetDelta_UnstTime();
-    total_T  = (su2double)nExtIter*delta_T;
+  if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+    nTimeIter = config->GetUnst_AdjointIter();
+    delta_T  = config->GetTime_Step();
+    total_T  = (su2double)nTimeIter*delta_T;
   } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     
     /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
     
     su2double period = config->GetHarmonicBalance_Period();
-    nExtIter  = config->GetnTimeInstances();
-    delta_T   = period/(su2double)nExtIter;
+    nTimeIter  = config->GetnTimeInstances();
+    delta_T   = period/(su2double)nTimeIter;
     total_T   = period;
     
   } else {
-    nExtIter = 1;
+    nTimeIter = 1;
     delta_T  = 1.0;
     total_T  = 1.0;
   }
   
-  for (iExtIter = 0; iExtIter < nExtIter; iExtIter++) {
+  for (iTimeIter = 0; iTimeIter < nTimeIter; iTimeIter++) {
     
     /*--- Prepare to read surface sensitivity files (CSV) ---*/
     
@@ -15991,15 +15991,15 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     
     /*--- Write file name with extension if unsteady or steady ---*/
     if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-    	SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+    	SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iTimeIter));
 
-    if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
+    if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
         (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
-      if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
-      if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iExtIter));
-      if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iExtIter));
+      if ((SU2_TYPE::Int(iTimeIter) >= 0)    && (SU2_TYPE::Int(iTimeIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iTimeIter));
+      if ((SU2_TYPE::Int(iTimeIter) >= 10)   && (SU2_TYPE::Int(iTimeIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iTimeIter));
+      if ((SU2_TYPE::Int(iTimeIter) >= 100)  && (SU2_TYPE::Int(iTimeIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iTimeIter));
+      if ((SU2_TYPE::Int(iTimeIter) >= 1000) && (SU2_TYPE::Int(iTimeIter) < 10000)) SPRINTF (buffer, "_0%d.csv",    SU2_TYPE::Int(iTimeIter));
+      if (SU2_TYPE::Int(iTimeIter) >= 10000) SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iTimeIter));
     }
     else
       SPRINTF (buffer, ".csv");
@@ -16088,7 +16088,7 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
                (Kind_Solver == ADJ_NAVIER_STOKES)       ||
                (Kind_Solver == ADJ_RANS));
   su2double Sens, dull_val, AoASens;
-  unsigned short nExtIter, iDim;
+  unsigned short nTimeIter, iDim;
   unsigned long iPoint, index;
   string::size_type position;
   int counter = 0;
@@ -16096,13 +16096,13 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   Sensitivity = new su2double[nPoint*nDim];
 
   if (config->GetUnsteady_Simulation()) {
-    nExtIter = config->GetnExtIter();
+    nTimeIter = config->GetTimeIter();
   }else {
-    nExtIter = 1;
+    nTimeIter = 1;
   }
  
   if (rank == MASTER_NODE)
-    cout << "Reading in sensitivity at iteration " << nExtIter-1 << "."<< endl;
+    cout << "Reading in sensitivity at iteration " << nTimeIter-1 << "."<< endl;
   
   unsigned short skipVar = nDim, skipMult = 1;
 
@@ -16135,14 +16135,8 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   filename = config->GetSolution_AdjFileName();
 
   filename = config->GetObjFunc_Extension(filename);
-
-  if (config->GetUnsteady_Simulation()) {
-    filename = config->GetUnsteady_FileName(filename, nExtIter-1, ".dat");
-  }
   
-  if (config->GetnZone() > 1){
-    filename = config->GetMultizone_FileName(filename, config->GetiZone(), ".dat");
-  }
+  filename = config->GetFilename(filename, ".dat", nTimeIter-1);
 
   if (config->GetRead_Binary_Restart()) {
 
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 4b8d45ae27cd..6440021e5d43 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -1915,7 +1915,7 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
   /*--- For the unsteady adjoint, use reverse time ---*/
   if (adjoint) {
     /*--- Set the first adjoint mesh position to the final direct one ---*/
-    if (iter == 0) dt = ((su2double)config->GetnExtIter()-1)*dt;
+    if (iter == 0) dt = ((su2double)config->GetnTime_Iter()-1)*dt;
     /*--- Reverse the rotation direction for the adjoint ---*/
     else dt = -1.0*dt;
   } else {
@@ -2095,7 +2095,7 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
   if (adjoint) {
     /*--- For the unsteady adjoint, we integrate backwards through
      physical time, so perform mesh motion in reverse. ---*/ 
-    unsigned long nFlowIter  = config->GetnExtIter();
+    unsigned long nFlowIter  = config->GetnTime_Iter();
     unsigned long directIter = nFlowIter - iter - 1;
     time_new = static_cast<su2double>(directIter)*deltaT;
     time_old = time_new;
@@ -2240,7 +2240,7 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
   if (adjoint) {
     /*--- For the unsteady adjoint, we integrate backwards through
      physical time, so perform mesh motion in reverse. ---*/
-    unsigned long nFlowIter  = config->GetnExtIter();
+    unsigned long nFlowIter  = config->GetnTime_Iter();
     unsigned long directIter = nFlowIter - iter - 1;
     time_new = static_cast<su2double>(directIter)*deltaT;
     time_old = time_new;
@@ -2370,7 +2370,7 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
   if (adjoint) {
     /*--- For the unsteady adjoint, we integrate backwards through
      physical time, so perform mesh motion in reverse. ---*/
-    unsigned long nFlowIter  = config->GetnExtIter();
+    unsigned long nFlowIter  = config->GetnTime_Iter();
     unsigned long directIter = nFlowIter - iter - 1;
     time_new = static_cast<su2double>(directIter)*deltaT;
     time_old = time_new;
@@ -6261,7 +6261,7 @@ void CSurfaceMovement::Surface_Rotating(CGeometry *geometry, CConfig *config,
   }
 }
 
-void CSurfaceMovement::AeroelasticDeform(CGeometry *geometry, CConfig *config, unsigned long ExtIter, unsigned short iMarker, unsigned short iMarker_Monitoring, vector<su2double>& displacements) {
+void CSurfaceMovement::AeroelasticDeform(CGeometry *geometry, CConfig *config, unsigned long TimeIter, unsigned short iMarker, unsigned short iMarker_Monitoring, vector<su2double>& displacements) {
   
   /* The sign conventions of these are those of the Typical Section Wing Model, below the signs are corrected */
   su2double dh = -displacements[0];           // relative plunge
@@ -6281,7 +6281,7 @@ void CSurfaceMovement::AeroelasticDeform(CGeometry *geometry, CConfig *config, u
     su2double Omega, dt, psi;
     dt = config->GetDelta_UnstTimeND();
     Omega  = (config->GetRotation_Rate(3)/config->GetOmega_Ref());
-    psi = Omega*(dt*ExtIter);
+    psi = Omega*(dt*TimeIter);
     
     /*--- Correct for the airfoil starting position (This is hardcoded in here) ---*/
     if (Monitoring_Tag == "Airfoil1") {
@@ -6368,7 +6368,7 @@ void CSurfaceMovement::SetBoundary_Flutter3D(CGeometry *geometry, CConfig *confi
     /*--- For the unsteady adjoint, we integrate backwards through
      physical time, so perform mesh motion in reverse. ---*/
     
-    unsigned long nFlowIter  = config->GetnExtIter();
+    unsigned long nFlowIter  = config->GetnTime_Iter();
     unsigned long directIter = nFlowIter - iter - 1;
     time_new = static_cast<su2double>(directIter)*deltaT;
     time_old = time_new;
@@ -6454,7 +6454,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
     if (adjoint) {
       /*--- For the unsteady adjoint, we integrate backwards through
        physical time, so perform mesh motion in reverse. ---*/
-      unsigned long nFlowIter = config->GetnExtIter() - 1;
+      unsigned long nFlowIter = config->GetnTime_Iter() - 1;
       flowIter  = nFlowIter - iter;
       unsigned short lastindex = DV_Filename.find_last_of(".");
       DV_Filename = DV_Filename.substr(0, lastindex);
@@ -6543,7 +6543,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
     /*--- For the unsteady adjoint, use reverse time ---*/
     if (adjoint) {
       /*--- Set the first adjoint mesh position to the final direct one ---*/
-      if (iter == 0) dt = ((su2double)config->GetnExtIter()-1) * dt;
+      if (iter == 0) dt = ((su2double)config->GetnTime_Iter()-1) * dt;
       /*--- Reverse the rotation direction for the adjoint ---*/
       else dt = -1.0*dt;
     } else {
diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index b237aa4166fb..5fd7f684dac5 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -87,7 +87,7 @@ class CDriver {
   unsigned long DOFsPerPoint;                   /*!< \brief Number of unknowns at each vertex, i.e., number of equations solved. */
   su2double MDOFs;                              /*!< \brief Total number of DOFs in millions in the calculation (including ghost points).*/
   su2double MDOFsDomain;                        /*!< \brief Total number of DOFs in millions in the calculation (excluding ghost points).*/
-  unsigned long ExtIter;                        /*!< \brief External iteration.*/
+  unsigned long TimeIter;                        /*!< \brief External iteration.*/
   ofstream **ConvHist_file;                       /*!< \brief Convergence history file.*/
   ofstream FSIHist_file;                        /*!< \brief FSI convergence history file.*/
   unsigned short iMesh,                         /*!< \brief Iterator on mesh levels.*/
@@ -348,47 +348,47 @@ class CDriver {
   /*!
    * \brief A virtual member.
    */
-  virtual void ResetConvergence() { };
+  virtual void ResetConvergence() { }
 
   /*!
    * \brief Perform some pre-processing before an iteration of the physics.
    */
-  void PreprocessExtIter(unsigned long ExtIter);
+  virtual void Preprocess(unsigned long TimeIter){ }
 
   /*!
    * \brief Monitor the computation.
    */
-  virtual bool Monitor(unsigned long ExtIter);
+  virtual bool Monitor(unsigned long TimeIter){ return false; }
 
   /*!
    * \brief Output the solution in solution file.
    */
-  void Output(unsigned long ExtIter);
+  virtual void Output(unsigned long TimeIter){ }
 
   /*!
    * \brief Perform a dynamic mesh deformation, including grid velocity computation and update of the multigrid structure.
    */
-  virtual void DynamicMeshUpdate(unsigned long ExtIter) { };
+  virtual void DynamicMeshUpdate(unsigned long TimeIter) { }
 
   /*!
    * \brief Perform a dynamic mesh deformation, including grid velocity computation and update of the multigrid structure.
    */
-  virtual void DynamicMeshUpdate(unsigned short val_iZone, unsigned long ExtIter) { };
+  virtual void DynamicMeshUpdate(unsigned short val_iZone, unsigned long TimeIter) { }
 
   /*!
    * \brief Perform a static mesh deformation, without considering grid velocity.
    */
-  virtual void StaticMeshUpdate() { };
+  virtual void StaticMeshUpdate() { }
 
   /*!
    * \brief Perform a mesh deformation as initial condition.
    */
-  virtual void SetInitialMesh() { };
+  virtual void SetInitialMesh() { }
 
   /*!
    * \brief Process the boundary conditions and update the multigrid structure.
    */
-  virtual void BoundaryConditionsUpdate() { };
+  virtual void BoundaryConditionsUpdate() { }
 
   /*!
    * \brief Get the total drag.
@@ -464,13 +464,13 @@ class CDriver {
    * \brief Get the number of external iterations.
    * \return Number of external iterations.
    */
-  unsigned long GetnExtIter();
+  unsigned long GetnTimeIter();
 
   /*!
    * \brief Get the current external iteration.
    * \return Current external iteration.
    */
-  unsigned long GetExtIter();
+  unsigned long GetTime_Iter();
 
   /*!
    * \brief Get the unsteady time step.
@@ -768,7 +768,7 @@ class CFluidDriver : public CDriver {
   /*!
    * \brief Perform a dynamic mesh deformation, included grid velocity computation and the update of the multigrid structure (multiple zone).
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
   /*!
    * \brief Perform a static mesh deformation, without considering grid velocity (multiple zone).
@@ -874,7 +874,7 @@ class CTurbomachineryDriver : public CFluidDriver {
   /*!
    * \brief Monitor the computation.
    */
-  bool Monitor(unsigned long ExtIter);
+  bool Monitor(unsigned long TimeIter);
 
 
 
@@ -1047,7 +1047,7 @@ class CFSIDriver : public CDriver {
   /*!
    * \brief Overload, does nothing but avoids dynamic mesh updates in FSI problems before the iteration
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
 };
 
@@ -1299,7 +1299,7 @@ class CDiscAdjFSIDriver : public CDriver {
   /*!
    * \brief Overload, does nothing but avoids dynamic mesh updates in adjoint FSI problems before the iteration
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
   /*!
    * \brief Transfer the displacements computed on the structural solver into the fluid solver.
@@ -1356,7 +1356,7 @@ class CMultiphysicsZonalDriver : public CDriver {
   /*!
    * \brief Perform a dynamic mesh deformation, included grid velocity computation and the update of the multigrid structure (multiple zone).
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
   /*!
    * \brief Routine to provide all the desired physical transfers between the different zones during one iteration.
diff --git a/SU2_CFD/include/drivers/CMultizoneDriver.hpp b/SU2_CFD/include/drivers/CMultizoneDriver.hpp
index 02a8eb364ad6..950a50b16ece 100644
--- a/SU2_CFD/include/drivers/CMultizoneDriver.hpp
+++ b/SU2_CFD/include/drivers/CMultizoneDriver.hpp
@@ -126,12 +126,12 @@ class CMultizoneDriver : public CDriver {
   /*!
    * \brief Perform a dynamic mesh deformation, included grid velocity computation and the update of the multigrid structure (multiple zone).
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
   /*!
    * \brief Perform a dynamic mesh deformation, including grid velocity computation and update of the multigrid structure.
    */
-  void DynamicMeshUpdate(unsigned short val_iZone, unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned short val_iZone, unsigned long TimeIter);
 
   /*!
    * \brief Routine to provide all the desired physical transfers between the different zones during one iteration.
diff --git a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
index 520370dcdb30..bd8ec3d68645 100644
--- a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
+++ b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
@@ -95,17 +95,17 @@ class CSinglezoneDriver : public CDriver {
   /*!
    * \brief Output the solution in solution file.
    */
-  void Output(unsigned long ExtIter);
+  void Output(unsigned long TimeIter);
 
   /*!
    * \brief Perform a dynamic mesh deformation, included grid velocity computation and the update of the multigrid structure.
    */
-  void DynamicMeshUpdate(unsigned long ExtIter);
+  void DynamicMeshUpdate(unsigned long TimeIter);
 
   /*!
    * \brief Monitor
    * \param ExtIter
    */
-  bool Monitor(unsigned long ExtIter);
+  bool Monitor(unsigned long TimeIter);
 
 };
diff --git a/SU2_CFD/include/integration_structure.hpp b/SU2_CFD/include/integration_structure.hpp
index 4e1d624cad63..811deedcfe9b 100644
--- a/SU2_CFD/include/integration_structure.hpp
+++ b/SU2_CFD/include/integration_structure.hpp
@@ -105,10 +105,9 @@ class CIntegration {
    * \param[in] solver - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   void Space_Integration_FEM(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics, CConfig *config,
-               unsigned short RunTime_EqSystem, unsigned long Iteration);
+               unsigned short RunTime_EqSystem);
 
   /*! 
    * \brief Do the time integration (explicit or implicit) of the numerical system.
@@ -117,10 +116,9 @@ class CIntegration {
    * \param[in] config - Definition of the particular problem.
    * \param[in] iRKStep - Current step of the Runge-Kutta iteration.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   void Time_Integration(CGeometry *geometry, CSolver **solver_container, CConfig *config, 
-              unsigned short iRKStep, unsigned short RunTime_EqSystem, unsigned long Iteration);
+              unsigned short iRKStep, unsigned short RunTime_EqSystem);
   
   /*! 
    * \brief Do the time integration (explicit or implicit) of the numerical system on a FEM framework.
@@ -132,7 +130,7 @@ class CIntegration {
    * \param[in] Iteration - Current iteration.
    */
   void Time_Integration_FEM(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics, CConfig *config,
-                  unsigned short RunTime_EqSystem, unsigned long Iteration);
+                  unsigned short RunTime_EqSystem);
 
   /*!
    * \brief Initialize the adjoint solution using the primal problem.
@@ -174,7 +172,7 @@ class CIntegration {
    * \param[in] Iteration - Current iteration.
    * \param[in] monitor - Objective function that is use to study its convergence.
    */
-  void Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver, unsigned long iOuterIter);
+  void Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver);
 
   /*!
    * \brief Do the convergence analysis to determine if the adjoint FEM analysis has converged.
@@ -184,7 +182,7 @@ class CIntegration {
    * \param[in] Iteration - Current iteration.
    * \param[in] monitor - Objective function that is use to study its convergence.
    */
-  void Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver, unsigned long iOuterIter);
+  void Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver);
 
 
   /*!
@@ -194,7 +192,7 @@ class CIntegration {
    * \param[in] Iteration - Current iteration.
    * \param[in] monitor - Objective function that is use to study its convergence.
    */
-  void Convergence_Monitoring_FSI(CGeometry *fea_geometry, CConfig *fea_config, CSolver *fea_solver, unsigned long iOuterIter);
+  void Convergence_Monitoring_FSI(CGeometry *fea_geometry, CConfig *fea_config, CSolver *fea_solver);
 
 
   /*!
@@ -271,10 +269,9 @@ class CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   virtual void MultiGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-                  CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                  CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
   
   /*! 
    * \brief A virtual member.
@@ -285,11 +282,10 @@ class CIntegration {
    * \param[in] iMesh - Index of the mesh in multigrid computations.
    * \param[in] mu - Variable for controlling the kind of multigrid algorithm.   
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   virtual void MultiGrid_Cycle(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
                  CConfig **config, unsigned short iMesh, unsigned short mu, unsigned short RunTime_EqSystem,
-                 unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                 unsigned short iZone, unsigned short iInst);
   
   /*! 
    * \brief A virtual member.
@@ -297,11 +293,10 @@ class CIntegration {
    * \param[in] solver_container - Container vector with all the solutions.
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    * \param[in] monitor - value of the non-dimensional parameters for monitoring the convergence.
    */
   virtual void NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container, 
-                                         CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, unsigned long Iteration, 
+                                         CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem,
                                          su2double *monitor);
   
   /*! 
@@ -398,10 +393,9 @@ class CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   virtual void SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-                  CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                  CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
 
 
   /*!
@@ -411,10 +405,9 @@ class CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   virtual void Structural_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-                  CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                  CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
 
   
   /*! 
@@ -474,7 +467,7 @@ class CMultiGridIntegration : public CIntegration {
    * \param[in] Iteration - Current iteration.
    */
   void MultiGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-               CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+               CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
   
   /*! 
    * \brief Perform a Full-Approximation Storage (FAS) Multigrid. 
@@ -488,8 +481,7 @@ class CMultiGridIntegration : public CIntegration {
    * \param[in] Iteration - Current iteration.
    */
   void MultiGrid_Cycle(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-                     CConfig **config, unsigned short iMesh, unsigned short mu, unsigned short RunTime_EqSystem,
-                     unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                     CConfig **config, unsigned short iMesh, unsigned short mu, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
   
   /*! 
    * \brief Compute the non-dimensional parameters.
@@ -501,7 +493,7 @@ class CMultiGridIntegration : public CIntegration {
    * \param[in] monitor - value of the non-dimensional parameters for monitoring the convergence.
    */
   void NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container, 
-                                 CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, unsigned long Iteration, 
+                                 CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, 
                                  su2double *monitor);
 
   /*! 
@@ -640,10 +632,9 @@ class CSingleGridIntegration : public CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   void SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-               CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+               CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
   
   /*!
    * \brief Restrict solution from fine grid to a coarse grid.
@@ -700,10 +691,9 @@ class CStructuralIntegration : public CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   void Structural_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-               CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+               CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
 
 };
 
@@ -734,10 +724,9 @@ class CFEM_DG_Integration : public CIntegration {
    * \param[in] numerics_container - Description of the numerical method (the way in which the equations are solved).
    * \param[in] config - Definition of the particular problem.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-   * \param[in] Iteration - Current iteration.
    */
   void SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
-                            CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst);
+                            CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst);
   /*!
    * \brief Perform the spatial integration of the numerical system.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -763,7 +752,7 @@ class CFEM_DG_Integration : public CIntegration {
    * \param[in] Iteration - Current iteration.
    */
   void Time_Integration(CGeometry *geometry, CSolver **solver_container, CConfig *config,
-                        unsigned short iStep, unsigned short RunTime_EqSystem, unsigned long Iteration);
+                        unsigned short iStep, unsigned short RunTime_EqSystem);
 };
 
 #include "integration_structure.inl"
diff --git a/SU2_CFD/include/integration_structure.inl b/SU2_CFD/include/integration_structure.inl
index 91b7f6bfbf86..c2ef06be85ef 100644
--- a/SU2_CFD/include/integration_structure.inl
+++ b/SU2_CFD/include/integration_structure.inl
@@ -50,14 +50,14 @@ inline void CIntegration::SetConvergence(bool value) { Convergence = value; }
 inline void CIntegration::SetConvergence_FSI(bool valueFSI) { Convergence_FSI = valueFSI; }
 
 inline void CIntegration::MultiGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container, 
-                        CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst) { }
+                        CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) { }
   
 inline void CIntegration::MultiGrid_Cycle(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container,
                  CConfig **config, unsigned short iMesh, unsigned short mu, unsigned short RunTime_EqSystem,
-                 unsigned long Iteration, unsigned short iZone, unsigned short iInst) { }
+                 unsigned short iZone, unsigned short iInst) { }
                     
 inline void CIntegration::NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container, 
-                                                      CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, unsigned long Iteration, 
+                                                      CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, 
                                                       su2double *monitor) { }
   
 inline void CIntegration::SetProlongated_Correction(CSolver *sol_fine, CGeometry *geo_fine, CConfig *config, unsigned short iMesh) { }
@@ -81,10 +81,10 @@ inline void CIntegration::SetForcing_Term(CSolver *sol_fine, CSolver *sol_coarse
                       CConfig *config, unsigned short iMesh) { }
 
 inline void CIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container, 
-                        CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst) { }
+                        CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) { }
 
 inline void CIntegration::Structural_Iteration(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container, 
-                        CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst) { }
+                        CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) { }
 
 
 inline void CIntegration::SetPotential_Solver(CGeometry ****geometry, CSolver *****solver_container, CNumerics ******numerics_container, 
diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp
index 3927a847c412..a3f7f4192c7e 100644
--- a/SU2_CFD/include/iteration_structure.hpp
+++ b/SU2_CFD/include/iteration_structure.hpp
@@ -99,7 +99,7 @@ class CIteration {
    */
   virtual void SetGrid_Movement(CGeometry **geometry, CSurfaceMovement *surface_movement,
                       CVolumetricMovement *grid_movement,
-                      CSolver ***solver, CConfig *config, unsigned long IntIter, unsigned long ExtIter);
+                      CSolver ***solver, CConfig *config, unsigned long IntIter, unsigned long TimeIter);
   
   /*!
    * \brief A virtual member.
@@ -261,7 +261,7 @@ class CIteration {
       CGeometry ****geometry,
       CSolver *****solver,
       CConfig **config,
-      unsigned long ExtIter,
+      unsigned long InnerIter,
       bool StopCalc,
       unsigned short val_iZone,
       unsigned short val_iInst);
@@ -1755,7 +1755,7 @@ class CDiscAdjHeatIteration : public CIteration {
               CGeometry ****geometry,
               CSolver *****solver,
               CConfig **config,
-              unsigned long ExtIter,
+              unsigned long InnerIter,
               bool StopCalc,
               unsigned short val_iZone,
               unsigned short val_iInst);
diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 48a94a7d6be3..7724c7e9002e 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -3584,7 +3584,7 @@ class CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - Physical iteration number.
    */
-  void Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometry, CConfig *config, unsigned long ExtIter);
+  void Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometry, CConfig *config, unsigned long TimeIter);
   
   /*!
    * \brief Sets up the generalized eigenvectors and eigenvalues needed to solve the aeroelastic equations.
@@ -6449,7 +6449,7 @@ class CEulerSolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
   
   /*!
    * \brief Set the freestream pressure.
@@ -8038,7 +8038,7 @@ class CIncEulerSolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
   
   /*!
    * \brief Set the freestream pressure.
@@ -10601,7 +10601,7 @@ class CAdjEulerSolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
 
   /*!
    * \brief Load a solution from a restart file.
@@ -11372,7 +11372,7 @@ class CHeatSolverFVM : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
 
   /*!
    * \brief Set the total residual adding the term that comes from the Dual Time-Stepping Strategy.
@@ -11513,7 +11513,7 @@ class CFEASolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
   
   /*!
    * \brief Reset the initial condition for the FEM structural problem.
@@ -11522,7 +11522,7 @@ class CFEASolver : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter);
   
   /*!
    * \brief Compute the time step for solving the FEM equations.
@@ -13274,7 +13274,7 @@ class CFEM_DG_EulerSolver : public CSolver {
    * \param[in] ExtIter - External iteration.
    */
   void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container,
-                           CConfig *config, unsigned long ExtIter);
+                           CConfig *config, unsigned long TimeIter);
 
   /*!
    * \brief Set the working solution of the first time level to the current
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index c04047a4f7c2..e8d5a2442af0 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -48,9 +48,9 @@ inline su2double CSolver::GetCSensitivity(unsigned short val_marker, unsigned lo
 inline void CSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iRKStep, 
                                      unsigned short iMesh, unsigned short RunTime_EqSystem) { }
                                      
-inline void CSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) { }
+inline void CSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) { }
 
-inline void CSolver::ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) { }
+inline void CSolver::ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) { }
 
 inline void CSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) { }
 
diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
index a49022069f8b..61ae4be53331 100644
--- a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -45,11 +45,8 @@ CDiscAdjSinglezoneDriver::CDiscAdjSinglezoneDriver(char* confFile,
 
 
   /*--- Store the number of internal iterations that will be run by the adjoint solver ---*/
-  if (!config_container[ZONE_0]->GetTime_Domain())
-    nAdjoint_Iter = config_container[ZONE_0]->GetnIter();
-  else {
-    nAdjoint_Iter = config_container[ZONE_0]->GetnInner_Iter();
-  }
+  nAdjoint_Iter = config_container[ZONE_0]->GetnInner_Iter();
+  
 
   /*--- Store the pointers ---*/
   config      = config_container[ZONE_0];
@@ -122,11 +119,6 @@ CDiscAdjSinglezoneDriver::~CDiscAdjSinglezoneDriver(void) {
 }
 
 void CDiscAdjSinglezoneDriver::Preprocess(unsigned long TimeIter) {
-
-  /*--- Set the value of the external iteration to TimeIter. -------------------------------------*/
-  /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
-
-  config_container[ZONE_0]->SetExtIter(TimeIter);
   
   config_container[ZONE_0]->SetTimeIter(TimeIter);
 
@@ -161,8 +153,6 @@ void CDiscAdjSinglezoneDriver::Run() {
      *--- Issues with iteration number should be dealt with once the output structure is in place. ---*/
 
     config->SetInnerIter(Adjoint_Iter);
-    if(!config->GetTime_Domain() && (MainVariables == FLOW_CONS_VARS))
-      config->SetExtIter(Adjoint_Iter);
 
     /*--- Secondary sensitivities must be computed with a certain frequency. ---*/
     /*--- It is also done at the beginning so all memory gets allocated.     ---*/
@@ -291,11 +281,10 @@ void CDiscAdjSinglezoneDriver::SetAdj_ObjFunction(){
 
   bool time_stepping = config->GetUnsteady_Simulation() != STEADY;
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
-  unsigned long ExtIter = config->GetExtIter();
   su2double seeding = 1.0;
 
   if (time_stepping){
-    if (ExtIter < IterAvg_Obj){
+    if (TimeIter < IterAvg_Obj){
       seeding = 1.0/((su2double)IterAvg_Obj);
     }
     else{
@@ -415,7 +404,7 @@ void CDiscAdjSinglezoneDriver::DirectRun(unsigned short kind_recording){
 
   /*--- Run one single iteration ---*/
 
-  config->SetIntIter(1);
+  config->SetInnerIter(1);
 
   /*--- Iterate the direct solver ---*/
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 51e55d73ad31..0d61db22336e 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -45,8 +45,7 @@
 
 CDriver::CDriver(char* confFile,
                  unsigned short val_nZone,
-                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), 
-  ExtIter(0), nZone(val_nZone), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
+                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), nZone(val_nZone), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
 
   unsigned short jZone;
 
@@ -3652,13 +3651,13 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
   
 
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
-  if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-    ExtIter = config_container[ZONE_0]->GetRestart_Iter();
+  if (config_container[ZONE_0]->GetTime_Domain() && config_container[ZONE_0]->GetRestart())
+    TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
   /*--- Check for a dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY
       && config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
-    ExtIter = config_container[ZONE_0]->GetRestart_Iter();
+    TimeIter = config_container[ZONE_0]->GetRestart_Iter();
   
   
 }
@@ -3804,16 +3803,17 @@ void CDriver::StartSolver(){
   if (rank == MASTER_NODE)
     cout << endl <<"------------------------------ Begin Solver -----------------------------" << endl;
 
-  while ( ExtIter < config_container[ZONE_0]->GetnExtIter() ) {
+  unsigned long Iter = 0;
+  while ( Iter < config_container[ZONE_0]->GetnInner_Iter() ) {
 
     /*--- Perform some external iteration preprocessing. ---*/
 
-    PreprocessExtIter(ExtIter);
+    Preprocess(Iter);
 
      /*--- Perform a dynamic mesh update if required. ---*/
 
       if (!fem_solver) {
-        DynamicMeshUpdate(ExtIter);
+        DynamicMeshUpdate(Iter);
       }
 
     /*--- Run a single iteration of the problem (fluid, elasticity, heat, ...). ---*/
@@ -3829,17 +3829,17 @@ void CDriver::StartSolver(){
 
     /*--- Monitor the computations after each iteration. ---*/
 
-    Monitor(ExtIter);
+    Monitor(Iter);
 
     /*--- Output the solution in files. ---*/
 
-    Output(ExtIter);
+    Output(Iter);
 
     /*--- If the convergence criteria has been met, terminate the simulation. ---*/
 
     if (StopCalc) break;
 
-    ExtIter++;
+    Iter++;
 
   }
 #ifdef VTUNEPROF
@@ -3847,15 +3847,15 @@ void CDriver::StartSolver(){
 #endif
 }
 
-void CDriver::PreprocessExtIter(unsigned long ExtIter) {
+
+void CFluidDriver::Preprocess(unsigned long Iter) {
 
   /*--- Set the value of the external iteration and physical time. ---*/
 
-  for (iZone = 0; iZone < nZone; iZone++) {
-    config_container[iZone]->SetExtIter(ExtIter);
-  
+  for (iZone = 0; iZone < nZone; iZone++) {  
+    config_container[iZone]->SetInnerIter(Iter);
     if (config_container[iZone]->GetUnsteady_Simulation())
-      config_container[iZone]->SetPhysicalTime(static_cast<su2double>(ExtIter)*config_container[iZone]->GetDelta_UnstTimeND());
+      config_container[iZone]->SetPhysicalTime(static_cast<su2double>(Iter)*config_container[iZone]->GetDelta_UnstTimeND());
     else
       config_container[iZone]->SetPhysicalTime(0.0);
   
@@ -4146,7 +4146,7 @@ void CFluidDriver::Run() {
     /*--- For each zone runs one single iteration ---*/
 
     for (iZone = 0; iZone < nZone; iZone++) {
-      config_container[iZone]->SetIntIter(IntIter);
+      config_container[iZone]->SetInnerIter(IntIter);
       iteration_container[iZone][INST_0]->Iterate(output_container[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
     }
 
@@ -4183,7 +4183,7 @@ void CFluidDriver::Update() {
          surface_movement, grid_movement, FFDBox, iZone, INST_0);
 }
 
-void CFluidDriver::DynamicMeshUpdate(unsigned long ExtIter) {
+void CFluidDriver::DynamicMeshUpdate(unsigned long TimeIter) {
 
   bool harmonic_balance;
 
@@ -4337,7 +4337,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
   CConfig *runtime = NULL;
   strcpy(runtime_file_name, "runtime.dat");
   runtime = new CConfig(runtime_file_name, config_container[ZONE_0]);
-  runtime->SetExtIter(ExtIter);
+  runtime->SetInnerIter(ExtIter);
   delete runtime;
 
   /*--- Update the convergence history file (serial and parallel computations). ---*/
@@ -4597,7 +4597,7 @@ void CHBDriver::SetHarmonicBalance(unsigned short iInst) {
     implicit = (config_container[ZONE_0]->GetKind_TimeIntScheme_AdjFlow() == EULER_IMPLICIT);
   }
 
-  unsigned long ExtIter = config_container[ZONE_0]->GetExtIter();
+  unsigned long InnerIter = config_container[ZONE_0]->GetInnerIter();
 
   /*--- Retrieve values from the config file ---*/
   su2double *U = new su2double[nVar];
@@ -4613,7 +4613,7 @@ void CHBDriver::SetHarmonicBalance(unsigned short iInst) {
   /*--- Non-dimensionalize the input period, if necessary.  */
   period /= config_container[ZONE_0]->GetTime_Ref();
 
-  if (ExtIter == 0)
+  if (InnerIter == 0)
     ComputeHB_Operator();
 
   /*--- Compute various source terms for explicit direct, implicit direct, and adjoint problems ---*/
@@ -5114,7 +5114,7 @@ void CFSIDriver::Run() {
   bool dyn_fsi = (((config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_2ND))
                    && (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC));
 
-  unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetIntIter(IntIter);
+  unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetInnerIter(IntIter);
   unsigned long OuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
   unsigned long nOuterIter = config_container[ZONE_FLOW]->GetnIterFSI();
   unsigned long nIntIter;
@@ -5147,7 +5147,7 @@ void CFSIDriver::Run() {
 
   iteration_container[ZONE_FLOW][INST_0]->SetGrid_Movement(geometry_container[ZONE_FLOW][INST_0], 
                                                            surface_movement[ZONE_FLOW], grid_movement[ZONE_FLOW][INST_0],
-                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, ExtIter );
+                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, TimeIter );
 
     /*-----------------------------------------------------------------*/
     /*-------------------- Fluid subiteration -------------------------*/
@@ -5166,9 +5166,6 @@ void CFSIDriver::Run() {
 
     for (IntIter = 0; IntIter < nIntIter; IntIter++){
 
-      /*--- Set ExtIter to iExtIter_FLOW; this is a trick to loop on the steady-state flow solver ---*/
-      config_container[ZONE_FLOW]->SetExtIter(IntIter);
-
       iteration_container[ZONE_FLOW][INST_0]->Iterate(output_container[ZONE_FLOW], integration_container, geometry_container,
           solver_container, numerics_container, config_container,
           surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
@@ -5192,8 +5189,6 @@ void CFSIDriver::Run() {
 
     for (IntIter = 0; IntIter < nIntIter; IntIter++){
 
-      config_container[ZONE_FLOW]->SetIntIter(IntIter);
-
       iteration_container[ZONE_FLOW][INST_0]->Iterate(output_container[ZONE_FLOW], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
 
       /*--- If convergence was reached in every zone --*/
@@ -5423,7 +5418,7 @@ bool CFSIDriver::BGSConvergence(unsigned long IntIter, unsigned short ZONE_FLOW,
 
   }
 
-  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[ZONE_STRUCT][INST_0][MESH_0], config_container[ZONE_STRUCT], solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL], IntIter);
+  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[ZONE_STRUCT][INST_0][MESH_0], config_container[ZONE_STRUCT], solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]);
 
   Convergence = integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->GetConvergence_FSI();
 
@@ -5450,7 +5445,7 @@ void CFSIDriver::Update() {
   /*--- This will become more general, but we need to modify the configuration for that ---*/
   unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
 
-  ExtIter = config_container[ZONE_FLOW]->GetExtIter();
+  TimeIter = config_container[ZONE_FLOW]->GetTimeIter();
 
   /*-----------------------------------------------------------------*/
   /*--------------------- Enforce continuity ------------------------*/
@@ -5467,7 +5462,7 @@ void CFSIDriver::Update() {
   
   iteration_container[ZONE_FLOW][INST_0]->SetGrid_Movement(geometry_container[ZONE_FLOW][INST_0], 
                                                            surface_movement[ZONE_FLOW], grid_movement[ZONE_FLOW][INST_0],
-                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, ExtIter );
+                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, TimeIter );
 
   /*--- TODO: Temporary output of objective function for Flow OFs. Needs to be integrated into the refurbished output ---*/
 
@@ -5691,9 +5686,9 @@ CDiscAdjFSIDriver::CDiscAdjFSIDriver(char* confFile,
     myfile_res.close();
   }
 
-  /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
-  config_container[ZONE_0]->SetnExtIter(1);
-  config_container[ZONE_1]->SetnExtIter(1);
+//  /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
+//  config_container[ZONE_0]->SetnExtIter(1);
+//  config_container[ZONE_1]->SetnExtIter(1);
 
 }
 
@@ -5725,7 +5720,7 @@ void CDiscAdjFSIDriver::Run( ) {
   unsigned short iZone;
   bool BGS_Converged = false;
 
-  unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetIntIter(IntIter);
+  unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetInnerIter(IntIter);
   unsigned long iOuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(iOuterIter);
   unsigned long nOuterIter = config_container[ZONE_FLOW]->GetnIterFSI();
 
@@ -5781,8 +5776,8 @@ void CDiscAdjFSIDriver::Preprocess(unsigned short ZONE_FLOW,
                   unsigned short kind_recording){
 
   unsigned long IntIter = 0, iPoint;
-  config_container[ZONE_0]->SetIntIter(IntIter);
-  unsigned short ExtIter = config_container[ZONE_FLOW]->GetExtIter();
+  config_container[ZONE_0]->SetInnerIter(IntIter);
+  unsigned short ExtIter = config_container[ZONE_FLOW]->GetTimeIter();
 
   bool dual_time_1st = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
   bool dual_time_2nd = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
@@ -5947,8 +5942,8 @@ void CDiscAdjFSIDriver::Preprocess(unsigned short ZONE_FLOW,
   /*----------------------------------------------------------------------------*/
 
   IntIter = 0;
-  config_container[ZONE_STRUCT]->SetIntIter(IntIter);
-  ExtIter = config_container[ZONE_STRUCT]->GetExtIter();
+  config_container[ZONE_STRUCT]->SetInnerIter(IntIter);
+  ExtIter = config_container[ZONE_STRUCT]->GetTimeIter();
   bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
 
   int Direct_Iter_FEA;
@@ -6034,7 +6029,7 @@ void CDiscAdjFSIDriver::PrintDirect_Residuals(unsigned short ZONE_FLOW,
                                                           unsigned short ZONE_STRUCT,
                                                           unsigned short kind_recording){
 
-  unsigned short ExtIter = config_container[ZONE_FLOW]->GetExtIter();
+  unsigned short ExtIter = config_container[ZONE_FLOW]->GetTimeIter();
   bool turbulent = (config_container[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS);
   bool nonlinear_analysis = (config_container[ZONE_STRUCT]->GetGeometricConditions() == LARGE_DEFORMATIONS);   // Nonlinear analysis.
   bool unsteady = config_container[ZONE_FLOW]->GetUnsteady_Simulation() != NONE;
@@ -6206,7 +6201,7 @@ void CDiscAdjFSIDriver::Fluid_Iteration_Direct(unsigned short ZONE_FLOW, unsigne
   /*---- Sets all the cross dependencies for the flow variables -----*/
   /*-----------------------------------------------------------------*/
 
-  config_container[ZONE_FLOW]->SetIntIter(0);
+  config_container[ZONE_FLOW]->SetInnerIter(0);
 
   direct_iteration[ZONE_FLOW]->Iterate(output_container[ZONE_FLOW], integration_container, geometry_container,
       solver_container, numerics_container, config_container,
@@ -6273,7 +6268,7 @@ void CDiscAdjFSIDriver::Structural_Iteration_Direct(unsigned short ZONE_FLOW, un
 
 void CDiscAdjFSIDriver::Mesh_Deformation_Direct(unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT) {
 
-  unsigned long ExtIter = config_container[ZONE_STRUCT]->GetExtIter();
+  unsigned long ExtIter = config_container[ZONE_STRUCT]->GetTimeIter();
 
   /*-----------------------------------------------------------------*/
   /*--------------------- Set MPI Solution --------------------------*/
@@ -6316,7 +6311,7 @@ void CDiscAdjFSIDriver::SetRecording(unsigned short ZONE_FLOW,
                                               unsigned short ZONE_STRUCT,
                                               unsigned short kind_recording){
 
-  unsigned long IntIter = config_container[ZONE_0]->GetIntIter();
+  unsigned long IntIter = config_container[ZONE_0]->GetInnerIter();
   bool unsteady = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() != NONE);
   bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
 
@@ -6417,7 +6412,7 @@ void CDiscAdjFSIDriver::SetRecording(unsigned short ZONE_FLOW,
 
   /* --- Reset the number of the internal iterations---*/
 
-  config_container[ZONE_0]->SetIntIter(IntIter);
+  config_container[ZONE_0]->SetInnerIter(IntIter);
 
 
 }
@@ -6566,14 +6561,14 @@ void CDiscAdjFSIDriver::Iterate_Block(unsigned short ZONE_FLOW,
   }
 
   for (unsigned short iZone = 0; iZone < config_container[ZONE_FLOW]->GetnZone(); iZone++)
-    config_container[iZone]->SetIntIter(IntIter);
+    config_container[iZone]->SetInnerIter(IntIter);
 
   for(IntIter = 0; IntIter < nIntIter; IntIter++){
 
     /*--- Set the internal iteration ---*/
 
     for (unsigned short iZone = 0; iZone < config_container[ZONE_FLOW]->GetnZone(); iZone++)
-      config_container[iZone]->SetIntIter(IntIter);
+      config_container[iZone]->SetInnerIter(IntIter);
 
     /*--- Set the adjoint values of the flow and objective function ---*/
 
@@ -7186,7 +7181,7 @@ void CMultiphysicsZonalDriver::Run() {
           output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
       }
 
-      config_container[iZone]->SetIntIter(IntIter);
+      config_container[iZone]->SetInnerIter(IntIter);
 
       for (jZone = 0; jZone < nZone; jZone++)
         if(jZone != iZone && transfer_container[jZone][iZone] != NULL)
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 8c6cb52ee73b..44734311359d 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -213,7 +213,6 @@ void CMultizoneDriver::Preprocess(unsigned long TimeIter) {
 
     /*--- Set the value of the external iteration to TimeIter. -------------------------------------*/
     /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
-    config_container[iZone]->SetExtIter(TimeIter);
     config_container[iZone]->SetTimeIter(TimeIter);
     
 
@@ -280,7 +279,6 @@ void CMultizoneDriver::Run_GaussSeidel() {
   unsigned long iOuter_Iter;
   unsigned short jZone, UpdateMesh;
   bool DeformMesh = false;
-  unsigned long ExtIter = 0;
   bool Convergence = false;
 
   unsigned long OuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
@@ -307,7 +305,7 @@ void CMultizoneDriver::Run_GaussSeidel() {
         }
       }
       /*--- If a mesh update is required due to the transfer of data ---*/
-      if (UpdateMesh > 0) DynamicMeshUpdate(iZone, ExtIter);
+      if (UpdateMesh > 0) DynamicMeshUpdate(iZone, TimeIter);
 
       /*--- Iterate the zone as a block, either to convergence or to a max number of iterations ---*/
       iteration_container[iZone][INST_0]->Solve(output_container[iZone], integration_container, geometry_container, solver_container,
@@ -334,7 +332,6 @@ void CMultizoneDriver::Run_Jacobi() {
   unsigned long iOuter_Iter;
   unsigned short jZone, UpdateMesh;
   bool DeformMesh = false;
-  unsigned long ExtIter = 0;
   bool Convergence = false;
 
   unsigned long OuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
@@ -361,7 +358,7 @@ void CMultizoneDriver::Run_Jacobi() {
         }
       }
       /*--- If a mesh update is required due to the transfer of data ---*/
-      if (UpdateMesh > 0) DynamicMeshUpdate(iZone, ExtIter);
+      if (UpdateMesh > 0) DynamicMeshUpdate(iZone, TimeIter);
 
     }
 
@@ -462,7 +459,7 @@ void CMultizoneDriver::Update() {
         }
       }
     /*--- If a mesh update is required due to the transfer of data ---*/
-    if (UpdateMesh > 0) DynamicMeshUpdate(iZone, ExtIter);
+    if (UpdateMesh > 0) DynamicMeshUpdate(iZone, TimeIter);
 
     iteration_container[iZone][INST_0]->Update(output_container[iZone], integration_container, geometry_container,
         solver_container, numerics_container, config_container,
@@ -509,7 +506,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         
         (((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
           (config_container[iZone]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
-         ((TimeIter == 0) || (ExtIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
+         ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
         
         ((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
          ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0) ||
@@ -531,13 +528,13 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
       
     }
     
-    /*--- Determine whether a solution doesn't need to be written
-   after the current iteration ---*/
+//    /*--- Determine whether a solution doesn't need to be written
+//   after the current iteration ---*/
     
-    if (config_container[iZone]->GetFixed_CL_Mode()) {
-      if (config_container[iZone]->GetnExtIter()-config_container[iZone]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-      if (config_container[iZone]->GetnExtIter() - 1 == ExtIter) output_files = true;
-    }
+//    if (config_container[iZone]->GetFixed_CL_Mode()) {
+//      if (config_container[iZone]->GetnExtIter()-config_container[iZone]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
+//      if (config_container[iZone]->GetnExtIter() - 1 == ExtIter) output_files = true;
+//    }
     
     /*--- write the solution ---*/
     
@@ -606,7 +603,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
 
 }
 
-void CMultizoneDriver::DynamicMeshUpdate(unsigned long ExtIter) {
+void CMultizoneDriver::DynamicMeshUpdate(unsigned long TimeIter) {
 
   bool harmonic_balance;
 
@@ -616,16 +613,16 @@ void CMultizoneDriver::DynamicMeshUpdate(unsigned long ExtIter) {
     if ((config_container[iZone]->GetGrid_Movement()) && (!harmonic_balance) && (!fsi)) {
       iteration_container[iZone][INST_0]->SetGrid_Movement(geometry_container[iZone][INST_0],surface_movement[iZone], 
                                                                grid_movement[iZone][INST_0], solver_container[iZone][INST_0],
-                                                               config_container[iZone], 0, ExtIter);
+                                                               config_container[iZone], 0, TimeIter);
     }
   }
 }
 
-void CMultizoneDriver::DynamicMeshUpdate(unsigned short val_iZone, unsigned long ExtIter) {
+void CMultizoneDriver::DynamicMeshUpdate(unsigned short val_iZone, unsigned long TimeIter) {
 
   iteration_container[val_iZone][INST_0]->SetGrid_Movement(geometry_container[val_iZone][INST_0],surface_movement[val_iZone], 
                                                            grid_movement[val_iZone][INST_0], solver_container[val_iZone][INST_0],
-                                                           config_container[val_iZone], 0, ExtIter);
+                                                           config_container[val_iZone], 0, TimeIter);
 
 }
 
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index b8335fb0a409..be122a12b1c3 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -114,10 +114,6 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
   
   config_container[ZONE_0]->SetTimeIter(TimeIter);
 
-  /*--- Set the value of the external iteration to TimeIter. -------------------------------------*/
-  /*--- TODO: This should be generalised for an homogeneous criteria throughout the code. --------*/
-  config_container[ZONE_0]->SetExtIter(TimeIter);
-
   /*--- Store the current physical time in the config container, as
    this can be used for verification / MMS. This should also be more
    general once the drivers are more stable. ---*/
@@ -127,18 +123,6 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
   else
     config_container[ZONE_0]->SetPhysicalTime(0.0);
   
-  /*--- Read the target pressure for inverse design. ---------------------------------------------*/
-  /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-//  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
-//    output->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
-
-//  /*--- Read the target heat flux ----------------------------------------------------------------*/
-//  /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-//  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
-//    output->SetHeatFlux_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],
-//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[iZone], TimeIter);
-
   /*--- Set the initial condition for EULER/N-S/RANS ---------------------------------------------*/
   if ((config_container[ZONE_0]->GetKind_Solver() ==  EULER) ||
       (config_container[ZONE_0]->GetKind_Solver() ==  NAVIER_STOKES) ||
@@ -212,13 +196,13 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
       /*--- General if statements to print output statements ---*/
 
-      (TimeIter+1 >= config_container[ZONE_0]->GetnTime_Iter()) || (StopCalc) ||
+      (StopCalc) ||
 
       /*--- Unsteady problems ---*/
 
       (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
         (config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
-       ((TimeIter == 0) || (ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
+       ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
 
       ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
        ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0) ||
@@ -243,10 +227,10 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
   /*--- Determine whether a solution doesn't need to be written
    after the current iteration ---*/
 
-  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
-    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-    if (config_container[ZONE_0]->GetnExtIter() - 1 == ExtIter) output_files = true;
-  }
+//  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
+//    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
+//    if (config_container[ZONE_0]->GetnExtIter() - 1 == ExtIter) output_files = true;
+//  }
 
   /*--- write the solution ---*/
 
diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp
index e1597717cff1..d432b927a271 100644
--- a/SU2_CFD/src/integration_structure.cpp
+++ b/SU2_CFD/src/integration_structure.cpp
@@ -224,20 +224,18 @@ void CIntegration::Space_Integration_FEM(CGeometry *geometry,
                                      CSolver **solver_container,
                                      CNumerics **numerics,
                                      CConfig *config,
-                                     unsigned short RunTime_EqSystem,
-                                     unsigned long Iteration) {
+                                     unsigned short RunTime_EqSystem) {
 
     unsigned short iMarker;
 
-    bool initial_calc = (config->GetExtIter() == 0);                  // Checks if it is the first calculation.
+    bool initial_calc = (config->GetTimeIter() == 0);                  // Checks if it is the first calculation.
     bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
-    bool first_iter = (config->GetIntIter() == 0);                  // Checks if it is the first iteration
-    bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool first_iter = (config->GetInnerIter() == 0);                  // Checks if it is the first iteration
     unsigned short IterativeScheme = config->GetKind_SpaceIteScheme_FEA();       // Iterative schemes: NEWTON_RAPHSON, MODIFIED_NEWTON_RAPHSON
     unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
 
     bool restart = config->GetRestart();                                  // Restart solution
-    bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) ==  SU2_TYPE::Int(config->GetRestart_Iter()));  // Restart iteration
+    bool initial_calc_restart = (SU2_TYPE::Int(config->GetTimeIter()) ==  SU2_TYPE::Int(config->GetRestart_Iter()));  // Restart iteration
 
     /*--- Compute Mass Matrix ---*/
     /*--- The mass matrix is computed only once, at the beginning of the calculation, no matter whether the ---*/
@@ -245,7 +243,7 @@ void CIntegration::Space_Integration_FEM(CGeometry *geometry,
 
     /*--- If the analysis is linear, only a the constitutive term of the stiffness matrix has to be computed ---*/
     /*--- This is done only once, at the beginning of the calculation. From then on, K is constant ---*/
-    if ((linear_analysis && (initial_calc || dynamic)) ||
+    if ((linear_analysis && (initial_calc && first_iter)) ||
       (linear_analysis && restart && initial_calc_restart)) {
       solver_container[MainSolver]->Compute_StiffMatrix(geometry, solver_container, numerics, config);
     }
@@ -338,7 +336,7 @@ void CIntegration::Adjoint_Setup(CGeometry ****geometry, CSolver *****solver_con
 }
 
 void CIntegration::Time_Integration(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iRKStep,
-                                    unsigned short RunTime_EqSystem, unsigned long Iteration) {
+                                    unsigned short RunTime_EqSystem) {
   unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
   unsigned short KindSolver = config->GetKind_Solver();
   
@@ -384,7 +382,7 @@ void CIntegration::Time_Integration(CGeometry *geometry, CSolver **solver_contai
 }
 
 void CIntegration::Time_Integration_FEM(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics, CConfig *config,
-                                    unsigned short RunTime_EqSystem, unsigned long Iteration) {
+                                    unsigned short RunTime_EqSystem) {
 
   unsigned short iMarker;
 
@@ -741,7 +739,7 @@ void CIntegration::SetFEM_StructuralSolver(CGeometry *geometry, CSolver **solver
   
 }
 
-void CIntegration::Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver, unsigned long iOuterIter) {
+void CIntegration::Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver) {
   
   su2double Reference_UTOL, Reference_RTOL, Reference_ETOL;
   su2double Residual_UTOL, Residual_RTOL, Residual_ETOL;
@@ -801,7 +799,7 @@ void CIntegration::Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *conf
   
 }
 
-void CIntegration::Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver, unsigned long iOuterIter) {
+void CIntegration::Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver) {
 
   su2double val_I, Max_Val_I;
 
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index 60315f1237fd..7bf1bf9740b7 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -113,7 +113,7 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry,
   
   MultiGrid_Cycle(geometry, solver_container, numerics_container, config,
                   FinestMesh, RecursiveParam, RunTime_EqSystem,
-                  Iteration, iZone, iInst);
+                  iZone, iInst);
 
   /*--- Computes primitive variables and gradients in the finest mesh (useful for the next solver (turbulence) and output ---*/
 
@@ -125,12 +125,8 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry,
   
   NonDimensional_Parameters(geometry[iZone][iInst], solver_container[iZone][iInst],
                             numerics_container[iZone][iInst], config[iZone],
-                            FinestMesh, RunTime_EqSystem, Iteration, &monitor);
+                            FinestMesh, RunTime_EqSystem, &monitor);
   
-  /*--- Convergence strategy ---*/
-  
-  Convergence_Monitoring(geometry[iZone][iInst][FinestMesh], config[iZone], Iteration, monitor, FinestMesh);
-
 }
 
 void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
@@ -140,14 +136,11 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
                                             unsigned short iMesh,
                                             unsigned short RecursiveParam,
                                             unsigned short RunTime_EqSystem,
-                                            unsigned long Iteration,
                                             unsigned short iZone,
                                             unsigned short iInst) {
   
   unsigned short iPreSmooth, iPostSmooth, iRKStep, iRKLimit = 1;
-  
-  bool startup_multigrid = (config[iZone]->GetRestart_Flow() && (RunTime_EqSystem == RUNTIME_FLOW_SYS) && (Iteration == 0));
-  unsigned short SolContainer_Position = config[iZone]->GetContainerPosition(RunTime_EqSystem);
+    unsigned short SolContainer_Position = config[iZone]->GetContainerPosition(RunTime_EqSystem);
   
   /*--- Do a presmoothing on the grid iMesh to be restricted to the grid iMesh+1 ---*/
   
@@ -177,11 +170,11 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
 
         /*--- Compute time step, max eigenvalue, and integration scheme (steady and unsteady problems) ---*/
         
-        solver_container[iZone][iInst][iMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh, Iteration);
+        solver_container[iZone][iInst][iMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh,  config[iZone]->GetTimeIter());
         
         /*--- Restrict the solution and gradient for the adjoint problem ---*/
         
-        Adjoint_Setup(geometry, solver_container, config, RunTime_EqSystem, Iteration, iZone);
+        Adjoint_Setup(geometry, solver_container, config, RunTime_EqSystem, config[iZone]->GetTime_Step(), iZone);
         
       }
       
@@ -191,7 +184,7 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
       
       /*--- Time integration, update solution using the old solution plus the solution increment ---*/
       
-      Time_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iRKStep, RunTime_EqSystem, Iteration);
+      Time_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iRKStep, RunTime_EqSystem);
       
       /*--- Send-Receive boundary conditions, and postprocessing ---*/
       
@@ -202,8 +195,7 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
   }
   
   /*--- Compute Forcing Term $P_(k+1) = I^(k+1)_k(P_k+F_k(u_k))-F_(k+1)(I^(k+1)_k u_k)$ and update solution for multigrid ---*/
-  
-  if ( (iMesh < config[iZone]->GetnMGLevels() && ((Iteration >= config[iZone]->GetnStartUpIter()) || startup_multigrid)) ) {
+    if ( iMesh < config[iZone]->GetnMGLevels() ) {
     /*--- Compute $r_k = P_k + F_k(u_k)$ ---*/
     
     solver_container[iZone][iInst][iMesh][SolContainer_Position]->Preprocessing(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh, NO_RK_ITER, RunTime_EqSystem, false);
@@ -223,8 +215,8 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
     /*--- Recursive call to MultiGrid_Cycle ---*/
     
     for (unsigned short imu = 0; imu <= RecursiveParam; imu++) {
-      if (iMesh == config[iZone]->GetnMGLevels()-2) MultiGrid_Cycle(geometry, solver_container, numerics_container, config, iMesh+1, 0, RunTime_EqSystem, Iteration, iZone, iInst);
-      else MultiGrid_Cycle(geometry, solver_container, numerics_container, config, iMesh+1, RecursiveParam, RunTime_EqSystem, Iteration, iZone, iInst);
+      if (iMesh == config[iZone]->GetnMGLevels()-2) MultiGrid_Cycle(geometry, solver_container, numerics_container, config, iMesh+1, 0, RunTime_EqSystem, iZone, iInst);
+      else MultiGrid_Cycle(geometry, solver_container, numerics_container, config, iMesh+1, RecursiveParam, RunTime_EqSystem, iZone, iInst);
     }
     
     /*--- Compute prolongated solution, and smooth the correction $u^(new)_k = u_k +  Smooth(I^k_(k+1)(u_(k+1)-I^(k+1)_k u_k))$ ---*/
@@ -252,11 +244,11 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
           solver_container[iZone][iInst][iMesh][SolContainer_Position]->Set_OldSolution(geometry[iZone][iInst][iMesh]);
           if (config[iZone]->GetKind_TimeIntScheme() == CLASSICAL_RK4_EXPLICIT)
             solver_container[iZone][iInst][iMesh][SolContainer_Position]->Set_NewSolution(geometry[iZone][iInst][iMesh]);
-          solver_container[iZone][iInst][iMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh, Iteration);
+          solver_container[iZone][iInst][iMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh,  config[iZone]->GetTimeIter());
         }
         
         Space_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], numerics_container[iZone][iInst][iMesh][SolContainer_Position], config[iZone], iMesh, iRKStep, RunTime_EqSystem);
-        Time_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iRKStep, RunTime_EqSystem, Iteration);
+        Time_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iRKStep, RunTime_EqSystem);
         
         solver_container[iZone][iInst][iMesh][SolContainer_Position]->Postprocessing(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh], config[iZone], iMesh);
         
@@ -721,7 +713,7 @@ void CMultiGridIntegration::SetRestricted_Gradient(unsigned short RunTime_EqSyst
 }
 
 void CMultiGridIntegration::NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container,
-                                                      CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, unsigned long Iteration,
+                                                      CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, 
                                                       su2double *monitor) {
   
   const unsigned short nDim = geometry[FinestMesh]->GetnDim();
@@ -797,7 +789,7 @@ CSingleGridIntegration::CSingleGridIntegration(CConfig *config) : CIntegration(c
 CSingleGridIntegration::~CSingleGridIntegration(void) { }
 
 void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container,
-                                                  CNumerics ******numerics_container, CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst) {
+                                                  CNumerics ******numerics_container, CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) {
   unsigned short iMesh;
   su2double monitor = 0.0;
   
@@ -815,7 +807,7 @@ void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolve
   
   /*--- Time step evaluation ---*/
   
-  solver_container[iZone][iInst][FinestMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone], FinestMesh, 0);
+  solver_container[iZone][iInst][FinestMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone], FinestMesh, config[iZone]->GetTimeIter());
   
   /*--- Space integration ---*/
   
@@ -825,7 +817,7 @@ void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolve
   /*--- Time integration ---*/
   
   Time_Integration(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone], NO_RK_ITER,
-                   RunTime_EqSystem, Iteration);
+                   RunTime_EqSystem);
   
   /*--- Postprocessing ---*/
   
@@ -842,10 +834,6 @@ void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolve
     solver_container[iZone][iInst][FinestMesh][HEAT_SOL]->Heat_Fluxes(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone]);
   }
   
-  /*--- Convergence strategy ---*/
-  
-  Convergence_Monitoring(geometry[iZone][iInst][FinestMesh], config[iZone], Iteration, monitor, FinestMesh);
-  
   /*--- If turbulence model, copy the turbulence variables to the coarse levels ---*/
   
   if (RunTime_EqSystem == RUNTIME_TURB_SYS) {
@@ -946,25 +934,25 @@ CStructuralIntegration::CStructuralIntegration(CConfig *config) : CIntegration(c
 CStructuralIntegration::~CStructuralIntegration(void) { }
 
 void CStructuralIntegration::Structural_Iteration(CGeometry ****geometry, CSolver *****solver_container,
-                                                  CNumerics ******numerics_container, CConfig **config, unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone, unsigned short iInst) {
+                                                  CNumerics ******numerics_container, CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) {
 
   unsigned short SolContainer_Position = config[iZone]->GetContainerPosition(RunTime_EqSystem);
 
   /*--- Preprocessing ---*/
 
   solver_container[iZone][iInst][MESH_0][SolContainer_Position]->Preprocessing(geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0],
-      config[iZone], numerics_container[iZone][iInst][MESH_0][SolContainer_Position], MESH_0, Iteration, RunTime_EqSystem, false);
+      config[iZone], numerics_container[iZone][iInst][MESH_0][SolContainer_Position], MESH_0, NO_RK_ITER, RunTime_EqSystem, false);
 
 
   /*--- Space integration ---*/
 
   Space_Integration_FEM(geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], numerics_container[iZone][iInst][MESH_0][SolContainer_Position],
-                    config[iZone], RunTime_EqSystem, Iteration);
+                    config[iZone], RunTime_EqSystem);
 
   /*--- Time integration ---*/
 
   Time_Integration_FEM(geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0], numerics_container[iZone][iInst][MESH_0][SolContainer_Position],
-                config[iZone], RunTime_EqSystem, Iteration);
+                config[iZone], RunTime_EqSystem);
 
   /*--- Postprocessing ---*/
 
@@ -974,8 +962,8 @@ void CStructuralIntegration::Structural_Iteration(CGeometry ****geometry, CSolve
   /*--- Convergence strategy ---*/
 
   switch (RunTime_EqSystem) {
-    case RUNTIME_FEA_SYS: Convergence_Monitoring_FEM(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position], Iteration); break;
-    case RUNTIME_ADJFEA_SYS: Convergence_Monitoring_FEM_Adj(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position], Iteration); break;
+    case RUNTIME_FEA_SYS: Convergence_Monitoring_FEM(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position]); break;
+    case RUNTIME_ADJFEA_SYS: Convergence_Monitoring_FEM_Adj(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position]); break;
   }
 
 }
@@ -989,7 +977,6 @@ void CFEM_DG_Integration::SingleGrid_Iteration(CGeometry ****geometry,
                                                CNumerics ******numerics_container,
                                                CConfig **config,
                                                unsigned short RunTime_EqSystem,
-                                               unsigned long Iteration,
                                                unsigned short iZone,
                                                unsigned short iInst) {
 
@@ -1027,7 +1014,7 @@ void CFEM_DG_Integration::SingleGrid_Iteration(CGeometry ****geometry,
         TimeSynSpecified to true, which leads to an outer loop in the
         algorithm below. ---*/
   bool TimeSyncSpecified   = false;
-  const su2double TimeSync = config[iZone]->GetDelta_UnstTimeND();
+  const su2double TimeSync = config[iZone]->GetTime_Step()/config[iZone]->GetTime_Ref();
   if(config[iZone]->GetUnsteady_Simulation() == TIME_STEPPING &&
      config[iZone]->GetUnst_CFL()            != 0.0           &&
      TimeSync                                != 0.0) TimeSyncSpecified = true;
@@ -1041,7 +1028,7 @@ void CFEM_DG_Integration::SingleGrid_Iteration(CGeometry ****geometry,
     /* Compute the time step for stability. */
     solver_container[iZone][iInst][iMesh][SolContainer_Position]->SetTime_Step(geometry[iZone][iInst][iMesh],
                                                                                solver_container[iZone][iInst][iMesh],
-                                                                               config[iZone], iMesh, Iteration);
+                                                                               config[iZone], iMesh, config[iZone]->GetTimeIter());
     /* Possibly overrule the specified time step when a synchronization time was
        specified and determine whether or not the time loop must be continued.
        When TimeSyncSpecified is false, the loop is always terminated. */
@@ -1077,7 +1064,7 @@ void CFEM_DG_Integration::SingleGrid_Iteration(CGeometry ****geometry,
 
         /*--- Time integration, update solution using the old solution plus the solution increment ---*/
         Time_Integration(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh],
-                         config[iZone], iStep, RunTime_EqSystem, Iteration);
+                         config[iZone], iStep, RunTime_EqSystem);
 
         /*--- Postprocessing ---*/
         solver_container[iZone][iInst][iMesh][SolContainer_Position]->Postprocessing(geometry[iZone][iInst][iMesh], solver_container[iZone][iInst][iMesh],
@@ -1121,7 +1108,7 @@ void CFEM_DG_Integration::Space_Integration(CGeometry *geometry,
 }
 
 void CFEM_DG_Integration::Time_Integration(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iStep,
-                                    unsigned short RunTime_EqSystem, unsigned long Iteration) {
+                                    unsigned short RunTime_EqSystem) {
 
   unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 6a5220237607..8bf6bed02c9a 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -57,7 +57,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
           CSolver ***solver,
           CConfig *config,
           unsigned long IntIter,
-          unsigned long ExtIter)   {
+          unsigned long TimeIter)   {
 
   unsigned short iDim;
   unsigned short Kind_Grid_Movement = config->GetKind_GridMovement();
@@ -86,13 +86,13 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
        velocities for the fine mesh. ---*/
 
       grid_movement->Rigid_Translation(geometry[MESH_0],
-                                       config, val_iZone, ExtIter);
+                                       config, val_iZone, TimeIter);
       grid_movement->Rigid_Plunging(geometry[MESH_0],
-                                    config, val_iZone, ExtIter);
+                                    config, val_iZone, TimeIter);
       grid_movement->Rigid_Pitching(geometry[MESH_0],
-                                    config, val_iZone, ExtIter);
+                                    config, val_iZone, TimeIter);
       grid_movement->Rigid_Rotation(geometry[MESH_0],
-                                    config, val_iZone, ExtIter);
+                                    config, val_iZone, TimeIter);
 
       /*--- Update the multigrid structure after moving the finest grid,
        including computing the grid velocities on the coarser levels. ---*/
@@ -104,7 +104,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
 
     case ELASTICITY:
 
-      if (ExtIter != 0) {
+      if (TimeIter != 0) {
 
         if (rank == MASTER_NODE)
           cout << " Deforming the grid using the Linear Elasticity solution." << endl;
@@ -139,7 +139,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       /*--- Compute the new node locations for moving markers ---*/
 
       surface_movement->Surface_Translating(geometry[MESH_0],
-                                            config, ExtIter, val_iZone);
+                                            config, TimeIter, val_iZone);
       /*--- Deform the volume grid around the new boundary locations ---*/
 
       if (rank == MASTER_NODE)
@@ -152,7 +152,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       /*--- Compute the new node locations for moving markers ---*/
 
       surface_movement->Surface_Plunging(geometry[MESH_0],
-                                         config, ExtIter, val_iZone);
+                                         config, TimeIter, val_iZone);
       /*--- Deform the volume grid around the new boundary locations ---*/
 
       if (rank == MASTER_NODE)
@@ -165,7 +165,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       /*--- Compute the new node locations for moving markers ---*/
 
       surface_movement->Surface_Pitching(geometry[MESH_0],
-                                         config, ExtIter, val_iZone);
+                                         config, TimeIter, val_iZone);
       /*--- Deform the volume grid around the new boundary locations ---*/
 
       if (rank == MASTER_NODE)
@@ -178,7 +178,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       /*--- Compute the new node locations for moving markers ---*/
 
       surface_movement->Surface_Rotating(geometry[MESH_0],
-                                         config, ExtIter, val_iZone);
+                                         config, TimeIter, val_iZone);
       /*--- Deform the volume grid around the new boundary locations ---*/
 
       if (rank == MASTER_NODE)
@@ -192,7 +192,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       if (!adjoint) {
         if (rank == MASTER_NODE)
           cout << " Computing grid velocities by finite differencing." << endl;
-        geometry[MESH_0]->SetGridVelocity(config, ExtIter);
+        geometry[MESH_0]->SetGridVelocity(config, TimeIter);
       }
 
       /*--- Update the multigrid structure after moving the finest grid,
@@ -218,13 +218,13 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
            velocities for the fine mesh. ---*/
 
           grid_movement->Rigid_Translation(geometry[MESH_0],
-                                           config, val_iZone, ExtIter);
+                                           config, val_iZone, TimeIter);
           grid_movement->Rigid_Plunging(geometry[MESH_0],
-                                        config, val_iZone, ExtIter);
+                                        config, val_iZone, TimeIter);
           grid_movement->Rigid_Pitching(geometry[MESH_0],
-                                        config, val_iZone, ExtIter);
+                                        config, val_iZone, TimeIter);
           grid_movement->Rigid_Rotation(geometry[MESH_0],
-                                        config, val_iZone, ExtIter);
+                                        config, val_iZone, TimeIter);
 
           /*--- Update the multigrid structure after moving the finest grid,
            including computing the grid velocities on the coarser levels. ---*/
@@ -242,7 +242,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
 
         /*--- Solve the aeroelastic equations for the new node locations of the moving markers(surfaces) ---*/
 
-        solver[MESH_0][FLOW_SOL]->Aeroelastic(surface_movement, geometry[MESH_0], config, ExtIter);
+        solver[MESH_0][FLOW_SOL]->Aeroelastic(surface_movement, geometry[MESH_0], config, TimeIter);
 
         /*--- Deform the volume grid around the new boundary locations ---*/
 
@@ -256,7 +256,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
 
         if (rank == MASTER_NODE)
           cout << " Computing grid velocities by finite differencing." << endl;
-        geometry[MESH_0]->SetGridVelocity(config, ExtIter);
+        geometry[MESH_0]->SetGridVelocity(config, TimeIter);
 
         /*--- Update the multigrid structure after moving the finest grid,
          including computing the grid velocities on the coarser levels. ---*/
@@ -281,7 +281,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       if (!adjoint && !stat_mesh) {
         if (rank == MASTER_NODE && Screen_Output)
           cout << "Computing grid velocities by finite differencing." << endl;
-        geometry[MESH_0]->SetGridVelocity(config, ExtIter);
+        geometry[MESH_0]->SetGridVelocity(config, TimeIter);
       }
       else if (stat_mesh) {
           if (rank == MASTER_NODE && Screen_Output)
@@ -323,7 +323,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       if (rank == MASTER_NODE)
         cout << " Updating node locations by rigid rotation." << endl;
       grid_movement->Rigid_Rotation(geometry[MESH_0],
-                                                          config, val_iZone, ExtIter);
+                                                          config, val_iZone, TimeIter);
     }
 
     /*--- Load new surface node locations from external files ---*/
@@ -331,7 +331,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
       if (rank == MASTER_NODE)
       cout << " Updating surface locations from file." << endl;
     surface_movement->SetExternal_Deformation(geometry[MESH_0],
-                                                         config, val_iZone, ExtIter);
+                                                         config, val_iZone, TimeIter);
 
     /*--- Deform the volume grid around the new boundary locations ---*/
     
@@ -346,7 +346,7 @@ void CIteration::SetGrid_Movement(CGeometry **geometry,
     if (!adjoint) {
       if (rank == MASTER_NODE)
         cout << " Computing grid velocities by finite differencing." << endl;
-      geometry[MESH_0]->SetGridVelocity(config, ExtIter);
+      geometry[MESH_0]->SetGridVelocity(config, TimeIter);
   }
 
     /*--- Update the multigrid structure after moving the finest grid,
@@ -438,7 +438,7 @@ void CIteration::Output(COutput *output,
     CGeometry ****geometry,
     CSolver *****solver,
     CConfig **config,
-    unsigned long Iter,
+    unsigned long InnerIter,
     bool StopCalc,
     unsigned short val_iZone,
     unsigned short val_iInst)      {
@@ -465,14 +465,11 @@ void CIteration::Output(COutput *output,
       /*--- Fixed CL problem ---*/
 
       ((config[val_iZone]->GetFixed_CL_Mode()) &&
-       (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == Iter)) ||
+       (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == InnerIter)) ||
 
       /*--- Steady problems ---*/
 
-      ((Iter % config[val_iZone]->GetWrt_Sol_Freq() == 0) && (Iter != 0) &&
-       ((config[val_iZone]->GetUnsteady_Simulation() == STEADY) ||
-        (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) ||
-        (config[val_iZone]->GetUnsteady_Simulation() == ROTATIONAL_FRAME))) ||
+      ((InnerIter % config[val_iZone]->GetWrt_Sol_Freq() == 0) && (InnerIter != 0)) ||
 
       /*--- No inlet profile file found. Print template. ---*/
 
@@ -488,13 +485,13 @@ void CIteration::Output(COutput *output,
    after the current iteration ---*/
 
   if (config[val_iZone]->GetFixed_CL_Mode()) {
-    if (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < Iter) output_files = false;
-    if (config[val_iZone]->GetnExtIter() - 1 == Iter) output_files = true;
+    if (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < InnerIter) output_files = false;
+    if (config[val_iZone]->GetnInner_Iter() - 1 == InnerIter) output_files = true;
   }
 
   /*--- write the solution ---*/
 
-  if (output_files) {
+  if (output_files && config[val_iZone]->GetWrt_Output()) {
 
     if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
 
@@ -557,8 +554,7 @@ void CFluidIteration::Preprocess(COutput *output,
                                     unsigned short val_iZone,
                                     unsigned short val_iInst) {
   
-  unsigned long IntIter = 0; config[val_iZone]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
+  unsigned long TimeIter = config[val_iZone]->GetTimeIter();
   
   bool fsi = config[val_iZone]->GetFSI_Simulation();
   unsigned long OuterIter = config[val_iZone]->GetOuterIter();
@@ -568,7 +564,7 @@ void CFluidIteration::Preprocess(COutput *output,
   /*--- This is done only in the first block subiteration.---*/
   /*--- From then on, the solver reuses the partially converged solution obtained in the previous subiteration ---*/
   if( fsi  && ( OuterIter == 0 ) ){
-    solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->SetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], ExtIter);
+    solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->SetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], TimeIter);
   }
   
   /*--- Apply a Wind Gust ---*/
@@ -595,31 +591,30 @@ void CFluidIteration::Iterate(COutput *output,
                                  CFreeFormDefBox*** FFDBox,
                                  unsigned short val_iZone,
                                  unsigned short val_iInst) {
-  unsigned long IntIter, ExtIter;
+  unsigned long InnerIter, TimeIter;
   
   bool unsteady = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
   bool frozen_visc = (config[val_iZone]->GetContinuous_Adjoint() && config[val_iZone]->GetFrozen_Visc_Cont()) ||
                      (config[val_iZone]->GetDiscrete_Adjoint() && config[val_iZone]->GetFrozen_Visc_Disc());
-  ExtIter = config[val_iZone]->GetExtIter();
+  TimeIter = config[val_iZone]->GetTimeIter();
   
   /* --- Setting up iteration values depending on if this is a
    steady or an unsteady simulaiton */
   
-  if ( !unsteady ) IntIter = ExtIter;
-  else IntIter = config[val_iZone]->GetIntIter();
+  InnerIter = config[val_iZone]->GetInnerIter();
   
   /*--- Update global parameters ---*/
   
   switch( config[val_iZone]->GetKind_Solver() ) {
       
     case EULER: case DISC_ADJ_EULER:
-      config[val_iZone]->SetGlobalParam(EULER, RUNTIME_FLOW_SYS, ExtIter); break;
+      config[val_iZone]->SetGlobalParam(EULER, RUNTIME_FLOW_SYS); break;
       
     case NAVIER_STOKES: case DISC_ADJ_NAVIER_STOKES:
-      config[val_iZone]->SetGlobalParam(NAVIER_STOKES, RUNTIME_FLOW_SYS, ExtIter); break;
+      config[val_iZone]->SetGlobalParam(NAVIER_STOKES, RUNTIME_FLOW_SYS); break;
       
     case RANS: case DISC_ADJ_RANS:
-      config[val_iZone]->SetGlobalParam(RANS, RUNTIME_FLOW_SYS, ExtIter); break;
+      config[val_iZone]->SetGlobalParam(RANS, RUNTIME_FLOW_SYS); break;
       
   }
   
@@ -627,31 +622,31 @@ void CFluidIteration::Iterate(COutput *output,
   /*--- Solve the Euler, Navier-Stokes or Reynolds-averaged Navier-Stokes (RANS) equations (one iteration) ---*/
   
   integration[val_iZone][val_iInst][FLOW_SOL]->MultiGrid_Iteration(geometry, solver, numerics,
-                                                                  config, RUNTIME_FLOW_SYS, IntIter, val_iZone, val_iInst);
+                                                                  config, RUNTIME_FLOW_SYS, val_iZone, val_iInst);
   
   if ((config[val_iZone]->GetKind_Solver() == RANS) ||
       ((config[val_iZone]->GetKind_Solver() == DISC_ADJ_RANS) && !frozen_visc)) {
     
     /*--- Solve the turbulence model ---*/
     
-    config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TURB_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TURB_SYS);
     integration[val_iZone][val_iInst][TURB_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                     config, RUNTIME_TURB_SYS, IntIter, val_iZone, val_iInst);
+                                                                     config, RUNTIME_TURB_SYS, val_iZone, val_iInst);
     
     /*--- Solve transition model ---*/
     
     if (config[val_iZone]->GetKind_Trans_Model() == LM) {
-      config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TRANS_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TRANS_SYS);
       integration[val_iZone][val_iInst][TRANS_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                        config, RUNTIME_TRANS_SYS, IntIter, val_iZone, val_iInst);
+                                                                        config, RUNTIME_TRANS_SYS, val_iZone, val_iInst);
     }
     
   }
 
   if (config[val_iZone]->GetWeakly_Coupled_Heat()){
-    config[val_iZone]->SetGlobalParam(RANS, RUNTIME_HEAT_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(RANS, RUNTIME_HEAT_SYS);
     integration[val_iZone][val_iInst][HEAT_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                     config, RUNTIME_HEAT_SYS, IntIter, val_iZone, val_iInst);
+                                                                     config, RUNTIME_HEAT_SYS, val_iZone, val_iInst);
   }
   
   /*--- Call Dynamic mesh update if AEROELASTIC motion was specified ---*/
@@ -659,12 +654,12 @@ void CFluidIteration::Iterate(COutput *output,
   if ((config[val_iZone]->GetGrid_Movement()) && (config[val_iZone]->GetAeroelastic_Simulation()) && unsteady) {
       
     SetGrid_Movement(geometry[val_iZone][val_iInst], surface_movement[val_iZone], grid_movement[val_iZone][val_iInst],
-                     solver[val_iZone][val_iInst], config[val_iZone], IntIter, ExtIter);
+                     solver[val_iZone][val_iInst], config[val_iZone], InnerIter, TimeIter);
     
     /*--- Apply a Wind Gust ---*/
     
     if (config[val_iZone]->GetWind_Gust()) {
-      if (IntIter % config[val_iZone]->GetAeroelasticIter() == 0 && IntIter != 0)
+      if (InnerIter % config[val_iZone]->GetAeroelasticIter() == 0 && InnerIter != 0)
         SetWind_GustField(config[val_iZone], geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst]);
     }
     
@@ -693,8 +688,6 @@ void CFluidIteration::Update(COutput *output,
                                 unsigned short val_iInst)      {
   
   unsigned short iMesh;
-  su2double Physical_dt, Physical_t;
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
 
   /*--- Dual time stepping strategy ---*/
   
@@ -722,16 +715,7 @@ void CFluidIteration::Update(COutput *output,
       integration[val_iZone][val_iInst][TRANS_SOL]->SetDualTime_Solver(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0][TRANS_SOL], config[val_iZone], MESH_0);
       integration[val_iZone][val_iInst][TRANS_SOL]->SetConvergence(false);
     }
-    
-    /*--- Verify convergence criteria (based on total time) ---*/
-    
-    Physical_dt = config[val_iZone]->GetDelta_UnstTime();
-    Physical_t  = (ExtIter+1)*Physical_dt;
-    if (Physical_t >=  config[val_iZone]->GetTotal_UnstTime())
-      integration[val_iZone][val_iInst][FLOW_SOL]->SetConvergence(true);
-    
   }
-  
 }
 
 bool CFluidIteration::Monitor(COutput *output,
@@ -827,8 +811,7 @@ void CFluidIteration::Solve(COutput *output,
                                  unsigned short val_iInst) {
 
   /*--- Boolean to determine if we are running a static or dynamic case ---*/
-  bool steady = (config[val_iZone]->GetUnsteady_Simulation() == STEADY);
-  bool unsteady = !steady;
+  bool steady   = !config[val_iZone]->GetTime_Domain();
 
   unsigned long Inner_Iter, nInner_Iter = config[val_iZone]->GetnInner_Iter();
   bool StopCalc = false;
@@ -842,13 +825,6 @@ void CFluidIteration::Solve(COutput *output,
   StartTime = MPI_Wtime();
 #endif
 
-  /*--- If the problem is multizone, the block iterates on the number of internal iterations ---*/
-  /*--- If the problem is single zone, the block iterates on the number of iterations (pseudo-time)---*/
-  if (multizone || unsteady)
-    nInner_Iter = config[val_iZone]->GetnInner_Iter();
-  else
-    nInner_Iter = config[val_iZone]->GetnIter();
-
   /*--- Preprocess the solver ---*/
   Preprocess(output, integration, geometry,
       solver, numerics, config,
@@ -861,16 +837,6 @@ void CFluidIteration::Solve(COutput *output,
 
       config[val_iZone]->SetInnerIter(Inner_Iter);
 
-      /*--- For steady-state flow simulations, we need to loop over ExtIter for the number of time steps ---*/
-      if (steady) config[val_iZone]->SetExtIter(Inner_Iter);
-      /*--- For unsteady flow simulations, we need to loop over IntIter for the number of time steps ---*/
-      if (unsteady) config[val_iZone]->SetIntIter(Inner_Iter);
-      /*--- If only one internal iteration is required, the ExtIter/IntIter is the OuterIter of the block structure ---*/
-      if (nInner_Iter == 1) {
-        if (steady) config[val_iZone]->SetExtIter(config[val_iZone]->GetOuterIter());
-        if (unsteady) config[val_iZone]->SetIntIter(config[val_iZone]->GetOuterIter());
-      }
-
       /*--- Run a single iteration of the solver ---*/
       Iterate(output, integration, geometry,
           solver, numerics, config,
@@ -881,10 +847,10 @@ void CFluidIteration::Solve(COutput *output,
                          solver, numerics, config,
                          surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
-      /*--- Output files at intermediate time positions if the problem is single zone ---*/
+      /*--- Output files at intermediate iterations if the problem is single zone ---*/
 
-      if (singlezone) Output(output, geometry, solver, config,
-                             config[val_iZone]->GetInnerIter(), StopCalc, val_iZone, val_iInst);
+      if (singlezone && steady) Output(output, geometry, solver, config,
+                                          config[val_iZone]->GetInnerIter(), StopCalc, val_iZone, val_iInst);
       
 
       /*--- If the iteration has converged, break the loop ---*/
@@ -941,8 +907,8 @@ void CFluidIteration::SetWind_GustField(CConfig *config, CGeometry **geometry, C
   su2double *Gust, *GridVel, *NewGridVel, *GustDer;
   
   su2double Physical_dt = config->GetDelta_UnstTime();
-  unsigned long ExtIter = config->GetExtIter();
-  su2double Physical_t = ExtIter*Physical_dt;
+  unsigned long TimeIter = config->GetTimeIter();
+  su2double Physical_t = TimeIter*Physical_dt;
   
   su2double Uinf = solver[MESH_0][FLOW_SOL]->GetVelocity_Inf(0); // Assumption gust moves at infinity velocity
   
@@ -1184,17 +1150,16 @@ void CFEMFluidIteration::Preprocess(COutput *output,
                                     unsigned short val_iZone,
                                     unsigned short val_iInst) {
   
-  unsigned long IntIter = 0; config[ZONE_0]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
+  unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
   const bool restart = (config[ZONE_0]->GetRestart() ||
                         config[ZONE_0]->GetRestart_Flow());
   
   /*--- Set the initial condition if this is not a restart. ---*/
-  if (ExtIter == 0 && !restart)
+  if (TimeIter == 0 && !restart)
     solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->SetInitialCondition(geometry[val_iZone][val_iInst],
                                                                        solver[val_iZone][val_iInst],
                                                                        config[val_iZone],
-                                                                       ExtIter);
+                                                                       TimeIter);
   
 }
 
@@ -1209,23 +1174,20 @@ void CFEMFluidIteration::Iterate(COutput *output,
                                  CFreeFormDefBox*** FFDBox,
                                  unsigned short val_iZone,
                                  unsigned short val_iInst) {
-  
-  unsigned long IntIter = 0; config[ZONE_0]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
-  
+    
   /*--- Update global parameters ---*/
   
   if (config[val_iZone]->GetKind_Solver() == FEM_EULER || config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM_EULER)
-    config[val_iZone]->SetGlobalParam(FEM_EULER, RUNTIME_FLOW_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(FEM_EULER, RUNTIME_FLOW_SYS);
   
   if (config[val_iZone]->GetKind_Solver() == FEM_NAVIER_STOKES || config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM_NS)
-    config[val_iZone]->SetGlobalParam(FEM_NAVIER_STOKES, RUNTIME_FLOW_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(FEM_NAVIER_STOKES, RUNTIME_FLOW_SYS);
   
   if (config[val_iZone]->GetKind_Solver() == FEM_RANS || config[val_iZone]->GetKind_Solver() == DISC_ADJ_FEM_RANS)
-    config[val_iZone]->SetGlobalParam(FEM_RANS, RUNTIME_FLOW_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(FEM_RANS, RUNTIME_FLOW_SYS);
   
   if (config[val_iZone]->GetKind_Solver() == FEM_LES)
-    config[val_iZone]->SetGlobalParam(FEM_LES, RUNTIME_FLOW_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(FEM_LES, RUNTIME_FLOW_SYS);
   
   /*--- Solve the Euler, Navier-Stokes, RANS or LES equations (one iteration) ---*/
   
@@ -1234,7 +1196,7 @@ void CFEMFluidIteration::Iterate(COutput *output,
                                                                               numerics,
                                                                               config,
                                                                               RUNTIME_FLOW_SYS,
-                                                                              IntIter, val_iZone,
+                                                                              val_iZone,
                                                                               val_iInst);
 }
 
@@ -1299,30 +1261,12 @@ void CHeatIteration::Iterate(COutput *output,
                              unsigned short val_iZone,
                              unsigned short val_iInst) {
 
-  unsigned long IntIter, ExtIter;
-  bool unsteady = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
-  
-  ExtIter = config[val_iZone]->GetExtIter();
-  
-  /* --- Setting up iteration values depending on if this is a
-   steady or an unsteady simulaiton */
-
-  if ( !unsteady ) IntIter = ExtIter;
-  else IntIter = config[val_iZone]->GetIntIter();
-  
   /*--- Update global parameters ---*/
 
-  config[val_iZone]->SetGlobalParam(HEAT_EQUATION_FVM, RUNTIME_HEAT_SYS, ExtIter);
+  config[val_iZone]->SetGlobalParam(HEAT_EQUATION_FVM, RUNTIME_HEAT_SYS);
 
-  integration[val_iZone][val_iInst][HEAT_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                   config, RUNTIME_HEAT_SYS, IntIter, val_iZone, val_iInst);
+  integration[val_iZone][val_iInst][HEAT_SOL]->SingleGrid_Iteration(geometry, solver, numerics, config, RUNTIME_HEAT_SYS, val_iZone, val_iInst);
   
-  /*--- Write the convergence history ---*/
-
-  if ( unsteady && !config[val_iZone]->GetDiscrete_Adjoint() && (!config[val_iZone]->GetMultizone_Problem() && !config[val_iZone]->GetSinglezone_Driver())) {
-
-    output->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry, solver, config, integration, true, 0.0, val_iZone, val_iInst);
-  }
 }
 
 void CHeatIteration::Update(COutput *output,
@@ -1339,7 +1283,7 @@ void CHeatIteration::Update(COutput *output,
   
   unsigned short iMesh;
   su2double Physical_dt, Physical_t;
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
+  unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
   
   /*--- Dual time stepping strategy ---*/
   if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
@@ -1352,7 +1296,7 @@ void CHeatIteration::Update(COutput *output,
     }
     
     Physical_dt = config[val_iZone]->GetDelta_UnstTime();
-    Physical_t  = (ExtIter+1)*Physical_dt;
+    Physical_t  = (TimeIter+1)*Physical_dt;
     if (Physical_t >=  config[val_iZone]->GetTotal_UnstTime())
       integration[val_iZone][val_iInst][HEAT_SOL]->SetConvergence(true);
   }
@@ -1411,16 +1355,6 @@ void CHeatIteration::Solve(COutput *output,
 		
     config[val_iZone]->SetInnerIter(Inner_Iter);
 
-    /*--- For steady-state flow simulations, we need to loop over ExtIter for the number of time steps ---*/
-    if (steady) config[val_iZone]->SetExtIter(Inner_Iter);
-    /*--- For unsteady flow simulations, we need to loop over IntIter for the number of time steps ---*/
-    if (unsteady) config[val_iZone]->SetIntIter(Inner_Iter);
-    /*--- If only one internal iteration is required, the ExtIter/IntIter is the OuterIter of the block structure ---*/
-    if (nInner_Iter == 1) {
-      if (steady) config[val_iZone]->SetExtIter(config[val_iZone]->GetOuterIter());
-      if (unsteady) config[val_iZone]->SetIntIter(config[val_iZone]->GetOuterIter());
-    }
-
     Iterate(output, integration, geometry,
         solver, numerics, config,
         surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
@@ -1471,9 +1405,9 @@ void CFEAIteration::Iterate(COutput *output,
                                 ) {
 
   su2double loadIncrement;
-  unsigned long IntIter = 0; config[val_iZone]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
-
+  unsigned long IntIter = 0;
+  unsigned long TimeIter = config[val_iZone]->GetTimeIter();
+  bool StopCalc;
   unsigned long iIncrement;
   unsigned long nIncrements = config[val_iZone]->GetNumberIncrements();
 
@@ -1485,8 +1419,6 @@ void CFEAIteration::Iterate(COutput *output,
 
   bool incremental_load = config[val_iZone]->GetIncrementalLoad();              // If an incremental load is applied
 
-  ofstream ConvHist_file;
-
   /*--- This is to prevent problems when running a linear solver ---*/
   if (!nonlinear) incremental_load = false;
 
@@ -1494,19 +1426,20 @@ void CFEAIteration::Iterate(COutput *output,
   integration[val_iZone][val_iInst][FEA_SOL]->SetConvergence(false);
 
   if (linear) {
-
-    /*--- Set the value of the internal iteration ---*/
-
-    IntIter = ExtIter;
-
+    
+    config[val_iZone]->SetInnerIter(0);
+    
     /*--- FEA equations ---*/
 
-    config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS);
 
     /*--- Run the iteration ---*/
 
     integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-        config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+        config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
+    
+    Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+    
 
   }
   /*--- If the structure is held static and the solver is nonlinear, we don't need to solve for static time, but we need to compute Mass Matrix and Integration constants ---*/
@@ -1515,44 +1448,36 @@ void CFEAIteration::Iterate(COutput *output,
     /*--- THIS IS THE DIRECT APPROACH (NO INCREMENTAL LOAD APPLIED) ---*/
 
     if (!incremental_load) {
-
-      /*--- Set the value of the internal iteration ---*/
-
-      IntIter = 0;       
+      
+      IntIter = 0;
       config[val_iZone]->SetInnerIter(IntIter);
-      config[val_iZone]->SetIntIter(IntIter);
-
+      
       /*--- FEA equations ---*/
 
-      config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS);
 
       /*--- Run the iteration ---*/
 
       integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-          config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
-
+          config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
+      Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+      
       /*----------------- If the solver is non-linear, we need to subiterate using a Newton-Raphson approach ----------------------*/
 
-      for (IntIter = 1; IntIter < config[val_iZone]->GetDyn_nIntIter(); IntIter++) {
+      for (IntIter = 1; IntIter < config[val_iZone]->GetnInner_Iter(); IntIter++) {
 
+        config[val_iZone]->SetInnerIter(IntIter);
+        
         /*--- Limits to only one structural iteration for the discrete adjoint FEM problem ---*/
         if (disc_adj_fem) break;
 
-        /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-        solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-        output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
-        config[val_iZone]->SetInnerIter(IntIter);
-        config[val_iZone]->SetIntIter(IntIter);
-
-        integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-            config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+        StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
         integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-            config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+            config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
-        if (integration[val_iZone][val_iInst][FEA_SOL]->GetConvergence()) break;
+        if (StopCalc) break;
 
       }
 
@@ -1562,7 +1487,7 @@ void CFEAIteration::Iterate(COutput *output,
 
       /*--- Set the initial condition: store the current solution as Solution_Old ---*/
 
-      solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->SetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], ExtIter);
+      solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->SetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], TimeIter);
 
       /*--- The load increment is 1.0 ---*/
       loadIncrement = 1.0;
@@ -1572,39 +1497,32 @@ void CFEAIteration::Iterate(COutput *output,
       /*--- Set the value of the internal iteration ---*/
 
       IntIter = 0;
+      config[val_iZone]->SetInnerIter(IntIter);
 
       /*--- FEA equations ---*/
 
-      config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
-
-      /*--- Write the convergence history headers ---*/
-
-      if (!disc_adj_fem) output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
+      config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS);
 
       /*--- Run the first iteration ---*/
 
       integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-          config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+          config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-      solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-      output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
+      
+      Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+   
       /*--- Run the second iteration ---*/
 
       IntIter = 1;
-
-      config[val_iZone]->SetIntIter(IntIter);
+      config[val_iZone]->SetInnerIter(IntIter);
 
       integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-          config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+          config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
       /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-      solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-      output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
+      Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
       bool meetCriteria;
       su2double Residual_UTOL, Residual_RTOL, Residual_ETOL;
@@ -1628,15 +1546,12 @@ void CFEAIteration::Iterate(COutput *output,
         for (IntIter = 2; IntIter < config[val_iZone]->GetDyn_nIntIter(); IntIter++) {
 
           /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-          solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-          output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
-          config[val_iZone]->SetIntIter(IntIter);
-
+          StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+ 
           integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-              config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+              config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
-          if (integration[val_iZone][val_iInst][FEA_SOL]->GetConvergence()) break;
+          if (StopCalc) break;
 
         }
 
@@ -1649,7 +1564,7 @@ void CFEAIteration::Iterate(COutput *output,
         /*--- Here we have to restart the solution to the original one of the iteration ---*/
         /*--- Retrieve the Solution_Old as the current solution before subiterating ---*/
 
-        solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->ResetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], ExtIter);
+        solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->ResetInitialCondition(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], TimeIter);
 
         /*--- For the number of increments ---*/
         for (iIncrement = 0; iIncrement < nIncrements; iIncrement++) {
@@ -1659,12 +1574,12 @@ void CFEAIteration::Iterate(COutput *output,
           /*--- Set the load increment and the initial condition, and output the parameters of UTOL, RTOL, ETOL for the previous iteration ---*/
 
           /*--- Set the convergence monitor to false, to force se solver to converge every subiteration ---*/
-          integration[val_iZone][val_iInst][FEA_SOL]->SetConvergence(false);
+          output->SetConvergence(false);
 
 
           /*--- FEA equations ---*/
 
-          config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
+          config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS);
 
 
           solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->SetLoad_Increment(loadIncrement);
@@ -1676,16 +1591,15 @@ void CFEAIteration::Iterate(COutput *output,
 
           /*--- Set the value of the internal iteration ---*/
           IntIter = 0;
-          config[val_iZone]->SetIntIter(IntIter);
 
           /*--- FEA equations ---*/
 
-          config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS, ExtIter);
+          config[val_iZone]->SetGlobalParam(FEM_ELASTICITY, RUNTIME_FEA_SYS);
 
           /*--- Run the iteration ---*/
 
           integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-              config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+              config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
 
           /*----------------- If the solver is non-linear, we need to subiterate using a Newton-Raphson approach ----------------------*/
@@ -1693,23 +1607,19 @@ void CFEAIteration::Iterate(COutput *output,
           for (IntIter = 1; IntIter < config[val_iZone]->GetDyn_nIntIter(); IntIter++) {
 
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-            solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-            output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
-
-            config[val_iZone]->SetIntIter(IntIter);
+            StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
             integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
-                config, RUNTIME_FEA_SYS, IntIter, val_iZone, val_iInst);
+                config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
-            if (integration[val_iZone][val_iInst][FEA_SOL]->GetConvergence()) break;
+            if (StopCalc) break;
 
           }
 
           /*--- Write history for intermediate steps ---*/
           if (iIncrement < nIncrements - 1){
             /*--- Write the convergence history (first, compute Von Mises stress) ---*/
-            solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
-            output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), IntIter);
+            StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
           }
 
         }
@@ -1759,7 +1669,7 @@ void CFEAIteration::Update(COutput *output,
        unsigned short val_iInst) {
 
   su2double Physical_dt, Physical_t;
-    unsigned long ExtIter = config[val_iZone]->GetExtIter();
+    unsigned long TimeIter = config[val_iZone]->GetTimeIter();
   bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);          // Dynamic problems
   bool static_fem = (config[val_iZone]->GetDynamic_Analysis() == STATIC);         // Static problems
   bool fsi = config[val_iZone]->GetFSI_Simulation();         // Fluid-Structure Interaction problems
@@ -1778,7 +1688,7 @@ void CFEAIteration::Update(COutput *output,
       /*--- Verify convergence criteria (based on total time) ---*/
 
     Physical_dt = config[val_iZone]->GetDelta_DynTime();
-    Physical_t  = (ExtIter+1)*Physical_dt;
+    Physical_t  = (TimeIter+1)*Physical_dt;
     if (Physical_t >=  config[val_iZone]->GetTotal_DynTime())
       integration[val_iZone][val_iInst][FEA_SOL]->SetConvergence(true);
     } else if ( static_fem && fsi) {
@@ -1871,15 +1781,14 @@ bool CFEAIteration::Monitor(COutput *output,
 #endif
   UsedTime = StopTime - StartTime;
 
-  /*--- If convergence was reached --*/
-  StopCalc = integration[val_iZone][INST_0][FEA_SOL]->GetConvergence();
-
   solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
 
   if (config[val_iZone]->GetMultizone_Problem() || config[val_iZone]->GetSinglezone_Driver()){
     output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), config[val_iZone]->GetInnerIter());
   }
-
+  
+  StopCalc = output->GetConvergence();
+  
   return StopCalc;
 
 }
@@ -1914,9 +1823,6 @@ void CFEAIteration::Solve(COutput *output,
       solver, numerics, config,
       surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
-  Monitor(output, integration, geometry,
-                        solver, numerics, config,
-                        surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
 
   /*--- Write the convergence history for the structure (only screen output) ---*/
 //  if (multizone) output->SetConvHistory_Body(geometry, solver, config, integration, false, 0.0, val_iZone, INST_0);
@@ -1943,13 +1849,13 @@ void CAdjFluidIteration::Preprocess(COutput *output,
   unsigned short iMesh;
   bool harmonic_balance = (config[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
   bool dynamic_mesh = config[ZONE_0]->GetGrid_Movement();
-  unsigned long IntIter = 0; config[ZONE_0]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
+  unsigned long InnerIter = 0; 
+  unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
 
   /*--- For the unsteady adjoint, load a new direct solution from a restart file. ---*/
   
-  if (((dynamic_mesh && ExtIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) && !harmonic_balance) {
-    int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 1;
+  if (((dynamic_mesh && TimeIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) && !harmonic_balance) {
+    int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 1;
     if (rank == MASTER_NODE && val_iZone == ZONE_0 && config[val_iZone]->GetUnsteady_Simulation())
       cout << endl << " Loading flow solution from direct iteration " << Direct_Iter << "." << endl;
     solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->LoadRestart(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], Direct_Iter, true);
@@ -1957,14 +1863,14 @@ void CAdjFluidIteration::Preprocess(COutput *output,
   
   /*--- Continuous adjoint Euler, Navier-Stokes or Reynolds-averaged Navier-Stokes (RANS) equations ---*/
   
-  if ((ExtIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) {
+  if ((InnerIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) {
     
     if (config[val_iZone]->GetKind_Solver() == ADJ_EULER)
-      config[val_iZone]->SetGlobalParam(ADJ_EULER, RUNTIME_FLOW_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(ADJ_EULER, RUNTIME_FLOW_SYS);
     if (config[val_iZone]->GetKind_Solver() == ADJ_NAVIER_STOKES)
-      config[val_iZone]->SetGlobalParam(ADJ_NAVIER_STOKES, RUNTIME_FLOW_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(ADJ_NAVIER_STOKES, RUNTIME_FLOW_SYS);
     if (config[val_iZone]->GetKind_Solver() == ADJ_RANS)
-      config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_FLOW_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_FLOW_SYS);
     
     /*--- Solve the Euler, Navier-Stokes or Reynolds-averaged Navier-Stokes (RANS) equations (one iteration) ---*/
     
@@ -1975,22 +1881,22 @@ void CAdjFluidIteration::Preprocess(COutput *output,
       cout << "Compute residuals to check the convergence of the direct problem." << endl;
     
     integration[val_iZone][val_iInst][FLOW_SOL]->MultiGrid_Iteration(geometry, solver, numerics,
-                                                                    config, RUNTIME_FLOW_SYS, 0, val_iZone, val_iInst);
+                                                                    config, RUNTIME_FLOW_SYS, val_iZone, val_iInst);
     
     if (config[val_iZone]->GetKind_Solver() == ADJ_RANS) {
       
       /*--- Solve the turbulence model ---*/
       
-      config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_TURB_SYS, ExtIter);
+      config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_TURB_SYS);
       integration[val_iZone][val_iInst][TURB_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                       config, RUNTIME_TURB_SYS, IntIter, val_iZone, val_iInst);
+                                                                       config, RUNTIME_TURB_SYS, val_iZone, val_iInst);
       
       /*--- Solve transition model ---*/
       
       if (config[val_iZone]->GetKind_Trans_Model() == LM) {
-        config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TRANS_SYS, ExtIter);
+        config[val_iZone]->SetGlobalParam(RANS, RUNTIME_TRANS_SYS);
         integration[val_iZone][val_iInst][TRANS_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                          config, RUNTIME_TRANS_SYS, IntIter, val_iZone, val_iInst);
+                                                                          config, RUNTIME_TRANS_SYS, val_iZone, val_iInst);
       }
       
     }
@@ -2050,39 +1956,22 @@ void CAdjFluidIteration::Iterate(COutput *output,
                                     unsigned short val_iZone,
                                     unsigned short val_iInst) {
   
-  unsigned long IntIter = 0; config[ZONE_0]->SetIntIter(IntIter);
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
-  bool unsteady = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
-  
-  /*--- Set the value of the internal iteration ---*/
-  
-  ExtIter = config[val_iZone]->GetExtIter();
-  
-  /* --- Setting up iteration values depending on if this is a 
-  steady or an unsteady simulaiton */
-
-  if ( !unsteady ) 
-    IntIter = ExtIter;
-  else
-    IntIter = config[val_iZone]->GetIntIter();
-    
-    
   switch( config[val_iZone]->GetKind_Solver() ) {
 
   case ADJ_EULER:
-    config[val_iZone]->SetGlobalParam(ADJ_EULER, RUNTIME_ADJFLOW_SYS, ExtIter); break;
+    config[val_iZone]->SetGlobalParam(ADJ_EULER, RUNTIME_ADJFLOW_SYS); break;
 
   case ADJ_NAVIER_STOKES:
-    config[val_iZone]->SetGlobalParam(ADJ_NAVIER_STOKES, RUNTIME_ADJFLOW_SYS, ExtIter); break;
+    config[val_iZone]->SetGlobalParam(ADJ_NAVIER_STOKES, RUNTIME_ADJFLOW_SYS); break;
 
   case ADJ_RANS:
-    config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_ADJFLOW_SYS, ExtIter); break;          
+    config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_ADJFLOW_SYS); break;          
   }
     
   /*--- Iteration of the flow adjoint problem ---*/
   
   integration[val_iZone][val_iInst][ADJFLOW_SOL]->MultiGrid_Iteration(geometry, solver, numerics,
-                                                                     config, RUNTIME_ADJFLOW_SYS, IntIter, val_iZone, val_iInst);
+                                                                     config, RUNTIME_ADJFLOW_SYS, val_iZone, val_iInst);
   
   /*--- Iteration of the turbulence model adjoint ---*/
   
@@ -2090,9 +1979,9 @@ void CAdjFluidIteration::Iterate(COutput *output,
     
     /*--- Adjoint turbulence model solution ---*/
     
-    config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_ADJTURB_SYS, ExtIter);
+    config[val_iZone]->SetGlobalParam(ADJ_RANS, RUNTIME_ADJTURB_SYS);
     integration[val_iZone][val_iInst][ADJTURB_SOL]->SingleGrid_Iteration(geometry, solver, numerics,
-                                                                        config, RUNTIME_ADJTURB_SYS, IntIter, val_iZone, val_iInst);
+                                                                        config, RUNTIME_ADJTURB_SYS, val_iZone, val_iInst);
     
   }
   
@@ -2111,7 +2000,7 @@ void CAdjFluidIteration::Update(COutput *output,
   
   su2double Physical_dt, Physical_t;
   unsigned short iMesh;
-  unsigned long ExtIter = config[ZONE_0]->GetExtIter();
+  unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
   
   /*--- Dual time stepping strategy ---*/
   
@@ -2125,7 +2014,7 @@ void CAdjFluidIteration::Update(COutput *output,
       integration[val_iZone][val_iInst][ADJFLOW_SOL]->SetConvergence(false);
     }
     
-    Physical_dt = config[val_iZone]->GetDelta_UnstTime(); Physical_t  = (ExtIter+1)*Physical_dt;
+    Physical_dt = config[val_iZone]->GetDelta_UnstTime(); Physical_t  = (TimeIter+1)*Physical_dt;
     if (Physical_t >=  config[val_iZone]->GetTotal_UnstTime()) integration[val_iZone][val_iInst][ADJFLOW_SOL]->SetConvergence(true);
     
   }
@@ -2158,9 +2047,8 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
   StartTime = MPI_Wtime();
 #endif
 
-  unsigned long IntIter = 0, iPoint;
-  config[ZONE_0]->SetIntIter(IntIter);
-  unsigned short ExtIter = config[val_iZone]->GetExtIter();
+  unsigned long iPoint;
+  unsigned short TimeIter = config[val_iZone]->GetTimeIter();
   bool dual_time_1st = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
   bool dual_time_2nd = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
@@ -2180,7 +2068,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
 
   if (config[val_iZone]->GetUnsteady_Simulation()) {
 
-    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 2;
+    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2;
 
     /*--- For dual-time stepping we want to load the already converged solution at timestep n ---*/
 
@@ -2188,7 +2076,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
       Direct_Iter += 1;
     }
 
-    if (ExtIter == 0){
+    if (TimeIter == 0){
 
       if (dual_time_2nd) {
 
@@ -2241,7 +2129,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
     }
 
 
-    if ((ExtIter > 0) && dual_time){
+    if ((TimeIter > 0) && dual_time){
 
       /*--- Load solution timestep n-1 | n-2 for DualTimestepping 1st | 2nd order ---*/
       if (dual_time_1st){
@@ -2323,7 +2211,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
 
   /*--- Store flow solution also in the adjoint solver in order to be able to reset it later ---*/
 
-  if (ExtIter == 0 || dual_time) {
+  if (TimeIter == 0 || dual_time) {
     for (iMesh=0; iMesh<=config[val_iZone]->GetnMGLevels();iMesh++) {
       for (iPoint = 0; iPoint < geometry[val_iZone][val_iInst][iMesh]->GetnPoint(); iPoint++) {
         solver[val_iZone][val_iInst][iMesh][ADJFLOW_SOL]->node[iPoint]->SetSolution_Direct(solver[val_iZone][val_iInst][iMesh][FLOW_SOL]->node[iPoint]->GetSolution());
@@ -2403,18 +2291,10 @@ void CDiscAdjFluidIteration::Iterate(COutput *output,
                                         unsigned short val_iZone,
                                         unsigned short val_iInst) {
   
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
   unsigned short Kind_Solver = config[val_iZone]->GetKind_Solver();
-  unsigned long IntIter = 0;
-  bool unsteady = config[val_iZone]->GetUnsteady_Simulation() != STEADY;
   bool frozen_visc = config[val_iZone]->GetFrozen_Visc_Disc();
   bool heat = config[val_iZone]->GetWeakly_Coupled_Heat();
 
-  if (!unsteady)
-    IntIter = ExtIter;
-  else {
-    IntIter = config[val_iZone]->GetIntIter();
-  }
 
   /*--- Extract the adjoints of the conservative input variables and store them for the next iteration ---*/
 
@@ -2424,12 +2304,7 @@ void CDiscAdjFluidIteration::Iterate(COutput *output,
 
     solver[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->ExtractAdjoint_Variables(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone]);
 
-    /*--- Set the convergence criteria (only residual possible) ---*/
-
-    integration[val_iZone][val_iInst][ADJFLOW_SOL]->Convergence_Monitoring(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone],
-                                                                          IntIter, log10(solver[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)), MESH_0);
-
-    }
+  }
   if (turbulent && !frozen_visc) {
 
     solver[val_iZone][val_iInst][MESH_0][ADJTURB_SOL]->ExtractAdjoint_Solution(geometry[val_iZone][val_iInst][MESH_0],
@@ -2770,9 +2645,8 @@ void CDiscAdjFEAIteration::Preprocess(COutput *output,
                                            unsigned short val_iZone,
                                            unsigned short val_iInst) {
 
-  unsigned long IntIter = 0, iPoint;
-  config[ZONE_0]->SetIntIter(IntIter);
-  unsigned short ExtIter = config[val_iZone]->GetExtIter();
+  unsigned long iPoint;
+  unsigned short TimeIter = config[val_iZone]->GetTimeIter();
   bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
 
   int Direct_Iter;
@@ -2781,7 +2655,7 @@ void CDiscAdjFEAIteration::Preprocess(COutput *output,
 
   if (dynamic) {
 
-    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 1;
+    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 1;
 
     /*--- We want to load the already converged solution at timesteps n and n-1 ---*/
 
@@ -2886,8 +2760,6 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
 
   bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
 
-  unsigned long IntIter  = config[val_iZone]->GetIntIter();
-
   /*--- Extract the adjoints of the conservative input variables and store them for the next iteration ---*/
 
   solver[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->ExtractAdjoint_Solution(geometry[val_iZone][val_iInst][MESH_0],
@@ -2895,14 +2767,6 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
 
   solver[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->ExtractAdjoint_Variables(geometry[val_iZone][val_iInst][MESH_0],
                                                                                        config[val_iZone]);
-
-  /*--- Set the convergence criteria (only residual possible) ---*/
-
-  integration[val_iZone][val_iInst][ADJFEA_SOL]->Convergence_Monitoring(geometry[val_iZone][val_iInst][MESH_0],config[val_iZone],
-                                                                                  IntIter,log10(solver[val_iZone][val_iInst][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0)), MESH_0);
-
-
-
   if (dynamic){
     integration[val_iZone][val_iInst][ADJFEA_SOL]->SetConvergence(false);
   }
@@ -2922,13 +2786,13 @@ void CDiscAdjFEAIteration::SetRecording(COutput *output,
                                              unsigned short val_iInst,
                                              unsigned short kind_recording)      {
 
-  unsigned long IntIter = config[ZONE_0]->GetIntIter();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter(), DirectExtIter;
+  unsigned long InnerIter = config[ZONE_0]->GetInnerIter();
+  unsigned long TimeIter = config[val_iZone]->GetTimeIter(), DirectTimeIter;
   bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
 
-  DirectExtIter = 0;
+  DirectTimeIter = 0;
   if (dynamic){
-    DirectExtIter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 1;
+    DirectTimeIter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 1;
   }
 
   /*--- Reset the tape ---*/
@@ -2971,7 +2835,7 @@ void CDiscAdjFEAIteration::SetRecording(COutput *output,
   /*--- Set the correct direct iteration number ---*/
 
   if (dynamic){
-    config[val_iZone]->SetExtIter(DirectExtIter);
+    config[val_iZone]->SetTimeIter(DirectTimeIter);
   }
 
   /*--- Run the direct iteration ---*/
@@ -2979,7 +2843,7 @@ void CDiscAdjFEAIteration::SetRecording(COutput *output,
   fem_iteration->Iterate(output,integration,geometry,solver,numerics,
                               config,surface_movement,grid_movement,FFDBox, val_iZone, val_iInst);
 
-  config[val_iZone]->SetExtIter(ExtIter);
+  config[val_iZone]->SetTimeIter(TimeIter);
 
   /*--- Register structural variables and objective function as output ---*/
 
@@ -2995,7 +2859,7 @@ void CDiscAdjFEAIteration::SetRecording(COutput *output,
 
   /* --- Reset the number of the internal iterations---*/
 
-  config[ZONE_0]->SetIntIter(IntIter);
+  config[ZONE_0]->SetInnerIter(InnerIter);
 
 }
 
@@ -3246,7 +3110,7 @@ void CDiscAdjFEAIteration::Postprocess(COutput *output,
 
     myfile_res.precision(15);
 
-    myfile_res << config[val_iZone]->GetExtIter() << "\t";
+    myfile_res << config[val_iZone]->GetTimeIter() << "\t";
 
     switch (config[val_iZone]->GetKind_ObjFunc()){
     case REFERENCE_GEOMETRY:
@@ -3364,9 +3228,8 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
                                            unsigned short val_iZone,
                                            unsigned short val_iInst) {
 
-  unsigned long IntIter = 0, iPoint;
-  config[ZONE_0]->SetIntIter(IntIter);
-  unsigned short ExtIter = config[val_iZone]->GetExtIter();
+  unsigned long iPoint;
+  unsigned short TimeIter = config[val_iZone]->GetTimeIter();
   bool dual_time_1st = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
   bool dual_time_2nd = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
@@ -3377,7 +3240,7 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
 
   if (config[val_iZone]->GetUnsteady_Simulation()) {
 
-    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 2;
+    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2;
 
     /*--- For dual-time stepping we want to load the already converged solution at timestep n ---*/
 
@@ -3385,7 +3248,7 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
       Direct_Iter += 1;
     }
 
-    if (ExtIter == 0){
+    if (TimeIter == 0){
 
       if (dual_time_2nd) {
 
@@ -3426,7 +3289,7 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
     }
 
 
-    if ((ExtIter > 0) && dual_time){
+    if ((TimeIter > 0) && dual_time){
 
       /*--- Load solution timestep n - 2 ---*/
 
@@ -3479,7 +3342,7 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
 
   /*--- Store flow solution also in the adjoint solver in order to be able to reset it later ---*/
 
-  if (ExtIter == 0 || dual_time) {
+  if (TimeIter == 0 || dual_time) {
     for (iPoint = 0; iPoint < geometry[val_iZone][val_iInst][MESH_0]->GetnPoint(); iPoint++) {
       solver[val_iZone][val_iInst][MESH_0][ADJHEAT_SOL]->node[iPoint]->SetSolution_Direct(solver[val_iZone][val_iInst][MESH_0][HEAT_SOL]->node[iPoint]->GetSolution());
     }
@@ -3657,7 +3520,7 @@ void  CDiscAdjHeatIteration::Output(COutput *output,
                                     CGeometry ****geometry,
                                     CSolver *****solver,
                                     CConfig **config,
-                                    unsigned long ExtIter,
+                                    unsigned long InnerIter,
                                     bool StopCalc,
                                     unsigned short val_iZone,
                                     unsigned short val_iInst) { }
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 3cc11961849e..e1d35f75b620 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -455,8 +455,8 @@ void CAdjFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
 
 bool CAdjFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index a8bc38815447..c89c4dee373f 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -485,8 +485,8 @@ void CAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CS
 
 bool CAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index a29539f9765f..408f059e9193 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -359,8 +359,8 @@ su2double CFlowCompFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometr
 
 bool CFlowCompFEMOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index e4ba6c2ba17c..b27a21294638 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -605,8 +605,8 @@ su2double CFlowIncOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
 
 bool CFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (config->GetIntIter() == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (config->GetExtIter() < 2)); 
+  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 2ae9e8dc4c9e..80dec3a28fcc 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -248,7 +248,6 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
   unsigned short iMesh;
   
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
   unsigned short nVar = 1;
 
   bool energy = config[val_iZone]->GetEnergy_Equation();
@@ -293,7 +292,7 @@ void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, uns
 
   /*--- Detect a stall in the residual ---*/
 
-  if ((fabs(Diff) <= RhoRes_New*1E-8) && (ExtIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
+  if ((fabs(Diff) <= RhoRes_New*1E-8) && (curr_InnerIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
 
   CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
   CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
@@ -530,7 +529,7 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   
     /*--- Write data to file --- */
   
-    file_writer->Write_Data(config->GetFilename(SurfaceFilename, ""), surface_sort);
+    file_writer->Write_Data(config->GetFilename(SurfaceFilename, "", curr_TimeIter), surface_sort);
   
   }
   
@@ -555,7 +554,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   
   /*--- Write data to file --- */
   
-  file_writer->Write_Data(config->GetFilename(FileName, ""), data_sorter);
+  file_writer->Write_Data(config->GetFilename(FileName, "", curr_TimeIter), data_sorter);
   
   if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
     cout << "Wrote " << file_writer->Get_Filesize()/(1.0e6) << " MB to disk in ";
@@ -886,12 +885,12 @@ void COutput::PrepareHistoryFile(CConfig *config){
    /*--- Append the restart iteration: if dynamic problem and restart ---*/
   
   if (config->GetTime_Domain() && config->GetRestart()) {
-    long iExtIter = config->GetRestart_Iter();
-    if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iExtIter));
-    if ((SU2_TYPE::Int(iExtIter) >= 1000) && (SU2_TYPE::Int(iExtIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iExtIter));
-    if (SU2_TYPE::Int(iExtIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iExtIter));
+    long iIter = config->GetRestart_Iter();
+    if (SU2_TYPE::Int(iIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iIter));
+    if ((SU2_TYPE::Int(iIter) >= 10) && (SU2_TYPE::Int(iIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iIter));
+    if ((SU2_TYPE::Int(iIter) >= 100) && (SU2_TYPE::Int(iIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iIter));
+    if ((SU2_TYPE::Int(iIter) >= 1000) && (SU2_TYPE::Int(iIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iIter));
+    if (SU2_TYPE::Int(iIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iIter));
     strcat(char_histfile, buffer);
   }
   
diff --git a/SU2_CFD/src/output/output_physics.cpp b/SU2_CFD/src/output/output_physics.cpp
index 6d12c1b7ba5d..5c7826732409 100644
--- a/SU2_CFD/src/output/output_physics.cpp
+++ b/SU2_CFD/src/output/output_physics.cpp
@@ -63,7 +63,7 @@ void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry
   /*--- Compute BC imposed value for convergence monitoring ---*/
   for(iMarkerTP = 0; iMarkerTP < nMarkerTP; iMarkerTP++ ){
     for(iSpan = 0; iSpan < config->GetnSpan_iZones(iMarkerTP) + 1; iSpan++){
-      if(config->GetRampOutletPressure() && config->GetExtIter() > 0){
+      if(config->GetRampOutletPressure() && config->GetInnerIter() > 0){
         PressureOut_BC[iMarkerTP][iSpan] = config->GetMonitorOutletPressure()/config->GetPressure_Ref();
       }
       FluidModel->SetTDState_PT(config->GetTotalPressureIn_BC(), config->GetTotalTemperatureIn_BC());
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 4a7debec0d41..dcad8a0858c4 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -472,7 +472,7 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
 
-  }else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+  }else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
@@ -690,7 +690,7 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
     if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
       SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
       
-    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
       if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
@@ -814,7 +814,7 @@ void COutputLegacy::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry,
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
     
-  } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+  } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
@@ -1070,7 +1070,7 @@ void COutputLegacy::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry,
     if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
       SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
       
-    } else if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
+    } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
       if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.csv", SU2_TYPE::Int(iExtIter));
@@ -4034,7 +4034,7 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   unsigned short nZone = geometry->GetnZone();
   unsigned short Kind_Solver  = config->GetKind_Solver();
   unsigned short iVar, iDim, nDim = geometry->GetnDim();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
+  unsigned long iPoint, iExtIter = config->GetInnerIter();
   bool grid_movement = config->GetGrid_Movement();
   bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
   bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
@@ -4066,7 +4066,7 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
-  } else if (config->GetWrt_Unsteady()) {
+  } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -4243,10 +4243,10 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
 
   /*--- Write the general header and flow conditions ----*/
 
-  if (dual_time)
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-  else
-    restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+//  if (dual_time)
+    restart_file <<"EXT_ITER= " << config->GetInnerIter() + 1 << endl;
+//  else
+//    restart_file <<"EXT_ITER= " << config->GetInnerIter() + config->GetInnerIter_OffSet() + 1 << endl;
   restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
   restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
   restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
@@ -4362,7 +4362,7 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   }
   strcpy (cstr, filename.data());
   
-  if (config->GetWrt_Unsteady() && config->GetRestart()) {
+  if (config->GetTime_Domain() && config->GetRestart()) {
     long iExtIter = config->GetRestart_Iter();
     if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -4581,8 +4581,8 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
   bool output_comboObj      = (config[val_iZone]->GetnObj() > 1);
   bool fluid_structure      = (config[val_iZone]->GetFSI_Simulation());
   bool fea                  = ((config[val_iZone]->GetKind_Solver()== FEM_ELASTICITY)||(config[val_iZone]->GetKind_Solver()== DISC_ADJ_FEM));
-  unsigned long iIntIter    = config[val_iZone]->GetIntIter();
-  unsigned long iExtIter    = config[val_iZone]->GetExtIter();
+  unsigned long iIntIter    = config[val_iZone]->GetInnerIter();
+  unsigned long iExtIter    = config[val_iZone]->GetInnerIter();
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
   unsigned short nZone      = config[val_iZone]->GetnZone();
   unsigned short nInst      = config[val_iZone]->GetnTimeInstances();
@@ -4598,7 +4598,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
   if (!disc_adj && !cont_adj && !DualTime_Iteration) {
     
     if ((config[val_iZone]->GetFixed_CL_Mode()) &&
-        (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
+        (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < iExtIter)) {
       output_files = false;
     }
     
@@ -4608,10 +4608,10 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
     /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
     
     if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
-        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-1))) ||
+        ((!config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnInner_Iter()-1))) ||
         /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnExtIter()-2))) ||
-        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnExtIter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (iExtIter == (config[val_iZone]->GetnInner_Iter()-2))) ||
+        ((config[val_iZone]->GetFixed_CL_Mode()) && (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == iExtIter))) {
 
       
       if ((rank == MASTER_NODE) && output_files) cout << endl << "------------------------ Evaluate Special Output ------------------------";
@@ -5218,7 +5218,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
     if (Unsteady) write_heads = (iIntIter == 0);
     else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
     
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnExtIter() -1)));
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnInner_Iter() -1)));
     
     /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
     bool write_heads_FEM;
@@ -6342,7 +6342,7 @@ void COutputLegacy::SetCFL_Number(CSolver *****solver_container, CConfig **confi
   unsigned short iMesh;
   
   unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
-  unsigned long ExtIter = config[val_iZone]->GetExtIter();
+  unsigned long ExtIter = config[val_iZone]->GetInnerIter();
   unsigned short nVar = 1;
 
   bool energy = config[val_iZone]->GetEnergy_Equation();
@@ -9278,7 +9278,7 @@ void COutputLegacy::SetCp_InverseDesign(CSolver *solver_container, CGeometry *ge
   
   /*--- Write file name with extension if unsteady or steady ---*/
   
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
+  if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
       (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
@@ -9429,7 +9429,7 @@ void COutputLegacy::SetHeatFlux_InverseDesign(CSolver *solver_container, CGeomet
   
   /*--- Write file name with extension if unsteady or steady ---*/
   
-  if ((config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) ||
+  if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
       (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
@@ -11277,7 +11277,7 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
 //    string filename = config[ZONE_FLOW]->GetConv_FileName_FSI();
 //    strcpy (cstr, filename.data());
 
-    if (config[ZONE_FLOW]->GetWrt_Unsteady() && config[ZONE_FLOW]->GetRestart()) {
+    if (config[ZONE_FLOW]->GetTime_Domain() && config[ZONE_FLOW]->GetRestart()) {
       long iExtIter = config[ZONE_FLOW]->GetRestart_Iter();
       if (SU2_TYPE::Int(iExtIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iExtIter));
@@ -11414,7 +11414,7 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
 
       unsigned short nDim = geometry[ZONE_STRUCT][INST_0][MESH_0]->GetnDim();
 
-      unsigned long iExtIter = config[ZONE_STRUCT]->GetExtIter();
+      unsigned long iExtIter = config[ZONE_STRUCT]->GetInnerIter();
       unsigned long ExtIter_OffSet = config[ZONE_STRUCT]->GetExtIter_OffSet();
       unsigned long iOuterIter = config[ZONE_STRUCT]->GetOuterIter();
       su2double dummy = 0.0;
@@ -11917,7 +11917,7 @@ void COutputLegacy::SpecialOutput_Turbo(CSolver *****solver, CGeometry ****geome
 
   unsigned short iDim, iSpan;
 
-  unsigned long iExtIter = config[val_iZone]->GetExtIter();
+  unsigned long iExtIter = config[val_iZone]->GetInnerIter();
   su2double* SpanWiseValuesIn, *SpanWiseValuesOut;
   ofstream myfile;
   string spanwise_performance_filename;
@@ -12174,7 +12174,7 @@ void COutputLegacy::SpecialOutput_HarmonicBalance(CSolver *****solver, CGeometry
   /*--- Other variables ---*/
   unsigned short iVar, kInst;
   unsigned short nVar_output = 5;
-  unsigned long current_iter = config[ZONE_0]->GetExtIter();
+  unsigned long current_iter = config[ZONE_0]->GetInnerIter();
 
   /*--- Allocate memory for send buffer ---*/
   sbuf_var = new su2double[nVar_output];
@@ -12396,7 +12396,7 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
     /*--- Store the solution to be used on the final iteration with cte. lift mode. ---*/
 
     if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
+        (config[iZone]->GetnInner_Iter()-config[iZone]->GetIter_dCL_dAlpha() -1 == iExtIter)) {
 
       if (rank == MASTER_NODE)
         cout << "Storing solution output data locally on each rank (cte. CL mode)." << endl;
@@ -12417,7 +12417,7 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
     /*--- Recover the solution to be used on the final iteration with cte. lift mode. ---*/
 
     if ((!cont_adj) && (!disc_adj) && (config[iZone]->GetFixed_CL_Mode()) &&
-        (config[iZone]->GetnExtIter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
+        (config[iZone]->GetnInner_Iter() - 1 == iExtIter) && (Local_Data_Copy != NULL)) {
 
       if (rank == MASTER_NODE)
         cout << "Recovering solution output data locally on each rank (cte. CL mode)." << endl;
@@ -17772,7 +17772,7 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   
   unsigned short nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
   unsigned short iVar;
-  unsigned long iPoint, iExtIter = config->GetExtIter();
+  unsigned long iPoint, iExtIter = config->GetInnerIter();
   bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
   bool adjoint   = (config->GetContinuous_Adjoint() ||
@@ -17808,7 +17808,7 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
-  } else if (config->GetWrt_Unsteady()) {
+  } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem || disc_adj_fem) && (config->GetWrt_Dynamic())) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -17877,10 +17877,10 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   /*--- Write the metadata (master rank alone) ----*/
 
   if (rank == MASTER_NODE) {
-    if (dual_time)
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-    else
-      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
+//    if (dual_time)
+      restart_file <<"EXT_ITER= " << config->GetInnerIter() + 1 << endl;
+//    else
+//      restart_file <<"EXT_ITER= " << config->GetInnerIter() + config->GetInnerIter_OffSet() + 1 << endl;
     restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
     restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
     restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
@@ -17902,7 +17902,7 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
   /*--- Local variables ---*/
 
   unsigned short iVar, nZone = geometry->GetnZone(), nInst = config->GetnTimeInstances();
-  unsigned long iPoint, iExtIter = config->GetExtIter();
+  unsigned long iPoint, iExtIter = config->GetInnerIter();
   bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool adjoint   = (config->GetContinuous_Adjoint() ||
                     config->GetDiscrete_Adjoint());
@@ -17936,7 +17936,7 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
   /*--- Unsteady problems require an iteration number to be appended. ---*/
   if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
-  } else if (config->GetWrt_Unsteady()) {
+  } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
   } else if ((fem) && (config->GetWrt_Dynamic())) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -17968,9 +17968,9 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
 
   int Restart_ExtIter;
   if (dual_time)
-    Restart_ExtIter= (int)config->GetExtIter() + 1;
+    Restart_ExtIter= (int)config->GetInnerIter() + 1;
   else
-    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
+    Restart_ExtIter = (int)config->GetInnerIter() + (int)config->GetExtIter_OffSet() + 1;
 
   passivedouble Restart_Metadata[8] = {
     SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
diff --git a/SU2_CFD/src/python_wrapper_structure.cpp b/SU2_CFD/src/python_wrapper_structure.cpp
index bf2b97486a1b..dc27893c6b32 100644
--- a/SU2_CFD/src/python_wrapper_structure.cpp
+++ b/SU2_CFD/src/python_wrapper_structure.cpp
@@ -285,14 +285,14 @@ bool CDriver::IsAHaloNode(unsigned short iMarker, unsigned short iVertex) {
 
 }
 
-unsigned long CDriver::GetnExtIter() {
+unsigned long CDriver::GetnTimeIter() {
 
-    return config_container[ZONE_0]->GetnExtIter();
+    return config_container[ZONE_0]->GetnTime_Iter();
 }
 
-unsigned long CDriver::GetExtIter(){
+unsigned long CDriver::GetTime_Iter(){
 
-  return ExtIter;
+  return TimeIter;
 }
 
 su2double CDriver::GetUnsteady_TimeStep(){
diff --git a/SU2_CFD/src/solver_adjoint_discrete.cpp b/SU2_CFD/src/solver_adjoint_discrete.cpp
index 67ce26242e32..561c81a459e9 100644
--- a/SU2_CFD/src/solver_adjoint_discrete.cpp
+++ b/SU2_CFD/src/solver_adjoint_discrete.cpp
@@ -439,11 +439,11 @@ void CDiscAdjSolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config) {
 
   bool time_stepping = config->GetUnsteady_Simulation() != STEADY;
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long TimeIter = config->GetTimeIter();
   su2double seeding = 1.0;
 
   if (time_stepping) {
-    if (ExtIter < IterAvg_Obj) {
+    if (TimeIter < IterAvg_Obj) {
       seeding = 1.0/((su2double)IterAvg_Obj);
     }
     else {
@@ -932,8 +932,7 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
   unsigned short iVar, iMesh;
   unsigned long iPoint, index, iChildren, Point_Fine, counter;
   su2double Area_Children, Area_Parent, *Solution_Fine;
-  ifstream restart_file;
-  string restart_filename, filename, text_line;
+  string restart_filename, filename;
 
   bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
@@ -942,6 +941,9 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
 
   filename = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
+  
+  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  
 
   /*--- Read and store the restart metadata. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index ea921b305b04..f2f36d70829d 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -702,11 +702,11 @@ void CDiscAdjFEASolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config){
   
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long TimeIter = config->GetTimeIter();
   su2double seeding = 1.0;
 
   if (dynamic){
-    if (ExtIter < IterAvg_Obj){
+    if (TimeIter < IterAvg_Obj){
       seeding = 1.0/((su2double)IterAvg_Obj);
     }
     else{
@@ -1225,8 +1225,7 @@ void CDiscAdjFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCo
   unsigned short iVar, iMesh;
   unsigned long iPoint, index, iChildren, Point_Fine, counter;
   su2double Area_Children, Area_Parent, *Solution_Fine;
-  ifstream restart_file;
-  string restart_filename, filename, text_line;
+  string restart_filename, filename;
 
   bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
@@ -1235,6 +1234,7 @@ void CDiscAdjFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCo
 
   filename = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
+  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
 
   /*--- Read and store the restart metadata. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 6e327191f83e..2343830591b7 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -1579,7 +1579,7 @@ void CAdjEulerSolver::SetIntBoundary_Jump(CGeometry *geometry, CSolver **solver_
   
 }
 
-void CAdjEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CAdjEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
   unsigned long iPoint, Point_Fine;
   unsigned short iMesh, iChildren, iVar;
   su2double Area_Children, Area_Parent, *Solution, *Solution_Fine;
@@ -1616,7 +1616,7 @@ void CAdjEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   /*--- The value of the solution for the first iteration of the dual time ---*/
   for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
     for (iPoint = 0; iPoint < geometry[iMesh]->GetnPoint(); iPoint++) {
-      if ((ExtIter == 0) && (dual_time)) {
+      if ((TimeIter == 0) && (dual_time)) {
         solver_container[iMesh][ADJFLOW_SOL]->node[iPoint]->Set_Solution_time_n();
         solver_container[iMesh][ADJFLOW_SOL]->node[iPoint]->Set_Solution_time_n1();
       }
@@ -2887,12 +2887,12 @@ void CAdjEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_cont
                                       CConfig *config, unsigned short iMesh, bool Output) {
   
   unsigned long Iter_Fixed_CL = config->GetIter_Fixed_CL();
-  unsigned long ExtIter       = config->GetExtIter();
+  unsigned long InnerIter     = config->GetInnerIter();
   bool Update_AoA             = false;
   su2double dCL_dAlpha        = config->GetdCL_dAlpha()*180.0/PI_NUMBER;
   unsigned long Update_Alpha  = config->GetUpdate_Alpha();
   
-  if (ExtIter == 0) AoA_Counter = 0;
+  if (InnerIter == 0) AoA_Counter = 0;
   
   /*--- Only the fine mesh level should check the convergence criteria ---*/
   
@@ -2905,7 +2905,7 @@ void CAdjEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_cont
     /*--- Reevaluate the lift derivative with respect to Angle of Attack
      at a fix number of iterations ---*/
     
-    if ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0)) {
+    if ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0)) {
       AoA_Counter++;
       if ((AoA_Counter <= Update_Alpha)) Update_AoA = true;
       Update_AoA = true;
@@ -2971,7 +2971,7 @@ void CAdjEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_cont
   
   /*--- Output some information to the console with the headers ---*/
   
-  bool write_heads = ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0));
+  bool write_heads = ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0));
   if ((rank == MASTER_NODE) && (iMesh == MESH_0) && write_heads && Output) {
     cout.precision(7);
     cout.setf(ios::fixed, ios::floatfield);
@@ -4748,8 +4748,7 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
-  string UnstExt, text_line, filename, restart_filename;
-  ifstream restart_file;
+  string filename, restart_filename;
 
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = config->GetnZone();
@@ -4758,6 +4757,7 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
 
   filename         = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
+  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -4767,16 +4767,6 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
 
   unsigned short skipVars = geometry[MESH_0]->GetnDim();
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
-
-  /*--- Modify file name for an unsteady restart ---*/
-
-  if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
-
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index bf8297a67ccd..515e13608fea 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -941,14 +941,14 @@ void CFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
   
   
   unsigned long iPoint;
-  bool initial_calc = (config->GetExtIter() == 0);                  // Checks if it is the first calculation.
-  bool first_iter = (config->GetIntIter() == 0);                          // Checks if it is the first iteration
+  bool initial_calc = (config->GetTimeIter() == 0) && (config->GetInnerIter() == 0);                  // Checks if it is the first calculation.
+  bool first_iter = (config->GetInnerIter() == 0);                          // Checks if it is the first iteration
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
   bool restart = config->GetRestart();                        // Restart analysis
-  bool initial_calc_restart = (SU2_TYPE::Int(config->GetExtIter()) ==SU2_TYPE::Int(config->GetRestart_Iter())); // Initial calculation for restart
+  bool initial_calc_restart = (SU2_TYPE::Int(config->GetTimeIter()) ==SU2_TYPE::Int(config->GetRestart_Iter())); // Initial calculation for restart
   
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);     // Discrete adjoint FEM solver
   
@@ -1095,7 +1095,7 @@ void CFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
 
 void CFEASolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iMesh, unsigned long Iteration) { }
 
-void CFEASolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CFEASolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
   
   unsigned long iPoint, nPoint;
   bool incremental_load = config->GetIncrementalLoad();              // If an incremental load is applied
@@ -1111,7 +1111,7 @@ void CFEASolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_con
   
 }
 
-void CFEASolver::ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CFEASolver::ResetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
   
   unsigned long iPoint, nPoint;
   bool incremental_load = config->GetIncrementalLoad();              // If an incremental load is applied
@@ -2125,7 +2125,7 @@ void CFEASolver::Postprocessing(CGeometry *geometry, CSolver **solver_container,
   unsigned short iVar;
   unsigned long iPoint, total_index;
   
-  bool first_iter = (config->GetIntIter() == 0);
+  bool first_iter = (config->GetInnerIter() == 0);
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);    // Nonlinear analysis.
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
   
@@ -3080,7 +3080,7 @@ void CFEASolver::ImplicitNewmark_Iteration(CGeometry *geometry, CSolver **solver
   unsigned long iPoint, jPoint;
   unsigned short iVar, jVar;
   
-  bool first_iter = (config->GetIntIter() == 0);
+  bool first_iter = (config->GetInnerIter() == 0);
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -3393,7 +3393,7 @@ void CFEASolver::GeneralizedAlpha_Iteration(CGeometry *geometry, CSolver **solve
   unsigned long iPoint, jPoint;
   unsigned short iVar, jVar;
   
-  bool first_iter = (config->GetIntIter() == 0);
+  bool first_iter = (config->GetInnerIter() == 0);
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -3908,7 +3908,7 @@ void CFEASolver::Compute_OFRefGeom(CGeometry *geometry, CSolver **solver_contain
 
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
 
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long TimeIter = config->GetTimeIter();
 
   su2double reference_geometry = 0.0, current_solution = 0.0;
 
@@ -3952,7 +3952,7 @@ void CFEASolver::Compute_OFRefGeom(CGeometry *geometry, CSolver **solver_contain
   Total_OFRefGeom = objective_function_reduce + PenaltyValue;
 
   Global_OFRefGeom += Total_OFRefGeom;
-  objective_function_averaged = Global_OFRefGeom / (ExtIter + 1.0 + EPS);
+  objective_function_averaged = Global_OFRefGeom / (TimeIter + 1.0 + EPS);
 
   bool direct_diff = ((config->GetDirectDiff() == D_YOUNG) ||
                       (config->GetDirectDiff() == D_POISSON) ||
@@ -3988,11 +3988,11 @@ void CFEASolver::Compute_OFRefGeom(CGeometry *geometry, CSolver **solver_contain
 
     if (fsi) {
       Total_ForwardGradient = local_forward_gradient;
-      averaged_gradient     = Total_ForwardGradient / (ExtIter + 1.0);
+      averaged_gradient     = Total_ForwardGradient / (TimeIter + 1.0);
     }
     else {
       Total_ForwardGradient += local_forward_gradient;
-      averaged_gradient      = Total_ForwardGradient / (ExtIter + 1.0);
+      averaged_gradient      = Total_ForwardGradient / (TimeIter + 1.0);
     }
 
     myfile_res << scientific << local_forward_gradient << "\t";
@@ -4043,7 +4043,7 @@ void CFEASolver::Compute_OFRefNode(CGeometry *geometry, CSolver **solver_contain
 
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
 
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long TimeIter = config->GetTimeIter();
 
   su2double reference_geometry = 0.0, current_solution = 0.0;
 
@@ -4099,7 +4099,7 @@ void CFEASolver::Compute_OFRefNode(CGeometry *geometry, CSolver **solver_contain
   Total_OFRefNode = objective_function_reduce + PenaltyValue;
 
   Global_OFRefNode += Total_OFRefNode;
-  objective_function_averaged = Global_OFRefNode / (ExtIter + 1.0 + EPS);
+  objective_function_averaged = Global_OFRefNode / (TimeIter + 1.0 + EPS);
 
   bool direct_diff = ((config->GetDirectDiff() == D_YOUNG) ||
                       (config->GetDirectDiff() == D_POISSON) ||
@@ -4135,11 +4135,11 @@ void CFEASolver::Compute_OFRefNode(CGeometry *geometry, CSolver **solver_contain
 
     if (fsi) {
       Total_ForwardGradient = local_forward_gradient;
-      averaged_gradient     = Total_ForwardGradient / (ExtIter + 1.0);
+      averaged_gradient     = Total_ForwardGradient / (TimeIter + 1.0);
     }
     else {
       Total_ForwardGradient += local_forward_gradient;
-      averaged_gradient      = Total_ForwardGradient / (ExtIter + 1.0);
+      averaged_gradient      = Total_ForwardGradient / (TimeIter + 1.0);
     }
 
     myfile_res << scientific << local_forward_gradient << "\t";
@@ -4177,7 +4177,7 @@ void CFEASolver::Compute_OFRefNode(CGeometry *geometry, CSolver **solver_contain
       ofstream myfile_his;
       myfile_his.open ("history_refnode.dat",ios::app);
       myfile_his.precision(15);
-      myfile_his << ExtIter << "\t";
+      myfile_his << TimeIter << "\t";
       myfile_his << scientific << Total_OFRefNode << "\t";
       myfile_his << scientific << objective_function_averaged << "\t";
       myfile_his << scientific << difX_reduce << "\t";
@@ -4313,11 +4313,7 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
   unsigned short iVar, nSolVar;
   unsigned long index;
 
-  ifstream restart_file;
-  string restart_filename, filename, text_line;
-
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry[MESH_0]->GetnZone();
+  string filename;
 
   bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
   bool fluid_structure = config->GetFSI_Simulation();
@@ -4334,16 +4330,7 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetSolution_FileName();
-
-  /*--- If multizone, append zone name ---*/
-
-  if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
-
-  if (dynamic) {
-    filename = config->GetUnsteady_FileName(filename, val_iter, ".dat");
-  }
+  filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
 
   /*--- Read all lines in the restart file ---*/
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index d3c169e072d3..3750d51d7281 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -289,17 +289,8 @@ void CHeatSolverFVM::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
                         (config->GetKind_Solver() == DISC_ADJ_HEAT));
 
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
-
-  string UnstExt, text_line;
-  ifstream restart_file;
-
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
 
-  string restart_filename = config->GetSolution_FileName();
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -333,16 +324,6 @@ void CHeatSolverFVM::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
     cout << "WARNING: Finite volume heat solver's restart routine could not load data." << endl;
   }
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
-
-  /*--- Modify file name for an unsteady restart ---*/
-
-  if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
-
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
@@ -1688,7 +1669,7 @@ void CHeatSolverFVM::ImplicitEuler_Iteration(CGeometry *geometry, CSolver **solv
 
 }
 
-void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
 
   unsigned long iPoint, Point_Fine;
   unsigned short iMesh, iChildren, iVar;
@@ -1701,7 +1682,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
   /*--- If restart solution, then interpolate the flow solution to
    all the multigrid levels, this is important with the dual time strategy ---*/
 
-  if (restart && (ExtIter == 0)) {
+  if (restart && (TimeIter == 0)) {
 
     Solution = new su2double[nVar];
     for (iMesh = 1; iMesh <= config->GetnMGLevels(); iMesh++) {
@@ -1726,7 +1707,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
 
   /*--- The value of the solution for the first iteration of the dual time ---*/
 
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
+  if (dual_time && (TimeIter == 0 || (restart && (long)TimeIter == (long)config->GetRestart_Iter()))) {
 
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -1738,7 +1719,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
       }
     }
 
-    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
+    if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
 
       /*--- Load an additional restart file for a 2nd-order restart ---*/
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index a187cd17383e..7d670dd383cf 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -2760,7 +2760,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
   
 }
 
-void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
 
   unsigned long iPoint;
   unsigned short iMesh, iDim;
@@ -2778,7 +2778,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
   bool SubsonicEngine = config->GetSubsonicEngine();
 
   /*--- Check if a verification solution is to be computed. ---*/
-  if ((VerificationSolution)  && (ExtIter == 0) && !restart) {
+  if ((VerificationSolution)  && (TimeIter == 0) && !restart) {
 
     /*--- Loop over the multigrid levels. ---*/
     for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
@@ -2805,7 +2805,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
     
     /*--- Set initial boundary condition at iteration 0 ---*/
     
-    if ((ExtIter == 0) && (!restart)) {
+    if ((TimeIter == 0) && (!restart)) {
       
       su2double Velocity_Cyl[3] = {0.0, 0.0, 0.0}, Velocity_CylND[3] = {0.0, 0.0, 0.0}, Viscosity_Cyl,
       Density_Cyl, Density_CylND, Pressure_CylND, ModVel_Cyl, ModVel_CylND, Energy_CylND,
@@ -2930,7 +2930,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
   /*--- Make sure that the solution is well initialized for unsteady
    calculations with dual time-stepping (load additional restarts for 2nd-order). ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
+  if (dual_time && (TimeIter == 0 || (restart && (long)TimeIter == (long)config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -2946,7 +2946,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
       }
     }
     
-    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
+    if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
@@ -2976,12 +2976,12 @@ void CEulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   
   unsigned long ErrorCounter = 0;
   
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long InnerIter = config->GetInnerIter();
   bool cont_adjoint     = config->GetContinuous_Adjoint();
   bool disc_adjoint     = config->GetDiscrete_Adjoint();
   bool implicit         = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool muscl            = (config->GetMUSCL_Flow() || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == ROE));
-  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
+  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
   bool center           = (config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED) || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED);
   bool center_jst       = center && (config->GetKind_Centered_Flow() == JST);
   bool engine           = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
@@ -3362,10 +3362,10 @@ void CEulerSolver::Upwind_Residual(CGeometry *geometry, CSolver **solver_contain
   
   bool neg_density_i = false, neg_density_j = false, neg_pressure_i = false, neg_pressure_j = false, neg_sound_speed = false;
   
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long InnerIter = config->GetInnerIter();
   bool implicit         = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool muscl            = (config->GetMUSCL_Flow() && (iMesh == MESH_0));
-  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
+  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
   bool grid_movement    = config->GetGrid_Movement();
   bool roe_turkel       = (config->GetKind_Upwind_Flow() == TURKEL);
   bool ideal_gas        = (config->GetKind_FluidModel() == STANDARD_AIR || config->GetKind_FluidModel() == IDEAL_GAS );
@@ -5862,10 +5862,10 @@ void CEulerSolver::GetPower_Properties(CGeometry *geometry, CConfig *config, uns
   su2double Cp                                               = Gas_Constant*Gamma / (Gamma-1.0);
   su2double Alpha                                         = config->GetAoA()*PI_NUMBER/180.0;
   su2double Beta                                           = config->GetAoS()*PI_NUMBER/180.0;
-  bool write_heads = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0) && (config->GetExtIter()!= 0))
-                      || (config->GetExtIter() == 1));
-  bool Evaluate_BC = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0))
-                      || (config->GetExtIter() == 1) || (config->GetDiscrete_Adjoint()));
+  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) && (config->GetInnerIter()!= 0))
+                      || (config->GetInnerIter() == 1));
+  bool Evaluate_BC = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0))
+                      || (config->GetInnerIter() == 1) || (config->GetDiscrete_Adjoint()));
   
   if ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0)) Engine = true;
   if ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0)) Engine = false;
@@ -6871,7 +6871,7 @@ void CEulerSolver::SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_con
   bool ratio                            = (config->GetActDisk_Jump() == RATIO);
   unsigned long Update_BCThrust         = config->GetUpdate_BCThrust();
   unsigned long Iter_Fixed_NetThrust    = config->GetIter_Fixed_NetThrust();
-  unsigned long ExtIter                 = config->GetExtIter();
+  unsigned long InnerIter                 = config->GetInnerIter();
   bool Update_BCThrust_Bool             = false;
   bool restart                          = (config->GetRestart() || config->GetRestart_Flow());
   su2double Fan_Poly_Eff                = config->GetFan_Poly_Eff();
@@ -6931,7 +6931,7 @@ void CEulerSolver::SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_con
   
   else {
     
-    if (ExtIter == 0) BCThrust_Counter = 0;
+    if (InnerIter == 0) BCThrust_Counter = 0;
     
     /*--- Only the fine mesh level should check the convergence criteria ---*/
     
@@ -6943,7 +6943,7 @@ void CEulerSolver::SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_con
       
       /*--- Reevaluate BCThrust at a fix number of iterations ---*/
       
-      if ((ExtIter % Iter_Fixed_NetThrust == 0) && (ExtIter != 0)) {
+      if ((InnerIter % Iter_Fixed_NetThrust == 0) && (InnerIter != 0)) {
         BCThrust_Counter++;
         if ((BCThrust_Counter != 0) &&
             (BCThrust_Counter != 1) &&
@@ -6967,7 +6967,7 @@ void CEulerSolver::SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_con
     /*--- If it is the first iteration, set the BCThrust to a meaning full target value,
      * this can be done at an initialization level, for the time being it is OK here ---*/
     
-    if (ExtIter == 0) {
+    if (InnerIter == 0) {
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
         if ((config->GetMarker_All_KindBC(iMarker) == ACTDISK_INLET) ||
             (config->GetMarker_All_KindBC(iMarker) == ACTDISK_OUTLET)) {
@@ -7152,7 +7152,7 @@ void CEulerSolver::SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_con
     
     /*--- Evaluate the pressure jump at each node using the total thrust ---*/
     
-    if ((Update_BCThrust_Bool && Output) || (ExtIter == 0)) {
+    if ((Update_BCThrust_Bool && Output) || (InnerIter == 0)) {
       
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
         
@@ -7305,13 +7305,13 @@ void CEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_contain
   unsigned long Iter_Fixed_CL = config->GetIter_Fixed_CL();
   unsigned long Update_Alpha = config->GetUpdate_Alpha();
   
-  unsigned long ExtIter       = config->GetExtIter();
-  bool write_heads = ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0));
+  unsigned long InnerIter       = config->GetInnerIter();
+  bool write_heads = ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0));
   su2double Beta                 = config->GetAoS()*PI_NUMBER/180.0;
   su2double dCL_dAlpha           = config->GetdCL_dAlpha()*180.0/PI_NUMBER;
   bool Update_AoA             = false;
   
-  if (ExtIter == 0) AoA_Counter = 0;
+  if (InnerIter == 0) AoA_Counter = 0;
   
   /*--- Only the fine mesh level should check the convergence criteria ---*/
   
@@ -7323,7 +7323,7 @@ void CEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_contain
 
     /*--- Reevaluate Angle of Attack at a fixed number of iterations ---*/
     
-    if ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0)) {
+    if ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0)) {
       AoA_Counter++;
       if ((AoA_Counter <= Update_Alpha)) Update_AoA = true;
       else Update_AoA = false;
@@ -7421,11 +7421,11 @@ void CEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_contain
 
 	unsigned long Iter_dCL_dAlpha = config->GetIter_dCL_dAlpha();
 
-  if ((config->GetnExtIter()-Iter_dCL_dAlpha == ExtIter) && Output) {
+  if ((config->GetnInner_Iter()-Iter_dCL_dAlpha == InnerIter) && Output) {
 
     AoA_old = config->GetAoA();
 
-    if (config->GetnExtIter()-Iter_dCL_dAlpha == ExtIter) {
+    if (config->GetnInner_Iter()-Iter_dCL_dAlpha == InnerIter) {
       Wrt_Con_Freq = SU2_TYPE::Int(su2double(config->GetIter_dCL_dAlpha())/10.0);
       config->SetWrt_Con_Freq(Wrt_Con_Freq);
       Total_CD_Prev = Total_CD;
@@ -7439,7 +7439,7 @@ void CEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_contain
     
     if ((rank == MASTER_NODE) && (iMesh == MESH_0)) {
       
-    	if (config->GetnExtIter()-Iter_dCL_dAlpha == ExtIter) {
+    	if (config->GetnInner_Iter()-Iter_dCL_dAlpha == InnerIter) {
        cout << endl << "----------------------------- Fixed CL Mode -----------------------------" << endl;
        cout << " Change AoA by +0.001 deg to evaluate gradient." << endl;
        cout << "-------------------------------------------------------------------------" << endl << endl;
@@ -7495,7 +7495,7 @@ void CEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_contain
 
   }
   
-  if (AoA_FD_Change && (config->GetnExtIter()-1 == ExtIter) && Output && (iMesh == MESH_0) && !config->GetDiscrete_Adjoint()) {
+  if (AoA_FD_Change && (config->GetnInner_Iter()-1 == InnerIter) && Output && (iMesh == MESH_0) && !config->GetDiscrete_Adjoint()) {
 
     /*--- Update angle of attack ---*/
 
@@ -12670,9 +12670,9 @@ void CEulerSolver::ComputeVerificationError(CGeometry *geometry,
    RMS (L2) and maximum (Linf) global error norms. From these
    global measures, one can compute the order of accuracy. ---*/
   
-  bool write_heads = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)
-                       && (config->GetExtIter()!= 0))
-                      || (config->GetExtIter() == 1));
+  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+                       && (config->GetInnerIter()!= 0))
+                      || (config->GetInnerIter() == 1));
   if( !write_heads ) return;  
 
   /*--- Check if there actually is an exact solution for this
@@ -12770,16 +12770,9 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
   bool static_fsi = ((config->GetUnsteady_Simulation() == STEADY) &&
                      (config->GetFSI_Simulation()));
   bool steady_restart = config->GetSteadyRestart();
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
   bool turbulent     = (config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == DISC_ADJ_RANS);
 
-  string UnstExt, text_line;
-  ifstream restart_file;
-
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-
-  string restart_filename = config->GetSolution_FileName();
+  string  restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -12802,16 +12795,6 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
     else turbVars = 1;
   }
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
-
-  /*--- Modify file name for an unsteady restart ---*/
-
-  if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
-
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
@@ -15028,15 +15011,15 @@ void CNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, C
   unsigned long iPoint, ErrorCounter = 0;
   su2double StrainMag = 0.0, Omega = 0.0, *Vorticity;
     
-  unsigned long ExtIter     = config->GetExtIter();
+  unsigned long InnerIter     = config->GetInnerIter();
   bool cont_adjoint         = config->GetContinuous_Adjoint();
   bool disc_adjoint         = config->GetDiscrete_Adjoint();
   bool implicit             = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool center               = (config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED) || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED);
   bool center_jst           = center && config->GetKind_Centered_Flow() == JST;
-  bool limiter_flow         = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
-  bool limiter_turb         = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
-  bool limiter_adjflow      = (cont_adjoint && (config->GetKind_SlopeLimit_AdjFlow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter()));
+  bool limiter_flow         = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
+  bool limiter_turb         = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
+  bool limiter_adjflow      = (cont_adjoint && (config->GetKind_SlopeLimit_AdjFlow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter()));
   bool fixed_cl             = config->GetFixed_CL_Mode();
   bool engine               = ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0));
   bool actuator_disk        = ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0));
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index 19c86ee1627f..844b793b2593 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -3118,10 +3118,10 @@ bool CFEM_DG_EulerSolver::Complete_MPI_ReverseCommunication(CConfig *config,
   return true;
 }
 
-void CFEM_DG_EulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CFEM_DG_EulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
 
   /*--- Check if a verification solution is to be computed. ---*/
-  if ((VerificationSolution)  && (ExtIter == 0)) {
+  if ((VerificationSolution)  && (TimeIter == 0)) {
 
     /* Loop over the owned elements. */
     for(unsigned long i=0; i<nVolElemOwned; ++i) {
@@ -3245,10 +3245,10 @@ void CFEM_DG_EulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_co
                          CURRENT_FUNCTION);
 
         /* Determine whether or not it is needed to compute the motion data. */
-        const unsigned long ExtIter = config->GetExtIter();
+        const unsigned long TimeIter = config->GetTimeIter();
 
         bool computeMotion = false, firstTime = false;
-        if(ExtIter == 0 && iStep == 0) computeMotion = firstTime = true;
+        if(TimeIter == 0 && iStep == 0) computeMotion = firstTime = true;
         if(iStep == 1 || iStep == 3)   computeMotion = true;
 
         if( computeMotion ) {
@@ -3260,7 +3260,7 @@ void CFEM_DG_EulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_co
           /* Determine the time for which the motion data must be determined. */
           const su2double deltaT = config->GetDelta_UnstTimeND();
 
-          su2double tNew = ExtIter*deltaT;
+          su2double tNew = TimeIter*deltaT;
           if( iStep ) tNew += 0.25*(iStep+1)*deltaT;
 
           /* Determine the time for which the currently stored position was
@@ -7330,9 +7330,9 @@ void CFEM_DG_EulerSolver::ComputeVerificationError(CGeometry *geometry,
    RMS (L2) and maximum (Linf) global error norms. From these
    global measures, one can compute the order of accuracy. ---*/
 
-  bool write_heads = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)
-                       && (config->GetExtIter()!= 0))
-                      || (config->GetExtIter() == 1));
+  bool write_heads = ((((config->GetTimeIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+                       && (config->GetTimeIter()!= 0))
+                      || (config->GetTimeIter() == 1));
   if( !write_heads ) return;
   
   /*--- Check if there actually is an exact solution for this
@@ -9406,9 +9406,6 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   unsigned short iVar;
   unsigned long index;
 
-  string UnstExt, text_line;
-  ifstream restart_file;
-
   const bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
 
   string restart_filename = config->GetSolution_FileName();
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index da7949bbd39f..f10ce0407d65 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -1392,7 +1392,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
   
 }
 
-void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) {
+void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
   
   unsigned long iPoint, Point_Fine;
   unsigned short iMesh, iChildren, iVar;
@@ -1406,7 +1406,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   
   /*--- Check if a verification solution is to be computed. ---*/
-  if ((VerificationSolution) && (ExtIter == 0) && !restart) {
+  if ((VerificationSolution) && (TimeIter == 0) && !restart) {
     
     /*--- Loop over the multigrid levels. ---*/
     for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
@@ -1429,7 +1429,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   /*--- If restart solution, then interpolate the flow solution to
    all the multigrid levels, this is important with the dual time strategy ---*/
   
-  if (restart && (ExtIter == 0)) {
+  if (restart && (TimeIter == 0)) {
     
     Solution = new su2double[nVar];
     for (iMesh = 1; iMesh <= config->GetnMGLevels(); iMesh++) {
@@ -1482,7 +1482,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   
   /*--- The value of the solution for the first iteration of the dual time ---*/
   
-  if (dual_time && (ExtIter == 0 || (restart && (long)ExtIter == (long)config->GetRestart_Iter()))) {
+  if (dual_time && (TimeIter == 0 || (restart && (long)TimeIter == (long)config->GetRestart_Iter()))) {
     
     /*--- Push back the initial condition to previous solution containers
      for a 1st-order restart or when simply intitializing to freestream. ---*/
@@ -1498,7 +1498,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
       }
     }
     
-    if ((restart && (long)ExtIter == (long)config->GetRestart_Iter()) &&
+    if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
         (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
@@ -1527,12 +1527,12 @@ void CIncEulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_contai
   
   unsigned long ErrorCounter = 0;
 
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long InnerIter = config->GetInnerIter();
   bool cont_adjoint     = config->GetContinuous_Adjoint();
   bool disc_adjoint     = config->GetDiscrete_Adjoint();
   bool implicit         = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool muscl            = (config->GetMUSCL_Flow() || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == ROE));
-  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
+  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
   bool center           = ((config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED) || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED));
   bool center_jst       = center && (config->GetKind_Centered_Flow() == JST);
   bool fixed_cl         = config->GetFixed_CL_Mode();
@@ -1903,10 +1903,10 @@ void CIncEulerSolver::Upwind_Residual(CGeometry *geometry, CSolver **solver_cont
   unsigned long iEdge, iPoint, jPoint, counter_local = 0, counter_global = 0;
   unsigned short iDim, iVar;
   
-  unsigned long ExtIter = config->GetExtIter();
+  unsigned long InnerIter = config->GetInnerIter();
   bool implicit         = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool muscl            = (config->GetMUSCL_Flow() && (iMesh == MESH_0));
-  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
+  bool limiter          = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
   bool grid_movement    = config->GetGrid_Movement();
   bool van_albada       = config->GetKind_SlopeLimit_Flow() == VAN_ALBADA_EDGE;
 
@@ -4083,13 +4083,13 @@ void CIncEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_cont
   unsigned long Iter_Fixed_CL = config->GetIter_Fixed_CL();
   unsigned long Update_Alpha = config->GetUpdate_Alpha();
   
-  unsigned long ExtIter       = config->GetExtIter();
-  bool write_heads = ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0));
+  unsigned long InnerIter       = config->GetInnerIter();
+  bool write_heads = ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0));
   su2double Beta                 = config->GetAoS()*PI_NUMBER/180.0;
   su2double dCL_dAlpha           = config->GetdCL_dAlpha()*180.0/PI_NUMBER;
   bool Update_AoA             = false;
   
-  if (ExtIter == 0) AoA_Counter = 0;
+  if (InnerIter == 0) AoA_Counter = 0;
   
   /*--- Only the fine mesh level should check the convergence criteria ---*/
   
@@ -4101,7 +4101,7 @@ void CIncEulerSolver::SetFarfield_AoA(CGeometry *geometry, CSolver **solver_cont
     
     /*--- Reevaluate Angle of Attack at a fixed number of iterations ---*/
     
-    if ((ExtIter % Iter_Fixed_CL == 0) && (ExtIter != 0)) {
+    if ((InnerIter % Iter_Fixed_CL == 0) && (InnerIter != 0)) {
       AoA_Counter++;
       if ((AoA_Counter <= Update_Alpha)) Update_AoA = true;
       Update_AoA = true;
@@ -6162,9 +6162,9 @@ void CIncEulerSolver::GetOutlet_Properties(CGeometry *geometry, CConfig *config,
   
   bool axisymmetric = config->GetAxisymmetric();
 
-  bool write_heads = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)
-                       && (config->GetExtIter()!= 0))
-                      || (config->GetExtIter() == 1));
+  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+                       && (config->GetInnerIter()!= 0))
+                      || (config->GetInnerIter() == 1));
   
   /*--- Get the number of outlet markers and check for any mass flow BCs. ---*/
   
@@ -6377,9 +6377,9 @@ void CIncEulerSolver::ComputeVerificationError(CGeometry *geometry,
    RMS (L2) and maximum (Linf) global error norms. From these
    global measures, one can compute the order of accuracy. ---*/
   
-  bool write_heads = ((((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0)
-                       && (config->GetExtIter()!= 0))
-                      || (config->GetExtIter() == 1));
+  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+                       && (config->GetInnerIter()!= 0))
+                      || (config->GetInnerIter() == 1));
   if( !write_heads ) return;
   
   /*--- Check if there actually is an exact solution for this
@@ -6479,16 +6479,9 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                     (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
   bool steady_restart = config->GetSteadyRestart();
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
   bool turbulent     = (config->GetKind_Solver() == RANS) || (config->GetKind_Solver() == DISC_ADJ_RANS);
   
-  string UnstExt, text_line;
-  ifstream restart_file;
-  
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-
-  string restart_filename = config->GetSolution_FileName();
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -6523,16 +6516,6 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   if ((!energy) && (!weakly_coupled_heat)) nVar_Restart--;
   Solution[nVar-1] = GetTemperature_Inf();
   
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-  restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
-
-  /*--- Modify file name for an unsteady restart ---*/
-  
-  if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
-
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
@@ -7413,15 +7396,15 @@ void CIncNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   unsigned long iPoint, ErrorCounter = 0;
   su2double StrainMag = 0.0, Omega = 0.0, *Vorticity;
   
-  unsigned long ExtIter     = config->GetExtIter();
+  unsigned long InnerIter     = config->GetInnerIter();
   bool cont_adjoint         = config->GetContinuous_Adjoint();
   bool disc_adjoint         = config->GetDiscrete_Adjoint();
   bool implicit             = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool center               = ((config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED) || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED));
   bool center_jst           = center && config->GetKind_Centered_Flow() == JST;
-  bool limiter_flow         = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
-  bool limiter_turb         = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter());
-  bool limiter_adjflow      = (cont_adjoint && (config->GetKind_SlopeLimit_AdjFlow() != NO_LIMITER) && (ExtIter <= config->GetLimiterIter()));
+  bool limiter_flow         = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
+  bool limiter_turb         = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
+  bool limiter_adjflow      = (cont_adjoint && (config->GetKind_SlopeLimit_AdjFlow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter()));
   bool fixed_cl             = config->GetFixed_CL_Mode();
   bool van_albada           = config->GetKind_SlopeLimit_Flow() == VAN_ALBADA_EDGE;
   bool outlet               = ((config->GetnMarker_Outlet() != 0));
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index c0360e23d4ad..762c9c84afe4 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -759,25 +759,8 @@ void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
   unsigned short iVar, iMesh;
   unsigned long iPoint, index, iChildren, Point_Fine;
   su2double Area_Children, Area_Parent, *Solution_Fine;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = (config->GetUnsteady_Simulation() == TIME_STEPPING);
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-
-  string UnstExt, text_line;
-  ifstream restart_file;
-  string restart_filename = config->GetSolution_FileName();
-
-  /*--- Modify file name for multizone problems ---*/
-  if (nZone >1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone, ".dat");
-
-  /*--- Modify file name for an unsteady restart ---*/
-  
-  if (dual_time|| time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter, ".dat");
 
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
@@ -1151,7 +1134,7 @@ CTurbSASolver::~CTurbSASolver(void) {
 void CTurbSASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output) {
   
   unsigned long iPoint;
-  bool limiter_turb = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (config->GetExtIter() <= config->GetLimiterIter());
+  bool limiter_turb = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (config->GetInnerIter() <= config->GetLimiterIter());
   unsigned short kind_hybridRANSLES = config->GetKind_HybridRANSLES();
   su2double** PrimGrad_Flow = NULL;
   su2double* Vorticity = NULL;
@@ -3490,7 +3473,7 @@ void CTurbSSTSolver::Preprocessing(CGeometry *geometry, CSolver **solver_contain
   
   unsigned long iPoint;
 
-  bool limiter_turb = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (config->GetExtIter() <= config->GetLimiterIter());
+  bool limiter_turb = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) && (config->GetInnerIter() <= config->GetLimiterIter());
 
   
   for (iPoint = 0; iPoint < nPoint; iPoint ++) {
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 143a036ac39b..c561521a0bd2 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3617,7 +3617,7 @@ void CSolver::Gauss_Elimination(su2double** A, su2double* rhs, unsigned short nV
   
 }
 
-void CSolver::Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometry, CConfig *config, unsigned long ExtIter) {
+void CSolver::Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometry, CConfig *config, unsigned long TimeIter) {
   
   /*--- Variables used for Aeroelastic case ---*/
   
@@ -3659,7 +3659,7 @@ void CSolver::Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometr
             su2double Omega, dt, psi;
             dt = config->GetDelta_UnstTimeND();
             Omega  = (config->GetRotation_Rate(2)/config->GetOmega_Ref());
-            psi = Omega*(dt*ExtIter);
+            psi = Omega*(dt*TimeIter);
             
             /*--- Correct for the airfoil starting position (This is hardcoded in here) ---*/
             if (Monitoring_Tag == "Airfoil1") {
@@ -3689,7 +3689,7 @@ void CSolver::Aeroelastic(CSurfaceMovement *surface_movement, CGeometry *geometr
       }
       
       /*--- Compute the new surface node locations ---*/
-      surface_movement->AeroelasticDeform(geometry, config, ExtIter, iMarker, iMarker_Monitoring, structural_solution);
+      surface_movement->AeroelasticDeform(geometry, config, TimeIter, iMarker, iMarker_Monitoring, structural_solution);
       
     }
     
@@ -4446,7 +4446,7 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
  su2double dCMy_dCL_ = config->GetdCMy_dCL();
  su2double dCMz_dCL_ = config->GetdCMz_dCL();
   string::size_type position;
-	unsigned long ExtIter_ = 0;
+	unsigned long InnerIter_ = 0;
 	ifstream restart_file;
 	bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
 
@@ -4594,7 +4594,7 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
 
 		/*--- Store intermediate vals from file I/O in correct variables. ---*/
 
-		ExtIter_  = Restart_Iter;
+		InnerIter_  = Restart_Iter;
 		AoA_      = Restart_Meta[0];
 		AoS_      = Restart_Meta[1];
 		BCThrust_ = Restart_Meta[2];
@@ -4717,7 +4717,7 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
 
 				position = text_line.find ("EXT_ITER=",0);
 				if (position != string::npos) {
-					text_line.erase (0,9); ExtIter_ = atoi(text_line.c_str());
+					text_line.erase (0,9); InnerIter_ = atoi(text_line.c_str());
 				}
 
 				/*--- Angle of attack ---*/
@@ -4929,7 +4929,7 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
 	/*--- External iteration ---*/
 
   if ((config->GetDiscard_InFiles() == false) && (!adjoint || (adjoint && config->GetRestart())))
-    config->SetExtIter_OffSet(ExtIter_);
+    config->SetExtIter_OffSet(InnerIter_);
 
 }
 
@@ -5455,8 +5455,8 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
 
   /*--- Open the restart file and extract the nVar and field names. ---*/
 
-  string Tag, text_line, AdjExt, UnstExt;
-  unsigned long iExtIter = config->GetExtIter();
+  string Tag, text_line;
+  unsigned long InnerIter = config->GetInnerIter();
 
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
@@ -5482,10 +5482,10 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
+  if (config->GetTime_Domain()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(InnerIter), ".dat");
   } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(InnerIter), ".dat");
   }
 
   /*--- Read only the number of variables in the restart file. ---*/
@@ -5743,8 +5743,6 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
 
   string filename;
   unsigned long index;
-  string UnstExt, text_line, AdjExt;
-  ifstream solution_file;
   unsigned short iDim, iVar;
   bool adjoint = ( config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint() ); 
   unsigned short iInst = config->GetiInst();
@@ -5769,7 +5767,7 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
     filename = config->GetSolution_FileName();
   }
 
-  filename = config->GetFilename(filename, ".dat");
+  filename = config->GetFilename(filename, ".dat", val_iter);
 
   /*--- Output the file name to the console. ---*/
 
@@ -5882,13 +5880,8 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
   /*--- Restart the solution from file information ---*/
   string filename;
   unsigned long index;
-  string UnstExt, text_line, AdjExt;
-  ifstream solution_file;
   unsigned short iVar;
-  unsigned long iExtIter = config->GetExtIter();
   bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry->GetnZone();
 
   /*--- Retrieve filename from config ---*/
   if (adjoint) {
@@ -5900,15 +5893,7 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
 
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-  if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetWrt_Unsteady() || config->GetUnsteady_Simulation() != HARMONIC_BALANCE) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
-  }
+  filename = config->GetFilename(filename, ".dat", val_iter);
 
   /*--- Output the file name to the console. ---*/
 
@@ -6023,7 +6008,7 @@ void CBaselineSolver_FEM::SetOutputVariables(CGeometry *geometry, CConfig *confi
   /*--- Open the restart file and extract the nVar and field names. ---*/
 
   string Tag, text_line, AdjExt, UnstExt;
-  unsigned long iExtIter = config->GetExtIter();
+  unsigned long TimeIter = config->GetTimeIter();
 
   ifstream restart_file;
   string filename;
@@ -6034,8 +6019,8 @@ void CBaselineSolver_FEM::SetOutputVariables(CGeometry *geometry, CConfig *confi
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
 
-  if (config->GetWrt_Unsteady()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
+  if (config->GetTime_Domain()) {
+    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(TimeIter), ".dat");
   }
 
   /*--- Read only the number of variables in the restart file. ---*/
@@ -6249,12 +6234,9 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   unsigned short iVar;
   unsigned long index;
 
-  string UnstExt, text_line;
-  ifstream restart_file;
-
   string restart_filename = config->GetSolution_FileName();
 
-  if (config->GetWrt_Unsteady()) {
+  if (config->GetTime_Domain()) {
     restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), ".dat");
   }
 
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 6bd66e8b45a3..8790b94640c7 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
       /*--- Instantiate the solvers for each zone. ---*/
       for (iZone = 0; iZone < nZone; iZone++){
         config_container[iZone]->SetiInst(INST_0);
-        config_container[iZone]->SetExtIter(TimeIter);
+        config_container[iZone]->SetTimeIter(TimeIter);
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
         
         output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
@@ -310,7 +310,7 @@ int main(int argc, char *argv[]) {
           for (iZone = 0; iZone < nZone; iZone++){
 
             /*--- Set the current iteration number in the config class. ---*/
-            config_container[iZone]->SetExtIter(TimeIter);
+            config_container[iZone]->SetTimeIter(TimeIter);
             /*--- So far, only enabled for single-instance problems ---*/
             config_container[iZone]->SetiInst(INST_0);
             solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
@@ -376,63 +376,63 @@ int main(int argc, char *argv[]) {
     }
 
     su2double Physical_dt, Physical_t;
-    unsigned long iExtIter = 0, iExtIterFlow = 0, iExtIterFEM = 0;
+    unsigned long TimeIter = 0, TimeIterFlow = 0, TimeIterFEM = 0;
     bool StopCalc = false;
     bool SolutionInstantiatedFlow = false, SolutionInstantiatedFEM = false;
 
     /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
     if (config_container[ZONE_0]->GetRestart()){
-      iExtIterFlow = config_container[ZONE_0]->GetRestart_Iter();
-      iExtIterFEM = config_container[ZONE_1]->GetRestart_Iter();
-      if (iExtIterFlow != iExtIterFEM) {
+      TimeIterFlow = config_container[ZONE_0]->GetRestart_Iter();
+      TimeIterFEM = config_container[ZONE_1]->GetRestart_Iter();
+      if (TimeIterFlow != TimeIterFEM) {
         SU2_MPI::Error("For multizone computations, please add the number of zones as a second argument for SU2_SOL.", CURRENT_FUNCTION);
       }
       else {
-        iExtIter = iExtIterFlow;
+        TimeIter = TimeIterFlow;
       }
     }
 
 
-    while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
+    while (TimeIter < config_container[ZONE_0]->GetnTime_Iter()) {
 
       /*--- Check several conditions in order to merge the correct time step files. ---*/
 
       Physical_dt = config_container[ZONE_0]->GetDelta_UnstTime();
-      Physical_t  = (iExtIter+1)*Physical_dt;
+      Physical_t  = (TimeIter+1)*Physical_dt;
       if (Physical_t >=  config_container[ZONE_0]->GetTotal_UnstTime())
         StopCalc = true;
 
       if (
-          ((iExtIter+1 == config_container[ZONE_0]->GetnExtIter()) ||
-           ((iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (iExtIter != 0) &&
+          ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
+           ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
             !((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
               (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND))) ||
            (StopCalc) ||
            (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
              (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) &&
-            ((iExtIter == 0) || (iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))))
+            ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))))
 
           &&
 
-          ((iExtIter+1 == config_container[ZONE_1]->GetnExtIter()) ||
+          ((TimeIter+1 == config_container[ZONE_1]->GetnTime_Iter()) ||
            (StopCalc) ||
            ((config_container[ZONE_1]->GetDynamic_Analysis() == DYNAMIC) &&
-            ((iExtIter == 0) || (iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0))))
+            ((TimeIter == 0) || (TimeIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0))))
 
           ){
 
         /*--- Set the current iteration number in the config class. ---*/
-        config_container[ZONE_0]->SetExtIter(iExtIter);
-        config_container[ZONE_1]->SetExtIter(iExtIter);
+        config_container[ZONE_0]->SetTimeIter(TimeIter);
+        config_container[ZONE_1]->SetTimeIter(TimeIter);
 
         /*--- Read in the restart file for this time step ---*/
 
         /*--- For the fluid zone (ZONE_0) ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFlow == false &&
-            (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
-                               iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
-                               iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
+            (TimeIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(TimeIter) == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
+                               TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                               TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
           output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
           output[ZONE_0]->PreprocessVolumeOutput(config_container[ZONE_0]);
@@ -446,9 +446,9 @@ int main(int argc, char *argv[]) {
         /*--- Either instantiate the solution class or load a restart file. ---*/
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFEM == false &&
-            (iExtIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(iExtIter) == SU2_TYPE::Int(config_container[ZONE_1]->GetRestart_Iter()))) ||
-                               iExtIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
-                               iExtIter+1 == config_container[ZONE_1]->GetnExtIter()))) {
+            (TimeIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(TimeIter) == SU2_TYPE::Int(config_container[ZONE_1]->GetRestart_Iter()))) ||
+                               TimeIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                               TimeIter+1 == config_container[ZONE_1]->GetnTime_Iter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
           output[ZONE_1] = new CBaselineOutput(config_container[ZONE_1], geometry_container[ZONE_1][INST_0]->GetnDim(), solver_container[ZONE_1][INST_0]);
           output[ZONE_1]->PreprocessVolumeOutput(config_container[ZONE_1]);
@@ -456,7 +456,7 @@ int main(int argc, char *argv[]) {
         }
           solver_container[ZONE_1][INST_0]->LoadRestart_FSI(geometry_container[ZONE_1][INST_0], config_container[ZONE_1], SU2_TYPE::Int(MESH_0));
 
-        if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
+        if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
         for (iZone = 0; iZone < nZone; iZone++){
           
           /*--- Load the data --- */
@@ -474,19 +474,19 @@ int main(int argc, char *argv[]) {
         }
       }
 
-      iExtIter++;
+      TimeIter++;
       if (StopCalc) break;
     }
 
   } else if (fem_solver) {
 
-    if (config_container[ZONE_0]->GetWrt_Unsteady()) {
+    if (config->GetTime_Domain()) {
 
       /*--- Unsteady DG simulation: merge all unsteady time steps. First,
        find the frequency and total number of files to write. ---*/
 
       su2double Physical_dt, Physical_t;
-      unsigned long iExtIter = 0;
+      unsigned long TimeIter = 0;
       bool StopCalc = false;
       bool *SolutionInstantiated = new bool[nZone];
 
@@ -494,50 +494,50 @@ int main(int argc, char *argv[]) {
         SolutionInstantiated[iZone] = false;
 
       /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
-      if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
+      if (config_container[ZONE_0]->GetTime_Domain() && config_container[ZONE_0]->GetRestart())
+        TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
-      while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
+      while (TimeIter < config_container[ZONE_0]->GetnTime_Iter()) {
 
         /*--- Check several conditions in order to merge the correct time step files. ---*/
         Physical_dt = config_container[ZONE_0]->GetDelta_UnstTime();
-        Physical_t  = (iExtIter+1)*Physical_dt;
+        Physical_t  = (TimeIter+1)*Physical_dt;
         if (Physical_t >=  config_container[ZONE_0]->GetTotal_UnstTime())
           StopCalc = true;
 
-        if ((iExtIter+1 == config_container[ZONE_0]->GetnExtIter()) ||
-            ((iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (iExtIter != 0) &&
+        if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
+            ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
              !(config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) ||
             (StopCalc) ||
             ((config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING) &&
-             ((iExtIter == 0) || (iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
               /*--- Read in the restart file for this time step ---*/
               for (iZone = 0; iZone < nZone; iZone++) {
 
                 /*--- Set the current iteration number in the config class. ---*/
-                config_container[iZone]->SetExtIter(iExtIter);
+                config_container[iZone]->SetTimeIter(TimeIter);
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
-                    (iExtIter == 0 ||
-                     (config_container[ZONE_0]->GetRestart() && ((long)iExtIter == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
-                                                                                  iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
-                                                                                  iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
+                    (TimeIter == 0 ||
+                     (config_container[ZONE_0]->GetRestart() && ((long)TimeIter == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
+                                                                                  TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                                                                  TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter())))) {
 
                   solver_container[iZone][INST_0] = new CBaselineSolver_FEM(geometry_container[iZone][INST_0], config_container[iZone]);
                   SolutionInstantiated[iZone] = true;
                 }
                 solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone],
-                                                             config_container[iZone], (int)iExtIter, true);
+                                                             config_container[iZone], (int)TimeIter, true);
               }
 
               if (rank == MASTER_NODE)
-                cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
+                cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
 //              output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, iExtIter, nZone);
             }
         
-        iExtIter++;
+        TimeIter++;
         if (StopCalc) break;
       }
       
@@ -558,13 +558,13 @@ int main(int argc, char *argv[]) {
   }
   else {
 
-    if (config_container[ZONE_0]->GetWrt_Unsteady()) {
+    if (config_container[ZONE_0]->GetTime_Domain()) {
 
       /*--- Unsteady simulation: merge all unsteady time steps. First,
        find the frequency and total number of files to write. ---*/
 
       su2double Physical_dt, Physical_t;
-      unsigned long iExtIter = 0;
+      unsigned long TimeIter = 0;
       bool StopCalc = false;
       bool *SolutionInstantiated = new bool[nZone];
 
@@ -572,25 +572,25 @@ int main(int argc, char *argv[]) {
         SolutionInstantiated[iZone] = false;
 
       /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
-      if (config_container[ZONE_0]->GetWrt_Unsteady() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
+      if (config_container[ZONE_0]->GetTime_Domain() && config_container[ZONE_0]->GetRestart())
+        TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
-      while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
+      while (TimeIter < config_container[ZONE_0]->GetnTime_Iter()) {
 
         /*--- Check several conditions in order to merge the correct time step files. ---*/
-        Physical_dt = config_container[ZONE_0]->GetDelta_UnstTime();
-        Physical_t  = (iExtIter+1)*Physical_dt;
-        if (Physical_t >=  config_container[ZONE_0]->GetTotal_UnstTime())
+        Physical_dt = config_container[ZONE_0]->GetTime_Step();
+        Physical_t  = (TimeIter+1)*Physical_dt;
+        if (Physical_t >=  config_container[ZONE_0]->GetMax_Time())
           StopCalc = true;
 
-        if ((iExtIter+1 == config_container[ZONE_0]->GetnExtIter()) ||
-            ((iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (iExtIter != 0) &&
+        if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
+            ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
              !((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
                (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND))) ||
             (StopCalc) ||
             (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
               (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) &&
-             ((iExtIter == 0) || (iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
 
 
@@ -598,13 +598,13 @@ int main(int argc, char *argv[]) {
               for (iZone = 0; iZone < nZone; iZone++) {
 
                 /*--- Set the current iteration number in the config class. ---*/
-                config_container[iZone]->SetExtIter(iExtIter);
+                config_container[iZone]->SetTimeIter(TimeIter);
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
-                    (iExtIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)iExtIter ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
-                                                                                  iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
-                                                                                  iExtIter+1 == config_container[ZONE_0]->GetnExtIter())))) {
+                    (TimeIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)TimeIter ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
+                                                                                  TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                                                                  TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
                   output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
@@ -616,7 +616,7 @@ int main(int argc, char *argv[]) {
               }
 
               if (rank == MASTER_NODE)
-                cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
+                cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
                 
                 /*--- Load the data --- */
@@ -634,7 +634,7 @@ int main(int argc, char *argv[]) {
               }
         }
 
-        iExtIter++;
+        TimeIter++;
         if (StopCalc) break;
       }
 
@@ -687,7 +687,7 @@ int main(int argc, char *argv[]) {
        find the frequency and total number of files to write. ---*/
 
       su2double Physical_dt, Physical_t;
-      unsigned long iExtIter = 0;
+      unsigned long TimeIter = 0;
       bool StopCalc = false;
       bool SolutionInstantiated = false;
 
@@ -696,34 +696,34 @@ int main(int argc, char *argv[]) {
       /*--- Check for an dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
       if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY &&
           config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
-        iExtIter = config_container[ZONE_0]->GetRestart_Iter();
+        TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
-      while (iExtIter < config_container[ZONE_0]->GetnExtIter()) {
+      while (TimeIter < config_container[ZONE_0]->GetnTime_Iter()) {
 
         /*--- Check several conditions in order to merge the correct time step files. ---*/
         /*--- If the solver is structural, the total and delta_t are obtained from different functions. ---*/
 
-        Physical_dt = config_container[ZONE_0]->GetDelta_DynTime();
-        Physical_t  = (iExtIter+1)*Physical_dt;
-        if (Physical_t >=  config_container[ZONE_0]->GetTotal_DynTime())
+        Physical_dt = config_container[ZONE_0]->GetTime_Step();
+        Physical_t  = (TimeIter+1)*Physical_dt;
+        if (Physical_t >=  config_container[ZONE_0]->GetMax_Time())
           StopCalc = true;
 
-        if ((iExtIter+1 == config_container[ZONE_0]->GetnExtIter()) ||
+        if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
             (StopCalc) ||
             ((config_container[ZONE_0]->GetDynamic_Analysis() == DYNAMIC) &&
-             ((iExtIter == 0) || (iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
               /*--- Set the current iteration number in the config class. ---*/
-              config_container[ZONE_0]->SetExtIter(iExtIter);
+              config_container[ZONE_0]->SetTimeIter(TimeIter);
 
               /*--- Read in the restart file for this time step ---*/
               for (iZone = 0; iZone < nZone; iZone++) {
 
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated == false &&
-                    (iExtIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(iExtIter) ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
-                                       iExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
-                                       iExtIter+1 == config_container[ZONE_0]->GetnExtIter()))) {
+                    (TimeIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(TimeIter) ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
+                                       TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                       TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
                   output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
@@ -735,7 +735,7 @@ int main(int argc, char *argv[]) {
               }
 
               if (rank == MASTER_NODE)
-                cout << "Writing the volume solution for time step " << iExtIter << "." << endl;
+                cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
                 
                 /*--- Load the data --- */
@@ -753,7 +753,7 @@ int main(int argc, char *argv[]) {
               }        
         }
         
-        iExtIter++;
+        TimeIter++;
         if (StopCalc) break;
       }
       

From 97ea9b76b76d1ce2af951ecf6cfc1f3a9380d527 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Aug 2019 16:04:55 +0200
Subject: [PATCH 387/539] Changed option for screen/history output frequency

---
 Common/include/config_structure.hpp          | 13 +++----
 Common/include/config_structure.inl          |  6 ++--
 Common/src/config_structure.cpp              | 35 +++++++++++++++----
 SU2_CFD/include/output/CElasticityOutput.hpp | 18 ----------
 SU2_CFD/src/output/CDriverOutput.cpp         | 22 ++++++------
 SU2_CFD/src/output/CElasticityOutput.cpp     | 23 -------------
 SU2_CFD/src/output/COutput.cpp               | 36 ++++++++++++--------
 7 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 6457b01b623a..576adff6f190 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1062,8 +1062,8 @@ class CConfig {
   su2double Time_Step;          /*!< \brief Determines the time step for the multizone problem */
   su2double Max_Time;           /*!< \brief Determines the maximum time for the time-domain problems */
   su2double *default_wrt_freq;
-  su2double *HistoryWrtFreq,    /*!< \brief Array containing history writing frequencies for timer iter, outer iter, inner iter */
-            *ScreenWrtFreq;     /*!< \brief Array containing screen writing frequencies for timer iter, outer iter, inner iter */
+  unsigned long HistoryWrtFreq[3],    /*!< \brief Array containing history writing frequencies for timer iter, outer iter, inner iter */
+                ScreenWrtFreq[3];     /*!< \brief Array containing screen writing frequencies for timer iter, outer iter, inner iter */
   bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
   bool SinglezoneDriver;        /*!< \brief Determines if the single-zone driver is used. (TEMPORARY) */
   bool Wrt_ZoneConv;            /*!< \brief Write the convergence history of each individual zone to screen. */
@@ -9112,16 +9112,17 @@ class CConfig {
   su2double Get_StartTime();
 
   /*!
-   * \brief GetHistory_Wrt_Freq
+   * \brief GetHistory_Wrt_Freq_Inner
    * \return 
    */
-  su2double* GetHistory_Wrt_Freq();
+  unsigned long GetHistory_Wrt_Freq(unsigned short iter);
   
   /*!
-   * \brief GetScreen_Wrt_Freq
+   * \brief GetScreen_Wrt_Freq_Inner
    * \return 
    */
-  su2double* GetScreen_Wrt_Freq();
+  unsigned long GetScreen_Wrt_Freq(unsigned short iter);
+  
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 3c215ba36454..47d450c7e676 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2046,6 +2046,8 @@ inline void  CConfig::Set_StartTime(su2double starttime){StartTime = starttime;}
 
 inline su2double  CConfig::Get_StartTime() {return StartTime;}
 
-inline su2double* CConfig::GetScreen_Wrt_Freq() {return ScreenWrtFreq;}
+inline unsigned long CConfig::GetHistory_Wrt_Freq(unsigned short iter) {return HistoryWrtFreq[iter];}
+
+inline unsigned long CConfig::GetScreen_Wrt_Freq(unsigned short iter) {return ScreenWrtFreq[iter];}
+
 
-inline su2double* CConfig::GetHistory_Wrt_Freq() {return HistoryWrtFreq;}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 970538c82660..2243add30ab1 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2428,13 +2428,21 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Type of output printed to the volume solution file */
   addStringListOption("VOLUME_OUTPUT", nVolumeOutput, VolumeOutput);
   
-  default_wrt_freq[0] = 1.0; default_wrt_freq[1] = 1.0; default_wrt_freq[2] = 1.0;
-  /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
-  addDoubleArrayOption("HISTORY_WRT_FREQ", 3, HistoryWrtFreq, default_wrt_freq);
+  /* DESCRIPTION: History writing frequency (INNER_ITER) */
+  addUnsignedLongOption("HISTORY_WRT_FREQ_INNER", HistoryWrtFreq[2], 1);
+  /* DESCRIPTION: History writing frequency (OUTER_ITER) */
+  addUnsignedLongOption("HISTORY_WRT_FREQ_OUTER", HistoryWrtFreq[1], 1); 
+  /* DESCRIPTION: History writing frequency (TIME_ITER) */
+  addUnsignedLongOption("HISTORY_WRT_FREQ_TIME", HistoryWrtFreq[0], 1);
+  
+  /* DESCRIPTION: Screen writing frequency (INNER_ITER) */
+  addUnsignedLongOption("SCREEN_WRT_FREQ_INNER", ScreenWrtFreq[2], 1);
+  /* DESCRIPTION: Screen writing frequency (OUTER_ITER) */
+  addUnsignedLongOption("SCREEN_WRT_FREQ_OUTER", ScreenWrtFreq[1], 1); 
+  /* DESCRIPTION: Screen writing frequency (TIME_ITER) */
+  addUnsignedLongOption("SCREEN_WRT_FREQ_TIME", ScreenWrtFreq[0], 1);
+  
   
-  /* DESCRIPTION: History writing frequency (TIME_ITER, OUTER_ITER, INNER_ITER) */
-  addDoubleArrayOption("SCREEN_WRT_FREQ", 3, ScreenWrtFreq, default_wrt_freq);
- 
   /* DESCRIPTION: Using Uncertainty Quantification with SST Turbulence Model */
   addBoolOption("USING_UQ", using_uq, false);
 
@@ -2998,6 +3006,21 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     }
   }
   
+  /*--- Check for unsteady problem ---*/
+  
+  if ((Unsteady_Simulation == TIME_STEPPING ||
+       Unsteady_Simulation == DT_STEPPING_1ST ||
+       Unsteady_Simulation == DT_STEPPING_2ND) && !Time_Domain){
+    SU2_MPI::Error("TIME_DOMAIN must be set to YES if UNSTEADY_SIMULATION is "
+                   "TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER or DUAL_TIME_STEPPING-2ND_ORDER", CURRENT_FUNCTION);
+  }
+  
+  if (Time_Domain){
+    if (Unsteady_Simulation == TIME_STEPPING){
+      InnerIter = 1;
+    }
+  }
+  
   /*--- Low memory only for ASCII Tecplot ---*/
 
   if (Output_FileFormat != TECPLOT) Low_MemoryOutput = NO;
diff --git a/SU2_CFD/include/output/CElasticityOutput.hpp b/SU2_CFD/include/output/CElasticityOutput.hpp
index c1ceba962e4c..52dd742f3e48 100644
--- a/SU2_CFD/include/output/CElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CElasticityOutput.hpp
@@ -80,24 +80,6 @@ class CElasticityOutput : public COutput {
    */
   void SetHistoryOutputFields(CConfig *config);
 
-  /*!
-   * \brief Determines if the history file output.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteHistoryFile_Output(CConfig *config);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Header(CConfig *config);
-  
-  /*!
-   * \brief Determines if the screen header should be written.
-   * \param[in] config - Definition of the particular problem.
-   */
-  bool WriteScreen_Output(CConfig *config);
-  
   /*!
    * \brief SetVolumeOutputFields
    * \param config
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index aa99537c863b..460e8e89e9ea 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -158,7 +158,7 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
   }
 }
 
-inline bool CDriverOutput::WriteScreen_Header(CConfig *config) {
+bool CDriverOutput::WriteScreen_Header(CConfig *config) {
 
   bool write_header = true;
 
@@ -168,13 +168,15 @@ inline bool CDriverOutput::WriteScreen_Header(CConfig *config) {
   return write_header;
 
 }
-inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
+
+bool CDriverOutput::WriteScreen_Output(CConfig *config) {
   
-  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
+  unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
+  unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);    
 
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -183,24 +185,24 @@ inline bool CDriverOutput::WriteScreen_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(ScreenWrt_Freq[1])) && 
+  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq_Outer) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
-  
  
   return true;
 }
 
-inline bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
+bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
   
-  su2double* HistoryWrt_Freq = config->GetHistory_Wrt_Freq();
+  unsigned long HistoryWrt_Freq_Outer = config->GetHistory_Wrt_Freq(1);
+  unsigned long HistoryWrt_Freq_Time  = config->GetHistory_Wrt_Freq(0);    
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(HistoryWrt_Freq[0]))&& 
+  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq_Time)&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -209,7 +211,7 @@ inline bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(HistoryWrt_Freq[1])) && 
+  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq_Outer) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 6776ebaa3cd4..b637ac83ce11 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -246,28 +246,5 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   
 }
 
-inline bool CElasticityOutput::WriteHistoryFile_Output(CConfig *config) { return true;}
-
-inline bool CElasticityOutput::WriteScreen_Header(CConfig *config) {  
-  
-  bool write_header;
-  if (nonlinear_analysis) write_header = (config->GetIntIter() == 0);
-  else write_header = (((config->GetExtIter() % (config->GetWrt_Con_Freq()*40)) == 0));
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_header = (write_header && config->GetWrt_ZoneConv());
-
-  return write_header;
-  
-}
-inline bool CElasticityOutput::WriteScreen_Output(CConfig *config) {
-
-  bool write_output = true;
-
-  /*--- For multizone problems, print the header only if requested explicitly (default of GetWrt_ZoneConv is false) ---*/
-  if(config->GetMultizone_Problem()) write_output = (write_output && config->GetWrt_ZoneConv());
-
-  return write_output;
-}
 
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 80dec3a28fcc..d85ef9b5c29b 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1338,7 +1338,9 @@ bool COutput::WriteScreen_Header(CConfig *config) {
     RestartIter = config->GetRestart_Iter();
   }
   
-  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
+  unsigned long ScreenWrt_Freq_Inner = config->GetScreen_Wrt_Freq(2);
+  unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
+  unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);
   
   /*--- Header is always disabled for multizone problems unless explicitely requested --- */
   
@@ -1354,26 +1356,30 @@ bool COutput::WriteScreen_Header(CConfig *config) {
     return true;
   }
   
-  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     return false;
   }
    
-  if (SU2_TYPE::Int(ScreenWrt_Freq[2]) == 0 && SU2_TYPE::Int(ScreenWrt_Freq[1]) == 0){
+  /*--- If there is no inner or outer iteration, don't print header ---*/
+  if (ScreenWrt_Freq_Outer == 0 && ScreenWrt_Freq_Inner == 0){
     return false;
   }
   
+  /*--- Print header if we are at the first inner iteration ---*/
+  
   if (curr_InnerIter == 0){
-    write_header = true;
+    return true;
   }
   
-  return write_header;
+  return false;
 }
 
 bool COutput::WriteScreen_Output(CConfig *config) {
   
-  su2double* ScreenWrt_Freq = config->GetScreen_Wrt_Freq();
-    
+  unsigned long ScreenWrt_Freq_Inner = config->GetScreen_Wrt_Freq(2);
+  unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
+  unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);    
   
   if (config->GetMultizone_Problem() && !config->GetWrt_ZoneConv()){
     
@@ -1383,7 +1389,7 @@ bool COutput::WriteScreen_Output(CConfig *config) {
   
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(ScreenWrt_Freq[0]))&& 
+  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -1392,14 +1398,14 @@ bool COutput::WriteScreen_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(ScreenWrt_Freq[1])) && 
+  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq_Outer) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, SU2_TYPE::Int(ScreenWrt_Freq[2])) &&
+  if (!PrintOutput(curr_InnerIter, ScreenWrt_Freq_Inner) &&
       !(curr_InnerIter == config->GetnInner_Iter() - 1)){
     
     return false;
@@ -1412,11 +1418,13 @@ bool COutput::WriteScreen_Output(CConfig *config) {
 
 bool COutput::WriteHistoryFile_Output(CConfig *config) { 
 
-  su2double* HistoryWrt_Freq = config->GetHistory_Wrt_Freq();
+  unsigned long HistoryWrt_Freq_Inner = config->GetHistory_Wrt_Freq(2);
+  unsigned long HistoryWrt_Freq_Outer = config->GetHistory_Wrt_Freq(1);
+  unsigned long HistoryWrt_Freq_Time  = config->GetHistory_Wrt_Freq(0);    
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, SU2_TYPE::Int(HistoryWrt_Freq[0]))&& 
+  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq_Time)&& 
       !(curr_TimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
@@ -1425,14 +1433,14 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
   
   if (Convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, SU2_TYPE::Int(HistoryWrt_Freq[1])) && 
+  if (!PrintOutput(curr_OuterIter,HistoryWrt_Freq_Outer) && 
       !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, SU2_TYPE::Int(HistoryWrt_Freq[2])) &&
+  if (!PrintOutput(curr_InnerIter, HistoryWrt_Freq_Inner) &&
       !(curr_InnerIter == config->GetnInner_Iter() - 1)){
     
     return false;

From 5e2659ab991109f563cc03a1d0142565788754c1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Aug 2019 16:05:41 +0200
Subject: [PATCH 388/539] Added error messages

---
 Common/src/config_structure.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 2243add30ab1..1c6cdb0cf7cf 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3213,21 +3213,32 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     nTimeIter = 1;
     Time_Step = 0;
     
-    ScreenWrtFreq[0] = 1.0;
-    HistoryWrtFreq[0] = 1.0;
-    
-    nExtIter = nIter;
+    ScreenWrtFreq[0]  = 1;
+    HistoryWrtFreq[0] = 1;
   } 
   
   if (Time_Domain){
     Delta_UnstTime = Time_Step;
     Delta_DynTime  = Time_Step;
-    nExtIter = nTimeIter;
   }
   
   if (!Multizone_Problem){
-    ScreenWrtFreq[1] = 0.0;
-    HistoryWrtFreq[1] = 0.0;
+    ScreenWrtFreq[1]  = 0;
+    HistoryWrtFreq[1] = 0;
+    if (!Time_Domain){
+      /*--- If not running multizone or unsteady, INNER_ITER and ITER are interchangeable,
+       * but precedence will be given to INNER_ITER if both options are present. ---*/
+      if (all_options.find("INNER_ITER") != all_options.end()){
+        nInnerIter = nIter;
+      }
+    }
+  }
+  
+  
+  if ((Multizone_Problem || Time_Domain) && all_options.find("ITER") == all_options.end()){
+    SU2_MPI::Error("ITER must not be used when running multizone and/or unsteady problems.\n"
+                   "Use TIME_ITER, OUTER_ITER or INNER_ITER to specify number of time iterations,\n"
+                   "outer iterations or inner iterations, respectively.", CURRENT_FUNCTION);
   }
 
   /*--- If we're solving a purely steady problem with no prescribed grid

From 26215fff7d70a1344a46acebbeb226678bc2492d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 12 Aug 2019 16:06:34 +0200
Subject: [PATCH 389/539] Moved deprecated driver routines to CFluidDriver

---
 SU2_CFD/include/drivers/CDriver.hpp |  42 +++-
 SU2_CFD/src/drivers/CDriver.cpp     | 300 +++++++---------------------
 2 files changed, 103 insertions(+), 239 deletions(-)

diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index 5fd7f684dac5..01bbd7be29c6 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -279,28 +279,28 @@ class CDriver {
    * \param[in] donorZone - zone in which the displacements will be predicted.
    * \param[in] targetZone - zone which receives the predicted displacements.
    */
-  virtual void Predict_Displacements(unsigned short donorZone, unsigned short targetZone) {};
+  virtual void Predict_Displacements(unsigned short donorZone, unsigned short targetZone) {}
 
   /*!
    * \brief A virtual member.
    * \param[in] donorZone - zone in which the tractions will be predicted.
    * \param[in] targetZone - zone which receives the predicted traction.
    */
-  virtual void Predict_Tractions(unsigned short donorZone, unsigned short targetZone) {};
+  virtual void Predict_Tractions(unsigned short donorZone, unsigned short targetZone) {}
 
   /*!
    * \brief A virtual member.
    * \param[in] donorZone - zone in which the displacements will be transferred.
    * \param[in] targetZone - zone which receives the tractions transferred.
    */
-  virtual void Transfer_Displacements(unsigned short donorZone, unsigned short targetZone) {};
+  virtual void Transfer_Displacements(unsigned short donorZone, unsigned short targetZone) {}
 
   /*!
    * \brief A virtual member.
    * \param[in] donorZone - zone from which the tractions will be transferred.
    * \param[in] targetZone - zone which receives the tractions transferred.
    */
-  virtual void Transfer_Tractions(unsigned short donorZone, unsigned short targetZone) {};
+  virtual void Transfer_Tractions(unsigned short donorZone, unsigned short targetZone) {}
 
   /*!
    * \brief A virtual member.
@@ -308,7 +308,7 @@ class CDriver {
    * \param[in] targetZone - destination of the information.
    * \param[in] iOuterIter - Fluid-Structure Interaction subiteration.
    */
-  virtual void Relaxation_Displacements(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter) {};
+  virtual void Relaxation_Displacements(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter) {}
 
   /*!
    * \brief A virtual member.
@@ -316,29 +316,29 @@ class CDriver {
    * \param[in] targetZone - destination of the information.
    * \param[in] iOuterIter - Fluid-Structure Interaction subiteration.
    */
-  virtual void Relaxation_Tractions(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter) {};
+  virtual void Relaxation_Tractions(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter) {}
   
   /*!
    * \brief A virtual member to run a Block Gauss-Seidel iteration in multizone problems.
    */
-  virtual void Run_GaussSeidel(){};
+  virtual void Run_GaussSeidel(){}
 
   /*!
    * \brief A virtual member to run a Block-Jacobi iteration in multizone problems.
    */
-  virtual void Run_Jacobi(){};
+  virtual void Run_Jacobi(){}
   
   /*!
    * \brief A virtual member.
    */
-  virtual void Update() {};
+  virtual void Update() {}
   
 public:
 
   /*!
    * \brief Launch the computation for all zones and all physics.
    */
-  virtual void StartSolver();
+  virtual void StartSolver() {}
   
   /*!
    * \brief Deallocation routine
@@ -749,6 +749,11 @@ class CFluidDriver : public CDriver {
    * \brief Destructor of the class.
    */
   ~CFluidDriver(void);
+  
+  /*!
+   * \brief Launch the computation for all zones and all physics.
+   */
+  void StartSolver();
 
   /*!
    * \brief Run a single iteration of the physics within multiple zones.
@@ -759,6 +764,21 @@ class CFluidDriver : public CDriver {
    * \brief Update the dual-time solution within multiple zones.
    */
   void Update();
+  
+  /*!
+   * \brief Output the solution in solution file.
+   */
+  void Output(unsigned long InnerIter);
+  
+  /*!
+   * \brief Monitor the computation.
+   */
+  bool Monitor(unsigned long ExtIter);
+  
+  /*!
+   * \brief Perform some pre-processing before an iteration of the physics.
+   */
+  void Preprocess(unsigned long Iter);  
 
   /*!
    * \brief Reset the convergence flag (set to false) of the multizone solver.
@@ -885,7 +905,7 @@ class CTurbomachineryDriver : public CFluidDriver {
  * \brief Class for driving an iteration of Harmonic Balance (HB) method problem using multiple time zones.
  * \author T. Economon
  */
-class CHBDriver : public CDriver {
+class CHBDriver : public CFluidDriver {
 
 private:
   COutputLegacy* output_legacy;
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 0d61db22336e..a87f33f7dc10 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3792,7 +3792,16 @@ void CDriver::Turbomachinery_Preprocessing(CConfig** config, CGeometry**** geome
 
 }
 
-void CDriver::StartSolver(){
+
+
+
+CDriver::~CDriver(void) {}
+
+CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, MPICommunicator, false) { }
+
+CFluidDriver::~CFluidDriver(void) { }
+
+void CFluidDriver::StartSolver(){
 
 #ifdef VTUNEPROF
   __itt_resume();
@@ -3882,222 +3891,12 @@ void CFluidDriver::Preprocess(unsigned long Iter) {
           (config_container[iZone]->GetKind_Solver() ==  NAVIER_STOKES) ||
           (config_container[iZone]->GetKind_Solver() ==  RANS) ) {
         for (iInst = 0; iInst < nInst[iZone]; iInst++)
-          solver_container[iZone][iInst][MESH_0][FLOW_SOL]->SetInitialCondition(geometry_container[iZone][INST_0], solver_container[iZone][iInst], config_container[iZone], ExtIter);
+          solver_container[iZone][iInst][MESH_0][FLOW_SOL]->SetInitialCondition(geometry_container[iZone][INST_0], solver_container[iZone][iInst], config_container[iZone], Iter);
       }
     }
   }
 
 }
-
-bool CDriver::Monitor(unsigned long ExtIter) {
-
-  /*--- Synchronization point after a single solver iteration. Compute the
-   wall clock time required. ---*/
-
-#ifndef HAVE_MPI
-  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-  StopTime = MPI_Wtime();
-#endif
-  IterCount++;
-  UsedTime = (StopTime - StartTime) + UsedTimeCompute;
-  
-  
-  /*--- Check if there is any change in the runtime parameters ---*/
-  
-  CConfig *runtime = NULL;
-  strcpy(runtime_file_name, "runtime.dat");
-  runtime = new CConfig(runtime_file_name, config_container[ZONE_0]);
-  runtime->SetExtIter(ExtIter);
-  delete runtime;
-
-  /*--- Evaluate the new CFL number (adaptive). ---*/
-  if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
-    for (iZone = 0; iZone < nZone; iZone++){
-      if (!(config_container[iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
-        output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
-    }
-  }
-
-  /*--- Check whether the current simulation has reached the specified
-   convergence criteria, and set StopCalc to true, if so. ---*/
-  
-  switch (config_container[ZONE_0]->GetKind_Solver()) {
-    case EULER: case NAVIER_STOKES: case RANS:
-      StopCalc = integration_container[ZONE_0][INST_0][FLOW_SOL]->GetConvergence(); break;
-    case HEAT_EQUATION_FVM:
-      StopCalc = integration_container[ZONE_0][INST_0][HEAT_SOL]->GetConvergence(); break;
-    case FEM_ELASTICITY:
-      StopCalc = integration_container[ZONE_0][INST_0][FEA_SOL]->GetConvergence(); break;
-    case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-    case DISC_ADJ_FEM_EULER: case DISC_ADJ_FEM_NS: case DISC_ADJ_FEM_RANS:
-      StopCalc = integration_container[ZONE_0][INST_0][ADJFLOW_SOL]->GetConvergence(); break;
-  }
-  
-  return StopCalc;
-  
-}
-
-void CDriver::Output(unsigned long ExtIter) {
-  
-  unsigned long nExtIter = config_container[ZONE_0]->GetnExtIter();
-  bool output_files = false;
-  
-  unsigned short RestartFormat = SU2_RESTART_ASCII;
-  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
-  
-  bool Wrt_Surf = config_container[ZONE_0]->GetWrt_Srf_Sol();
-  bool Wrt_Vol  = config_container[ZONE_0]->GetWrt_Vol_Sol();
-  bool Wrt_CSV  = config_container[ZONE_0]->GetWrt_Csv_Sol();
-  
-  if (config_container[ZONE_0]->GetWrt_Binary_Restart()){
-    RestartFormat = SU2_RESTART_BINARY;
-  }
-  /*--- Determine whether a solution needs to be written
-   after the current iteration ---*/
-  
-  if (
-      
-      /*--- General if statements to print output statements ---*/
-      
-      (ExtIter+1 >= nExtIter) || (StopCalc) ||
-      
-      /*--- Fixed CL problem ---*/
-      
-      ((config_container[ZONE_0]->GetFixed_CL_Mode()) &&
-       (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 == ExtIter)) ||
-      
-      /*--- Steady problems ---*/
-      
-      ((ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (ExtIter != 0) &&
-       ((config_container[ZONE_0]->GetUnsteady_Simulation() == STEADY) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == ROTATIONAL_FRAME))) ||
-      
-      /*--- Unsteady problems ---*/
-      
-      (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
-       ((ExtIter == 0) || (ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-      
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (!fsi) &&
-       ((ExtIter == 0) || ((ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0) ||
-                           ((ExtIter-1) % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-      
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (fsi) &&
-       ((ExtIter == 0) || ((ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-      
-      ((config_container[ZONE_0]->GetDynamic_Analysis() == DYNAMIC) &&
-       ((ExtIter == 0) || (ExtIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-      
-      /*--- No inlet profile file found. Print template. ---*/
-      
-      (config_container[ZONE_0]->GetWrt_InletFile())
-      
-      ) {
-    
-    output_files = true;
-    
-  }
-  
-  /*--- Determine whether a solution doesn't need to be written
-   after the current iteration ---*/
-  
-  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
-    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-    if (config_container[ZONE_0]->GetnExtIter() - 1 == ExtIter) output_files = true;
-  }
-  
-  /*--- write the solution ---*/
-  
-  if (output_files) {
-    
-    /*--- Time the output for performance benchmarking. ---*/
-#ifndef HAVE_MPI
-    StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StopTime = MPI_Wtime();
-#endif
-    UsedTimeCompute += StopTime-StartTime;
-#ifndef HAVE_MPI
-    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StartTime = MPI_Wtime();
-#endif
-    
-    /*--- Add a statement about the type of solver exit. ---*/
-    
-    if (((ExtIter+1 >= nExtIter) || StopCalc) && (rank == MASTER_NODE)) {
-      cout << endl << "----------------------------- Solver Exit -------------------------------";
-      if (StopCalc) cout << endl << "Convergence criteria satisfied." << endl;
-      else cout << endl << "Maximum number of external iterations reached (EXT_ITER)." << endl;
-      cout << "-------------------------------------------------------------------------" << endl;
-    }
-
-    if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
-    
-    
-    /*--- Execute the routine for writing restart, volume solution,
-     surface solution, and surface comma-separated value files. ---*/
-    
-    for (iZone = 0; iZone < nZone; iZone++){
-      for (unsigned short iInst = 0; iInst < nInst[iZone]; iInst++){
-        
-        config_container[iZone]->SetiInst(iInst);
-        
-        output_container[iZone]->Load_Data(geometry_container[iZone][iInst][MESH_0], config_container[iZone], solver_container[iZone][iInst][MESH_0]);
-        
-        /*--- Write restart files ---*/
-        
-        output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat);
-        
-        /*--- Write visualization files ---*/
-        
-        if (Wrt_Vol)
-          output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
-        
-        if (Wrt_Surf)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
-        if (Wrt_CSV)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV);    
-        
-        output_container[iZone]->DeallocateData_Parallel();
-        
-      }
-    }
-    if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
-    
-    /*--- Store output time and restart the timer for the compute phase. ---*/
-#ifndef HAVE_MPI
-    StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StopTime = MPI_Wtime();
-#endif
-    UsedTimeOutput += StopTime-StartTime;
-    OutputCount++;
-    BandwidthSum = config_container[ZONE_0]->GetRestart_Bandwidth_Agg();
-#ifndef HAVE_MPI
-    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StartTime = MPI_Wtime();
-#endif
-    
-  }
-
-  ///*--- Export Surface Solution File for Unsteady Simulations ---*/
-  ///*--- When calculate mean/fluctuation option will be available, delete the following part ---*/
-  //if ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) && (ExtIter % config_container[ZONE_0]->GetWrt_Surf_Freq_DualTime() == 0) && config_container[ZONE_0]->GetWrt_Csv_Sol()) {
-  //    output->SetSurfaceCSV_Flow(config_container[ZONE_0], geometry_container[ZONE_0][INST_0][MESH_0], solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL], ExtIter, ZONE_0, INST_0);}
-
-}
-
-CDriver::~CDriver(void) {}
-
-CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, MPICommunicator, false) { }
-
-CFluidDriver::~CFluidDriver(void) { }
-
 void CFluidDriver::Run() {
 
   unsigned short iZone, jZone, checkConvergence;
@@ -4191,12 +3990,67 @@ void CFluidDriver::DynamicMeshUpdate(unsigned long TimeIter) {
    harmonic_balance = (config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
     /*--- Dynamic mesh update ---*/
     if ((config_container[iZone]->GetGrid_Movement()) && (!harmonic_balance)) {
-      iteration_container[iZone][INST_0]->SetGrid_Movement(geometry_container[iZone][INST_0], surface_movement[iZone], grid_movement[iZone][INST_0], solver_container[iZone][INST_0], config_container[iZone], 0, ExtIter );
+      iteration_container[iZone][INST_0]->SetGrid_Movement(geometry_container[iZone][INST_0], surface_movement[iZone], grid_movement[iZone][INST_0], solver_container[iZone][INST_0], config_container[iZone], 0, TimeIter );
+    }
+  }
+
+}
+bool CFluidDriver::Monitor(unsigned long ExtIter) {
+
+  /*--- Synchronization point after a single solver iteration. Compute the
+   wall clock time required. ---*/
+
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  IterCount++;
+  UsedTime = (StopTime - StartTime) + UsedTimeCompute;
+  
+  
+  /*--- Check if there is any change in the runtime parameters ---*/
+  
+  CConfig *runtime = NULL;
+  strcpy(runtime_file_name, "runtime.dat");
+  runtime = new CConfig(runtime_file_name, config_container[ZONE_0]);
+  runtime->SetTimeIter(ExtIter);
+  delete runtime;
+
+  /*--- Evaluate the new CFL number (adaptive). ---*/
+  if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
+    for (iZone = 0; iZone < nZone; iZone++){
+      if (!(config_container[iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
+        output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
     }
   }
 
+  /*--- Check whether the current simulation has reached the specified
+   convergence criteria, and set StopCalc to true, if so. ---*/
+  
+  switch (config_container[ZONE_0]->GetKind_Solver()) {
+    case EULER: case NAVIER_STOKES: case RANS:
+      StopCalc = integration_container[ZONE_0][INST_0][FLOW_SOL]->GetConvergence(); break;
+    case HEAT_EQUATION_FVM:
+      StopCalc = integration_container[ZONE_0][INST_0][HEAT_SOL]->GetConvergence(); break;
+    case FEM_ELASTICITY:
+      StopCalc = integration_container[ZONE_0][INST_0][FEA_SOL]->GetConvergence(); break;
+    case ADJ_EULER: case ADJ_NAVIER_STOKES: case ADJ_RANS:
+    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
+    case DISC_ADJ_FEM_EULER: case DISC_ADJ_FEM_NS: case DISC_ADJ_FEM_RANS:
+      StopCalc = integration_container[ZONE_0][INST_0][ADJFLOW_SOL]->GetConvergence(); break;
+  }
+  
+  return StopCalc;
+  
+}
+
+
+void CFluidDriver::Output(unsigned long InnerIter) {
+ 
 }
 
+
 CTurbomachineryDriver::CTurbomachineryDriver(char* confFile, unsigned short val_nZone,
                                              SU2_Comm MPICommunicator):
                                              CFluidDriver(confFile, val_nZone, MPICommunicator) {
@@ -4265,15 +4119,7 @@ void CTurbomachineryDriver::Run() {
   if (rank == MASTER_NODE){
     SetTurboPerformance(ZONE_0);
   }
-  
-  /*--- Update the convergence history file (serial and parallel computations). ---*/
-  
 
-  for (iZone = 0; iZone < nZone; iZone++) {
-    for (iInst = 0; iInst < nInst[iZone]; iInst++)
-      output_legacy->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
-                                         config_container, integration_container, false, UsedTime, iZone, iInst);
-  }
   
 }
 
@@ -4458,10 +4304,9 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
 
 CHBDriver::CHBDriver(char* confFile,
     unsigned short val_nZone,
-    SU2_Comm MPICommunicator) : CDriver(confFile,
+    SU2_Comm MPICommunicator) : CFluidDriver(confFile,
         val_nZone,
-        MPICommunicator,
-        false) {
+        MPICommunicator) {
   unsigned short kInst;
 
   nInstHB = nInst[ZONE_0];
@@ -4526,14 +4371,13 @@ void CHBDriver::Run() {
         surface_movement, grid_movement, FFDBox, ZONE_0, iInst);
   
   /*--- Update the convergence history file (serial and parallel computations). ---*/
-  
 
   for (iZone = 0; iZone < nZone; iZone++) {
-    for (iInst = 0; iInst < nInst[iZone]; iInst++)
+    for (iInst = 0; iInst < nInst[iZone]; iInst++)    
       output_legacy->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container,
-                                         config_container, integration_container, false, UsedTime, iZone, iInst);
+          config_container, integration_container, false, UsedTime, iZone, iInst);
   }
-
+  
 }
 
 void CHBDriver::Update() {

From a7c99a29aeb41da576ccb9b860444acd0f76998c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 13 Aug 2019 11:31:38 +0200
Subject: [PATCH 390/539] Adapted monitoring routine for singlezone driver

---
 Common/src/config_structure.cpp           |  4 +--
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp | 39 +++++++++++++----------
 SU2_CFD/src/output/COutput.cpp            | 12 ++++---
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 1c6cdb0cf7cf..14e891f37611 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -234,7 +234,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
   /*--- Update original config file ---*/
 
   if (runtime_file) {
-    config->SetnExtIter(nExtIter);
+    config->SetTimeIter(nTimeIter);
   }
 
 }
@@ -730,7 +730,7 @@ void CConfig::SetRunTime_Options(void) {
   
   /* DESCRIPTION: Number of external iterations */
   
-  addUnsignedLongOption("EXT_ITER", nExtIter, 999999);
+  addUnsignedLongOption("TIME_ITER", nTimeIter, 999999);
 
 }
 
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index be122a12b1c3..6170c40be304 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -299,55 +299,62 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
   
 }
 
-void CSinglezoneDriver::DynamicMeshUpdate(unsigned long ExtIter) {
+void CSinglezoneDriver::DynamicMeshUpdate(unsigned long TimeIter) {
 
   /*--- Dynamic mesh update ---*/
   if (config_container[ZONE_0]->GetGrid_Movement()) {
     iteration_container[ZONE_0][INST_0]->SetGrid_Movement(geometry_container[ZONE_0][INST_0],surface_movement[ZONE_0], 
                                                           grid_movement[ZONE_0][INST_0], solver_container[ZONE_0][INST_0],
-                                                          config_container[ZONE_0], 0, ExtIter);  }
+                                                          config_container[ZONE_0], 0, TimeIter);  }
 
 }
 
-bool CSinglezoneDriver::Monitor(unsigned long ExtIter){
+bool CSinglezoneDriver::Monitor(unsigned long TimeIter){
 
-  unsigned long nInnerIter, InnerIter, TimeIter, nTimeIter;
+  unsigned long nInnerIter, InnerIter, nTimeIter;
   su2double MaxTime, CurTime;
-  bool TimeDomain, InnerConvergence;
+  bool TimeDomain, InnerConvergence, FinalTimeReached, MaxIterationsReached;
   
   nInnerIter = config_container[ZONE_0]->GetnInner_Iter();
   InnerIter  = config_container[ZONE_0]->GetInnerIter();
-  TimeIter   = config_container[ZONE_0]->GetTimeIter();
   nTimeIter  = config_container[ZONE_0]->GetnTime_Iter();
   MaxTime    = config_container[ZONE_0]->GetMax_Time();
-  CurTime    = TimeIter*config_container[ZONE_0]->GetTime_Step();
+  CurTime    = output_container[ZONE_0]->GetHistoryFieldValue("CUR_TIME");
   
   TimeDomain = config_container[ZONE_0]->GetTime_Domain();
   
-  InnerConvergence = output_container[ZONE_0]->GetConvergence();
   
   /*--- Check whether the inner solver has converged --- */
 
   if (TimeDomain == NO){
-    if (((InnerIter+1 >= nInnerIter) || InnerConvergence) && (rank == MASTER_NODE)) {
+    
+    InnerConvergence     = output_container[ZONE_0]->GetConvergence();    
+    MaxIterationsReached = InnerIter+1 >= nInnerIter;
+    
+    if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
       cout << endl << "----------------------------- Solver Exit -------------------------------";
       if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
-      else cout << endl << "Maximum number of iterations reached (ITER)." << endl;
+      else cout << endl << "Maximum number of iterations reached (ITER = " << nInnerIter << " )." << endl;
       cout << "-------------------------------------------------------------------------" << endl;
     }
   }
 
-  /*--- Check whether the outer time integration has reached the final time ---*/
-
-  StopCalc = CurTime >= MaxTime;
 
   if (TimeDomain == YES) {
-    if ((StopCalc || TimeIter+1 >= nTimeIter) && (rank == MASTER_NODE)){
+    
+    /*--- Check whether the outer time integration has reached the final time ---*/
+  
+    FinalTimeReached     = CurTime >= MaxTime;
+    MaxIterationsReached = TimeIter+1 >= nTimeIter;    
+    
+    if ((FinalTimeReached || MaxIterationsReached) && (rank == MASTER_NODE)){
       cout << endl << "----------------------------- Solver Exit -------------------------------";
-      if (StopCalc) cout << endl << "Maximum time reached." << endl;
-      else cout << endl << "Maximum number of time iterations reached (TIME_ITER)." << endl;
+      if (FinalTimeReached) cout << endl << "Maximum time reached (MAX_TIME = " << MaxTime << "s)." << endl;
+      else cout << endl << "Maximum number of time iterations reached (TIME_ITER = " << nTimeIter << ")." << endl;
       cout << "-------------------------------------------------------------------------" << endl;      
     }
+    
+    StopCalc = FinalTimeReached || MaxIterationsReached;
   }
 
   /*--- Reset the inner convergence --- */
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index d85ef9b5c29b..c15352febf20 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1464,9 +1464,9 @@ void COutput::SetCommonHistoryFields(CConfig *config){
   
   /// BEGIN_GROUP: TIME_DOMAIN, DESCRIPTION: Time integration information
   /// Description: The current time
-  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_FIXED, "TIME_DOMAIN", "Current physical time (s)");
+  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_SCIENTIFIC, "TIME_DOMAIN", "Current physical time (s)");
   /// Description: The current time step
-  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_FIXED, "TIME_DOMAIN", "Current time step (s)");
+  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_SCIENTIFIC, "TIME_DOMAIN", "Current time step (s)");
  
   /// DESCRIPTION: Currently used wall-clock time.
   AddHistoryOutput("PHYS_TIME",   "Time(sec)", FORMAT_SCIENTIFIC, "PHYS_TIME", "Average wall-clock time"); 
@@ -1479,8 +1479,12 @@ void COutput::LoadCommonHistoryData(CConfig *config){
   SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
   SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
   
-  SetHistoryOutputValue("CUR_TIME",  curr_TimeIter*config->GetTime_Step());
-  SetHistoryOutputValue("TIME_STEP", config->GetTime_Step());
+  if (config->GetTime_Domain()){
+    SetHistoryOutputValue("TIME_STEP", config->GetDelta_UnstTimeND()*config->GetTime_Ref());           
+    if (curr_InnerIter == 0){
+      SetHistoryOutputValue("CUR_TIME",  GetHistoryFieldValue("CUR_TIME") + GetHistoryFieldValue("TIME_STEP"));      
+    }
+  }
   
   su2double StopTime, UsedTime;
 #ifndef HAVE_MPI

From 610b61c9a5dd0c748b795e4b112f4327aef90f36 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 13 Aug 2019 11:32:10 +0200
Subject: [PATCH 391/539] removed old convergence monitoring routines

---
 SU2_CFD/include/integration_structure.hpp |  41 ---
 SU2_CFD/src/drivers/CDriver.cpp           |   2 +-
 SU2_CFD/src/integration_structure.cpp     | 403 ----------------------
 3 files changed, 1 insertion(+), 445 deletions(-)

diff --git a/SU2_CFD/include/integration_structure.hpp b/SU2_CFD/include/integration_structure.hpp
index 811deedcfe9b..a6a72ea496ac 100644
--- a/SU2_CFD/include/integration_structure.hpp
+++ b/SU2_CFD/include/integration_structure.hpp
@@ -143,16 +143,6 @@ class CIntegration {
   void Adjoint_Setup(CGeometry ****geometry, CSolver *****solver_container, CConfig **config,
                      unsigned short RunTime_EqSystem, unsigned long Iteration, unsigned short iZone);
 
-  /*! 
-   * \brief Do the convergence analysis to determine if the code must stop the execution.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] Iteration - Current iteration.
-   * \param[in] monitor - Objective function that is use to study its convergence.
-   */
-  void Convergence_Monitoring(CGeometry *geometry, CConfig *config, 
-                unsigned long Iteration, su2double monitor, unsigned short iMesh);
-  
   /*! 
    * \brief Average the scalar output in case there is a unsteady solution.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -164,37 +154,6 @@ class CIntegration {
   void Average_Monitoring(CGeometry *geometry, CConfig *config,
                 unsigned long Iteration, su2double monitor, unsigned short iMesh);
 
-  /*!
-   * \brief Do the convergence analysis to determine if the structural FEM analysis has converged.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] solver - Solution of the problem
-   * \param[in] Iteration - Current iteration.
-   * \param[in] monitor - Objective function that is use to study its convergence.
-   */
-  void Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver);
-
-  /*!
-   * \brief Do the convergence analysis to determine if the adjoint FEM analysis has converged.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] solver - Solution of the problem
-   * \param[in] Iteration - Current iteration.
-   * \param[in] monitor - Objective function that is use to study its convergence.
-   */
-  void Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver);
-
-
-  /*!
-   * \brief Do the convergence analysis to determine if the FSI problem has converged on the structural side.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] Iteration - Current iteration.
-   * \param[in] monitor - Objective function that is use to study its convergence.
-   */
-  void Convergence_Monitoring_FSI(CGeometry *fea_geometry, CConfig *fea_config, CSolver *fea_solver);
-
-
   /*!
    * \brief Get the value of the convergence.
    * \return Level of convergence of the solution.
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index a87f33f7dc10..71edb0414ea3 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -5262,7 +5262,7 @@ bool CFSIDriver::BGSConvergence(unsigned long IntIter, unsigned short ZONE_FLOW,
 
   }
 
-  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[ZONE_STRUCT][INST_0][MESH_0], config_container[ZONE_STRUCT], solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]);
+//  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[ZONE_STRUCT][INST_0][MESH_0], config_container[ZONE_STRUCT], solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]);
 
   Convergence = integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->GetConvergence_FSI();
 
diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp
index d432b927a271..319dbdcb1b4a 100644
--- a/SU2_CFD/src/integration_structure.cpp
+++ b/SU2_CFD/src/integration_structure.cpp
@@ -454,132 +454,6 @@ void CIntegration::Time_Integration_FEM(CGeometry *geometry, CSolver **solver_co
 
 }
 
-void CIntegration::Convergence_Monitoring(CGeometry *geometry, CConfig *config, unsigned long Iteration,
-                                          su2double monitor, unsigned short iMesh) {
-  
-  unsigned short iCounter;
-
-  /*--- Initialize some variables for controlling the output frequency. ---*/
-  
-  bool DualTime_Iteration = false;
-  unsigned long iIntIter = config->GetIntIter();
-  unsigned long iExtIter = config->GetExtIter();
-  bool Unsteady = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                   (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config->GetWrt_Con_Freq() == 0));
-  bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config->GetWrt_Con_Freq_DualTime() == 0));
-  bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-  bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config->GetWrt_Con_Freq() == 0));
-  bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config->GetWrt_Con_Freq() == 0));
-  
-  if ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3)) {
-    
-    bool Already_Converged = Convergence;
-    
-    /*--- Cauchy based convergence criteria ---*/
-    
-    if (config->GetConvCriteria() == CAUCHY) {
-      
-      /*--- Initialize at the fist iteration ---*/
-      
-      if (Iteration  == 0) {
-        Cauchy_Value = 0.0;
-        Cauchy_Counter = 0;
-        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-          Cauchy_Serie[iCounter] = 0.0;
-      }
-      
-      Old_Func = New_Func;
-      New_Func = monitor;
-      Cauchy_Func = fabs(New_Func - Old_Func);
-      
-      Cauchy_Serie[Cauchy_Counter] = Cauchy_Func;
-      Cauchy_Counter++;
-      
-      if (Cauchy_Counter == config->GetCauchy_Elems()) Cauchy_Counter = 0;
-      
-      Cauchy_Value = 1;
-      if (Iteration  >= config->GetCauchy_Elems()) {
-        Cauchy_Value = 0;
-        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-          Cauchy_Value += Cauchy_Serie[iCounter];
-      }
-      
-      if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
-      else { Convergence = true; Convergence_FullMG = true; }
-      
-    }
-    
-    /*--- Residual based convergence criteria ---*/
-    
-    if (config->GetConvCriteria() == RESIDUAL) {
-      
-      /*--- Compute the initial value ---*/
-      
-      if (Iteration == config->GetStartConv_Iter() ) InitResidual = monitor;
-      if (monitor > InitResidual) InitResidual = monitor;
-      
-      /*--- Check the convergence ---*/
-      
-      if (((fabs(InitResidual - monitor) >= config->GetOrderMagResidual()) && (monitor < InitResidual))  ||
-          (monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
-      else { Convergence = false; Convergence_FullMG = false; }
-      
-    }
-    
-    /*--- Do not apply any convergence criteria of the number
-     of iterations is less than a particular value ---*/
-    
-    if (Iteration < config->GetStartConv_Iter()) {
-      Convergence = false;
-      Convergence_FullMG = false;
-    }
-    
-    if (Already_Converged) { Convergence = true; Convergence_FullMG = true; }
-    
-    
-    /*--- Apply the same convergence criteria to all the processors ---*/
-    
-#ifdef HAVE_MPI
-    
-    unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-    sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-    rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-    
-    /*--- Convergence criteria ---*/
-    
-    sbuf_conv[0] = Convergence;
-    SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-    
-    /*-- Compute global convergence criteria in the master node --*/
-    
-    sbuf_conv[0] = 0;
-    if (rank == MASTER_NODE) {
-      if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-      else sbuf_conv[0] = 0;
-    }
-    
-    SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-    
-    if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
-    else { Convergence = false; Convergence_FullMG = false; }
-    
-    delete [] sbuf_conv;
-    delete [] rbuf_conv;
-    
-#endif
-    
-    /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
-    
-    if (monitor != monitor) {
-      SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
-    }
-    
-    if (config->GetFinestMesh() != MESH_0 ) Convergence = false;
-    
-  }
-  
-}
 
 void CIntegration::SetDualTime_Solver(CGeometry *geometry, CSolver *solver, CConfig *config, unsigned short iMesh) {
   unsigned long iPoint;
@@ -738,280 +612,3 @@ void CIntegration::SetFEM_StructuralSolver(CGeometry *geometry, CSolver **solver
   }
   
 }
-
-void CIntegration::Convergence_Monitoring_FEM(CGeometry *geometry, CConfig *config, CSolver *solver) {
-  
-  su2double Reference_UTOL, Reference_RTOL, Reference_ETOL;
-  su2double Residual_UTOL, Residual_RTOL, Residual_ETOL;
-  
-  bool Already_Converged = Convergence;
-  
-  Reference_UTOL = config->GetResidual_FEM_UTOL();
-  Reference_RTOL = config->GetResidual_FEM_RTOL();
-  Reference_ETOL = config->GetResidual_FEM_ETOL();
-  
-  Residual_UTOL = log10(solver->GetRes_FEM(0));
-  Residual_RTOL = log10(solver->GetRes_FEM(1));
-  Residual_ETOL = log10(solver->GetRes_FEM(2));
-  
-  //  cout << "Reference - UTOL: " << Reference_UTOL << " ETOL: " << Reference_ETOL << " RTOL: " << Reference_RTOL << endl;
-  //  cout << "Residual - UTOL: " << Residual_UTOL << " ETOL: " << Residual_ETOL << " RTOL: " << Residual_RTOL << endl;
-  
-  if ((Residual_UTOL <= Reference_UTOL) &&
-      (Residual_ETOL <= Reference_ETOL) &&
-      (Residual_RTOL <= Reference_RTOL)) {
-    Convergence = true;
-  }
-  
-  if (Already_Converged) Convergence = true;
-  
-  
-  /*--- Apply the same convergence criteria to all the processors ---*/
-  
-#ifdef HAVE_MPI
-  
-  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-  
-  /*--- Convergence criteria ---*/
-  
-  sbuf_conv[0] = Convergence;
-  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*-- Compute global convergence criteria in the master node --*/
-  
-  sbuf_conv[0] = 0;
-  if (rank == MASTER_NODE) {
-    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-    else sbuf_conv[0] = 0;
-  }
-  
-  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-  
-  if (sbuf_conv[0] == 1) { Convergence = true; }
-  else { Convergence = false; }
-  
-  delete [] sbuf_conv;
-  delete [] rbuf_conv;
-  
-#endif
-  
-}
-
-void CIntegration::Convergence_Monitoring_FEM_Adj(CGeometry *geometry, CConfig *config, CSolver *solver) {
-
-  su2double val_I, Max_Val_I;
-
-  bool Already_Converged = Convergence;
-
-  Max_Val_I = config->GetCriteria_FEM_ADJ();
-  val_I     = log10(solver->Get_val_I());
-
-  //  cout << "Reference - UTOL: " << Reference_UTOL << " ETOL: " << Reference_ETOL << " RTOL: " << Reference_RTOL << endl;
-  //  cout << "Residual - UTOL: " << Residual_UTOL << " ETOL: " << Residual_ETOL << " RTOL: " << Residual_RTOL << endl;
-
-  if (val_I <= Max_Val_I){
-    Convergence = true;
-  }
-
-  if (Already_Converged) Convergence = true;
-
-
-  /*--- Apply the same convergence criteria to all the processors ---*/
-
-#ifdef HAVE_MPI
-
-  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-
-  /*--- Convergence criteria ---*/
-
-  sbuf_conv[0] = Convergence;
-  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-
-  /*-- Compute global convergence criteria in the master node --*/
-
-  sbuf_conv[0] = 0;
-  if (rank == MASTER_NODE) {
-    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-    else sbuf_conv[0] = 0;
-  }
-
-  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-
-  if (sbuf_conv[0] == 1) { Convergence = true; }
-  else { Convergence = false; }
-
-  delete [] sbuf_conv;
-  delete [] rbuf_conv;
-
-#endif
-
-}
-
-
-void CIntegration::Convergence_Monitoring_FSI(CGeometry *fea_geometry, CConfig *fea_config, CSolver *fea_solver, unsigned long iOuterIter) {
-  
-  su2double FEA_check[2] = {0.0, 0.0};
-  su2double magResidualFSI = 0.0, logResidualFSI_initial = 0.0, logResidualFSI = 0.0;
-  su2double magResidualFSI_criteria, logResidualFSI_criteria;
-  
-  unsigned long iExtIter = fea_config->GetExtIter();
-  
-  unsigned long iPoint, iDim;
-  unsigned long nPointDomain, nDim;
-  su2double *dispPred, *dispPred_Old;
-  su2double deltaU, deltaURad, deltaURes, deltaURes_recv = 0.0;
-  
-  magResidualFSI_criteria = -1*fea_config->GetOrderMagResidualFSI();
-  logResidualFSI_criteria = fea_config->GetMinLogResidualFSI();
-  
-  deltaURes = 0.0;
-  
-  /*--- Only when there is movement it makes sense to check convergence (otherwise, it is always converged...) ---*/
-  /*--- The same with the first iteration, if we are doing strongly coupled we need at least two. ---*/
-  
-  if (iOuterIter == 0) {
-    /*--- Set the convergence values to 0.0 --*/
-    fea_solver->SetFSI_ConvValue(0,0.0);
-    fea_solver->SetFSI_ConvValue(1,0.0);
-    
-  }
-  else if (iOuterIter > 0) {
-    
-    // We loop only over the points that belong to the processor
-    nPointDomain = fea_geometry->GetnPointDomain();
-    nDim = fea_geometry->GetnDim();
-    
-    for (iPoint=0; iPoint < nPointDomain; iPoint++) {
-      
-      deltaURad = 0.0;
-      
-      dispPred = fea_solver->node[iPoint]->GetSolution_Pred();
-      dispPred_Old = fea_solver->node[iPoint]->GetSolution_Pred_Old();
-      
-      for (iDim = 0; iDim < nDim; iDim++) {
-        
-        /*--- Compute the deltaU, and add deltaU2 to deltaURad ---*/
-        deltaU = dispPred[iDim] - dispPred_Old[iDim];
-        deltaURad += deltaU * deltaU;
-        
-      }
-      
-      /*--- The residual is the maximum of the values of sqrt(deltaURad) computed ---*/
-      deltaURad = sqrt(deltaURad);
-      deltaURes = max(deltaURes, deltaURad);
-      
-    }
-    
-    // We need to communicate the maximum residual throughout the different processors
-    
-#ifdef HAVE_MPI
-    /*--- We sum the squares of the norms across the different processors ---*/
-    SU2_MPI::Allreduce(&deltaURes, &deltaURes_recv, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
-#else
-    deltaURes_recv         = deltaURes;
-#endif
-
-    /*--- Store the FSI residual ---*/
-    fea_solver->SetFSI_Residual(deltaURes_recv);
-
-    if (iOuterIter == 1) {
-      fea_solver->SetFSI_ConvValue(0,deltaURes_recv);
-      logResidualFSI_initial = log10(deltaURes_recv);
-      
-      if (logResidualFSI_initial < logResidualFSI_criteria) Convergence_FSI = true;
-
-    }
-    else {
-      fea_solver->SetFSI_ConvValue(1,deltaURes_recv);
-      FEA_check[0] = fea_solver->GetFSI_ConvValue(0);
-      logResidualFSI_initial = log10(FEA_check[0]);
-      logResidualFSI = log10(deltaURes_recv);
-      
-      magResidualFSI=logResidualFSI-logResidualFSI_initial;
-      
-      if ((logResidualFSI < logResidualFSI_criteria) || (magResidualFSI < magResidualFSI_criteria)) Convergence_FSI = true;
-    }
-
-  }
-    
-  /*--- Apply the same convergence criteria to all the processors ---*/
-  
-#ifdef HAVE_MPI
-  
-  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-  
-  /*--- Convergence criteria ---*/
-  
-  sbuf_conv[0] = Convergence_FSI;
-  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-  
-  /*-- Compute global convergence criteria in the master node --*/
-  
-  sbuf_conv[0] = 0;
-  if (rank == MASTER_NODE) {
-    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-    else sbuf_conv[0] = 0;
-  }
-  
-  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-  
-  if (sbuf_conv[0] == 1) { Convergence_FSI = true; }
-  else { Convergence_FSI = false; }
-  
-  delete [] sbuf_conv;
-  delete [] rbuf_conv;
-  
-#endif
-  
-  if (rank == MASTER_NODE) {
-    
-    su2double WAitken;
-    unsigned short RelaxMethod_FSI = fea_config->GetRelaxation_Method_FSI();
-    
-    if (RelaxMethod_FSI == NO_RELAXATION) {
-      WAitken = 1.0;
-    }
-    else if (RelaxMethod_FSI == FIXED_PARAMETER) {
-      WAitken = fea_config->GetAitkenStatRelax();
-    }
-    else if (RelaxMethod_FSI == AITKEN_DYNAMIC) {
-      WAitken = fea_solver->GetWAitken_Dyn();
-    }
-    else {
-      WAitken = 1.0;
-      cout << "No relaxation parameter used. " << endl;
-    }
-    
-    /*--- Store the Relaxation coefficient residual ---*/
-    fea_solver->SetRelaxCoeff(WAitken);
-
-    cout.precision(6);
-    if (iOuterIter == 0) cout << endl <<"BGS_Iter" << "        ExtIter" << "     Relaxation" <<  endl;
-    else if (iOuterIter == 1) cout << endl <<"BGS_Iter" << "        ExtIter" << "     Relaxation" << "      Res[ATOL]"  <<  endl;
-    else cout << endl <<"BGS_Iter" << "        ExtIter" << "     Relaxation" << "      Res[ATOL]"  << "      Res[OMAG]"<<  endl;
-      
-    cout.width(8); cout << iOuterIter;
-    cout.width(15); cout << iExtIter;
-    cout.width(15); cout << WAitken;
-    cout.width(15);
-    if (iOuterIter == 0) cout << " ";
-    else if (iOuterIter == 1) cout << logResidualFSI_initial;
-    else cout << logResidualFSI;
-    cout.width(15);
-    if (iOuterIter < 2) cout << " ";
-    else cout << magResidualFSI;
-    cout.setf(ios::fixed, ios::floatfield);
-    cout << endl;
-    cout << endl << "Simulation time: " << fea_config->GetCurrent_DynTime() << ". Time step: " << fea_config->GetDelta_DynTime() << ".";
-    cout << endl;
-    cout << endl << "------------------------------------------------------------------------- ";
-    cout << endl;
-  }
-  
-}

From d2278eb282bce71e2b96d0d82f2b8f7d53d637ec Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 13 Aug 2019 11:33:30 +0200
Subject: [PATCH 392/539] Removed unnecessary calls in multigrid iteration

---
 SU2_CFD/src/integration_time.cpp | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index 7bf1bf9740b7..6b0616f81211 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -46,17 +46,12 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry,
                                                 CNumerics ******numerics_container,
                                                 CConfig **config,
                                                 unsigned short RunTime_EqSystem,
-                                                unsigned long Iteration,
                                                 unsigned short iZone,
                                                 unsigned short iInst) {
-  unsigned short FinestMesh, iMGLevel = 0;
+  unsigned short FinestMesh;
   su2double monitor = 1.0;
   bool FullMG = false;
   
-  const bool restart = (config[iZone]->GetRestart() || config[iZone]->GetRestart_Flow());
-  const bool startup_multigrid = ((config[iZone]->GetRestart_Flow())     &&
-                                  (RunTime_EqSystem == RUNTIME_FLOW_SYS) &&
-                                  (Iteration == 0));
   const bool direct = ((config[iZone]->GetKind_Solver() == EULER)                         ||
                        (config[iZone]->GetKind_Solver() == NAVIER_STOKES)                 ||
                        (config[iZone]->GetKind_Solver() == RANS)                          ||
@@ -76,24 +71,6 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry,
     RecursiveParam = V_CYCLE;
     FullMG = true;
   }
-  
-  /*--- If restart, update multigrid levels at the first multigrid iteration ---*/
-	/*-- Since the restart takes care of this I dont think is required, but we should check after the new restart routines are added ---*/
-  
-  if ((restart && (Iteration == config[iZone]->GetnStartUpIter())) || startup_multigrid)
-  {
-    for (iMGLevel = 0; iMGLevel < config[iZone]->GetnMGLevels(); iMGLevel++) {
-      
-      SetRestricted_Solution(RunTime_EqSystem, solver_container[iZone][iInst][iMGLevel][SolContainer_Position],
-                             solver_container[iZone][iInst][iMGLevel+1][SolContainer_Position],
-                             geometry[iZone][iInst][iMGLevel], geometry[iZone][iInst][iMGLevel+1], config[iZone]);
-      
-      SetRestricted_Solution(RUNTIME_TURB_SYS, solver_container[iZone][iInst][iMGLevel][SolContainer_Position], solver_container[iZone][iInst][iMGLevel+1][SolContainer_Position], geometry[iZone][iInst][iMGLevel], geometry[iZone][iInst][iMGLevel+1], config[iZone]);
-      
-      SetRestricted_EddyVisc(RUNTIME_TURB_SYS, solver_container[iZone][iInst][iMGLevel][SolContainer_Position], solver_container[iZone][iInst][iMGLevel+1][SolContainer_Position], geometry[iZone][iInst][iMGLevel], geometry[iZone][iInst][iMGLevel+1], config[iZone]);
-      
-    }
-  }
 	
   /*--- Full multigrid strategy and start up with fine grid only works with the direct problem ---*/
 
@@ -959,13 +936,6 @@ void CStructuralIntegration::Structural_Iteration(CGeometry ****geometry, CSolve
   solver_container[iZone][iInst][MESH_0][SolContainer_Position]->Postprocessing(geometry[iZone][iInst][MESH_0], solver_container[iZone][iInst][MESH_0],
       config[iZone], numerics_container[iZone][iInst][MESH_0][SolContainer_Position],  MESH_0);
 
-  /*--- Convergence strategy ---*/
-
-  switch (RunTime_EqSystem) {
-    case RUNTIME_FEA_SYS: Convergence_Monitoring_FEM(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position]); break;
-    case RUNTIME_ADJFEA_SYS: Convergence_Monitoring_FEM_Adj(geometry[iZone][iInst][MESH_0], config[iZone], solver_container[iZone][iInst][MESH_0][SolContainer_Position]); break;
-  }
-
 }
 
 CFEM_DG_Integration::CFEM_DG_Integration(CConfig *config) : CIntegration(config) { }

From b5aa9b2efb676ad65362a0fbc26d1c9bf189151f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 13 Aug 2019 11:34:00 +0200
Subject: [PATCH 393/539] Added calls to set the time step

---
 SU2_CFD/src/solver_direct_mean.cpp     | 2 ++
 SU2_CFD/src/solver_direct_mean_fem.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 7d670dd383cf..ab032714f8db 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -15362,6 +15362,8 @@ void CNSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container, CC
 #endif
     for (iPoint = 0; iPoint < nPointDomain; iPoint++)
       node[iPoint]->SetDelta_Time(Global_Delta_Time);
+    
+    config->SetDelta_UnstTimeND(Global_Delta_Time);
   }
   
   /*--- Recompute the unsteady time step for the dual time strategy
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index 844b793b2593..28ab0d0559a5 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -3744,6 +3744,8 @@ void CFEM_DG_EulerSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_con
     if (time_stepping) {
       for(unsigned long l=0; l<nVolElemOwned; ++l)
         VecDeltaTime[l] = Min_Delta_Time/volElem[l].factTimeLevel;
+      
+      config->SetDelta_UnstTimeND(Min_Delta_Time);
     }
   }
 }
@@ -10811,6 +10813,8 @@ void CFEM_DG_NSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_contai
     if (time_stepping) {
       for(unsigned long l=0; l<nVolElemOwned; ++l)
         VecDeltaTime[l] = Min_Delta_Time/volElem[l].factTimeLevel;
+      
+      config->SetDelta_UnstTimeND(Min_Delta_Time);
     }
   }
 }

From 19fde94cf1afb522e9a4a5175e76302d70ff1b7a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 13 Aug 2019 11:34:18 +0200
Subject: [PATCH 394/539] Small fixes

---
 SU2_CFD/src/output/COutput.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index c15352febf20..851dd1963c10 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1235,14 +1235,6 @@ void COutput::CheckOffsetCache(){
     if (it != Offset_Cache_Copy.end() ){
       SU2_MPI::Error("Offset cache contains duplicate entries.", CURRENT_FUNCTION);
     }
-    
-    /*--- Check if the size of the offset cache matches the size of the volume output list. 
-       * If that is not the case, then probably SetVolumeOutputValue() was not called for all fields declared with
-       * AddVolumeOutput(). ---*/
-    
-    if (VolumeOutput_List.size() != Offset_Cache.size()){
-      SU2_MPI::Error("Offset cache size and volume output size do not match.", CURRENT_FUNCTION);
-    }
   }
   Offset_Cache_Checked = true;
   
@@ -1329,8 +1321,6 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  
-
-  bool write_header = false;
   
   unsigned long RestartIter = 0;
   

From b8bba73c428d06df3839eb0ada1b01ea87fcab98 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 14 Aug 2019 16:35:29 +0200
Subject: [PATCH 395/539] Fixed monitoring for disc adj.

---
 SU2_CFD/include/drivers/CSinglezoneDriver.hpp |  2 +-
 .../src/drivers/CDiscAdjSinglezoneDriver.cpp  | 14 +--------
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     |  4 ++-
 SU2_CFD/src/integration_time.cpp              |  2 +-
 SU2_CFD/src/iteration_structure.cpp           | 30 ++++++++-----------
 TestCases/parallel_regression.py              |  2 +-
 6 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
index bd8ec3d68645..1fbddc141bcc 100644
--- a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
+++ b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
@@ -106,6 +106,6 @@ class CSinglezoneDriver : public CDriver {
    * \brief Monitor
    * \param ExtIter
    */
-  bool Monitor(unsigned long TimeIter);
+  virtual bool Monitor(unsigned long TimeIter);
 
 };
diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
index 7e6ef2163189..f96bc2c696ee 100644
--- a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -191,15 +191,7 @@ void CDiscAdjSinglezoneDriver::Run() {
     /*--- Clear the stored adjoint information to be ready for a new evaluation. ---*/
 
     AD::ClearAdjoints();
-
-    if (config->GetTime_Domain())
-      output_container[ZONE_0]->SetHistory_Output(geometry_container[ZONE_0][INST_0][MESH_0], 
-                                        solver_container[ZONE_0][INST_0][MESH_0], 
-                                        config_container[ZONE_0], 
-                                        config_container[ZONE_0]->GetTimeIter(),
-                                        config_container[ZONE_0]->GetOuterIter(),
-                                        config_container[ZONE_0]->GetInnerIter());
-
+    
     if (StopCalc) break;
 
   }
@@ -406,10 +398,6 @@ void CDiscAdjSinglezoneDriver::DirectRun(unsigned short kind_recording){
 
   direct_iteration->Preprocess(output_container[ZONE_0], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
-  /*--- Run one single iteration ---*/
-
-  config->SetInnerIter(1);
-
   /*--- Iterate the direct solver ---*/
 
   direct_iteration->Iterate(output_container[ZONE_0], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 5f970eff3cdc..fed37a856d8d 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -333,13 +333,15 @@ bool CSinglezoneDriver::Monitor(unsigned long TimeIter){
     
     InnerConvergence     = output_container[ZONE_0]->GetConvergence();    
     MaxIterationsReached = InnerIter+1 >= nInnerIter;
-    
+        
     if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
       cout << endl << "----------------------------- Solver Exit -------------------------------";
       if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
       else cout << endl << "Maximum number of iterations reached (ITER = " << nInnerIter << " )." << endl;
       cout << "-------------------------------------------------------------------------" << endl;
     }
+    
+    StopCalc = MaxIterationsReached || InnerConvergence;
   }
 
 
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index 6b0616f81211..9cf3fd759409 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -151,7 +151,7 @@ void CMultiGridIntegration::MultiGrid_Cycle(CGeometry ****geometry,
         
         /*--- Restrict the solution and gradient for the adjoint problem ---*/
         
-        Adjoint_Setup(geometry, solver_container, config, RunTime_EqSystem, config[iZone]->GetTime_Step(), iZone);
+        Adjoint_Setup(geometry, solver_container, config, RunTime_EqSystem, config[iZone]->GetTimeIter(), iZone);
         
       }
       
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index ebbb24bbee60..57e4ca41ea10 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1475,12 +1475,13 @@ void CFEAIteration::Iterate(COutput *output,
         
         /*--- Limits to only one structural iteration for the discrete adjoint FEM problem ---*/
         if (disc_adj_fem) break;
-
-        StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
-
+        
         integration[val_iZone][val_iInst][FEA_SOL]->Structural_Iteration(geometry, solver, numerics,
             config, RUNTIME_FEA_SYS, val_iZone, val_iInst);
 
+        StopCalc = Monitor(output, integration, geometry,  solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, INST_0);
+        
+
         if (StopCalc) break;
 
       }
@@ -2571,22 +2572,17 @@ bool CDiscAdjFluidIteration::Monitor(COutput *output,
 #endif
   UsedTime = StopTime - StartTime;
 
-  /*--- If convergence was reached --*/
-  StopCalc = integration[val_iZone][INST_0][ADJFLOW_SOL]->GetConvergence();
-
   /*--- Write the convergence history for the fluid (only screen output) ---*/
 
-  /*--- The logic is right now case dependent ----*/
-  /*--- This needs to be generalized when the new output structure comes ---*/
-  output_history = (steady && !(multizone && (config[val_iZone]->GetnInner_Iter()==1)));
-
-  if (output_history) output->SetHistory_Output(geometry[ZONE_0][INST_0][MESH_0], 
-                                                solver[ZONE_0][INST_0][MESH_0], 
-                                                config[ZONE_0], 
-                                                config[ZONE_0]->GetTimeIter(),
-                                                config[ZONE_0]->GetOuterIter(), 
-                                                config[ZONE_0]->GetInnerIter());
-
+  output->SetHistory_Output(geometry[ZONE_0][INST_0][MESH_0], 
+                            solver[ZONE_0][INST_0][MESH_0], 
+                            config[ZONE_0], 
+                            config[ZONE_0]->GetTimeIter(),
+                            config[ZONE_0]->GetOuterIter(), 
+                            config[ZONE_0]->GetInnerIter());
+  
+  StopCalc = output->GetConvergence();
+  
   return StopCalc;
 
 }
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 5eb0bac5ff2c..2d3b6be25004 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -992,7 +992,7 @@ def main():
     dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
     dynbeam2d.cfg_file  = "configBeam_2d.cfg"
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [6.000000, 1.000000, 0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
+    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "parallel_computation_fsi.py -f"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001

From 63a65f113f692ecba9e7bbd8dea7b0ed36519eeb Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 14 Aug 2019 16:36:22 +0200
Subject: [PATCH 396/539] Fixed SU2_SOL

---
 SU2_CFD/src/output/COutput.cpp |  4 +--
 SU2_SOL/src/SU2_SOL.cpp        | 55 +++++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 580b5d77b4d4..d63f2e56ffb6 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -452,7 +452,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing Tecplot binary file solution file." << endl;
     }
     
-    filewriter = new CTecplotBinaryFileWriter(Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
+    filewriter = new CTecplotBinaryFileWriter(Variable_Names, nDim, curr_TimeIter, GetHistoryFieldValue("TIME_STEP"));
       
     break;
     
@@ -468,7 +468,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing Tecplot ASCII file solution file." << endl;
     }
     
-    filewriter = new CTecplotFileWriter(Variable_Names, nDim, curr_TimeIter, config->GetTime_Step());
+    filewriter = new CTecplotFileWriter(Variable_Names, nDim, curr_TimeIter, GetHistoryFieldValue("TIME_STEP"));
 
     break;
     
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 8790b94640c7..24a8f537625c 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -290,6 +290,7 @@ int main(int argc, char *argv[]) {
         
         output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
         output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+        output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
         
       }
 
@@ -305,6 +306,7 @@ int main(int argc, char *argv[]) {
             (StopCalc) || // We have surpassed the requested time
             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)) // The iteration has been requested
           ){
+          if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << ", t = " << Physical_t << " s ." << endl;
 
           /*--- Load the restart for all the zones. ---*/
           for (iZone = 0; iZone < nZone; iZone++){
@@ -313,13 +315,16 @@ int main(int argc, char *argv[]) {
             config_container[iZone]->SetTimeIter(TimeIter);
             /*--- So far, only enabled for single-instance problems ---*/
             config_container[iZone]->SetiInst(INST_0);
-            solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+            solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], TimeIter, true);
           }
 
-          if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << ", t = " << Physical_t << " s ." << endl;
           
           for (iZone = 0; iZone < nZone; iZone++){
             
+            /*--- Load history data (volume output might require some values) --- */
+            
+            output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+            
             /*--- Load the data --- */
             
             output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
@@ -346,13 +351,18 @@ int main(int argc, char *argv[]) {
         config_container[iZone]->SetiInst(INST_0);
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
-        solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+        solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], 0, true);
         output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
         output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+        output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
       
       }
       for (iZone = 0; iZone < nZone; iZone++){
         
+        /*--- Load history data (volume output might require some values) --- */
+        
+        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
+        
         /*--- Load the data --- */
         
         output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
@@ -436,10 +446,11 @@ int main(int argc, char *argv[]) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
           output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
           output[ZONE_0]->PreprocessVolumeOutput(config_container[ZONE_0]);
+          output[ZONE_0]->PreprocessHistoryOutput(config_container[ZONE_0], false);
          
           SolutionInstantiatedFlow = true;
         }
-          solver_container[ZONE_0][INST_0]->LoadRestart_FSI(geometry_container[ZONE_0][INST_0], config_container[ZONE_0], SU2_TYPE::Int(MESH_0));
+          solver_container[ZONE_0][INST_0]->LoadRestart_FSI(geometry_container[ZONE_0][INST_0], config_container[ZONE_0], TimeIter);
 
 
         /*--- For the structural zone (ZONE_1) ---*/
@@ -454,11 +465,15 @@ int main(int argc, char *argv[]) {
           output[ZONE_1]->PreprocessVolumeOutput(config_container[ZONE_1]);
           SolutionInstantiatedFEM = true;
         }
-          solver_container[ZONE_1][INST_0]->LoadRestart_FSI(geometry_container[ZONE_1][INST_0], config_container[ZONE_1], SU2_TYPE::Int(MESH_0));
+          solver_container[ZONE_1][INST_0]->LoadRestart_FSI(geometry_container[ZONE_1][INST_0], config_container[ZONE_1], TimeIter);
 
         if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
         for (iZone = 0; iZone < nZone; iZone++){
           
+          /*--- Load history data (volume output might require some values) --- */
+          
+          output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+          
           /*--- Load the data --- */
           
           output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
@@ -549,7 +564,7 @@ int main(int argc, char *argv[]) {
       /*--- Definition of the solution class ---*/
 
       solver_container[iZone][INST_0] = new CBaselineSolver_FEM(geometry_container[iZone][INST_0], config_container[iZone]);
-      solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+      solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone], config_container[iZone], 0, true);
     }
 
 //    output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, 0, nZone);
@@ -608,17 +623,22 @@ int main(int argc, char *argv[]) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
                   output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+                  output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
                   
                   SolutionInstantiated[iZone] = true;
                 }
                   config_container[iZone]->SetiInst(INST_0);
-                  solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+                  solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], TimeIter, true);
               }
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
                 
+                /*--- Load history data (volume output might require some values) --- */
+                
+                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+                
                 /*--- Load the data --- */
                 
                 output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
@@ -648,18 +668,23 @@ int main(int argc, char *argv[]) {
         for (iInst = 0; iInst < nInst[iZone]; iInst++){
 
           config_container[iZone]->SetiInst(iInst);
+          config_container[iZone]->SetTimeIter(iInst);
 
           /*--- Either instantiate the solution class or load a restart file. ---*/
           solver_container[iZone][iInst] = new CBaselineSolver(geometry_container[iZone][iInst], config_container[iZone]);
-          solver_container[iZone][iInst]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+          solver_container[iZone][iInst]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], iInst, true);
           output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][iInst]->GetnDim(), solver_container[iZone][iInst]);          
           output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+          output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
 
           /*--- Print progress in solution writing to the screen. ---*/
           if (rank == MASTER_NODE) {
             cout << "Storing the volume solution for time instance " << iInst << "." << endl;
           }
 
+          /*--- Load history data (volume output might require some values) --- */
+          
+          output[iZone]->SetHistory_Output(geometry_container[iZone][iInst], &solver_container[iZone][iInst], config_container[iZone], iInst, 0, 0);
             
           /*--- Load the data --- */
           
@@ -727,17 +752,22 @@ int main(int argc, char *argv[]) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
                   output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+                  output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
                   
                   SolutionInstantiated = true;
                 }
                 config_container[iZone]->SetiInst(INST_0);
-                solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+                solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], TimeIter, true);
               }
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
+
+                /*--- Load history data (volume output might require some values) --- */
                 
+                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+                                
                 /*--- Load the data --- */
                 
                 output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
@@ -767,13 +797,18 @@ int main(int argc, char *argv[]) {
         config_container[iZone]->SetiInst(INST_0);
         /*--- Definition of the solution class ---*/
         solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
-        solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], SU2_TYPE::Int(MESH_0), true);
+        solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], 0, true);
         output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
         output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+        output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
         
       }
       
       for (iZone = 0; iZone < nZone; iZone++){
+      
+        /*--- Load history data (volume output might require some values) --- */
+        
+        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], iInst, 0, 0);
         
         /*--- Load the data --- */
         

From cd0c66da910f27f4b427c56c2b0c799184bf5a67 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 14 Aug 2019 16:36:51 +0200
Subject: [PATCH 397/539] Disabled reading/writing of meta data

---
 .../src/output/filewriter/CSU2BinaryFileWriter.cpp   |  2 +-
 SU2_CFD/src/solver_adjoint_discrete.cpp              |  2 +-
 SU2_CFD/src/solver_adjoint_elasticity.cpp            |  2 +-
 SU2_CFD/src/solver_adjoint_mean.cpp                  |  4 ++--
 SU2_CFD/src/solver_direct_mean.cpp                   |  4 ++--
 SU2_CFD/src/solver_direct_mean_inc.cpp               |  4 ++--
 SU2_CFD/src/solver_structure.cpp                     | 12 +-----------
 7 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 5d8b4a184a25..5914b0937be3 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -41,7 +41,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
    one int for ExtIter and 8 su2doubles. ---*/
 
   int var_buf_size = 5;
-  int var_buf[5] = {535532, GlobalField_Counter, (int)data_sorter->GetnPointsGlobal(), 1, 8};
+  int var_buf[5] = {535532, GlobalField_Counter, (int)data_sorter->GetnPointsGlobal(), 0, 0};
 
   /*--- Prepare the 1D data buffer on this rank. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_discrete.cpp b/SU2_CFD/src/solver_adjoint_discrete.cpp
index 76274709bc09..2cc5fca1fc9f 100644
--- a/SU2_CFD/src/solver_adjoint_discrete.cpp
+++ b/SU2_CFD/src/solver_adjoint_discrete.cpp
@@ -947,7 +947,7 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
 
   /*--- Read and store the restart metadata. ---*/
 
-  Read_SU2_Restart_Metadata(geometry[MESH_0], config, true, restart_filename);
+//  Read_SU2_Restart_Metadata(geometry[MESH_0], config, true, restart_filename);
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index f2f36d70829d..51672dd062a7 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -1238,7 +1238,7 @@ void CDiscAdjFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCo
 
   /*--- Read and store the restart metadata. ---*/
 
-  Read_SU2_Restart_Metadata(geometry[MESH_0], config, true, restart_filename);
+//  Read_SU2_Restart_Metadata(geometry[MESH_0], config, true, restart_filename);
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 2343830591b7..fa1b83ca1d5c 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -300,7 +300,7 @@ CAdjEulerSolver::CAdjEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   if (restart && (iMesh == MESH_0)) {
     mesh_filename = config->GetSolution_AdjFileName();
     filename      = config->GetObjFunc_Extension(mesh_filename);
-    Read_SU2_Restart_Metadata(geometry, config, true, filename);
+//    Read_SU2_Restart_Metadata(geometry, config, true, filename);
   }
 
   /*--- Define solver parameters needed for execution of destructor ---*/
@@ -5064,7 +5064,7 @@ CAdjNSSolver::CAdjNSSolver(CGeometry *geometry, CConfig *config, unsigned short
   if (restart && (iMesh == MESH_0)) {
     mesh_filename = config->GetSolution_AdjFileName();
     filename      = config->GetObjFunc_Extension(mesh_filename);
-    Read_SU2_Restart_Metadata(geometry, config, true, filename);
+//    Read_SU2_Restart_Metadata(geometry, config, true, filename);
   }
 
   /*--- Calculate area monitored for area-averaged-outflow-quantity-based objectives ---*/
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 757040a4504c..6ab1e53847cd 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -224,7 +224,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     /*--- Read and store the restart metadata. ---*/
 
-    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
 
   }
 
@@ -14196,7 +14196,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
     /*--- Read and store the restart metadata. ---*/
 
-    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
     
   }
 
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index b4c8644eab8f..69a17c8b883c 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -152,7 +152,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
     /*--- Read and store the restart metadata. ---*/
 
-    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
     
   }
 
@@ -6799,7 +6799,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     /*--- Read and store the restart metadata. ---*/
 
-    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
     
   }
 
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index c561521a0bd2..6ac5b2456236 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -5476,17 +5476,7 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
-
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
-    filename = config->GetMultiInstance_FileName(filename, config->GetiInst(), ".dat");
-
-  /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetTime_Domain()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(InnerIter), ".dat");
-  } else if (config->GetWrt_Dynamic()) {
-    filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(InnerIter), ".dat");
-  }
+    filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
 
   /*--- Read only the number of variables in the restart file. ---*/
 

From 7fa8ca00ddd97ba0491b526e3d6485b432cc27e7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 14 Aug 2019 16:37:39 +0200
Subject: [PATCH 398/539] Fixed some test cases

---
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg   |  2 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg  |  1 -
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  2 +-
 .../fea_fsi/WallChannel_2d/configFEA.cfg      |  2 +-
 .../fea_fsi/WallChannel_2d/configFSI.cfg      |  2 +-
 TestCases/parallel_regression.py              | 23 +++++++++++--------
 TestCases/serial_regression.py                |  2 +-
 .../axial_stage_2D/Axial_stage2D.cfg          |  2 +-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 46c27157a239..8b0b881b2213 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -13,7 +13,7 @@ KIND_RADIAL_BASIS_FUNCTION = WENDLAND_C2
 RADIAL_BASIS_FUNCTION_PARAMETER = 0.015
 RADIAL_BASIS_FUNCTION_POLYNOMIAL_TERM = YES
 
-INNER_ITER = 1
+INNER_ITER = 30
 WRT_BINARY_RESTART=NO
 READ_BINARY_RESTART=NO
 %
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 53526daf5287..2d03a03ef8dd 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -21,7 +21,6 @@ SOLVER= EULER
 MATH_PROBLEM= DIRECT
 KIND_TURB_MODEL= NONE
 
-SURFACE_MOVEMENT = FLUID_STRUCTURE_STATIC
 MULTIZONE_MESH = NO
 INNER_ITER= 60
 %
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index d23e2c835398..ee3e3ce9d067 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -30,7 +30,7 @@ DYNAMIC_ANALYSIS= YES
 DYN_TIMESTEP= 0.01
 TIME_STEP=0.01
 MAX_TIME= 0.1
-INNER_ITER=2
+INNER_ITER=7
 TIME_ITER=7
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.2601
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index 3f6265a3f898..af250e18229b 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -19,7 +19,7 @@ RESIDUAL_REDUCTION_FSI= 5
 RESIDUAL_MINVAL_FSI= -8
 
 %SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DISP_X, BGS_DISP_Y)
-
+INNER_ITER=10
 LINEAR_SOLVER= FGMRES
 LINEAR_SOLVER_PREC= LU_SGS
 LINEAR_SOLVER_ERROR= 1E-6
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
index 87c887f51aa6..4c0d720d8e98 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
@@ -14,7 +14,7 @@ MARKER_ZONE_INTERFACE = (wallUpwF, wallUpwS, wallUpperF, wallUpperS, wallDownF,
 MESH_FILENAME= meshFSI_2D.su2
 
 TIME_DOMAIN = YES
-TIME_ITER = 3
+TIME_ITER = 5
 TIME_STEP = 0.005
 
 RESTART_SOL= YES
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 2d3b6be25004..824ce8b35c0f 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -995,19 +995,22 @@ def main():
     dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "parallel_computation_fsi.py -f"
     dynbeam2d.timeout   = 1600
+    dynbeam2d.unsteady  = True
     dynbeam2d.tol       = 0.00001
     test_list.append(dynbeam2d)
 
-#    # FSI, 2d
-#    fsi2d           = TestCase('fsi2d')
-#    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
-#    fsi2d.cfg_file  = "configFSI.cfg"
-#    fsi2d.test_iter = 4
-#    fsi2d.test_vals = [2.000000, 0.500000, -7.780230, -1.142095] #last 4 columns
-#    fsi2d.su2_exec  = "parallel_computation_fsi.py -f"
-#    fsi2d.timeout   = 1600
-#    fsi2d.tol       = 0.00001
-#    test_list.append(fsi2d)
+    # FSI, 2d
+    fsi2d           = TestCase('fsi2d')
+    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
+    fsi2d.cfg_file  = "configFSI.cfg"
+    fsi2d.test_iter = 4
+    fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641483] #last 4 columns
+    fsi2d.su2_exec  = "parallel_computation_fsi.py -f"
+    fsi2d.timeout   = 1600
+    fsi2d.multizone= True
+    fsi2d.unsteady = True
+    fsi2d.tol       = 0.00001
+    test_list.append(fsi2d)
 
     ##########################
     ### Zonal multiphysics ###
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index ae67a1966ea8..64329e61fe71 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1076,7 +1076,7 @@ def main():
     dynbeam2d.unsteady  = True
     dynbeam2d.new_output= True
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66127.000000] #last 4 columns
+    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "SU2_CFD"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 4b3d2d1bd449..754f34479234 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -270,7 +270,7 @@ RELAXATION_FACTOR_TURB= 0.95
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-ITER= 2001
+OUTER_ITER= 21
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= RESIDUAL

From e05582f86bac886f55ff38f66c25231c5cd56ef2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 11:29:14 +0200
Subject: [PATCH 399/539] Changed conv criteria option names

---
 Common/src/config_structure.cpp                 |  8 ++++----
 QuickStart/inv_NACA0012.cfg                     | 17 +++++------------
 .../aeroelastic/aeroelastic_NACA64A010.cfg      |  8 ++++----
 .../cont_adj_euler/naca0012/inv_NACA0012.cfg    |  8 ++++----
 .../cont_adj_euler/naca0012/inv_NACA0012_FD.cfg |  8 ++++----
 .../naca0012/inv_NACA0012_discadj.cfg           |  8 ++++----
 .../cont_adj_euler/oneram6/inv_ONERAM6.cfg      |  8 ++++----
 .../cont_adj_euler/wedge/inv_wedge_ROE.cfg      |  4 ++--
 .../wedge/inv_wedge_ROE_multiobj.cfg            |  4 ++--
 .../cylinder/lam_cylinder.cfg                   |  8 ++++----
 .../naca0012_sub/lam_NACA0012.cfg               |  8 ++++----
 .../naca0012_trans/lam_NACA0012.cfg             |  8 ++++----
 TestCases/cont_adj_rans/naca0012/turb_nasa.cfg  |  8 ++++----
 .../cont_adj_rans/naca0012/turb_nasa_binary.cfg |  8 ++++----
 .../cont_adj_rans/oneram6/turb_ONERAM6.cfg      |  8 ++++----
 .../cont_adj_rans/rae2822/turb_SA_RAE2822.cfg   |  8 ++++----
 .../control_surface/inv_ONERAM6_moving.cfg      |  8 ++++----
 .../control_surface/inv_ONERAM6_setting.cfg     |  8 ++++----
 .../coupled_cht/incompressible/configFlow.cfg   |  8 ++++----
 .../coupled_cht_incompressible.cfg              |  8 ++++----
 TestCases/ddes/flatplate/ddes_flatplate.cfg     |  8 ++++----
 .../deformation/brick_hex/def_brick_hex.cfg     |  8 ++++----
 .../brick_hex_rans/def_brick_hex_rans.cfg       |  8 ++++----
 .../deformation/brick_prism/def_brick_prism.cfg |  8 ++++----
 .../brick_prism_rans/def_brick_prism_rans.cfg   |  8 ++++----
 .../deformation/brick_pyra/def_brick_pyra.cfg   |  8 ++++----
 .../deformation/brick_tets/def_brick_tets.cfg   |  8 ++++----
 .../cylindrical_ffd/def_cylindrical.cfg         |  4 ++--
 TestCases/deformation/naca0012/def_NACA0012.cfg |  8 ++++----
 .../naca0012/surface_file_NACA0012.cfg          |  8 ++++----
 TestCases/deformation/naca4412/def_NACA4412.cfg |  8 ++++----
 TestCases/deformation/rae2822/def_RAE2822.cfg   |  8 ++++----
 .../deformation/spherical_ffd/def_spherical.cfg |  4 ++--
 .../spherical_ffd/def_spherical_bspline.cfg     |  4 ++--
 TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg  |  8 ++++----
 .../cylinder3D/inv_cylinder3D.cfg               |  8 ++++----
 .../disc_adj_euler/oneram6/inv_ONERAM6.cfg      |  8 ++++----
 TestCases/disc_adj_fsi/Airfoil_2d/config.cfg    |  6 +++---
 TestCases/disc_adj_fsi/configAD_fsi.cfg         |  8 ++++----
 TestCases/disc_adj_heat/disc_adj_heat.cfg       |  8 ++++----
 .../naca0012/incomp_NACA0012_disc.cfg           |  8 ++++----
 .../cylinder/heated_cylinder.cfg                |  8 ++++----
 .../naca0012/turb_naca0012_sa.cfg               |  8 ++++----
 .../naca0012/turb_naca0012_sst.cfg              |  8 ++++----
 TestCases/disc_adj_rans/cylinder/cylinder.cfg   |  8 ++++----
 .../disc_adj_rans/cylinder_DT_1ST/cylinder.cfg  |  8 ++++----
 .../disc_adj_rans/naca0012/turb_NACA0012_sa.cfg |  8 ++++----
 .../naca0012/turb_NACA0012_sst.cfg              |  8 ++++----
 .../transonic_stator_2D/transonic_stator.cfg    |  8 ++++----
 TestCases/euler/CRM/inv_CRM_JST.cfg             |  8 ++++----
 TestCases/euler/biparabolic/BIPARABOLIC.cfg     |  8 ++++----
 TestCases/euler/bluntbody/blunt.cfg             |  8 ++++----
 TestCases/euler/channel/inv_channel.cfg         |  8 ++++----
 TestCases/euler/channel/inv_channel_RK.cfg      |  8 ++++----
 TestCases/euler/naca0012/inv_NACA0012.cfg       |  8 ++++----
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg   |  8 ++++----
 TestCases/euler/oneram6/inv_ONERAM6.cfg         |  8 ++++----
 TestCases/euler/wedge/inv_wedge_HLLC.cfg        |  8 ++++----
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg     |  2 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg    |  6 +++---
 TestCases/fea_fsi/Airfoil_RBF/settings.cfg      |  6 +++---
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg     | 10 +++++-----
 TestCases/fea_fsi/WallChannel_2d/configFEA.cfg  |  2 +-
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg     | 10 +++++-----
 TestCases/fea_fsi/WallChannel_2d/configFlow.cfg | 10 +++++-----
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg    |  8 ++++----
 .../fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg  |  8 ++++----
 TestCases/gust/inv_gust_NACA0012.cfg            |  8 ++++----
 TestCases/harmonic_balance/HB.cfg               |  8 ++++----
 .../hb_rans_preconditioning/davis.cfg           |  8 ++++----
 .../2D/Quad32X32_nPoly4/InviscidVortex.cfg      |  8 ++++----
 .../3D/nPoly2_Tets/InviscidVortex.cfg           |  8 ++++----
 .../3D/nPoly4_Tets/InviscidVortex.cfg           |  8 ++++----
 .../fem_NACA0012.cfg                            |  8 ++++----
 .../NACA0012_5thOrder/fem_NACA0012.cfg          |  8 ++++----
 .../NACA0012_5thOrder/fem_NACA0012_reg.cfg      |  8 ++++----
 .../Ringleb/Quad100X50_nPoly3/Ringleb.cfg       |  8 ++++----
 .../Quad100X50_nPoly3/Ringleb_WallBC.cfg        |  8 ++++----
 .../Ringleb/Quad100X50_nPoly4/Ringleb.cfg       |  8 ++++----
 .../Quad100X50_nPoly4/Ringleb_WallBC.cfg        |  8 ++++----
 .../Ringleb/Quad200X100_nPoly4/Ringleb.cfg      |  8 ++++----
 .../Quad200X100_nPoly4/Ringleb_WallBC.cfg       |  8 ++++----
 .../Quad50X50_HalfGeom_nPoly4/Ringleb.cfg       |  8 ++++----
 .../Ringleb_WallBC.cfg                          |  8 ++++----
 .../Ringleb.cfg                                 |  8 ++++----
 .../Ringleb_WallBC.cfg                          |  8 ++++----
 .../Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg   |  8 ++++----
 .../Ringleb_WallBC.cfg                          |  8 ++++----
 .../Sphere_4thOrder_Hexa/fem_Sphere.cfg         |  8 ++++----
 .../Sphere_4thOrder_Tet/fem_Sphere.cfg          |  8 ++++----
 .../nPoly1/fem_SubsonicChannel.cfg              |  8 ++++----
 .../nPoly1/fem_SubsonicChannel_Farfield.cfg     |  8 ++++----
 .../nPoly2/fem_SubsonicChannel.cfg              |  8 ++++----
 .../nPoly2/fem_SubsonicChannel_Farfield.cfg     |  8 ++++----
 .../nPoly4/fem_SubsonicChannel.cfg              |  8 ++++----
 .../nPoly4/fem_SubsonicChannel_Farfield.cfg     |  8 ++++----
 .../CylinderViscous/nPoly3/fem_Cylinder_reg.cfg |  8 ++++----
 .../FlatPlate/nPoly4/lam_flatplate_reg.cfg      |  8 ++++----
 .../nPoly3_QuadDominant/fem_Sphere_reg.cfg      |  8 ++++----
 .../nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg |  8 ++++----
 .../nPoly4/fem_unst_cylinder.cfg                |  8 ++++----
 .../nPoly4/fem_unst_cylinder_ADER.cfg           |  8 ++++----
 .../incomp_euler/naca0012/incomp_NACA0012.cfg   |  8 ++++----
 TestCases/incomp_euler/nozzle/inv_nozzle.cfg    |  2 +-
 .../buoyancy_cavity/lam_buoyancy_cavity.cfg     |  8 ++++----
 .../cylinder/incomp_cylinder.cfg                |  8 ++++----
 .../cylinder/poly_cylinder.cfg                  |  8 ++++----
 TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg  |  8 ++++----
 TestCases/incomp_rans/naca0012/naca0012.cfg     |  8 ++++----
 TestCases/mms/dg_navierstokes/lam_mms_dg.cfg    |  8 ++++----
 .../mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg    |  8 ++++----
 TestCases/mms/dg_ringleb/ringleb_dg.cfg         |  8 ++++----
 TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg  |  8 ++++----
 .../mms/fvm_incomp_navierstokes/lam_mms_fds.cfg |  8 ++++----
 TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg  |  8 ++++----
 TestCases/moving_wall/cavity/lam_cavity.cfg     |  8 ++++----
 .../spinning_cylinder/spinning_cylinder.cfg     |  8 ++++----
 .../multiple_ffd/naca0012/inv_NACA0012_ffd.cfg  |  8 ++++----
 .../navierstokes/cylinder/cylinder_lowmach.cfg  |  8 ++++----
 .../navierstokes/cylinder/lam_cylinder.cfg      |  8 ++++----
 .../navierstokes/flatplate/lam_flatplate.cfg    |  8 ++++----
 .../navierstokes/naca0012/lam_NACA0012.cfg      |  8 ++++----
 .../navierstokes/poiseuille/lam_poiseuille.cfg  |  8 ++++----
 .../poiseuille/profile_poiseuille.cfg           |  8 ++++----
 TestCases/nicf/LS89/turb_SA_PR.cfg              |  8 ++++----
 TestCases/nicf/LS89/turb_SST_PR.cfg             |  8 ++++----
 TestCases/nicf/edge/edge_PPR.cfg                |  8 ++++----
 TestCases/nicf/edge/edge_VW.cfg                 |  8 ++++----
 .../inv_wedge_ROE_2surf_1obj.cfg                |  4 ++--
 .../inv_wedge_ROE_multiobj.cfg                  |  4 ++--
 .../inv_wedge_ROE_multiobj_1surf.cfg            |  4 ++--
 .../inv_wedge_ROE_multiobj_combo.cfg            |  4 ++--
 .../inv_NACA0012_multipoint.cfg                 |  8 ++++----
 .../pitching_naca64a010/pitching_NACA64A010.cfg |  8 ++++----
 .../pitching_oneram6/pitching_ONERAM6.cfg       |  8 ++++----
 .../rotating_naca0012/rotating_NACA0012.cfg     |  8 ++++----
 .../steady_inverse_design/inv_NACA0012.cfg      |  8 ++++----
 .../steady_naca0012/inv_NACA0012_adv.cfg        |  8 ++++----
 .../steady_naca0012/inv_NACA0012_basic.cfg      |  8 ++++----
 .../steady_oneram6/inv_ONERAM6_adv.cfg          |  8 ++++----
 .../steady_oneram6/inv_ONERAM6_basic.cfg        |  8 ++++----
 .../pitching_naca64a010/turb_NACA64A010.cfg     |  8 ++++----
 .../pitching_oneram6/turb_ONERAM6.cfg           |  8 ++++----
 .../steady_oneram6/turb_ONERAM6.cfg             |  8 ++++----
 .../steady_rae2822/turb_SA_RAE2822.cfg          |  8 ++++----
 TestCases/polar/naca0012/inv_NACA0012.cfg       |  8 ++++----
 .../flatPlate_rigidMotion_Conf.cfg              |  8 ++++----
 .../unsteady_CHT_FlatPlate_Conf.cfg             |  8 ++++----
 TestCases/rans/flatplate/turb_SA_flatplate.cfg  |  8 ++++----
 TestCases/rans/flatplate/turb_SST_flatplate.cfg |  8 ++++----
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg    |  8 ++++----
 .../rans/naca0012/turb_NACA0012_sa_binary.cfg   |  8 ++++----
 .../rans/naca0012/turb_NACA0012_sa_neg.cfg      |  8 ++++----
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg   |  8 ++++----
 .../turb_NACA0012_sst_multigrid_restart.cfg     |  8 ++++----
 TestCases/rans/oneram6/turb_ONERAM6.cfg         |  8 ++++----
 TestCases/rans/propeller/propeller.cfg          |  4 ++--
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg      |  8 ++++----
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg     |  8 ++++----
 TestCases/rans/s809/trans_s809.cfg              |  8 ++++----
 TestCases/rans/s809/turb_S809.cfg               |  8 ++++----
 TestCases/rans/vki_turbine/turb_vki.cfg         |  8 ++++----
 TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg |  8 ++++----
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg    |  8 ++++----
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg    |  8 ++++----
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg    |  8 ++++----
 .../rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg  |  8 ++++----
 .../rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg  |  8 ++++----
 .../caradonna_tung/rot_caradonna_tung.cfg       |  8 ++++----
 TestCases/rotating/naca0012/rot_NACA0012.cfg    |  8 ++++----
 .../sliding_interface/bars_SST_2D/bars.cfg      | 10 +++++-----
 .../channel_2D/channel_2D_NN.cfg                |  8 ++++----
 .../channel_2D/channel_2D_WA.cfg                |  8 ++++----
 .../channel_3D/channel_3D_NN.cfg                |  8 ++++----
 .../channel_3D/channel_3D_WA.cfg                |  8 ++++----
 .../incompressible_steady/configCircle.cfg      |  8 ++++----
 .../incompressible_steady/configOut.cfg         |  8 ++++----
 .../incompressible_unsteady/configCircle.cfg    |  8 ++++----
 .../incompressible_unsteady/configOut.cfg       |  8 ++++----
 TestCases/sliding_interface/pipe/pipe_NN.cfg    |  8 ++++----
 TestCases/sliding_interface/pipe/pipe_WA.cfg    |  8 ++++----
 .../rotating_cylinders/rot_cylinders_NN.cfg     |  8 ++++----
 .../rotating_cylinders/rot_cylinders_WA.cfg     |  8 ++++----
 .../single_stage/single_stage_NN.cfg            |  8 ++++----
 .../single_stage/single_stage_WA.cfg            |  8 ++++----
 .../sup_vor_shed_NN.cfg                         |  8 ++++----
 .../sup_vor_shed_WA.cfg                         |  8 ++++----
 .../uniform_flow/uniform_NN.cfg                 |  8 ++++----
 .../uniform_flow/uniform_WA.cfg                 |  8 ++++----
 .../transitional_BC_model_ConfigFile.cfg        |  8 ++++----
 .../transitional_BC_model_ConfigFile.cfg        |  8 ++++----
 .../transitional_BC_model_ConfigFile.cfg        |  8 ++++----
 .../turbomachinery/APU_turbocharger/Jones.cfg   |  8 ++++----
 .../APU_turbocharger/Jones_rst.cfg              |  8 ++++----
 .../axial_stage_2D/Axial_stage2D.cfg            |  8 ++++----
 .../centrifugal_blade/centrifugal_blade.cfg     |  8 ++++----
 .../centrifugal_stage/centrifugal_stage.cfg     |  8 ++++----
 .../transonic_stator_2D/transonic_stator.cfg    |  8 ++++----
 .../transonic_stator_rst.cfg                    |  8 ++++----
 .../pitching_NACA64A010.cfg                     |  8 ++++----
 .../turb_NACA64A010.cfg                         |  8 ++++----
 .../plunging_naca0012/plunging_NACA0012.cfg     |  6 +++---
 .../unsteady/square_cylinder/turb_square.cfg    |  8 ++++----
 203 files changed, 784 insertions(+), 791 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index eb45b8918ece..3f3bd8b86546 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1436,7 +1436,7 @@ void CConfig::SetConfig_Options() {
   /*!\brief RESIDUAL_REDUCTION \n DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value)\n DEFAULT: 3.0 \ingroup Config*/
   addDoubleOption("RESIDUAL_REDUCTION", OrderMagResidual, 5.0);
   /*!\brief RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -14.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_MINVAL", MinLogResidual, -14.0);
+  addDoubleOption("CONV_RESIDUAL_MINVAL", MinLogResidual, -14.0);
   /* DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value) */
   addDoubleOption("RESIDUAL_REDUCTION_FSI", OrderMagResidualFSI, 3.0);
   /* DESCRIPTION: Min value of the residual (log10 of the residual) */
@@ -1460,11 +1460,11 @@ void CConfig::SetConfig_Options() {
   /*!\brief RESIDUAL_FUNC_FLOW\n DESCRIPTION: Flow functional for the Residual criteria\n OPTIONS: See \link Residual_Map \endlink \n DEFAULT: RHO_RESIDUAL \ingroup Config*/
   addEnumOption("RESIDUAL_FUNC_FLOW", Residual_Func_Flow, Residual_Map, RHO_RESIDUAL);
   /*!\brief STARTCONV_ITER\n DESCRIPTION: Iteration number to begin convergence monitoring\n DEFAULT: 5 \ingroup Config*/
-  addUnsignedLongOption("STARTCONV_ITER", StartConv_Iter, 5);
+  addUnsignedLongOption("CONV_STARTITER", StartConv_Iter, 5);
   /*!\brief CAUCHY_ELEMS\n DESCRIPTION: Number of elements to apply the criteria. \n DEFAULT 100 \ingroup Config*/
-  addUnsignedShortOption("CAUCHY_ELEMS", Cauchy_Elems, 100);
+  addUnsignedShortOption("CONV_CAUCHY_ELEMS", Cauchy_Elems, 100);
   /*!\brief CAUCHY_EPS\n DESCRIPTION: Epsilon to control the series convergence \n DEFAULT: 1e-10 \ingroup Config*/
-  addDoubleOption("CAUCHY_EPS", Cauchy_Eps, 1E-10);
+  addDoubleOption("CONV_CAUCHY_EPS", Cauchy_Eps, 1E-10);
   /*!\brief CAUCHY_FUNC_FLOW
    *  \n DESCRIPTION: Flow functional for the Cauchy criteria \n OPTIONS: see \link Objective_Map \endlink \n DEFAULT: DRAG_COEFFICIENT \ingroup Config*/
   addEnumOption("CAUCHY_FUNC_FLOW", Cauchy_Func_Flow, Objective_Map, DRAG_COEFFICIENT);
diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index 6e0a7bdc2562..6aabc38b8952 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -240,26 +240,19 @@ VISUALIZE_VOLUME_DEF= NO
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
-CONV_CRITERIA= CAUCHY
-%
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
+CONV_FIELD= RMS_DENSITY
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
-%
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
+CONV_CAUCHY_EPS= 1E-6
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index fa6824e37bde..7634c8e72ab6 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -270,16 +270,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index c2b3f5a1ae4f..11a15b7bccb5 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -256,16 +256,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 5a1c11522895..994c888f2b4d 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -250,16 +250,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 6cf1b865c641..d1a7369d1f72 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -206,16 +206,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index d6456b393607..1b8bdc3ecc5b 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -213,16 +213,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 25
+CONV_STARTITER= 25
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 1c818cf4ecfe..932e0738115b 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -212,10 +212,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index d0b12f993004..bb07b2985dfa 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -225,10 +225,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 082f97c8dfa7..fbaa9b22c678 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -223,16 +223,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 87fa47717f31..8e8a9e26c27c 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -208,16 +208,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 9
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index e94603660ebf..c5b968e3c24e 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -219,16 +219,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 13
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 70ffecc50bb6..5ed247b1dd54 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -262,16 +262,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 6994c5e19050..639380d036cc 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -262,16 +262,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index 4fc8614deaa7..f2930106d819 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -276,16 +276,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index 799e94326112..8dbc2be790de 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -194,16 +194,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index d7c490d8d046..220e70ff07ef 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -196,16 +196,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -6
+CONV_RESIDUAL_MINVAL= -6
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 100
+CONV_STARTITER= 100
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 3d94056d4af8..a536c6792d85 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -196,16 +196,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -6
+CONV_RESIDUAL_MINVAL= -6
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 100
+CONV_STARTITER= 100
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/coupled_cht/incompressible/configFlow.cfg b/TestCases/coupled_cht/incompressible/configFlow.cfg
index 23bd273bc71e..cc1b879dd0ea 100644
--- a/TestCases/coupled_cht/incompressible/configFlow.cfg
+++ b/TestCases/coupled_cht/incompressible/configFlow.cfg
@@ -108,10 +108,10 @@ RELAXATION_FACTOR_TURB= 1.0
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 16
-RESIDUAL_MINVAL= -32
-STARTCONV_ITER= 200
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-10
+CONV_RESIDUAL_MINVAL= -32
+CONV_STARTITER= 200
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-10
 CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
index 7a493e1fe698..9afe4f90ec23 100644
--- a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
+++ b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
@@ -156,13 +156,13 @@ CONV_CRITERIA= RESIDUAL
 
 RESIDUAL_REDUCTION= 16
 
-RESIDUAL_MINVAL= -32
+CONV_RESIDUAL_MINVAL= -32
 
-STARTCONV_ITER= 200
+CONV_STARTITER= 200
 
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 
 CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index c209311be432..0eea593bc0a5 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -177,16 +177,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index d16f5d93ee41..cc9868274aae 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index 46840c345b43..e5d275cafb5e 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 2eb4553d1331..7ddabfd461d9 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 5ec08fffbcdd..e1fc3b2f5f6f 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 992aa40f6786..7b02b76dcf03 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index a1437b561621..582f66efbcce 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -205,16 +205,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 844cd9a9b7ba..b194af9c556c 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -252,10 +252,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index fb53335179a7..e0beaf0730cb 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -249,16 +249,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 0a395d45f247..ff62d2df7610 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -259,16 +259,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index ff547dce4a7f..051963356dd9 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -226,16 +226,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E0
+CONV_CAUCHY_EPS= 1E0
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 4721f5c4e390..44912282d689 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -201,16 +201,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index b4a7935ab866..a0afa72ed8db 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -255,10 +255,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index 6077a3732fe4..739b3f5252f9 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -262,10 +262,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index aa971bf3b161..3f19d04edb8d 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -478,16 +478,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9.00
+CONV_RESIDUAL_MINVAL= -9.00
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 5
+CONV_STARTITER= 5
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index efe961fa13df..2d88a9ef53fa 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -259,16 +259,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 4635c9dd026c..b6c258364730 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -187,16 +187,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 25
+CONV_STARTITER= 25
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
index d1ea53fcd34f..941b41e0882c 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
@@ -112,13 +112,13 @@ FSI_ITER= 9
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 4
-RESIDUAL_MINVAL_FSI= -4
+CONV_RESIDUAL_MINVAL_FSI= -4
 % fluid
 UNST_INT_ITER= 51
 CONV_CRITERIA= RESIDUAL
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 RESIDUAL_REDUCTION= 9
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 % solid
 NONLINEAR_FEM_INT_ITER= 11
 RESIDUAL_FEM_UTOL= -9.0
diff --git a/TestCases/disc_adj_fsi/configAD_fsi.cfg b/TestCases/disc_adj_fsi/configAD_fsi.cfg
index 4bd3f2ceef62..b4a9e8691f7f 100644
--- a/TestCases/disc_adj_fsi/configAD_fsi.cfg
+++ b/TestCases/disc_adj_fsi/configAD_fsi.cfg
@@ -155,8 +155,8 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
-RESIDUAL_MINVAL= -10
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
+CONV_RESIDUAL_MINVAL= -10
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 62434c2d925b..ab0c918d3747 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -147,13 +147,13 @@ CONV_CRITERIA= RESIDUAL
 
 RESIDUAL_REDUCTION= 16
 
-RESIDUAL_MINVAL= -32
+CONV_RESIDUAL_MINVAL= -32
 
-STARTCONV_ITER= 200
+CONV_STARTITER= 200
 
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 
 CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 75bc46eb6c26..9b7edbc43b59 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -173,16 +173,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 1a1eda7010b0..85f35b26de17 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -247,16 +247,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 2fea4aae6c0b..1d5b5678d211 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -228,16 +228,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index 2caebfe37935..549032ec83a8 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -228,16 +228,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index f02f9588a6e2..1c4e0d0212fd 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -206,16 +206,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 1495ce58f749..6b99b1dc6a7e 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -214,16 +214,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index c6217a8f806b..08e9db0bf97f 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -194,16 +194,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 9cac272de5df..27cb60395e50 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -193,16 +193,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 22cda7725190..71bdce936f90 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -371,16 +371,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index 6aa88a86cadd..450e1aac1e17 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -188,16 +188,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -6
+CONV_RESIDUAL_MINVAL= -6
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 100
+CONV_STARTITER= 100
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 1624afc8cf12..8a019cfa3526 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -223,16 +223,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -6
+CONV_RESIDUAL_MINVAL= -6
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 28c4b7972295..1a3fc28e8207 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -148,16 +148,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 8af6e3d114e2..cadb715e998a 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -167,16 +167,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index ea3afb42bc30..a2c37db99360 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -163,16 +163,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index dca5a3b9421f..e8847f8c7c7f 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -241,16 +241,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index e3b172fca95b..d1442d16e1c0 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -153,16 +153,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index a4b67daf7086..8472e59a12d5 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -215,16 +215,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 25
+CONV_STARTITER= 25
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 3a74b7714546..71581ac8cc05 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -162,16 +162,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 8b0b881b2213..c9d79e2042cd 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -62,7 +62,7 @@ FSI_ITER= 1
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 8
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 % solid
 NONLINEAR_FEM_INT_ITER= 30
 RESIDUAL_FEM_UTOL= -6.0
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 2d03a03ef8dd..003b573fe431 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -97,13 +97,13 @@ FSI_ITER= 1
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 8
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 % fluid
 UNST_INT_ITER= 60
 CONV_CRITERIA= RESIDUAL
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 RESIDUAL_REDUCTION= 9
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 % grid deformation
 DEFORM_NONLINEAR_ITER= 1
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
diff --git a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
index d963f492fced..7ce65768c4c1 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
@@ -139,13 +139,13 @@ FSI_ITER= 1
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 8
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 % fluid
 UNST_INT_ITER= 60
 CONV_CRITERIA= RESIDUAL
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 RESIDUAL_REDUCTION= 9
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 % solid
 NONLINEAR_FEM_INT_ITER= 30
 RESIDUAL_FEM_UTOL= -6.0
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 6674c15db382..d6c02c2f9981 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -77,7 +77,7 @@ STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 5
 %
 % Min value of the residual in the boundary displacement (log10 of the residual)
-RESIDUAL_MINVAL_FSI= -5.92
+CONV_RESIDUAL_MINVAL_FSI= -5.92
 
 % -------------------------- BOUNDARY CONDITIONS ------------------------------%
 %
@@ -358,16 +358,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index af250e18229b..2dc1936463d4 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -16,7 +16,7 @@ READ_BINARY_RESTART= NO
 BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
 RESIDUAL_REDUCTION_FSI= 5
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 
 %SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DISP_X, BGS_DISP_Y)
 INNER_ITER=10
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index 09d48671a667..6ce5e332e8a3 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -30,7 +30,7 @@ CONSERVATIVE_INTERPOLATION = YES
 BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
 RESIDUAL_REDUCTION_FSI= 5
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIME= 4.01
 UNST_INT_ITER= 50
@@ -72,10 +72,10 @@ JST_SENSOR_COEFF= ( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
-RESIDUAL_MINVAL= -10
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
+CONV_RESIDUAL_MINVAL= -10
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 CAUCHY_FUNC_FLOW= DRAG
 ELASTICITY_MODULUS=5E4
 MATERIAL_DENSITY=50
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index f27a30d1d6b1..191072e0bef6 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -19,7 +19,7 @@ RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 
-RESIDUAL_MINVAL_FSI= -8
+CONV_RESIDUAL_MINVAL_FSI= -8
 UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIME= 4.01
 
@@ -61,10 +61,10 @@ JST_SENSOR_COEFF= ( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
-RESIDUAL_MINVAL= -10
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
+CONV_RESIDUAL_MINVAL= -10
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 CAUCHY_FUNC_FLOW= DRAG
 
 MULTIZONE_MESH= NO
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 918d91d17031..fce153554846 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -254,16 +254,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index f83ef68199ce..acecdef0ccc6 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -259,16 +259,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 14
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index 0687a47c41ac..a6780f5ff4b6 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -226,16 +226,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 0
+CONV_STARTITER= 0
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 2895d3be4082..5c7147261456 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -261,16 +261,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 07df091d19b3..6e08a2c6126a 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -204,16 +204,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 918e594fba26..4472ee12fd4b 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -126,16 +126,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index a4b1d76fd720..e1fbcede68ea 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -125,16 +125,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 9544aae8673d..d26cbb838efd 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -125,16 +125,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index c60ba73fa157..5acf7b71add3 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -123,16 +123,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index 9efe70b54fcd..4b4ada6674af 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -129,16 +129,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 68ab563c3d05..1f47a9f4352c 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -134,16 +134,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index dee304fabf6e..66ed8d84a5c5 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index 5a7db54b6a92..b1a7d206c7e5 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index e368578c1d67..f99d6dab5c15 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index c890ab18976f..243b733210a3 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index b703c80ee28a..66093c18f0a8 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index ec00f0999d86..32111e17fa4d 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 0f480fad3a45..5fffbfc712e2 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index ac231790d607..33cb12161448 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 718cad45544b..5509332ddded 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 3fec2be3de42..92c8c44219e8 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 05c1cb858980..5aac4fa69d2a 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 2810bf2a62bf..e6efcb1700a6 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -120,16 +120,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index fbce4f4abafe..8388e9499593 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -123,16 +123,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index b8402d7cfb4a..951da8f8eadf 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -125,16 +125,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index f57256ec123d..9b2fec777408 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -133,16 +133,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index 511735996142..dc6acb203051 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -126,16 +126,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index 7b92bc1dd93c..c5e93527990d 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -133,16 +133,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index 79280d8135aa..e79ba7d5934d 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -126,16 +126,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 1ef514b0cb85..24cd592e8204 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -133,16 +133,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index bece858e7cbb..b197184633d7 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -126,16 +126,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index fc72cee5e11d..18783b548ed0 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -127,16 +127,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 275247851f44..2c1f19e9185b 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -135,16 +135,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 396e65d38ad8..0db6b3716305 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -127,16 +127,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index bac91d818261..da39cd275308 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -151,16 +151,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 265bd7dc53d8..4bc178d186ed 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -143,16 +143,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 346365e1f4c5..2df6a6fa5120 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -156,16 +156,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index 724646afb391..cf7dda77ac34 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -173,16 +173,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 7
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 50
+CONV_CAUCHY_ELEMS= 50
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index b2c214163b19..b9c4976029ca 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -178,7 +178,7 @@ ITER= 9999
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index af693a65b1fe..8fa72d88ae1a 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -207,16 +207,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 4ff54c90bbec..8a85ec3b4888 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -169,16 +169,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 60fd84f62d3c..758e5696af95 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -234,16 +234,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 553dd054ab81..53e42f0e4340 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -304,16 +304,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 509dac254487..323ffa8333f0 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -191,16 +191,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index b768407d43cc..aa186f9d1a72 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -121,16 +121,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index 7ca407e32d65..71003963358c 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -139,16 +139,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index acd1cbebad83..0d754dc280a1 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -138,16 +138,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index e8e425aa127f..6ed8e9e1c041 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -165,16 +165,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index 1297accf25dc..1014109773d8 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -187,16 +187,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index 6ffd93049d01..22caf7dcaf55 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -204,16 +204,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -14
+CONV_RESIDUAL_MINVAL= -14
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index fbe586e39dc4..6166fd6c73dd 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -174,16 +174,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 748e818ab0e3..2fc40bae90fd 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -207,16 +207,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-7
+CONV_CAUCHY_EPS= 1E-7
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 5365b3bf7639..4be3e4a0a87b 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -264,16 +264,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 63ccd0438eef..6161a7b00f15 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -166,16 +166,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index fff80fb8e2bb..4f4b52c983db 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -161,16 +161,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index b9a8d52116af..3386f4f376a1 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -178,16 +178,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index 033debc22543..191971c13d75 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -153,16 +153,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 989657ad4011..8556dcfddb89 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -204,16 +204,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index 4247212a1586..fbb2b1dd9347 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -236,16 +236,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index d0fc1ff1615d..34ee0191c640 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -262,16 +262,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 32a27cd8b9ae..7ce39af1c7e1 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -261,16 +261,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 86972d02f461..034958458125 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -182,16 +182,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 0d1496908008..f2097476c2ea 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -182,16 +182,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 906cbe046747..8cda378da71f 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -222,10 +222,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index eb337f5f58d8..14eccd00558e 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -223,10 +223,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index faa5715335e9..cd76edc7d0a1 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -223,10 +223,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 542ba5a58b6c..3e477e5be9a2 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -225,10 +225,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -11
+CONV_RESIDUAL_MINVAL= -11
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index a40bc9d7764b..7c4d19e277fa 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -220,16 +220,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index 269c6679999b..76ac6b2870a6 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -277,16 +277,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index cdd08708ba5f..0e6d009a9d9c 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -256,16 +256,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index 6cff3a153add..a90acfaa960d 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -247,16 +247,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index a7154425ce75..9b7a13927b4f 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -237,16 +237,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index c0675f327292..fe02ce8cbc9c 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -247,16 +247,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 33e6664bfd3d..7a6ab7b5f18b 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -229,16 +229,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -13
+CONV_RESIDUAL_MINVAL= -13
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index 13fe9c9c53f4..2cd4c8996d14 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -213,16 +213,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 25
+CONV_STARTITER= 25
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 850efe1d5e07..53a0518cd16b 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -213,16 +213,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 25
+CONV_STARTITER= 25
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index ff4ba627a11a..995edd902767 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -293,16 +293,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index 0a797601f5d1..b87642ac3c34 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -316,16 +316,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 50
+CONV_CAUCHY_ELEMS= 50
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index 9c95bac8032b..f9efe5fbf5de 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -263,16 +263,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 56d80b5a4262..8e2dcf4b7325 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -208,16 +208,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 3dbc1c80f697..d1e8e60923d2 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -255,16 +255,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 7330b5f689ba..5266b600170b 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -464,16 +464,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 4
+CONV_STARTITER= 4
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 10
+CONV_CAUCHY_ELEMS= 10
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= LIFT
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index c365df416330..a47195c47ac4 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -445,16 +445,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 4
+CONV_STARTITER= 4
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 10
+CONV_CAUCHY_ELEMS= 10
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= LIFT
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index d4385a6436c8..6c634078c078 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -187,16 +187,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index eb1159d48a07..09a2f3f9875d 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -184,16 +184,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -15
+CONV_RESIDUAL_MINVAL= -15
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index b006051e5735..aeed3333bc7f 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -196,16 +196,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index 1c0d1b17deb5..137ecfc14e5b 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index 1d5a0971bc89..e4fed577ade5 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -187,16 +187,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index a467a536f617..bf5761544825 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -195,16 +195,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index d3e41b6f3b40..0a906c149525 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -360,16 +360,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 7
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 30
+CONV_STARTITER= 30
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 500
+CONV_CAUCHY_ELEMS= 500
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index 964ccfa4256d..5878c0fa0643 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -224,16 +224,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 7b6a722ad803..502d4cf11973 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -215,10 +215,10 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index 7814b0ee542c..cd8251471fcc 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 95774b770d08..917f4b622028 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -179,16 +179,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index 06b1f787645b..44c3ac893566 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -170,16 +170,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index d641461d3103..bee67d77ba8d 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -184,16 +184,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index 11e0abc98f71..ff472f2f6034 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -191,16 +191,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index 159b1248e8b7..0ccc2f9da665 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -183,16 +183,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index 1372b175a885..efc49cd3b0b7 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 533f74d1be68..8d3390e20098 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 55a0470e6d9b..6d486fa1a1c1 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 43d4a899dac0..c59805c18dd4 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index 17f3b5f3f9fd..cdad92011b0c 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -9
+CONV_RESIDUAL_MINVAL= -9
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index a2cc6397713c..556538abfe86 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -172,16 +172,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index dd0d6da20ed6..d3d552755083 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -268,16 +268,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 5cf74fb53878..6e2d68ac21c4 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -266,23 +266,23 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 CAUCHY_FUNC_FLOW= DRAG
 %
 % Epsilon for full multigrid method evaluation
-%FULLMG_CAUCHY_EPS= 1E-4
+%FULLMG_CONV_CAUCHY_EPS= 1E-4
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 5c3725f439be..98bcac0888ed 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -191,16 +191,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index fdcf4714a5fa..c908a3af9918 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -189,16 +189,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index e19f97fb1013..b68f62f38065 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -201,16 +201,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 8fe867ff18fd..701b0ea79355 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -189,16 +189,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index a3244d42480a..15fe37184eb1 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -100,10 +100,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
-RESIDUAL_MINVAL= -16
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-6
+CONV_RESIDUAL_MINVAL= -16
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-6
 CAUCHY_FUNC_FLOW= DRAG
 
 % --------------------------- TURBULENCE PARAMETERS --------------------------%
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index 2a7dffc77287..aa4af820656a 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -110,10 +110,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
-RESIDUAL_MINVAL= -16
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-6
+CONV_RESIDUAL_MINVAL= -16
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-6
 CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index c5de0e993462..51454b2bb535 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -109,10 +109,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
-RESIDUAL_MINVAL= -16
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-6
+CONV_RESIDUAL_MINVAL= -16
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-6
 CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index bb0fb61081f1..24fa33d9680b 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -119,10 +119,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 12
-RESIDUAL_MINVAL= -16
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-6
+CONV_RESIDUAL_MINVAL= -16
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-6
 CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 722ff30b0d51..d50f95d9aec8 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -204,16 +204,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index af7f875e4ac4..87d7cbd6aa10 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -203,16 +203,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 6abf5ba2569d..f8821c2ef57f 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -194,16 +194,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 848639e5cbfe..edd40c8b79c0 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -196,16 +196,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index d9fd9fb5358d..a2cc7aee9c40 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -235,16 +235,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 444764cd408f..922383be9a27 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -235,16 +235,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index c8549099c353..253d9363eccb 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -197,16 +197,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 920d2d6c432b..4f3565e8f761 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -197,16 +197,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index abf4d257e590..5e11b9bca436 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -194,16 +194,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 7775ec3dfa6b..25d1e95a9f49 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -199,16 +199,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 9e44258a3026..931519394519 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -183,16 +183,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -20
+CONV_RESIDUAL_MINVAL= -20
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 900cdb04b92b..0ad76153c5fe 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -219,16 +219,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -20
+CONV_RESIDUAL_MINVAL= -20
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index 74e4802514f4..38bfb83f7ecc 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -202,16 +202,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -20
+CONV_RESIDUAL_MINVAL= -20
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index c3700863f84f..948c30587d72 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -287,16 +287,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 208f638a1b81..6b4132c7d646 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -292,16 +292,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 754f34479234..4e15086a561d 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -281,16 +281,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 43b76b856c3e..3f7ff8d21ff4 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -319,16 +319,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index e35a74d96505..5d43054b1b04 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -327,16 +327,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
 CAUCHY_FUNC_FLOW= DRAG
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index b44fd59bd5d2..f143cbb1ded6 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -289,16 +289,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index 05c22fcb5262..d043c37f142e 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -294,16 +294,16 @@ RESIDUAL_FUNC_FLOW= RHO_ENERGY
 RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -16
+CONV_RESIDUAL_MINVAL= -16
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index 8495f4782435..d25d18f0416e 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -269,16 +269,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index e42f395d6101..099d211e6c8d 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -293,16 +293,16 @@ CONV_CRITERIA= CAUCHY
 RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index ab3c25347ffb..47deb79deb76 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -195,13 +195,13 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 1
+CONV_STARTITER= 1
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 19550baa4871..afc2c2d3baa7 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -207,16 +207,16 @@ CONV_CRITERIA= RESIDUAL
 RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-5
+CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)

From 3652d8293d74197201904706902a31697f9a73c5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 13:51:48 +0200
Subject: [PATCH 400/539] Renamed UNSTEADY_SIMULATION -> TIME_MARCHING

---
 Common/include/config_structure.hpp           |  4 +-
 Common/include/config_structure.inl           |  2 +-
 Common/include/option_structure.hpp           |  2 +-
 Common/src/config_structure.cpp               | 54 +++++++-------
 Common/src/dual_grid_structure.cpp            | 12 ++--
 Common/src/fem_geometry_structure.cpp         | 10 +--
 Common/src/geometry_structure.cpp             | 28 ++++----
 Common/src/geometry_structure_fem_part.cpp    |  2 +-
 Common/src/grid_movement_structure.cpp        | 10 +--
 Common/src/toolboxes/MMS/CIncTGVSolution.cpp  |  6 +-
 .../toolboxes/MMS/CInviscidVortexSolution.cpp |  6 +-
 .../toolboxes/MMS/CMMSIncEulerSolution.cpp    |  2 +-
 .../src/toolboxes/MMS/CMMSIncNSSolution.cpp   |  2 +-
 .../MMS/CMMSNSTwoHalfCirclesSolution.cpp      |  2 +-
 .../MMS/CMMSNSTwoHalfSpheresSolution.cpp      |  2 +-
 .../toolboxes/MMS/CMMSNSUnitQuadSolution.cpp  |  2 +-
 .../MMS/CMMSNSUnitQuadSolutionWallBC.cpp      |  2 +-
 .../src/toolboxes/MMS/CNSUnitQuadSolution.cpp |  2 +-
 Common/src/toolboxes/MMS/CRinglebSolution.cpp |  2 +-
 Common/src/toolboxes/MMS/CTGVSolution.cpp     |  6 +-
 SU2_CFD/src/SU2_CFD.cpp                       |  6 +-
 .../src/drivers/CDiscAdjSinglezoneDriver.cpp  |  2 +-
 SU2_CFD/src/drivers/CDriver.cpp               | 64 ++++++++---------
 SU2_CFD/src/drivers/CMultizoneDriver.cpp      | 12 ++--
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     | 12 ++--
 SU2_CFD/src/integration_structure.cpp         |  4 +-
 SU2_CFD/src/integration_time.cpp              |  2 +-
 SU2_CFD/src/iteration_structure.cpp           | 62 ++++++++--------
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |  4 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |  4 +-
 SU2_CFD/src/output/CElasticityOutput.cpp      |  2 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |  4 +-
 SU2_CFD/src/output/CFlowCompOutput.cpp        |  6 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp         |  4 +-
 .../src/output/output_structure_legacy.cpp    | 72 +++++++++----------
 SU2_CFD/src/solver_adjoint_discrete.cpp       | 30 ++++----
 SU2_CFD/src/solver_adjoint_elasticity.cpp     | 18 ++---
 SU2_CFD/src/solver_adjoint_mean.cpp           | 20 +++---
 SU2_CFD/src/solver_direct_elasticity.cpp      | 26 +++----
 SU2_CFD/src/solver_direct_heat.cpp            | 20 +++---
 SU2_CFD/src/solver_direct_mean.cpp            | 66 ++++++++---------
 SU2_CFD/src/solver_direct_mean_fem.cpp        | 18 ++---
 SU2_CFD/src/solver_direct_mean_inc.cpp        | 64 ++++++++---------
 SU2_CFD/src/solver_direct_turbulent.cpp       | 26 +++----
 SU2_CFD/src/solver_structure.cpp              | 14 ++--
 SU2_CFD/src/transfer_physics.cpp              |  2 +-
 SU2_CFD/src/variables/CAdjEulerVariable.cpp   | 12 ++--
 SU2_CFD/src/variables/CDiscAdjVariable.cpp    |  4 +-
 SU2_CFD/src/variables/CEulerVariable.cpp      | 12 ++--
 SU2_CFD/src/variables/CFEAVariable.cpp        |  2 +-
 SU2_CFD/src/variables/CHeatFVMVariable.cpp    |  4 +-
 SU2_CFD/src/variables/CIncEulerVariable.cpp   |  8 +--
 SU2_CFD/src/variables/CTurbSAVariable.cpp     |  4 +-
 SU2_CFD/src/variables/CTurbSSTVariable.cpp    |  4 +-
 SU2_CFD/src/variables/CTurbVariable.cpp       |  2 +-
 SU2_CFD/src/variables/CVariable.cpp           |  4 +-
 SU2_SOL/src/SU2_SOL.cpp                       | 26 +++----
 .../aeroelastic/aeroelastic_NACA64A010.cfg    |  2 +-
 TestCases/ddes/flatplate/ddes_flatplate.cfg   |  2 +-
 TestCases/disc_adj_rans/cylinder/cylinder.cfg |  2 +-
 .../cylinder_DT_1ST/cylinder.cfg              |  2 +-
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |  2 -
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg   |  2 +-
 .../fea_fsi/WallChannel_2d/configFEA.cfg      |  5 --
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |  2 +-
 .../fea_fsi/WallChannel_2d/configFlow.cfg     |  5 +-
 TestCases/gust/inv_gust_NACA0012.cfg          |  2 +-
 TestCases/harmonic_balance/HB.cfg             |  2 +-
 .../hb_rans_preconditioning/davis.cfg         |  2 +-
 .../2D/Quad32X32_nPoly4/InviscidVortex.cfg    |  4 +-
 .../3D/nPoly2_Tets/InviscidVortex.cfg         |  4 +-
 .../3D/nPoly4_Tets/InviscidVortex.cfg         |  4 +-
 .../fem_Sphere_reg_ADER.cfg                   |  2 +-
 .../nPoly4/fem_unst_cylinder.cfg              |  2 +-
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |  2 +-
 .../incomp_euler/naca0012/incomp_NACA0012.cfg |  2 +-
 .../cylinder/incomp_cylinder.cfg              |  2 +-
 .../incomp_rans/AhmedBody/turb_ahmed.cfg      |  2 +-
 TestCases/incomp_rans/naca0012/naca0012.cfg   |  2 +-
 .../spinning_cylinder/spinning_cylinder.cfg   |  2 +-
 .../pitching_NACA64A010.cfg                   |  2 +-
 .../pitching_oneram6/pitching_ONERAM6.cfg     |  2 +-
 .../pitching_naca64a010/turb_NACA64A010.cfg   |  2 +-
 .../pitching_oneram6/turb_ONERAM6.cfg         |  2 +-
 .../flatPlate_rigidMotion_Conf.cfg            |  2 +-
 .../unsteady_CHT_FlatPlate_Conf.cfg           |  2 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |  2 +-
 .../channel_2D/channel_2D_NN.cfg              |  2 +-
 .../channel_2D/channel_2D_WA.cfg              |  2 +-
 .../channel_3D/channel_3D_NN.cfg              |  2 +-
 .../channel_3D/channel_3D_WA.cfg              |  2 +-
 .../incompressible_unsteady/configCircle.cfg  |  2 +-
 .../incompressible_unsteady/configOut.cfg     |  2 +-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |  2 +-
 TestCases/sliding_interface/pipe/pipe_WA.cfg  |  2 +-
 .../rotating_cylinders/rot_cylinders_NN.cfg   |  2 +-
 .../rotating_cylinders/rot_cylinders_WA.cfg   |  2 +-
 .../single_stage/single_stage_NN.cfg          |  2 +-
 .../single_stage/single_stage_WA.cfg          |  2 +-
 .../sup_vor_shed_NN.cfg                       |  2 +-
 .../sup_vor_shed_WA.cfg                       |  2 +-
 .../uniform_flow/uniform_NN.cfg               |  2 +-
 .../uniform_flow/uniform_WA.cfg               |  2 +-
 .../pitching_NACA64A010.cfg                   |  2 +-
 .../turb_NACA64A010.cfg                       |  2 +-
 .../plunging_naca0012/plunging_NACA0012.cfg   |  2 +-
 .../unsteady/square_cylinder/turb_square.cfg  |  2 +-
 107 files changed, 455 insertions(+), 461 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 576adff6f190..e6e379919575 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -163,7 +163,7 @@ class CConfig {
   su2double CL_Target; /*!< \brief Weight of the drag coefficient. */
   su2double CM_Target; /*!< \brief Weight of the drag coefficient. */
   su2double *HTP_Min_XCoord, *HTP_Min_YCoord; /*!< \brief Identification of the HTP. */
-  unsigned short Unsteady_Simulation;	/*!< \brief Steady or unsteady (time stepping or dual time stepping) computation. */
+  unsigned short TimeMarching;	/*!< \brief Steady or unsteady (time stepping or dual time stepping) computation. */
   unsigned short Dynamic_Analysis;	/*!< \brief Static or dynamic structural analysis. */
   unsigned short nStartUpIter;	/*!< \brief Start up iterations using the fine grid. */
   su2double FixAzimuthalLine; /*!< \brief Fix an azimuthal line due to misalignments of the nearfield. */
@@ -5082,7 +5082,7 @@ class CConfig {
    * \return The kind of time integration: Steady state, time stepping method (unsteady) or
    *         dual time stepping method (unsteady).
    */
-  unsigned short GetUnsteady_Simulation(void);
+  unsigned short GetTime_Marching(void);
   
   /*!
    * \brief Provides the number of chemical reactions in the chemistry model
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 47d450c7e676..2cd1fd4bc8cc 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1298,7 +1298,7 @@ inline su2double CConfig::GetCoeff_ObjChainRule(unsigned short iVar) { return Ob
 
 inline unsigned short CConfig::GetKind_SensSmooth(void) { return Kind_SensSmooth; }
 
-inline unsigned short CConfig::GetUnsteady_Simulation(void) { return Unsteady_Simulation; }
+inline unsigned short CConfig::GetTime_Marching(void) { return TimeMarching; }
 
 inline bool CConfig::GetRestart(void) {	return Restart; }
 
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 6f198973e888..c4acaf59ba45 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1838,7 +1838,7 @@ enum ENUM_UNSTEADY {
   HARMONIC_BALANCE = 5    /*!< \brief Use a harmonic balance source term. */
 
 };
-static const map<string, ENUM_UNSTEADY> Unsteady_Map = CCreateMap<string, ENUM_UNSTEADY>
+static const map<string, ENUM_UNSTEADY> TimeMarching_Map = CCreateMap<string, ENUM_UNSTEADY>
 ("NO", STEADY)
 ("TIME_STEPPING", TIME_STEPPING)
 ("DUAL_TIME_STEPPING-1ST_ORDER", DT_STEPPING_1ST)
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 3f3bd8b86546..2eba5ddc2938 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1296,7 +1296,7 @@ void CConfig::SetConfig_Options() {
   /*--- Options related to time-marching ---*/
 
   /* DESCRIPTION: Unsteady simulation  */
-  addEnumOption("UNSTEADY_SIMULATION", Unsteady_Simulation, Unsteady_Map, STEADY);
+  addEnumOption("TIME_MARCHING", TimeMarching, TimeMarching_Map, STEADY);
   /* DESCRIPTION:  Courant-Friedrichs-Lewy condition of the finest grid */
   addDoubleOption("CFL_NUMBER", CFLFineGrid, 1.25);
   /* DESCRIPTION:  Courant-Friedrichs-Lewy condition of the finest grid in (heat fvm) solid solvers */
@@ -3008,15 +3008,15 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   /*--- Check for unsteady problem ---*/
   
-  if ((Unsteady_Simulation == TIME_STEPPING ||
-       Unsteady_Simulation == DT_STEPPING_1ST ||
-       Unsteady_Simulation == DT_STEPPING_2ND) && !Time_Domain){
+  if ((TimeMarching == TIME_STEPPING ||
+       TimeMarching == DT_STEPPING_1ST ||
+       TimeMarching == DT_STEPPING_2ND) && !Time_Domain){
     SU2_MPI::Error("TIME_DOMAIN must be set to YES if UNSTEADY_SIMULATION is "
                    "TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER or DUAL_TIME_STEPPING-2ND_ORDER", CURRENT_FUNCTION);
   }
   
   if (Time_Domain){
-    if (Unsteady_Simulation == TIME_STEPPING){
+    if (TimeMarching == TIME_STEPPING){
       InnerIter = 1;
     }
   }
@@ -3033,7 +3033,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   /*--- Deactivate the multigrid in the adjoint problem ---*/
   
   if ((ContinuousAdjoint && !MG_AdjointFlow) ||
-      (Unsteady_Simulation == TIME_STEPPING)) { nMGLevels = 0; }
+      (TimeMarching == TIME_STEPPING)) { nMGLevels = 0; }
 
   /*--- If Fluid Structure Interaction, set the solver for each zone.
    *--- ZONE_0 is the zone of the fluid.
@@ -3091,20 +3091,19 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   if (Kind_Solver == FEM_ELASTICITY) {
     nMGLevels = 0;
-    if (Dynamic_Analysis == STATIC) nTimeIter = 1;
   }
 
   /*--- Initialize the ofstream ConvHistFile. ---*/
 //  ofstream ConvHistFile;
 
-  if (Kind_Solver == FEM_ELASTICITY) {
+//  if (Kind_Solver == FEM_ELASTICITY) {
 
-	  if (Dynamic_Analysis == STATIC) { Wrt_Dynamic = false; }
-	  else { Wrt_Dynamic = true; }
+//	  if (Dynamic_Analysis == STATIC) { Wrt_Dynamic = false; }
+//	  else { Wrt_Dynamic = true; }
 
-  } else {
-    Wrt_Dynamic = false;
-  }
+//  } else {
+//    Wrt_Dynamic = false;
+//  }
 
   if (Kind_Solver == ZONE_SPECIFIC) {
     ZoneSpecific_Problem = true;
@@ -3113,7 +3112,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
   /*--- Check for unsupported features. ---*/
 
-  if ((Kind_Solver != EULER && Kind_Solver != NAVIER_STOKES && Kind_Solver != RANS) && (Unsteady_Simulation == HARMONIC_BALANCE)){
+  if ((Kind_Solver != EULER && Kind_Solver != NAVIER_STOKES && Kind_Solver != RANS) && (TimeMarching == HARMONIC_BALANCE)){
     SU2_MPI::Error("Harmonic Balance not yet implemented for the incompressible solver.", CURRENT_FUNCTION);
   }
 
@@ -3220,7 +3219,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
   }
   
-  if (Unsteady_Simulation == TIME_STEPPING){
+  if (TimeMarching == TIME_STEPPING){
     nIter      = 1;
     nInnerIter  = 1;
   }
@@ -3231,6 +3230,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     
     ScreenWrtFreq[0]  = 1;
     HistoryWrtFreq[0] = 1;
+    
+    if (TimeMarching != HARMONIC_BALANCE)
+      TimeMarching = STEADY;
   } 
   
   if (Time_Domain){
@@ -3263,7 +3265,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   if (GetGrid_Movement()){
     if ((Kind_SU2 == SU2_CFD || Kind_SU2 == SU2_SOL) &&
-        (Unsteady_Simulation == STEADY && !Time_Domain)){
+        (TimeMarching == STEADY && !Time_Domain)){
       
       if((Kind_GridMovement != ROTATING_FRAME) &&
          (Kind_GridMovement != STEADY_TRANSLATION) &&
@@ -3413,7 +3415,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   
   /*-- Setting Harmonic Balance period from the config file */
 
-  if (Unsteady_Simulation == HARMONIC_BALANCE) {
+  if (TimeMarching == HARMONIC_BALANCE) {
   	HarmonicBalance_Period = GetHarmonicBalance_Period();
   	if (HarmonicBalance_Period < 0)  {
       SU2_MPI::Error("Not a valid value for time period!!", CURRENT_FUNCTION);
@@ -3878,7 +3880,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
   if (Kind_TimeIntScheme_FEM_Flow == ADER_DG) {
 
-    Unsteady_Simulation = TIME_STEPPING;  // Only time stepping for ADER.
+    TimeMarching = TIME_STEPPING;  // Only time stepping for ADER.
 
     /* If time accurate local time stepping is used, make sure that an unsteady
        CFL is specified. If not, terminate. */
@@ -4107,7 +4109,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
 
   /*--- Set up the time stepping / unsteady CFL options. ---*/
-  if ((Unsteady_Simulation == TIME_STEPPING) && (Unst_CFL != 0.0)) {
+  if ((TimeMarching == TIME_STEPPING) && (Unst_CFL != 0.0)) {
     for (iCFL = 0; iCFL < nCFL; iCFL++)
       CFL[iCFL] = Unst_CFL;
   }
@@ -4392,7 +4394,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     /*--- Disable writing of limiters if enabled ---*/
     Wrt_Limiters = false;
 
-    if (Unsteady_Simulation) {
+    if (TimeMarching) {
 
       Restart_Flow = false;
 
@@ -5863,7 +5865,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     cout << endl <<"--------------- Time Numerical Integration  ( Zone "  << iZone << " ) ------------------" << endl;
 
     if (!fea) {
-		switch (Unsteady_Simulation) {
+		switch (TimeMarching) {
 		  case NO:
 			cout << "Local time stepping (steady state simulation)." << endl; break;
 		  case TIME_STEPPING:
@@ -5877,8 +5879,8 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 			else cout << "Unsteady time step provided by the user (s): "<< Delta_UnstTime << "." << endl;
 			break;
 		  case DT_STEPPING_1ST: case DT_STEPPING_2ND:
-			if (Unsteady_Simulation == DT_STEPPING_1ST) cout << "Unsteady simulation, dual time stepping strategy (first order in time)."<< endl;
-			if (Unsteady_Simulation == DT_STEPPING_2ND) cout << "Unsteady simulation, dual time stepping strategy (second order in time)."<< endl;
+			if (TimeMarching == DT_STEPPING_1ST) cout << "Unsteady simulation, dual time stepping strategy (first order in time)."<< endl;
+			if (TimeMarching == DT_STEPPING_2ND) cout << "Unsteady simulation, dual time stepping strategy (second order in time)."<< endl;
 			if (Unst_CFL != 0.0) cout << "Time step computed by the code. Unsteady CFL number: " << Unst_CFL <<"."<< endl;
 			else cout << "Unsteady time step provided by the user (s): "<< Delta_UnstTime << "." << endl;
 			cout << "Total number of internal Dual Time iterations: "<< Unst_nIntIter <<"." << endl;
@@ -5886,7 +5888,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 		}
   }
 	else {
-		switch (Dynamic_Analysis) {
+		switch (Time_Domain) {
 		  case NO:
 			cout << "Static structural analysis." << endl; break;
 		  case YES:
@@ -6087,7 +6089,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
         }
         MGTable.PrintFooter();
       }
-			if (Unsteady_Simulation != TIME_STEPPING) {
+			if (TimeMarching != TIME_STEPPING) {
 				cout << "Courant-Friedrichs-Lewy number:   ";
 				cout.precision(3);
 				cout.width(6); cout << CFL[0];
@@ -6212,7 +6214,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     if (Low_MemoryOutput) cout << "Writing output files with low memory RAM requirements."<< endl;
     cout << "Writing a solution file every " << Wrt_Sol_Freq <<" iterations."<< endl;
     cout << "Writing the convergence history every " << Wrt_Con_Freq <<" iterations."<< endl;
-    if ((Unsteady_Simulation == DT_STEPPING_1ST) || (Unsteady_Simulation == DT_STEPPING_2ND)) {
+    if ((TimeMarching == DT_STEPPING_1ST) || (TimeMarching == DT_STEPPING_2ND)) {
       cout << "Writing the dual time flow solution every " << Wrt_Sol_Freq_DualTime <<" iterations."<< endl;
       cout << "Writing the dual time convergence history every " << Wrt_Con_Freq_DualTime <<" iterations."<< endl;
     }
diff --git a/Common/src/dual_grid_structure.cpp b/Common/src/dual_grid_structure.cpp
index c550c58bca82..2c432e104e68 100644
--- a/Common/src/dual_grid_structure.cpp
+++ b/Common/src/dual_grid_structure.cpp
@@ -59,7 +59,7 @@ CPoint::CPoint(unsigned short val_nDim, unsigned long val_globalindex, CConfig *
 
   /*--- Volume (0 -> Vol_nP1, 1-> Vol_n, 2 -> Vol_nM1 ) and coordinates of the control volume ---*/
 
-  if (config->GetUnsteady_Simulation() == NO) { 
+  if (config->GetTime_Marching() == NO) { 
     Volume = new su2double[1]; 
     Volume[0] = 0.0; 
   }
@@ -122,7 +122,7 @@ CPoint::CPoint(unsigned short val_nDim, unsigned long val_globalindex, CConfig *
 
     /*--- Structures for storing old node coordinates for computing grid 
     velocities via finite differencing with dynamically deforming meshes. ---*/
-    if ( config->GetUnsteady_Simulation() != NO ) {
+    if ( config->GetTime_Marching() != NO ) {
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
@@ -153,7 +153,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, unsigned long val_g
 
   /*--- Volume (0 -> Vol_nP1, 1-> Vol_n, 2 -> Vol_nM1 ) and coordinates of the control volume ---*/
 
-  if (config->GetUnsteady_Simulation() == NO) { 
+  if (config->GetTime_Marching() == NO) { 
     Volume = new su2double[1]; 
     Volume[0] = 0.0; 
   }
@@ -215,7 +215,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, unsigned long val_g
 
     /*--- Structures for storing old node coordinates for computing grid
     velocities via finite differencing with dynamically deforming meshes. ---*/
-    if (config->GetUnsteady_Simulation() != NO) {
+    if (config->GetTime_Marching() != NO) {
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
@@ -250,7 +250,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, su2double val_coord
   GridVel = NULL;  GridVel_Grad = NULL;
 
   /*--- Volume (0 -> Vol_nP1, 1-> Vol_n, 2 -> Vol_nM1 ) and coordinates of the control volume ---*/
-  if ( config->GetUnsteady_Simulation() == NO ) { 
+  if ( config->GetTime_Marching() == NO ) { 
     Volume = new su2double[1]; 
     Volume[0] = 0.0; 
   }
@@ -314,7 +314,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, su2double val_coord
 
     /*--- Structures for storing old node coordinates for computing grid
     velocities via finite differencing with dynamically deforming meshes. ---*/
-    if ( config->GetUnsteady_Simulation() != NO ) {
+    if ( config->GetTime_Marching() != NO ) {
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
diff --git a/Common/src/fem_geometry_structure.cpp b/Common/src/fem_geometry_structure.cpp
index 079669d723f7..787f9258aab9 100644
--- a/Common/src/fem_geometry_structure.cpp
+++ b/Common/src/fem_geometry_structure.cpp
@@ -5435,14 +5435,14 @@ void CMeshFEM_DG::MetricTermsVolumeElements(CConfig *config) {
   bool FullMassMatrix   = false, FullInverseMassMatrix = false;
   bool LumpedMassMatrix = false, DerMetricTerms = false;
 
-  if(config->GetUnsteady_Simulation() == STEADY ||
-     config->GetUnsteady_Simulation() == ROTATIONAL_FRAME) {
+  if(config->GetTime_Marching() == STEADY ||
+     config->GetTime_Marching() == ROTATIONAL_FRAME) {
     if( UseLumpedMassMatrix) LumpedMassMatrix      = true;
     else                     FullInverseMassMatrix = true;
   }
-  else if(config->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-          config->GetUnsteady_Simulation() == DT_STEPPING_2ND ||
-          config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  else if(config->GetTime_Marching() == DT_STEPPING_1ST ||
+          config->GetTime_Marching() == DT_STEPPING_2ND ||
+          config->GetTime_Marching() == HARMONIC_BALANCE) {
     if( UseLumpedMassMatrix ) FullMassMatrix = LumpedMassMatrix = true;
     else                      FullInverseMassMatrix = true;
   }
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 0e4e19fd98e9..64d49dbf4d16 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -780,7 +780,7 @@ void CGeometry::InitiateComms(CGeometry *geometry,
       MPI_TYPE         = COMM_TYPE_DOUBLE;
       break;
     case COORDINATES_OLD:
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      if (config->GetTime_Marching() == DT_STEPPING_2ND)
         COUNT_PER_POINT  = nDim*2;
       else
         COUNT_PER_POINT  = nDim;
@@ -861,7 +861,7 @@ void CGeometry::InitiateComms(CGeometry *geometry,
             for (iDim = 0; iDim < nDim; iDim++) {
               bufDSend[buf_offset+iDim] = vector[iDim];
             }
-            if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) {
+            if (config->GetTime_Marching() == DT_STEPPING_2ND) {
               vector = node[iPoint]->GetCoord_n1();
               for (iDim = 0; iDim < nDim; iDim++) {
                 bufDSend[buf_offset+nDim+iDim] = vector[iDim];
@@ -960,7 +960,7 @@ void CGeometry::CompleteComms(CGeometry *geometry,
             break;
           case COORDINATES_OLD:
             node[iPoint]->SetCoord_n(&bufDRecv[buf_offset]);
-            if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+            if (config->GetTime_Marching() == DT_STEPPING_2ND)
               node[iPoint]->SetCoord_n1(&bufDRecv[buf_offset+nDim]);
             break;
           case MAX_LENGTH:
@@ -7334,7 +7334,7 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel(CConfig *config, string val_mes
   string::size_type position;
   bool domain_flag = false;
   bool found_transform = false;
-  bool harmonic_balance = config->GetUnsteady_Simulation() == HARMONIC_BALANCE;
+  bool harmonic_balance = config->GetTime_Marching() == HARMONIC_BALANCE;
   bool multizone_file = config->GetMultizone_Mesh();
   bool actuator_disk  = (((config->GetnMarker_ActDiskInlet() != 0) ||
                           (config->GetnMarker_ActDiskOutlet() != 0)) &&
@@ -15761,9 +15761,9 @@ void CPhysicalGeometry::SetGridVelocity(CConfig *config, unsigned long iter) {
     /*--- Compute mesh velocity with 1st or 2nd-order approximation ---*/
     
     for (iDim = 0; iDim < nDim; iDim++) {
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      if (config->GetTime_Marching() == DT_STEPPING_1ST)
         GridVel = ( Coord_nP1[iDim] - Coord_n[iDim] ) / TimeStep;
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      if (config->GetTime_Marching() == DT_STEPPING_2ND)
         GridVel = ( 3.0*Coord_nP1[iDim] - 4.0*Coord_n[iDim]
                    + 1.0*Coord_nM1[iDim] ) / (2.0*TimeStep);
       
@@ -15959,11 +15959,11 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
   
   unsigned long iTimeIter, nTimeIter;
   su2double delta_T, total_T;
-  if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+  if (config->GetTime_Marching() && config->GetTime_Domain()) {
     nTimeIter = config->GetUnst_AdjointIter();
     delta_T  = config->GetTime_Step();
     total_T  = (su2double)nTimeIter*delta_T;
-  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  } else if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     
     /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
     
@@ -15990,11 +15990,11 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     strcpy (cstr, surfadj_filename.c_str());
     
     /*--- Write file name with extension if unsteady or steady ---*/
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)
+    if (config->GetTime_Marching() == HARMONIC_BALANCE)
     	SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(iTimeIter));
 
-    if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
-        (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
+    if ((config->GetTime_Marching() && config->GetTime_Domain()) ||
+        (config->GetTime_Marching() == HARMONIC_BALANCE)) {
       if ((SU2_TYPE::Int(iTimeIter) >= 0)    && (SU2_TYPE::Int(iTimeIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iTimeIter));
       if ((SU2_TYPE::Int(iTimeIter) >= 10)   && (SU2_TYPE::Int(iTimeIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iTimeIter));
       if ((SU2_TYPE::Int(iTimeIter) >= 100)  && (SU2_TYPE::Int(iTimeIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iTimeIter));
@@ -16096,7 +16096,7 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   
   Sensitivity = new su2double[nPoint*nDim];
 
-  if (config->GetUnsteady_Simulation()) {
+  if (config->GetTime_Marching()) {
     nTimeIter = config->GetTimeIter();
   }else {
     nTimeIter = 1;
@@ -19604,9 +19604,9 @@ void CMultiGridGeometry::SetGridVelocity(CConfig *config, unsigned long iter) {
     /*--- Compute mesh velocity with 1st or 2nd-order approximation ---*/
     
     for (iDim = 0; iDim < nDim; iDim++) {
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      if (config->GetTime_Marching() == DT_STEPPING_1ST)
         GridVel = ( Coord_nP1[iDim] - Coord_n[iDim] ) / TimeStep;
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      if (config->GetTime_Marching() == DT_STEPPING_2ND)
         GridVel = ( 3.0*Coord_nP1[iDim] - 4.0*Coord_n[iDim]
                    +  1.0*Coord_nM1[iDim] ) / (2.0*TimeStep);
       
diff --git a/Common/src/geometry_structure_fem_part.cpp b/Common/src/geometry_structure_fem_part.cpp
index aeba5b478131..21b8ae00d7ed 100644
--- a/Common/src/geometry_structure_fem_part.cpp
+++ b/Common/src/geometry_structure_fem_part.cpp
@@ -424,7 +424,7 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel_FEM(CConfig        *config,
   string::size_type position;
   unsigned long nDOFsGrid_Local = 0, loc_element_count = 0;
   bool domain_flag   = false;
-  bool time_spectral = config->GetUnsteady_Simulation() == HARMONIC_BALANCE;
+  bool time_spectral = config->GetTime_Marching() == HARMONIC_BALANCE;
   unsigned short nMarker_Max = config->GetnMarker_Max();
   nZone = val_nZone;
 
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 6440021e5d43..827be22dbd45 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -1903,7 +1903,7 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
   su2double rotMatrix[3][3] = {{0.0,0.0,0.0}, {0.0,0.0,0.0}, {0.0,0.0,0.0}};
   su2double dtheta, dphi, dpsi, cosTheta, sinTheta;
   su2double cosPhi, sinPhi, cosPsi, sinPsi;
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool adjoint = config->GetContinuous_Adjoint();
 
 
@@ -2066,7 +2066,7 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
   unsigned short iDim;
   unsigned short nDim = geometry->GetnDim();
   unsigned long iPoint;
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool adjoint = config->GetContinuous_Adjoint();
 
   
@@ -2213,7 +2213,7 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
   su2double deltaT, time_new, time_old;
   unsigned short iDim, nDim = geometry->GetnDim();
   unsigned long iPoint;
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool adjoint = config->GetContinuous_Adjoint();
 
   
@@ -2345,7 +2345,7 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
   su2double deltaT, time_new, time_old;
   unsigned short iDim, nDim = geometry->GetnDim();
   unsigned long iPoint;
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool adjoint = config->GetContinuous_Adjoint();
 
   
@@ -6440,7 +6440,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
   char buffer[50];
   string DV_Filename, UnstExt, text_line;
   ifstream surface_positions;
-  bool unsteady = config->GetUnsteady_Simulation();
+  bool unsteady = config->GetTime_Marching();
   bool adjoint = config->GetContinuous_Adjoint();
   
   /*--- Load stuff from config ---*/
diff --git a/Common/src/toolboxes/MMS/CIncTGVSolution.cpp b/Common/src/toolboxes/MMS/CIncTGVSolution.cpp
index 6f583833f022..2482962891e3 100644
--- a/Common/src/toolboxes/MMS/CIncTGVSolution.cpp
+++ b/Common/src/toolboxes/MMS/CIncTGVSolution.cpp
@@ -74,9 +74,9 @@ CIncTGVSolution::CIncTGVSolution(unsigned short val_nDim,
   
   /*--- Perform some sanity and error checks for this solution here. ---*/
   
-  if((config->GetUnsteady_Simulation() != TIME_STEPPING) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_1ST) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_2ND))
+  if((config->GetTime_Marching() != TIME_STEPPING) &&
+     (config->GetTime_Marching() != DT_STEPPING_1ST) &&
+     (config->GetTime_Marching() != DT_STEPPING_2ND))
     SU2_MPI::Error("Unsteady mode must be selected for the incompressible Taylor Green Vortex",
                    CURRENT_FUNCTION);
   
diff --git a/Common/src/toolboxes/MMS/CInviscidVortexSolution.cpp b/Common/src/toolboxes/MMS/CInviscidVortexSolution.cpp
index 6a5136d881cb..11e35e48f69e 100644
--- a/Common/src/toolboxes/MMS/CInviscidVortexSolution.cpp
+++ b/Common/src/toolboxes/MMS/CInviscidVortexSolution.cpp
@@ -71,9 +71,9 @@ CInviscidVortexSolution::CInviscidVortexSolution(unsigned short val_nDim,
   gamOvGm1 = ovGm1*Gamma;
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if((config->GetUnsteady_Simulation() != TIME_STEPPING) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_1ST) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_2ND))
+  if((config->GetTime_Marching() != TIME_STEPPING) &&
+     (config->GetTime_Marching() != DT_STEPPING_1ST) &&
+     (config->GetTime_Marching() != DT_STEPPING_2ND))
     SU2_MPI::Error("Unsteady mode must be selected for the inviscid vortex",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CMMSIncEulerSolution.cpp b/Common/src/toolboxes/MMS/CMMSIncEulerSolution.cpp
index 19df6207057e..b7d1fb4b465f 100644
--- a/Common/src/toolboxes/MMS/CMMSIncEulerSolution.cpp
+++ b/Common/src/toolboxes/MMS/CMMSIncEulerSolution.cpp
@@ -71,7 +71,7 @@ CMMSIncEulerSolution::CMMSIncEulerSolution(unsigned short val_nDim,
   epsilon = 0.001;
   
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS incompressible Euler case",
                    CURRENT_FUNCTION);
   
diff --git a/Common/src/toolboxes/MMS/CMMSIncNSSolution.cpp b/Common/src/toolboxes/MMS/CMMSIncNSSolution.cpp
index 762208dfb546..c60ea393e693 100644
--- a/Common/src/toolboxes/MMS/CMMSIncNSSolution.cpp
+++ b/Common/src/toolboxes/MMS/CMMSIncNSSolution.cpp
@@ -72,7 +72,7 @@ CMMSIncNSSolution::CMMSIncNSSolution(unsigned short val_nDim,
   epsilon = 0.001;
   
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS incompressible NS case",
                    CURRENT_FUNCTION);
   
diff --git a/Common/src/toolboxes/MMS/CMMSNSTwoHalfCirclesSolution.cpp b/Common/src/toolboxes/MMS/CMMSNSTwoHalfCirclesSolution.cpp
index 0a691dd6ab25..cebfa3bd8bef 100644
--- a/Common/src/toolboxes/MMS/CMMSNSTwoHalfCirclesSolution.cpp
+++ b/Common/src/toolboxes/MMS/CMMSNSTwoHalfCirclesSolution.cpp
@@ -89,7 +89,7 @@ CMMSNSTwoHalfCirclesSolution::CMMSNSTwoHalfCirclesSolution(unsigned short val_nD
   a_T2 = -0.85;
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS NS Two Half Circles case",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CMMSNSTwoHalfSpheresSolution.cpp b/Common/src/toolboxes/MMS/CMMSNSTwoHalfSpheresSolution.cpp
index 827cfb790cbd..72be6be29833 100644
--- a/Common/src/toolboxes/MMS/CMMSNSTwoHalfSpheresSolution.cpp
+++ b/Common/src/toolboxes/MMS/CMMSNSTwoHalfSpheresSolution.cpp
@@ -94,7 +94,7 @@ CMMSNSTwoHalfSpheresSolution::CMMSNSTwoHalfSpheresSolution(unsigned short val_nD
     SU2_MPI::Error("Grid must be 3D for the MMS NS Two Half Spheres case",
                    CURRENT_FUNCTION);
 
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS NS Two Half Spheres case",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolution.cpp b/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolution.cpp
index bcc77e882b7f..b3bee18b42d6 100644
--- a/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolution.cpp
+++ b/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolution.cpp
@@ -98,7 +98,7 @@ CMMSNSUnitQuadSolution::CMMSNSUnitQuadSolution(unsigned short val_nDim,
   v_y     =      4.0;
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS NS Unit Quad case",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolutionWallBC.cpp b/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolutionWallBC.cpp
index 5f5a517bb631..dc94d1525626 100644
--- a/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolutionWallBC.cpp
+++ b/Common/src/toolboxes/MMS/CMMSNSUnitQuadSolutionWallBC.cpp
@@ -91,7 +91,7 @@ CMMSNSUnitQuadSolutionWallBC::CMMSNSUnitQuadSolutionWallBC(unsigned short val_nD
   a_T2 = -0.85;
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the MMS NS Unit Quad case with wall BCs.",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CNSUnitQuadSolution.cpp b/Common/src/toolboxes/MMS/CNSUnitQuadSolution.cpp
index 103667f6f015..2e64ad54dfd7 100644
--- a/Common/src/toolboxes/MMS/CNSUnitQuadSolution.cpp
+++ b/Common/src/toolboxes/MMS/CNSUnitQuadSolution.cpp
@@ -64,7 +64,7 @@ CNSUnitQuadSolution::CNSUnitQuadSolution(unsigned short val_nDim,
   Viscosity = config->GetMu_ConstantND();
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the NS Unit Quad case",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CRinglebSolution.cpp b/Common/src/toolboxes/MMS/CRinglebSolution.cpp
index 77f53bdcabb5..e52728710b36 100644
--- a/Common/src/toolboxes/MMS/CRinglebSolution.cpp
+++ b/Common/src/toolboxes/MMS/CRinglebSolution.cpp
@@ -61,7 +61,7 @@ CRinglebSolution::CRinglebSolution(unsigned short val_nDim,
   tGamOvGm1 = Gamma*tovGm1;
 
   /*--- Perform some sanity and error checks for this solution here. ---*/
-  if(config->GetUnsteady_Simulation() != STEADY)
+  if(config->GetTime_Marching() != STEADY)
     SU2_MPI::Error("Steady mode must be selected for the Ringleb case",
                    CURRENT_FUNCTION);
 
diff --git a/Common/src/toolboxes/MMS/CTGVSolution.cpp b/Common/src/toolboxes/MMS/CTGVSolution.cpp
index 7ade895e3c40..bdaa7e9e089e 100644
--- a/Common/src/toolboxes/MMS/CTGVSolution.cpp
+++ b/Common/src/toolboxes/MMS/CTGVSolution.cpp
@@ -68,9 +68,9 @@ CTGVSolution::CTGVSolution(unsigned short val_nDim,
   
   /*--- Perform some sanity and error checks for this solution here. ---*/
 
-  if((config->GetUnsteady_Simulation() != TIME_STEPPING) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_1ST) &&
-     (config->GetUnsteady_Simulation() != DT_STEPPING_2ND))
+  if((config->GetTime_Marching() != TIME_STEPPING) &&
+     (config->GetTime_Marching() != DT_STEPPING_1ST) &&
+     (config->GetTime_Marching() != DT_STEPPING_2ND))
     SU2_MPI::Error("Unsteady mode must be selected for the Taylor Green Vortex",
                    CURRENT_FUNCTION); 
 
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 646edc9f228e..0920efac9360 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) {
   if (!dry_run){
     
     if (((config->GetSinglezone_Driver() || (nZone == 1 && config->GetDiscrete_Adjoint()))
-         && config->GetUnsteady_Simulation() != HARMONIC_BALANCE && (!turbo)) || (turbo && config->GetDiscrete_Adjoint())) {
+         && config->GetTime_Marching() != HARMONIC_BALANCE && (!turbo)) || (turbo && config->GetDiscrete_Adjoint())) {
       
       
       /*--- Single zone problem: instantiate the single zone driver class. ---*/
@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) {
       
       driver = new CMultizoneDriver(config_file_name, nZone, MPICommunicator);
       
-    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    } else if (config->GetTime_Marching() == HARMONIC_BALANCE) {
       
       /*--- Harmonic balance problem: instantiate the Harmonic Balance driver class. ---*/
       
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
       
     } else if ((nZone == 2) && fsi) {
       
-      bool stat_fsi = ((config->GetDynamic_Analysis() == STATIC) && (config->GetUnsteady_Simulation() == STEADY));
+      bool stat_fsi = ((!config->GetTime_Domain()));
       bool disc_adj_fsi = (config->GetDiscrete_Adjoint());
       
       /*--- If the problem is a discrete adjoint FSI problem ---*/
diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
index f96bc2c696ee..13f2b9bed06e 100644
--- a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -275,7 +275,7 @@ void CDiscAdjSinglezoneDriver::SetRecording(unsigned short kind_recording){
 
 void CDiscAdjSinglezoneDriver::SetAdj_ObjFunction(){
 
-  bool time_stepping = config->GetUnsteady_Simulation() != STEADY;
+  bool time_stepping = config->GetTime_Marching() != STEADY;
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
   su2double seeding = 1.0;
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index e2c03b91b938..0ee254978df6 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -871,7 +871,7 @@ void CDriver::Geometrical_Preprocessing_FVM(CConfig *config, CGeometry **&geomet
   /*--- For unsteady simulations, initialize the grid volumes
    and coordinates for previous solutions. Loop over all zones/grids ---*/
   
-  if (config->GetUnsteady_Simulation() && config->GetGrid_Movement()) {
+  if (config->GetTime_Marching() && config->GetGrid_Movement()) {
     for (iMGlevel = 0; iMGlevel <= config->GetnMGLevels(); iMGlevel++) {
       for (iPoint = 0; iPoint < geometry[iMGlevel]->GetnPoint(); iPoint++) {
         
@@ -1287,14 +1287,14 @@ void CDriver::Inlet_Preprocessing(CSolver ***solver, CGeometry **geometry,
 
   /*--- Adjust iteration number for unsteady restarts. ---*/
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   bool adjoint = (config->GetDiscrete_Adjoint() || config->GetContinuous_Adjoint());
 
   if (dual_time) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-    else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+    else if (config->GetTime_Marching() == DT_STEPPING_1ST)
       val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
   }
@@ -1418,15 +1418,15 @@ void CDriver::Solver_Restart(CSolver ***solver, CGeometry **geometry,
 
   /*--- Adjust iteration number for unsteady restarts. ---*/
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   bool adjoint = (config->GetDiscrete_Adjoint() || config->GetContinuous_Adjoint());
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC); // Dynamic simulation (FSI).
+  bool time_domain = (config->GetTime_Domain()); // Dynamic simulation (FSI).
 
   if (dual_time) {
     if (adjoint) val_iter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-    else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+    else if (config->GetTime_Marching() == DT_STEPPING_1ST)
       val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     else val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
   }
@@ -1480,7 +1480,7 @@ void CDriver::Solver_Restart(CSolver ***solver, CGeometry **geometry,
       solver[MESH_0][TURB_SOL]->LoadRestart(geometry, solver, config, val_iter, update_geo);
     }
     if (fem) {
-      if (dynamic) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+      if (time_domain) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       solver[MESH_0][FEA_SOL]->LoadRestart(geometry, solver, config, val_iter, update_geo);
     }
     if (fem_euler || fem_ns) {
@@ -1513,7 +1513,7 @@ void CDriver::Solver_Restart(CSolver ***solver, CGeometry **geometry,
         solver[MESH_0][ADJHEAT_SOL]->LoadRestart(geometry, solver, config, val_iter, update_geo);
     }
     if (disc_adj_fem) {
-        if (dynamic) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+        if (time_domain) val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
         solver[MESH_0][ADJFEA_SOL]->LoadRestart(geometry, solver, config, val_iter, update_geo);
     }
     if (disc_adj_heat) {
@@ -3132,7 +3132,7 @@ void CDriver::DynamicMesh_Preprocessing(CConfig *config, CGeometry **geometry, C
     
     surface_movement = new CSurfaceMovement();
     surface_movement->CopyBoundary(geometry[MESH_0], config);
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE){
+    if (config->GetTime_Marching() == HARMONIC_BALANCE){
       if (rank == MASTER_NODE) cout << endl <<  "Instance "<< iInst + 1 <<":" << endl;
       iteration->SetGrid_Movement(geometry, surface_movement, grid_movement,  solver, config, 0, iInst);
     }
@@ -3885,7 +3885,7 @@ void CFluidDriver::Preprocess(unsigned long Iter) {
 
   for (iZone = 0; iZone < nZone; iZone++) {  
     config_container[iZone]->SetInnerIter(Iter);
-    if (config_container[iZone]->GetUnsteady_Simulation())
+    if (config_container[iZone]->GetTime_Marching())
       config_container[iZone]->SetPhysicalTime(static_cast<su2double>(Iter)*config_container[iZone]->GetDelta_UnstTimeND());
     else
       config_container[iZone]->SetPhysicalTime(0.0);
@@ -3932,7 +3932,7 @@ void CFluidDriver::Run() {
    zones and executing the iterations. Note that data transers between zones
    and other intermediate procedures may be required. ---*/
 
-  unsteady = (config_container[MESH_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[MESH_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  unsteady = (config_container[MESH_0]->GetTime_Marching() == DT_STEPPING_1ST) || (config_container[MESH_0]->GetTime_Marching() == DT_STEPPING_2ND);
 
   /*--- Zone preprocessing ---*/
 
@@ -4012,7 +4012,7 @@ void CFluidDriver::DynamicMeshUpdate(unsigned long TimeIter) {
   bool harmonic_balance;
 
   for (iZone = 0; iZone < nZone; iZone++) {
-   harmonic_balance = (config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+   harmonic_balance = (config_container[iZone]->GetTime_Marching() == HARMONIC_BALANCE);
     /*--- Dynamic mesh update ---*/
     if ((config_container[iZone]->GetGrid_Movement()) && (!harmonic_balance)) {
       iteration_container[iZone][INST_0]->SetGrid_Movement(geometry_container[iZone][INST_0], surface_movement[iZone], grid_movement[iZone][INST_0], solver_container[iZone][INST_0], config_container[iZone], 0, TimeIter );
@@ -4987,9 +4987,9 @@ void CFSIDriver::Run() {
   unsigned short iZone;
 
   /*--- Boolean to determine if we are running a static or dynamic case ---*/
-  bool stat_fsi = ((config_container[ZONE_FLOW]->GetUnsteady_Simulation() == STEADY) && (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == STATIC));
-  bool dyn_fsi = (((config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_2ND))
-                   && (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC));
+  bool stat_fsi = (!config_container[ZONE_STRUCT]->GetTime_Domain());
+  bool dyn_fsi = (((config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_1ST) || (config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_2ND))
+                   && (config_container[ZONE_STRUCT]->GetTime_Domain()));
 
   unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetInnerIter(IntIter);
   unsigned long OuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
@@ -5657,8 +5657,8 @@ void CDiscAdjFSIDriver::Preprocess(unsigned short ZONE_FLOW,
   config_container[ZONE_0]->SetInnerIter(IntIter);
   unsigned short ExtIter = config_container[ZONE_FLOW]->GetTimeIter();
 
-  bool dual_time_1st = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
-  bool dual_time_2nd = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time_1st = (config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_1ST);
+  bool dual_time_2nd = (config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_2ND);
   bool turbulent = (config_container[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS) ||
                    (config_container[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_INC_RANS);
   bool dual_time = (dual_time_1st || dual_time_2nd);
@@ -5672,7 +5672,7 @@ void CDiscAdjFSIDriver::Preprocess(unsigned short ZONE_FLOW,
 
   /*--- For the unsteady adjoint, load direct solutions from restart files. ---*/
 
-  if (config_container[ZONE_FLOW]->GetUnsteady_Simulation()) {
+  if (config_container[ZONE_FLOW]->GetTime_Marching()) {
 
     Direct_Iter_Flow = SU2_TYPE::Int(config_container[ZONE_FLOW]->GetUnst_AdjointIter()) - SU2_TYPE::Int(ExtIter) - 2;
 
@@ -5823,7 +5823,7 @@ void CDiscAdjFSIDriver::Preprocess(unsigned short ZONE_FLOW,
   IntIter = 0;
   config_container[ZONE_STRUCT]->SetInnerIter(IntIter);
   ExtIter = config_container[ZONE_STRUCT]->GetTimeIter();
-  bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config_container[ZONE_STRUCT]->GetTime_Domain());
 
   int Direct_Iter_FEA;
 
@@ -5912,8 +5912,8 @@ void CDiscAdjFSIDriver::PrintDirect_Residuals(unsigned short ZONE_FLOW,
   bool turbulent = (config_container[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_RANS) ||
                    (config_container[ZONE_FLOW]->GetKind_Solver() == DISC_ADJ_INC_RANS);
   bool nonlinear_analysis = (config_container[ZONE_STRUCT]->GetGeometricConditions() == LARGE_DEFORMATIONS);   // Nonlinear analysis.
-  bool unsteady = config_container[ZONE_FLOW]->GetUnsteady_Simulation() != NONE;
-  bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
+  bool unsteady = config_container[ZONE_FLOW]->GetTime_Marching() != NONE;
+  bool dynamic = (config_container[ZONE_STRUCT]->GetTime_Domain());
 
   su2double val_OFunction = 0.0;
   string kind_OFunction;
@@ -6194,8 +6194,8 @@ void CDiscAdjFSIDriver::SetRecording(unsigned short ZONE_FLOW,
                                               unsigned short kind_recording){
 
   unsigned long IntIter = config_container[ZONE_0]->GetInnerIter();
-  bool unsteady = (config_container[ZONE_FLOW]->GetUnsteady_Simulation() != NONE);
-  bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
+  bool unsteady = (config_container[ZONE_FLOW]->GetTime_Marching() != NONE);
+  bool dynamic = (config_container[ZONE_STRUCT]->GetTime_Domain());
 
   string kind_DirectIteration = " ";
   string kind_AdjointIteration = " ";
@@ -6412,10 +6412,10 @@ void CDiscAdjFSIDriver::Iterate_Block(unsigned short ZONE_FLOW,
                                                 unsigned short kind_recording){
 
   unsigned long IntIter=0, nIntIter = 1;
-  bool dual_time_1st = (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
-  bool dual_time_2nd = (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time_1st = (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST);
+  bool dual_time_2nd = (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
-  bool dynamic = (config_container[ZONE_STRUCT]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config_container[ZONE_STRUCT]->GetTime_Domain());
 
   bool adjoint_convergence = false;
 
@@ -7027,7 +7027,7 @@ void CMultiphysicsZonalDriver::Run() {
    zones and executing the iterations. Note that data transers between zones
    and other intermediate procedures may be required. ---*/
 
-  unsteady = (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config_container[MESH_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  unsteady = (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) || (config_container[MESH_0]->GetTime_Marching() == DT_STEPPING_2ND);
 
   /*--- Zone preprocessing ---*/
 
@@ -7119,7 +7119,7 @@ void CMultiphysicsZonalDriver::DynamicMeshUpdate(unsigned long ExtIter) {
   bool harmonic_balance;
 
   for (iZone = 0; iZone < nZone; iZone++) {
-   harmonic_balance = (config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+   harmonic_balance = (config_container[iZone]->GetTime_Marching() == HARMONIC_BALANCE);
     /*--- Dynamic mesh update ---*/
     if ((config_container[iZone]->GetGrid_Movement()) && (!harmonic_balance)) {
       
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 5b4e8839d04a..eb70c5206d79 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -508,18 +508,18 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         
         /*--- Unsteady problems ---*/
         
-        (((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-          (config_container[iZone]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
+        (((config_container[iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+          (config_container[iZone]->GetTime_Marching() == TIME_STEPPING)) &&
          ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
         
-        ((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+        ((config_container[iZone]->GetTime_Marching() == DT_STEPPING_2ND) &&
          ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0) ||
                               ((TimeIter-1) % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
         
-        ((config_container[iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+        ((config_container[iZone]->GetTime_Marching() == DT_STEPPING_2ND) &&
          ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
         
-        ((config_container[iZone]->GetDynamic_Analysis() == DYNAMIC) &&
+        ((config_container[iZone]->GetTime_Domain()) &&
          ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
         
         /*--- No inlet profile file found. Print template. ---*/
@@ -612,7 +612,7 @@ void CMultizoneDriver::DynamicMeshUpdate(unsigned long TimeIter) {
   bool harmonic_balance;
 
   for (iZone = 0; iZone < nZone; iZone++) {
-   harmonic_balance = (config_container[iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+   harmonic_balance = (config_container[iZone]->GetTime_Marching() == HARMONIC_BALANCE);
     /*--- Dynamic mesh update ---*/
     if ((config_container[iZone]->GetGrid_Movement()) && (!harmonic_balance) && (!fsi)) {
       iteration_container[iZone][INST_0]->SetGrid_Movement(geometry_container[iZone][INST_0],surface_movement[iZone], 
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index fed37a856d8d..a0cc99a9065c 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -118,7 +118,7 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
    this can be used for verification / MMS. This should also be more
    general once the drivers are more stable. ---*/
   
-  if (config_container[ZONE_0]->GetUnsteady_Simulation())
+  if (config_container[ZONE_0]->GetTime_Marching())
     config_container[ZONE_0]->SetPhysicalTime(static_cast<su2double>(TimeIter)*config_container[ZONE_0]->GetDelta_UnstTimeND());
   else
     config_container[ZONE_0]->SetPhysicalTime(0.0);
@@ -203,18 +203,18 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
       /*--- Unsteady problems ---*/
 
-      (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-        (config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) &&
+      (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
+        (config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING)) &&
        ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
 
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+      ((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND) &&
        ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0) ||
                            ((TimeIter-1) % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
 
-      ((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND) &&
+      ((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND) &&
        ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
 
-      ((config_container[ZONE_0]->GetDynamic_Analysis() == DYNAMIC) &&
+      ((config_container[ZONE_0]->GetTime_Domain()) &&
        ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
 
       /*--- No inlet profile file found. Print template. ---*/
diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp
index 319dbdcb1b4a..0f0b89643bd2 100644
--- a/SU2_CFD/src/integration_structure.cpp
+++ b/SU2_CFD/src/integration_structure.cpp
@@ -65,8 +65,8 @@ void CIntegration::Space_Integration(CGeometry *geometry,
   unsigned short iMarker, KindBC;
   
   unsigned short MainSolver = config->GetContainerPosition(RunTime_EqSystem);
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Compute inviscid residuals ---*/
   
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index 9cf3fd759409..d999686e2a8f 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -985,7 +985,7 @@ void CFEM_DG_Integration::SingleGrid_Iteration(CGeometry ****geometry,
         algorithm below. ---*/
   bool TimeSyncSpecified   = false;
   const su2double TimeSync = config[iZone]->GetTime_Step()/config[iZone]->GetTime_Ref();
-  if(config[iZone]->GetUnsteady_Simulation() == TIME_STEPPING &&
+  if(config[iZone]->GetTime_Marching() == TIME_STEPPING &&
      config[iZone]->GetUnst_CFL()            != 0.0           &&
      TimeSync                                != 0.0) TimeSyncSpecified = true;
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 57e4ca41ea10..249d711ed286 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -593,7 +593,7 @@ void CFluidIteration::Iterate(COutput *output,
                                  unsigned short val_iInst) {
   unsigned long InnerIter, TimeIter;
   
-  bool unsteady = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool unsteady = (config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) || (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND);
   bool frozen_visc = (config[val_iZone]->GetContinuous_Adjoint() && config[val_iZone]->GetFrozen_Visc_Cont()) ||
                      (config[val_iZone]->GetDiscrete_Adjoint() && config[val_iZone]->GetFrozen_Visc_Disc());
   TimeIter = config[val_iZone]->GetTimeIter();
@@ -693,8 +693,8 @@ void CFluidIteration::Update(COutput *output,
 
   /*--- Dual time stepping strategy ---*/
   
-  if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+  if ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)) {
     
     /*--- Update dual time solver on all mesh levels ---*/
     
@@ -1290,8 +1290,8 @@ void CHeatIteration::Update(COutput *output,
   unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
   
   /*--- Dual time stepping strategy ---*/
-  if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+  if ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)) {
     
     /*--- Update dual time solver ---*/
     for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
@@ -1341,8 +1341,8 @@ void CHeatIteration::Solve(COutput *output,
                              unsigned short val_iInst) {
 
   /*--- Boolean to determine if we are running a steady or unsteady case ---*/
-  bool steady = (config[val_iZone]->GetUnsteady_Simulation() == STEADY);
-  bool unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) || (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool steady = (config[val_iZone]->GetTime_Marching() == STEADY);
+  bool unsteady = ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) || (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND));
 
   unsigned short Inner_Iter, nInner_Iter = config[val_iZone]->GetnInner_Iter();
   bool StopCalc = false;
@@ -1675,8 +1675,8 @@ void CFEAIteration::Update(COutput *output,
 
   su2double Physical_dt, Physical_t;
     unsigned long TimeIter = config[val_iZone]->GetTimeIter();
-  bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);          // Dynamic problems
-  bool static_fem = (config[val_iZone]->GetDynamic_Analysis() == STATIC);         // Static problems
+  bool dynamic = (config[val_iZone]->GetTime_Domain());          // Dynamic problems
+  bool static_fem = (!config[val_iZone]->GetTime_Domain());         // Static problems
   bool fsi = config[val_iZone]->GetFSI_Simulation();         // Fluid-Structure Interaction problems
 
 
@@ -1852,23 +1852,23 @@ void CAdjFluidIteration::Preprocess(COutput *output,
                                        unsigned short val_iInst) {
   
   unsigned short iMesh;
-  bool harmonic_balance = (config[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config[ZONE_0]->GetTime_Marching() == HARMONIC_BALANCE);
   bool dynamic_mesh = config[ZONE_0]->GetGrid_Movement();
   unsigned long InnerIter = 0; 
   unsigned long TimeIter = config[ZONE_0]->GetTimeIter();
 
   /*--- For the unsteady adjoint, load a new direct solution from a restart file. ---*/
   
-  if (((dynamic_mesh && TimeIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) && !harmonic_balance) {
+  if (((dynamic_mesh && TimeIter == 0) || config[val_iZone]->GetTime_Marching()) && !harmonic_balance) {
     int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 1;
-    if (rank == MASTER_NODE && val_iZone == ZONE_0 && config[val_iZone]->GetUnsteady_Simulation())
+    if (rank == MASTER_NODE && val_iZone == ZONE_0 && config[val_iZone]->GetTime_Marching())
       cout << endl << " Loading flow solution from direct iteration " << Direct_Iter << "." << endl;
     solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->LoadRestart(geometry[val_iZone][val_iInst], solver[val_iZone][val_iInst], config[val_iZone], Direct_Iter, true);
   }
   
   /*--- Continuous adjoint Euler, Navier-Stokes or Reynolds-averaged Navier-Stokes (RANS) equations ---*/
   
-  if ((InnerIter == 0) || config[val_iZone]->GetUnsteady_Simulation()) {
+  if ((InnerIter == 0) || config[val_iZone]->GetTime_Marching()) {
     
     if (config[val_iZone]->GetKind_Solver() == ADJ_EULER)
       config[val_iZone]->SetGlobalParam(ADJ_EULER, RUNTIME_FLOW_SYS);
@@ -2009,8 +2009,8 @@ void CAdjFluidIteration::Update(COutput *output,
   
   /*--- Dual time stepping strategy ---*/
   
-  if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+  if ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)) {
     
     /*--- Update dual time solver ---*/
     
@@ -2054,8 +2054,8 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
 
   unsigned long iPoint;
   unsigned short TimeIter = config[val_iZone]->GetTimeIter();
-  bool dual_time_1st = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
-  bool dual_time_2nd = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time_1st = (config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST);
+  bool dual_time_2nd = (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
   unsigned short iMesh;
   int Direct_Iter;
@@ -2071,7 +2071,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
 
   /*--- For the unsteady adjoint, load direct solutions from restart files. ---*/
 
-  if (config[val_iZone]->GetUnsteady_Simulation()) {
+  if (config[val_iZone]->GetTime_Marching()) {
 
     Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2;
 
@@ -2541,8 +2541,8 @@ void CDiscAdjFluidIteration::Update(COutput *output,
 
   /*--- Dual time stepping strategy ---*/
 
-  if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+  if ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)) {
 
     for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
       integration[val_iZone][val_iInst][ADJFLOW_SOL]->SetConvergence(false);
@@ -2562,7 +2562,7 @@ bool CDiscAdjFluidIteration::Monitor(COutput *output,
     unsigned short val_iInst)     {
 
   bool StopCalc = false;
-  bool steady = (config[val_iZone]->GetUnsteady_Simulation() == STEADY);
+  bool steady = (config[val_iZone]->GetTime_Marching() == STEADY);
   bool output_history = false;
 
 #ifndef HAVE_MPI
@@ -2620,7 +2620,7 @@ CDiscAdjFEAIteration::CDiscAdjFEAIteration(CConfig *config) : CIteration(config)
     for (iVar = 0; iVar < config->GetnPoissonRatio(); iVar++)
       myfile_res << "Sens_Nu_" << iVar << "\t";
 
-    if (config->GetDynamic_Analysis() == DYNAMIC){
+    if (config->GetTime_Domain()){
         for (iVar = 0; iVar < config->GetnMaterialDensity(); iVar++)
           myfile_res << "Sens_Rho_" << iVar << "\t";
     }
@@ -2652,7 +2652,7 @@ void CDiscAdjFEAIteration::Preprocess(COutput *output,
 
   unsigned long iPoint;
   unsigned short TimeIter = config[val_iZone]->GetTimeIter();
-  bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config[val_iZone]->GetTime_Domain());
 
   int Direct_Iter;
 
@@ -2763,7 +2763,7 @@ void CDiscAdjFEAIteration::Iterate(COutput *output,
                                         unsigned short val_iInst) {
 
 
-  bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config[val_iZone]->GetTime_Domain());
 
   /*--- Extract the adjoints of the conservative input variables and store them for the next iteration ---*/
 
@@ -2793,7 +2793,7 @@ void CDiscAdjFEAIteration::SetRecording(COutput *output,
 
   unsigned long InnerIter = config[ZONE_0]->GetInnerIter();
   unsigned long TimeIter = config[val_iZone]->GetTimeIter(), DirectTimeIter;
-  bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config[val_iZone]->GetTime_Domain());
 
   DirectTimeIter = 0;
   if (dynamic){
@@ -3097,7 +3097,7 @@ void CDiscAdjFEAIteration::Postprocess(COutput *output,
     unsigned short val_iInst) {
 
 
-  bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config[val_iZone]->GetTime_Domain());
 
   /*--- Global sensitivities ---*/
   solver[val_iZone][val_iInst][MESH_0][ADJFEA_SOL]->SetSensitivity(geometry[val_iZone][val_iInst][MESH_0],config[val_iZone]);
@@ -3235,15 +3235,15 @@ void CDiscAdjHeatIteration::Preprocess(COutput *output,
 
   unsigned long iPoint;
   unsigned short TimeIter = config[val_iZone]->GetTimeIter();
-  bool dual_time_1st = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST);
-  bool dual_time_2nd = (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time_1st = (config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST);
+  bool dual_time_2nd = (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
   unsigned short iMesh;
   int Direct_Iter;
 
   /*--- For the unsteady adjoint, load direct solutions from restart files. ---*/
 
-  if (config[val_iZone]->GetUnsteady_Simulation()) {
+  if (config[val_iZone]->GetTime_Marching()) {
 
     Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2;
 
@@ -3499,8 +3499,8 @@ void CDiscAdjHeatIteration::Update(COutput *output,
 
   /*--- Dual time stepping strategy ---*/
 
-  if ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+  if ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)) {
 
     for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
       integration[val_iZone][val_iInst][ADJHEAT_SOL]->SetConvergence(false);
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index e1d35f75b620..b51abd2f1f1f 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -455,8 +455,8 @@ void CAdjFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
 
 bool CAdjFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index c89c4dee373f..bc7d2e212b31 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -485,8 +485,8 @@ void CAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CS
 
 bool CAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index b637ac83ce11..b30271be6e8c 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -44,7 +44,7 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
   linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
-  dynamic = (config->GetTime_Domain() || (config->GetDynamic_Analysis() == DYNAMIC));  // Dynamic analysis.
+  dynamic = (config->GetTime_Domain());  // Dynamic analysis.
   
   /*--- Initialize number of variables ---*/
   if (linear_analysis) nVar_FEM = nDim;
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 408f059e9193..8af7bd2bf6b5 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -359,8 +359,8 @@ su2double CFlowCompFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometr
 
 bool CFlowCompFEMOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index a70009778c32..c1d5f47cda5b 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -655,14 +655,14 @@ su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry,
 
 bool CFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))||
-        (config->GetUnsteady_Simulation() == STEADY && (curr_InnerIter < 2));
+  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))||
+        (config->GetTime_Marching() == STEADY && (curr_InnerIter < 2));
   
 }
 
 bool CFlowCompOutput::SetUpdate_Averages(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && curr_InnerIter == 0);
+  return (config->GetTime_Marching() != STEADY && curr_InnerIter == 0);
       
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index b27a21294638..fa42f100d6dc 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -605,8 +605,8 @@ su2double CFlowIncOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
 
 bool CFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetUnsteady_Simulation() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetUnsteady_Simulation() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index ed8575768026..432784654dd7 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -688,10 +688,10 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
     
     /*--- Write file name with extension if unsteady ---*/
     strcpy (cstr, filename.c_str());
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    if (config->GetTime_Marching() == HARMONIC_BALANCE) {
       SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
       
-    } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+    } else if (config->GetTime_Marching() && config->GetTime_Domain()) {
       if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
@@ -1070,10 +1070,10 @@ void COutputLegacy::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry,
     /*--- Write file name with extension if unsteady ---*/
     strcpy (cstr, filename.c_str());
     
-    if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    if (config->GetTime_Marching() == HARMONIC_BALANCE) {
       SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
       
-    } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+    } else if (config->GetTime_Marching() && config->GetTime_Domain()) {
       if ((SU2_TYPE::Int(iExtIter) >= 0) && (SU2_TYPE::Int(iExtIter) < 10)) SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 10) && (SU2_TYPE::Int(iExtIter) < 100)) SPRINTF (buffer, "_000%d.csv", SU2_TYPE::Int(iExtIter));
       if ((SU2_TYPE::Int(iExtIter) >= 100) && (SU2_TYPE::Int(iExtIter) < 1000)) SPRINTF (buffer, "_00%d.csv", SU2_TYPE::Int(iExtIter));
@@ -2445,7 +2445,7 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
     
     if (Kind_Solver == FEM_ELASTICITY)  {
       /*--- If the analysis is dynamic... ---*/
-      if (config->GetDynamic_Analysis() == DYNAMIC) {
+      if (config->GetTime_Domain()) {
         /*--- Velocities ---*/
         iVar_FEA_Vel = nVar_Total;
         if (geometry->GetnDim() == 2) nVar_Total += 2;
@@ -3389,7 +3389,7 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
     
     /*--- Communicate the Velocities for dynamic FEM problem ---*/
     
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetTime_Domain())) {
       
       /*--- Loop over this partition to collect the current variable ---*/
       
@@ -3452,7 +3452,7 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
     
     /*--- Communicate the Accelerations for dynamic FEM problem ---*/
     
-    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetDynamic_Analysis() == DYNAMIC)) {
+    if ((Kind_Solver == FEM_ELASTICITY) && (config->GetTime_Domain())) {
       
       /*--- Loop over this partition to collect the current variable ---*/
       
@@ -4066,15 +4066,15 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   unsigned short iVar, iDim, nDim = geometry->GetnDim();
   unsigned long iPoint, iExtIter = config->GetInnerIter();
   bool grid_movement = config->GetGrid_Movement();
-  bool dynamic_fem = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic_fem = (config->GetTime_Domain());
   bool fem = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
   ofstream restart_file;
   ofstream meta_file;
   string filename, meta_filename;
   bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   /*--- Retrieve filename from config ---*/
   
@@ -4094,7 +4094,7 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
     filename= config->GetMultizone_FileName(filename, val_iZone, ".dat");
   
   /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(config->GetiInst()), ".dat");
   } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -4693,7 +4693,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
       
       /*--- Output a file with the forces breakdown. ---*/
       
-      if (config[val_iZone]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+      if (config[val_iZone]->GetTime_Marching() == HARMONIC_BALANCE) {
         SpecialOutput_HarmonicBalance(solver_container, geometry, config, val_iInst, nInst, output_files);
       }
       
@@ -4730,8 +4730,8 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
     }
     
     unsigned long ExtIter_OffSet = config[val_iZone]->GetExtIter_OffSet();
-    if (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-        config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+    if (config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST ||
+        config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND)
       ExtIter_OffSet = 0;
 
     /*--- WARNING: These buffers have hard-coded lengths. Note that you
@@ -5243,8 +5243,8 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
     
     /*--- Header frequency ---*/
     
-    bool Unsteady = ((config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                     (config[val_iZone]->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+    bool Unsteady = ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
+                     (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND));
     bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
     bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
@@ -5256,7 +5256,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
     /*--- We maintain the name, as it is an input of the function ---*/
     /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
     /*--- dynamic determines if the problem is, or not, time dependent ---*/
-    bool dynamic = (config[val_iZone]->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+    bool dynamic = (config[val_iZone]->GetTime_Domain());              // Dynamic simulations.
     bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
     bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
     bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
@@ -5556,7 +5556,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
         ) {
 
           if (!fem) {
-            if (!Unsteady && (config[val_iZone]->GetUnsteady_Simulation() != TIME_STEPPING)) {
+            if (!Unsteady && (config[val_iZone]->GetTime_Marching() != TIME_STEPPING)) {
               switch (config[val_iZone]->GetKind_Solver()) {
               case EULER : case NAVIER_STOKES: case RANS:
               case INC_EULER : case INC_NAVIER_STOKES: case INC_RANS:    
@@ -5642,10 +5642,10 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
             }
             else {
               if (flow) {
-                if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
+                if ((config[val_iZone]->GetTime_Marching() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()== 0.0))
                 {
                   cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
-                } else if ((config[val_iZone]->GetUnsteady_Simulation() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
+                } else if ((config[val_iZone]->GetTime_Marching() == TIME_STEPPING) && (config[val_iZone]->GetUnst_CFL()!= 0.0)) {
                   cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ". Time step: " << solver_container[val_iZone][val_iInst][config[val_iZone]->GetFinestMesh()][FLOW_SOL]->GetMin_Delta_Time() << ". CFL: " << config[val_iZone]->GetUnst_CFL()<<".";
                 } else {
                   cout << endl << "Min DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMin_Delta_Time()<< ".Max DT: " << solver_container[val_iZone][val_iInst][FinestMesh][FLOW_SOL]->GetMax_Delta_Time() << ".Dual Time step: " << config[val_iZone]->GetDelta_UnstTimeND() << ".";
@@ -6498,7 +6498,7 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
   
   bool compressible       = (config[val_iZone]->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible     = (config[val_iZone]->GetKind_Regime() == INCOMPRESSIBLE);
-  bool unsteady           = (config[val_iZone]->GetUnsteady_Simulation() != NO);
+  bool unsteady           = (config[val_iZone]->GetTime_Marching() != NO);
   bool viscous            = config[val_iZone]->GetViscous();
   bool grid_movement      = config[val_iZone]->GetGrid_Movement();
   bool gravity            = config[val_iZone]->GetGravityForce();
@@ -9339,8 +9339,8 @@ void COutputLegacy::SetCp_InverseDesign(CSolver *solver_container, CGeometry *ge
   
   /*--- Write file name with extension if unsteady or steady ---*/
   
-  if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
+  if ((config->GetTime_Marching() && config->GetTime_Domain()) ||
+      (config->GetTime_Marching() == HARMONIC_BALANCE)) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
@@ -9490,8 +9490,8 @@ void COutputLegacy::SetHeatFlux_InverseDesign(CSolver *solver_container, CGeomet
   
   /*--- Write file name with extension if unsteady or steady ---*/
   
-  if ((config->GetUnsteady_Simulation() && config->GetTime_Domain()) ||
-      (config->GetUnsteady_Simulation() == HARMONIC_BALANCE)) {
+  if ((config->GetTime_Marching() && config->GetTime_Domain()) ||
+      (config->GetTime_Marching() == HARMONIC_BALANCE)) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.dat", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.dat",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.dat",   SU2_TYPE::Int(iExtIter));
@@ -13221,7 +13221,7 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
           
             /*--- Get the physical time if necessary. ---*/
             su2double time = 0.0;
-            if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+            if (config->GetTime_Marching()) time = config->GetPhysicalTime();
           
             /* Set the pointers to the coordinates and solution of this DOF. */
             const su2double *coor = geometry->node[iPoint]->GetCoord();
@@ -13854,7 +13854,7 @@ void COutputLegacy::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry,
           
             /*--- Get the physical time if necessary. ---*/
             su2double time = 0.0;
-            if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+            if (config->GetTime_Marching()) time = config->GetPhysicalTime();
           
             /* Set the pointers to the coordinates and solution of this DOF. */
             const su2double *coor = geometry->node[iPoint]->GetCoord();
@@ -14426,7 +14426,7 @@ void COutputLegacy::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometr
     }
     
     /*--- If the analysis is dynamic... ---*/
-    if (config->GetDynamic_Analysis() == DYNAMIC) {
+    if (config->GetTime_Domain()) {
       
       /*--- Velocities ---*/
       nVar_Par += 2;
@@ -14560,7 +14560,7 @@ void COutputLegacy::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometr
         
         /*--- Load the velocities and accelerations (dynamic calculations). ---*/
         
-        if (config->GetDynamic_Analysis() == DYNAMIC) {
+        if (config->GetTime_Domain()) {
           
           /*--- Velocities ---*/
           
@@ -17854,8 +17854,8 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
   bool adjoint   = (config->GetContinuous_Adjoint() ||
                     config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   ofstream restart_file;
   string filename;
   
@@ -17883,7 +17883,7 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
     filename= config->GetMultiInstance_FileName(filename, val_iInst, ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
   } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -17991,8 +17991,8 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
   bool fem       = (config->GetKind_Solver() == FEM_ELASTICITY);
   bool adjoint   = (config->GetContinuous_Adjoint() ||
                     config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool wrt_perf  = config->GetWrt_Performance();
   ofstream restart_file;
   string filename;
@@ -18019,7 +18019,7 @@ void COutputLegacy::WriteRestart_Parallel_Binary(CConfig *config, CGeometry *geo
     filename= config->GetMultiInstance_FileName(filename, val_iInst, ".dat");
 
   /*--- Unsteady problems require an iteration number to be appended. ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(val_iInst), ".dat");
   } else if (config->GetTime_Domain()) {
     filename = config->GetUnsteady_FileName(filename, SU2_TYPE::Int(iExtIter), ".dat");
@@ -21256,7 +21256,7 @@ void COutputLegacy::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSol
 
             /*--- Get the physical time if necessary. ---*/
             su2double time = 0.0;
-            if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+            if (config->GetTime_Marching()) time = config->GetPhysicalTime();
 
             /* Get the verification solution. */
             su2double mmsSol[5];
diff --git a/SU2_CFD/src/solver_adjoint_discrete.cpp b/SU2_CFD/src/solver_adjoint_discrete.cpp
index 2cc5fca1fc9f..47d4d056fb4e 100644
--- a/SU2_CFD/src/solver_adjoint_discrete.cpp
+++ b/SU2_CFD/src/solver_adjoint_discrete.cpp
@@ -154,9 +154,9 @@ CDiscAdjSolver::~CDiscAdjSolver(void) {
 void CDiscAdjSolver::SetRecording(CGeometry* geometry, CConfig *config){
 
 
-  bool time_n_needed  = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)),
-  time_n1_needed = config->GetUnsteady_Simulation() == DT_STEPPING_2ND;
+  bool time_n_needed  = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config->GetTime_Marching() == DT_STEPPING_2ND)),
+  time_n1_needed = config->GetTime_Marching() == DT_STEPPING_2ND;
 
   unsigned long iPoint;
   unsigned short iVar;
@@ -248,9 +248,9 @@ void CDiscAdjSolver::SetMesh_Recording(CGeometry** geometry, CVolumetricMovement
 void CDiscAdjSolver::RegisterSolution(CGeometry *geometry, CConfig *config) {
   unsigned long iPoint, nPoint = geometry->GetnPoint();
 
-  bool time_n_needed  = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)),
-  time_n1_needed = config->GetUnsteady_Simulation() == DT_STEPPING_2ND,
+  bool time_n_needed  = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config->GetTime_Marching() == DT_STEPPING_2ND)),
+  time_n1_needed = config->GetTime_Marching() == DT_STEPPING_2ND,
   input = true;
 
   /*--- Register solution at all necessary time instances and other variables on the tape ---*/
@@ -437,7 +437,7 @@ void CDiscAdjSolver::RegisterObj_Func(CConfig *config) {
 
 void CDiscAdjSolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config) {
 
-  bool time_stepping = config->GetUnsteady_Simulation() != STEADY;
+  bool time_stepping = config->GetTime_Marching() != STEADY;
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
   unsigned long TimeIter = config->GetTimeIter();
   su2double seeding = 1.0;
@@ -460,10 +460,10 @@ void CDiscAdjSolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config) {
 
 void CDiscAdjSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *config){
 
-  bool time_n_needed  = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-      (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool time_n_needed  = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+      (config->GetTime_Marching() == DT_STEPPING_2ND));
 
-  bool time_n1_needed = config->GetUnsteady_Simulation() == DT_STEPPING_2ND;
+  bool time_n1_needed = config->GetTime_Marching() == DT_STEPPING_2ND;
 
   unsigned short iVar;
   unsigned long iPoint;
@@ -727,8 +727,8 @@ void CDiscAdjSolver::ExtractAdjoint_CrossTerm_Geometry_Flow(CGeometry *geometry,
 
 void CDiscAdjSolver::SetAdjoint_Output(CGeometry *geometry, CConfig *config) {
 
-  bool dual_time = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST ||
-      config->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time = (config->GetTime_Marching() == DT_STEPPING_1ST ||
+      config->GetTime_Marching() == DT_STEPPING_2ND);
   bool fsi = config->GetFSI_Simulation();
 
   unsigned short iVar;
@@ -794,7 +794,7 @@ void CDiscAdjSolver::SetSensitivity(CGeometry *geometry, CConfig *config) {
   unsigned short iDim;
   su2double *Coord, Sensitivity, eps;
 
-  bool time_stepping = (config->GetUnsteady_Simulation() != STEADY);
+  bool time_stepping = (config->GetTime_Marching() != STEADY);
 
   for (iPoint = 0; iPoint < nPoint; iPoint++) {
     Coord = geometry->node[iPoint]->GetCoord();
@@ -909,8 +909,8 @@ void CDiscAdjSolver::SetSurface_Sensitivity(CGeometry *geometry, CConfig *config
 }
 
 void CDiscAdjSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config_container, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output) {
-  bool dual_time_1st = (config_container->GetUnsteady_Simulation() == DT_STEPPING_1ST);
-  bool dual_time_2nd = (config_container->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time_1st = (config_container->GetTime_Marching() == DT_STEPPING_1ST);
+  bool dual_time_2nd = (config_container->GetTime_Marching() == DT_STEPPING_2ND);
   bool dual_time = (dual_time_1st || dual_time_2nd);
   su2double *solution_n, *solution_n1;
   unsigned long iPoint;
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index 51672dd062a7..1790d7210328 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -90,7 +90,7 @@ CDiscAdjFEASolver::CDiscAdjFEASolver(CGeometry *geometry, CConfig *config, CSolv
   string filename, AdjExt;
   su2double dull_val;
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   bool compressible = (config->GetKind_Regime() == COMPRESSIBLE);
   bool incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
@@ -495,7 +495,7 @@ CDiscAdjFEASolver::~CDiscAdjFEASolver(void){
 void CDiscAdjFEASolver::SetRecording(CGeometry* geometry, CConfig *config){
 
 
-  bool dynamic (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic (config->GetTime_Domain());
 
   unsigned long iPoint;
   unsigned short iVar;
@@ -552,7 +552,7 @@ void CDiscAdjFEASolver::RegisterSolution(CGeometry *geometry, CConfig *config){
 
   unsigned long iPoint, nPoint = geometry->GetnPoint();
 
-  bool dynamic (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic (config->GetTime_Domain());
   bool input = true;
 
   /*--- Register solution at all necessary time instances and other variables on the tape ---*/
@@ -640,7 +640,7 @@ void CDiscAdjFEASolver::RegisterOutput(CGeometry *geometry, CConfig *config){
 
   unsigned long iPoint, nPoint = geometry->GetnPoint();
 
-  bool dynamic (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   /*--- Register variables as output of the solver iteration ---*/
 
@@ -700,7 +700,7 @@ void CDiscAdjFEASolver::RegisterObj_Func(CConfig *config){
 
 void CDiscAdjFEASolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config){
   
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
   unsigned long TimeIter = config->GetTimeIter();
   su2double seeding = 1.0;
@@ -723,7 +723,7 @@ void CDiscAdjFEASolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config){
 
 void CDiscAdjFEASolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *config){
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   unsigned short iVar;
   unsigned long iPoint;
@@ -921,7 +921,7 @@ void CDiscAdjFEASolver::ExtractAdjoint_Variables(CGeometry *geometry, CConfig *c
 
 void CDiscAdjFEASolver::SetAdjoint_Output(CGeometry *geometry, CConfig *config){
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   bool fsi = config->GetFSI_Simulation();
 
   unsigned short iVar;
@@ -969,7 +969,7 @@ void CDiscAdjFEASolver::SetAdjoint_Output(CGeometry *geometry, CConfig *config){
 
 void CDiscAdjFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config_container, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output){
 
-  bool dynamic = (config_container->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config_container->GetTime_Domain());
   unsigned long iPoint;
   unsigned short iVar;
 
@@ -1097,7 +1097,7 @@ void CDiscAdjFEASolver::BC_Clamped_Post(CGeometry *geometry, CSolver **solver_co
                                             unsigned short val_marker) {
 
   unsigned long iPoint, iVertex;
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   for (iVertex = 0; iVertex < geometry->nVertex[val_marker]; iVertex++) {
 
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index fa1b83ca1d5c..67eff3bb56aa 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -1585,8 +1585,8 @@ void CAdjEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   su2double Area_Children, Area_Parent, *Solution, *Solution_Fine;
   
   bool restart = config->GetRestart();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   /*--- If restart solution, then interpolate the flow solution to
    all the multigrid levels, this is important with the dual time strategy ---*/
@@ -1887,7 +1887,7 @@ void CAdjEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
   bool rotating_frame = config->GetRotating_Frame();
   bool axisymmetric   = config->GetAxisymmetric();
   //  bool gravity        = (config->GetGravityForce() == YES);
-  bool harmonic_balance  = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance  = (config->GetTime_Marching() == HARMONIC_BALANCE);
   
   /*--- Initialize the source residual to zero ---*/
   for (iVar = 0; iVar < nVar; iVar++) Residual[iVar] = 0.0;
@@ -4713,9 +4713,9 @@ void CAdjEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
     
     /*--- Compute Residual ---*/
     for (iVar = 0; iVar < nVar; iVar++) {
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Residual[iVar] = ( U_time_nP1[iVar]*Volume_nP1 - U_time_n[iVar]*Volume_n ) / TimeStep;
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      if (config->GetTime_Marching() == DT_STEPPING_2ND)
         Residual[iVar] = ( 3.0*U_time_nP1[iVar]*Volume_nP1 - 4.0*U_time_n[iVar]*Volume_n
                           +  1.0*U_time_nM1[iVar]*Volume_nM1 ) / (2.0*TimeStep);
     }
@@ -4728,9 +4728,9 @@ void CAdjEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
         for (jVar = 0; jVar < nVar; jVar++)
           Jacobian_i[iVar][jVar] = 0.0;
         
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Jacobian_i[iVar][iVar] = Volume_nP1 / TimeStep;
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Jacobian_i[iVar][iVar] = (Volume_nP1*3.0)/(2.0*TimeStep);
       }
       Jacobian.AddBlock(iPoint, iPoint, Jacobian_i);
@@ -4745,9 +4745,9 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   unsigned short iDim, iVar, iMesh;
   unsigned long iPoint, index, iChildren, Point_Fine;
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   string filename, restart_filename;
 
   unsigned short iZone = config->GetiZone();
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 515e13608fea..5921ec2d44df 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -101,7 +101,7 @@ CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
   unsigned short iVar, jVar, iDim, jDim;
   unsigned short iTerm, iKind;
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+  bool dynamic = (config->GetTime_Domain());              // Dynamic simulations.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool fsi = config->GetFSI_Simulation();                        // FSI simulation
   bool gen_alpha = (config->GetKind_TimeIntScheme_FEA() == GENERALIZED_ALPHA);  // Generalized alpha method requires residual at previous time step.
@@ -943,7 +943,7 @@ void CFEASolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
   unsigned long iPoint;
   bool initial_calc = (config->GetTimeIter() == 0) && (config->GetInnerIter() == 0);                  // Checks if it is the first calculation.
   bool first_iter = (config->GetInnerIter() == 0);                          // Checks if it is the first iteration
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+  bool dynamic = (config->GetTime_Domain());              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
@@ -1581,7 +1581,7 @@ void CFEASolver::Compute_NodalStress(CGeometry *geometry, CSolver **solver_conta
   
   bool prestretch_fem = config->GetPrestretch();
   
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   
   bool topology_mode = config->GetTopology_Optimization();
   su2double simp_exponent = config->GetSIMP_Exponent();
@@ -1981,7 +1981,7 @@ void CFEASolver::BC_Clamped(CGeometry *geometry, CSolver **solver_container, CNu
   
   unsigned long iPoint, iVertex;
   
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   Solution[0] = 0.0;
   Solution[1] = 0.0;
@@ -2015,7 +2015,7 @@ void CFEASolver::BC_Clamped_Post(CGeometry *geometry, CSolver **solver_container
                                             unsigned short val_marker) {
   
   unsigned long iPoint, iVertex;
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   
   for (iVertex = 0; iVertex < geometry->nVertex[val_marker]; iVertex++) {
     
@@ -3006,7 +3006,7 @@ su2double CFEASolver::Compute_LoadCoefficient(su2double CurrentTime, su2double R
 
   bool restart = config->GetRestart(); // Restart analysis
   bool fsi = config->GetFSI_Simulation();  // FSI simulation.
-  bool stat_fsi = (config->GetDynamic_Analysis() == STATIC);
+  bool stat_fsi = !config->GetTime_Domain();
 
   /*--- This offset introduces the ramp load in dynamic cases starting from the restart point. ---*/
   bool offset = (restart && fsi && (!stat_fsi));
@@ -3081,7 +3081,7 @@ void CFEASolver::ImplicitNewmark_Iteration(CGeometry *geometry, CSolver **solver
   unsigned short iVar, jVar;
   
   bool first_iter = (config->GetInnerIter() == 0);
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+  bool dynamic = (config->GetTime_Domain());              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
@@ -3253,7 +3253,7 @@ void CFEASolver::ImplicitNewmark_Update(CGeometry *geometry, CSolver **solver_co
   unsigned short iVar;
   unsigned long iPoint;
   
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);          // Dynamic simulations.
+  bool dynamic = (config->GetTime_Domain());          // Dynamic simulations.
   
   /*--- Update solution ---*/
   
@@ -3319,7 +3319,7 @@ void CFEASolver::ImplicitNewmark_Relaxation(CGeometry *geometry, CSolver **solve
   unsigned short iVar;
   unsigned long iPoint;
   su2double *valSolutionPred;
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   
   /*--- Update solution and set it to be the solution after applying relaxation---*/
   
@@ -3394,7 +3394,7 @@ void CFEASolver::GeneralizedAlpha_Iteration(CGeometry *geometry, CSolver **solve
   unsigned short iVar, jVar;
   
   bool first_iter = (config->GetInnerIter() == 0);
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);              // Dynamic simulations.
+  bool dynamic = (config->GetTime_Domain());              // Dynamic simulations.
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
   bool newton_raphson = (config->GetKind_SpaceIteScheme_FEA() == NEWTON_RAPHSON);    // Newton-Raphson method
@@ -3906,7 +3906,7 @@ void CFEASolver::Compute_OFRefGeom(CGeometry *geometry, CSolver **solver_contain
   unsigned long iPoint;
   unsigned long nTotalPoint = 1;
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   unsigned long TimeIter = config->GetTimeIter();
 
@@ -4041,7 +4041,7 @@ void CFEASolver::Compute_OFRefNode(CGeometry *geometry, CSolver **solver_contain
   unsigned short iVar;
   unsigned long iPoint;
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
 
   unsigned long TimeIter = config->GetTimeIter();
 
@@ -4315,7 +4315,7 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
 
   string filename;
 
-  bool dynamic = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic = (config->GetTime_Domain());
   bool fluid_structure = config->GetFSI_Simulation();
   bool discrete_adjoint = config->GetDiscrete_Adjoint();
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 707f1d1e7334..2c8a970a92e9 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -1329,8 +1329,8 @@ void CHeatSolverFVM::SetTime_Step(CGeometry *geometry, CSolver **solver_containe
                || (config->GetKind_Solver() == DISC_ADJ_INC_RANS));
   
   bool turb = ((config->GetKind_Solver() == INC_RANS) || (config->GetKind_Solver() == DISC_ADJ_INC_RANS));
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
 
   eddy_viscosity    = 0.0;
@@ -1496,7 +1496,7 @@ void CHeatSolverFVM::SetTime_Step(CGeometry *geometry, CSolver **solver_containe
   }
 
   /*--- For exact time solution use the minimum delta time of the whole mesh ---*/
-  if (config->GetUnsteady_Simulation() == TIME_STEPPING) {
+  if (config->GetTime_Marching() == TIME_STEPPING) {
 #ifdef HAVE_MPI
     su2double rbuf_time, sbuf_time;
     sbuf_time = Global_Delta_Time;
@@ -1680,8 +1680,8 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
   su2double Area_Children, Area_Parent, *Solution_Fine, *Solution;
 
   bool restart   = (config->GetRestart() || config->GetRestart_Flow());
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- If restart solution, then interpolate the flow solution to
    all the multigrid levels, this is important with the dual time strategy ---*/
@@ -1724,7 +1724,7 @@ void CHeatSolverFVM::SetInitialCondition(CGeometry **geometry, CSolver ***solver
     }
 
     if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
-        (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+        (config->GetTime_Marching() == DT_STEPPING_2ND)) {
 
       /*--- Load an additional restart file for a 2nd-order restart ---*/
 
@@ -1784,9 +1784,9 @@ void CHeatSolverFVM::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_
        time discretization scheme (1st- or 2nd-order).---*/
 
       for (iVar = 0; iVar < nVar; iVar++) {
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*Volume_nP1 / TimeStep;
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Residual[iVar] = ( 3.0*U_time_nP1[iVar] - 4.0*U_time_n[iVar]
                             +1.0*U_time_nM1[iVar])*Volume_nP1 / (2.0*TimeStep);
       }
@@ -1798,9 +1798,9 @@ void CHeatSolverFVM::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_
       if (implicit) {
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) Jacobian_i[iVar][jVar] = 0.0;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1 / TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (Volume_nP1*3.0)/(2.0*TimeStep);
         }
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 6ab1e53847cd..69a39258ab64 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -181,9 +181,9 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   unsigned short direct_diff = config->GetDirectDiff();
   int Unst_RestartIter;
   unsigned short iZone = config->GetiZone();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
 
   bool low_mach_prec = config->Low_Mach_Preconditioning();
 
@@ -208,7 +208,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
@@ -2227,7 +2227,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
   su2double Beta             = config->GetAoS()*PI_NUMBER/180.0;
   su2double Mach             = config->GetMach();
   su2double Reynolds         = config->GetReynolds();
-  bool unsteady           = (config->GetUnsteady_Simulation() != NO);
+  bool unsteady           = (config->GetTime_Marching() != NO);
   bool viscous            = config->GetViscous();
   bool grid_movement      = config->GetGrid_Movement();
   bool gravity            = config->GetGravityForce();
@@ -2771,8 +2771,8 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
   unsigned short nDim = geometry[MESH_0]->GetnDim();
   bool restart = (config->GetRestart() || config->GetRestart_Flow());
   bool rans = (config->GetKind_Turb_Model() != NONE);
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool SubsonicEngine = config->GetSubsonicEngine();
 
   /*--- Check if a verification solution is to be computed. ---*/
@@ -2945,7 +2945,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
     }
     
     if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
-        (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+        (config->GetTime_Marching() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
       
@@ -3113,9 +3113,9 @@ void CEulerSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
   
   bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool grid_movement = config->GetGrid_Movement();
-  bool time_steping = config->GetUnsteady_Simulation() == TIME_STEPPING;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool time_steping = config->GetTime_Marching() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   Min_Delta_Time = 1.E6; Max_Delta_Time = 0.0;
   
@@ -3643,7 +3643,7 @@ void CEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_contain
   bool rotating_frame   = config->GetRotating_Frame();
   bool axisymmetric     = config->GetAxisymmetric();
   bool gravity          = (config->GetGravityForce() == YES);
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool windgust         = config->GetWind_Gust();
   bool body_force       = config->GetBody_Force();
 
@@ -3813,7 +3813,7 @@ void CEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_contain
       
       /*--- Get the physical time. ---*/
       su2double time = 0.0;
-      if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+      if (config->GetTime_Marching()) time = config->GetPhysicalTime();
       
       /*--- Loop over points ---*/
       for (iPoint = 0; iPoint < nPointDomain; iPoint++) {
@@ -12393,7 +12393,7 @@ void CEulerSolver::BC_Custom(CGeometry      *geometry,
     /*--- Get the physical time. ---*/
     
     su2double time = 0.0;
-    if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+    if (config->GetTime_Marching()) time = config->GetPhysicalTime();
     
     /*--- Loop over all the vertices on this boundary marker ---*/
     
@@ -12489,9 +12489,9 @@ void CEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_co
        time discretization scheme (1st- or 2nd-order).---*/
       
       for (iVar = 0; iVar < nVar; iVar++) {
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*Volume_nP1 / TimeStep;
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Residual[iVar] = ( 3.0*U_time_nP1[iVar] - 4.0*U_time_n[iVar]
                             +1.0*U_time_nM1[iVar])*Volume_nP1 / (2.0*TimeStep);
       }
@@ -12503,9 +12503,9 @@ void CEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_co
       if (implicit) {
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) Jacobian_i[iVar][jVar] = 0.0;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1 / TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (Volume_nP1*3.0)/(2.0*TimeStep);
         }
         Jacobian.AddBlock(iPoint, iPoint, Jacobian_i);
@@ -12619,9 +12619,9 @@ void CEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_co
        due to the time discretization has a new form.---*/
       
       for (iVar = 0; iVar < nVar; iVar++) {
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(Volume_nP1/TimeStep);
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(3.0*Volume_nP1/(2.0*TimeStep))
           + (U_time_nM1[iVar] - U_time_n[iVar])*(Volume_nM1/(2.0*TimeStep));
       }
@@ -12632,9 +12632,9 @@ void CEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_co
       if (implicit) {
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) Jacobian_i[iVar][jVar] = 0.0;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1/TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (3.0*Volume_nP1)/(2.0*TimeStep);
         }
         Jacobian.AddBlock(iPoint, iPoint, Jacobian_i);
@@ -12669,7 +12669,7 @@ void CEulerSolver::ComputeVerificationError(CGeometry *geometry,
 
       /*--- Get the physical time if necessary. ---*/
       su2double time = 0.0;
-      if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+      if (config->GetTime_Marching()) time = config->GetPhysicalTime();
     
       /*--- Reset the global error measures to zero. ---*/
       for (unsigned short iVar = 0; iVar < nVar; iVar++) {
@@ -12752,9 +12752,9 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
   unsigned short turb_model = config->GetKind_Turb_Model();
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
   bool grid_movement  = config->GetGrid_Movement();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool static_fsi = ((config->GetUnsteady_Simulation() == STEADY) &&
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool static_fsi = ((config->GetTime_Marching() == STEADY) &&
                      (config->GetFSI_Simulation()));
   bool steady_restart = config->GetSteadyRestart();
   bool turbulent     = (config->GetKind_Turb_Model() != NONE);
@@ -14151,9 +14151,9 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
   bool restart    = (config->GetRestart() || config->GetRestart_Flow());
   int Unst_RestartIter;
   unsigned short iZone = config->GetiZone();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
 
   bool roe_turkel = (config->GetKind_Upwind_Flow() == TURKEL);
   bool low_mach_prec = config->Low_Mach_Preconditioning();
@@ -14180,7 +14180,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
@@ -15182,8 +15182,8 @@ void CNSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container, CC
   
   bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool grid_movement = config->GetGrid_Movement();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   Min_Delta_Time = 1.E6; Max_Delta_Time = 0.0;
   
@@ -15339,7 +15339,7 @@ void CNSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container, CC
   }
   
   /*--- For exact time solution use the minimum delta time of the whole mesh ---*/
-  if (config->GetUnsteady_Simulation() == TIME_STEPPING) {
+  if (config->GetTime_Marching() == TIME_STEPPING) {
 #ifdef HAVE_MPI
     su2double rbuf_time, sbuf_time;
     sbuf_time = Global_Delta_Time;
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index aaa7e908031b..aa612c31df75 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -802,7 +802,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
   su2double Beta             = config->GetAoS()*PI_NUMBER/180.0;
   su2double Mach             = config->GetMach();
   su2double Reynolds         = config->GetReynolds();
-  bool unsteady           = (config->GetUnsteady_Simulation() != NO);
+  bool unsteady           = (config->GetTime_Marching() != NO);
   bool viscous            = config->GetViscous();
   bool grid_movement      = config->GetGrid_Movement();
   bool turbulent          = (config->GetKind_Solver() == FEM_RANS) || (config->GetKind_Solver() == FEM_LES);
@@ -3222,7 +3222,7 @@ void CFEM_DG_EulerSolver::Preprocessing(CGeometry *geometry, CSolver **solver_co
   /*                       Check for grid motion.                                */
   /*-----------------------------------------------------------------------------*/
 
-  const bool harmonic_balance = config->GetUnsteady_Simulation() == HARMONIC_BALANCE;
+  const bool harmonic_balance = config->GetTime_Marching() == HARMONIC_BALANCE;
   if(config->GetGrid_Movement() && !harmonic_balance) {
 
     /*--- Determine the type of grid motion. ---*/
@@ -3598,7 +3598,7 @@ void CFEM_DG_EulerSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_con
                                     unsigned short iMesh, unsigned long Iteration) {
   
   /* Check whether or not a time stepping scheme is used. */
-  const bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  const bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
 
   /* Initialize the minimum and maximum time step. */
   Min_Delta_Time = 1.e25; Max_Delta_Time = 0.0;
@@ -5773,7 +5773,7 @@ void CFEM_DG_EulerSolver::Volume_Residual(CConfig             *config,
 
   /*--- Get the physical time for MMS if necessary. ---*/
   su2double time = 0.0;
-  if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+  if (config->GetTime_Marching()) time = config->GetPhysicalTime();
   
   /* Determine the number of elements that are treated simultaneously
      in the matrix products to obtain good gemm performance. */
@@ -7344,7 +7344,7 @@ void CFEM_DG_EulerSolver::ComputeVerificationError(CGeometry *geometry,
 
       /*--- Get the physical time if necessary. ---*/
       su2double time = 0.0;
-      if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+      if (config->GetTime_Marching()) time = config->GetPhysicalTime();
 
       /*--- Reset the global error measures to zero. ---*/
       for (unsigned short iVar = 0; iVar < nVar; iVar++) {
@@ -8679,7 +8679,7 @@ void CFEM_DG_EulerSolver::BC_Custom(CConfig                  *config,
 
   /*--- Get the physical time if necessary. ---*/
   su2double time = 0.0;
-  if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+  if (config->GetTime_Marching()) time = config->GetPhysicalTime();
   
   /*--- Loop over the requested range of surface faces. Multiple faces
         are treated simultaneously to improve the performance of the matrix
@@ -10409,7 +10409,7 @@ void CFEM_DG_NSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_contai
                                     unsigned short iMesh, unsigned long Iteration) {
   
   /* Check whether or not a time stepping scheme is used. */
-  const bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  const bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
 
   /* Allocate the memory for the work array and initialize it to zero to avoid
      warnings in debug mode  about uninitialized memory when padding is applied. */
@@ -12673,7 +12673,7 @@ void CFEM_DG_NSSolver::Volume_Residual(CConfig             *config,
 
   /*--- Get the physical time if necessary. ---*/
   su2double time = 0.0;
-  if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+  if (config->GetTime_Marching()) time = config->GetPhysicalTime();
   
   /* Constant factor present in the heat flux vector. */
   const su2double factHeatFlux_Lam  = Gamma/Prandtl_Lam;
@@ -15575,7 +15575,7 @@ void CFEM_DG_NSSolver::BC_Custom(CConfig                  *config,
 
   /*--- Get the physical time if necessary. ---*/
   su2double time = 0.0;
-  if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+  if (config->GetTime_Marching()) time = config->GetPhysicalTime();
   
   /*--- Loop over the requested range of surface faces. Multiple faces
         are treated simultaneously to improve the performance of the matrix
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 69a17c8b883c..98705584ed2e 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -110,9 +110,9 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   string filename = config->GetSolution_FileName();
   int Unst_RestartIter;
   unsigned short iZone = config->GetiZone();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
   bool fsi     = config->GetFSI_Simulation();
   bool multizone = config->GetMultizone_Problem();
@@ -136,7 +136,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
@@ -822,7 +822,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
   su2double Mach     = config->GetMach();
   su2double Reynolds = config->GetReynolds();
   
-  bool unsteady      = (config->GetUnsteady_Simulation() != NO);
+  bool unsteady      = (config->GetTime_Marching() != NO);
   bool viscous       = config->GetViscous();
   bool grid_movement = config->GetGrid_Movement();
   bool turbulent     = ((config->GetKind_Solver() == INC_RANS) ||
@@ -1401,8 +1401,8 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
   bool restart   = (config->GetRestart() || config->GetRestart_Flow());
   bool rans      = ((config->GetKind_Solver() == INC_RANS) ||
                     (config->GetKind_Solver() == DISC_ADJ_INC_RANS));
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   /*--- Check if a verification solution is to be computed. ---*/
   if ((VerificationSolution) && (TimeIter == 0) && !restart) {
@@ -1498,7 +1498,7 @@ void CIncEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solve
     }
     
     if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
-        (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)) {
+        (config->GetTime_Marching() == DT_STEPPING_2ND)) {
       
       /*--- Load an additional restart file for a 2nd-order restart ---*/
       
@@ -1644,9 +1644,9 @@ void CIncEulerSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_contain
   
   bool implicit      = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool grid_movement = config->GetGrid_Movement();
-  bool time_steping  = config->GetUnsteady_Simulation() == TIME_STEPPING;
-  bool dual_time     = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool time_steping  = config->GetTime_Marching() == TIME_STEPPING;
+  bool dual_time     = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   Min_Delta_Time = 1.E6; Max_Delta_Time = 0.0;
 
@@ -2226,7 +2226,7 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
       
       /*--- Get the physical time. ---*/
       su2double time = 0.0;
-      if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+      if (config->GetTime_Marching()) time = config->GetPhysicalTime();
       
       /*--- Loop over points ---*/
       for (iPoint = 0; iPoint < nPointDomain; iPoint++) {
@@ -5717,7 +5717,7 @@ void CIncEulerSolver::BC_Custom(CGeometry      *geometry,
     /*--- Get the physical time. ---*/
     
     su2double time = 0.0;
-    if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+    if (config->GetTime_Marching()) time = config->GetPhysicalTime();
     
     /*--- Loop over all the vertices on this boundary marker ---*/
     
@@ -5851,9 +5851,9 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
        contribution, as the time derivative should always be zero. ---*/
       
       for (iVar = 0; iVar < nVar; iVar++) {
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*Volume_nP1 / TimeStep;
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Residual[iVar] = ( 3.0*U_time_nP1[iVar] - 4.0*U_time_n[iVar]
                             +1.0*U_time_nM1[iVar])*Volume_nP1 / (2.0*TimeStep);
       }
@@ -5923,9 +5923,9 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
           
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) {
-            if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+            if (config->GetTime_Marching() == DT_STEPPING_1ST)
               Jacobian_i[iVar][jVar] *= Volume_nP1 / TimeStep;
-            if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+            if (config->GetTime_Marching() == DT_STEPPING_2ND)
               Jacobian_i[iVar][jVar] *= (Volume_nP1*3.0)/(2.0*TimeStep);
           }
         }
@@ -6121,9 +6121,9 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
        due to the time discretization has a new form.---*/
       
       for (iVar = 0; iVar < nVar; iVar++) {
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+        if (config->GetTime_Marching() == DT_STEPPING_1ST)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(Volume_nP1/TimeStep);
-        if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+        if (config->GetTime_Marching() == DT_STEPPING_2ND)
           Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(3.0*Volume_nP1/(2.0*TimeStep))
           + (U_time_nM1[iVar] - U_time_n[iVar])*(Volume_nM1/(2.0*TimeStep));
       }
@@ -6134,9 +6134,9 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       LinSysRes.AddBlock(iPoint, Residual);
       if (implicit) {
         for (iVar = 1; iVar < nVar; iVar++) {
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1/TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (3.0*Volume_nP1)/(2.0*TimeStep);
         }
         for (iDim = 0; iDim < nDim; iDim++)
@@ -6388,7 +6388,7 @@ void CIncEulerSolver::ComputeVerificationError(CGeometry *geometry,
     
       /*--- Get the physical time if necessary. ---*/
       su2double time = 0.0;
-      if (config->GetUnsteady_Simulation()) time = config->GetPhysicalTime();
+      if (config->GetTime_Marching()) time = config->GetPhysicalTime();
     
       /*--- Reset the global error measures to zero. ---*/
       for (unsigned short iVar = 0; iVar < nVar; iVar++) {
@@ -6473,10 +6473,10 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   unsigned short turb_model = config->GetKind_Turb_Model();
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
   bool grid_movement  = config->GetGrid_Movement();
-  bool static_fsi = ((config->GetUnsteady_Simulation() == STEADY) &&
+  bool static_fsi = ((config->GetTime_Marching() == STEADY) &&
                      (config->GetFSI_Simulation()));
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool steady_restart = config->GetSteadyRestart();
   bool turbulent     = (config->GetKind_Solver() == INC_RANS) || (config->GetKind_Solver() == DISC_ADJ_INC_RANS);
   
@@ -6759,9 +6759,9 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
   bool restart   = (config->GetRestart() || config->GetRestart_Flow());
   int Unst_RestartIter;
   unsigned short iZone = config->GetiZone();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
   string filename_ = config->GetSolution_FileName();
 
@@ -6783,7 +6783,7 @@ CIncNSSolver::CIncNSSolver(CGeometry *geometry, CConfig *config, unsigned short
 
     if (dual_time) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
-      else if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
       filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
@@ -7552,8 +7552,8 @@ void CIncNSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
   
   bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
   bool grid_movement = config->GetGrid_Movement();
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool energy = config->GetEnergy_Equation();
 
   Min_Delta_Time = 1.E6; Max_Delta_Time = 0.0;
@@ -7717,7 +7717,7 @@ void CIncNSSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
   }
   
   /*--- For exact time solution use the minimum delta time of the whole mesh ---*/
-  if (config->GetUnsteady_Simulation() == TIME_STEPPING) {
+  if (config->GetTime_Marching() == TIME_STEPPING) {
 #ifdef HAVE_MPI
     su2double rbuf_time, sbuf_time;
     sbuf_time = Global_Delta_Time;
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index 780646d95364..d08d960a9aad 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -526,9 +526,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
         }
         
         for (iVar = 0; iVar < nVar; iVar++) {
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Residual[iVar] = ( Density_nP1*U_time_nP1[iVar] - Density_n*U_time_n[iVar])*Volume_nP1 / TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Residual[iVar] = ( 3.0*Density_nP1*U_time_nP1[iVar] - 4.0*Density_n*U_time_n[iVar]
                               +1.0*Density_nM1*U_time_nM1[iVar])*Volume_nP1 / (2.0*TimeStep);
         }
@@ -536,9 +536,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
       } else {
         
         for (iVar = 0; iVar < nVar; iVar++) {
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*Volume_nP1 / TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Residual[iVar] = ( 3.0*U_time_nP1[iVar] - 4.0*U_time_n[iVar]
                               +1.0*U_time_nM1[iVar])*Volume_nP1 / (2.0*TimeStep);
         }
@@ -551,9 +551,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
       if (implicit) {
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) Jacobian_i[iVar][jVar] = 0.0;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1 / TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (Volume_nP1*3.0)/(2.0*TimeStep);
         }
         Jacobian.AddBlock(iPoint, iPoint, Jacobian_i);
@@ -714,9 +714,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
         }
         
         for (iVar = 0; iVar < nVar; iVar++) {
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Residual[iVar] = (Density_nP1*U_time_nP1[iVar] - Density_n*U_time_n[iVar])*(Volume_nP1/TimeStep);
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Residual[iVar] = (Density_nP1*U_time_nP1[iVar] - Density_n*U_time_n[iVar])*(3.0*Volume_nP1/(2.0*TimeStep))
             + (Density_nM1*U_time_nM1[iVar] - Density_n*U_time_n[iVar])*(Volume_nM1/(2.0*TimeStep));
         }
@@ -724,9 +724,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
       } else {
         
         for (iVar = 0; iVar < nVar; iVar++) {
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(Volume_nP1/TimeStep);
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Residual[iVar] = (U_time_nP1[iVar] - U_time_n[iVar])*(3.0*Volume_nP1/(2.0*TimeStep))
             + (U_time_nM1[iVar] - U_time_n[iVar])*(Volume_nM1/(2.0*TimeStep));
         }
@@ -739,9 +739,9 @@ void CTurbSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver_con
       if (implicit) {
         for (iVar = 0; iVar < nVar; iVar++) {
           for (jVar = 0; jVar < nVar; jVar++) Jacobian_i[iVar][jVar] = 0.0;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+          if (config->GetTime_Marching() == DT_STEPPING_1ST)
             Jacobian_i[iVar][iVar] = Volume_nP1/TimeStep;
-          if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+          if (config->GetTime_Marching() == DT_STEPPING_2ND)
             Jacobian_i[iVar][iVar] = (3.0*Volume_nP1)/(2.0*TimeStep);
         }
         Jacobian.AddBlock(iPoint, iPoint, Jacobian_i);
@@ -1215,7 +1215,7 @@ void CTurbSASolver::Source_Residual(CGeometry *geometry, CSolver **solver_contai
                                     CConfig *config, unsigned short iMesh) {
   unsigned long iPoint;
   
-  bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
+  bool harmonic_balance = (config->GetTime_Marching() == HARMONIC_BALANCE);
   bool transition    = (config->GetKind_Trans_Model() == LM);
   bool transition_BC = (config->GetKind_Trans_Model() == BC);
   
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 6ac5b2456236..8eba0a6df2e3 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -1861,7 +1861,7 @@ void CSolver::InitiateComms(CGeometry *geometry,
       MPI_TYPE         = COMM_TYPE_DOUBLE;
       break;
     case SOLUTION_FEA:
-      if (config->GetDynamic_Analysis() == DYNAMIC)
+      if (config->GetTime_Domain())
         COUNT_PER_POINT  = nVar*3;
       else
         COUNT_PER_POINT  = nVar;
@@ -1985,7 +1985,7 @@ void CSolver::InitiateComms(CGeometry *geometry,
           case SOLUTION_FEA:
             for (iVar = 0; iVar < nVar; iVar++) {
               bufDSend[buf_offset+iVar] = node[iPoint]->GetSolution(iVar);
-              if (config->GetDynamic_Analysis() == DYNAMIC) {
+              if (config->GetTime_Domain()) {
                 bufDSend[buf_offset+nVar+iVar]   = node[iPoint]->GetSolution_Vel(iVar);
                 bufDSend[buf_offset+nVar*2+iVar] = node[iPoint]->GetSolution_Accel(iVar);
               }
@@ -2135,7 +2135,7 @@ void CSolver::CompleteComms(CGeometry *geometry,
           case SOLUTION_FEA:
             for (iVar = 0; iVar < nVar; iVar++) {
               node[iPoint]->SetSolution(iVar, bufDRecv[buf_offset+iVar]);
-              if (config->GetDynamic_Analysis() == DYNAMIC) {
+              if (config->GetTime_Domain()) {
                 node[iPoint]->SetSolution_Vel(iVar, bufDRecv[buf_offset+nVar+iVar]);
                 node[iPoint]->SetSolution_Accel(iVar, bufDRecv[buf_offset+nVar*2+iVar]);
               }
@@ -3995,7 +3995,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- Now, we load the restart file for time n-1, if the simulation is 2nd Order ---*/
 
-  if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) {
+  if (config->GetTime_Marching() == DT_STEPPING_2ND) {
 
     ifstream restart_file_n1;
     string filename_n1;
@@ -5067,9 +5067,9 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
   unsigned short iDim, iVar, iMesh, iMarker, jMarker;
   unsigned long iPoint, iVertex, index, iChildren, Point_Fine, iRow;
   su2double Area_Children, Area_Parent, *Coord, dist, min_dist;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
+  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
 
   string UnstExt, text_line;
   ifstream restart_file;
diff --git a/SU2_CFD/src/transfer_physics.cpp b/SU2_CFD/src/transfer_physics.cpp
index eaea3b159ec7..983184b194ae 100644
--- a/SU2_CFD/src/transfer_physics.cpp
+++ b/SU2_CFD/src/transfer_physics.cpp
@@ -100,7 +100,7 @@ void CTransfer_FlowTraction::GetPhysical_Constants(CSolver *flow_solution, CSolv
   Physical_Constants[1] = ModAmpl;
   
   /*--- For static FSI, we cannot apply the ramp like this ---*/
-  if ((flow_config->GetUnsteady_Simulation() == STEADY) && (struct_config->GetDynamic_Analysis() == STATIC)){
+  if ((!flow_config->GetTime_Domain()) && (!struct_config->GetTime_Domain())){
     Physical_Constants[1] = 1.0;
     if (Ramp_Load){
       CurrentTime = static_cast<su2double>(struct_config->GetOuterIter());
diff --git a/SU2_CFD/src/variables/CAdjEulerVariable.cpp b/SU2_CFD/src/variables/CAdjEulerVariable.cpp
index c799397eabb5..d97a308fa0ec 100644
--- a/SU2_CFD/src/variables/CAdjEulerVariable.cpp
+++ b/SU2_CFD/src/variables/CAdjEulerVariable.cpp
@@ -54,8 +54,8 @@ CAdjEulerVariable::CAdjEulerVariable(su2double val_psirho, su2double *val_phi, s
 
   unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Array initialization ---*/
   Psi = NULL;
@@ -131,7 +131,7 @@ CAdjEulerVariable::CAdjEulerVariable(su2double val_psirho, su2double *val_phi, s
     IntBoundary_Jump[iVar] = 0.0;
 
   /*--- Allocate space for the harmonic balance source terms ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     HB_Source = new su2double[nVar];
     for (iVar = 0; iVar < nVar; iVar++)
       HB_Source[iVar] = 0.0;
@@ -146,8 +146,8 @@ CAdjEulerVariable::CAdjEulerVariable(su2double *val_solution, unsigned short val
 
   unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Array initialization ---*/
   Psi = NULL;
@@ -218,7 +218,7 @@ CAdjEulerVariable::CAdjEulerVariable(su2double *val_solution, unsigned short val
     IntBoundary_Jump[iVar] = 0.0;
 
   /*--- Allocate space for the harmonic balance source terms ---*/
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     HB_Source = new su2double[nVar];
     for (iVar = 0; iVar < nVar; iVar++)
       HB_Source[iVar] = 0.0;
diff --git a/SU2_CFD/src/variables/CDiscAdjVariable.cpp b/SU2_CFD/src/variables/CDiscAdjVariable.cpp
index 1f6a53fa5d8b..c84c43b8ad4d 100644
--- a/SU2_CFD/src/variables/CDiscAdjVariable.cpp
+++ b/SU2_CFD/src/variables/CDiscAdjVariable.cpp
@@ -64,8 +64,8 @@ CDiscAdjVariable::CDiscAdjVariable() : CVariable() {
 CDiscAdjVariable::CDiscAdjVariable(su2double* val_solution, unsigned short val_ndim, unsigned short val_nvar,
                                    CConfig *config) : CVariable(val_ndim, val_nvar, config) {
 
-  bool dual_time = (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
-      || (config->GetUnsteady_Simulation() == DT_STEPPING_2ND);
+  bool dual_time = (config->GetTime_Marching() == DT_STEPPING_1ST)
+      || (config->GetTime_Marching() == DT_STEPPING_2ND);
 
   bool fsi = config->GetFSI_Simulation();
 
diff --git a/SU2_CFD/src/variables/CEulerVariable.cpp b/SU2_CFD/src/variables/CEulerVariable.cpp
index 88c076f5272b..17a939b2bff5 100644
--- a/SU2_CFD/src/variables/CEulerVariable.cpp
+++ b/SU2_CFD/src/variables/CEulerVariable.cpp
@@ -68,8 +68,8 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
                                unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
     unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool viscous = config->GetViscous();
   bool windgust = config->GetWind_Gust();
   bool classical_rk4 = (config->GetKind_TimeIntScheme_Flow() == CLASSICAL_RK4_EXPLICIT);
@@ -187,7 +187,7 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
 
   /*--- Allocate space for the harmonic balance source terms ---*/
 
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     HB_Source = new su2double[nVar];
     for (iVar = 0; iVar < nVar; iVar++) HB_Source[iVar] = 0.0;
   }
@@ -231,8 +231,8 @@ CEulerVariable::CEulerVariable(su2double val_density, su2double *val_velocity, s
 CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim, unsigned short val_nvar, CConfig *config) : CVariable(val_nDim, val_nvar, config) {
     unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool viscous = config->GetViscous();
   bool windgust = config->GetWind_Gust();
   bool classical_rk4 = (config->GetKind_TimeIntScheme_Flow() == CLASSICAL_RK4_EXPLICIT);
@@ -342,7 +342,7 @@ CEulerVariable::CEulerVariable(su2double *val_solution, unsigned short val_nDim,
 
   /*--- Allocate space for the harmonic balance source terms ---*/
 
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     HB_Source = new su2double[nVar];
     for (iVar = 0; iVar < nVar; iVar++) HB_Source[iVar] = 0.0;
   }
diff --git a/SU2_CFD/src/variables/CFEAVariable.cpp b/SU2_CFD/src/variables/CFEAVariable.cpp
index 6927da8498c6..35bf96b502e2 100644
--- a/SU2_CFD/src/variables/CFEAVariable.cpp
+++ b/SU2_CFD/src/variables/CFEAVariable.cpp
@@ -70,7 +70,7 @@ CFEAVariable::CFEAVariable(su2double *val_fea, unsigned short val_nDim, unsigned
 
   bool refgeom = config->GetRefGeom();        // Reference geometry needs to be stored
 
-  bool dynamic_analysis = (config->GetDynamic_Analysis() == DYNAMIC);
+  bool dynamic_analysis = (config->GetTime_Domain());
   bool fsi_analysis = config->GetFSI_Simulation();
 
   VonMises_Stress       = 0.0;
diff --git a/SU2_CFD/src/variables/CHeatFVMVariable.cpp b/SU2_CFD/src/variables/CHeatFVMVariable.cpp
index 7317d2991b5c..d140958f7b84 100644
--- a/SU2_CFD/src/variables/CHeatFVMVariable.cpp
+++ b/SU2_CFD/src/variables/CHeatFVMVariable.cpp
@@ -50,8 +50,8 @@ CHeatFVMVariable::CHeatFVMVariable(su2double val_Heat, unsigned short val_nDim,
 
   unsigned short iVar, iMesh, nMGSmooth = 0;
   bool low_fidelity = false;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Array initialization ---*/
   Solution_Direct = NULL;
diff --git a/SU2_CFD/src/variables/CIncEulerVariable.cpp b/SU2_CFD/src/variables/CIncEulerVariable.cpp
index c72a9b056978..8b2b1adab61a 100644
--- a/SU2_CFD/src/variables/CIncEulerVariable.cpp
+++ b/SU2_CFD/src/variables/CIncEulerVariable.cpp
@@ -60,8 +60,8 @@ CIncEulerVariable::CIncEulerVariable(su2double val_pressure, su2double *val_velo
 
   unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time    = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                       (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time    = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                       (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool viscous      = config->GetViscous();
   bool axisymmetric = config->GetAxisymmetric();
 
@@ -176,8 +176,8 @@ CIncEulerVariable::CIncEulerVariable(su2double *val_solution, unsigned short val
 
   unsigned short iVar, iDim, iMesh, nMGSmooth = 0;
 
-  bool dual_time    = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                      (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time    = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                      (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool viscous      = config->GetViscous();
   bool axisymmetric = config->GetAxisymmetric();
 
diff --git a/SU2_CFD/src/variables/CTurbSAVariable.cpp b/SU2_CFD/src/variables/CTurbSAVariable.cpp
index 9bb9654008cd..cb8a897c1fc8 100644
--- a/SU2_CFD/src/variables/CTurbSAVariable.cpp
+++ b/SU2_CFD/src/variables/CTurbSAVariable.cpp
@@ -43,8 +43,8 @@ CTurbSAVariable::CTurbSAVariable(void) : CTurbVariable() { }
 CTurbSAVariable::CTurbSAVariable(su2double val_nu_tilde, su2double val_muT, unsigned short val_nDim,
                                  unsigned short val_nvar, CConfig *config) : CTurbVariable(val_nDim, val_nvar, config) {
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Initialization of S-A variables ---*/
   Solution[0] = val_nu_tilde;    Solution_Old[0] = val_nu_tilde;
diff --git a/SU2_CFD/src/variables/CTurbSSTVariable.cpp b/SU2_CFD/src/variables/CTurbSSTVariable.cpp
index 01c5e010345e..3e8c11b9f4b5 100644
--- a/SU2_CFD/src/variables/CTurbSSTVariable.cpp
+++ b/SU2_CFD/src/variables/CTurbSSTVariable.cpp
@@ -44,8 +44,8 @@ CTurbSSTVariable::CTurbSSTVariable(su2double val_kine, su2double val_omega, su2d
                                    unsigned short val_nDim, unsigned short val_nvar, su2double *constants,
                                    CConfig *config) : CTurbVariable(val_nDim, val_nvar, config) {
 
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
+  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+                    (config->GetTime_Marching() == DT_STEPPING_2ND));
 
   /*--- Initialization of variables ---*/
 
diff --git a/SU2_CFD/src/variables/CTurbVariable.cpp b/SU2_CFD/src/variables/CTurbVariable.cpp
index e9a1d90b0149..a7ff233deb01 100644
--- a/SU2_CFD/src/variables/CTurbVariable.cpp
+++ b/SU2_CFD/src/variables/CTurbVariable.cpp
@@ -55,7 +55,7 @@ CTurbVariable::CTurbVariable(unsigned short val_nDim, unsigned short val_nvar, C
 
   /*--- Allocate space for the harmonic balance source terms ---*/
 
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     HB_Source = new su2double[nVar];
     for (iVar = 0; iVar < nVar; iVar++)
       HB_Source[iVar] = 0.0;
diff --git a/SU2_CFD/src/variables/CVariable.cpp b/SU2_CFD/src/variables/CVariable.cpp
index be21b7d495b4..c21e4595e826 100644
--- a/SU2_CFD/src/variables/CVariable.cpp
+++ b/SU2_CFD/src/variables/CVariable.cpp
@@ -138,11 +138,11 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
       Gradient[iVar][iDim] = 0.0;
   }
 
-  if (config->GetUnsteady_Simulation() != NO) {
+  if (config->GetTime_Marching() != NO) {
     Solution_time_n = new su2double [nVar];
     Solution_time_n1 = new su2double [nVar];
   }
-  else if (config->GetDynamic_Analysis() == DYNAMIC) {
+  else if (config->GetTime_Domain()) {
     Solution_time_n = new su2double [nVar];
     for (iVar = 0; iVar < nVar; iVar++) Solution_time_n[iVar] = 0.0;
   }
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 24a8f537625c..4df291f60983 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -415,18 +415,18 @@ int main(int argc, char *argv[]) {
       if (
           ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
            ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
-            !((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-              (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND))) ||
+            !((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
+              (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND))) ||
            (StopCalc) ||
-           (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-             (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) &&
+           (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
+             (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND)) &&
             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))))
 
           &&
 
           ((TimeIter+1 == config_container[ZONE_1]->GetnTime_Iter()) ||
            (StopCalc) ||
-           ((config_container[ZONE_1]->GetDynamic_Analysis() == DYNAMIC) &&
+           ((config_container[ZONE_1]->GetTime_Domain()) &&
             ((TimeIter == 0) || (TimeIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0))))
 
           ){
@@ -522,9 +522,9 @@ int main(int argc, char *argv[]) {
 
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
             ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
-             !(config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING)) ||
+             !(config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING)) ||
             (StopCalc) ||
-            ((config_container[ZONE_0]->GetUnsteady_Simulation() == TIME_STEPPING) &&
+            ((config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING) &&
              ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
               /*--- Read in the restart file for this time step ---*/
@@ -600,11 +600,11 @@ int main(int argc, char *argv[]) {
 
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
             ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
-             !((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-               (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND))) ||
+             !((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
+               (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND))) ||
             (StopCalc) ||
-            (((config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-              (config_container[ZONE_0]->GetUnsteady_Simulation() == DT_STEPPING_2ND)) &&
+            (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
+              (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND)) &&
              ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
 
@@ -660,7 +660,7 @@ int main(int argc, char *argv[]) {
 
     }
 
-    else if (config_container[ZONE_0]->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+    else if (config_container[ZONE_0]->GetTime_Marching() == HARMONIC_BALANCE) {
 
       /*--- Read in the restart file for this time step ---*/
       for (iZone = 0; iZone < nZone; iZone++) {
@@ -735,7 +735,7 @@ int main(int argc, char *argv[]) {
 
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
             (StopCalc) ||
-            ((config_container[ZONE_0]->GetDynamic_Analysis() == DYNAMIC) &&
+            ((config_container[ZONE_0]->GetTime_Domain()) &&
              ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
 
               /*--- Set the current iteration number in the config class. ---*/
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 7634c8e72ab6..371b6eb97cfd 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -68,7 +68,7 @@ TIME_DOMAIN=YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, SPECTRAL_METHOD)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 TIME_STEP= 0.00174532925199
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 0eea593bc0a5..cbcc3ce86c91 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -70,7 +70,7 @@ TIME_DOMAIN= YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 % U_inf = 69.4448 - dt*=0.02 - dt=0.000288
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index 1c4e0d0212fd..88d1e67ba9bf 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -38,7 +38,7 @@ TIME_ITER = 10
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 TIME_STEP= 0.0015
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 6b99b1dc6a7e..14527f268c5a 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -45,7 +45,7 @@ TIME_ITER = 10
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-1ST_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-1ST_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 TIME_STEP= 0.0015
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index ee3e3ce9d067..26b1b0abab42 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -26,8 +26,6 @@ POISSON_RATIO=0.3
 MATERIAL_DENSITY=7854
 FORMULATION_ELASTICITY_2D = PLANE_STRESS
 TIME_DOMAIN=YES
-DYNAMIC_ANALYSIS= YES
-DYN_TIMESTEP= 0.01
 TIME_STEP=0.01
 MAX_TIME= 0.1
 INNER_ITER=7
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index d6c02c2f9981..a1b5a6d44116 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -148,7 +148,7 @@ MARKER_PRESSURE= ( RightBeamS , 0, LowerBeamS, 0, UpperBeamS, 0)
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Total Physical Time for dual time stepping simulations (s)
 UNST_TIME= 1.0
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index 2dc1936463d4..3fcc3d1eb1e9 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -15,8 +15,6 @@ READ_BINARY_RESTART= NO
 
 BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
-RESIDUAL_REDUCTION_FSI= 5
-CONV_RESIDUAL_MINVAL_FSI= -8
 
 %SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DISP_X, BGS_DISP_Y)
 INNER_ITER=10
@@ -29,8 +27,6 @@ ELASTICITY_MODULUS=5E4
 MATERIAL_DENSITY=50
 FORMULATION_ELASTICITY_2D = PLANE_STRESS
 POISSON_RATIO=0.3
-DYNAMIC_ANALYSIS= YES
-DYN_TIME= 4.01
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.36
 NEWMARK_GAMMA=0.7
@@ -40,7 +36,6 @@ RELAXATION = YES
 
 GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
-NONLINEAR_FEM_INT_ITER = 10
 RESIDUAL_FEM_UTOL = -7.0
 RESIDUAL_FEM_RTOL = -7.0
 RESIDUAL_FEM_ETOL = -7.0
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index 6ce5e332e8a3..4a55436ca4ba 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -31,7 +31,7 @@ BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
 RESIDUAL_REDUCTION_FSI= 5
 CONV_RESIDUAL_MINVAL_FSI= -8
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIME= 4.01
 UNST_INT_ITER= 50
 KIND_TURB_MODEL= NONE
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index 191072e0bef6..bfdcfba4b502 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -19,9 +19,8 @@ RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 
-CONV_RESIDUAL_MINVAL_FSI= -8
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIME= 4.01
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
+MAX_TIME= 4.01
 
 KIND_TURB_MODEL= NONE
 AOA= 0.0
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index a6780f5ff4b6..9a8865670144 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -61,7 +61,7 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, SPECTRAL_METHOD)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 TIME_STEP= 0.001469304
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 5c7147261456..d3e79f684b9e 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -28,7 +28,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= HARMONIC_BALANCE
+TIME_MARCHING= HARMONIC_BALANCE
 %
 % Number of time instances (Zones)
 TIME_INSTANCES= 3
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 6e08a2c6126a..85592b7322d5 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -28,7 +28,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= HARMONIC_BALANCE
+TIME_MARCHING= HARMONIC_BALANCE
 %
 % Number of time instances (Zones)
 TIME_INSTANCES= 7
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 4472ee12fd4b..2ed4bdedbe9a 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -63,8 +63,8 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%UNSTEADY_SIMULATION= NO
-UNSTEADY_SIMULATION= TIME_STEPPING
+%TIME_MARCHING= NO
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 UNST_TIMESTEP= 2.0e-3
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index e1fbcede68ea..4c1e8d5e76a3 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -62,8 +62,8 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%UNSTEADY_SIMULATION= NO
-UNSTEADY_SIMULATION= TIME_STEPPING
+%TIME_MARCHING= NO
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 UNST_TIMESTEP= 2.0e-3
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index d26cbb838efd..e39183c9d682 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -62,8 +62,8 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%UNSTEADY_SIMULATION= NO
-UNSTEADY_SIMULATION= TIME_STEPPING
+%TIME_MARCHING= NO
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 UNST_TIMESTEP= 1.0e-3
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index da39cd275308..7f55c79f7dd0 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -92,7 +92,7 @@ MARKER_DESIGNING = ( Sphere )
 TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= TIME_STEPPING
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 TIME_STEP= 2.0e-6
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 4bc178d186ed..4978ea8071e3 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -96,7 +96,7 @@ TIME_DOMAIN=YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= TIME_STEPPING
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 TIME_STEP= 1e-6
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 2df6a6fa5120..56dbffe90d3e 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -97,7 +97,7 @@ TIME_DOMAIN= YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-UNSTEADY_SIMULATION= TIME_STEPPING
+TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 TIME_STEP= 1.6e-5
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index cf7dda77ac34..b8262a2f7876 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -64,7 +64,7 @@ REF_AREA= 1.0
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 1E-2
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 8a85ec3b4888..6decf4131cc7 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -61,7 +61,7 @@ REF_AREA= 1.0
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 53e42f0e4340..da3125663a85 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -64,7 +64,7 @@ REF_AREA= 0.677
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 323ffa8333f0..87dc4c1dde17 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -33,7 +33,7 @@ SINGLEZONE_DRIVER= YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 2fc40bae90fd..0f16f584261e 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -52,7 +52,7 @@ REYNOLDS_LENGTH= 1.0
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.01
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index 76ac6b2870a6..216085d9cfe8 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -29,7 +29,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0023555025613149587
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index 0e6d009a9d9c..129a7ac6b779 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -43,7 +43,7 @@ FREESTREAM_TEMPERATURE= 288.15
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.002161633860454094
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index 995edd902767..efda25720082 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -29,7 +29,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0023555025613149587
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index b87642ac3c34..1c9e09383fb4 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -49,7 +49,7 @@ REYNOLDS_LENGTH= 0.64607
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.002161633860454094
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 5266b600170b..e2d2e0169105 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -160,7 +160,7 @@ KT_CONSTANT= 0.0257
 TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 TIME_STEP= 0.003
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index a47195c47ac4..7535eb43d76a 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -161,7 +161,7 @@ TIME_DOMAIN=YES
 TIME_ITER= 10
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
 TIME_STEP= 0.003
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 0a906c149525..cc61a6c4ce14 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -145,7 +145,7 @@ SUTHERLAND_CONSTANT= 110.4
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%UNSTEADY_SIMULATION=  DUAL_TIME_STEPPING-2ND_ORDER
+%TIME_MARCHING=  DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0001
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 98bcac0888ed..11d44abb92a0 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -48,7 +48,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index c908a3af9918..120d3721bf5e 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -48,7 +48,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index b68f62f38065..83a5bf4878df 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -47,7 +47,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.1
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 701b0ea79355..73776750f778 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -47,7 +47,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 51454b2bb535..6c8c873d6614 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -25,7 +25,7 @@ MULTIZONE_MESH = NO
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIMESTEP= 1.0
 UNST_INT_ITER= 20
 RESTART_ITER = 2
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 24fa33d9680b..69aa7bee61a7 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -25,7 +25,7 @@ MULTIZONE_MESH = NO
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 UNST_TIMESTEP= 1.0
 UNST_INT_ITER= 20
 RESTART_ITER = 2
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index d50f95d9aec8..82bbf3e819e6 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -43,7 +43,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.1
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 87d7cbd6aa10..4bc8551cd472 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -41,7 +41,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.1
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index f8821c2ef57f..c4e122a71b0d 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -46,7 +46,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index edd40c8b79c0..2209549bcda1 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -49,7 +49,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index a2cc7aee9c40..8f45218dd33f 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -36,7 +36,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.1
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 922383be9a27..4baebeeebfe7 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -38,7 +38,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.1
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index 253d9363eccb..bb3c32c9899d 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -48,7 +48,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 4f3565e8f761..96fb8c85d10b 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -50,7 +50,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 5e11b9bca436..fe310ac09c3b 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -42,7 +42,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-1ST_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 25d1e95a9f49..166da7920a57 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -35,7 +35,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-1ST_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 1E-4
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index d25d18f0416e..c72e36f9874c 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -29,7 +29,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0023555025613149587
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 099d211e6c8d..6ba0fe3034f1 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -29,7 +29,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0023555025613149587
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index 47deb79deb76..5c6c4d5ef3e3 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -29,7 +29,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 UNST_TIMESTEP= 0.0023555025613149587
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index afc2c2d3baa7..ea62a7bab0fe 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -43,7 +43,7 @@ TIME_DOMAIN = YES
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
 TIME_STEP= 0.0015

From 5e65ff150ced6691fa259490c4a37de916db044d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 15:04:01 +0200
Subject: [PATCH 401/539] Added runtime option parsing for single zone driver

---
 Common/include/config_structure.hpp           |  8 +++++++-
 Common/include/config_structure.inl           |  2 ++
 Common/src/config_structure.cpp               | 11 ++++++++--
 SU2_CFD/include/drivers/CSinglezoneDriver.hpp |  5 +++++
 SU2_CFD/src/drivers/CDriver.cpp               |  4 +++-
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     | 20 +++++++++++++++++++
 6 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index e6e379919575..f0013e14a2f4 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -8981,10 +8981,16 @@ class CConfig {
 
   /*!
    * \brief Get the number of time iterations
-   * \return Number of time steps run for the multizone problem
+   * \return Number of time steps run 
    */
   unsigned long GetnTime_Iter(void);
 
+  /*!
+   * \brief Set the number of time iterations
+   * \param[in] val_iter - Number of time steps run 
+   */
+  void SetnTime_Iter(unsigned long val_iter);
+  
   /*!
    * \brief Get the number of pseudo-time iterations
    * \return Number of pseudo-time steps run for the single-zone problem
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 2cd1fd4bc8cc..b265666c4ba7 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1994,6 +1994,8 @@ inline unsigned long CConfig::GetnOuter_Iter(void) { return nOuterIter; }
 
 inline unsigned long CConfig::GetnTime_Iter(void) { return nTimeIter; }
 
+inline void CConfig::SetnTime_Iter(unsigned long val_iter) { nTimeIter = val_iter; }
+
 inline unsigned long CConfig::GetnIter(void) { return nIter; }
 
 inline unsigned long CConfig::GetRestart_Iter(void) { return Restart_Iter; }
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 2eba5ddc2938..44059406f2f8 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -227,6 +227,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
   /*--- Parsing the config file  ---*/
 
   runtime_file = SetRunTime_Parsing(case_filename);
+  
   /*--- Set the default values for all of the options that weren't set ---*/
       
   SetDefault();
@@ -234,9 +235,11 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
   /*--- Update original config file ---*/
 
   if (runtime_file) {
-    config->SetTimeIter(nTimeIter);
+    if (all_options.find("TIME_ITER") == all_options.end())
+      config->SetnTime_Iter(nTimeIter);
+    if (all_options.find("CFL_NUMBER") == all_options.end())
+      config->SetCFL(MESH_0, CFLFineGrid);
   }
-
 }
 
 SU2_MPI::Comm CConfig::GetMPICommunicator() {
@@ -731,6 +734,10 @@ void CConfig::SetRunTime_Options(void) {
   /* DESCRIPTION: Number of external iterations */
   
   addUnsignedLongOption("TIME_ITER", nTimeIter, 999999);
+ 
+  /* DESCRIPTION: CFL Number */
+  
+  addDoubleOption("CFL_NUMBER", CFLFineGrid, 10);
 
 }
 
diff --git a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
index 1fbddc141bcc..298b74f875ea 100644
--- a/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
+++ b/SU2_CFD/include/drivers/CSinglezoneDriver.hpp
@@ -107,5 +107,10 @@ class CSinglezoneDriver : public CDriver {
    * \param ExtIter
    */
   virtual bool Monitor(unsigned long TimeIter);
+  
+  /*!
+   * \brief Runtime_Parsing
+   */
+  virtual void Runtime_Options();
 
 };
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 0ee254978df6..9f009c2c41b0 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -46,7 +46,7 @@
 
 CDriver::CDriver(char* confFile,
                  unsigned short val_nZone,
-                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), nZone(val_nZone), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
+                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), nZone(val_nZone), TimeIter(0), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
 
   unsigned short jZone;
 
@@ -313,6 +313,8 @@ void CDriver::SetContainers_Null(){
     transfer_types[iZone]                 = new unsigned short[nZone];
     nInst[iZone]                          = 1;
   }
+  
+  strcpy(runtime_file_name, "runtime.dat");
 
 }
 
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index a0cc99a9065c..21ce487953dc 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -109,6 +109,10 @@ void CSinglezoneDriver::StartSolver() {
 }
 
 void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
+    
+  /*--- Set runtime option ---*/
+  
+  Runtime_Options();
   
   /*--- Set the current time iteration in the config ---*/
   
@@ -369,3 +373,19 @@ bool CSinglezoneDriver::Monitor(unsigned long TimeIter){
   return StopCalc;
 }
 
+void CSinglezoneDriver::Runtime_Options(){
+  
+  ifstream runtime_configfile;
+  
+  /*--- Try to open the runtime config file ---*/
+  
+  runtime_configfile.open(runtime_file_name, ios::in);
+  
+  /*--- If succeeded create a temporary config object ---*/
+  
+  if (runtime_configfile.good()){
+    CConfig *runtime = new CConfig(runtime_file_name, config_container[ZONE_0]);
+    delete runtime;
+  }
+  
+}

From 2fb6e40736ba472cd50bedd5d988b3a87a35d1dc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 15:04:27 +0200
Subject: [PATCH 402/539] Added cfl number as history output to solvers

---
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp | 3 +++
 SU2_CFD/src/output/CFlowCompOutput.cpp    | 3 +++
 SU2_CFD/src/output/CFlowIncOutput.cpp     | 6 +++++-
 SU2_CFD/src/output/CHeatOutput.cpp        | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 8af7bd2bf6b5..169013f7ff12 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -139,6 +139,8 @@ void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
    
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver.");
+  
+  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
  
   /*--- Add analyze surface history fields --- */
   
@@ -317,6 +319,7 @@ void CFlowCompFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
   
   SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
   
   /*--- Set the analyse surface history values --- */
   
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index c1d5f47cda5b..9220fe58995e 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -241,6 +241,8 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
   /// END_GROUP
   
+  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+  
   /*--- Add analyze surface history fields --- */
   
   AddAnalyzeSurfaceOutput(config);
@@ -605,6 +607,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
   
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
  
   /*--- Set the analyse surface history values --- */
   
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index fa42f100d6dc..22e021bca4fe 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -206,6 +206,8 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver");
   
+  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
+  
   /*--- Add analyze surface history fields --- */
   
   AddAnalyzeSurfaceOutput(config);
@@ -291,7 +293,9 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
       else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
     }
 
-  }
+  }  
+  SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
+
   
   /*--- Set the analyse surface history values --- */
   
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index f93f622d0f0c..ebb09021213c 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -106,7 +106,8 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
     SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
   
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
-  
+  SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
+    
 }
   
 
@@ -121,6 +122,7 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
   AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximal heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
   AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", "Total average temperature on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
   
 }
 

From e89aaacd0e8babeb7a16fd1769091fc8a7e28899 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 15:09:53 +0200
Subject: [PATCH 403/539] Fixed pywrapper cases

---
 .../flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg      | 3 ---
 .../flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py     | 4 ++--
 .../flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py   | 4 ++--
 .../flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg    | 3 ---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index e2d2e0169105..6750c9b5e871 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -453,9 +453,6 @@ VISUALIZE_SURFACE_DEF= NO
 VISUALIZE_VOLUME_DEF= NO
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-%
-% Number of total iterations
-ITER= 999999
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= CAUCHY
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
index d4455a832cde..95079487e740 100755
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
@@ -140,8 +140,8 @@ def main():
 
   # Retrieve some control parameters from the driver
   deltaT = SU2Driver.GetUnsteady_TimeStep()
-  TimeIter = SU2Driver.GetExtIter()
-  nTimeIter = SU2Driver.GetnExtIter()
+  TimeIter = SU2Driver.GetTime_Iter()
+  nTimeIter = SU2Driver.GetnTimeIter()
   time = TimeIter*deltaT
 
   # Extract the initial position of each node on the moving marker
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
index f4c5d74f1101..930d0e5aca5f 100755
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/launch_unsteady_CHT_FlatPlate.py
@@ -139,8 +139,8 @@ def main():
 
   # Retrieve some control parameters from the driver
   deltaT = SU2Driver.GetUnsteady_TimeStep()
-  TimeIter = SU2Driver.GetExtIter()
-  nTimeIter = SU2Driver.GetnExtIter()
+  TimeIter = SU2Driver.GetTime_Iter()
+  nTimeIter = SU2Driver.GetnTimeIter()
   time = TimeIter*deltaT
 
   # Time loop is defined in Python so that we have acces to SU2 functionalities at each time step
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 7535eb43d76a..e4a3d1839d7e 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -434,9 +434,6 @@ VISUALIZE_VOLUME_DEF= NO
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-ITER= 999999
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 %
 CONV_CRITERIA= CAUCHY

From d9a3568c49e30738f8fda93bb0306af893508ad7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 15:35:22 +0200
Subject: [PATCH 404/539] Disabled some test cases for the moment

---
 TestCases/serial_regression.py    | 64 +++++++++++++++----------------
 TestCases/serial_regression_AD.py | 20 +++++-----
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 64329e61fe71..58c3f9abfd1a 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -551,16 +551,16 @@ def main():
     test_list.append(contadj_wedge)
     
     # Inviscid fixed CL NACA0012
-    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
-    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
-    contadj_fixedCL_naca0012.test_iter = 100
-    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
-    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
-    contadj_fixedCL_naca0012.new_output= True
-    contadj_fixedCL_naca0012.timeout   = 1600
-    contadj_fixedCL_naca0012.tol       = 0.00001
-    test_list.append(contadj_fixedCL_naca0012)
+#    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
+#    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+#    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
+#    contadj_fixedCL_naca0012.test_iter = 100
+#    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
+#    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
+#    contadj_fixedCL_naca0012.new_output= True
+#    contadj_fixedCL_naca0012.timeout   = 1600
+#    contadj_fixedCL_naca0012.tol       = 0.00001
+#    test_list.append(contadj_fixedCL_naca0012)
 
     ###################################
     ### Cont. adj. compressible N-S ###
@@ -1434,28 +1434,28 @@ def main():
     # Optimization with multiple objectives, with gradients evaluated individually
     # the difference in gradient value relative to combined case 
     # is due to lack of solution file for the adjoint and small number of iterations
-    opt_multiobj_py            = TestCase('opt_multiobj_py')
-    opt_multiobj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_multiobj_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
-    opt_multiobj_py.test_iter  = 1
-    opt_multiobj_py.test_vals = [1, 1, 1.084701E+02, 3.799222E+00] #last 4 columns
-    opt_multiobj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
-    opt_multiobj_py.timeout    = 1600
-    opt_multiobj_py.tol       = 0.00001
-    pass_list.append(opt_multiobj_py.run_opt())
-    test_list.append(opt_multiobj_py)
-
-    # test optimization, with multiple objectives and gradient evaluated as 'combo' 
-    opt_multiobjcombo_py            = TestCase('opt_multiobjcombo_py')
-    opt_multiobjcombo_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_multiobjcombo_py.cfg_file   = "inv_wedge_ROE_multiobj_combo.cfg"
-    opt_multiobjcombo_py.test_iter  = 1
-    opt_multiobjcombo_py.test_vals = [1, 1, 1.084701E+02, 3.789322E+00] #last 4 columns
-    opt_multiobjcombo_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
-    opt_multiobjcombo_py.timeout    = 1600
-    opt_multiobjcombo_py.tol       = 0.00001
-    pass_list.append(opt_multiobjcombo_py.run_opt())
-    test_list.append(opt_multiobjcombo_py)
+#    opt_multiobj_py            = TestCase('opt_multiobj_py')
+#    opt_multiobj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+#    opt_multiobj_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
+#    opt_multiobj_py.test_iter  = 1
+#    opt_multiobj_py.test_vals = [1, 1, 1.084701E+02, 3.799222E+00] #last 4 columns
+#    opt_multiobj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
+#    opt_multiobj_py.timeout    = 1600
+#    opt_multiobj_py.tol       = 0.00001
+#    pass_list.append(opt_multiobj_py.run_opt())
+#    test_list.append(opt_multiobj_py)
+#
+#    # test optimization, with multiple objectives and gradient evaluated as 'combo' 
+#    opt_multiobjcombo_py            = TestCase('opt_multiobjcombo_py')
+#    opt_multiobjcombo_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
+#    opt_multiobjcombo_py.cfg_file   = "inv_wedge_ROE_multiobj_combo.cfg"
+#    opt_multiobjcombo_py.test_iter  = 1
+#    opt_multiobjcombo_py.test_vals = [1, 1, 1.084701E+02, 3.789322E+00] #last 4 columns
+#    opt_multiobjcombo_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
+#    opt_multiobjcombo_py.timeout    = 1600
+#    opt_multiobjcombo_py.tol       = 0.00001
+#    pass_list.append(opt_multiobjcombo_py.run_opt())
+#    test_list.append(opt_multiobjcombo_py)
 
     # test optimization, with multiple objectives evaluated on a single surface
     opt_multiobj1surf_py            = TestCase('opt_multiobj1surf_py')
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 6b798ab6038b..be089ffd1b81 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -303,16 +303,16 @@ def main():
     test_list.append(directdiff_multiple_ffd_py)
 
     # test continuous_adjoint.py, with multiple objectives
-    discadj_multi_py            = TestCase('discadj_multi_py')
-    discadj_multi_py.cfg_dir    = "cont_adj_euler/wedge"
-    discadj_multi_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
-    discadj_multi_py.test_iter  = 10
-    discadj_multi_py.su2_exec   = "discrete_adjoint.py"
-    discadj_multi_py.timeout    = 1600
-    discadj_multi_py.reference_file = "of_grad_combo.dat.refdiscrete"
-    discadj_multi_py.test_file  = "of_grad_combo.dat"
-    pass_list.append(discadj_multi_py.run_filediff())
-    test_list.append(discadj_multi_py)
+#    discadj_multi_py            = TestCase('discadj_multi_py')
+#    discadj_multi_py.cfg_dir    = "cont_adj_euler/wedge"
+#    discadj_multi_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
+#    discadj_multi_py.test_iter  = 10
+#    discadj_multi_py.su2_exec   = "discrete_adjoint.py"
+#    discadj_multi_py.timeout    = 1600
+#    discadj_multi_py.reference_file = "of_grad_combo.dat.refdiscrete"
+#    discadj_multi_py.test_file  = "of_grad_combo.dat"
+#    pass_list.append(discadj_multi_py.run_filediff())
+#    test_list.append(discadj_multi_py)
 
     # Tests summary
     print('==================================================================')

From a245505bd1fe7c1753f9fffcd1cef6c610f3b0a4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 16:33:20 +0200
Subject: [PATCH 405/539] Missing renaming

---
 SU2_CFD/src/output/output_structure_legacy.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 432784654dd7..cf0325bbe2d4 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -469,10 +469,10 @@ void COutputLegacy::SetSurfaceCSV_Flow(CConfig *config, CGeometry *geometry,
   /*--- Write file name with extension if unsteady ---*/
   strcpy (cstr, config->GetSurfCoeff_FileName().c_str());
   
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
 
-  }else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+  }else if (config->GetTime_Marching() && config->GetTime_Domain()) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));
@@ -814,10 +814,10 @@ void COutputLegacy::SetSurfaceCSV_Adjoint(CConfig *config, CGeometry *geometry,
   
   strcpy (cstr, config->GetSurfAdjCoeff_FileName().c_str());
   
-  if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
+  if (config->GetTime_Marching() == HARMONIC_BALANCE) {
     SPRINTF (buffer, "_%d.csv", SU2_TYPE::Int(val_iInst));
     
-  } else if (config->GetUnsteady_Simulation() && config->GetTime_Domain()) {
+  } else if (config->GetTime_Marching() && config->GetTime_Domain()) {
     if ((SU2_TYPE::Int(iExtIter) >= 0)    && (SU2_TYPE::Int(iExtIter) < 10))    SPRINTF (buffer, "_0000%d.csv", SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 10)   && (SU2_TYPE::Int(iExtIter) < 100))   SPRINTF (buffer, "_000%d.csv",  SU2_TYPE::Int(iExtIter));
     if ((SU2_TYPE::Int(iExtIter) >= 100)  && (SU2_TYPE::Int(iExtIter) < 1000))  SPRINTF (buffer, "_00%d.csv",   SU2_TYPE::Int(iExtIter));

From b5610eabd6c520c80ad8ff6b68c298f0746f902d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 16:34:32 +0200
Subject: [PATCH 406/539] disabled test case

---
 TestCases/parallel_regression.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 824ce8b35c0f..dd9d278ed5af 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -96,16 +96,16 @@ def main():
     oneram6.tol       = 0.00001
     test_list.append(oneram6)
 
-    # Fixed CL NACA0012
-    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
-    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    fixedCL_naca0012.test_iter = 100
-    fixedCL_naca0012.test_vals = [-2.474140, 2.927471, 0.290169, 0.019080] #last 4 columns
-    fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
-    fixedCL_naca0012.timeout   = 1600
-    fixedCL_naca0012.tol       = 0.00001
-    test_list.append(fixedCL_naca0012)
+#    # Fixed CL NACA0012
+#    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
+#    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+#    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
+#    fixedCL_naca0012.test_iter = 100
+#    fixedCL_naca0012.test_vals = [-2.474140, 2.927471, 0.290169, 0.019080] #last 4 columns
+#    fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
+#    fixedCL_naca0012.timeout   = 1600
+#    fixedCL_naca0012.tol       = 0.00001
+#    test_list.append(fixedCL_naca0012)
     
     # Polar sweep of the inviscid NACA0012
     polar_naca0012           = TestCase('polar_naca0012')

From 47069c5f081254c55814ddd2ddbe30b1f29e7a70 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 17:21:37 +0200
Subject: [PATCH 407/539] Fixed python scripts

---
 SU2_PY/FSI/FSIInterface.py                       |  2 +-
 SU2_PY/FSI/PitchPlungeAirfoilStructuralTester.py |  4 ++--
 SU2_PY/FSI/io/FSI_config.py                      |  2 +-
 SU2_PY/SU2/io/tools.py                           | 12 ++++++------
 SU2_PY/fsi_computation.py                        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/SU2_PY/FSI/FSIInterface.py b/SU2_PY/FSI/FSIInterface.py
index 7a1c30d49974..96afc4231346 100644
--- a/SU2_PY/FSI/FSIInterface.py
+++ b/SU2_PY/FSI/FSIInterface.py
@@ -158,7 +158,7 @@ def __init__(self, FSI_config, FluidSolver, SolidSolver, have_MPI):
 	self.MPIPrint('Fluid solver : SU2_CFD')
 	self.MPIPrint('Solid solver : {}'.format(FSI_config['CSD_SOLVER']))
 
-	if FSI_config['UNSTEADY_SIMULATION'] == 'YES':
+	if FSI_config['TIME_MARCHING'] == 'YES':
           self.MPIPrint('Unsteady coupled simulation with physical time step : {} s'.format(FSI_config['UNST_TIMESTEP']))
           self.unsteady = True
 	else:
diff --git a/SU2_PY/FSI/PitchPlungeAirfoilStructuralTester.py b/SU2_PY/FSI/PitchPlungeAirfoilStructuralTester.py
index 31b2d21a68a3..c65eb137e650 100755
--- a/SU2_PY/FSI/PitchPlungeAirfoilStructuralTester.py
+++ b/SU2_PY/FSI/PitchPlungeAirfoilStructuralTester.py
@@ -133,7 +133,7 @@ def __init__(self, config_fileName):
 
     self.Mesh_file = self.Config['MESH_FILE']
     self.FSI_marker = self.Config['MOVING_MARKER']
-    self.Unsteady = (self.Config['UNSTEADY_SIMULATION']=="YES")
+    self.Unsteady = (self.Config['TIME_MARCHING']=="YES")
     if self.Unsteady:
       print('Dynamic computation.')
     if self.Config['STRUCT_TYPE'] == "AIRFOIL":
@@ -224,7 +224,7 @@ def __readConfig(self):
 	    break
 
 	  #string values
-	  if case("UNSTEADY_SIMULATION")	: pass
+	  if case("TIME_MARCHING")	: pass
 	  if case("MESH_FILE")			: pass
 	  if case("CSD_SOLVER")		      	: pass
 	  if case("MOVING_MARKER")		: pass
diff --git a/SU2_PY/FSI/io/FSI_config.py b/SU2_PY/FSI/io/FSI_config.py
index 22769a22bb41..ee848d43cba9 100644
--- a/SU2_PY/FSI/io/FSI_config.py
+++ b/SU2_PY/FSI/io/FSI_config.py
@@ -115,7 +115,7 @@ def readConfig(self):
                 if case("MESH_INTERP_METHOD")         : pass
 		if case("DISP_PRED")		      : pass
 		if case("AITKEN_RELAX")               : pass
-	        if case("UNSTEADY_SIMULATION")	      : pass
+	        if case("TIME_MARCHING")	      : pass
 		if case("INTERNAL_FLOW")	      : 
 	        #if case("MESH_DEF_METHOD")	      : pass
 		    self._ConfigContent[this_param] = this_value
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 51d62b46fdc5..bd73796c3be9 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -511,7 +511,7 @@ def read_aerodynamics( History_filename , nZones = 1, special_cases=[], final_av
         
         Outputs:
             dictionary with function keys and thier values
-            if special cases has 'UNSTEADY_SIMULATION', returns time averaged data
+            if special cases has 'TIME_MARCHING', returns time averaged data
             otherwise returns final value from history file
     """
     
@@ -528,7 +528,7 @@ def read_aerodynamics( History_filename , nZones = 1, special_cases=[], final_av
             Func_Values[this_objfun] = history_data[this_objfun] 
     
     # for unsteady cases, average time-accurate objective function values
-    if 'UNSTEADY_SIMULATION' in special_cases and not final_avg:
+    if 'TIME_MARCHING' in special_cases and not final_avg:
         for key,value in Func_Values.items():
             Func_Values[key] = sum(value)/len(value)
          
@@ -985,8 +985,8 @@ def get_specialCases(config):
         if 'SOLVER' in config and config['SOLVER'] == key:
             special_cases.append(key)
             
-    if config.get('UNSTEADY_SIMULATION','NO') != 'NO':
-        special_cases.append('UNSTEADY_SIMULATION')
+    if config.get('TIME_MARCHING','NO') != 'NO':
+        special_cases.append('TIME_MARCHING')
      
     # no support for more than one special case
     if len(special_cases) > 1:
@@ -997,7 +997,7 @@ def get_specialCases(config):
         raise Exception('Must set WRT_SOL_FREQ= 1 for WRT_UNSTEADY= YES')
   
     # Special case for harmonic balance
-    if 'UNSTEADY_SIMULATION' in config and config['UNSTEADY_SIMULATION'] == 'HARMONIC_BALANCE':
+    if 'TIME_MARCHING' in config and config['TIME_MARCHING'] == 'HARMONIC_BALANCE':
         special_cases.append('HARMONIC_BALANCE')
 
     # Special case for rotating frame
@@ -1072,7 +1072,7 @@ def expand_part(name,config):
     return names
 
 def expand_time(name,config):
-    if 'UNSTEADY_SIMULATION' in get_specialCases(config):
+    if 'TIME_MARCHING' in get_specialCases(config):
         n_time = config['UNST_ADJOINT_ITER']
         if not isinstance(name, list):
             name_pat = add_suffix(name,'%05d')
diff --git a/SU2_PY/fsi_computation.py b/SU2_PY/fsi_computation.py
index a4badccf3a22..f81c2e04d74b 100755
--- a/SU2_PY/fsi_computation.py
+++ b/SU2_PY/fsi_computation.py
@@ -161,7 +161,7 @@ def main():
     comm.barrier()
 
   # --- Launch a steady or unsteady FSI computation --- #
-  if FSI_config['UNSTEADY_SIMULATION'] == "YES":
+  if FSI_config['TIME_MARCHING'] == "YES":
     try:
       FSIInterface.UnsteadyFSI(FSI_config, FluidSolver, SolidSolver)
     except NameError as exception:

From c1cd9e1f9ccfae7b4e5c0b949e26bae525e045e5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 17:25:18 +0200
Subject: [PATCH 408/539] Fixed for reading sensitivity

---
 Common/src/geometry_structure.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 64d49dbf4d16..332b09bff8f0 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -16096,8 +16096,8 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   
   Sensitivity = new su2double[nPoint*nDim];
 
-  if (config->GetTime_Marching()) {
-    nTimeIter = config->GetTimeIter();
+  if (config->GetTime_Domain()) {
+    nTimeIter = config->GetnTime_Iter();
   }else {
     nTimeIter = 1;
   }

From 6862f35bb364de4de4aef413f5646499e87904da Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 15 Aug 2019 17:44:55 +0200
Subject: [PATCH 409/539] Fixed some warnings

---
 Common/src/config_structure.cpp                  | 8 +++-----
 SU2_CFD/src/drivers/CDriver.cpp                  | 2 +-
 SU2_CFD/src/integration_time.cpp                 | 8 --------
 SU2_CFD/src/iteration_structure.cpp              | 8 +-------
 SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp | 3 +--
 SU2_CFD/src/output/output_structure_legacy.cpp   | 4 ----
 SU2_CFD/src/solver_adjoint_mean.cpp              | 6 ------
 SU2_CFD/src/solver_structure.cpp                 | 8 ++------
 SU2_SOL/src/SU2_SOL.cpp                          | 2 +-
 9 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 44059406f2f8..80db0c1f1c34 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -5895,13 +5895,11 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 		}
   }
 	else {
-		switch (Time_Domain) {
-		  case NO:
-			cout << "Static structural analysis." << endl; break;
-		  case YES:
+		if (Time_Domain) {
+			cout << "Static structural analysis." << endl; 
+		 } else {
 			cout << "Dynamic structural analysis."<< endl;
 			cout << "Time step provided by the user for the dynamic analysis(s): "<< Delta_DynTime << "." << endl;
-			break;
 		}
 	}
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 9f009c2c41b0..2dc2b231dc82 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -46,7 +46,7 @@
 
 CDriver::CDriver(char* confFile,
                  unsigned short val_nZone,
-                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), nZone(val_nZone), TimeIter(0), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
+                 SU2_Comm MPICommunicator, bool dummy_geo):config_file_name(confFile), StartTime(0.0), StopTime(0.0), UsedTime(0.0), TimeIter(0), nZone(val_nZone), StopCalc(false), fsi(false), fem_solver(false), dummy_geometry(dummy_geo) {
 
   unsigned short jZone;
 
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index d999686e2a8f..cd5894ec9a37 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -768,7 +768,6 @@ CSingleGridIntegration::~CSingleGridIntegration(void) { }
 void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolver *****solver_container,
                                                   CNumerics ******numerics_container, CConfig **config, unsigned short RunTime_EqSystem, unsigned short iZone, unsigned short iInst) {
   unsigned short iMesh;
-  su2double monitor = 0.0;
   
   unsigned short SolContainer_Position = config[iZone]->GetContainerPosition(RunTime_EqSystem);
 
@@ -800,13 +799,6 @@ void CSingleGridIntegration::SingleGrid_Iteration(CGeometry ****geometry, CSolve
   
   solver_container[iZone][iInst][FinestMesh][SolContainer_Position]->Postprocessing(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone], FinestMesh);
   
-  /*--- Compute adimensional parameters and the convergence monitor ---*/
-  
-  switch (RunTime_EqSystem) {
-    case RUNTIME_FEA_SYS:     monitor = log10(solver_container[iZone][iInst][FinestMesh][FEA_SOL]->GetRes_RMS(0));     break;
-    case RUNTIME_HEAT_SYS:    monitor = log10(solver_container[iZone][iInst][FinestMesh][HEAT_SOL]->GetRes_RMS(0));    break;
-  }
-  
   if (RunTime_EqSystem == RUNTIME_HEAT_SYS) {
     solver_container[iZone][iInst][FinestMesh][HEAT_SOL]->Heat_Fluxes(geometry[iZone][iInst][FinestMesh], solver_container[iZone][iInst][FinestMesh], config[iZone]);
   }
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 249d711ed286..3f2670c5c173 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1340,10 +1340,6 @@ void CHeatIteration::Solve(COutput *output,
                              unsigned short val_iZone,
                              unsigned short val_iInst) {
 
-  /*--- Boolean to determine if we are running a steady or unsteady case ---*/
-  bool steady = (config[val_iZone]->GetTime_Marching() == STEADY);
-  bool unsteady = ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) || (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND));
-
   unsigned short Inner_Iter, nInner_Iter = config[val_iZone]->GetnInner_Iter();
   bool StopCalc = false;
 
@@ -2562,9 +2558,7 @@ bool CDiscAdjFluidIteration::Monitor(COutput *output,
     unsigned short val_iInst)     {
 
   bool StopCalc = false;
-  bool steady = (config[val_iZone]->GetTime_Marching() == STEADY);
-  bool output_history = false;
-
+  
 #ifndef HAVE_MPI
   StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 2d1b818050dc..a04f2df43637 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -32,7 +32,7 @@ CFVMDataSorter::~CFVMDataSorter(){
 
 void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
   
-  unsigned long iPoint, Global_Index, iVertex;
+  unsigned long iPoint, iVertex;
   unsigned short iMarker;
   int SendRecv, RecvFrom;
   bool notHalo;
@@ -48,7 +48,6 @@ void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
       
       for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        Global_Index = geometry->node[iPoint]->GetGlobalIndex();
         
         /*--- We need to keep one copy of overlapping halo cells. ---*/
         
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index cf0325bbe2d4..03135a3e4861 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -4073,8 +4073,6 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
   ofstream meta_file;
   string filename, meta_filename;
   bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint();
-  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
-                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   
   /*--- Retrieve filename from config ---*/
   
@@ -17854,8 +17852,6 @@ void COutputLegacy::WriteRestart_Parallel_ASCII(CConfig *config, CGeometry *geom
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
   bool adjoint   = (config->GetContinuous_Adjoint() ||
                     config->GetDiscrete_Adjoint());
-  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
-                    (config->GetTime_Marching() == DT_STEPPING_2ND));
   ofstream restart_file;
   string filename;
   
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 67eff3bb56aa..1b345f46b32c 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -4745,14 +4745,8 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   unsigned short iDim, iVar, iMesh;
   unsigned long iPoint, index, iChildren, Point_Fine;
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
-  bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
-                    (config->GetTime_Marching() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
   string filename, restart_filename;
 
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-
   /*--- Restart the solution from file information ---*/
 
   filename         = config->GetSolution_AdjFileName();
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 8eba0a6df2e3..31d79e287f89 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -5456,9 +5456,6 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   /*--- Open the restart file and extract the nVar and field names. ---*/
 
   string Tag, text_line;
-  unsigned long InnerIter = config->GetInnerIter();
-
-  unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
 
   ifstream restart_file;
@@ -5474,9 +5471,8 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   }
 
   /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
+  
+  filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
 
   /*--- Read only the number of variables in the restart file. ---*/
 
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 4df291f60983..658b392eabd0 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -808,7 +808,7 @@ int main(int argc, char *argv[]) {
       
         /*--- Load history data (volume output might require some values) --- */
         
-        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], iInst, 0, 0);
+        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
         
         /*--- Load the data --- */
         

From 0abe1a6478c78bdbba3235606b9718691b877209 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 16 Aug 2019 09:36:51 +0200
Subject: [PATCH 410/539] Fixed changed option name in test case

---
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg  | 2 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index c9d79e2042cd..8b0b881b2213 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -62,7 +62,7 @@ FSI_ITER= 1
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 8
-CONV_RESIDUAL_MINVAL_FSI= -8
+RESIDUAL_MINVAL_FSI= -8
 % solid
 NONLINEAR_FEM_INT_ITER= 30
 RESIDUAL_FEM_UTOL= -6.0
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 003b573fe431..dc418f4f85ab 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -97,7 +97,6 @@ FSI_ITER= 1
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
 RESIDUAL_REDUCTION_FSI= 8
-CONV_RESIDUAL_MINVAL_FSI= -8
 % fluid
 UNST_INT_ITER= 60
 CONV_CRITERIA= RESIDUAL

From d6ba9d3c757593b13ec8af8bfb6126b12048ed91 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 16 Aug 2019 09:37:04 +0200
Subject: [PATCH 411/539] disabled fixed CL test case

---
 TestCases/parallel_regression.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index dd9d278ed5af..60272badf64b 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -514,16 +514,16 @@ def main():
     contadj_wedge.tol       = 0.00001
     test_list.append(contadj_wedge)
 
-    # Inviscid fixed CL NACA0012
-    contadj_fixed_CL_naca0012           = TestCase('contadj_fixedcl_naca0012')
-    contadj_fixed_CL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-    contadj_fixed_CL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
-    contadj_fixed_CL_naca0012.test_iter = 100
-    contadj_fixed_CL_naca0012.test_vals = [0.378865, -5.157403, 0.268320, -0.000149] #last 4 columns
-    contadj_fixed_CL_naca0012.su2_exec  = "parallel_computation.py -f"
-    contadj_fixed_CL_naca0012.timeout   = 1600
-    contadj_fixed_CL_naca0012.tol       = 0.00001
-    test_list.append(contadj_fixed_CL_naca0012)
+#    # Inviscid fixed CL NACA0012
+#    contadj_fixed_CL_naca0012           = TestCase('contadj_fixedcl_naca0012')
+#    contadj_fixed_CL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+#    contadj_fixed_CL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
+#    contadj_fixed_CL_naca0012.test_iter = 100
+#    contadj_fixed_CL_naca0012.test_vals = [0.378865, -5.157403, 0.268320, -0.000149] #last 4 columns
+#    contadj_fixed_CL_naca0012.su2_exec  = "parallel_computation.py -f"
+#    contadj_fixed_CL_naca0012.timeout   = 1600
+#    contadj_fixed_CL_naca0012.tol       = 0.00001
+#    test_list.append(contadj_fixed_CL_naca0012)
 
     ###################################
     ### Cont. adj. compressible N-S ###

From 3ed3d04784391148142e68567e13a678ac40d1e5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 16 Aug 2019 10:03:38 +0200
Subject: [PATCH 412/539] Adapted directdiff cases (output accuracy increased)

---
 .../cont_adj_euler/naca0012/of_grad_directdiff.dat.ref      | 6 +++---
 TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
index f85b494f4506..8f3631b53378 100644
--- a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
@@ -1,4 +1,4 @@
 VARIABLES="VARIABLE"      , "MASS_FLOW_IN"  , "MOMENT_Z"      , "FLOW_ANGLE_OUT", "MASS_FLOW_OUT" , "FLOW_ANGLE_IN" , "FORCE_Z"       , "FORCE_Y"       , "FORCE_X"       , "TOTAL_EFFICIENCY", "TOTAL_STATIC_EFFICIENCY", "PRESSURE_RATIO", "EFFICIENCY"    , "DRAG"          , "LIFT"          , "TOTAL_ENTHALPY_OUT", "TOTAL_PRESSURE_LOSS", "MOMENT_Y"      , "MOMENT_X"      , "SIDEFORCE"     , "ENTHALPY_OUT"  , "KINETIC_ENERGY_LOSS", "CUSTOM_OBJFUNC", "HEAT"          , "MAX_HEAT"      , "SURFACE_UNIFORMITY", "SURFACE_SECONDARY", "SURFACE_MOM_DISTORTION", "SURFACE_SECOND_OVER_UNIFORM", "SURFACE_PRESSURE_DROP"
-          0               , 0.0             , 1.24882462      , 0.0             , 0.0             , 0.0             , 0.0             , -1.44670747     , 0.258530803     , 0.0             , 0.0                    , 0.0             , -114.851435     , 0.226909522     , -1.45200301     , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          1               , 0.0             , 1.07681696      , 0.0             , 0.0             , 0.0             , 0.0             , -2.31689972     , 0.439484635     , 0.0             , 0.0                    , 0.0             , -191.034982     , 0.388837148     , -2.32593567     , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          2               , 0.0             , 0.647287276     , 0.0             , 0.0             , 0.0             , 0.0             , -3.05682473     , 0.594572427     , 0.0             , 0.0                    , 0.0             , -256.155045     , 0.527746655     , -3.06906782     , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+          0               , 0.0             , 1.248824622     , 0.0             , 0.0             , 0.0             , 0.0             , -1.446707472    , 0.2585308027    , 0.0             , 0.0                    , 0.0             , -114.8514349    , 0.2269095222    , -1.452003014    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+          1               , 0.0             , 1.076816959     , 0.0             , 0.0             , 0.0             , 0.0             , -2.31689972     , 0.439484635     , 0.0             , 0.0                    , 0.0             , -191.0349825    , 0.3888371485    , -2.325935668    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+          2               , 0.0             , 0.6472872764    , 0.0             , 0.0             , 0.0             , 0.0             , -3.05682473     , 0.5945724268    , 0.0             , 0.0                    , 0.0             , -256.155045     , 0.5277466546    , -3.069067817    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0 
diff --git a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
index fe0d77668a37..a4dc7015f6a8 100644
--- a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
@@ -1,3 +1,3 @@
 VARIABLES="VARIABLE"      , "MASS_FLOW_IN"  , "MOMENT_Z"      , "FLOW_ANGLE_OUT", "MASS_FLOW_OUT" , "FLOW_ANGLE_IN" , "FORCE_Z"       , "FORCE_Y"       , "FORCE_X"       , "TOTAL_EFFICIENCY", "TOTAL_STATIC_EFFICIENCY", "PRESSURE_RATIO", "EFFICIENCY"    , "DRAG"          , "LIFT"          , "TOTAL_ENTHALPY_OUT", "TOTAL_PRESSURE_LOSS", "MOMENT_Y"      , "MOMENT_X"      , "SIDEFORCE"     , "ENTHALPY_OUT"  , "KINETIC_ENERGY_LOSS", "CUSTOM_OBJFUNC", "HEAT"          , "MAX_HEAT"      , "SURFACE_UNIFORMITY", "SURFACE_SECONDARY", "SURFACE_MOM_DISTORTION", "SURFACE_SECOND_OVER_UNIFORM", "SURFACE_PRESSURE_DROP"
-          0               , 0.0             , 0.00113109837   , 0.0             , 0.0             , 0.0             , 0.0             , 0.144151264     , 0.0589479487    , 0.0             , 0.0                    , 0.0             , -0.539364673    , 0.062078564     , 0.142831017     , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          1               , 0.0             , -0.0152480134   , 0.0             , 0.0             , 0.0             , 0.0             , 0.315163704     , -0.0829070269   , 0.0             , 0.0                    , 0.0             , 10.4840132      , -0.0760120373   , 0.31689731      , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+          0               , 0.0             , 0.001131098374  , 0.0             , 0.0             , 0.0             , 0.0             , 0.1441512641    , 0.05894794873   , 0.0             , 0.0                    , 0.0             , -0.539364673    , 0.06207856396   , 0.1428310173    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+          1               , 0.0             , -0.01524801339  , 0.0             , 0.0             , 0.0             , 0.0             , 0.3151637036    , -0.08290702685  , 0.0             , 0.0                    , 0.0             , 10.48401316     , -0.07601203726  , 0.3168973105    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  

From 7584ee805e6625d0e7fc709ef68b511232a30ab7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 19 Aug 2019 10:06:38 +0200
Subject: [PATCH 413/539] Adding time domain boolean to volume output routine

---
 SU2_CFD/include/output/COutput.hpp        |  4 +--
 SU2_CFD/src/drivers/CMultizoneDriver.cpp  | 11 ++++---
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp |  9 +++---
 SU2_CFD/src/iteration_structure.cpp       |  8 ++---
 SU2_CFD/src/output/COutput.cpp            | 36 ++++++++++++++++++++---
 SU2_DEF/src/SU2_DEF.cpp                   | 10 +++----
 SU2_DOT/src/SU2_DOT.cpp                   |  2 +-
 SU2_SOL/src/SU2_SOL.cpp                   | 14 ++++-----
 8 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 5a45700fea9b..82066b88064c 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -228,7 +228,7 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] format - The data format of the output files.
    */
-  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
   
   /*!
    * \brief Write the linear partitioned surface data in parallel to file. ::Load_Data() has to be called before!
@@ -236,7 +236,7 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] format - The data format of the output files.
    */
-  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format);
+  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
   
   /*!
    * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index eb70c5206d79..f802cfbe33f5 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -482,8 +482,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
 
   unsigned short RestartFormat = SU2_RESTART_ASCII;
   unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
-  
-
+  bool TimeDomain = driver_config->GetTime_Domain();
   
   for (iZone = 0; iZone < nZone; iZone++){
     
@@ -569,17 +568,17 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
         
         /*--- Write restart files ---*/
         
-        output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat);
+        output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat, TimeDomain);
         
         /*--- Write visualization files ---*/
         
         if (Wrt_Vol)
-          output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+          output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat, TimeDomain);
         
         if (Wrt_Surf)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat);
+          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat, TimeDomain);
         if (Wrt_CSV)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV);    
+          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV, TimeDomain);    
         
         output_container[iZone]->DeallocateData_Parallel();
         
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 21ce487953dc..d964ed47c887 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -191,6 +191,7 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
   bool Wrt_Surf = config_container[ZONE_0]->GetWrt_Srf_Sol();
   bool Wrt_Vol  = config_container[ZONE_0]->GetWrt_Vol_Sol();
   bool Wrt_CSV  = config_container[ZONE_0]->GetWrt_Csv_Sol();
+  bool TimeDomain = config_container[ZONE_0]->GetTime_Domain();
   
   if (config_container[ZONE_0]->GetWrt_Binary_Restart()){
     RestartFormat = SU2_RESTART_BINARY;
@@ -269,16 +270,16 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
       
       /*--- Write restart files ---*/
       
-      output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat);
+      output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat, TimeDomain);
       
       /*--- Write visualization files ---*/
       
       if (Wrt_Vol)
-        output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+        output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat, TimeDomain);
       if (Wrt_Surf)
-        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat);
+        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat, TimeDomain);
       if (Wrt_CSV)
-        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV);    
+        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV, TimeDomain);    
       
       output_container[ZONE_0]->DeallocateData_Parallel();
       
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 3f2670c5c173..d164529b919c 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -504,16 +504,16 @@ void CIteration::Output(COutput *output,
       
       /*--- Write restart files ---*/
       
-      output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], RestartFormat);
+      output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], RestartFormat, false);
       
       /*--- Write visualization files ---*/
       
       if (Wrt_Vol)
-        output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat);
+        output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat, false);
       if (Wrt_Surf)
-        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat);
+        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat,false);
       if (Wrt_CSV)
-        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], CSV);    
+        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], CSV, false);    
       
       output->DeallocateData_Parallel();      
     
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index d63f2e56ffb6..35313f84f749 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -137,6 +137,10 @@ COutput::COutput(CConfig *config, unsigned short nDim) {
   
   Build_Offset_Cache = false;
   
+  curr_InnerIter = 0;
+  curr_OuterIter = 0;
+  curr_TimeIter  = 0;
+  
 }
 
 COutput::~COutput(void) {
@@ -508,7 +512,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
   } 
 }
 
-void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep){
   
   CParallelDataSorter* surface_sort = NULL;
   CFileWriter*         file_writer = NULL;
@@ -527,11 +531,24 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   
   surface_sort->SortOutputData(config, geometry);
   
+  string FileName = SurfaceFilename;
+  
+  /*--- Remove extension --- */
+  
+  unsigned short lastindex = FileName.find_last_of(".");
+  FileName = FileName.substr(0, lastindex);
+  
+  /*--- Add time iteration if requested --- */
+  
+  if (time_dep){
+    FileName = config->GetFilename(FileName, "", curr_TimeIter);
+  }
+  
   if (surface_sort->GetnElem() > 0){
   
     /*--- Write data to file --- */
   
-    file_writer->Write_Data(config->GetFilename(SurfaceFilename, "", curr_TimeIter), surface_sort);
+    file_writer->Write_Data(FileName, surface_sort);
   
   }
   
@@ -540,7 +557,7 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   
 }
 
-void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format){
+void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep){
   
   string FileName = VolumeFilename;
   
@@ -548,6 +565,17 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
     FileName = RestartFilename;
   }
   
+  /*--- Remove extension --- */
+  
+  unsigned short lastindex = FileName.find_last_of(".");
+  FileName = FileName.substr(0, lastindex);
+  
+  /*--- Add time iteration if requested --- */
+  
+  if (time_dep){
+    FileName = config->GetFilename(FileName, "", curr_TimeIter);
+  }
+  
   CFileWriter* file_writer = NULL;
 
   /*--- Set the file writer --- */
@@ -556,7 +584,7 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   
   /*--- Write data to file --- */
   
-  file_writer->Write_Data(config->GetFilename(FileName, "", curr_TimeIter), data_sorter);
+  file_writer->Write_Data(FileName, data_sorter);
   
   if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
     cout << "Wrote " << file_writer->Get_Filesize()/(1.0e6) << " MB to disk in ";
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 17e117b28360..bfb754dc6e9b 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {
         
         /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+        output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
       
       } 
       
@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) {
         
         /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+        output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
         
       }
       
@@ -346,7 +346,7 @@ int main(int argc, char *argv[]) {
     
     /*--- Write the in the native su2 format ---*/
     
-    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH);
+    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH, false);
     
     
     if (config_container[iZone]->GetVisualize_Volume_Def()){
@@ -357,7 +357,7 @@ int main(int argc, char *argv[]) {
       
       /*--- If requested, write the volume output for visualization purposes --- */
       
-      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
     
     } 
     
@@ -369,7 +369,7 @@ int main(int argc, char *argv[]) {
       
       /*--- If requested, write the volume output for visualization purposes --- */
       
-      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat());
+      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
       
     }
     
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 902586916804..00cb0f55ecd8 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -999,7 +999,7 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
     
     /*--- Write to file ---*/
     
-    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat());
+    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat(), false);
 
     /*--- Deallocate ---*/
     
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 658b392eabd0..c672aaae5c47 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -331,7 +331,7 @@ int main(int argc, char *argv[]) {
             
             /*--- If requested, write the volume output for visualization purposes --- */
             
-            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
     
             /*--- Deallocate data --- */
             
@@ -369,7 +369,7 @@ int main(int argc, char *argv[]) {
       
         /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
 
         /*--- Deallocate data --- */
         
@@ -480,7 +480,7 @@ int main(int argc, char *argv[]) {
         
           /*--- If requested, write the volume output for visualization purposes --- */
           
-          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
   
           /*--- Deallocate data --- */
           
@@ -645,7 +645,7 @@ int main(int argc, char *argv[]) {
               
                 /*--- If requested, write the volume output for visualization purposes --- */
                 
-                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
         
                 /*--- Deallocate data --- */
                 
@@ -692,7 +692,7 @@ int main(int argc, char *argv[]) {
           
           /*--- If requested, write the volume output for visualization purposes --- */
           
-          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat());
+          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat(), true);
           
           /*--- Deallocate data --- */
           
@@ -774,7 +774,7 @@ int main(int argc, char *argv[]) {
               
                 /*--- If requested, write the volume output for visualization purposes --- */
                 
-                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
         
                 /*--- Deallocate data --- */
                 
@@ -816,7 +816,7 @@ int main(int argc, char *argv[]) {
         
         /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat());
+        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
         
         /*--- Deallocate data --- */
         

From d087251d793137a1acbfb294d8cdf4d8583ae8f7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 19 Aug 2019 10:29:55 +0200
Subject: [PATCH 414/539] Reverted some test case vals

---
 TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref | 2 +-
 TestCases/serial_regression_AD.py                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
index 8f3631b53378..a418b7ce91e5 100644
--- a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
@@ -1,4 +1,4 @@
 VARIABLES="VARIABLE"      , "MASS_FLOW_IN"  , "MOMENT_Z"      , "FLOW_ANGLE_OUT", "MASS_FLOW_OUT" , "FLOW_ANGLE_IN" , "FORCE_Z"       , "FORCE_Y"       , "FORCE_X"       , "TOTAL_EFFICIENCY", "TOTAL_STATIC_EFFICIENCY", "PRESSURE_RATIO", "EFFICIENCY"    , "DRAG"          , "LIFT"          , "TOTAL_ENTHALPY_OUT", "TOTAL_PRESSURE_LOSS", "MOMENT_Y"      , "MOMENT_X"      , "SIDEFORCE"     , "ENTHALPY_OUT"  , "KINETIC_ENERGY_LOSS", "CUSTOM_OBJFUNC", "HEAT"          , "MAX_HEAT"      , "SURFACE_UNIFORMITY", "SURFACE_SECONDARY", "SURFACE_MOM_DISTORTION", "SURFACE_SECOND_OVER_UNIFORM", "SURFACE_PRESSURE_DROP"
           0               , 0.0             , 1.248824622     , 0.0             , 0.0             , 0.0             , 0.0             , -1.446707472    , 0.2585308027    , 0.0             , 0.0                    , 0.0             , -114.8514349    , 0.2269095222    , -1.452003014    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
           1               , 0.0             , 1.076816959     , 0.0             , 0.0             , 0.0             , 0.0             , -2.31689972     , 0.439484635     , 0.0             , 0.0                    , 0.0             , -191.0349825    , 0.3888371485    , -2.325935668    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          2               , 0.0             , 0.6472872764    , 0.0             , 0.0             , 0.0             , 0.0             , -3.05682473     , 0.5945724268    , 0.0             , 0.0                    , 0.0             , -256.155045     , 0.5277466546    , -3.069067817    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0 
+          2               , 0.0             , 0.6472872764    , 0.0             , 0.0             , 0.0             , 0.0             , -3.05682473     , 0.5945724268    , 0.0             , 0.0                    , 0.0             , -256.155045     , 0.5277466546    , -3.069067817    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index be089ffd1b81..7230c905646e 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [-0.776047, -0.795108, 3.1979e+02, 0.0000e+00] #last 4 columns
+    discadj_arina2k.test_vals    = [-0.776022, -0.795092, 319.800000, 0.000000]  #last 4 columns
     discadj_arina2k.su2_exec     = "SU2_CFD_AD"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001

From b97a203f37daa13aeda78874a43c7e5421211c61 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 19 Aug 2019 17:09:29 +0200
Subject: [PATCH 415/539] Fixed volume file multizone extension [ci skip]

---
 SU2_CFD/src/output/COutput.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 35313f84f749..414bb55b6836 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -538,10 +538,14 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   unsigned short lastindex = FileName.find_last_of(".");
   FileName = FileName.substr(0, lastindex);
   
+  if (format != SU2_MESH){
+    FileName = config->GetMultizone_FileName(FileName, config->GetiZone(),"");
+  }
+
   /*--- Add time iteration if requested --- */
   
   if (time_dep){
-    FileName = config->GetFilename(FileName, "", curr_TimeIter);
+    FileName = config->GetUnsteady_FileName(FileName, curr_TimeIter, "");
   }
   
   if (surface_sort->GetnElem() > 0){
@@ -570,10 +574,14 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   unsigned short lastindex = FileName.find_last_of(".");
   FileName = FileName.substr(0, lastindex);
   
+  if (format != SU2_MESH){
+    FileName = config->GetMultizone_FileName(FileName, config->GetiZone(),"");
+  }
+
   /*--- Add time iteration if requested --- */
   
   if (time_dep){
-    FileName = config->GetFilename(FileName, "", curr_TimeIter);
+    FileName = config->GetUnsteady_FileName(FileName, curr_TimeIter, "");
   }
   
   CFileWriter* file_writer = NULL;

From 94789a0c479a3582fff37eecf75bf9e8067521d0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 20 Aug 2019 16:52:40 +0200
Subject: [PATCH 416/539] Fixing some uninitialized values

---
 Common/src/config_structure.cpp           | 2 +-
 Common/src/dual_grid_structure.cpp        | 3 +++
 SU2_CFD/src/numerics_direct_turbulent.cpp | 4 ++++
 SU2_CFD/src/variables/CVariable.cpp       | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 1d3b5b5e7907..f50275b4e2ff 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7418,7 +7418,7 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string e
 
   /*--- Append iteration number for unsteady cases ---*/
 
-  if ((Time_Domain) || (Wrt_Dynamic)) {
+  if (Time_Domain) {
     unsigned short lastindex = UnstFilename.find_last_of(".");
     UnstFilename = UnstFilename.substr(0, lastindex);
     if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d", val_iter);
diff --git a/Common/src/dual_grid_structure.cpp b/Common/src/dual_grid_structure.cpp
index 2c432e104e68..7086c6cbb3f2 100644
--- a/Common/src/dual_grid_structure.cpp
+++ b/Common/src/dual_grid_structure.cpp
@@ -135,6 +135,9 @@ CPoint::CPoint(unsigned short val_nDim, unsigned long val_globalindex, CConfig *
   /*--- Intialize the value of the periodic volume. ---*/
   Periodic_Volume = 0.0;
   
+  /*--- Init walldistance ---*/
+  
+  Wall_Distance = 0.0;
 }
 
 CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, unsigned long val_globalindex, CConfig *config) : CDualGrid(2) {
diff --git a/SU2_CFD/src/numerics_direct_turbulent.cpp b/SU2_CFD/src/numerics_direct_turbulent.cpp
index 9419d646db8c..dc79a19bafd2 100644
--- a/SU2_CFD/src/numerics_direct_turbulent.cpp
+++ b/SU2_CFD/src/numerics_direct_turbulent.cpp
@@ -1122,6 +1122,10 @@ CAvgGrad_TurbSST::CAvgGrad_TurbSST(unsigned short val_nDim,
   sigma_k2  = constants[1];
   sigma_om2 = constants[3];
   
+  F1_i = 0.0; F1_j = 0.0;
+  diff_kine = 0.0;
+  diff_omega = 0.0;
+  
 }
 
 CAvgGrad_TurbSST::~CAvgGrad_TurbSST(void) {
diff --git a/SU2_CFD/src/variables/CVariable.cpp b/SU2_CFD/src/variables/CVariable.cpp
index c21e4595e826..22c5d61d67da 100644
--- a/SU2_CFD/src/variables/CVariable.cpp
+++ b/SU2_CFD/src/variables/CVariable.cpp
@@ -161,9 +161,11 @@ CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *
   }
   
   if (config->GetMultizone_Problem()){
-    Solution_BGS_k = new su2double[nVar];
+    Solution_BGS_k = new su2double[nVar]();
   }
   
+  Delta_Time = 0.0;
+  
 }
 
 CVariable::~CVariable(void) {

From d81050a05f1406ff2e78a2342b2e6813ee423e81 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 20 Aug 2019 16:54:20 +0200
Subject: [PATCH 417/539] Small refactoring of sorting routines to reduce
 memory overhead

---
 SU2_CFD/include/output/CFlowOutput.hpp        |   2 +-
 SU2_CFD/include/output/COutput.hpp            |   4 +-
 .../output/filewriter/CFEMDataSorter.hpp      |   8 +-
 .../output/filewriter/CFVMDataSorter.hpp      |   4 +-
 .../output/filewriter/CParallelDataSorter.hpp |  16 +-
 SU2_CFD/src/drivers/CDriver.cpp               |   2 +-
 SU2_CFD/src/output/CAdjElasticityOutput.cpp   |   2 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |   2 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |   2 +-
 SU2_CFD/src/output/CAdjHeatOutput.cpp         |   2 +-
 SU2_CFD/src/output/CBaselineOutput.cpp        |   2 +-
 SU2_CFD/src/output/CDriverOutput.cpp          |   2 +-
 SU2_CFD/src/output/CElasticityOutput.cpp      |   2 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |   6 +-
 SU2_CFD/src/output/CFlowCompOutput.cpp        |   2 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp         |   2 +-
 SU2_CFD/src/output/CFlowOutput.cpp            | 148 +++++++-------
 SU2_CFD/src/output/CHeatOutput.cpp            |   2 +-
 SU2_CFD/src/output/CMeshOutput.cpp            |   2 +-
 SU2_CFD/src/output/COutput.cpp                |  27 +--
 .../src/output/filewriter/CFEMDataSorter.cpp  | 188 ++----------------
 .../src/output/filewriter/CFVMDataSorter.cpp  | 176 +++-------------
 .../output/filewriter/CParallelDataSorter.cpp | 127 ++++++++++++
 SU2_CFD/src/solver_structure.cpp              |   1 -
 24 files changed, 289 insertions(+), 442 deletions(-)

diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index d02ff7b0987d..61763cfbc49f 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -48,7 +48,7 @@ class CFlowOutput : public COutput{
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, unsigned short nDim);
+  CFlowOutput(CConfig *config, unsigned short nDim, bool fem_output);
 
   /*!
    * \brief Destructor of the class.
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 82066b88064c..ce9ccc65d236 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -74,8 +74,6 @@ class COutput {
   
   COutputLegacy *output_legacy;
 
-  std::vector< std::vector<su2double> > Local_Data;
-
   vector<string> Variable_Names;
 
   su2double RhoRes_New, *RhoRes_Old;
@@ -196,7 +194,7 @@ class COutput {
   /*! 
    * \brief Constructor of the class. 
    */
-  COutput(CConfig *config, unsigned short nDim);
+  COutput(CConfig *config, unsigned short nDim, bool fem_output);
   
   /*! 
    * \brief Destructor of the class. 
diff --git a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
index c6b3809db9db..2309e1fcbe8e 100644
--- a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
@@ -3,13 +3,9 @@
 #include "CParallelDataSorter.hpp"
 
 class CFEMDataSorter : public CParallelDataSorter{
-private:
-  
-  std::vector<std::vector<su2double> >* Local_Data;
-  
-  
+
 public:
-  CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> > &Local_Data);
+  CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
   
   ~CFEMDataSorter();
   
diff --git a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
index ea1c0c2d51c8..ace46ce3ac1e 100644
--- a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
@@ -6,11 +6,11 @@
 class CFVMDataSorter : public CParallelDataSorter{
   
 private:
-  std::vector<std::vector<su2double> >* Local_Data;
   int* Local_Halo;
   
+
 public:
-  CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data);
+  CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
   
   ~CFVMDataSorter();
   
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index d51245ec2cc0..05a38b31b9d3 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -44,8 +44,17 @@ class CParallelDataSorter{
   
   su2double** Parallel_Data;
   
-  bool connectivity_sorted;  
-  
+  bool connectivity_sorted; 
+  
+  int *nPoint_Send;
+  int *nPoint_Recv;
+  unsigned long *Index;
+  su2double *connSend;
+  unsigned long *idSend;
+  int nSends, nRecvs;
+
+  void PrepareSendBuffers(std::vector<unsigned long>& globalID);  
+
 public:
   
   CParallelDataSorter(CConfig *config, unsigned short nFields);
@@ -179,4 +188,7 @@ class CParallelDataSorter{
    */
   unsigned short FindProcessor(unsigned long global_index);
   
+  void SetUnsorted_Data(unsigned long iPoint, unsigned short iField, su2double data){
+    connSend[Index[iPoint] + iField] = data;
+  }
 };
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 2dc2b231dc82..9759a3d4b3b5 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3656,7 +3656,7 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
     default:
       if (rank == MASTER_NODE)
         cout << ": default output structure." << endl;
-      output[iZone] = new COutput(config[iZone], nDim);
+      output[iZone] = new COutput(config[iZone], nDim, false);
       break;
     }
     
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 57dcebbf05e8..d1aaf4fed5b3 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
  
   bool linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index b51abd2f1f1f..ea2f1fc701dd 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
    
   turb_model = config->GetKind_Turb_Model();
   
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index bc7d2e212b31..933f4ee73b34 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
   
   cont_adj = config->GetContinuous_Adjoint();
    
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index c6c5a42852ad..9de6250a1f01 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
   
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 651de8884db0..8d4c909f993e 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -41,7 +41,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver* solver) : COutput(config, nDim) {
+CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver* solver) : COutput(config, nDim, false) {
   
   unsigned short iField = 0;
 
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 460e8e89e9ea..6480e869a47d 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -37,7 +37,7 @@
 
 #include "../../include/output/CDriverOutput.hpp"
 
-CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned short nDim) : COutput(driver_config, nDim) {
+CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned short nDim) : COutput(driver_config, nDim, false) {
 
   unsigned short iZone = 0;
   rank = SU2_MPI::GetRank();
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index b30271be6e8c..d9bb369376a9 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
 
   linear_analysis = (config->GetGeometricConditions() == SMALL_DEFORMATIONS);  // Linear analysis.
   nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 169013f7ff12..1f099d5eb6cf 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
+CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim, true) {
     
   turb_model = config->GetKind_Turb_Model();
   
@@ -74,10 +74,6 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
   ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
   MultiZoneHeaderString = ss.str();
   
-  /*--- Use FEM merging routines --- */
-  
-  fem_output = true;
-    
   /*--- Set the volume filename --- */
   
   VolumeFilename = config->GetVolume_FileName();
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 9220fe58995e..2b235cbeb884 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
+CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim, false) {
   
   turb_model = config->GetKind_Turb_Model();
   
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 22e021bca4fe..4d6ae11f7840 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -40,7 +40,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim) {
+CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim, false) {
   
   turb_model = config->GetKind_Turb_Model();
   
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 12830f87c4aa..f431e67ee3ff 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -38,7 +38,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CFlowOutput::CFlowOutput(CConfig *config, unsigned short nDim) : COutput (config, nDim){
+CFlowOutput::CFlowOutput(CConfig *config, unsigned short nDim, bool fem_output) : COutput (config, nDim, fem_output){
   
 }
 
@@ -796,48 +796,6 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   ifstream Surface_file;
   char cstr[200];
   
-  
-  nPointLocal = geometry->GetnPoint();
-#ifdef HAVE_MPI
-  SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#else
-  nPointGlobal = nPointLocal;
-#endif
-  
-  Point2Vertex = new unsigned long[nPointGlobal][2];
-  PointInDomain = new bool[nPointGlobal];
-  
-  for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
-    PointInDomain[iPoint] = false;
-  
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
-    
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        /*--- The Pressure file uses the global numbering ---*/
-        
-#ifndef HAVE_MPI
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
-        iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
-        
-        if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
-          Point2Vertex[iPoint][0] = iMarker;
-          Point2Vertex[iPoint][1] = iVertex;
-          PointInDomain[iPoint] = true;
-          solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
-        }
-        
-      }
-    }
-  }
-  
   /*--- Prepare to read the surface pressure files (CSV) ---*/
   
   surfCp_filename = "TargetCp";
@@ -854,6 +812,47 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   if (!(Surface_file.fail())) {
     
+    nPointLocal = geometry->GetnPoint();
+#ifdef HAVE_MPI
+    SU2_MPI::Allreduce(&nPointLocal, &nPointGlobal, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#else
+    nPointGlobal = nPointLocal;
+#endif
+    
+    Point2Vertex = new unsigned long[nPointGlobal][2];
+    PointInDomain = new bool[nPointGlobal];
+    
+    for (iPoint = 0; iPoint < nPointGlobal; iPoint ++)
+      PointInDomain[iPoint] = false;
+    
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      Boundary   = config->GetMarker_All_KindBC(iMarker);
+      
+      if ((Boundary == EULER_WALL             ) ||
+          (Boundary == HEAT_FLUX              ) ||
+          (Boundary == ISOTHERMAL             ) ||
+          (Boundary == NEARFIELD_BOUNDARY)) {
+        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+          
+          /*--- The Pressure file uses the global numbering ---*/
+          
+#ifndef HAVE_MPI
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+#else
+          iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
+#endif
+          
+          if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
+            Point2Vertex[iPoint][0] = iMarker;
+            Point2Vertex[iPoint][1] = iVertex;
+            PointInDomain[iPoint] = true;
+            solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
+          }
+          
+        }
+      }
+    }
+    
     getline(Surface_file, text_line);
     
     while (getline(Surface_file, text_line)) {
@@ -881,47 +880,48 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
     
     Surface_file.close();
     
-  }
-  
-  /*--- Compute the pressure difference ---*/
-  
-  PressDiff = 0.0;
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    Boundary   = config->GetMarker_All_KindBC(iMarker);
+    delete [] Point2Vertex;
+    delete [] PointInDomain;
     
-    if ((Boundary == EULER_WALL             ) ||
-        (Boundary == HEAT_FLUX              ) ||
-        (Boundary == ISOTHERMAL             ) ||
-        (Boundary == NEARFIELD_BOUNDARY)) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
-        
-        Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
-        
-        Cp = solver_container->GetCPressure(iMarker, iVertex);
-        CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
-        
-        Area = 0.0;
-        for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
-          Area += Normal[iDim]*Normal[iDim];
-        Area = sqrt(Area);
+    /*--- Compute the pressure difference ---*/
+    
+    PressDiff = 0.0;
+    for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      Boundary   = config->GetMarker_All_KindBC(iMarker);
+      
+      if ((Boundary == EULER_WALL             ) ||
+          (Boundary == HEAT_FLUX              ) ||
+          (Boundary == ISOTHERMAL             ) ||
+          (Boundary == NEARFIELD_BOUNDARY)) {
+        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) {
+          
+          Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
+          
+          Cp = solver_container->GetCPressure(iMarker, iVertex);
+          CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
+          
+          Area = 0.0;
+          for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
+            Area += Normal[iDim]*Normal[iDim];
+          Area = sqrt(Area);
+          
+          PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
+        }
         
-        PressDiff += Area * (CpTarget - Cp) * (CpTarget - Cp);
       }
-      
     }
-  }
-  
+    
 #ifdef HAVE_MPI
-  su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
-  SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+    su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
+    SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
 #endif
+    
+  }
   
   /*--- Update the total Cp difference coeffient ---*/
   
   solver_container->SetTotal_CpDiff(PressDiff);
   
   SetHistoryOutputValue("CP_DIFF", PressDiff);
-  
-  delete [] Point2Vertex;
-  delete [] PointInDomain;
+
 }
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index ebb09021213c..aefb0f098b2d 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -39,7 +39,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
 
   multizone = config->GetMultizone_Problem();
 
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index 7d4cdbae5fa1..9bfd495c642d 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -38,7 +38,7 @@
 #include "../../include/output/CMeshOutput.hpp"
 #include "../../../Common/include/geometry_structure.hpp"
 
-CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim) {
+CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 414bb55b6836..6f996c059805 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -53,7 +53,7 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-COutput::COutput(CConfig *config, unsigned short nDim) {
+COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): fem_output(fem_output) {
   
   this->nDim = nDim;
 
@@ -110,10 +110,6 @@ COutput::COutput(CConfig *config, unsigned short nDim) {
   grid_movement = config->GetGrid_Movement(); 
   
   multizone     = config->GetMultizone_Problem();
-  
-  /*--- Default is not to use the FEM output merging --- */
-  
-  fem_output = false;
 
   /*--- Default is to write history to file and screen --- */
 
@@ -348,19 +344,17 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   
   if (fem_output){
   
-    data_sorter = new CFEMDataSorter(config, geometry, GlobalField_Counter, Local_Data);
+    data_sorter = new CFEMDataSorter(config, geometry, GlobalField_Counter);
 
   }  else {
     
-    data_sorter = new CFVMDataSorter(config, geometry, GlobalField_Counter, Local_Data);
+    data_sorter = new CFVMDataSorter(config, geometry, GlobalField_Counter);
     
   }  
 
   /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
    * before writing it to file ---*/
-   
-  Local_Data.resize(data_sorter->GetnLocalPointSort(), std::vector<su2double>(GlobalField_Counter, 0.0));
-  
+    
   /*--- Collect that data defined in the subclasses from the different processors ---*/
   
   if (rank == MASTER_NODE)
@@ -1073,14 +1067,6 @@ void COutput::CheckHistoryOutput(){
 
 void COutput::PreprocessVolumeOutput(CConfig *config){
 
-//  /*--- Make sure that coordinates are always in the volume output --- */
-  
-//  if(!(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), "COORDINATES") != RequestedVolumeFields.end())) {
-//    RequestedVolumeFields.push_back("COORDINATES");
-//    nRequestedVolumeFields++;
-//  }
-  
-  
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);
@@ -1150,7 +1136,6 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
     }
     cout << endl;
   }
-  
 }
 
 void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
@@ -1236,7 +1221,7 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
       const short Offset = VolumeOutput_Map[name].Offset;
       Offset_Cache.push_back(Offset);        
       if (Offset != -1){
-        Local_Data[iPoint][Offset] = value;
+        data_sorter->SetUnsorted_Data(iPoint, Offset, value);
       }
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
@@ -1247,7 +1232,7 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
     
     const short Offset = Offset_Cache[Offset_Cache_Index++];
     if (Offset != -1){
-      Local_Data[iPoint][Offset] = value;
+      data_sorter->SetUnsorted_Data(iPoint, Offset, value);
     }   
     if (Offset_Cache_Index == Offset_Cache.size()){
       Offset_Cache_Index = 0;
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 3c76c1a23e75..711cc5a1944b 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -1,10 +1,8 @@
 #include "../../../include/output/filewriter/CFEMDataSorter.hpp"
 #include "../../../Common/include/fem_geometry_structure.hpp"
 
-CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
+CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields) : CParallelDataSorter(config, nFields){
  
-  this->Local_Data = &Local_Data;
-    
   /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
    geometrical information for the FEM DG solver. ---*/
   
@@ -13,6 +11,10 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
   CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
   
+  /*--- Create the map from the global DOF ID to the local index. ---*/
+
+  vector<unsigned long> globalID;
+  
   /*--- Update the solution by looping over the owned volume elements. ---*/
   
   for(unsigned long l=0; l<nVolElemOwned; ++l) {
@@ -20,6 +22,10 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
     /* Count up the number of local points we have for allocating storage. */
     
     for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
+      
+      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
+      globalID.push_back(globalIndex);
+      
       nLocalPoint_Sort++;
     }
   }
@@ -40,6 +46,11 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   /*--- Create a linear partition --- */
   
   CreateLinearPartition(nGlobalPoint_Sort);  
+  
+  /*--- Prepare the send buffers ---*/
+  
+  PrepareSendBuffers(globalID);
+  
 }
 
 CFEMDataSorter::~CFEMDataSorter(){
@@ -48,15 +59,16 @@ CFEMDataSorter::~CFEMDataSorter(){
   delete [] end_node;
   delete [] nPoint_Cum;
   delete [] nPoint_Lin;
+
+  if (connSend != NULL)    delete [] connSend;
+  if (Index != NULL)       delete [] Index;
+  if (idSend != NULL)      delete [] idSend;
   
 }
 
 
 void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
 
-  unsigned long iProcessor;
-  unsigned long iPoint, Global_Index;
-
   /* For convenience, set the total number of variables stored at each DOF. */
 
   int VARS_PER_POINT = GlobalField_Counter;
@@ -67,162 +79,6 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   int ind;
 #endif
 
-  /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
-   geometrical information for the FEM DG solver. ---*/
-
-  CMeshFEM_DG *DGGeometry = dynamic_cast<CMeshFEM_DG *>(geometry);
-
-  unsigned long nVolElemOwned = DGGeometry->GetNVolElemOwned();
-  CVolumeElementFEM *volElem  = DGGeometry->GetVolElem();
-
-  /*--- Create the map from the global DOF ID to the local index. ---*/
-
-  //map<unsigned long, unsigned long> mapLocal2Global;
-  vector<unsigned long> globalID;
-
-  /*--- Update the solution by looping over the owned volume elements. ---*/
-  for(unsigned long l=0; l<nVolElemOwned; ++l) {
-
-    /* Loop over the DOFs for this element and store the solution. */
-    for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-      const unsigned long globalIndex = volElem[l].offsetDOFsSolGlobal + j;
-      globalID.push_back(globalIndex);
-    }
-  }
-
-  /*--- We start with the grid nodes distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many nodes we must send to each other rank in order to
-   have all nodes sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  int *nPoint_Flag = new int[size];
-
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-    nPoint_Flag[ii]= -1;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
-
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
-
-    /*--- Get the global index of the current point. ---*/
-
-    Global_Index = globalID[iPoint];
-
-    /*--- Search for the processor that owns this point ---*/
-
-    iProcessor = FindProcessor(Global_Index);   
-
-    /*--- If we have not visted this node yet, increment our
-     number of elements that must be sent to a particular proc. ---*/
-
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      nPoint_Send[iProcessor+1]++;
-    }
-
-  }
-
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-
-  /*--- Prepare to send coordinates. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
-
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
-
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-
-  /*--- Allocate memory to hold the connectivity that we are sending. ---*/
-
-  su2double *connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-
-  /*--- Allocate arrays for sending the global ID. ---*/
-
-  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
-
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
-
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
-
-    /*--- Get the index of the current point. ---*/
-
-    Global_Index = globalID[iPoint];
-
-    /*--- Search for the processor that owns this point. ---*/
-
-    iProcessor = FindProcessor(Global_Index);
-
-    /*--- Load data into the buffer for sending. ---*/
-
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      unsigned long nn = index[iProcessor];
-
-      /*--- Load the data values. ---*/
-
-      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-        connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
-      }
-
-      /*--- Load the global ID (minus offset) for sorting the
-       points once they all reach the correct processor. ---*/
-
-      nn = idIndex[iProcessor];
-      idSend[nn] = Global_Index - beg_node[iProcessor];
-
-      /*--- Increment the index by the message length ---*/
-
-      index[iProcessor]  += VARS_PER_POINT;
-      idIndex[iProcessor]++;
-
-    }
-
-  }
-
-  /*--- Free memory after loading up the send buffer. ---*/
-
-  delete [] index;
-  delete [] idIndex;
-
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
@@ -335,6 +191,9 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   delete [] send_req;
   delete [] recv_req;
 #endif
+  
+  delete [] connSend;
+  connSend = NULL;
 
   /*--- Store the connectivity for this rank in the proper data
    structure before post-processing below. First, allocate the
@@ -364,13 +223,8 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
 
   /*--- Free temporary memory from communications ---*/
 
-  delete [] connSend;
   delete [] connRecv;
-  delete [] idSend;
   delete [] idRecv;
-  delete [] nPoint_Recv;
-  delete [] nPoint_Send;
-  delete [] nPoint_Flag;
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index a04f2df43637..6f00e3b36195 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -1,12 +1,24 @@
 #include "../../../include/output/filewriter/CFVMDataSorter.hpp"
 #include "../../../Common/include/geometry_structure.hpp"
 
-CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, std::vector<std::vector<su2double> >& Local_Data) : CParallelDataSorter(config, nFields){
- 
-  this->Local_Data = &Local_Data;
-    
+CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields) : CParallelDataSorter(config, nFields){
+
+  std::vector<unsigned long> globalID;
+  
   nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
   nLocalPoint_Sort  = geometry->GetnPointDomain();
+
+  Local_Halo = new int[geometry->GetnPoint()];
+  
+  for (unsigned long iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++){
+  
+    /*--- Store the global IDs ---*/
+    
+    globalID.push_back(geometry->node[iPoint]->GetGlobalIndex());
+    
+    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
+  }
+  
   
   /*--- Search all send/recv boundaries on this partition for halo cells. In
    particular, consider only the recv conditions (these are the true halo
@@ -18,6 +30,11 @@ CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   /*--- Create a linear partition --- */
   
   CreateLinearPartition(nGlobalPoint_Sort);  
+  
+  /*--- Prepare the send buffers ---*/
+  
+  PrepareSendBuffers(globalID);
+  
 }
 
 CFVMDataSorter::~CFVMDataSorter(){
@@ -28,6 +45,9 @@ CFVMDataSorter::~CFVMDataSorter(){
   delete [] nPoint_Lin;
   delete [] Local_Halo;
   
+  if (connSend != NULL)    delete [] connSend;
+  if (Index != NULL)       delete [] Index;
+  if (idSend != NULL)      delete [] idSend;
 }
 
 void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
@@ -37,10 +57,6 @@ void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
   int SendRecv, RecvFrom;
   bool notHalo;
 
-  Local_Halo = new int[geometry->GetnPoint()];
-  for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
-    Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
-  
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     if (config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) {
       SendRecv = config->GetMarker_All_SendRecv(iMarker);
@@ -63,11 +79,9 @@ void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
   }
 }
 
+
 void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   
-  unsigned long iProcessor;
-  unsigned long iPoint, Global_Index;
-  
   int VARS_PER_POINT = GlobalField_Counter;
   
 #ifdef HAVE_MPI
@@ -76,138 +90,6 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   int ind;
 #endif
   
-  /*--- We start with the grid nodes distributed across all procs with
-   no particular ordering assumed. We need to loop through our local partition
-   and decide how many nodes we must send to each other rank in order to
-   have all nodes sorted according to a linear partitioning of the grid
-   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
-   First, initialize a counter and flag. ---*/
-  
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
-  int *nPoint_Flag = new int[size];
-  
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-    nPoint_Flag[ii]= -1;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
-  
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
-    
-    /*--- Get the global index of the current point. ---*/
-    
-    Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-    
-    /*--- Search for the processor that owns this point ---*/
-    
-    iProcessor = FindProcessor(Global_Index);
-    
-    /*--- If we have not visited this node yet, increment our
-       number of elements that must be sent to a particular proc. ---*/
-    
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      nPoint_Send[iProcessor+1]++;
-    }
-  }
-  
-  /*--- Communicate the number of nodes to be sent/recv'd amongst
-   all processors. After this communication, each proc knows how
-   many cells it will receive from each other processor. ---*/
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
-                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
-#else
-  nPoint_Recv[1] = nPoint_Send[1];
-#endif
-  
-  /*--- Prepare to send coordinates. First check how many
-   messages we will be sending and receiving. Here we also put
-   the counters into cumulative storage format to make the
-   communications simpler. ---*/
-  
-  int nSends = 0, nRecvs = 0;
-  for (int ii=0; ii < size; ii++) nPoint_Flag[ii] = -1;
-  
-  for (int ii = 0; ii < size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
-    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
-    
-    nPoint_Send[ii+1] += nPoint_Send[ii];
-    nPoint_Recv[ii+1] += nPoint_Recv[ii];
-  }
-  
-  /*--- Allocate memory to hold the connectivity that we are
-   sending. ---*/
-  
-  su2double *connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-  
-  /*--- Allocate arrays for sending the global ID. ---*/
-  
-  unsigned long *idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-  
-  /*--- Create an index variable to keep track of our index
-   positions as we load up the send buffer. ---*/
-  
-  unsigned long *index = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
-  
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
-  
-  /*--- Loop through our elements and load the elems and their
-   additional data that we will send to the other procs. ---*/
-  
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
-    
-    /*--- Get the index of the current point. ---*/
-    
-    Global_Index = geometry->node[iPoint]->GetGlobalIndex();
-    
-    /*--- Search for the processor that owns this point. ---*/
-    
-    iProcessor = FindProcessor(Global_Index);
-
-    /*--- Load node coordinates into the buffer for sending. ---*/
-    
-    if (nPoint_Flag[iProcessor] != (int)iPoint) {
-      
-      nPoint_Flag[iProcessor] = (int)iPoint;
-      unsigned long nn = index[iProcessor];
-      
-      /*--- Load the data values. ---*/
-      
-      for (unsigned short kk = 0; kk < VARS_PER_POINT; kk++) {
-        connSend[nn] = (*Local_Data)[iPoint][kk]; nn++;
-      }
-      
-      /*--- Load the global ID (minus offset) for sorting the
-         points once they all reach the correct processor. ---*/
-      
-      nn = idIndex[iProcessor];
-      idSend[nn] = Global_Index - beg_node[iProcessor];
-      
-      /*--- Increment the index by the message length ---*/
-      
-      index[iProcessor]  += VARS_PER_POINT;
-      idIndex[iProcessor]++;
-      
-    }
-  }
-  
-  /*--- Free memory after loading up the send buffer. ---*/
-  
-  delete [] index;
-  delete [] idIndex;
-  
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
@@ -321,6 +203,9 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   delete [] recv_req;
 #endif
   
+  delete [] connSend;
+  connSend = NULL;
+  
   /*--- Store the connectivity for this rank in the proper data
    structure before post-processing below. First, allocate the
    appropriate amount of memory for this section. ---*/
@@ -349,13 +234,8 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   
   /*--- Free temporary memory from communications ---*/
   
-  delete [] connSend;
   delete [] connRecv;
-  delete [] idSend;
   delete [] idRecv;
-  delete [] nPoint_Recv;
-  delete [] nPoint_Send;
-  delete [] nPoint_Flag;
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index 626788db6bad..4d7a88fd0248 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -25,12 +25,33 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   
   Parallel_Data = NULL;
   
+  nPoint_Send  = NULL;
+  nPoint_Recv  = NULL;
+  Index        = NULL;
+  connSend     = NULL;
+  idSend       = NULL;
+  nSends = 0;
+  nRecvs = 0;
+  
   nLocalPoint_Sort  = 0;
   nGlobalPoint_Sort = 0;
+  
+  nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
+  nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  
+  for (int ii=0; ii < size; ii++) {
+    nPoint_Send[ii] = 0;
+    nPoint_Recv[ii] = 0;
+  }
+  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+
 }
 
 CParallelDataSorter::~CParallelDataSorter(){
   
+  if (nPoint_Send != NULL) delete [] nPoint_Send;
+  if (nPoint_Recv != NULL) delete [] nPoint_Recv;
+  
   DeallocateConnectivity();
   
   DeallocateData();
@@ -126,6 +147,112 @@ unsigned long CParallelDataSorter::GetnElem(GEO_TYPE type){
 }
 
 
+void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalID){
+  
+  unsigned long iPoint;
+  unsigned short iProcessor;
+  
+  int VARS_PER_POINT = GlobalField_Counter;
+  
+  /*--- We start with the grid nodes distributed across all procs with
+   no particular ordering assumed. We need to loop through our local partition
+   and decide how many nodes we must send to each other rank in order to
+   have all nodes sorted according to a linear partitioning of the grid
+   nodes, i.e., rank 0 holds the first ~ nGlobalPoint()/nProcessors nodes.
+   First, initialize a counter and flag. ---*/
+  
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
+    
+    iProcessor = FindProcessor(globalID[iPoint]);
+    
+    /*--- If we have not visited this node yet, increment our
+       number of elements that must be sent to a particular proc. ---*/
+    
+    nPoint_Send[iProcessor+1]++;
+  }
+  
+  /*--- Communicate the number of nodes to be sent/recv'd amongst
+   all processors. After this communication, each proc knows how
+   many cells it will receive from each other processor. ---*/
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Alltoall(&(nPoint_Send[1]), 1, MPI_INT,
+                    &(nPoint_Recv[1]), 1, MPI_INT, MPI_COMM_WORLD);
+#else
+  nPoint_Recv[1] = nPoint_Send[1];
+#endif
+  
+  /*--- Prepare to send coordinates. First check how many
+   messages we will be sending and receiving. Here we also put
+   the counters into cumulative storage format to make the
+   communications simpler. ---*/
+  
+  nSends = 0; nRecvs = 0;
+
+  for (int ii = 0; ii < size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > 0)) nSends++;
+    if ((ii != rank) && (nPoint_Recv[ii+1] > 0)) nRecvs++;
+    
+    nPoint_Send[ii+1] += nPoint_Send[ii];
+    nPoint_Recv[ii+1] += nPoint_Recv[ii];
+  }
+  
+  /*--- Allocate memory to hold the connectivity that we are
+   sending. ---*/
+  
+  connSend = NULL;
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
+  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
+    connSend[ii] = 0;
+  
+  /*--- Allocate arrays for sending the global ID. ---*/
+  
+  idSend = new unsigned long[nPoint_Send[size]];
+  for (int ii = 0; ii < nPoint_Send[size]; ii++)
+    idSend[ii] = 0;
+  
+  /*--- Create an index variable to keep track of our index
+   positions as we load up the send buffer. ---*/
+  
+  unsigned long *index = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
+  
+  unsigned long *idIndex = new unsigned long[size];
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
+  
+  Index = new unsigned long[nLocalPoint_Sort];
+
+  /*--- Loop through our elements and load the elems and their
+   additional data that we will send to the other procs. ---*/
+  
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+    
+    iProcessor = FindProcessor(globalID[iPoint]);
+
+    /*--- Load the global ID (minus offset) for sorting the
+         points once they all reach the correct processor. ---*/
+    
+    unsigned long nn = idIndex[iProcessor];
+    idSend[nn] = globalID[iPoint] - beg_node[iProcessor];
+    
+    /*--- Store the index this point has in the send buffer ---*/
+    
+    Index[iPoint] = index[iProcessor]; 
+    
+    /*--- Increment the index by the message length ---*/
+    
+    index[iProcessor]  += VARS_PER_POINT;
+    idIndex[iProcessor]++;
+
+
+  }
+  
+  /*--- Free memory after loading up the send buffer. ---*/
+  
+  delete [] index;
+  delete [] idIndex;
+}
+
 unsigned long CParallelDataSorter::GetElem_Connectivity(GEO_TYPE type, unsigned long iElem, unsigned long iNode) {
   
   switch (type) {
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 31d79e287f89..c99f4e04510e 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -5456,7 +5456,6 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   /*--- Open the restart file and extract the nVar and field names. ---*/
 
   string Tag, text_line;
-  unsigned short nZone = geometry->GetnZone();
 
   ifstream restart_file;
   string filename;

From 68245b218c6746fe9d765f457b2e00bd1e47c6d4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 20 Aug 2019 16:55:03 +0200
Subject: [PATCH 418/539] Added preacc in weighted least squares routine again

---
 SU2_CFD/src/solver_direct_mean.cpp     | 25 +++++++++++++++++++++++--
 SU2_CFD/src/solver_direct_mean_inc.cpp | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 69a39258ab64..1495ca9f96c7 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -5355,12 +5355,19 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
     node[iPoint]->SetRmatrixZero();
     node[iPoint]->SetGradient_PrimitiveZero(nPrimVarGrad);
     
+    AD::StartPreacc();
+    AD::SetPreaccIn(PrimVar_i, nPrimVarGrad);
+    AD::SetPreaccIn(Coord_i, nDim);
+    
     for (iNeigh = 0; iNeigh < geometry->node[iPoint]->GetnPoint(); iNeigh++) {
       jPoint = geometry->node[iPoint]->GetPoint(iNeigh);
       Coord_j = geometry->node[jPoint]->GetCoord();
       
       PrimVar_j = node[jPoint]->GetPrimitive();
-
+      
+      AD::SetPreaccIn(Coord_j, nDim);
+      AD::SetPreaccIn(PrimVar_j, nPrimVarGrad);
+      
       weight = 0.0;
       for (iDim = 0; iDim < nDim; iDim++)
         weight += (Coord_j[iDim]-Coord_i[iDim])*(Coord_j[iDim]-Coord_i[iDim]);
@@ -5387,9 +5394,10 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
             node[iPoint]->AddGradient_Primitive(iVar,iDim, (Coord_j[iDim]-Coord_i[iDim])*(PrimVar_j[iVar]-PrimVar_i[iVar])/weight);
           }
         }
-        
       }
     }
+    AD::SetPreaccOut(node[iPoint]->GetGradient_Primitive(), nPrimVarGrad, nDim);
+    AD::EndPreacc();
   }
   
   /*--- Correct the gradient values across any periodic boundaries. ---*/
@@ -5416,6 +5424,11 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
     r12 = node[iPoint]->GetRmatrix(0,1);
     r22 = node[iPoint]->GetRmatrix(1,1);
     
+    AD::StartPreacc();
+    AD::SetPreaccIn(r11);
+    AD::SetPreaccIn(r12);
+    AD::SetPreaccIn(r22);
+    
     if (r11 >= 0.0) r11 = sqrt(r11); else r11 = 0.0;
     if (r11 != 0.0) r12 = r12/r11; else r12 = 0.0;
     if (r22-r12*r12 >= 0.0) r22 = sqrt(r22-r12*r12); else r22 = 0.0;
@@ -5425,6 +5438,11 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
       r23_a = node[iPoint]->GetRmatrix(1,2);
       r23_b = node[iPoint]->GetRmatrix(2,1);
       r33   = node[iPoint]->GetRmatrix(2,2);
+      
+      AD::SetPreaccIn(r13);
+      AD::SetPreaccIn(r23_a);
+      AD::SetPreaccIn(r23_b);
+      AD::SetPreaccIn(r33);
 
       if (r11 != 0.0) r13 = r13/r11; else r13 = 0.0;
       if ((r22 != 0.0) && (r11*r22 != 0.0)) r23 = r23_a/r22 - r23_b*r12/(r11*r22); else r23 = 0.0;
@@ -5469,6 +5487,9 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
       }
     }
     
+    AD::SetPreaccOut(Smatrix, nDim, nDim);
+    AD::EndPreacc();
+    
     /*--- Computation of the gradient: S*c ---*/
     for (iVar = 0; iVar < nPrimVarGrad; iVar++) {
       for (iDim = 0; iDim < nDim; iDim++) {
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 98705584ed2e..8796aff775e2 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -3636,12 +3636,19 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
     node[iPoint]->SetRmatrixZero();
     node[iPoint]->SetGradient_PrimitiveZero(nPrimVarGrad);
     
+    AD::StartPreacc();
+    AD::SetPreaccIn(PrimVar_i, nPrimVarGrad);
+    AD::SetPreaccIn(Coord_i, nDim);
+    
     for (iNeigh = 0; iNeigh < geometry->node[iPoint]->GetnPoint(); iNeigh++) {
       jPoint = geometry->node[iPoint]->GetPoint(iNeigh);
       Coord_j = geometry->node[jPoint]->GetCoord();
       
       PrimVar_j = node[jPoint]->GetPrimitive();
       
+      AD::SetPreaccIn(Coord_j, nDim);
+      AD::SetPreaccIn(PrimVar_j, nPrimVarGrad);
+      
       weight = 0.0;
       for (iDim = 0; iDim < nDim; iDim++)
         weight += (Coord_j[iDim]-Coord_i[iDim])*(Coord_j[iDim]-Coord_i[iDim]);
@@ -3671,6 +3678,8 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
         
       }
     }
+    AD::SetPreaccOut(node[iPoint]->GetGradient_Primitive(), nPrimVarGrad, nDim);
+    AD::EndPreacc();
   }
   
   /*--- Correct the gradient values across any periodic boundaries. ---*/
@@ -3697,6 +3706,11 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
     r12 = node[iPoint]->GetRmatrix(0,1);
     r22 = node[iPoint]->GetRmatrix(1,1);
     
+    AD::StartPreacc();
+    AD::SetPreaccIn(r11);
+    AD::SetPreaccIn(r12);
+    AD::SetPreaccIn(r22);
+    
     if (r11 >= 0.0) r11 = sqrt(r11); else r11 = 0.0;
     if (r11 != 0.0) r12 = r12/r11; else r12 = 0.0;
     if (r22-r12*r12 >= 0.0) r22 = sqrt(r22-r12*r12); else r22 = 0.0;
@@ -3707,6 +3721,11 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
       r23_b = node[iPoint]->GetRmatrix(2,1);
       r33   = node[iPoint]->GetRmatrix(2,2);
       
+      AD::SetPreaccIn(r13);
+      AD::SetPreaccIn(r23_a);
+      AD::SetPreaccIn(r23_b);
+      AD::SetPreaccIn(r33);
+      
       if (r11 != 0.0) r13 = r13/r11; else r13 = 0.0;
       if ((r22 != 0.0) && (r11*r22 != 0.0)) r23 = r23_a/r22 - r23_b*r12/(r11*r22); else r23 = 0.0;
       if (r33-r23*r23-r13*r13 >= 0.0) r33 = sqrt(r33-r23*r23-r13*r13); else r33 = 0.0;
@@ -3750,6 +3769,9 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
       }
     }
     
+    AD::SetPreaccOut(Smatrix, nDim, nDim);
+    AD::EndPreacc();
+    
     /*--- Computation of the gradient: S*c ---*/
     for (iVar = 0; iVar < nPrimVarGrad; iVar++) {
       for (iDim = 0; iDim < nDim; iDim++) {

From 79a18f5c5ffa80f706486a07ec5bc5954c929086 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 20 Aug 2019 17:21:19 +0200
Subject: [PATCH 419/539] Fixing file naming for adj elasticity

---
 SU2_CFD/src/output/CAdjElasticityOutput.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index d1aaf4fed5b3..5ab3c18730c9 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -88,7 +88,11 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim)
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  RestartFilename = config->GetRestart_AdjFileName();
+  
+  /*--- Add the obj. function extension --- */
+  
+  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
 
   /*--- Set the default convergence field --- */
 

From 838fdf99cff84e6fe0ef9d16bbcbd963d097cde5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 20 Aug 2019 21:42:45 +0200
Subject: [PATCH 420/539] Disabled conv critera for disc adj test case

---
 TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index 3f19d04edb8d..4e49ce7e57b6 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -481,7 +481,7 @@ RESIDUAL_REDUCTION= 12
 CONV_RESIDUAL_MINVAL= -9.00
 %
 % Start convergence criteria at iteration number
-CONV_STARTITER= 5
+CONV_STARTITER= 20
 %
 % Number of elements to apply the criteria
 CONV_CAUCHY_ELEMS= 100

From 7959b63d4881f39a3a6e8b66744223cc54c74fef Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 21 Aug 2019 07:41:34 +0200
Subject: [PATCH 421/539] Update turb_ONERAM6.cfg

---
 TestCases/rans/oneram6/turb_ONERAM6.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index 5f5de19074db..a513a2f8ce7f 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -290,3 +290,5 @@ WRT_SOL_FREQ= 250
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
 %
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)

From cb6976264b6c9d0470d21864adfa3eadf45570cf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 21 Aug 2019 10:48:10 +0200
Subject: [PATCH 422/539] some fixes

---
 Common/src/config_structure.cpp    | 16 +++++++++-------
 SU2_CFD/src/output/CFlowOutput.cpp |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index f50275b4e2ff..e997394909ff 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7407,7 +7407,7 @@ string CConfig::GetFilename(string filename, string ext, unsigned long Iter){
 
 string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string ext) {
 
-  string UnstExt, UnstFilename = val_filename;
+  string UnstExt="", UnstFilename = val_filename;
   char buffer[50];
 
   /*--- Check that a positive value iteration is requested (for now). ---*/
@@ -7415,21 +7415,23 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string e
   if (val_iter < 0) {
     SU2_MPI::Error("Requesting a negative iteration number for the restart file!!", CURRENT_FUNCTION);
   }
-
+  
+  unsigned short lastindex = UnstFilename.find_last_of(".");
+  UnstFilename = UnstFilename.substr(0, lastindex);
+  
   /*--- Append iteration number for unsteady cases ---*/
 
   if (Time_Domain) {
-    unsigned short lastindex = UnstFilename.find_last_of(".");
-    UnstFilename = UnstFilename.substr(0, lastindex);
+
     if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d", val_iter);
     if ((val_iter >= 10)   && (val_iter < 100))   SPRINTF (buffer, "_000%d",  val_iter);
     if ((val_iter >= 100)  && (val_iter < 1000))  SPRINTF (buffer, "_00%d",   val_iter);
     if ((val_iter >= 1000) && (val_iter < 10000)) SPRINTF (buffer, "_0%d",    val_iter);
     if (val_iter >= 10000) SPRINTF (buffer, "_%d", val_iter);
-    string UnstExt = string(buffer);
-    UnstExt += ext;
-    UnstFilename.append(UnstExt);
+    UnstExt = string(buffer);
   }
+  UnstExt += ext;
+  UnstFilename.append(UnstExt);
 
   return UnstFilename;
 }
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index f431e67ee3ff..d24cb7161dcf 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -790,7 +790,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   unsigned short iMarker, icommas, Boundary, iDim;
   unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
-  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff;
+  su2double XCoord, YCoord, ZCoord, Pressure, PressureCoeff = 0, Cp, CpTarget, *Normal = NULL, Area, PressDiff = 0.0;
   bool *PointInDomain;
   string text_line, surfCp_filename;
   ifstream Surface_file;
@@ -911,8 +911,8 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
       }
     }
     
+    su2double MyPressDiff = PressDiff;
 #ifdef HAVE_MPI
-    su2double MyPressDiff = PressDiff;   PressDiff = 0.0;
     SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
 #endif
     

From d927520addab44e5e093c6fedb4d7b067f355725 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 21 Aug 2019 11:04:19 +0200
Subject: [PATCH 423/539] Fixing inverse design cp case

---
 SU2_CFD/src/output/CFlowOutput.cpp  | 6 +-----
 TestCases/parallel_regression_AD.py | 2 +-
 TestCases/serial_regression_AD.py   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index d24cb7161dcf..496e01a77cfa 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -836,11 +836,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
           
           /*--- The Pressure file uses the global numbering ---*/
           
-#ifndef HAVE_MPI
-          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-#else
           iPoint = geometry->node[geometry->vertex[iMarker][iVertex]->GetNode()]->GetGlobalIndex();
-#endif
           
           if (geometry->vertex[iMarker][iVertex]->GetNode() < geometry->GetnPointDomain()) {
             Point2Vertex[iPoint][0] = iMarker;
@@ -911,8 +907,8 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
       }
     }
     
-    su2double MyPressDiff = PressDiff;
 #ifdef HAVE_MPI
+    su2double MyPressDiff = PressDiff;    
     SU2_MPI::Allreduce(&MyPressDiff, &PressDiff, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
 #endif
     
diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
index ad221572b83c..5baaf3bcdff3 100644
--- a/TestCases/parallel_regression_AD.py
+++ b/TestCases/parallel_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [-0.747330, -0.782632, 326.910000, 0.000000] #last 4 columns
+    discadj_arina2k.test_vals    = [2.228982, 1.717042, 4.7258e+04, 0.0000e+00] #last 4 columns
     discadj_arina2k.su2_exec     = "parallel_computation.py -f"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 7230c905646e..6935f84b5358 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [-0.776022, -0.795092, 319.800000, 0.000000]  #last 4 columns
+    discadj_arina2k.test_vals    = [2.206814, 1.674391, 4.7250e+04, 0.0000e+00]#last 4 columns
     discadj_arina2k.su2_exec     = "SU2_CFD_AD"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001

From 34324df9d745e92a6a121273e9454572bd4bc467 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 21 Aug 2019 14:03:29 +0200
Subject: [PATCH 424/539] Removed Convergence criteria config options

---
 Common/include/config_structure.hpp           |  77 -----------
 Common/include/config_structure.inl           |  22 ----
 Common/src/config_structure.cpp               | 122 ++----------------
 SU2_CFD/include/output/COutput.hpp            |  12 +-
 SU2_CFD/src/drivers/CDriver.cpp               |  94 +++++++-------
 SU2_CFD/src/output/CBaselineOutput.cpp        |   4 +
 SU2_SOL/src/SU2_SOL.cpp                       |   2 +-
 .../aeroelastic/aeroelastic_NACA64A010.cfg    |   4 -
 .../cont_adj_euler/naca0012/inv_NACA0012.cfg  |   3 -
 .../naca0012/inv_NACA0012_FD.cfg              |   3 -
 .../naca0012/inv_NACA0012_discadj.cfg         |   3 -
 .../cont_adj_euler/oneram6/inv_ONERAM6.cfg    |   3 -
 .../cont_adj_euler/wedge/inv_wedge_ROE.cfg    |   2 -
 .../wedge/inv_wedge_ROE_multiobj.cfg          |   2 -
 .../cylinder/lam_cylinder.cfg                 |   3 -
 .../naca0012_sub/lam_NACA0012.cfg             |   3 -
 .../naca0012_trans/lam_NACA0012.cfg           |   3 -
 .../cont_adj_rans/naca0012/turb_nasa.cfg      |   3 -
 .../naca0012/turb_nasa_binary.cfg             |   3 -
 .../cont_adj_rans/oneram6/turb_ONERAM6.cfg    |   4 -
 .../cont_adj_rans/rae2822/turb_SA_RAE2822.cfg |   3 -
 .../control_surface/inv_ONERAM6_moving.cfg    |   3 -
 .../control_surface/inv_ONERAM6_setting.cfg   |   3 -
 .../coupled_cht/incompressible/configFlow.cfg |   2 -
 .../coupled_cht_incompressible.cfg            |   2 -
 TestCases/ddes/flatplate/ddes_flatplate.cfg   |   3 -
 .../deformation/brick_hex/def_brick_hex.cfg   |   3 -
 .../brick_hex_rans/def_brick_hex_rans.cfg     |   3 -
 .../brick_prism/def_brick_prism.cfg           |   3 -
 .../brick_prism_rans/def_brick_prism_rans.cfg |   3 -
 .../deformation/brick_pyra/def_brick_pyra.cfg |   3 -
 .../deformation/brick_tets/def_brick_tets.cfg |   3 -
 .../cylindrical_ffd/def_cylindrical.cfg       |   2 -
 .../deformation/naca0012/def_NACA0012.cfg     |   3 -
 .../naca0012/surface_file_NACA0012.cfg        |   3 -
 .../deformation/naca4412/def_NACA4412.cfg     |   3 -
 TestCases/deformation/rae2822/def_RAE2822.cfg |   3 -
 .../spherical_ffd/def_spherical.cfg           |   2 -
 .../spherical_ffd/def_spherical_bspline.cfg   |   2 -
 .../disc_adj_euler/arina2k/Arina2KRS.cfg      |   6 -
 .../cylinder3D/inv_cylinder3D.cfg             |   6 -
 .../disc_adj_euler/oneram6/inv_ONERAM6.cfg    |   6 -
 TestCases/disc_adj_fea/configAD_fem.cfg       |   3 -
 TestCases/disc_adj_fsi/Airfoil_2d/config.cfg  |   5 -
 TestCases/disc_adj_fsi/configAD_fsi.cfg       |   4 -
 TestCases/disc_adj_heat/disc_adj_heat.cfg     |   2 -
 .../naca0012/incomp_NACA0012_disc.cfg         |   3 -
 .../cylinder/heated_cylinder.cfg              |   3 -
 .../naca0012/turb_naca0012_sa.cfg             |   3 -
 .../naca0012/turb_naca0012_sst.cfg            |   3 -
 TestCases/disc_adj_rans/cylinder/cylinder.cfg |   3 -
 .../cylinder_DT_1ST/cylinder.cfg              |   3 -
 .../naca0012/turb_NACA0012_sa.cfg             |   3 -
 .../naca0012/turb_NACA0012_sst.cfg            |   3 -
 .../transonic_stator_2D/transonic_stator.cfg  |   4 -
 TestCases/euler/CRM/inv_CRM_JST.cfg           |   3 -
 TestCases/euler/biparabolic/BIPARABOLIC.cfg   |   3 -
 TestCases/euler/bluntbody/blunt.cfg           |   3 -
 TestCases/euler/channel/inv_channel.cfg       |   3 -
 TestCases/euler/channel/inv_channel_RK.cfg    |   3 -
 TestCases/euler/naca0012/inv_NACA0012.cfg     |   3 -
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg |   4 -
 TestCases/euler/oneram6/inv_ONERAM6.cfg       |   3 -
 TestCases/euler/wedge/inv_wedge_HLLC.cfg      |   3 -
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg   |   4 -
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg  |   2 -
 TestCases/fea_fsi/Airfoil_RBF/settings.cfg    |   5 -
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |   3 -
 TestCases/fea_fsi/MixElemsKnowles/config.cfg  |   3 -
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg   |  18 +--
 .../fea_fsi/WallChannel_2d/configFEA.cfg      |   3 -
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |  14 +-
 .../fea_fsi/WallChannel_2d/configFlow.cfg     |   3 -
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg  |   3 -
 .../naca0012/inv_NACA0012_ContAdj.cfg         |   3 -
 TestCases/gust/inv_gust_NACA0012.cfg          |   4 -
 TestCases/harmonic_balance/HB.cfg             |   3 -
 .../hb_rans_preconditioning/davis.cfg         |   3 -
 .../2D/Quad32X32_nPoly4/InviscidVortex.cfg    |   9 +-
 .../3D/nPoly2_Tets/InviscidVortex.cfg         |   9 +-
 .../3D/nPoly4_Tets/InviscidVortex.cfg         |   9 +-
 .../fem_NACA0012.cfg                          |   3 -
 .../NACA0012_5thOrder/fem_NACA0012.cfg        |   3 -
 .../NACA0012_5thOrder/fem_NACA0012_reg.cfg    |   3 -
 .../Ringleb/Quad100X50_nPoly3/Ringleb.cfg     |   3 -
 .../Quad100X50_nPoly3/Ringleb_WallBC.cfg      |   3 -
 .../Ringleb/Quad100X50_nPoly4/Ringleb.cfg     |   3 -
 .../Quad100X50_nPoly4/Ringleb_WallBC.cfg      |   3 -
 .../Ringleb/Quad200X100_nPoly4/Ringleb.cfg    |   3 -
 .../Quad200X100_nPoly4/Ringleb_WallBC.cfg     |   3 -
 .../Quad50X50_HalfGeom_nPoly4/Ringleb.cfg     |   3 -
 .../Ringleb_WallBC.cfg                        |   3 -
 .../Ringleb.cfg                               |   3 -
 .../Ringleb_WallBC.cfg                        |   3 -
 .../Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg |   3 -
 .../Ringleb_WallBC.cfg                        |   3 -
 .../Sphere_4thOrder_Hexa/fem_Sphere.cfg       |   3 -
 .../Sphere_4thOrder_Tet/fem_Sphere.cfg        |   3 -
 .../nPoly1/fem_SubsonicChannel.cfg            |   3 -
 .../nPoly1/fem_SubsonicChannel_Farfield.cfg   |   3 -
 .../nPoly2/fem_SubsonicChannel.cfg            |   3 -
 .../nPoly2/fem_SubsonicChannel_Farfield.cfg   |   3 -
 .../nPoly4/fem_SubsonicChannel.cfg            |   3 -
 .../nPoly4/fem_SubsonicChannel_Farfield.cfg   |   3 -
 .../nPoly3/fem_Cylinder_reg.cfg               |   3 -
 .../FlatPlate/nPoly4/lam_flatplate_reg.cfg    |   3 -
 .../nPoly3_QuadDominant/fem_Sphere_reg.cfg    |   3 -
 .../fem_Sphere_reg_ADER.cfg                   |   3 -
 .../nPoly4/fem_unst_cylinder.cfg              |   3 -
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |   3 -
 .../incomp_euler/naca0012/incomp_NACA0012.cfg |  21 ---
 TestCases/incomp_euler/nozzle/inv_nozzle.cfg  |   2 -
 .../buoyancy_cavity/lam_buoyancy_cavity.cfg   |   3 -
 .../cylinder/incomp_cylinder.cfg              |  22 ----
 .../cylinder/poly_cylinder.cfg                |   3 -
 .../incomp_rans/AhmedBody/turb_ahmed.cfg      |  27 ----
 TestCases/incomp_rans/naca0012/naca0012.cfg   |   3 -
 TestCases/mms/dg_navierstokes/lam_mms_dg.cfg  |   3 -
 .../mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg  |   3 -
 TestCases/mms/dg_ringleb/ringleb_dg.cfg       |   3 -
 .../mms/fvm_incomp_euler/inv_mms_jst.cfg      |   3 -
 .../fvm_incomp_navierstokes/lam_mms_fds.cfg   |   3 -
 .../mms/fvm_navierstokes/lam_mms_roe.cfg      |   3 -
 TestCases/moving_wall/cavity/lam_cavity.cfg   |   3 -
 .../spinning_cylinder/spinning_cylinder.cfg   |  19 ---
 .../naca0012/inv_NACA0012_ffd.cfg             |   6 -
 .../cylinder/cylinder_lowmach.cfg             |   3 -
 .../navierstokes/cylinder/lam_cylinder.cfg    |   3 -
 .../navierstokes/flatplate/lam_flatplate.cfg  |   3 -
 .../navierstokes/naca0012/lam_NACA0012.cfg    |   3 -
 .../poiseuille/lam_poiseuille.cfg             |   3 -
 .../poiseuille/profile_poiseuille.cfg         |   3 -
 TestCases/nicf/LS89/turb_SA_PR.cfg            |   3 -
 TestCases/nicf/LS89/turb_SST_PR.cfg           |   3 -
 TestCases/nicf/edge/edge_PPR.cfg              |   3 -
 TestCases/nicf/edge/edge_VW.cfg               |   3 -
 .../inv_wedge_ROE_2surf_1obj.cfg              |   2 -
 .../inv_wedge_ROE_multiobj.cfg                |   2 -
 .../inv_wedge_ROE_multiobj_1surf.cfg          |   2 -
 .../inv_wedge_ROE_multiobj_combo.cfg          |   2 -
 .../inv_NACA0012_multipoint.cfg               |   6 -
 .../pitching_NACA64A010.cfg                   |  10 +-
 .../pitching_oneram6/pitching_ONERAM6.cfg     |  10 +-
 .../rotating_naca0012/rotating_NACA0012.cfg   |   4 -
 .../steady_inverse_design/inv_NACA0012.cfg    |   3 -
 .../steady_naca0012/inv_NACA0012_adv.cfg      |   6 -
 .../steady_naca0012/inv_NACA0012_basic.cfg    |   6 -
 .../steady_oneram6/inv_ONERAM6_adv.cfg        |   6 -
 .../steady_oneram6/inv_ONERAM6_basic.cfg      |   6 -
 .../pitching_naca64a010/turb_NACA64A010.cfg   |  10 +-
 .../pitching_oneram6/turb_ONERAM6.cfg         |  10 +-
 .../steady_oneram6/turb_ONERAM6.cfg           |   4 -
 .../steady_rae2822/turb_SA_RAE2822.cfg        |   4 -
 TestCases/polar/naca0012/inv_NACA0012.cfg     |   3 -
 .../flatPlate_rigidMotion_Conf.cfg            |   6 -
 .../unsteady_CHT_FlatPlate_Conf.cfg           |   6 -
 .../rans/flatplate/turb_SA_flatplate.cfg      |   3 -
 .../rans/flatplate/turb_SST_flatplate.cfg     |   3 -
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg  |   3 -
 .../rans/naca0012/turb_NACA0012_sa_binary.cfg |   3 -
 .../rans/naca0012/turb_NACA0012_sa_neg.cfg    |   3 -
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg |   3 -
 .../turb_NACA0012_sst_multigrid_restart.cfg   |  34 -----
 TestCases/rans/oneram6/turb_ONERAM6.cfg       |   4 -
 TestCases/rans/propeller/propeller.cfg        |   2 -
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg    |   3 -
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg   |   3 -
 TestCases/rans/s809/trans_s809.cfg            |   3 -
 TestCases/rans/s809/turb_S809.cfg             |   3 -
 TestCases/rans/vki_turbine/turb_vki.cfg       |   3 -
 .../rans_uq/naca0012/turb_NACA0012_uq.cfg     |   3 -
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg  |   3 -
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg  |   3 -
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg  |   3 -
 .../naca0012/turb_NACA0012_uq_p1c1.cfg        |   3 -
 .../naca0012/turb_NACA0012_uq_p1c2.cfg        |   3 -
 .../caradonna_tung/rot_caradonna_tung.cfg     |   3 -
 TestCases/rotating/naca0012/rot_NACA0012.cfg  |   3 -
 .../sliding_interface/bars_SST_2D/bars.cfg    |   4 -
 .../channel_2D/channel_2D_NN.cfg              |   5 -
 .../channel_2D/channel_2D_WA.cfg              |   5 -
 .../channel_3D/channel_3D_NN.cfg              |  15 ---
 .../channel_3D/channel_3D_WA.cfg              |   5 -
 .../incompressible_steady/configCircle.cfg    |   2 -
 .../incompressible_steady/configOut.cfg       |   2 -
 .../incompressible_unsteady/configCircle.cfg  |   9 +-
 .../incompressible_unsteady/configOut.cfg     |   9 +-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |  14 --
 TestCases/sliding_interface/pipe/pipe_WA.cfg  |  14 --
 .../rotating_cylinders/rot_cylinders_NN.cfg   |   5 -
 .../rotating_cylinders/rot_cylinders_WA.cfg   |   5 -
 .../single_stage/single_stage_NN.cfg          |  13 +-
 .../single_stage/single_stage_WA.cfg          |  12 +-
 .../sup_vor_shed_NN.cfg                       |   5 -
 .../sup_vor_shed_WA.cfg                       |   5 -
 .../uniform_flow/uniform_NN.cfg               |   5 -
 .../uniform_flow/uniform_WA.cfg               |  34 ++---
 .../transitional_BC_model_ConfigFile.cfg      |   3 -
 .../transitional_BC_model_ConfigFile.cfg      |   3 -
 .../transitional_BC_model_ConfigFile.cfg      |   3 -
 .../turbomachinery/APU_turbocharger/Jones.cfg |   4 -
 .../APU_turbocharger/Jones_rst.cfg            |   4 -
 .../axial_stage_2D/Axial_stage2D.cfg          |   4 -
 .../centrifugal_blade/centrifugal_blade.cfg   |   5 -
 .../centrifugal_stage/centrifugal_stage.cfg   |   5 -
 .../transonic_stator_2D/transonic_stator.cfg  |   4 -
 .../transonic_stator_rst.cfg                  |   4 -
 .../pitching_NACA64A010.cfg                   |  10 +-
 .../turb_NACA64A010.cfg                       |  10 +-
 .../plunging_naca0012/plunging_NACA0012.cfg   |   9 +-
 .../unsteady/square_cylinder/turb_square.cfg  |   3 -
 config_template.cfg                           |   6 -
 212 files changed, 136 insertions(+), 1168 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 187712b13bb6..30890ec9ca1c 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -85,18 +85,7 @@ class CConfig {
   unsigned short nZoneSpecified; /*!< \brief Number of zones that are specified in config file. */
   su2double Highlite_Area; /*!< \brief Highlite area. */
   su2double Fan_Poly_Eff; /*!< \brief Highlite area. */
-  su2double OrderMagResidual; /*!< \brief Order of magnitude reduction. */
   su2double MinLogResidual; /*!< \brief Minimum value of the log residual. */
-  su2double OrderMagResidualFSI; /*!< \brief Order of magnitude reduction. */
-  su2double MinLogResidualFSI; /*!< \brief Minimum value of the log residual. */
-  su2double OrderMagResidual_BGS_F; /*!< \brief Order of magnitude reduction. */
-  su2double MinLogResidual_BGS_F; /*!< \brief Minimum value of the log residual. */
-  su2double OrderMagResidual_BGS_S; /*!< \brief Order of magnitude reduction. */
-  su2double MinLogResidual_BGS_S; /*!< \brief Minimum value of the log residual. */
-  su2double Res_FEM_UTOL; 		/*!< \brief UTOL criteria for structural FEM. */
-  su2double Res_FEM_RTOL; 		/*!< \brief RTOL criteria for structural FEM. */
-  su2double Res_FEM_ETOL; 		/*!< \brief ETOL criteria for structural FEM. */
-  su2double Res_FEM_ADJ;     /*!< \brief Convergence criteria for adjoint FEM. */
   su2double EA_ScaleFactor; /*!< \brief Equivalent Area scaling factor */
   su2double* EA_IntLimit; /*!< \brief Integration limits of the Equivalent Area computation */
   su2double AdjointLimit; /*!< \brief Adjoint variable limit */
@@ -6098,78 +6087,12 @@ class CConfig {
    */
   unsigned short GetContainerPosition(unsigned short val_eqsystem);
   
-  /*!
-   * \brief Value of the order of magnitude reduction of the residual.
-   * \return Value of the order of magnitude reduction of the residual.
-   */
-  su2double GetOrderMagResidual(void);
-  
   /*!
    * \brief Value of the minimum residual value (log10 scale).
    * \return Value of the minimum residual value (log10 scale).
    */
   su2double GetMinLogResidual(void);
   
-  /*!
-   * \brief Value of the order of magnitude reduction of the residual for FSI applications.
-   * \return Value of the order of magnitude reduction of the residual.
-   */
-  su2double GetOrderMagResidualFSI(void);
-  
-  /*!
-   * \brief Value of the minimum residual value for FSI applications (log10 scale).
-   * \return Value of the minimum residual value (log10 scale).
-   */
-  su2double GetMinLogResidualFSI(void);
-  
-  /*!
-   * \brief Value of the order of magnitude reduction of the flow residual for BGS applications.
-   * \return Value of the order of magnitude reduction of the residual.
-   */
-  su2double GetOrderMagResidual_BGS_F(void);
-  
-  /*!
-   * \brief Value of the minimum flow residual value for BGS applications (log10 scale).
-   * \return Value of the minimum residual value (log10 scale).
-   */
-  su2double GetMinLogResidual_BGS_F(void);
-  
-  /*!
-   * \brief Value of the order of magnitude reduction of the flow residual for BGS applications.
-   * \return Value of the order of magnitude reduction of the residual.
-   */
-  su2double GetOrderMagResidual_BGS_S(void);
-  
-  /*!
-   * \brief Value of the minimum flow residual value for BGS applications (log10 scale).
-   * \return Value of the minimum residual value (log10 scale).
-   */
-  su2double GetMinLogResidual_BGS_S(void);
-  
-  /*!
-   * \brief Value of the displacement tolerance UTOL for FEM structural analysis (log10 scale).
-   * \return Value of Res_FEM_UTOL (log10 scale).
-   */
-  su2double GetResidual_FEM_UTOL(void);
-  
-  /*!
-   * \brief Value of the displacement tolerance UTOL for FEM structural analysis (log10 scale).
-   * \return Value of Res_FEM_UTOL (log10 scale).
-   */
-  su2double GetResidual_FEM_RTOL(void);
-  
-  /*!
-   * \brief Value of the displacement tolerance UTOL for FEM structural analysis (log10 scale).
-   * \return Value of Res_FEM_UTOL (log10 scale).
-   */
-  su2double GetResidual_FEM_ETOL(void);
-  
-  /*!
-   * \brief Value of the maximum objective function for FEM elasticity adjoint (log10 scale).
-   * \return Value of Res_FEM_ADJ (log10 scale).
-   */
-  su2double GetCriteria_FEM_ADJ(void);
-  
   /*!
    * \brief Value of the damping factor for the engine inlet bc.
    * \return Value of the damping factor.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 7ba89cc868b9..b747a8251686 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1519,8 +1519,6 @@ inline su2double CConfig::GetDV_Value(unsigned short val_dv, unsigned short val_
 
 inline void CConfig::SetDV_Value(unsigned short val_dv, unsigned short val_ind, su2double val) { DV_Value[val_dv][val_ind] = val; }
 
-inline su2double CConfig::GetOrderMagResidual(void) { return OrderMagResidual; }
-
 inline su2double CConfig::GetMinLogResidual(void) { return MinLogResidual; }
 
 inline su2double CConfig::GetDamp_Engine_Inflow(void) { return Damp_Engine_Inflow; }
@@ -1873,26 +1871,6 @@ inline bool CConfig::GetConservativeInterpolation(void) { return ConservativeInt
 
 inline unsigned short CConfig::GetRelaxation_Method_FSI(void) { return Kind_BGS_RelaxMethod; }
 
-inline su2double CConfig::GetOrderMagResidualFSI(void) { return OrderMagResidualFSI; }
-
-inline su2double CConfig::GetMinLogResidualFSI(void) { return MinLogResidualFSI; }
-
-inline su2double CConfig::GetOrderMagResidual_BGS_F(void) { return OrderMagResidual_BGS_F; }
-
-inline su2double CConfig::GetMinLogResidual_BGS_F(void) { return MinLogResidual_BGS_F; }
-
-inline su2double CConfig::GetOrderMagResidual_BGS_S(void) { return OrderMagResidual_BGS_S; }
-
-inline su2double CConfig::GetMinLogResidual_BGS_S(void) { return MinLogResidual_BGS_S; }
-
-inline su2double CConfig::GetResidual_FEM_UTOL(void) { return Res_FEM_UTOL; }
-
-inline su2double CConfig::GetResidual_FEM_RTOL(void) { return Res_FEM_RTOL; }
-
-inline su2double CConfig::GetResidual_FEM_ETOL(void) { return Res_FEM_ETOL; }
-
-inline su2double CConfig::GetCriteria_FEM_ADJ(void) { return Res_FEM_ADJ; }
-
 inline unsigned short CConfig::GetDynamic_LoadTransfer(void) { return Dynamic_LoadTransfer; }
 
 inline unsigned short CConfig::GetDirectDiff() { return DirectDiff;}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index e997394909ff..37439d74229d 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1331,14 +1331,8 @@ void CConfig::SetConfig_Options() {
   addUnsignedShortOption("LEVELS_TIME_ACCURATE_LTS", nLevels_TimeAccurateLTS, 1);
   /* DESCRIPTION: Number of time DOFs used in the predictor step of ADER-DG. */
   addUnsignedShortOption("TIME_DOFS_ADER_DG", nTimeDOFsADER_DG, 2);
-  /* DESCRIPTION: Time Step for dual time stepping simulations (s) */
-  addDoubleOption("UNST_TIMESTEP", Delta_UnstTime, 0.0);
-  /* DESCRIPTION: Total Physical Time for dual time stepping simulations (s) */
-  addDoubleOption("UNST_TIME", Total_UnstTime, 1.0);
   /* DESCRIPTION: Unsteady Courant-Friedrichs-Lewy number of the finest grid */
   addDoubleOption("UNST_CFL_NUMBER", Unst_CFL, 0.0);
-  /* DESCRIPTION: Number of internal iterations (dual time method) */
-  addUnsignedLongOption("UNST_INT_ITER", Unst_nIntIter, 100);
   /* DESCRIPTION: Integer number of periodic time instances for Harmonic Balance */
   addUnsignedShortOption("TIME_INSTANCES", nTimeInstances, 1);
   /* DESCRIPTION: Time period for Harmonic Balance wihtout moving meshes */
@@ -1438,44 +1432,15 @@ void CConfig::SetConfig_Options() {
   /*!\brief CONV_CRITERIA
    *  \n DESCRIPTION: Convergence criteria \n OPTIONS: see \link Converge_Crit_Map \endlink \n DEFAULT: RESIDUAL \ingroup Config*/
   addEnumOption("CONV_CRITERIA", ConvCriteria, Converge_Crit_Map, RESIDUAL);
-  /*!\brief RESIDUAL_REDUCTION \n DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value)\n DEFAULT: 3.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_REDUCTION", OrderMagResidual, 5.0);
-  /*!\brief RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -14.0 \ingroup Config*/
+  /*!\brief CONV_RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -14.0 \ingroup Config*/
   addDoubleOption("CONV_RESIDUAL_MINVAL", MinLogResidual, -14.0);
-  /* DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value) */
-  addDoubleOption("RESIDUAL_REDUCTION_FSI", OrderMagResidualFSI, 3.0);
-  /* DESCRIPTION: Min value of the residual (log10 of the residual) */
-  addDoubleOption("RESIDUAL_MINVAL_FSI", MinLogResidualFSI, -5.0);
-  /*!\brief RESIDUAL_REDUCTION \n DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value)\n DEFAULT: 3.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_REDUCTION_BGS_FLOW", OrderMagResidual_BGS_F, 3.0);
-  /*!\brief RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -8.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_MINVAL_BGS_FLOW", MinLogResidual_BGS_F, -8.0);
-  /*!\brief RESIDUAL_REDUCTION \n DESCRIPTION: Residual reduction (order of magnitude with respect to the initial value)\n DEFAULT: 3.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_REDUCTION_BGS_STRUCTURE", OrderMagResidual_BGS_S, 3.0);
-  /*!\brief RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -8.0 \ingroup Config*/
-  addDoubleOption("RESIDUAL_MINVAL_BGS_STRUCTURE", MinLogResidual_BGS_S, -8.0);
-  /* DESCRIPTION: FEM: UTOL = norm(Delta_U(k)) / norm(U(k)) */
-  addDoubleOption("RESIDUAL_FEM_UTOL", Res_FEM_UTOL, -9.0);
-  /* DESCRIPTION: FEM: RTOL = norm(Residual(k)) / norm(Residual(0)) */
-  addDoubleOption("RESIDUAL_FEM_RTOL", Res_FEM_RTOL, -9.0);
-  /* DESCRIPTION: FEM: ETOL = Delta_U(k) * Residual(k) / Delta_U(0) * Residual(0) */
-  addDoubleOption("RESIDUAL_FEM_ETOL", Res_FEM_ETOL, -9.0);
-  /* DESCRIPTION: FEM: ETOL = Delta_U(k) * Residual(k) / Delta_U(0) * Residual(0) */
-  addEnumOption("RESIDUAL_CRITERIA_FEM", Res_FEM_CRIT, ResFem_Map, RESFEM_RELATIVE);
-  /*!\brief RESIDUAL_FUNC_FLOW\n DESCRIPTION: Flow functional for the Residual criteria\n OPTIONS: See \link Residual_Map \endlink \n DEFAULT: RHO_RESIDUAL \ingroup Config*/
-  addEnumOption("RESIDUAL_FUNC_FLOW", Residual_Func_Flow, Residual_Map, RHO_RESIDUAL);
-  /*!\brief STARTCONV_ITER\n DESCRIPTION: Iteration number to begin convergence monitoring\n DEFAULT: 5 \ingroup Config*/
+  /*!\brief CONV_STARTITER\n DESCRIPTION: Iteration number to begin convergence monitoring\n DEFAULT: 5 \ingroup Config*/
   addUnsignedLongOption("CONV_STARTITER", StartConv_Iter, 5);
-  /*!\brief CAUCHY_ELEMS\n DESCRIPTION: Number of elements to apply the criteria. \n DEFAULT 100 \ingroup Config*/
+  /*!\brief CONV_CAUCHY_ELEMS\n DESCRIPTION: Number of elements to apply the criteria. \n DEFAULT 100 \ingroup Config*/
   addUnsignedShortOption("CONV_CAUCHY_ELEMS", Cauchy_Elems, 100);
-  /*!\brief CAUCHY_EPS\n DESCRIPTION: Epsilon to control the series convergence \n DEFAULT: 1e-10 \ingroup Config*/
+  /*!\brief CONV_CAUCHY_EPS\n DESCRIPTION: Epsilon to control the series convergence \n DEFAULT: 1e-10 \ingroup Config*/
   addDoubleOption("CONV_CAUCHY_EPS", Cauchy_Eps, 1E-10);
-  /*!\brief CAUCHY_FUNC_FLOW
-   *  \n DESCRIPTION: Flow functional for the Cauchy criteria \n OPTIONS: see \link Objective_Map \endlink \n DEFAULT: DRAG_COEFFICIENT \ingroup Config*/
-  addEnumOption("CAUCHY_FUNC_FLOW", Cauchy_Func_Flow, Objective_Map, DRAG_COEFFICIENT);
-  /*!\brief CAUCHY_FUNC_ADJFLOW\n DESCRIPTION: Adjoint functional for the Cauchy criteria.\n OPTIONS: See \link Sens_Map \endlink. \n DEFAULT: SENS_GEOMETRY \ingroup Config*/
-  addEnumOption("CAUCHY_FUNC_ADJFLOW", Cauchy_Func_AdjFlow, Sens_Map, SENS_GEOMETRY);
-
+  /*!\brief CONV_FIELD\n DESCRIPTION: Output field to monitor \n Default: depends on solver \ingroup Config*/
   addStringOption("CONV_FIELD", ConvField, "");
 
   /*!\par CONFIG_CATEGORY: Multi-grid \ingroup Config*/
@@ -2019,9 +1984,6 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Direction of the Electic Fields */
   addDoubleListOption("ELECTRIC_FIELD_DIR", nDim_Electric_Field, Electric_Field_Dir);
 
-  /* DESCRIPTION: Convergence criteria for FEM adjoint */
-  addDoubleOption("CRITERIA_FEM_ADJ", Res_FEM_ADJ, -5.0);
-
   /*!\brief DESIGN_VARIABLE_FEA
    *  \n DESCRIPTION: Design variable for FEA problems \n OPTIONS: See \link DVFEA_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config */
   addEnumOption("DESIGN_VARIABLE_FEA", Kind_DV_FEA, DVFEA_Map, NODV_FEA);
@@ -2522,7 +2484,14 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
           if (!option_name.compare("URLX")) newString.append("URLX is now UQ_URLX.\n");
           if (!option_name.compare("EXT_ITER")) newString.append("Option EXT_ITER is deprecated as of v7.0. Please use TIME_ITER, OUTER_ITER or ITER \n"
                                                                  "to specify the number of time iterations, outer multizone iterations or iterations, respectively.");
-
+          if (!option_name.compare("UNST_TIMESTEP")) newString.append("UNST_TIMESTEP is now TIME_STEP.\n");
+          if (!option_name.compare("UNST_TIME")) newString.append("UNST_TIME is now MAX_TIME.\n");
+          if (!option_name.compare("UNST_INT_ITER")) newString.append("UNST_INT_ITER is now INNER_ITER.\n");
+          if (!option_name.compare("RESIDUAL_MINVAL")) newString.append("RESIDUAL_MINVAL is now CONV_RESIDUAL_MINVAL.\n");
+          if (!option_name.compare("STARTCONV_ITER")) newString.append("STARTCONV_ITER is now CONV_STARTITER.\n");
+          if (!option_name.compare("CAUCHY_ELEMS")) newString.append("CAUCHY_ELEMS is now CONV_CAUCHY_ELEMS.\n");
+          if (!option_name.compare("CAUCHY_EPS")) newString.append("CAUCHY_EPS is now CONV_CAUCHY_EPS.\n");
+          
           errorString.append(newString);
           err_count++;
         continue;
@@ -4127,7 +4096,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   	if ((Fixed_CL_Mode) || (Fixed_CM_Mode)) {
     ConvCriteria = RESIDUAL;
   		nInnerIter += Iter_dCL_dAlpha;
-  		OrderMagResidual = 24;
   		MinLogResidual = -24;
   	}
   }
@@ -6114,69 +6082,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     
     cout << "Maximum number of solver subiterations: " << nInnerIter <<"."<< endl;
     cout << "Maximum number of physical time-steps: " << nTimeIter <<"."<< endl;
-
-
-    if (!fea){
-
-      if (ConvCriteria == CAUCHY) {
-        if (!ContinuousAdjoint && !DiscreteAdjoint)
-          switch (Cauchy_Func_Flow) {
-            case LIFT_COEFFICIENT: cout << "Cauchy criteria for Lift using "
-              << Cauchy_Elems << " elements and epsilon " <<Cauchy_Eps<< "."<< endl; break;
-            case DRAG_COEFFICIENT: cout << "Cauchy criteria for Drag using "
-              << Cauchy_Elems << " elements and epsilon " <<Cauchy_Eps<< "."<< endl; break;
-          }
-
-        if (ContinuousAdjoint || DiscreteAdjoint)
-          switch (Cauchy_Func_AdjFlow) {
-            case SENS_GEOMETRY: cout << "Cauchy criteria for geo. sensitivity using "
-              << Cauchy_Elems << " elements and epsilon " <<Cauchy_Eps<< "."<< endl; break;
-            case SENS_MACH: cout << "Cauchy criteria for Mach number sensitivity using "
-              << Cauchy_Elems << " elements and epsilon " <<Cauchy_Eps<< "."<< endl; break;
-          }
-
-        cout << "Start convergence criteria at iteration " << StartConv_Iter<< "."<< endl;
-      
-      }
-
-
-      if (ConvCriteria == RESIDUAL) {
-        if (!ContinuousAdjoint && !DiscreteAdjoint) {
-          cout << "Reduce the density residual " << OrderMagResidual << " orders of magnitude."<< endl;
-          cout << "The minimum bound for the density residual is 10^(" << MinLogResidual<< ")."<< endl;
-          cout << "Start convergence criteria at iteration " << StartConv_Iter<< "."<< endl;
-        }
-
-        if (ContinuousAdjoint || DiscreteAdjoint) {
-          cout << "Reduce the adjoint density residual " << OrderMagResidual << " orders of magnitude."<< endl;
-          cout << "The minimum value for the adjoint density residual is 10^(" << MinLogResidual<< ")."<< endl;
-        }
-
-      }
-
-    }
-    else{
-        if (Kind_Struct_Solver == SMALL_DEFORMATIONS) {cout << "Convergence criteria determined by the linear solver." << endl;}
-        else if (Kind_Solver == DISC_ADJ_FEM){
-
-        }
-        else{
-          if (Res_FEM_CRIT == RESFEM_ABSOLUTE){
-              cout << "Absolute convergence criteria" << endl;
-              cout << "Log10 of displacements (UTOL-A): " << Res_FEM_UTOL << "."<< endl;
-              cout << "Log10 of residual (RTOL-A): " << Res_FEM_RTOL << "."<< endl;
-              cout << "Log10 of energy (ETOL-A): " << Res_FEM_ETOL << "."<< endl;
-          }
-          else{
-              cout << "Relative convergence criteria" << endl;
-              cout << "Displacements tolerance (UTOL): Reduce " << -Res_FEM_UTOL << " orders of magnitude."<< endl;
-              cout << "Residual tolerance (RTOL): Reduce " << -Res_FEM_RTOL << " orders of magnitude."<< endl;
-              cout << "Energy tolerance (ETOL): Reduce " << -Res_FEM_ETOL << " orders of magnitude."<< endl;
-          }
-        }
-    }
-
-
+    
   }
 
   if (val_software == SU2_MSH) {
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index ce9ccc65d236..a4884d213988 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -114,12 +114,12 @@ class COutput {
    * Each individual instance represents a single field (i.e. column) in the history file or on screen.   
    */
   struct HistoryOutputField {
-    string              FieldName;    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
-    su2double           Value;        /*!< \brief The value of the field. */
-    unsigned short      ScreenFormat; /*!< \brief The format that is used to print this value to screen. */
-    string              OutputGroup;  /*!< \brief The group this field belongs to. */
-    unsigned short      FieldType;
-    string              Description;
+    string              FieldName = "";    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
+    su2double           Value = 0.0;        /*!< \brief The value of the field. */
+    unsigned short      ScreenFormat = FORMAT_FIXED; /*!< \brief The format that is used to print this value to screen. */
+    string              OutputGroup  ="";  /*!< \brief The group this field belongs to. */
+    unsigned short      FieldType = TYPE_DEFAULT;
+    string              Description = "";
     HistoryOutputField() {}           /*!< \brief Default constructor. */
     HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype, string description):
       FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype), Description(description){}
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 9759a3d4b3b5..ab9ed8864032 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -4932,21 +4932,21 @@ CFSIDriver::CFSIDriver(char* confFile,
   unsigned short nVar_Flow = 0, nVar_Struct = 0;
 
   unsigned short iZone;
-  for (iZone = 0; iZone < nZone; iZone++){
-    switch (config_container[iZone]->GetKind_Solver()) {
-       case RANS: case EULER: case NAVIER_STOKES:
-      case INC_RANS: case INC_EULER: case INC_NAVIER_STOKES:   
-         nVar_Flow = solver_container[iZone][INST_0][MESH_0][FLOW_SOL]->GetnVar();
-         flow_criteria = config_container[iZone]->GetMinLogResidual_BGS_F();
-         flow_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_F();
-         break;
-       case FEM_ELASTICITY:
-         nVar_Struct = solver_container[iZone][INST_0][MESH_0][FEA_SOL]->GetnVar();
-         structure_criteria    = config_container[iZone]->GetMinLogResidual_BGS_S();
-         structure_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_S();
-         break;
-    }
-  }
+//  for (iZone = 0; iZone < nZone; iZone++){
+//    switch (config_container[iZone]->GetKind_Solver()) {
+//       case RANS: case EULER: case NAVIER_STOKES:
+//      case INC_RANS: case INC_EULER: case INC_NAVIER_STOKES:   
+//         nVar_Flow = solver_container[iZone][INST_0][MESH_0][FLOW_SOL]->GetnVar();
+//         flow_criteria = config_container[iZone]->GetMinLogResidual_BGS_F();
+//         flow_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_F();
+//         break;
+//       case FEM_ELASTICITY:
+//         nVar_Struct = solver_container[iZone][INST_0][MESH_0][FEA_SOL]->GetnVar();
+//         structure_criteria    = config_container[iZone]->GetMinLogResidual_BGS_S();
+//         structure_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_S();
+//         break;
+//    }
+//  }
 
   init_res_flow   = new su2double[nVar_Flow];
   init_res_struct = new su2double[nVar_Struct];
@@ -5450,23 +5450,23 @@ CDiscAdjFSIDriver::CDiscAdjFSIDriver(char* confFile,
   direct_iteration = new CIteration*[nZone];
 
   unsigned short iZone;
-  for (iZone = 0; iZone < nZone; iZone++){
-    switch (config_container[iZone]->GetKind_Solver()) {
-      case DISC_ADJ_INC_RANS: case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES:      
-       case DISC_ADJ_RANS: case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES:
-         direct_iteration[iZone] = new CFluidIteration(config_container[iZone]);
-         nVar_Flow = solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL]->GetnVar();
-         flow_criteria = config_container[iZone]->GetMinLogResidual_BGS_F();
-         flow_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_F();
-         break;
-       case DISC_ADJ_FEM:
-         direct_iteration[iZone] = new CFEAIteration(config_container[iZone]);
-         nVar_Struct = solver_container[iZone][INST_0][MESH_0][ADJFEA_SOL]->GetnVar();
-         structure_criteria    = config_container[iZone]->GetMinLogResidual_BGS_S();
-         structure_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_S();
-         break;
-    }
-  }
+//  for (iZone = 0; iZone < nZone; iZone++){
+//    switch (config_container[iZone]->GetKind_Solver()) {
+//      case DISC_ADJ_INC_RANS: case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES:      
+//       case DISC_ADJ_RANS: case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES:
+//         direct_iteration[iZone] = new CFluidIteration(config_container[iZone]);
+//         nVar_Flow = solver_container[iZone][INST_0][MESH_0][ADJFLOW_SOL]->GetnVar();
+//         flow_criteria = config_container[iZone]->GetMinLogResidual_BGS_F();
+//         flow_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_F();
+//         break;
+//       case DISC_ADJ_FEM:
+//         direct_iteration[iZone] = new CFEAIteration(config_container[iZone]);
+//         nVar_Struct = solver_container[iZone][INST_0][MESH_0][ADJFEA_SOL]->GetnVar();
+//         structure_criteria    = config_container[iZone]->GetMinLogResidual_BGS_S();
+//         structure_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_S();
+//         break;
+//    }
+//  }
 
   init_res_flow   = new su2double[nVar_Flow];
   init_res_struct = new su2double[nVar_Struct];
@@ -6619,30 +6619,30 @@ bool CDiscAdjFSIDriver::CheckConvergence(unsigned long IntIter,
 
   su2double residual_1, residual_2;
 
-  if (kind_recording == FLOW_CONS_VARS) {
+//  if (kind_recording == FLOW_CONS_VARS) {
 
-      /*--- Set the convergence criteria (only residual possible as of now) ---*/
+//      /*--- Set the convergence criteria (only residual possible as of now) ---*/
 
-      residual_1 = log10(solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0));
-      residual_2 = log10(solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1));
+//      residual_1 = log10(solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_RMS(0));
+//      residual_2 = log10(solver_container[ZONE_FLOW][INST_0][MESH_0][ADJFLOW_SOL]->GetRes_RMS(1));
 
-      flow_convergence = ((residual_1 < config_container[ZONE_FLOW]->GetMinLogResidual()) &&
-                          (residual_2 < config_container[ZONE_FLOW]->GetMinLogResidual()));
+//      flow_convergence = ((residual_1 < config_container[ZONE_FLOW]->GetMinLogResidual()) &&
+//                          (residual_2 < config_container[ZONE_FLOW]->GetMinLogResidual()));
 
-  }
+//  }
 
-  if (kind_recording == FEA_DISP_VARS) {
+//  if (kind_recording == FEA_DISP_VARS) {
 
-    /*--- Set the convergence criteria (only residual possible as of now) ---*/
+//    /*--- Set the convergence criteria (only residual possible as of now) ---*/
 
-    residual_1 = log10(solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0));
-    residual_2 = log10(solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1));
+//    residual_1 = log10(solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(0));
+//    residual_2 = log10(solver_container[ZONE_STRUCT][INST_0][MESH_0][ADJFEA_SOL]->GetRes_RMS(1));
 
-    // Temporary, until function is added
-    struct_convergence = ((residual_1 < config_container[ZONE_STRUCT]->GetResidual_FEM_UTOL()) &&
-                          (residual_2 < config_container[ZONE_STRUCT]->GetResidual_FEM_UTOL()));
+//    // Temporary, until function is added
+//    struct_convergence = ((residual_1 < config_container[ZONE_STRUCT]->GetResidual_FEM_UTOL()) &&
+//                          (residual_2 < config_container[ZONE_STRUCT]->GetResidual_FEM_UTOL()));
 
-  }
+//  }
 
   switch (kind_recording){
   case FLOW_CONS_VARS:      adjoint_convergence = flow_convergence; break;
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 8d4c909f993e..1690b9db0d7f 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -69,6 +69,10 @@ CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver*
   
   SurfaceFilename = "surface_baseline";
   
+  /*--- Conv field --- */
+  
+  Conv_Field = "NONE";
+  
 }
 
 CBaselineOutput::~CBaselineOutput(void) {
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index c672aaae5c47..44a3508c378b 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -706,7 +706,7 @@ int main(int argc, char *argv[]) {
 
     }
 
-    else if (config_container[ZONE_0]->GetWrt_Dynamic()){
+    else if (config_container[ZONE_0]->GetTime_Domain()){
 
       /*--- Dynamic simulation: merge all unsteady time steps. First,
        find the frequency and total number of files to write. ---*/
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 371b6eb97cfd..680b0300a928 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -266,8 +266,6 @@ TIME_ITER= 360
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -281,8 +279,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 271acb3a05e9..2228db019f56 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -252,8 +252,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -269,7 +267,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 73c32c59536b..8f9e7351355c 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -246,8 +246,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -263,7 +261,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index cc172f222623..7198f82e7906 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -202,8 +202,6 @@ DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -219,7 +217,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index facd14755945..d5598af834d9 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -209,8 +209,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -226,7 +224,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 %                        SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 31cc5fa26e70..37dcc5747496 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -208,8 +208,6 @@ MARKER_ANALYZE  = (outlet)
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 368b7528e8a3..146c7b26a822 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -221,8 +221,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index d9feaaeb5e0a..020fafe7c22d 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -219,8 +219,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -236,7 +234,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 61d9198115c1..51bc5c9c458e 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -204,8 +204,6 @@ DV_VALUE= 0.01
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 9
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -221,7 +219,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index 032aba9ed261..bf5d646501ff 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -215,8 +215,6 @@ DV_VALUE= 0.01
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 13
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -232,7 +230,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 5ed247b1dd54..d3f99da534f3 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -258,8 +258,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -275,7 +273,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- GRID ADAPTATION STRATEGY --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 639380d036cc..9098d36081e7 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -258,8 +258,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -275,7 +273,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- GRID ADAPTATION STRATEGY --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index 9fe65a802602..fb9195e3436f 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -272,8 +272,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -289,8 +287,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index 84f111c97378..e95691c72b69 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -190,8 +190,6 @@ FROZEN_VISC_CONT= YES
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -207,7 +205,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 2df69e1b587e..5f1229c4e05a 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -192,8 +192,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -6
@@ -209,7 +207,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 5a262d53e018..675807c0f68b 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -192,8 +192,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -6
@@ -209,7 +207,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/coupled_cht/incompressible/configFlow.cfg b/TestCases/coupled_cht/incompressible/configFlow.cfg
index cc1b879dd0ea..ff756a265bd3 100644
--- a/TestCases/coupled_cht/incompressible/configFlow.cfg
+++ b/TestCases/coupled_cht/incompressible/configFlow.cfg
@@ -107,12 +107,10 @@ RELAXATION_FACTOR_TURB= 1.0
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 16
 CONV_RESIDUAL_MINVAL= -32
 CONV_STARTITER= 200
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-10
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
diff --git a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
index 9afe4f90ec23..edb31330fca0 100644
--- a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
+++ b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
@@ -154,7 +154,6 @@ EXT_ITER= 11
 
 CONV_CRITERIA= RESIDUAL
 
-RESIDUAL_REDUCTION= 16
 
 CONV_RESIDUAL_MINVAL= -32
 
@@ -164,7 +163,6 @@ CONV_CAUCHY_ELEMS= 100
 
 CONV_CAUCHY_EPS= 1E-10
 
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index cbcc3ce86c91..9e4288315c48 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -173,8 +173,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -190,7 +188,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index cc9868274aae..a57b150584ad 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index e5d275cafb5e..39285fd27a8b 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 7ddabfd461d9..b73beda33d66 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index e1fc3b2f5f6f..45641e68f6d9 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 7b02b76dcf03..e036ddf26d43 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 582f66efbcce..22b938b039d9 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -201,8 +201,6 @@ FFD_CONTINUITY= 1ST_DERIVATIVE
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -218,7 +216,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index b194af9c556c..003d699f815d 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -248,8 +248,6 @@ ITER= 5
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 732fc3ca5405..762b162ea4d5 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -245,8 +245,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -262,7 +260,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 49c8655ba3bb..fa29a4776c2d 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -255,8 +255,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -272,7 +270,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 051963356dd9..132328d9b5bb 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -222,8 +222,6 @@ LIMIT_ADJFLOW= 1E6
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -239,7 +237,6 @@ CONV_CAUCHY_EPS= 1E0
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 5053427eb5f2..7046df98ba2d 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -197,8 +197,6 @@ FROZEN_VISC_CONT= YES
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -214,7 +212,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index a0afa72ed8db..9205eeadbb2f 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -251,8 +251,6 @@ ITER= 5
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index 739b3f5252f9..785c6d55def4 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -258,8 +258,6 @@ ITER= 5
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index 296d6d27e0a5..dc8cc3eded59 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -474,8 +474,6 @@ ITER= 12000
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9.00
@@ -489,11 +487,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index 2d88a9ef53fa..6672906a9925 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -255,8 +255,6 @@ ITER= 100
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -270,11 +268,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index b6c258364730..0e110c5979c9 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -183,8 +183,6 @@ GEO_MODE= FUNCTION
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -198,11 +196,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index b0b755404726..1af2958881ad 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -44,9 +44,6 @@ FORMULATION_ELASTICITY_2D = PLANE_STRAIN
 
 NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
 NONLINEAR_FEM_INT_ITER = 10
-RESIDUAL_FEM_UTOL = -9.0
-RESIDUAL_FEM_RTOL = -9.0
-RESIDUAL_FEM_ETOL = -9.0
 
 RESIDUAL_CRITERIA_FEM = ABSOLUTE
 
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
index 941b41e0882c..8e6414a969a7 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
@@ -111,19 +111,14 @@ TIME_ITER= 1
 FSI_ITER= 9
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
-RESIDUAL_REDUCTION_FSI= 4
 CONV_RESIDUAL_MINVAL_FSI= -4
 % fluid
 UNST_INT_ITER= 51
 CONV_CRITERIA= RESIDUAL
 CONV_STARTITER= 0
-RESIDUAL_REDUCTION= 9
 CONV_RESIDUAL_MINVAL= -9
 % solid
 NONLINEAR_FEM_INT_ITER= 11
-RESIDUAL_FEM_UTOL= -9.0
-RESIDUAL_FEM_RTOL= -9.0
-RESIDUAL_FEM_ETOL= -9.0
 % grid deformation
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
diff --git a/TestCases/disc_adj_fsi/configAD_fsi.cfg b/TestCases/disc_adj_fsi/configAD_fsi.cfg
index b4a9e8691f7f..b483dbdf6fe7 100644
--- a/TestCases/disc_adj_fsi/configAD_fsi.cfg
+++ b/TestCases/disc_adj_fsi/configAD_fsi.cfg
@@ -62,9 +62,6 @@ FORMULATION_ELASTICITY_2D = PLANE_STRESS
 
 NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
 NONLINEAR_FEM_INT_ITER = 5
-RESIDUAL_FEM_UTOL = -9.0
-RESIDUAL_FEM_RTOL = -9.0
-RESIDUAL_FEM_ETOL = -9.0
 
 MARKER_CLAMPED = ( Clamped_Right, Clamped_Left )
 MARKER_PRESSURE= ( LowerWallS, 0, UpperWallS, 0)
@@ -154,7 +151,6 @@ JST_SENSOR_COEFF=( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 5
 CONV_RESIDUAL_MINVAL= -10
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index ab0c918d3747..dc3a2cff8c56 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -145,7 +145,6 @@ TIME_DISCRE_HEAT= EULER_IMPLICIT
 
 CONV_CRITERIA= RESIDUAL
 
-RESIDUAL_REDUCTION= 16
 
 CONV_RESIDUAL_MINVAL= -32
 
@@ -155,7 +154,6 @@ CONV_CAUCHY_ELEMS= 100
 
 CONV_CAUCHY_EPS= 1E-10
 
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 5405f877f0a6..8708ecccedea 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -169,8 +169,6 @@ DV_VALUE= 0.01
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -186,7 +184,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index eeb6e64a2e62..a5664f58d21d 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -243,8 +243,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -260,7 +258,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 9d4fc21a88c0..6d7a6b8bbf3b 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -224,8 +224,6 @@ DV_VALUE= 0.01
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -241,7 +239,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index a48d2a174da2..10e96c1ba3e5 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -224,8 +224,6 @@ DV_VALUE= 0.01
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -241,7 +239,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index f836ff4ef615..db8c516754b3 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -202,8 +202,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -219,7 +217,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 3c87c83ec186..a024bfbbbf42 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -210,8 +210,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -227,7 +225,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 08e9db0bf97f..1bccc13629fe 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -190,8 +190,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -207,7 +205,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 27cb60395e50..7e15795ab1ba 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -189,8 +189,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -206,7 +204,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 4591c70adebe..3e6fd1f69c70 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -365,10 +365,7 @@ ITER= 2001
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -384,7 +381,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index 450e1aac1e17..bc628af17071 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -184,8 +184,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -6
@@ -201,7 +199,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 8a019cfa3526..10d2bd107509 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -219,8 +219,6 @@ HOLD_GRID_FIXED_COORD= ( -0.2, -0.4, 0.0, 2.2, 0.4, 0.0 )
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -6
@@ -236,7 +234,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 1a3fc28e8207..ea68f1d4ef0f 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -144,8 +144,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -161,7 +159,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index cadb715e998a..180bd8c8364a 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -163,8 +163,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -180,7 +178,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index a2c37db99360..e99a0bb59a24 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -159,8 +159,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -176,7 +174,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index 2b221922f44a..dbf3ebbb1e45 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -237,8 +237,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -254,7 +252,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index d1442d16e1c0..dfe0d613fb7e 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -149,8 +149,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -166,8 +164,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 22f93b8149f5..95bd22e11367 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -211,8 +211,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -228,7 +226,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 71581ac8cc05..043af4591ffe 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -158,8 +158,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -175,7 +173,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 8b0b881b2213..3180a79e6509 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -61,13 +61,9 @@ FSI_ITER= 1
 %RAMP_FSI_ITER= 5
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
-RESIDUAL_REDUCTION_FSI= 8
 RESIDUAL_MINVAL_FSI= -8
 % solid
 NONLINEAR_FEM_INT_ITER= 30
-RESIDUAL_FEM_UTOL= -6.0
-RESIDUAL_FEM_RTOL= -6.0
-RESIDUAL_FEM_ETOL= -6.0
 %
 % In\Out --------------------------------------------------------------- %
 MESH_FILENAME= meshFEA.su2
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index dc418f4f85ab..9d52d3777cd7 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -96,12 +96,10 @@ FSI_ITER= 1
 %RAMP_FSI_ITER= 5
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
-RESIDUAL_REDUCTION_FSI= 8
 % fluid
 UNST_INT_ITER= 60
 CONV_CRITERIA= RESIDUAL
 CONV_STARTITER= 0
-RESIDUAL_REDUCTION= 9
 CONV_RESIDUAL_MINVAL= -9
 % grid deformation
 DEFORM_NONLINEAR_ITER= 1
diff --git a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
index 7ce65768c4c1..ab7841c580f9 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
@@ -138,19 +138,14 @@ FSI_ITER= 1
 %RAMP_FSI_ITER= 5
 BGS_RELAXATION= FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.7
-RESIDUAL_REDUCTION_FSI= 8
 CONV_RESIDUAL_MINVAL_FSI= -8
 % fluid
 UNST_INT_ITER= 60
 CONV_CRITERIA= RESIDUAL
 CONV_STARTITER= 0
-RESIDUAL_REDUCTION= 9
 CONV_RESIDUAL_MINVAL= -9
 % solid
 NONLINEAR_FEM_INT_ITER= 30
-RESIDUAL_FEM_UTOL= -6.0
-RESIDUAL_FEM_RTOL= -6.0
-RESIDUAL_FEM_ETOL= -6.0
 % grid deformation
 DEFORM_NONLINEAR_ITER= 1
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index 26b1b0abab42..2a84ad761503 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -18,9 +18,6 @@ WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 DYN_RESTART_ITER= 1
 NONLINEAR_FEM_INT_ITER = 10
-RESIDUAL_FEM_UTOL = -5.0
-RESIDUAL_FEM_RTOL = -5.0
-RESIDUAL_FEM_ETOL = -5.0
 ELASTICITY_MODULUS=3E7
 POISSON_RATIO=0.3
 MATERIAL_DENSITY=7854
diff --git a/TestCases/fea_fsi/MixElemsKnowles/config.cfg b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
index 7538f283245d..753502fc6286 100644
--- a/TestCases/fea_fsi/MixElemsKnowles/config.cfg
+++ b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
@@ -44,9 +44,6 @@ LINEAR_SOLVER_ERROR= 1e-10
 % Convergence criteria
 NONLINEAR_FEM_INT_ITER= 1
 RESIDUAL_CRITERIA_FEM= ABSOLUTE
-RESIDUAL_FEM_UTOL= -6
-RESIDUAL_FEM_RTOL= -6
-RESIDUAL_FEM_ETOL= -6
 %
 % In/Out
 MESH_FILENAME= mesh.su2
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index a1b5a6d44116..095a6b5d7931 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -33,9 +33,6 @@ RESTART_SOL= YES
 % Unsteady restart iteration (need previous restart files)
 RESTART_ITER= 2
 %
-% Unsteady restart iteration (need previous restart files)
-DYN_RESTART_ITER= 2
-%
 % Restart the solution from a steady state solution (sets Grid Vel to 0)
 RESTART_STEADY_STATE = NO
 
@@ -54,13 +51,10 @@ MESH_FILENAME= mesh.su2
 % ------------------------------- TIME STEP -----------------------------------%
 %
 % Time Step for dual time stepping fluid simulations (s)
-UNST_TIMESTEP= 0.01
-%
-% Structural time step (s)
-DYN_TIMESTEP= 0.01
+TIME_STEP= 0.01
 %
 % Number of total iterations
-EXT_ITER= 35
+TIME_ITER= 35
 
 % --------------------------- FSI CONVERGENCE ---------------------------------%
 %
@@ -73,8 +67,6 @@ BGS_RELAXATION = FIXED_PARAMETER
 % Relaxation parameter
 STAT_RELAX_PARAMETER= 0.7
 %
-% Residual reduction in the boundary displacements (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION_FSI= 5
 %
 % Min value of the residual in the boundary displacement (log10 of the residual)
 CONV_RESIDUAL_MINVAL_FSI= -5.92
@@ -116,9 +108,6 @@ FORMULATION_ELASTICITY_2D = PLANE_STRESS
 NONLINEAR_FEM_INT_ITER = 20
 %
 % Convergence tolerances
-RESIDUAL_FEM_UTOL = -7.0
-RESIDUAL_FEM_RTOL = -5.0
-RESIDUAL_FEM_ETOL = -7.0
 
 % -------------------------- DYNAMIC SIMULATION -------------------------------%
 %
@@ -354,8 +343,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -371,5 +358,4 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index 3fcc3d1eb1e9..765d29324526 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -36,9 +36,6 @@ RELAXATION = YES
 
 GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
-RESIDUAL_FEM_UTOL = -7.0
-RESIDUAL_FEM_RTOL = -7.0
-RESIDUAL_FEM_ETOL = -7.0
 
 MARKER_CLAMPED = ( clamped )
 MARKER_PRESSURE= ( wallDownS, 0.0, wallUpperS, 0.0, wallUpwS, 0.0)
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index 4a55436ca4ba..ffde91afec89 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -20,20 +20,15 @@ RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 RESTART_ITER= 2
-DYN_RESTART_ITER= 2
-EXT_ITER= 3
-UNST_TIMESTEP= 0.005
-DYN_TIMESTEP= 0.005
 FSI_ITER= 5
 MARKER_ZONE_INTERFACE = (wallUpwF, wallUpwS, wallUpperF, wallUpperS, wallDownF, wallDownS)
 CONSERVATIVE_INTERPOLATION = YES
 BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
-RESIDUAL_REDUCTION_FSI= 5
 CONV_RESIDUAL_MINVAL_FSI= -8
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIME= 4.01
-UNST_INT_ITER= 50
+MAX_TIME= 4.01
+INNER_ITER= 50
 KIND_TURB_MODEL= NONE
 AOA= 0.0
 SIDESLIP_ANGLE= 0.0
@@ -71,12 +66,10 @@ VENKAT_LIMITER_COEFF= 1.0
 JST_SENSOR_COEFF= ( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 3
 CONV_RESIDUAL_MINVAL= -10
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-5
-CAUCHY_FUNC_FLOW= DRAG
 ELASTICITY_MODULUS=5E4
 MATERIAL_DENSITY=50
 FORMULATION_ELASTICITY_2D = PLANE_STRESS
@@ -89,9 +82,6 @@ NEWMARK_GAMMA=0.7
 GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
 NONLINEAR_FEM_INT_ITER = 10
-RESIDUAL_FEM_UTOL = -7.0
-RESIDUAL_FEM_RTOL = -7.0
-RESIDUAL_FEM_ETOL = -7.0
 FSI_LINEAR_SOLVER_PREC_STRUC= LU_SGS
 FSI_LINEAR_SOLVER_ITER_STRUC = 1000
 MARKER_CLAMPED = ( clamped )
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index bfdcfba4b502..a75e0f90647d 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -9,7 +9,6 @@ SOLVER= NAVIER_STOKES
 
 SURFACE_MOVEMENT = FLUID_STRUCTURE
 MARKER_MOVING=(wallUpwF, wallDownF, wallUpperF)
-UNST_INT_ITER= 50
 INNER_ITER=50
 
 %SCREEN_OUTPUT=(TIME_ITER, OUTER_ITER, INNER_ITER, BGS_DENSITY, BGS_ENERGY)
@@ -59,12 +58,10 @@ VENKAT_LIMITER_COEFF= 1.0
 JST_SENSOR_COEFF= ( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 3
 CONV_RESIDUAL_MINVAL= -10
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-5
-CAUCHY_FUNC_FLOW= DRAG
 
 MULTIZONE_MESH= NO
 MESH_FILENAME= meshFlow.su2
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 65152b50e470..80c20fc00849 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -250,8 +250,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -267,7 +265,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 84716aa78451..58cce2a80642 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -255,8 +255,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 14
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -272,7 +270,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index 9a8865670144..9a16e73e3e1f 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -222,8 +222,6 @@ TIME_ITER= 401
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -237,8 +235,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 6aedad877211..faa1f0526aa2 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -257,8 +257,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -274,7 +272,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 85592b7322d5..9edd4d406c4b 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -200,8 +200,6 @@ CFL_REDUCTION_TURB= 0.4
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -217,7 +215,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 2ed4bdedbe9a..309d961bdbfc 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -61,16 +61,18 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 %TIME_MARCHING= NO
 TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 2.0e-3
+TIME_STEP= 2.0e-3
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0
@@ -122,8 +124,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -139,7 +139,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 4c1e8d5e76a3..84b08929d4a0 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -60,16 +60,18 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 %TIME_MARCHING= NO
 TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 2.0e-3
+TIME_STEP= 2.0e-3
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0
@@ -121,8 +123,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -138,7 +138,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index e39183c9d682..18eb4519b303 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -60,16 +60,18 @@ REF_DIMENSIONALIZATION= DIMENSIONAL
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
 %TIME_MARCHING= NO
 TIME_MARCHING= TIME_STEPPING
 %
 % Time Step for time accurate simulations (s) -- Only used when UNST_CFL_NUMBER = 0.0
-UNST_TIMESTEP= 1.0e-3
+TIME_STEP= 1.0e-3
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
+MAX_TIME= 50.0
 %
 % Unsteady Courant-Friedrichs-Lewy number of the finest grid
 UNST_CFL_NUMBER= 0.0
@@ -121,8 +123,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -138,7 +138,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index 5acf7b71add3..df0e26393dc3 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -119,8 +119,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -136,7 +134,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index 4b4ada6674af..e2313e3c3e58 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -125,8 +125,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -142,7 +140,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 1f47a9f4352c..52a7140eeed9 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -130,8 +130,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -147,7 +145,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index 66ed8d84a5c5..f6000a7f9b2b 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index b1a7d206c7e5..a6ae0c244dc9 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index f99d6dab5c15..c4dcd0fc6709 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index 243b733210a3..1c964358f03f 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index 66093c18f0a8..9aefbf518d09 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index 32111e17fa4d..c256cdb364d3 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 5fffbfc712e2..f44894ee4255 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 33cb12161448..43df3b476e76 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 5509332ddded..968fc77469c1 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 92c8c44219e8..719b1f7d4f2f 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 5aac4fa69d2a..4312a7b34afb 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index e6efcb1700a6..36802d69dbf4 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -116,8 +116,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -133,7 +131,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index 8388e9499593..da2fd88eabc7 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -119,8 +119,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -136,7 +134,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index 951da8f8eadf..17aca1f99a78 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -121,8 +121,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -138,7 +136,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index 9b2fec777408..eafcac0fae7f 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -129,8 +129,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -146,7 +144,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index dc6acb203051..e664b7443555 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -122,8 +122,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -139,7 +137,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index c5e93527990d..0e3bfeecd9ec 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -129,8 +129,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -146,7 +144,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index e79ba7d5934d..ebae81e2c69d 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -122,8 +122,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -139,7 +137,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 24cd592e8204..7eb9500d0d95 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -129,8 +129,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -146,7 +144,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index b197184633d7..fa151ae4443d 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -122,8 +122,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -139,7 +137,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index 18783b548ed0..0644906a5d7c 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -123,8 +123,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -140,7 +138,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 2c1f19e9185b..1c44ca77a70f 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -131,8 +131,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -148,7 +146,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 0db6b3716305..7772bb2a2d2e 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -123,8 +123,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -140,7 +138,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index 7f55c79f7dd0..258a4c14dc36 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -147,8 +147,6 @@ LEVELS_TIME_ACCURATE_LTS= 4
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -164,7 +162,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 4978ea8071e3..93d903bb7c9c 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -139,8 +139,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -156,7 +154,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 56dbffe90d3e..d393d3b0a280 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -152,8 +152,6 @@ LEVELS_TIME_ACCURATE_LTS= 8
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -169,7 +167,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index b8262a2f7876..eecb2edc5a81 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -60,24 +60,6 @@ REF_LENGTH= 1.0
 % Reference area for force coefficients (0 implies automatic calculation)
 REF_AREA= 1.0
 
-% ------------------------- UNSTEADY SIMULATION -------------------------------%
-%
-% Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
-%                      DUAL_TIME_STEPPING-2ND_ORDER)
-TIME_MARCHING= NO
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 1E-2
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Unsteady Courant-Friedrichs-Lewy number of the finest grid
-UNST_CFL_NUMBER= 0.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 50
-
 % ----------------------- BOUNDARY CONDITION DEFINITION -----------------------%
 %
 % Euler wall boundary marker(s) (NONE = no marker)
@@ -169,8 +151,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 7
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -186,7 +166,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index b9c4976029ca..dadef3edaf87 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -174,8 +174,6 @@ CONV_NUM_METHOD_FLOW= FDS
 % Number of total iterations
 ITER= 9999
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 8fa72d88ae1a..1fdf061bab9c 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -203,8 +203,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -220,7 +218,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 6decf4131cc7..6015cdadbdc8 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -56,25 +56,6 @@ REF_LENGTH= 1.0
 %
 % Reference area for force coefficients (0 implies automatic calculation)
 REF_AREA= 1.0
-
-% ------------------------- UNSTEADY SIMULATION -------------------------------%
-%
-% Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
-%                      DUAL_TIME_STEPPING-2ND_ORDER)
-TIME_MARCHING= NO
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
-%
-% Unsteady Courant-Friedrichs-Lewy number of the finest grid
-UNST_CFL_NUMBER= 0.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
 % Navier-Stokes wall boundary marker(s) (NONE = no marker)
@@ -165,8 +146,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -182,7 +161,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 758e5696af95..f895c7749050 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -230,8 +230,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -247,7 +245,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index da3125663a85..428449d02ea0 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -60,27 +60,6 @@ REF_LENGTH= 1.044
 % Reference area for force coefficients (0 implies automatic calculation)
 REF_AREA= 0.677
 
-% ------------------------- UNSTEADY SIMULATION -------------------------------%
-%
-% Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
-%                      DUAL_TIME_STEPPING-2ND_ORDER)
-TIME_MARCHING= NO
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 50.0
-%
-% Unsteady Courant-Friedrichs-Lewy number of the finest grid
-UNST_CFL_NUMBER= 0.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-%
-% Iteration number to begin unsteady restarts
-RESTART_ITER= 0
-
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
 % Navier-Stokes (no-slip), constant heat flux wall  marker(s) (NONE = no marker)
@@ -300,8 +279,6 @@ FFD_ITERATIONS= 500
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -315,11 +292,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 87dc4c1dde17..75c17be01e40 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -187,8 +187,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -204,7 +202,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index aa186f9d1a72..4b7558a7f5f2 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -117,8 +117,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -134,7 +132,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index 71003963358c..16ab91aff1d2 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -135,8 +135,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -152,7 +150,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index 0d754dc280a1..eca905a2462b 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -134,8 +134,6 @@ USE_LUMPED_MASSMATRIX_DGFEM= YES
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -151,7 +149,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index 6ed8e9e1c041..493af99203d2 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -161,8 +161,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -178,7 +176,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index 1014109773d8..4e5dd3e5f717 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -183,8 +183,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -200,7 +198,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index 22caf7dcaf55..356482891828 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -200,8 +200,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 15
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -14
@@ -217,7 +215,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index 6166fd6c73dd..44d52080a56d 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -170,8 +170,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -187,7 +185,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 0f16f584261e..20e6459c2b65 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -47,22 +47,6 @@ REYNOLDS_NUMBER= 200.0
 %
 % Reynolds length (in meters)
 REYNOLDS_LENGTH= 1.0
-
-% ------------------------- UNSTEADY SIMULATION -------------------------------%
-%
-% Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
-%                      DUAL_TIME_STEPPING-2ND_ORDER, HARMONIC_BALANCE)
-TIME_MARCHING= NO
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.01
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 1.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
 % Type of dynamic mesh (NONE, RIGID_MOTION, DEFORMING, ROTATING_FRAME,
@@ -203,8 +187,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -220,7 +202,6 @@ CONV_CAUCHY_EPS= 1E-7
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 8d3550c20d63..2062d67a928f 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -260,8 +260,6 @@ FFD_FIX_K= (15)
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -275,11 +273,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 6161a7b00f15..f0e43af79ebe 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -162,8 +162,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -179,7 +177,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index 4f4b52c983db..c20197834708 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -157,8 +157,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -174,7 +172,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index 3386f4f376a1..cb3944bf8aca 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -174,8 +174,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -191,7 +189,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index 191971c13d75..7311a1afbaa1 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -149,8 +149,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -166,7 +164,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 8556dcfddb89..cbd701a79b88 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -200,8 +200,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -217,7 +215,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION ----------------------.su2
 %
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index fbb2b1dd9347..0eda9279a8a9 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -232,8 +232,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -249,7 +247,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION ----------------------.su2
 %
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 34ee0191c640..1d265e34b0cb 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -258,8 +258,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -275,7 +273,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 7ce39af1c7e1..9887b22b4e9f 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -257,8 +257,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -274,7 +272,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 034958458125..8c8369b19754 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -178,8 +178,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -195,7 +193,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index f2097476c2ea..9adfc021579e 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -178,8 +178,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 12
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -195,7 +193,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 1d8d9a5a12db..b5233e12a308 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -218,8 +218,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 0386e68ba931..62398a411deb 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -219,8 +219,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 3377ee7b7af6..1528f3c99a30 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -219,8 +219,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 334f9da65b4a..228af4e75968 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -221,8 +221,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 0385a8a4fa75..78e02e95bea6 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -216,8 +216,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -231,11 +229,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index edfd5019cf73..09aa3649b90b 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -32,16 +32,16 @@ RESTART_SOL= NO
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.59
+MAX_TIME= 0.59
 % 10 periods: 0.5888756403287397
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 110
+INNER_ITER= 110
 %
 % Starting direct iteration for unsteady adjoint
 UNST_ADJOINT_ITER= 251
@@ -273,8 +273,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -290,8 +288,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index ebc41eb433eb..c172f1f9fd99 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -46,15 +46,15 @@ FREESTREAM_TEMPERATURE= 288.15
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.002161633860454094
+TIME_STEP= 0.002161633860454094
 % 25 steps per period: 0.002161633860454094
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.541
+MAX_TIME= 0.541
 % 10 periods: 0.5404084651135235
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 250
+INNER_ITER= 250
 %
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 251
@@ -252,8 +252,6 @@ GEO_MODE= FUNCTION
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -269,8 +267,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index b8756316461d..32cf9a4add64 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -243,8 +243,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 8
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -260,8 +258,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_MACH
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 4576159b8628..2cc6da46e292 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -233,8 +233,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -250,7 +248,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index b3aa2fbc4936..8805b191a44e 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -243,8 +243,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -258,11 +256,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 2e50c745334b..485203b4ed00 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -225,8 +225,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13
@@ -240,11 +238,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index 55166fc3db76..6be78def0d66 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -209,8 +209,6 @@ GEO_MODE= FUNCTION
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -224,11 +222,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 4db861e82722..127631c0638f 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -209,8 +209,6 @@ GEO_MODE= FUNCTION
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -224,11 +222,7 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index 1498ea58a014..d9082787f043 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -32,17 +32,17 @@ RESTART_SOL= NO
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 % 36 steps per period: 0.0016357592286692995
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.59
+MAX_TIME= 0.59
 % 10 periods: 0.5888756403287397
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 2000
+INNER_ITER= 2000
 %
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 251
@@ -289,8 +289,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -306,8 +304,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index a6952e4a26fb..ef4a03fb0b9d 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -52,16 +52,16 @@ REYNOLDS_LENGTH= 0.64607
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.002161633860454094
+TIME_STEP= 0.002161633860454094
 % 25 steps per period: 0.002161633860454094
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.379
+MAX_TIME= 0.379
 % 10 periods: 0.5404084651135235
 % 7 periods: 0.37828592557946644
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 350
+INNER_ITER= 350
 %
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 176
@@ -312,8 +312,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -329,8 +327,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index 881412ec4377..5b5b0c65e7bc 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -259,8 +259,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -276,8 +274,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 10af90905f6d..c8e908ef9b8e 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -204,8 +204,6 @@ GEO_MODE= FUNCTION
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -221,8 +219,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 03f2d69f0089..0ba4a7a1e814 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -251,8 +251,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -268,7 +266,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 6750c9b5e871..e5936b361d5f 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -457,8 +457,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -472,11 +470,7 @@ CONV_CAUCHY_ELEMS= 10
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= LIFT
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index e4a3d1839d7e..a2f05619689e 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -438,8 +438,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -453,11 +451,7 @@ CONV_CAUCHY_ELEMS= 10
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= LIFT
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index 6c634078c078..5bad11aa5c90 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -183,8 +183,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -200,7 +198,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index 09a2f3f9875d..677fe827de0c 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -180,8 +180,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -15
@@ -197,7 +195,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index aeed3333bc7f..3cb11de2c453 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -192,8 +192,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -209,7 +207,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index 137ecfc14e5b..7c0de08976f8 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index e4fed577ade5..0f815c99ac4b 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -183,8 +183,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -200,7 +198,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index bf5761544825..78850bc7eec7 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -191,8 +191,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -208,7 +206,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index cc61a6c4ce14..a792cde0bfff 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -140,34 +140,6 @@ MU_T_REF= 273.15
 %
 % Sutherland constant (110.4 default value for AIR SI)
 SUTHERLAND_CONSTANT= 110.4
-
-% ------------------------- UNSTEADY SIMULATION -------------------------------%
-%
-% Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
-%                      DUAL_TIME_STEPPING-2ND_ORDER, TIME_SPECTRAL)
-%TIME_MARCHING=  DUAL_TIME_STEPPING-2ND_ORDER
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0001
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 5.0
-% 2500 iterations - 1.25
-% 3500 iterations - 1.75
-% 5000 iterations - 2.5
-%
-% Unsteady Courant-Friedrichs-Lewy number of the finest grid
-UNST_CFL_NUMBER= 0.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 100
-%
-% Integer number of periodic time instances for Time Spectral
-TIME_INSTANCES= 1
-%
-% Iteration number to begin unsteady restarts
-RESTART_ITER=2
-
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
 % Navier-Stokes (no-slip), constant heat flux wall  marker(s) (NONE = no marker)
@@ -356,8 +328,6 @@ ITER= 100
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 7
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -371,11 +341,7 @@ CONV_CAUCHY_ELEMS= 500
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index a513a2f8ce7f..f1e6e3714a29 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -220,8 +220,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -237,8 +235,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 502d4cf11973..1fec6b66c210 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -211,8 +211,6 @@ ITER= 15
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index fc1292e0dcef..13165230e29a 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -198,8 +198,6 @@ FROZEN_VISC_CONT= YES
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 917f4b622028..c970c0164b7c 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -175,8 +175,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -192,7 +190,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index 44c3ac893566..a3eccc2ad58d 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -166,8 +166,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -183,7 +181,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index bee67d77ba8d..df831df909a8 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -180,8 +180,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -197,7 +195,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index ff472f2f6034..fe7bc22b5118 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -187,8 +187,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -204,7 +202,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index 0ccc2f9da665..7bc805e7e2e4 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -179,8 +179,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -196,7 +194,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index efc49cd3b0b7..cf39b0892a8c 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 8d3390e20098..150e9d8a5bd5 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 6d486fa1a1c1..d5abf06ade93 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index c59805c18dd4..897de1223581 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index cdad92011b0c..ad7f591ec4d1 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -198,8 +198,6 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 556538abfe86..31200806d414 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -168,8 +168,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -185,7 +183,6 @@ CONV_CAUCHY_EPS= 1E-10
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 0b5af6214561..605263633f23 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -264,8 +264,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -281,7 +279,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 6e2d68ac21c4..f99b247f328e 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -260,10 +260,7 @@ CFL_REDUCTION_TURB= 0.10
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -279,7 +276,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 % Epsilon for full multigrid method evaluation
 %FULLMG_CONV_CAUCHY_EPS= 1E-4
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 11d44abb92a0..893fb7ee810a 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -185,10 +185,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -202,8 +199,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 120d3721bf5e..55d8bcc3ece4 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -183,10 +183,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -200,8 +197,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 83a5bf4878df..6f90610183b1 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -49,16 +49,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 20
-%
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -195,10 +185,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -212,8 +199,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 73776750f778..e877a9a9cda0 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -183,10 +183,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -200,8 +197,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 15fe37184eb1..9eefa3a63913 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -99,12 +99,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 12
 CONV_RESIDUAL_MINVAL= -16
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-6
-CAUCHY_FUNC_FLOW= DRAG
 
 % --------------------------- TURBULENCE PARAMETERS --------------------------%
 FREESTREAM_TURBULENCEINTENSITY = 0.001
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index aa4af820656a..07703b2d4e56 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -109,12 +109,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 12
 CONV_RESIDUAL_MINVAL= -16
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-6
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 6c8c873d6614..7de5b0bf46ba 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -26,11 +26,10 @@ MULTIZONE_MESH = NO
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIMESTEP= 1.0
-UNST_INT_ITER= 20
+TIME_STEP= 1.0
+INNER_ITER= 20
 RESTART_ITER = 2
-INNER_ITER = 1
-UNST_TIME= 100
+MAX_TIME= 100
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 
@@ -108,12 +107,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 12
 CONV_RESIDUAL_MINVAL= -16
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-6
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 69aa7bee61a7..414affbc7cbe 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -26,11 +26,10 @@ MULTIZONE_MESH = NO
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIMESTEP= 1.0
-UNST_INT_ITER= 20
+TIME_STEP= 1.0
+INNER_ITER= 20
 RESTART_ITER = 2
-INNER_ITER = 1
-UNST_TIME= 100
+MAX_TIME= 100
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 
@@ -118,12 +117,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 12
 CONV_RESIDUAL_MINVAL= -16
 CONV_STARTITER= 10
 CONV_CAUCHY_ELEMS= 100
 CONV_CAUCHY_EPS= 1E-6
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 82bbf3e819e6..9227f34e85d3 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -45,15 +45,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
-
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -198,10 +189,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -215,8 +203,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 4bc8551cd472..c5dbeb9bf9b9 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -42,15 +42,6 @@ RESTART_SOL= NO
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
-%
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -197,10 +188,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -214,8 +202,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index c4e122a71b0d..a343c93c4fd7 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -188,10 +188,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -205,8 +202,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 2209549bcda1..7b3ff744574b 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -190,10 +190,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -207,8 +204,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 8f45218dd33f..d7a4e705497b 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -34,18 +34,20 @@ RESTART_SOL= NO
 %
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
+%
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
+TIME_STEP= 0.1
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
+MAX_TIME= 10.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
+INNER_ITER= 200
 
 RESTART_ITER = 2
 %
@@ -229,10 +231,7 @@ RELAXATION_FACTOR_TURB= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -246,8 +245,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 4baebeeebfe7..d711614dfa62 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -36,18 +36,19 @@ RESTART_SOL= NO
 %
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
+TIME_DOMAIN=YES
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.1
+TIME_STEP= 0.1
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 10.0
+MAX_TIME= 10.0
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 200
+INNER_ITER= 200
 
 RESTART_ITER = 2
 %
@@ -229,10 +230,7 @@ RELAXATION_FACTOR_TURB= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -246,8 +244,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index bb3c32c9899d..b81c0a85693a 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -191,10 +191,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -208,8 +205,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 96fb8c85d10b..3e83eaa4afe4 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -191,10 +191,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -208,8 +205,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index fe310ac09c3b..86f486fca86c 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -188,10 +188,7 @@ RELAXATION_FACTOR_FLOW= 1.0
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -205,8 +202,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 166da7920a57..e13c3e17225e 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -13,12 +13,19 @@
 % Enable Multizone mode
 MULTIZONE= YES
 %
+MULTIZONE_SOLVER=BLOCK_JACOBI
+
 % List of config files to specify zone options
 CONFIG_LIST= (zone_1.cfg, zone_2.cfg)
 %
-OUTER_ITER=1000
 %
-INNER_ITER=1
+TIME_DOMAIN=YES
+%
+TIME_STEP= 1e-04
+TIME_ITER= 10
+OUTER_ITER= 120
+INNER_ITER= 1
+%
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)                         
@@ -37,17 +44,6 @@ RESTART_SOL= NO
 %                      DUAL_TIME_STEPPING-1ST_ORDER)
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
-% Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 1E-4
-%
-% Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.01
-%
-% Number of internal iterations (dual time method)
-UNST_INT_ITER= 120
-
-RESTART_ITER = 2
-%
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -89,12 +85,14 @@ MARKER_EULER= (outlet)
 MARKER_ZONE_INTERFACE= ( external_interface, internal_interface)
 MARKER_FLUID_INTERFACE= ( external_interface, internal_interface)
 
-%
 KIND_INTERPOLATION= WEIGHTED_AVERAGE
 %
 % Periodic boundary marker(s) (NONE = no marker)
 % Format: ( periodic marker, donor marker, rot_cen_x, rot_cen_y, rot_cen_z, rot_angle_x-axis, rot_angle_y-axis, rot_angle_z-axis, translation_x, translation_y, translation_z)
 MARKER_SYM= ( up, down )
+%
+%
+
 %
 %
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
@@ -186,17 +184,11 @@ RELAXATION_FACTOR_FLOW= 1.0
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Number of total iterations
-ITER= 32000
-%
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -210,8 +202,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 931519394519..3b7d2f102e38 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -179,8 +179,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -20
@@ -196,7 +194,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 0ad76153c5fe..6a343a0de2f9 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -215,8 +215,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -20
@@ -232,7 +230,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index 38bfb83f7ecc..9289f0f3ce75 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -198,8 +198,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -20
@@ -215,7 +213,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index 948c30587d72..f2a4254e97df 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -281,10 +281,7 @@ OUTER_ITER= 6
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -300,7 +297,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 6b4132c7d646..3d32e03fd1c0 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -286,10 +286,7 @@ OUTER_ITER= 6
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -305,7 +302,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 4e15086a561d..a765bb33615e 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -275,10 +275,7 @@ OUTER_ITER= 21
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -294,7 +291,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 3f7ff8d21ff4..936989eedc9a 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -313,10 +313,7 @@ ITER= 12000
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -330,8 +327,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index 5d43054b1b04..fffa23c0caca 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -321,10 +321,7 @@ ITER= 32000
 CONV_CRITERIA= RESIDUAL
 %
 % Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -338,8 +335,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 %
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index f143cbb1ded6..700c74fd6dbf 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -283,10 +283,7 @@ ITER= 2001
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -302,7 +299,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index d043c37f142e..7b4a46fd4a5e 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -288,10 +288,7 @@ ITER= 201
 %
 CONV_CRITERIA= RESIDUAL
 %
-RESIDUAL_FUNC_FLOW= RHO_ENERGY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -16
@@ -307,7 +304,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index f58f34dc90c1..370cd8951397 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -32,16 +32,16 @@ RESTART_SOL= NO
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.59
+MAX_TIME= 0.59
 % 10 periods: 0.5888756403287397
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 110
+INNER_ITER= 110
 %
 % Starting direct iteration for unsteady adjoint
 UNST_ADJOINT_ITER= 251
@@ -265,8 +265,6 @@ VISUALIZE_VOLUME_DEF= NO
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -282,8 +280,6 @@ CONV_CAUCHY_EPS= 1E-6
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 2b8aa33bde8a..a123e21916c9 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -32,17 +32,17 @@ RESTART_SOL= NO
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 % 36 steps per period: 0.0016357592286692995
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.59
+MAX_TIME= 0.59
 % 10 periods: 0.5888756403287397
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 2000
+INNER_ITER= 2000
 %
 % Direct iteration number at which to begin unsteady adjoint
 UNST_ADJOINT_ITER= 251
@@ -289,8 +289,6 @@ VISUALIZE_VOLUME_DEF= YES
 %
 CONV_CRITERIA= CAUCHY
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 4
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
@@ -306,8 +304,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
 %                                 DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index 5c6c4d5ef3e3..162d11d38817 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -32,16 +32,16 @@ RESTART_SOL= NO
 TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 %
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 0.5888756403287397
+MAX_TIME= 0.5888756403287397
 % 10 periods: 0.5888756403287397
 %
 % Number of internal iterations (dual time method)
-UNST_INT_ITER= 1000
+INNER_ITER= 1000
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
@@ -191,8 +191,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % Convergence criteria (CAUCHY, RESIDUAL)
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
@@ -205,7 +203,6 @@ CONV_CAUCHY_ELEMS= 100
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index ea62a7bab0fe..1b04b0e25624 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -203,8 +203,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 3
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -10
@@ -220,7 +218,6 @@ CONV_CAUCHY_EPS= 1E-5
 %
 % Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
 % 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/config_template.cfg b/config_template.cfg
index 8d7c077bce2c..7ac1a40e70b3 100644
--- a/config_template.cfg
+++ b/config_template.cfg
@@ -1234,8 +1234,6 @@ EXT_ITER= 1000
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
 %
 % Min value of the residual (log10 of the residual)
 RESIDUAL_MINVAL= -8
@@ -1249,11 +1247,7 @@ CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CAUCHY_EPS= 1E-10
 %
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
 %
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
 
 % ----------------------- DRIVER REFACTORED ITERATORS -------------------------%
 % As of now, these are only strictly necessary for single-zone discrete adjoint 

From 6a90e2b7fb988215ae6fe4cc999ff36ccc7bffba Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 21 Aug 2019 14:09:26 +0200
Subject: [PATCH 425/539] Removed lines in test cases

---
 TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg              | 2 --
 TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg           | 2 --
 TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg      | 2 --
 TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg                | 2 --
 TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg       | 2 --
 TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg   | 2 --
 TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg | 2 --
 TestCases/cont_adj_rans/naca0012/turb_nasa.cfg                  | 2 --
 TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg           | 2 --
 TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg                | 2 --
 TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg             | 2 --
 TestCases/control_surface/inv_ONERAM6_moving.cfg                | 2 --
 TestCases/control_surface/inv_ONERAM6_setting.cfg               | 2 --
 TestCases/ddes/flatplate/ddes_flatplate.cfg                     | 2 --
 TestCases/deformation/brick_hex/def_brick_hex.cfg               | 2 --
 TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg     | 2 --
 TestCases/deformation/brick_prism/def_brick_prism.cfg           | 2 --
 TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg | 2 --
 TestCases/deformation/brick_pyra/def_brick_pyra.cfg             | 2 --
 TestCases/deformation/brick_tets/def_brick_tets.cfg             | 2 --
 TestCases/deformation/naca0012/def_NACA0012.cfg                 | 2 --
 TestCases/deformation/naca0012/surface_file_NACA0012.cfg        | 2 --
 TestCases/deformation/naca4412/def_NACA4412.cfg                 | 2 --
 TestCases/deformation/rae2822/def_RAE2822.cfg                   | 2 --
 .../disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg     | 2 --
 .../disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg   | 2 --
 TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg    | 2 --
 TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg   | 2 --
 TestCases/disc_adj_rans/cylinder/cylinder.cfg                   | 2 --
 TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg            | 2 --
 TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg           | 2 --
 TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg          | 2 --
 .../transonic_stator_2D/transonic_stator.cfg                    | 2 --
 TestCases/euler/CRM/inv_CRM_JST.cfg                             | 2 --
 TestCases/euler/biparabolic/BIPARABOLIC.cfg                     | 2 --
 TestCases/euler/bluntbody/blunt.cfg                             | 2 --
 TestCases/euler/channel/inv_channel.cfg                         | 2 --
 TestCases/euler/channel/inv_channel_RK.cfg                      | 2 --
 TestCases/euler/naca0012/inv_NACA0012.cfg                       | 2 --
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg                   | 2 --
 TestCases/euler/oneram6/inv_ONERAM6.cfg                         | 2 --
 TestCases/euler/wedge/inv_wedge_HLLC.cfg                        | 2 --
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg                     | 2 --
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg                    | 2 --
 TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg            | 2 --
 TestCases/harmonic_balance/HB.cfg                               | 2 --
 TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg    | 2 --
 .../InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg       | 2 --
 .../hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg  | 2 --
 .../hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg  | 2 --
 .../hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg      | 2 --
 TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg          | 2 --
 TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg      | 2 --
 TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg       | 2 --
 .../hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg      | 2 --
 TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg       | 2 --
 .../hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg      | 2 --
 TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg      | 2 --
 .../hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg     | 2 --
 .../hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg     | 2 --
 .../Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg        | 2 --
 .../QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg        | 2 --
 .../QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg | 2 --
 .../hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg | 2 --
 .../Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg    | 2 --
 TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg         | 2 --
 TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg          | 2 --
 .../hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg    | 2 --
 .../SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg     | 2 --
 .../hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg    | 2 --
 .../SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg     | 2 --
 .../hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg    | 2 --
 .../SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg     | 2 --
 .../CylinderViscous/nPoly3/fem_Cylinder_reg.cfg                 | 2 --
 .../hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg     | 2 --
 .../SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg        | 2 --
 .../SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg   | 2 --
 .../UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg               | 2 --
 .../UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg          | 2 --
 TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg             | 2 --
 .../incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg | 2 --
 TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg      | 2 --
 TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg        | 2 --
 TestCases/incomp_rans/naca0012/naca0012.cfg                     | 2 --
 TestCases/mms/dg_navierstokes/lam_mms_dg.cfg                    | 2 --
 TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg              | 2 --
 TestCases/mms/dg_ringleb/ringleb_dg.cfg                         | 2 --
 TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg                  | 2 --
 TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg           | 2 --
 TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg                  | 2 --
 TestCases/moving_wall/cavity/lam_cavity.cfg                     | 2 --
 TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg   | 2 --
 TestCases/navierstokes/cylinder/cylinder_lowmach.cfg            | 2 --
 TestCases/navierstokes/cylinder/lam_cylinder.cfg                | 2 --
 TestCases/navierstokes/flatplate/lam_flatplate.cfg              | 2 --
 TestCases/navierstokes/naca0012/lam_NACA0012.cfg                | 2 --
 TestCases/navierstokes/poiseuille/lam_poiseuille.cfg            | 2 --
 TestCases/navierstokes/poiseuille/profile_poiseuille.cfg        | 2 --
 TestCases/nicf/LS89/turb_SA_PR.cfg                              | 2 --
 TestCases/nicf/LS89/turb_SST_PR.cfg                             | 2 --
 TestCases/nicf/edge/edge_PPR.cfg                                | 2 --
 TestCases/nicf/edge/edge_VW.cfg                                 | 2 --
 .../pitching_naca64a010/pitching_NACA64A010.cfg                 | 2 --
 .../optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg    | 2 --
 .../optimization_euler/rotating_naca0012/rotating_NACA0012.cfg  | 2 --
 .../optimization_euler/steady_inverse_design/inv_NACA0012.cfg   | 2 --
 .../optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg   | 2 --
 TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg   | 2 --
 TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg     | 2 --
 TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg  | 2 --
 TestCases/polar/naca0012/inv_NACA0012.cfg                       | 2 --
 TestCases/rans/flatplate/turb_SA_flatplate.cfg                  | 2 --
 TestCases/rans/flatplate/turb_SST_flatplate.cfg                 | 2 --
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg                    | 2 --
 TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg             | 2 --
 TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg                | 2 --
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg                   | 2 --
 TestCases/rans/oneram6/turb_ONERAM6.cfg                         | 2 --
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg                      | 2 --
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg                     | 2 --
 TestCases/rans/s809/trans_s809.cfg                              | 2 --
 TestCases/rans/s809/turb_S809.cfg                               | 2 --
 TestCases/rans/vki_turbine/turb_vki.cfg                         | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg                 | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg              | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg              | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg              | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg            | 2 --
 TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg            | 2 --
 TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg        | 2 --
 TestCases/rotating/naca0012/rot_NACA0012.cfg                    | 2 --
 TestCases/sliding_interface/bars_SST_2D/bars.cfg                | 2 --
 .../E387_Airfoil/transitional_BC_model_ConfigFile.cfg           | 2 --
 .../Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg    | 2 --
 .../T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg          | 2 --
 TestCases/turbomachinery/APU_turbocharger/Jones.cfg             | 2 --
 TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg         | 2 --
 TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg       | 2 --
 .../turbomachinery/transonic_stator_2D/transonic_stator.cfg     | 2 --
 .../turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg | 2 --
 .../unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg  | 2 --
 TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg | 2 --
 TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg      | 2 --
 TestCases/unsteady/square_cylinder/turb_square.cfg              | 2 --
 144 files changed, 288 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 2228db019f56..a358e85fe1ff 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -265,8 +265,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 8f9e7351355c..2687d428c5d4 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -259,8 +259,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 7198f82e7906..075916e15ca8 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -215,8 +215,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index d5598af834d9..9903805f24b3 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -222,8 +222,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-%                        SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 020fafe7c22d..0b7412449232 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -232,8 +232,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 51bc5c9c458e..1ff105bb82a4 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -217,8 +217,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index bf5d646501ff..d6fe7f1a721a 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -228,8 +228,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index d3f99da534f3..fd64a852135a 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -271,8 +271,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- GRID ADAPTATION STRATEGY --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 9098d36081e7..3a3f6acce98c 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -271,8 +271,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- GRID ADAPTATION STRATEGY --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index fb9195e3436f..c751d0d06f80 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -285,8 +285,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index e95691c72b69..c235f642dbeb 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -203,8 +203,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 5f1229c4e05a..71fa828b1d7e 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -205,8 +205,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 675807c0f68b..391789a8eab7 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -205,8 +205,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 9e4288315c48..3e6e9e8e0250 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -186,8 +186,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index a57b150584ad..e4fc5479aabc 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index 39285fd27a8b..c831528416f8 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index b73beda33d66..5268acfefcbc 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 45641e68f6d9..526a3184d376 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index e036ddf26d43..48c8e215e53b 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 22b938b039d9..50c3f781ffaa 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -214,8 +214,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 762b162ea4d5..413e74b5a811 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -258,8 +258,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index fa29a4776c2d..85ee052de1be 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -268,8 +268,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 132328d9b5bb..0bfa93739b56 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -235,8 +235,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E0
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 7046df98ba2d..9496ec0c6dce 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -210,8 +210,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 8708ecccedea..573b50f74603 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -182,8 +182,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index a5664f58d21d..21f4dc1e92cc 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -256,8 +256,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 6d7a6b8bbf3b..3b90bfd2b1b8 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -237,8 +237,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index 10e96c1ba3e5..dc8fa5b80be8 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -237,8 +237,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index db8c516754b3..2627f0c81e84 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -215,8 +215,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index a024bfbbbf42..f4946d103d84 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -223,8 +223,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 1bccc13629fe..646de298894f 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -203,8 +203,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 7e15795ab1ba..f6c5da2a3618 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -202,8 +202,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 3e6fd1f69c70..c79ba4855bb0 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -379,8 +379,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index bc628af17071..0232f414a4b2 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -197,8 +197,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 10d2bd107509..67bf81bcb022 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -232,8 +232,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index ea68f1d4ef0f..0479b48887c9 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -157,8 +157,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 180bd8c8364a..f3aac7860714 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -176,8 +176,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index e99a0bb59a24..ef8d12ca2754 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -172,8 +172,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index dbf3ebbb1e45..4241ff2ba82a 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -250,8 +250,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index dfe0d613fb7e..8e773d8047bc 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -162,8 +162,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 95bd22e11367..81209ffb0215 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -224,8 +224,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 043af4591ffe..5ec1df9c2c41 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -171,8 +171,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 095a6b5d7931..33663b2d553d 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -356,6 +356,4 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 80c20fc00849..002c2199a43c 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -263,8 +263,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 58cce2a80642..76460b290b16 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -268,8 +268,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index faa1f0526aa2..5dc5c30c7fc6 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -270,8 +270,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 9edd4d406c4b..52e1562cd8b5 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -213,8 +213,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 309d961bdbfc..722cc461c6e7 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -137,8 +137,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 84b08929d4a0..e3abd582d9f9 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -136,8 +136,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 18eb4519b303..8b7dc1be4773 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -136,8 +136,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index df0e26393dc3..49d3365c10e9 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -132,8 +132,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index e2313e3c3e58..243f2b4281c2 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -138,8 +138,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 52a7140eeed9..6b5629ded8fc 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -143,8 +143,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index f6000a7f9b2b..bdd0c93b8d58 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index a6ae0c244dc9..f1a3151329f3 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index c4dcd0fc6709..322352fad437 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index 1c964358f03f..ed2aa9fda190 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index 9aefbf518d09..bbd86aa874cb 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index c256cdb364d3..200708817126 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index f44894ee4255..9b48ee6b109f 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 43df3b476e76..1f42077fb0e4 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 968fc77469c1..e4d8118168da 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 719b1f7d4f2f..aa102ffe4cdb 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 4312a7b34afb..0042917b2d09 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 36802d69dbf4..3cf9492cb363 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -129,8 +129,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index da2fd88eabc7..a3191cf83959 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -132,8 +132,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index 17aca1f99a78..2c4ea64df852 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -134,8 +134,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index eafcac0fae7f..096c79aedcb0 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -142,8 +142,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index e664b7443555..d86799090892 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -135,8 +135,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index 0e3bfeecd9ec..d149d4abd0de 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -142,8 +142,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index ebae81e2c69d..81c9096f5897 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -135,8 +135,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 7eb9500d0d95..12cf6b1f9667 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -142,8 +142,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index fa151ae4443d..fc83556b93ee 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -135,8 +135,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index 0644906a5d7c..49a77dcb0bf7 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -136,8 +136,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 1c44ca77a70f..0a4869a1c0b0 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -144,8 +144,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 7772bb2a2d2e..50f5547a9cdf 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -136,8 +136,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index 258a4c14dc36..a1904bb67b90 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -160,8 +160,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 93d903bb7c9c..b57e083215a6 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -152,8 +152,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index d393d3b0a280..59df22f7e477 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -165,8 +165,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index eecb2edc5a81..74574f92c6c8 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -164,8 +164,6 @@ CONV_CAUCHY_ELEMS= 50
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 1fdf061bab9c..089eea6c593e 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -216,8 +216,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 6015cdadbdc8..47d990be935e 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -159,8 +159,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index f895c7749050..4887d546553c 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -243,8 +243,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 75c17be01e40..379a0a5a79e8 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -200,8 +200,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index 4b7558a7f5f2..b23045eb1caf 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -130,8 +130,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index 16ab91aff1d2..5fb16472af1a 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -148,8 +148,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index eca905a2462b..2e11cdb248d0 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -147,8 +147,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index 493af99203d2..6e06b1bf5c68 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -174,8 +174,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index 4e5dd3e5f717..af5894057d11 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -196,8 +196,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index 356482891828..1bbb1898f3b7 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -213,8 +213,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index 44d52080a56d..fb6b170bc5a3 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -183,8 +183,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 20e6459c2b65..45ff51afbd50 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -200,8 +200,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-7
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index f0e43af79ebe..81d99a234f73 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -175,8 +175,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index c20197834708..bfc756699bea 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -170,8 +170,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index cb3944bf8aca..b0c3961e566e 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -187,8 +187,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index 7311a1afbaa1..e1bedd0e0e14 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -162,8 +162,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index cbd701a79b88..934cff3f38e2 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -213,8 +213,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION ----------------------.su2
 %
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index 0eda9279a8a9..f669464ebd7e 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -245,8 +245,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION ----------------------.su2
 %
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 1d265e34b0cb..6dec21367c22 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -271,8 +271,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 9887b22b4e9f..6e6230dd2c6c 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -270,8 +270,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 8c8369b19754..00ad3be6c5c7 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -191,8 +191,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 9adfc021579e..0d3e30ed4116 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -191,8 +191,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index 09aa3649b90b..ba52e4bcc5db 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -286,8 +286,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index c172f1f9fd99..dc318e491acd 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -265,8 +265,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index 32cf9a4add64..2218a5b7a9c0 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -256,8 +256,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 2cc6da46e292..f29c607e84f6 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -246,8 +246,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index d9082787f043..a53a8b26b980 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -302,8 +302,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index ef4a03fb0b9d..7b7b54440100 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -325,8 +325,6 @@ CONV_CAUCHY_ELEMS= 50
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index 5b5b0c65e7bc..c61b2a23352e 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -272,8 +272,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index c8e908ef9b8e..91314593ad64 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -217,8 +217,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 0ba4a7a1e814..8a865ca1a0f3 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -264,8 +264,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 % Mesh input file
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index 5bad11aa5c90..20eb8dec3492 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -196,8 +196,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index 677fe827de0c..35084bb29bc3 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -193,8 +193,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 3cb11de2c453..653c0479699b 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -205,8 +205,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index 7c0de08976f8..f0508334e1ea 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index 0f815c99ac4b..42fd45901b65 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -196,8 +196,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index 78850bc7eec7..da7cfc65d8d4 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -204,8 +204,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index f1e6e3714a29..f0806f8ac2b9 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -233,8 +233,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index 13165230e29a..7dc561950e4c 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index c970c0164b7c..3c59222e152c 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -188,8 +188,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index a3eccc2ad58d..2d0108c8a18e 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -179,8 +179,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index df831df909a8..0fda0ff4a5b9 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -193,8 +193,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index fe7bc22b5118..bd95d5c56b83 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -200,8 +200,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index 7bc805e7e2e4..aeca27a5c30a 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -192,8 +192,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index cf39b0892a8c..d0fe7f843eed 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 150e9d8a5bd5..8bcd6c8a7d25 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index d5abf06ade93..8ea4bf039d0f 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 897de1223581..6a72fa304ae3 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index ad7f591ec4d1..986e89f228ff 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 31200806d414..4a2b4bbf8333 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -181,8 +181,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-10
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 605263633f23..24aa20c56cbb 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -277,8 +277,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index f99b247f328e..b31b10e1237b 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -274,8 +274,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 % Epsilon for full multigrid method evaluation
 %FULLMG_CONV_CAUCHY_EPS= 1E-4
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 3b7d2f102e38..dff57bc088c2 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -192,8 +192,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 6a343a0de2f9..d8902a0d38bd 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -228,8 +228,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index 9289f0f3ce75..eacd45f54cb0 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -211,8 +211,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index f2a4254e97df..132b2158f59a 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -295,8 +295,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 3d32e03fd1c0..1bab17bab76c 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -300,8 +300,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index a765bb33615e..c484069a4a13 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -289,8 +289,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 700c74fd6dbf..44a8f4802181 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -297,8 +297,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index 7b4a46fd4a5e..184c432e1054 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -302,8 +302,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 %
 %
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index 370cd8951397..378fae5efcaa 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -278,8 +278,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index a123e21916c9..a7c270059ab6 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -302,8 +302,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
-%                                 DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index 162d11d38817..e5ae0f83f84c 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -201,8 +201,6 @@ CONV_STARTITER= 1
 % Number of elements to apply the criteria
 CONV_CAUCHY_ELEMS= 100
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 1b04b0e25624..9ba9b9aa95d4 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -216,8 +216,6 @@ CONV_CAUCHY_ELEMS= 100
 % Epsilon to control the series convergence
 CONV_CAUCHY_EPS= 1E-5
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %

From d677f84c14bf46007d3243cd77bf409da8a133f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 26 Aug 2019 09:04:01 +0200
Subject: [PATCH 426/539] Adapting test case

---
 .../incomp_navierstokes/bend/lam_bend.cfg     | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/TestCases/incomp_navierstokes/bend/lam_bend.cfg b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
index 800863959633..f349754549ce 100755
--- a/TestCases/incomp_navierstokes/bend/lam_bend.cfg
+++ b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
@@ -13,7 +13,7 @@
 %                               TNE2_EULER, TNE2_NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)
-PHYSICAL_PROBLEM= NAVIER_STOKES
+SOLVER= INC_NAVIER_STOKES
 %
 % Specify turbulence model (NONE, SA, SST)
 KIND_TURB_MODEL= NONE
@@ -21,9 +21,6 @@ KIND_TURB_MODEL= NONE
 % Mathematical problem (DIRECT, ADJOINT)
 MATH_PROBLEM= DIRECT
 %
-% Regime type (COMPRESSIBLE, INCOMPRESSIBLE)
-REGIME_TYPE= INCOMPRESSIBLE
-%
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 
@@ -195,26 +192,19 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 % Number of total iterations
-EXT_ITER= 11
-%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 5
+ITER= 11
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-10
+CONV_CAUCHY_EPS= 1E-10
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
@@ -228,7 +218,7 @@ MESH_FORMAT= CGNS
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -240,13 +230,13 @@ OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -258,7 +248,7 @@ VALUE_OBJFUNC_FILENAME= of_eval.dat
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -277,3 +267,5 @@ WRT_CON_FREQ_DUALTIME= 10
 %
 % Output residual values in the solution files
 WRT_RESIDUALS= NO
+%
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)

From f985ebf91256779b59a954f1d3bc75162ab8af98 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 26 Aug 2019 09:14:58 +0200
Subject: [PATCH 427/539] disabled direct output when running adj solver

---
 SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp | 6 +++---
 TestCases/disc_adj_fea/configAD_fem.cfg          | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
index 13f2b9bed06e..4b0778a310f9 100644
--- a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -396,15 +396,15 @@ void CDiscAdjSinglezoneDriver::DirectRun(unsigned short kind_recording){
 
   /*--- Zone preprocessing ---*/
 
-  direct_iteration->Preprocess(output_container[ZONE_0], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
+  direct_iteration->Preprocess(direct_output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- Iterate the direct solver ---*/
 
-  direct_iteration->Iterate(output_container[ZONE_0], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
+  direct_iteration->Iterate(direct_output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- Postprocess the direct solver ---*/
 
-  direct_iteration->Postprocess(output_container[ZONE_0], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
+  direct_iteration->Postprocess(direct_output, integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- Print the direct residual to screen ---*/
 
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index 1af2958881ad..30afc86f9508 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -45,8 +45,6 @@ FORMULATION_ELASTICITY_2D = PLANE_STRAIN
 NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
 NONLINEAR_FEM_INT_ITER = 10
 
-RESIDUAL_CRITERIA_FEM = ABSOLUTE
-
 CONV_FILENAME= history
 VOLUME_FILENAME= beam
 BREAKDOWN_FILENAME= forces_breakdown.dat

From acde90d48be8bafec838de3a6222164352a7366c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 26 Aug 2019 15:48:48 +0200
Subject: [PATCH 428/539] Removed nonlinear residual computation from fea
 solver

---
 SU2_CFD/include/output/CElasticityOutput.hpp |  2 +-
 SU2_CFD/src/output/CElasticityOutput.cpp     | 15 +++--
 SU2_CFD/src/solver_direct_elasticity.cpp     | 63 --------------------
 3 files changed, 10 insertions(+), 70 deletions(-)

diff --git a/SU2_CFD/include/output/CElasticityOutput.hpp b/SU2_CFD/include/output/CElasticityOutput.hpp
index 52dd742f3e48..066c1ae1ed07 100644
--- a/SU2_CFD/include/output/CElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CElasticityOutput.hpp
@@ -94,5 +94,5 @@ class CElasticityOutput : public COutput {
    * \param iPoint
    */
   void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
+  bool SetInit_Residuals(CConfig *config);
 };
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index d9bb369376a9..23dac4c7480f 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -131,11 +131,10 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       SetHistoryOutputValue("RMS_DISP_Z", log10(fea_solver->GetRes_RMS(2)));
     }
   } else if (nonlinear_analysis){
-    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->GetRes_FEM(0)));
-    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->GetRes_FEM(1)));
-    if (nDim == 3){
-      SetHistoryOutputValue("RMS_ETOL", log10(fea_solver->GetRes_FEM(2)));
-    }
+    SetHistoryOutputValue("RMS_UTOL", log10(fea_solver->LinSysSol.norm()));
+    SetHistoryOutputValue("RMS_RTOL", log10(fea_solver->LinSysRes.norm()));
+    SetHistoryOutputValue("RMS_ETOL", log10(dotProd(fea_solver->LinSysSol, fea_solver->LinSysRes)));
+    
   }
   
   if (multizone){
@@ -245,6 +244,10 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("VON_MISES_STRESS", "Von_Mises_Stress", "STRESS", "von-Mises stress");
   
 }
-
+bool CElasticityOutput::SetInit_Residuals(CConfig *config){
+  
+  return (config->GetTime_Domain() == NO && (curr_InnerIter  == 0));
+  
+}
 
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index fbe2d40523a4..599e3566fef9 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -2202,69 +2202,6 @@ void CFEASolver::Postprocessing(CGeometry *geometry, CSolver **solver_container,
   else {
     if (nonlinear_analysis){
 
-      /*--- If the problem is nonlinear, we have 3 convergence criteria ---*/
-
-      /*--- UTOL = norm(Delta_U(k)) / norm(U(k)) --------------------------*/
-      /*--- RTOL = norm(Residual(k)) / norm(Residual(0)) ------------------*/
-      /*--- ETOL = Delta_U(k) * Residual(k) / Delta_U(0) * Residual(0) ----*/
-
-      if (first_iter){
-        Conv_Ref[0] = 1.0;                                        // Position for the norm of the solution
-        Conv_Ref[1] = max(LinSysRes.norm(), EPS);                 // Position for the norm of the residual
-        Conv_Ref[2] = max(dotProd(LinSysSol, LinSysRes), EPS);    // Position for the energy tolerance
-
-        /*--- Make sure the computation runs at least 2 iterations ---*/
-        Conv_Check[0] = 1.0;
-        Conv_Check[1] = 1.0;
-        Conv_Check[2] = 1.0;
-
-        /*--- If absolute, we check the norms ---*/
-        switch (config->GetResidual_Criteria_FEM()) {
-          case RESFEM_ABSOLUTE:
-            Conv_Check[0] = LinSysSol.norm();         // Norm of the delta-solution vector
-            Conv_Check[1] = LinSysRes.norm();         // Norm of the residual
-            Conv_Check[2] = dotProd(LinSysSol, LinSysRes);  // Position for the energy tolerance
-            break;
-        }
-      }
-      else {
-        /*--- Compute the norm of the solution vector Uk ---*/
-        for (iPoint = 0; iPoint < nPointDomain; iPoint++){
-          for (iVar = 0; iVar < nVar; iVar++){
-            solNorm += node[iPoint]->GetSolution(iVar) * node[iPoint]->GetSolution(iVar);
-          }
-        }
-
-        // We need to communicate the norm of the solution and compute the RMS throughout the different processors
-
-#ifdef HAVE_MPI
-        /*--- We sum the squares of the norms across the different processors ---*/
-        SU2_MPI::Allreduce(&solNorm, &solNorm_recv, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#else
-        solNorm_recv         = solNorm;
-#endif
-
-        Conv_Ref[0] = max(sqrt(solNorm_recv), EPS);           // Norm of the solution vector
-
-        switch (config->GetResidual_Criteria_FEM()) {
-          case RESFEM_RELATIVE:
-            Conv_Check[0] = LinSysSol.norm() / Conv_Ref[0];         // Norm of the delta-solution vector
-            Conv_Check[1] = LinSysRes.norm() / Conv_Ref[1];         // Norm of the residual
-            Conv_Check[2] = dotProd(LinSysSol, LinSysRes) / Conv_Ref[2];  // Position for the energy tolerance
-            break;
-          case RESFEM_ABSOLUTE:
-            Conv_Check[0] = LinSysSol.norm();         // Norm of the delta-solution vector
-            Conv_Check[1] = LinSysRes.norm();         // Norm of the residual
-            Conv_Check[2] = dotProd(LinSysSol, LinSysRes);  // Position for the energy tolerance
-            break;
-          default:
-            Conv_Check[0] = LinSysSol.norm() / Conv_Ref[0];         // Norm of the delta-solution vector
-            Conv_Check[1] = LinSysRes.norm() / Conv_Ref[1];         // Norm of the residual
-            Conv_Check[2] = dotProd(LinSysSol, LinSysRes) / Conv_Ref[2];  // Position for the energy tolerance
-            break;
-        }
-
-      }
 
       /*--- MPI solution ---*/
 

From 299f5a2d7e558b6865d5d7c6a5229cbf338cd5a9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 26 Aug 2019 15:59:50 +0200
Subject: [PATCH 429/539] Updated test case

---
 TestCases/fea_fsi/MixElemsKnowles/config.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/TestCases/fea_fsi/MixElemsKnowles/config.cfg b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
index 64e3d3f2594b..c7fb34f98458 100644
--- a/TestCases/fea_fsi/MixElemsKnowles/config.cfg
+++ b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
@@ -42,7 +42,7 @@ LINEAR_SOLVER_ITER= 1
 LINEAR_SOLVER_ERROR= 1e-10
 %
 % Convergence criteria
-NONLINEAR_FEM_INT_ITER= 1
+INNER_ITER= 1
 %
 % In/Out
 MESH_FILENAME= mesh.su2
@@ -50,3 +50,5 @@ MESH_FORMAT= SU2
 OUTPUT_FORMAT= PARAVIEW
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_structure.dat
+
+SCREEN_OUTPUT=(INNER_ITER, RMS_UTOL, RMS_RTOL, RMS_ETOL, VMS)

From c781d2bafe247bb03e45728c0293924ce82d49bd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 26 Aug 2019 16:11:59 +0200
Subject: [PATCH 430/539] Adapted SST SUST cases

---
 SU2_CFD/src/output/CFlowCompOutput.cpp        | 22 +++++++-------
 SU2_CFD/src/output/CFlowIncOutput.cpp         | 22 +++++++-------
 .../naca0012/naca0012_SST_SUST.cfg            | 29 +++++++++----------
 .../rans/naca0012/turb_NACA0012_sst_sust.cfg  | 27 +++++++++--------
 .../rans/rae2822/turb_SST_SUST_RAE2822.cfg    | 27 ++++++++---------
 5 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 2b235cbeb884..d768d40c0fdb 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -126,7 +126,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
     AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
     AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
@@ -153,7 +153,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
     AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
     AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
@@ -180,7 +180,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
     AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).",  TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
     AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).",  TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
@@ -278,7 +278,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION", "Turbulent kinetic energy");
     AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION", "Rate of dissipation");
     break;
@@ -334,7 +334,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("RES_ENERGY", "Residual_Energy", "RESIDUAL", "Residual of the energy");
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL", "Residual of turbulent kinetic energy");
     AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL", "Residual of the rate of dissipation");
     break;
@@ -355,7 +355,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("LIMITER_ENERGY", "Limiter_Energy", "LIMITER", "Limiter value of the energy");
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "LIMITER", "Limiter value of turb. kinetic energy");
     AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "LIMITER", "Limiter value of dissipation rate");
     break;
@@ -417,7 +417,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   
   // Turbulent Residuals
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
     SetVolumeOutputValue("DISSIPATION", iPoint, Node_Turb->GetSolution(1));
     break;
@@ -458,7 +458,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   }
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("RES_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     SetVolumeOutputValue("RES_DISSIPATION", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
@@ -481,7 +481,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   }
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
     SetVolumeOutputValue("LIMITER_DISSIPATION", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
@@ -550,7 +550,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
-  case SST:
+  case SST: case SST_SUST:
     SetHistoryOutputValue("RMS_TKE", log10(turb_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
@@ -571,7 +571,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
     break;  
-  case SST:
+  case SST: case SST_SUST:
     SetHistoryOutputValue("MAX_TKE", log10(turb_solver->GetRes_Max(0)));
     SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
     break;
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 4d6ae11f7840..5625fe9f5001 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -124,7 +124,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
     AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
     AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
@@ -153,7 +153,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
     AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
     AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
@@ -182,7 +182,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
     AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", TYPE_RESIDUAL);
     break;  
-  case SST:
+  case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
     AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", TYPE_RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
@@ -233,7 +233,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     SetHistoryOutputValue("RMS_NU_TILDE", log10(turb_solver->GetRes_RMS(0)));
     break;  
-  case SST:
+  case SST: case SST_SUST:
     SetHistoryOutputValue("RMS_TKE", log10(turb_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("RMS_DISSIPATION",    log10(turb_solver->GetRes_RMS(1)));
     break;
@@ -248,7 +248,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     SetHistoryOutputValue("MAX_NU_TILDE", log10(turb_solver->GetRes_Max(0)));
     break;  
-  case SST:
+  case SST: case SST_SUST:
     SetHistoryOutputValue("MAX_TKE", log10(turb_solver->GetRes_Max(0)));
     SetHistoryOutputValue("MAX_DISSIPATION",    log10(turb_solver->GetRes_Max(1)));
     break;
@@ -326,7 +326,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("TEMPERATURE",  "Temperature","SOLUTION", "Temperature");  
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION", "Turbulent kinetic energy");
     AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION", "Rate of dissipation");
     break;
@@ -380,7 +380,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL", "Residual of the temperature");
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("RES_TKE", "Residual_TKE", "RESIDUAL", "Residual of turbulent kinetic energy");
     AddVolumeOutput("RES_DISSIPATION", "Residual_Omega", "RESIDUAL", "Residual of the rate of dissipation.");
     break;
@@ -401,7 +401,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("LIMITER_TEMPERATURE", "Limiter_Temperature", "LIMITER", "Limiter value of the temperature");
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     AddVolumeOutput("LIMITER_TKE", "Limiter_TKE", "LIMITER", "Limiter value of turb. kinetic energy.");
     AddVolumeOutput("LIMITER_DISSIPATION", "Limiter_Omega", "LIMITER", "Limiter value of dissipation rate.");
     break;
@@ -466,7 +466,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   if (weakly_coupled_heat) SetVolumeOutputValue("TEMPERATURE",     iPoint, Node_Heat->GetSolution(0));
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("TKE", iPoint, Node_Turb->GetSolution(0));
     SetVolumeOutputValue("DISSIPATION", iPoint, Node_Turb->GetSolution(1));
     break;
@@ -512,7 +512,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   }
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("RES_TKE", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 0));
     SetVolumeOutputValue("RES_DISSIPATION", iPoint, solver[TURB_SOL]->LinSysRes.GetBlock(iPoint, 1));
     break;
@@ -535,7 +535,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   }
   
   switch(config->GetKind_Turb_Model()){
-  case SST:
+  case SST: case SST_SUST:
     SetVolumeOutputValue("LIMITER_TKE", iPoint, Node_Turb->GetLimiter_Primitive(0));
     SetVolumeOutputValue("LIMITER_DISSIPATION", iPoint, Node_Turb->GetLimiter_Primitive(1));
     break;
diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
index 7f26864c322a..9e9f69828f7d 100644
--- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
@@ -30,7 +30,7 @@ RESTART_SOL= NO
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER, 
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
-UNSTEADY_SIMULATION= NO
+TIME_MARCHING= NO
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
 %
@@ -91,7 +91,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 2500
+ITER= 2500
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -184,24 +184,19 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -10
+CONV_RESIDUAL_MINVAL= -10
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
@@ -215,7 +210,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -227,13 +222,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -242,7 +237,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -252,3 +247,7 @@ WRT_SOL_FREQ= 100
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
+
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
index 6badd3395364..25451282f622 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
@@ -108,7 +108,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 
 % ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
 %
@@ -194,24 +194,19 @@ CFL_REDUCTION_TURB= 1.0
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 10
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -12
+CONV_RESIDUAL_MINVAL= -12
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
@@ -225,7 +220,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow_sst_sust.dat
+SOLUTION_FILENAME= solution_flow_sst_sust.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -237,13 +232,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -252,7 +247,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -262,3 +257,7 @@ WRT_SOL_FREQ= 10000
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+%
+% Screen output fields
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
+
diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
index 00de695c3417..462dd79284e9 100644
--- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
@@ -91,7 +91,7 @@ CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
 %
 % Number of total iterations
-EXT_ITER= 99999
+ITER= 99999
 %
 % Linear solver for the implicit formulation (BCGSTAB, FGMRES)
 LINEAR_SOLVER= FGMRES
@@ -172,25 +172,19 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 CONV_CRITERIA= RESIDUAL
 %
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 6
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -8
+CONV_RESIDUAL_MINVAL= -8
 %
 % Start convergence criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
+CONV_CAUCHY_EPS= 1E-6
 %
-% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY, 
-% 	      	    		 SENS_MACH, DELTA_LIFT, DELTA_DRAG)
-CAUCHY_FUNC_FLOW= DRAG
-
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
 % Mesh input file
@@ -203,7 +197,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
@@ -215,13 +209,13 @@ OUTPUT_FORMAT= TECPLOT
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -230,7 +224,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
@@ -240,3 +234,6 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
+% Screen output fields
+SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
+

From 3f6dbdb3270d347d27c693d2a383254f4e31f2a9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 27 Aug 2019 15:17:57 +0200
Subject: [PATCH 431/539] Fixing some uninitialized values

---
 Common/src/config_structure.cpp   | 4 +++-
 Common/src/geometry_structure.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index a8526fc00d83..8bce7a9296a7 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -784,6 +784,8 @@ void CConfig::SetPointersNull(void) {
   Wrt_InletFile = false;
  
   Restart_Bandwidth_Agg = 0.0;
+  
+  Mesh_Box_Size = NULL;
  
 }
 
@@ -7366,7 +7368,7 @@ CConfig::~CConfig(void) {
   if (ScreenOutput != NULL) delete [] ScreenOutput;
   if (HistoryOutput != NULL) delete [] HistoryOutput;
   if (VolumeOutput != NULL) delete [] VolumeOutput;
-  
+  if (Mesh_Box_Size != NULL) delete [] Mesh_Box_Size;
 
 }
 
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 8212ae02d2d5..5f5e4937333a 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -5858,7 +5858,7 @@ void CPhysicalGeometry::DistributeMarkerTags(CConfig *config, CGeometry *geometr
   SU2_MPI::Bcast(&nMarker_Global, 1, MPI_UNSIGNED_LONG,
                  MASTER_NODE, MPI_COMM_WORLD);
 
-  char *mpi_str_buf = new char[nMarker_Global*MAX_STRING_SIZE];
+  char *mpi_str_buf = new char[nMarker_Global*MAX_STRING_SIZE]();
   if (rank == MASTER_NODE) {
     for (iMarker = 0; iMarker < nMarker_Global; iMarker++) {
       SPRINTF(&mpi_str_buf[iMarker*MAX_STRING_SIZE], "%s",

From 429a792322c5189ac514127bb78b04a23fd748cc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 27 Aug 2019 15:20:16 +0200
Subject: [PATCH 432/539] Renaming variables and adding comments in output
 classes

---
 SU2_CFD/include/drivers/CDriver.hpp           |   5 +-
 .../include/output/CAdjElasticityOutput.hpp   |  46 +-
 SU2_CFD/include/output/CAdjFlowIncOutput.hpp  |  86 ++-
 SU2_CFD/include/output/CAdjFlowOutput.hpp     |  87 +--
 SU2_CFD/include/output/CAdjHeatOutput.hpp     |  70 +-
 SU2_CFD/include/output/CBaselineOutput.hpp    |  27 +-
 SU2_CFD/include/output/CDriverOutput.hpp      |  43 +-
 SU2_CFD/include/output/CElasticityOutput.hpp  |  59 +-
 SU2_CFD/include/output/CFlowCompFEMOutput.hpp | 101 ++-
 SU2_CFD/include/output/CFlowCompOutput.hpp    |  97 ++-
 SU2_CFD/include/output/CFlowIncOutput.hpp     | 104 ++-
 SU2_CFD/include/output/CFlowOutput.hpp        |  43 +-
 SU2_CFD/include/output/CHeatOutput.hpp        |  48 +-
 SU2_CFD/include/output/CMeshOutput.hpp        |  29 +-
 SU2_CFD/include/output/COutput.hpp            | 502 ++++++++-----
 .../output/filewriter/CCSVFileWriter.hpp      |  57 +-
 .../output/filewriter/CFEMDataSorter.hpp      |  71 +-
 .../output/filewriter/CFVMDataSorter.hpp      |  78 +-
 .../include/output/filewriter/CFileWriter.hpp | 111 ++-
 .../output/filewriter/CParallelDataSorter.hpp | 170 +++--
 .../filewriter/CParaviewBinaryFileWriter.hpp  |  63 +-
 .../output/filewriter/CParaviewFileWriter.hpp |  55 +-
 .../filewriter/CSU2BinaryFileWriter.hpp       |  56 +-
 .../output/filewriter/CSU2FileWriter.hpp      |  57 +-
 .../output/filewriter/CSU2MeshFileWriter.hpp  |  61 +-
 .../filewriter/CSurfaceFEMDataSorter.hpp      |  67 +-
 .../filewriter/CSurfaceFVMDataSorter.hpp      |  73 +-
 .../filewriter/CTecplotBinaryFileWriter.hpp   |  60 +-
 .../output/filewriter/CTecplotFileWriter.hpp  |  63 +-
 SU2_CFD/src/SU2_CFD.cpp                       |   2 +-
 SU2_CFD/src/drivers/CDriver.cpp               |  49 +-
 SU2_CFD/src/integration_time.cpp              |  31 -
 SU2_CFD/src/iteration_structure.cpp           |  14 +-
 SU2_CFD/src/output/CAdjElasticityOutput.cpp   |  42 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |  52 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |  52 +-
 SU2_CFD/src/output/CAdjHeatOutput.cpp         |  42 +-
 SU2_CFD/src/output/CBaselineOutput.cpp        |  28 +-
 SU2_CFD/src/output/CDriverOutput.cpp          |  58 +-
 SU2_CFD/src/output/CElasticityOutput.cpp      |  52 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |  48 +-
 SU2_CFD/src/output/CFlowCompOutput.cpp        |  58 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp         |  48 +-
 SU2_CFD/src/output/CFlowOutput.cpp            |  14 +-
 SU2_CFD/src/output/CHeatOutput.cpp            |  36 +-
 SU2_CFD/src/output/CMeshOutput.cpp            |   8 +-
 SU2_CFD/src/output/COutput.cpp                | 699 +++++++++---------
 .../src/output/filewriter/CCSVFileWriter.cpp  |  12 +-
 .../src/output/filewriter/CFEMDataSorter.cpp  |  22 +-
 .../src/output/filewriter/CFVMDataSorter.cpp  |  53 +-
 .../output/filewriter/CParallelDataSorter.cpp | 126 +---
 .../output/filewriter/CParallelFileWriter.cpp |   8 +-
 .../filewriter/CParaviewBinaryFileWriter.cpp  |   8 +-
 .../output/filewriter/CParaviewFileWriter.cpp |  10 +-
 .../filewriter/CSU2BinaryFileWriter.cpp       |   6 +-
 .../src/output/filewriter/CSU2FileWriter.cpp  |  12 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  12 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  29 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      | 107 ++-
 .../filewriter/CTecplotBinaryFileWriter.cpp   |  16 +-
 .../output/filewriter/CTecplotFileWriter.cpp  |  15 +-
 61 files changed, 2368 insertions(+), 1790 deletions(-)

diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index 42d1a834fa44..30730fd6580b 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -50,6 +50,8 @@
 #include "../../../Common/include/config_structure.hpp"
 #include "../../../Common/include/interpolation_structure.hpp"
 
+#include "../output/COutputLegacy.hpp"
+
 #include "../output/COutput.hpp"
 #include "../output/CDriverOutput.hpp"
 #include "../output/CElasticityOutput.hpp"
@@ -1084,7 +1086,8 @@ class CFSIDriver : public CDriver {
  * \version 6.2.0 "Falcon"
  */
 class CDiscAdjFSIDriver : public CDriver {
-
+  
+  COutputLegacy* output_legacy;
   CIteration** direct_iteration;
   unsigned short RecordingState;
   unsigned short CurrentRecording;          /*!< \brief Stores the current status of the recording. */
diff --git a/SU2_CFD/include/output/CAdjElasticityOutput.hpp b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
index 22eff41d4d7b..c236be31cef5 100644
--- a/SU2_CFD/include/output/CAdjElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CAdjElasticityOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_fea_discadj.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CAdjElasticityOutput.hpp
+ * \brief Headers of the adjoint elasticity output class.
+ * \author T. Albring, R. Sanchez
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -40,19 +39,16 @@
 
 #include "COutput.hpp"
 
-/*! \class CDiscAdjFEAOutput
+/*! \class CAdjElasticityOutput
  *  \brief Output class for elasticity discrete adjoint problems.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CAdjElasticityOutput : public COutput {
+class CAdjElasticityOutput final : public COutput {
 private:
-  unsigned short nVar_FEM;
+  unsigned short nVar_FEM; //!< Number of FEM variables
 
 public:
-
-  ofstream HistFile;
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -62,29 +58,33 @@ class CAdjElasticityOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CAdjElasticityOutput(void);
-
-  void SetHistoryOutputFields(CConfig *config);
+  ~CAdjElasticityOutput(void) override;
+  
+  /*!
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryOutputFields(CConfig *config) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
 
   /*!
-   * \brief SetVolumeOutputFields
+   * \brief Set the available volume output fields
    * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
 
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
 
 };
diff --git a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
index fc8a12ae39a3..290c0208fb16 100644
--- a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_flow_inc_discadj.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CAdjFlowIncOutput.hpp
+ * \brief Headers of the adjoint incompressible flow output.
+ * \author T. Albring
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -40,18 +39,19 @@
 
 #include "COutput.hpp"
 
-/*! \class CDiscAdjFlowOutput
- *  \brief Output class for flow discrete adjoint problems.
+/*! \class CAdjFlowIncOutput
+ *  \brief Output class for incompressible flow discrete adjoint problems.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CAdjFlowIncOutput : public COutput {
+class CAdjFlowIncOutput final: public COutput {
 private:
   
-  bool cont_adj;
+  bool cont_adj; /*!< \brief Boolean indicating whether we run a cont. adjoint problem */ 
 
-  unsigned short turb_model;
-  bool heat, weakly_coupled_heat;
+  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
+  bool heat,                 /*!< \brief Boolean indicating whether have a heat problem*/ 
+  weakly_coupled_heat; /*!< \brief Boolean indicating whether have a weakly coupled heat equation*/ 
   
 public:
 
@@ -65,55 +65,59 @@ class CAdjFlowIncOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CAdjFlowIncOutput(void);
+  ~CAdjFlowIncOutput(void) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
-
-  void SetHistoryOutputFields(CConfig *config);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
+  
+  /*!
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryOutputFields(CConfig *config) override;
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver  - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
   
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
    */
-  bool SetUpdate_Averages(CConfig *config);
+  bool SetUpdate_Averages(CConfig *config) override;
 
 };
diff --git a/SU2_CFD/include/output/CAdjFlowOutput.hpp b/SU2_CFD/include/output/CAdjFlowOutput.hpp
index ca2e86718e71..5dc5e12fefff 100644
--- a/SU2_CFD/include/output/CAdjFlowOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_flow_discadj.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CAdjFlowCompOutput.hpp
+ * \brief Headers of the adjoint compressible flow output.
+ * \author T. Albring
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -40,20 +39,19 @@
 
 #include "COutput.hpp"
 
-/*! \class CDiscAdjFlowOutput
- *  \brief Output class for flow discrete adjoint problems.
+/*! \class CAdjFlowCompOutput
+ *  \brief Output class for compressible flow adjoint problems.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CAdjFlowCompOutput : public COutput {
+class CAdjFlowCompOutput final: public COutput {
 private:
-
-  bool cont_adj;
-  unsigned short turb_model;
+  
+  bool cont_adj; /*!< \brief Boolean indicating whether we run a cont. adjoint problem */ 
+  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
   
 public:
 
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -63,56 +61,59 @@ class CAdjFlowCompOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CAdjFlowCompOutput(void);
+  ~CAdjFlowCompOutput(void) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
-
-
-  void SetHistoryOutputFields(CConfig *config);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
+  
+  /*!
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetHistoryOutputFields(CConfig *config) override;
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver  - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
   
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
    */
-  bool SetUpdate_Averages(CConfig *config);
+  bool SetUpdate_Averages(CConfig *config) override;
 
 };
diff --git a/SU2_CFD/include/output/CAdjHeatOutput.hpp b/SU2_CFD/include/output/CAdjHeatOutput.hpp
index 9ba70f9c5ce0..032437a862cc 100644
--- a/SU2_CFD/include/output/CAdjHeatOutput.hpp
+++ b/SU2_CFD/include/output/CAdjHeatOutput.hpp
@@ -1,8 +1,7 @@
 /*!
  * \file output_fea_discadj.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \brief Headers of the adjoint heat output.
+ * \author T. Albring
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -40,18 +39,14 @@
 
 #include "COutput.hpp"
 
-/*! \class CDiscAdjFEAOutput
- *  \brief Output class for elasticity discrete adjoint problems.
+/*! \class CAdjHeatOutput
+ *  \brief Output class for adjoint heat output.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CAdjHeatOutput : public COutput {
-private:
-
+class CAdjHeatOutput final: public COutput {
 public:
 
-  ofstream HistFile;
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -61,41 +56,44 @@ class CAdjHeatOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CAdjHeatOutput(void);
-
-  void SetHistoryOutputFields(CConfig *config);
+   ~CAdjHeatOutput(void) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
-
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
+  
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);
-
-
+  void SetHistoryOutputFields(CConfig *config) override;
+  
   /*!
-   * \brief SetVolumeOutputFields
+   * \brief Set the available volume output fields
    * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
-
+  void SetVolumeOutputFields(CConfig *config) override;
+  
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
+  
+  /*!
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver  - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
 };
diff --git a/SU2_CFD/include/output/CBaselineOutput.hpp b/SU2_CFD/include/output/CBaselineOutput.hpp
index 98f9b4928a95..a68ff1a0335d 100644
--- a/SU2_CFD/include/output/CBaselineOutput.hpp
+++ b/SU2_CFD/include/output/CBaselineOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_baseline.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CBaselineOutput.hpp
+ * \brief  Headers of the baseline output.
+ * \author T. Albring
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -58,21 +57,21 @@ class CBaselineOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CBaselineOutput(void);
+  ~CBaselineOutput(void) override;
 
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
 
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
 
 };
diff --git a/SU2_CFD/include/output/CDriverOutput.hpp b/SU2_CFD/include/output/CDriverOutput.hpp
index c0b24ddf9c5d..28bcbbda0192 100644
--- a/SU2_CFD/include/output/CDriverOutput.hpp
+++ b/SU2_CFD/include/output/CDriverOutput.hpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_driver.hpp
+ * \file CDriverOutput.hpp
  * \brief Headers of the main subroutines for screen and history output in multizone problems.
  * \author R. Sanchez, T. Albring
  * \version 6.1.0 "Falcon"
@@ -60,13 +60,13 @@ using namespace std;
  * \brief Class for writing the multizone output.
  * \author R. Sanchez, T. Albring.
  */
-class CDriverOutput : public COutput {
+class CDriverOutput final: public COutput {
 
 protected:
-  unsigned short nZone;
+  unsigned short nZone; //!< Number of zones
   
-  string bgs_res_name;
-  bool write_zone;
+  string bgs_res_name; //!< Block-Gauss seidel residual name
+  bool write_zone;     //!< Boolean indicating whether the individual zones write to screen
   
 public:
 
@@ -78,38 +78,37 @@ class CDriverOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CDriverOutput(void);
+  ~CDriverOutput(void) override;
 
   /*!
-   * \brief Load the history file fields for multizone computations.
-   * \param[in] output - Output information of the particular multizone problem.
-   * \param[in] config - Definition of the particular multizone problem.
+   * \brief Load the multizone history output field values
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem.
    */
-  void LoadMultizoneHistoryData(COutput **output, CConfig **config);
+  void LoadMultizoneHistoryData(COutput **output, CConfig **config) override;
 
   /*!
-   * \brief Write the history output fields for multizone computations.
-   * \param[in] output - Output information of the particular multizone problem.
-   * \param[in] config - Definition of the particular multizone problem.
+   * \brief Set the available multizone history output fields
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem per zone.
    */
-  void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config);
+  void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) override;
 
-  /*! 
-   * \brief Determines if the screen header should be written.
+  /*!
+   * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Header(CConfig *config);
-
+  bool WriteHistoryFile_Output(CConfig *config) override;
+  
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Output(CConfig *config);
+  bool WriteScreen_Header(CConfig *config) override;
   
   /*!
-   * \brief Determines if the history file output.
+   * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config);
-
+  bool WriteScreen_Output(CConfig *config) override;
 };
diff --git a/SU2_CFD/include/output/CElasticityOutput.hpp b/SU2_CFD/include/output/CElasticityOutput.hpp
index 066c1ae1ed07..5d7d54509492 100644
--- a/SU2_CFD/include/output/CElasticityOutput.hpp
+++ b/SU2_CFD/include/output/CElasticityOutput.hpp
@@ -1,7 +1,6 @@
 /*!
- * \file output_fea.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \file CElasticityOutput.hpp
+ * \brief  Headers of the elasticity output.
  * \author F. Palacios, T. Economon, M. Colonno
  * \version 6.2.0 "Falcon"
  *
@@ -40,21 +39,19 @@
 
 #include "COutput.hpp"
 
-/*! \class CFEAOutput
+/*! \class CElasticityOutput
  *  \brief Output class for FEA problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 24, 2018.
  */
-class CElasticityOutput : public COutput {
-private:
-
+class CElasticityOutput final: public COutput {
 protected:
 
-  unsigned short nVar_FEM;
-  bool linear_analysis,
-       nonlinear_analysis,
-       dynamic;
-
+  unsigned short nVar_FEM; //!< Number of FEM variables
+  bool linear_analysis,    //!< Boolean indicating a linear analysis
+       nonlinear_analysis, //!< Boolean indicating a nonlinear analysis
+       dynamic;            //!< Boolean indicating a dynamic analysis
+ 
 public:
 
   /*!
@@ -66,33 +63,39 @@ class CElasticityOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CElasticityOutput(void);
+  ~CElasticityOutput(void) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
 
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config) override;
 
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   */
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override;
+  
+  /*!
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
-  bool SetInit_Residuals(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
 };
diff --git a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
index 0c7d14b32ba1..fa407f93c497 100644
--- a/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompFEMOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_flow_fem.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CFlowCompFEMOutput.hpp
+ * \brief  Headers of the compressible FEM flow output.
+ * \author R. Sanchez, T. Albring.
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -42,21 +41,16 @@
 
 class CVariable;
 
-/*! \class CFlowFEMOutput
- *  \brief Output class for compressible Flow problems.
+/*! \class CFlowCompFEMOutput
+ *  \brief Output class for the compressible FEM flow output.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowCompFEMOutput : public CFlowOutput {
+class CFlowCompFEMOutput final: public CFlowOutput {
 private:
   
-  unsigned short nVar;
-
-  unsigned short turb_model;
-  
-  bool grid_movement;
-  
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+  unsigned short nVar; //!< Number of variables
+  unsigned short turb_model; //!< Kind of turbulence model
 
 public:
 
@@ -69,70 +63,71 @@ class CFlowCompFEMOutput : public CFlowOutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowCompFEMOutput(void);
+  ~CFlowCompFEMOutput(void) override;
 
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeDataFEM
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iElem
-   * \param index
-   * \param dof
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iElem - Index of the element.
+   * \param[in] index - Index of the value.
+   * \param[in] dof - Index of the local degree of freedom.
    */
-  void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof);
+  void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                         unsigned long iElem, unsigned long index, unsigned short dof) override;
   
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryOutputFields(CConfig *config);
+  void SetHistoryOutputFields(CConfig *config) override;
 
   /*!
-   * \brief GetQ_Criterion
-   * \param config
-   * \param geometry
-   * \param node_flow
-   * \return 
+   * \brief Compute value of the Q criteration for vortex idenfitication
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] node_flow - The flow variable node
+   * \return Value of the Q criteration at the node
    */
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
    */
-  bool SetUpdate_Averages(CConfig *config);
+  bool SetUpdate_Averages(CConfig *config) override;
   
 };
diff --git a/SU2_CFD/include/output/CFlowCompOutput.hpp b/SU2_CFD/include/output/CFlowCompOutput.hpp
index 053c7084dc82..06385afeaba5 100644
--- a/SU2_CFD/include/output/CFlowCompOutput.hpp
+++ b/SU2_CFD/include/output/CFlowCompOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_flow.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CFlowCompOutput.hpp
+ * \brief  Headers of the compressible flow output.
+ * \author R. Sanchez, T. Albring.
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -42,18 +41,16 @@
 
 class CVariable;
 
-/*! \class CFlowOutput
- *  \brief Output class for compressible Flow problems.
+/*! \class CFlowCompOutput
+ *  \brief Output class for compressible flow problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowCompOutput : public CFlowOutput {
+class CFlowCompOutput final: public CFlowOutput {
 private:
   
-  unsigned short turb_model;
-    
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
-
+  unsigned short turb_model; //!< Kind of turbulence model
+   
 public:
 
   /*!
@@ -65,68 +62,70 @@ class CFlowCompOutput : public CFlowOutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowCompOutput(void);
+  ~CFlowCompOutput(void) override;
 
+  
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint); 
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override; 
   
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryOutputFields(CConfig *config);
-  
+  void SetHistoryOutputFields(CConfig *config) override;
+
   /*!
-   * \brief GetQ_Criterion
-   * \param config
-   * \param geometry
-   * \param node_flow
-   * \return 
+   * \brief Compute value of the Q criteration for vortex idenfitication
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] node_flow - The flow variable node
+   * \return Value of the Q criteration at the node
    */
   su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
    */
-  bool SetUpdate_Averages(CConfig *config);
+  bool SetUpdate_Averages(CConfig *config) override;
+
   
 };
diff --git a/SU2_CFD/include/output/CFlowIncOutput.hpp b/SU2_CFD/include/output/CFlowIncOutput.hpp
index f29da459209b..efb4c8cf0819 100644
--- a/SU2_CFD/include/output/CFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CFlowIncOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_flow_inc.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CFlowIncCompOutput.hpp
+ * \brief  Headers of the incompressible flow output.
+ * \author T. Albring, R. Sanchez
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -42,18 +41,17 @@
 
 class CVariable;
 
-/*! \class CIncFlowOutput
- *  \brief Output class for compressible Flow problems.
+/*! \class CFlowIncOutput
+ *  \brief Output class for incompressible flow problems.
  *  \author R. Sanchez, T. Albring.
  *  \date May 30, 2018.
  */
-class CFlowIncOutput : public CFlowOutput {
+class CFlowIncOutput final: public CFlowOutput {
 private:
 
-  unsigned short turb_model;
-  bool heat, weakly_coupled_heat;
-    
-  su2double RefDensity, RefPressure, RefVel2, factor, RefArea;
+  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
+  bool heat,                 /*!< \brief Boolean indicating whether have a heat problem*/ 
+  weakly_coupled_heat; /*!< \brief Boolean indicating whether have a weakly coupled heat equation*/ 
 
 public:
 
@@ -66,68 +64,68 @@ class CFlowIncOutput : public CFlowOutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowIncOutput(void);
-  
-  /*!
-   * \brief Set the history file header
-   * \param[in] config - Definition of the particular problem.
-   */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  ~CFlowIncOutput(void) override;
 
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Load the history output field values
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryOutputFields(CConfig *config);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex);  
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                       unsigned long iPoint, unsigned short iMarker, unsigned long iVertex) override;  
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override; 
   
   /*!
-   * \brief GetQ_Criterion
-   * \param config
-   * \param geometry
-   * \param node_flow
-   * \return 
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
+  void SetHistoryOutputFields(CConfig *config) override;
 
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Compute value of the Q criteration for vortex idenfitication
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] node_flow - The flow variable node
+   * \return Value of the Q criteration at the node
    */
-  bool SetInit_Residuals(CConfig *config);
+  su2double GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable *node_flow);
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetUpdate_Averages(CConfig *config);
+  bool SetInit_Residuals(CConfig *config) override;
   
+  /*!
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
+   */
+  bool SetUpdate_Averages(CConfig *config) override;
+
 };
diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index 61763cfbc49f..98b6e6f7e18f 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -1,7 +1,6 @@
 /*!
- * \file output_flow.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ * \file CFlowOutput.hpp
+ * \brief  Headers of the flow output.
  * \author F. Palacios, T. Economon, M. Colonno
  * \version 6.2.0 "Falcon"
  *
@@ -41,30 +40,58 @@
 #include "COutput.hpp"
 
 class CFlowOutput : public COutput{
-  
-  
 public:
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, unsigned short nDim, bool fem_output);
+  CFlowOutput(CConfig *config, unsigned short nDim, bool femOutput);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CFlowOutput(void);
+  ~CFlowOutput(void) override;
   
+  /*!
+   * \brief Add flow surface output fields
+   * \param[in] config - Definition of the particular problem.
+   */
   void AddAnalyzeSurfaceOutput(CConfig *config);
   
+  /*!
+   * \brief Set flow surface output field values
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Boolean indicating whether information should be written to screen
+   */
   void SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
   
+  /*!
+   * \brief Add aerodynamic coefficients as output fields
+   * \param[in] config - Definition of the particular problem.
+   */
   void AddAerodynamicCoefficients(CConfig *config);
   
+  /*!
+   * \brief  Set the value of the aerodynamic coefficients 
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] flow_solver - The container holding all solution data.
+   */
   void SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver);
   
+  /*!
+   * \brief Add CP inverse design output as history fields
+   * \param[in] config - Definition of the particular problem.
+   */
   void Add_CpInverseDesignOutput(CConfig *config);
   
-  void Set_CpInverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config);
+  /*!
+   * \brief Set CP inverse design output field values
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void Set_CpInverseDesign(CSolver *solver, CGeometry *geometry, CConfig *config);
   
 };
diff --git a/SU2_CFD/include/output/CHeatOutput.hpp b/SU2_CFD/include/output/CHeatOutput.hpp
index 5e2decb2e5d6..8a41c49f45b8 100644
--- a/SU2_CFD/include/output/CHeatOutput.hpp
+++ b/SU2_CFD/include/output/CHeatOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_heat.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CHeatOutput.hpp
+ * \brief  Headers of the heat output.
+ * \author R. Sanchez, T. Albring.
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -46,13 +45,9 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CHeatOutput : public COutput {
-private:
-  bool multizone;
-
+class CHeatOutput final: public COutput {
 public:
 
-
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
@@ -62,33 +57,32 @@ class CHeatOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CHeatOutput(void);
-
+  ~CHeatOutput(void) override;
+  
   /*!
-   * \brief Set the history file header
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
-  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver);
+  void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
   
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryOutputFields(CConfig *config);
-   
+  void SetVolumeOutputFields(CConfig *config) override;
+  
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override; 
   
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
- 
+  void SetHistoryOutputFields(CConfig *config) override;
 };
diff --git a/SU2_CFD/include/output/CMeshOutput.hpp b/SU2_CFD/include/output/CMeshOutput.hpp
index 3ecd402e8a52..8d2124f0d3b8 100644
--- a/SU2_CFD/include/output/CMeshOutput.hpp
+++ b/SU2_CFD/include/output/CMeshOutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output_mesh.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file CMeshOutput.hpp
+ * \brief  Headers of the mesh output.
+ * \author R. Sanchez, T. Albring.
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -45,7 +44,7 @@
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CMeshOutput : public COutput {
+class CMeshOutput final: public COutput {
 
 public:
 
@@ -58,21 +57,21 @@ class CMeshOutput : public COutput {
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CMeshOutput(void);
+  ~CMeshOutput(void) override;
 
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
-  void SetVolumeOutputFields(CConfig *config);
+  void SetVolumeOutputFields(CConfig *config) override;
 
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
-  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint);
+  void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint) override; 
 
 };
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index a4884d213988..67b2dd713084 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -1,8 +1,7 @@
 /*!
- * \file output.hpp
- * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
- * \author F. Palacios, T. Economon, M. Colonno
+ * \file COutput.hpp
+ * \brief Headers of the output class.
+ * \author T.Albring
  * \version 6.2.0 "Falcon"
  *
  * The current SU2 release has been coordinated by the
@@ -38,10 +37,9 @@
 
 #pragma once
 
-#include "../../../Common/include/mpi_structure.hpp"
-
 #include <fstream>
 #include <cmath>
+#include <map>
 #include <time.h>
 #include <sstream>
 #include <iomanip>
@@ -50,13 +48,13 @@
 
 #include "../../../Common/include/toolboxes/printing_toolbox.hpp"
 #include "../../../Common/include/toolboxes/signal_processing_toolbox.hpp"
+#include "../../../Common/include/option_structure.hpp"
 
 class CGeometry;
 class CSolver;
 class CFileWriter;
 class CParallelDataSorter;
-
-#include "COutputLegacy.hpp"
+class CConfig;
 
 using namespace std;
 
@@ -64,32 +62,37 @@ using namespace std;
  * \class COutput
  * \brief Class for writing the flow, adjoint and linearized solver 
  *        solution (including the history solution, and parallel stuff).
- * \author F. Palacios, T. Economon, M. Colonno.
+ * \author T.Albring
  */
 class COutput {
-
 protected:
   
-  CParallelDataSorter* data_sorter;
-  
-  COutputLegacy *output_legacy;
+  /*----------------------------- General ----------------------------*/  
+   
+  int rank,     /*!< \brief MPI Rank. */
+  size;         /*!< \brief MPI Size. */
 
-  vector<string> Variable_Names;
-
-  su2double RhoRes_New, *RhoRes_Old;
-
-  bool no_writing;
-
-protected:
-
-  int rank, 	  /*!< \brief MPI Rank. */
-  size;       	/*!< \brief MPI Size. */
-
-  unsigned short nDim;
+  unsigned short nDim;   /*!< \brief Physical Dimension */ 
   
-  unsigned short GlobalField_Counter; /*!< \brief Number of fields in the volume output */ 
-
-  unsigned short field_width;         /*!< \brief Width of each column for the screen output (hardcoded for now) */
+  bool multiZone,       /*!< \brief Boolean to store whether we are running a multizone problem */ 
+  gridMovement,         /*!< \brief Boolean to store whether we have grid movement enabled */ 
+  femOutput;            /*!< \brief Boolean to store whether we should use the FEM routines */ 
+  
+  /*----------------------------- Screen and history output ----------------------------*/  
+  
+  string historySep;              /*!< \brief Character which separates values in the history file */  
+  unsigned short fieldWidth;      /*!< \brief Width of each column for the screen output (hardcoded for now) */
+  bool noWriting;                 /*!< \brief Boolean indicating whether a screen/history output should be written */
+  unsigned long curTimeIter,      /*!< \brief Current value of the time iteration index */
+  curOuterIter,                   /*!< \brief Current value of the outer iteration index */
+  curInnerIter;                   /*!< \brief Current value of the inner iteration index */
+  
+  string historyFilename;       /*!< \brief The history filename*/
+  
+  /*! \brief Temporary variable to store the history filename */
+   char char_histfile[200];
+   /*! \brief Output file stream for the history */
+   ofstream histFile;
   
   /** \brief Enum to identify the screen output format. */
   enum ScreenOutputFormat {           
@@ -98,95 +101,136 @@ class COutput {
     FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
   };
   
+  /** \brief Enum to identify the screen/history field type. */  
   enum HistoryFieldType {           
-    TYPE_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
-    TYPE_AUTO_RESIDUAL,         /*!< \brief Integer format. Example: 34 */
-    TYPE_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
-    TYPE_AUTO_COEFFICIENT,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
-    TYPE_DEFAULT       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
+    TYPE_RESIDUAL,         /*!< \brief A user-defined residual field type*/
+    TYPE_AUTO_RESIDUAL,    /*!< \brief An automatically generated residual field type */
+    TYPE_COEFFICIENT,      /*!< \brief User defined coefficient field type  */
+    TYPE_AUTO_COEFFICIENT, /*!< \brief Automatically generated coefficient field type  */
+    TYPE_DEFAULT           /*!< \brief Default field type */  
   };
   
-  string HistorySep;                  /*!< \brief Character which separates values in the history file */
-  
   /** \brief Structure to store information for a history output field.
    * 
    *  The stored information is printed to the history file and to screen. 
    * Each individual instance represents a single field (i.e. column) in the history file or on screen.   
    */
   struct HistoryOutputField {
-    string              FieldName = "";    /*!< \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
-    su2double           Value = 0.0;        /*!< \brief The value of the field. */
-    unsigned short      ScreenFormat = FORMAT_FIXED; /*!< \brief The format that is used to print this value to screen. */
-    string              OutputGroup  ="";  /*!< \brief The group this field belongs to. */
-    unsigned short      FieldType = TYPE_DEFAULT;
-    string              Description = "";
-    HistoryOutputField() {}           /*!< \brief Default constructor. */
-    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, unsigned short fieldtype, string description):
-      FieldName(fieldname), Value(0.0), ScreenFormat(screenformat), OutputGroup(historyoutputgroup), FieldType(fieldtype), Description(description){}
+    /*! \brief The name of the field, i.e. the name that is printed in the screen or file header.*/
+    string              fieldName = ""; 
+    /*! \brief The value of the field. */
+    su2double           value = 0.0;
+    /*! \brief The format that is used to print this value to screen. */
+    unsigned short      screenFormat = FORMAT_FIXED; 
+    /*! \brief The group this field belongs to. */
+    string              outputGroup  ="";  
+    /*! \brief The field type*/
+    unsigned short      fieldType = TYPE_DEFAULT;
+    /*! \brief String containing the description of the field */
+    string              description = "";
+    /*! \brief Default constructor. */
+    HistoryOutputField() {}         
+    /*! \brief Constructor to initialize all members. */
+    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, 
+                       unsigned short fieldtype, string description):
+      fieldName(fieldname), value(0.0), screenFormat(screenformat),
+      outputGroup(historyoutputgroup), fieldType(fieldtype), description(description){}
   };
+
+  /*! \brief Associative map to access data stored in the history output fields by a string identifier. */
+  std::map<string, HistoryOutputField >         historyOutput_Map;
+  /*! \brief Vector that contains the keys of the ::historyOutput_Map in the order of their insertion. */
+  std::vector<string>                           historyOutput_List;      
+  /*! \brief Associative map to access data stored in the history per surface output fields by a string identifier. */
+  std::map<string, vector<HistoryOutputField> > historyOutputPerSurface_Map;  
+  /*! \brief Vector that contains the keys of the ::historyOutputPerSurface_Map in the order of their insertion. */
+  std::vector<string>                           historyOutputPerSurface_List;  
+
+  /*! \brief Requested history field names in the config file. */      
+  std::vector<string> requestedHistoryFields;
+  /*! \brief Number of requested history field names in the config file. */  
+  unsigned short nRequestedHistoryFields;
+  /*! \brief Requested screen field names in the config file. */  
+  std::vector<string> requestedScreenFields;
+  /*! \brief Number of requested screen field names in the config file. */    
+  unsigned short nRequestedScreenFields;
+
+  PrintingToolbox::CTablePrinter* convergenceTable;     //!< Convergence  output table structure
+  PrintingToolbox::CTablePrinter* multiZoneHeaderTable; //!< Multizone header output structure
+  std::string multiZoneHeaderString;                    //!< Multizone header string
+  
+  //! Structure to store the value of the running averages
+  map<string, Signal_Processing::RunningAverage> runningAverages; 
+  
+  //! Structure to store the value initial residuals for relative residual computation
+  std::map<string, su2double> initialResiduals;
+  
+   /*----------------------------- Volume output ----------------------------*/     
+   
+   CParallelDataSorter* volumeDataSorter;    //!< Volume data sorter
+   
+   vector<string> volumeFieldNames;     //!< Vector containing the volume field names
+   unsigned short nVolumeFields;        /*!< \brief Number of fields in the volume output */ 
   
+   string volumeFilename,               //!< Volume output filename
+   surfaceFilename,                     //!< Surface output filename
+   restartFilename;                     //!< Restart output filename
+   
   /** \brief Structure to store information for a volume output field.
    * 
    *  The stored information is used to create the volume solution file.   
    */
   struct VolumeOutputField {
-    string FieldName;          /*!< \brief The name of the field, i.e. the name that is printed in the file header.*/
-    int    Offset;             /*!< \brief This value identifies the position of the values of this field at each node in the ::Local_Data array. */
-    string OutputGroup;        /*!< \brief The group this field belongs to. */
-    string Description;    
-    VolumeOutputField () {}    /*!< \brief Default constructor. */
+    /*! \brief The name of the field, i.e. the name that is printed in the file header.*/
+    string fieldName;
+    /*! \brief This value identifies the position of the values of this field at each node in the ::Local_Data array. */
+    int    offset; 
+    /*! \brief The group this field belongs to. */
+    string outputGroup;
+    /*! \brief String containing the description of the field */
+    string description;
+    /*! \brief Default constructor. */
+    VolumeOutputField () {}
+    /*! \brief Constructor to initialize all members. */    
     VolumeOutputField(string fieldname, int offset, string volumeoutputgroup, string description):
-      FieldName(fieldname), Offset(offset), OutputGroup(volumeoutputgroup), Description(description){}
+      fieldName(fieldname), offset(offset), outputGroup(volumeoutputgroup), description(description){}
   };
-
-  std::map<string, HistoryOutputField >         HistoryOutput_Map;    /*!< \brief Associative map to access data stored in the history output fields by a string identifier. */
-  std::vector<string>                           HistoryOutput_List;   /*!< \brief Vector that contains the keys of the HistoryOutput_Map in the order of their insertion. */
-  std::map<string, vector<HistoryOutputField> > HistoryOutputPerSurface_Map; /*!< \brief Associative map to access data stored in the history per surface output fields by a string identifier. */
-  std::vector<string>                           HistoryOutputPerSurface_List;  /*!< \brief Vector that contains the keys of the HistoryOutputPerSurface_Map in the order of their insertion. */
-
-  std::map<string, VolumeOutputField >          VolumeOutput_Map;
-  std::vector<string>                           VolumeOutput_List;
-  std::vector<short>                            Offset_Cache;
-  unsigned short                                Offset_Cache_Index;
-  bool                                          Offset_Cache_Checked,
-                                                Build_Offset_Cache;
-  
-  std::vector<string> RequestedHistoryFields;
-  unsigned short nRequestedHistoryFields;
-  std::vector<string> RequestedScreenFields;
-  unsigned short nRequestedScreenFields;
-  std::vector<string> RequestedVolumeFields;
-  unsigned short nRequestedVolumeFields;
-  char char_histfile[200];
-
-  ofstream HistFile;
   
-  PrintingToolbox::CTablePrinter* ConvergenceTable;
-  PrintingToolbox::CTablePrinter* MultiZoneHeaderTable;
+  /*! \brief Associative map to access data stored in the volume output fields by a string identifier. */  
+  std::map<string, VolumeOutputField >          volumeOutput_Map;
+  /*! \brief Vector that contains the keys of the ::volumeOutput_Map in the order of their insertion. */  
+  std::vector<string>                           volumeOutput_List;
   
-  std::string MultiZoneHeaderString;
+  /*! \brief Vector to cache the positions of the field in the data array */
+  std::vector<short>                            fieldIndexCache;
+  /*! \brief Current value of the cache index */  
+  unsigned short                                curFieldIndex;
+  /*! \brief Boolean to store whether the field index cache should be build. */    
+  bool                                          buildFieldIndexCache;
   
-  std::map<string, su2double> Init_Residuals;
+
+  /*! \brief Requested volume field names in the config file. */    
+  std::vector<string> requestedVolumeFields;
+  /*! \brief Number of requested volume field names in the config file. */      
+  unsigned short nRequestedVolumeFields;
   
-  map<string, Signal_Processing::RunningAverage> RunningAverages;
+  /*----------------------------- Convergence monitoring ----------------------------*/     
+
+  su2double cauchyValue,         /*!< \brief Summed value of the convergence indicator. */
+  cauchyFunc;                    /*!< \brief Current value of the convergence indicator at one iteration. */
+  unsigned short Cauchy_Counter; /*!< \brief Number of elements of the Cauchy serial. */
+  su2double *cauchySerie;        /*!< \brief Complete Cauchy serial. */
+  su2double oldFunc,             /*!< \brief Old value of the coefficient. */
+  newFunc;                       /*!< \brief Current value of the coefficient. */
+  bool convergence;              /*!< \brief To indicate if the solver  has converged or not. */
+  su2double initResidual;        /*!< \brief Initial value of the residual to evaluate the convergence level. */
+  string convField;              /*!< \brief Name of the field to be monitored for convergence */
   
-  bool multizone, grid_movement, fem_output;
+  /*----------------------------- Adaptive CFL ----------------------------*/     
   
-  string VolumeFilename, SurfaceFilename, RestartFilename, HistoryFilename;
+  su2double rhoResNew,    /*!< New value of the residual for adaptive CFL routine */
+  rhoResOld;              /*!< Old value of the residual for adaptive CFL routine */
   
-  unsigned long curr_TimeIter, curr_OuterIter, curr_InnerIter;
-    
-  su2double Cauchy_Value,  /*!< \brief Summed value of the convergence indicator. */
-  Cauchy_Func;      /*!< \brief Current value of the convergence indicator at one iteration. */
-  unsigned short Cauchy_Counter;  /*!< \brief Number of elements of the Cauchy serial. */
-  su2double *Cauchy_Serie;      /*!< \brief Complete Cauchy serial. */
-  su2double Old_Func,  /*!< \brief Old value of the objective function (the function which is monitored). */
-  New_Func;      /*!< \brief Current value of the objective function (the function which is monitored). */
-  bool Convergence,    /*!< \brief To indicate if the flow solver (direct, adjoint, or linearized) has converged or not. */
-  Convergence_FSI,    /*!< \brief To indicate if the FSI problem has converged or not. */
-  Convergence_FullMG;    /*!< \brief To indicate if the Full Multigrid has converged and it is necessary to add a new level. */
-  su2double InitResidual;  /*!< \brief Initial value of the residual to evaluate the convergence level. */
-  string Conv_Field;
 public:
   
   /*----------------------------- Public member functions ----------------------------*/
@@ -194,17 +238,11 @@ class COutput {
   /*! 
    * \brief Constructor of the class. 
    */
-  COutput(CConfig *config, unsigned short nDim, bool fem_output);
-  
-  /*! 
-   * \brief Destructor of the class. 
-   */
-  virtual ~COutput(void);  
+  COutput(CConfig *config, unsigned short nDim, bool femOutput);
 
   /*!
    * \brief Preprocess the volume output by setting the requested volume output fields.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
    */
   void PreprocessVolumeOutput(CConfig *config);   
   
@@ -225,6 +263,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] format - The data format of the output files.
+   * \param[in] time_dep - Indicates whether time dependent files should be written.
    */
   void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
   
@@ -233,6 +272,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] format - The data format of the output files.
+   * \param[in] time_dep - Indicates whether time dependent files should be written.   
    */
   void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
   
@@ -250,93 +290,90 @@ class COutput {
   
   /*!
    * \brief Preprocess the history output by setting the history fields and opening the history file.
-   * \param[in] config - Definition of the particular problem.
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem per zone.
    * \param[in] wrt - If <TRUE> prepares history file for writing.
    */
   void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt = true);  
   
-  
   /*!
-   * \brief SetHistory_Output
-   * \param geometry
-   * \param solver_container
-   * \param config
-   * \param TimeIter
-   * \param OuterIter
-   * \param InnerIter
+   * \brief Collects history data from the solvers, monitors the convergence and writes to screen and history file.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] TimeIter - Value of the time iteration index
+   * \param[in] OuterIter - Value of outer iteration index
+   * \param[in] InnerIter - Value of the inner iteration index
    */
-  void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config,unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter);  
+  void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config,
+                         unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter);  
   
   
   /*!
-   * \brief SetHistory_Output
+   * \brief Collects history data from the solvers and monitors the convergence.
+   * Does not write to screen or file.
    * \param geometry
    * \param solver_container
    * \param config
-   * \param TimeIter
-   * \param OuterIter
-   * \param InnerIter
    */
   void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config);  
   
-  
-  void SetMultizoneHistory_Output(COutput** output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter);
-  
-  /*! 
-   * \brief Returns a pointer to the legacy output class needed for some old driver implementations.
-   * \return - Returns a pointer to the legacy output class.
+  /*!
+   *  Collects history data from the individual output per zone,
+   *  monitors the convergence and writes to screen and history file.
+   
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] driver_config - Base definition of the particular problem.
+   * \param[in] TimeIter - Value of the time iteration index
+   * \param[in] OuterIter - Value of outer iteration index
    */
-  inline COutputLegacy* GetLegacyOutput(){return output_legacy;}
-
+  void SetMultizoneHistory_Output(COutput** output, CConfig **config, CConfig *driver_config, 
+                                  unsigned long TimeIter, unsigned long OuterIter);
+ 
   /*!
    * \brief Sets the volume output filename
    * \param[in] filename - the new filename
    */
-  inline void SetVolume_Filename(string filename) {VolumeFilename = filename;}
+  inline void SetVolume_Filename(string filename) {volumeFilename = filename;}
   
   /*!
    * \brief Sets the surface output filename
    * \param[in] filename - the new filename
    */
-  inline void SetSurface_Filename(string filename) {SurfaceFilename = filename;}
+  inline void SetSurface_Filename(string filename) {surfaceFilename = filename;}
   
   /*!
    * \brief Returns the current volume filename
    * \return - The current volume filename
    */
-  inline string GetVolume_Filename() {return VolumeFilename;}
+  inline string GetVolume_Filename() {return volumeFilename;}
   
   /*!
    * \brief Returns the current surface filename
    * \return - The current surface filename
    */
-  inline string GetSurface_Filename() {return SurfaceFilename;}
-  
+  inline string GetSurface_Filename() {return surfaceFilename;}
   
   /*!
    * \brief Sets the restart filename
    * \param[in] filename - the new filename
    */
-  inline void SetRestart_Filename(string filename) {RestartFilename = filename;}
+  inline void SetRestart_Filename(string filename) {restartFilename = filename;}
     
   /*!
    * \brief Returns the current restart filename
    * \return - The current restart filename
    */
-  inline string GetRestart_Filename() {return RestartFilename;}
+  inline string GetRestart_Filename() {return restartFilename;}
   
   /*!
-   * \brief Write the history file and the convergence on the screen for serial computations.
-   * \param[in] ConvHist_file - Pointer to the convergence history file (which is defined in the main subroutine).
-   * \param[in] geometry - Geometrical definition of the problem.
+   * \brief Set the CFL number based on the current residuals
    * \param[in] solver_container - Container vector with all the solutions.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] integration - Generic subroutines for space integration, time integration, and monitoring.
-   * \param[in] iExtIter - Current external (time) iteration.
-   * \param[in] timeused - Current number of clock tick in the computation (related with total time).
-   * \param[in] val_nZone - iZone index.
    */
-  void SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone);  
+  void SetCFL_Number(CSolver ****solver_container, CConfig *config);  
   
   /*!
    * \brief Set the current iteration indices
@@ -345,41 +382,79 @@ class COutput {
    * \param[in] InnerIter - Inner iteration index
    */
   inline void SetIteration(unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter){
-    curr_TimeIter  = TimeIter;
-    curr_OuterIter = OuterIter;
-    curr_InnerIter = InnerIter;
+    curTimeIter  = TimeIter;
+    curOuterIter = OuterIter;
+    curInnerIter = InnerIter;
   }
   
+  /*!
+   * \brief Get the value of particular history output field
+   * \param[in] field - Name of the field
+   * \return Value of the field
+   */
   su2double GetHistoryFieldValue(string field){
-    return HistoryOutput_Map[field].Value;
+    return historyOutput_Map[field].value;
   }
   
+  /*!
+   * \brief Get a vector with all output fields in a particular group
+   * \param groupname - Name of the history group
+   * \return Vector containing all output fields of a group 
+   */
   vector<HistoryOutputField> GetHistoryGroup(string groupname){
     vector<HistoryOutputField> HistoryGroup;  
-    for (unsigned short iField = 0; iField < HistoryOutput_Map.size(); iField++){   
-      if (HistoryOutput_Map[HistoryOutput_List[iField]].OutputGroup == groupname){
-        HistoryGroup.push_back((HistoryOutput_Map[HistoryOutput_List[iField]]));
+    for (unsigned short iField = 0; iField < historyOutput_Map.size(); iField++){   
+      if (historyOutput_Map[historyOutput_List[iField]].outputGroup == groupname){
+        HistoryGroup.push_back((historyOutput_Map[historyOutput_List[iField]]));
       }
     }
     return HistoryGroup;
   }
   
+  /*!
+   * \brief Get the list of all output fields
+   * \return Vector container all output fields
+   */
   vector<string> GetHistoryOutput_List(){
-    return HistoryOutput_List;
+    return historyOutput_List;
   }
   
+  /*!
+   * \brief Get the map containing all output fields
+   * \return Map containing all output fields
+   */
   map<string, HistoryOutputField> GetHistoryFields(){
-    return HistoryOutput_Map;
+    return historyOutput_Map;
   }
   
+  /*!
+   * \brief Monitor the convergence of an output field
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] Iteration - Index of the current iteration.
+   * \return Boolean indicating whether the problem is converged.
+   */
   bool Convergence_Monitoring(CConfig *config, unsigned long Iteration);
 
-  bool GetConvergence() {return Convergence;}
+  /*!
+   * \brief Get convergence of the problem.
+   * \return Boolean indicating whether the problem is converged.
+   */
+  bool GetConvergence() {return convergence;}
 
-  void SetConvergence(bool conv) {Convergence = conv;}
+  /*!
+   * \brief Set the value of the convergence flag.
+   * \param[in] conv - New value of the convergence flag.
+   */
+  void SetConvergence(bool conv) {convergence = conv;}
   
+  /*!
+   * \brief Print a list of all history output fields to screen.
+   */
   void PrintHistoryFields();
   
+  /*!
+   * \brief Print a list of all volume output fields to screen.
+   */
   void PrintVolumeFields();
 
 protected:
@@ -432,8 +507,8 @@ class COutput {
    * \param[in] field_type - The type of the field (::HistoryFieldType).
    */
   inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, string description, unsigned short field_type = TYPE_DEFAULT ){
-    HistoryOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type, description);
-    HistoryOutput_List.push_back(name);
+    historyOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type, description);
+    historyOutput_List.push_back(name);
   }
   
   /*!
@@ -442,8 +517,8 @@ class COutput {
    * \param[in] value - The new value of this field.
    */
   inline void SetHistoryOutputValue(string name, su2double value){
-    if (HistoryOutput_Map.count(name) > 0){
-      HistoryOutput_Map[name].Value = value;
+    if (historyOutput_Map.count(name) > 0){
+      historyOutput_Map[name].value = value;
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
     }
@@ -460,9 +535,9 @@ class COutput {
    */
   inline void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type = TYPE_DEFAULT){
     if (marker_names.size() != 0){
-      HistoryOutputPerSurface_List.push_back(name);
+      historyOutputPerSurface_List.push_back(name);
       for (unsigned short i = 0; i < marker_names.size(); i++){
-        HistoryOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type, ""));
+        historyOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type, ""));
       }
     }
   }
@@ -474,8 +549,8 @@ class COutput {
    * \param[in] iMarker - The index of the marker.
    */
   inline void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker){
-    if (HistoryOutputPerSurface_Map.count(name) > 0){
-      HistoryOutputPerSurface_Map[name][iMarker].Value = value;
+    if (historyOutputPerSurface_Map.count(name) > 0){
+      historyOutputPerSurface_Map[name][iMarker].value = value;
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
     }
@@ -489,8 +564,8 @@ class COutput {
    * \param[in] description - Description of the volume field.
    */
   inline void AddVolumeOutput(string name, string field_name, string groupname, string description){
-    VolumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname, description);
-    VolumeOutput_List.push_back(name);
+    volumeOutput_Map[name] = VolumeOutputField(field_name, -1, groupname, description);
+    volumeOutput_List.push_back(name);
   }
   
   /*!
@@ -499,17 +574,16 @@ class COutput {
    * \param[in] value - The new value of this field.
    */
   void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
-  
-  /*!
-   * \brief CheckOffsetCache
-   */
-  void CheckOffsetCache();
-  
+
   /*!
    * \brief CheckHistoryOutput
    */
   void CheckHistoryOutput();
   
+  /*!
+   * \brief Open the history file and write the header.
+   * \param[in] config - Definition of the particular problem.
+   */
   void PrepareHistoryFile(CConfig *config);
 
   /*!
@@ -534,7 +608,7 @@ class COutput {
   void Postprocess_HistoryFields(CConfig *config);
   
   /*!
-   * \brief Create and write the file with the FSI convergence history.
+   * \brief Check whether we should print output.
    * \param[in] iIter - Current iteration.
    * \param[in] iFreq - Frequency of output printing.
    */
@@ -546,7 +620,27 @@ class COutput {
     return (iIter % iFreq == 0);
   } 
   
+  /*!
+   * \brief Set the history fields common for all solvers.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetCommonHistoryFields(CConfig *config);
+  
+  /*!
+   * \brief Load values of the history fields common for all solvers.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void LoadCommonHistoryData(CConfig *config);
+  
   /*--------------------------------- Virtual functions ---------------------------------------- */
+public:
+  
+  /*! 
+   * \brief Destructor of the class. 
+   */
+  virtual ~COutput(void);  
+
+protected:
   
   /*!
    * \brief Determines if the history file output.
@@ -567,86 +661,84 @@ class COutput {
   virtual bool WriteScreen_Output(CConfig *config);
 
   /*!
-   * \brief LoadVolumeData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
    */
   inline virtual void LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){}
   
   /*!
-   * \brief LoadVolumeDataFEM
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iElem
-   * \param index
-   * \param dof
+   * \brief Set the values of the volume output fields for a point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iElem - Index of the element.
+   * \param[in] index - Index of the value.
+   * \param[in] dof - Index of the local degree of freedom.
    */
-  inline virtual void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iElem, unsigned long index, unsigned short dof){}  
+  inline virtual void LoadVolumeDataFEM(CConfig *config, CGeometry *geometry, CSolver **solver, 
+                                        unsigned long iElem, unsigned long index, unsigned short dof){}  
   
   /*!
-   * \brief SetInit_Residuals
-   * \param config
-   * \return 
+   * \brief Check whether the base values for relative residuals should be initialized
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> if the residuals should be initialized.
    */
   inline virtual bool SetInit_Residuals(CConfig *config) {return false;}
   
   /*!
-   * \brief SetUpdate_Averages
-   * \param config
-   * \param dualtime
-   * \return 
+   * \brief Check whether the averaged values should be updated
+   * \param[in] config - Definition of the particular problem.
+   * \return <TRUE> averages should be updated.
    */
   inline virtual bool SetUpdate_Averages(CConfig *config){return false;}
   
   /*!
-   * \brief LoadSurfaceData
-   * \param config
-   * \param geometry
-   * \param solver
-   * \param iPoint
-   * \param iMarker
-   * \param iVertex
+   * \brief Set the values of the volume output fields for a surface point.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver - The container holding all solution data.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] iMarker - Index of the surface marker.
+   * \param[in] iVertex - Index of the vertex on the marker.
    */
-  inline virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){}
+  inline virtual void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver,
+                                      unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){}
   
   /*!
-   * \brief SetVolumeOutputFields
-   * \param config
+   * \brief Set the available volume output fields
+   * \param[in] config - Definition of the particular problem.
    */
   inline virtual void SetVolumeOutputFields(CConfig *config){}
   
   
   /*!
-   * \brief Load the output data to the containers in each subclass
+   * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
   inline virtual void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {}
 
   /*!
-   * \brief Load the output data to the containers in each subclass
+   * \brief Load the multizone history output field values
+   * \param[in] output - Container holding the output instances per zone.   
    * \param[in] config - Definition of the particular problem.
    */
   inline virtual void LoadMultizoneHistoryData(COutput **output, CConfig **config) {}  
   
   /*!
-   * \brief SetHistoryOutputFields
-   * \param config
+   * \brief Set the available history output fields
+   * \param[in] config - Definition of the particular problem.
    */
   inline virtual void SetHistoryOutputFields(CConfig *config) {}
   
   /*!
-   * \brief SetMultizoneHistoryOutputFields
-   * \param output
-   * \param solver
-   * \param config
+   * \brief Set the available multizone history output fields
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem per zone.
    */
   inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
 
-  inline void SetCommonHistoryFields(CConfig *config);
-  
-  inline void LoadCommonHistoryData(CConfig *config);
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
index bcab5ffa0e13..430f1aa4ea76 100644
--- a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
@@ -1,16 +1,65 @@
+/*!
+ * \file CCSVFileWriter.hpp
+ * \brief Headers fo the CSV file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "CFileWriter.hpp"
 
-class CCSVFileWriter : public CFileWriter{
+class CCSVFileWriter final: public CFileWriter{
   
-
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CCSVFileWriter(vector<string> fields, unsigned short nDim);
   
-  ~CCSVFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CCSVFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in CSV file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
index 2309e1fcbe8e..3a9fa6a73ea6 100644
--- a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
@@ -1,20 +1,67 @@
+/*!
+ * \file CFEMDataSorter.hpp
+ * \brief Headers fo the FEM data sorter class.
+ * \author T. Albring, T. Economon
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "CParallelDataSorter.hpp"
 
-class CFEMDataSorter : public CParallelDataSorter{
+class CFEMDataSorter final: public CParallelDataSorter{
 
 public:
+  
+  /*!
+   * \brief Constructor
+   * \param[in] config - Pointer to the current config structure
+   * \param[in] geometry - Pointer to the current geometry
+   * \param[in] nFields - Number of output fields
+   */
   CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
   
-  ~CFEMDataSorter();
+  /*!
+   * \brief Destructor
+   */
+  ~CFEMDataSorter() override;
   
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void SortOutputData(CConfig *config, CGeometry *geometry);
+  void SortOutputData() override;
   
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
@@ -22,20 +69,16 @@ class CFEMDataSorter : public CParallelDataSorter{
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
-  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) override;
   
   /*!
-   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
-   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
+   * \brief Get the global index of a point.
+   * \input iPoint - the point ID.
+   * \return Global index of a specific point.
    */
-  void DeallocateConnectivity_Parallel(bool surf_sol);
-  
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   */
-  void DeallocateData_Parallel();
-  
-  unsigned long GetGlobalIndex(unsigned long iPoint) { return beg_node[rank] + iPoint; }
+  unsigned long GetGlobalIndex(unsigned long iPoint) override{ 
+    return linearPartitioner->GetFirstIndexOnRank(rank) + iPoint;
+  }
   
 private:
   
diff --git a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
index ace46ce3ac1e..b65172005468 100644
--- a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
@@ -1,25 +1,72 @@
+/*!
+ * \file CFVMDataSorter.hpp
+ * \brief Headers fo the FVM data sorter class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "CParallelDataSorter.hpp"
 #include <vector>
 
-class CFVMDataSorter : public CParallelDataSorter{
+class CFVMDataSorter final: public CParallelDataSorter{
   
 private:
-  int* Local_Halo;
   
+  int* Local_Halo; //!< Array containing the flag whether a point is a halo node
 
 public:
+  
+  /*!
+   * \brief Constructor
+   * \param[in] config - Pointer to the current config structure
+   * \param[in] geometry - Pointer to the current geometry
+   * \param[in] nFields - Number of output fields
+   */
   CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
   
-  ~CFVMDataSorter();
+  /*!
+   * \brief Destructor
+   */
+  ~CFVMDataSorter() override;
   
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void SortOutputData(CConfig *config, CGeometry *geometry);
+  void SortOutputData() override;
   
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
@@ -27,14 +74,31 @@ class CFVMDataSorter : public CParallelDataSorter{
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
-  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) override;
   
-  unsigned long GetGlobalIndex(unsigned long iPoint) { return beg_node[rank] + iPoint; }
+  /*!
+   * \brief Get the global index of a point.
+   * \input iPoint - the point ID.
+   * \return Global index of a specific point.
+   */
+  unsigned long GetGlobalIndex(unsigned long iPoint) override { 
+    return linearPartitioner->GetFirstIndexOnRank(rank) + iPoint;
+  }
   
-  bool GetHalo(unsigned long iPoint){return Local_Halo[iPoint];}
+  /*!
+   * \brief Get the boolean whether a point is a halo node
+   * \param[in] iPoint - ID of the point
+   * \return <TRUE> if the point is a halo node.
+   */
+  bool GetHalo(unsigned long iPoint) {return Local_Halo[iPoint];}
   
 private:
   
+  /*!
+   * \brief Initialize the halo point flags
+   * \param[in] geometry - Pointer to the current geometry
+   * \param[in] config - Pointer to the current config structure
+   */
   void SetHaloPoints(CGeometry *geometry, CConfig *config);
   
   /*!
diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index 9fc178d4acdf..0485c71d2e8d 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -1,3 +1,40 @@
+/*!
+ * \file CFileWriter.hpp
+ * \brief Headers fo the file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "../../../Common/include/mpi_structure.hpp"
 #include "../../../Common/include/option_structure.hpp"
@@ -14,62 +51,84 @@ using namespace std;
 class CFileWriter{
 protected:
 
+  /*!
+   * \brief Vector containing the field names
+   */
   std::vector<std::string> fieldnames;
+  
+  /*!
+   * \brief The physical dimension of the problem
+   */
   unsigned short nDim;
   
-  int rank, size;
+  /*!
+   * \brief The MPI rank
+   */
+  int rank;
+  
+  /*!
+   * \brief The MPI size, aka the number of processors.
+   */
+  int size;
   
+  /*!
+   * \brief The file extension to be attached to the filename.
+   */
   std::string file_ext;
   
-  su2double StartTime, StopTime, UsedTime, Bandwidth, file_size;
+  su2double StartTime, /*!< \brief Start time for time measurement  */
+            StopTime , /*!< \brief Stop time for time measurement  */
+            UsedTime , /*!< \brief Used time for time measurement  */
+            Bandwidth, /*!< \brief Used bandwidth  */
+            file_size; /*!< \brief Size of the last written file  */
+  
+  /*!
+   * \brief Determine the file size
+   * \param[in] filename - Name of the file.
+   * \return 
+   */
+  inline unsigned long Determine_Filesize(std::string filename){
+      struct stat stat_buf;
+      int rc = stat(filename.c_str(), &stat_buf);
+      return rc == 0 ? stat_buf.st_size : -1;
+  }
   
 public:
   /*!
-   * \brief CFileWriter
-   * \param fields
-   * \param nDim
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] file_ext - The file extension to be attached to the filename
+   * \param[in] nDim - Physical dimension
    */  
-  CFileWriter(std::vector<std::string> fields, unsigned short nDim);
+  CFileWriter(std::vector<std::string> fields, string file_ext, unsigned short nDim);
   
   /*!
-   * \brief ~CFileWriter
+   * \brief Destructor
    */
   virtual ~CFileWriter();
   
   /*!
-   * \brief Write_Data
-   * \param filename
-   * \param data_sorter
+   * \brief Write sorted data to file
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
    */
   virtual void Write_Data(std::string filename, CParallelDataSorter* data_sorter){}
   
   /*!
-   * \brief Get_Bandwidth
+   * \brief Get the bandwith used for the last writing
    */
   su2double Get_Bandwidth(){return Bandwidth;}
   
   /*!
-   * \brief Get_Filesize
+   * \brief Get the filesize of the last written file.
    */
   su2double Get_Filesize(){return file_size;}
   
   /*!
-   * \brief Get_UsedTime
+   * \brief Get the used time of the last file writing.
    * \return 
    */
   su2double Get_UsedTime(){return UsedTime;}
- 
-protected:
-  /*!
-   * \brief Determine_Filesize
-   * \param filename
-   * \return 
-   */
-  unsigned long Determine_Filesize(std::string filename){
-      struct stat stat_buf;
-      int rc = stat(filename.c_str(), &stat_buf);
-      return rc == 0 ? stat_buf.st_size : -1;
-  }
-  
+
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 05a38b31b9d3..29b8cc3bf6d6 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -1,7 +1,45 @@
+/*!
+ * \file CParallelDataSorter.hpp
+ * \brief Headers fo the data sorter class.
+ * \author T. Albring, T. Economon
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "../../../Common/include/mpi_structure.hpp"
 #include "../../../Common/include/option_structure.hpp"
+#include "../../../Common/include/toolboxes/CLinearPartitioner.hpp"
 
 class CGeometry;
 class CConfig;
@@ -9,67 +47,82 @@ class CConfig;
 class CParallelDataSorter{
 protected:
   
-  int rank; 
+  /*!
+   * \brief The MPI rank
+   */
+  int rank;
+  
+  /*!
+   * \brief The MPI size, aka the number of processors.
+   */
   int size;
   
-  unsigned long nGlobal_Poin_Par;   // Global number of nodes with halos
-  unsigned long nGlobal_Elem_Par;  // Global number of elems without halos
-  unsigned long nParallel_Poin;
-  unsigned long nParallel_Line,
-  nParallel_Tria,
-  nParallel_Quad,
-  nParallel_Tetr,
-  nParallel_Hexa,
-  nParallel_Pris,
-  nParallel_Pyra;
-  int *Conn_Line_Par;
-  int *Conn_Tria_Par;  // triangle 1 = Conn_Tria[0], Conn_Tria[1], Conn_Tria[3]
-  int *Conn_Quad_Par;
-  int *Conn_Tetr_Par;
-  int *Conn_Hexa_Par;
-  int *Conn_Pris_Par;
-  int *Conn_Pyra_Par;
-  
-  unsigned long nGlobalPoint_Sort;
-  unsigned long nLocalPoint_Sort;
-  unsigned long nPoint_Restart;
-
-  unsigned long *beg_node;
-  unsigned long *end_node;
+  unsigned long nGlobal_Poin_Par;  //!< Global number of points without halos before sorting
+  unsigned long nGlobal_Elem_Par;  //!< Global number of elems without halos before sorting
+  unsigned long nParallel_Poin;    //!< Local number of points after sorting on this proc
+  unsigned long nParallel_Line,    //!< Local number of line elements after sorting on this proc
+  nParallel_Tria,                  //!< Local number of triangle elements after sorting on this proc
+  nParallel_Quad,                  //!< Local number of quad elements after sorting on this proc
+  nParallel_Tetr,                  //!< Local number of tetrahedral elements after sorting on this proc
+  nParallel_Hexa,                  //!< Local number of hexhedral elements after sorting on this proc
+  nParallel_Pris,                  //!< Local number of prism elements after sorting on this proc
+  nParallel_Pyra;                  //!< Local number of pyramid elements after sorting on this proc
+  int *Conn_Line_Par;              //!< Local connectivity of line elements after sorting on this proc
+  int *Conn_Tria_Par;              //!< Local connectivity of triangle elements after sorting on this proc
+  int *Conn_Quad_Par;              //!< Local connectivity of quad elements after sorting on this proc
+  int *Conn_Tetr_Par;              //!< Local connectivity of tetrahedral elements after sorting on this proc
+  int *Conn_Hexa_Par;              //!< Local connectivity of hexahedral elements after sorting on this proc
+  int *Conn_Pris_Par;              //!< Local connectivity of prism elements after sorting on this proc
+  int *Conn_Pyra_Par;              //!< Local connectivity of pyramid elements after sorting on this proc
+  
+  unsigned long nGlobalPoint_Sort; //!< Global number of points without halos after sorting 
+  unsigned long nLocalPoint_Sort;  //!< Local number of points without halos after sorting on this proc
 
-  unsigned long *nPoint_Lin;
-  unsigned long *nPoint_Cum;
   
-  unsigned short GlobalField_Counter;
+  CLinearPartitioner* linearPartitioner;  //!< Linear partitioner based on the global number of points.
   
-  su2double** Parallel_Data;
+  unsigned short GlobalField_Counter;  //!< Number of output fields
+  su2double** Parallel_Data;           //!< Array holding the output data after sorting
   
-  bool connectivity_sorted; 
+  bool connectivity_sorted;            //!< Boolean to store information on whether the connectivity is sorted
   
-  int *nPoint_Send;
-  int *nPoint_Recv;
-  unsigned long *Index;
-  su2double *connSend;
-  unsigned long *idSend;
-  int nSends, nRecvs;
-
+  int *nPoint_Send;                    //!< Number of points this processor has to send to other processors
+  int *nPoint_Recv;                    //!< Number of points this processor receives from other processors
+  unsigned long *Index;                //!< Index each point has in the send buffer
+  su2double *connSend;                 //!< Send buffer holding the data that will be send to other processors
+  unsigned long *idSend;               //!< Send buffer holding global indices that will be send to other processors
+  int nSends,                          //!< Number of sends
+  nRecvs;                              //!< Number of receives
+  
+  /*!
+   * \brief Prepare the send buffers by filling them with the global indices. 
+   * After calling this function, the data buffer for sending can be filled with the
+   * ::SetUnsorted_Data() routine.
+   * \param[in] globalID - Vector containing the global indices of the points
+   */
   void PrepareSendBuffers(std::vector<unsigned long>& globalID);  
 
 public:
   
+  /*!
+   * \brief Constructor
+   * \param[in] config - Pointer to the current config structure
+   * \param[in] nFields - Number of output fields
+   */
   CParallelDataSorter(CConfig *config, unsigned short nFields);
   
+  /*!
+   * \brief Destructor
+   */
   virtual ~CParallelDataSorter();
   
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
    */
-  virtual void SortOutputData(CConfig *config, CGeometry *geometry){}
+  virtual void SortOutputData(){}
 
   /*!
-   * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
+   * \brief Sort the connectivities (volume and surface) into data structures.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
@@ -121,14 +174,14 @@ class CParallelDataSorter{
    * \input rank - the processor rank.
    * \return The beginning node ID.
    */
-  unsigned long GetNodeBegin(unsigned short rank){return beg_node[rank];}
+  unsigned long GetNodeBegin(unsigned short rank){return linearPartitioner->GetFirstIndexOnRank(rank);}
   
   /*!
    * \brief Ending node ID of the linear partition owned by a specific processor.
    * \input rank - the processor rank.
    * \return The ending node ID.
    */
-  unsigned long GetNodeEnd(unsigned short rank){return end_node[rank];}
+  unsigned long GetNodeEnd(unsigned short rank){return linearPartitioner->GetLastIndexOnRank(rank);}
   
   /*!
    * \brief Get the value of the linear partitioned data.
@@ -150,44 +203,29 @@ class CParallelDataSorter{
    * \input rank - the processor rank.
    * \return The cumulated number of points up to certain processor rank.
    */
-  unsigned long GetnPointCumulative(unsigned short rank){return nPoint_Cum[rank];}
+  unsigned long GetnPointCumulative(unsigned short rank){return linearPartitioner->GetCumulativeSizeBeforeRank(rank);}
   
   /*!
    * \brief Get the linear number of points
    * \input rank - the processor rank.
    * \return The linear number of points up to certain processor rank.
    */
-  unsigned long GetnPointLinear(unsigned short rank){return nPoint_Lin[rank];}  
+  unsigned long GetnPointLinear(unsigned short rank){return linearPartitioner->GetSizeOnRank(rank);}  
   
   /*!
    * \brief Check whether the current connectivity is sorted (i.e. if SortConnectivity has been called)
    * \return <TRUE> if the connectivity is sorted.
    */  
   bool GetConnectivitySorted(){return connectivity_sorted;}
-
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   */
-  void DeallocateData();
   
   /*!
-   * \brief Deallocate temporary memory needed for merging and writing connectivity in parallel.
-   * \param[in] surf_sol - if <TRUE>, surface connectivity is deallocated, otherwise the volume connectivity.
+   * \brief Set the value of a specific field at a point.
+   * ::PrepareSendBuffers must be called before using this function.
+   * 
+   * \param[in] iPoint - ID of the point
+   * \param[in] iField - Index of the field
+   * \param[in] data - Value of the field
    */
-  void DeallocateConnectivity();
-  
-  /*!
-   * \brief CreateLinearPartition
-   */
-  void CreateLinearPartition(unsigned long nGlobalPoint);
-  
-  /*!
-   * \brief FindProcessor
-   * \param global_index
-   * \return 
-   */
-  unsigned short FindProcessor(unsigned long global_index);
-  
   void SetUnsorted_Data(unsigned long iPoint, unsigned short iField, su2double data){
     connSend[Index[iPoint] + iField] = data;
   }
diff --git a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
index fce42d406c2a..eeff951a3566 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
@@ -1,18 +1,75 @@
+/*!
+ * \file CParaviewBinaryFileWriter.hpp
+ * \brief Headers fo paraview binary file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "CFileWriter.hpp"
 
-class CParaviewBinaryFileWriter : public CFileWriter{
+class CParaviewBinaryFileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */
   CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim);
   
-  ~CParaviewBinaryFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CParaviewBinaryFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in paraview binary file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 private:
+  
+  /*!
+   * \brief Change storage of buffer from big endian to little endian
+   * \param buffer - Pointer to the beginning of the buffer
+   * \param nBytes - The size in bytes of an data entry
+   * \param nVar - The number of entries
+   */
   void SwapBytes(char *buffer, size_t nBytes, unsigned long nVar);
   
 };
diff --git a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
index 008ab8fcf024..c8885c4384e8 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
@@ -1,16 +1,65 @@
+/*!
+ * \file CParaviewFileWriter.hpp
+ * \brief Headers fo the paraview file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #include "CFileWriter.hpp"
 
-class CParaviewFileWriter : public CFileWriter{
+class CParaviewFileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CParaviewFileWriter(vector<string> fields, unsigned short nDim);
   
-  ~CParaviewFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CParaviewFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in paraview file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
index 305f74e09f0e..a587b47f836b 100644
--- a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
@@ -1,15 +1,65 @@
+/*!
+ * \file CSU2BinaryFileWriter.hpp
+ * \brief Headers fo the SU2 binary file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "CFileWriter.hpp"
 
-class CSU2BinaryFileWriter : public CFileWriter{
+class CSU2BinaryFileWriter final: public CFileWriter{
   
 
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim);
   
-  ~CSU2BinaryFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CSU2BinaryFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in SU2 binary file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
diff --git a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
index 18899020b489..4c0f38b0dcaf 100644
--- a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
@@ -1,16 +1,65 @@
+/*!
+ * \file CCSVFileWriter.hpp
+ * \brief Headers fo the CSV file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "CFileWriter.hpp"
 
-class CSU2FileWriter : public CFileWriter{
+class CSU2FileWriter final: public CFileWriter{
   
-
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CSU2FileWriter(vector<string> fields, unsigned short nDim);
   
-  ~CSU2FileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CSU2FileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in SU2 ASCII file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
index d8e922d592f9..5f22b3e6400c 100644
--- a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
@@ -1,18 +1,69 @@
+/*!
+ * \file CCSVFileWriter.hpp
+ * \brief Headers fo the CSV file writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 #include "CFileWriter.hpp"
 
-class CSU2MeshFileWriter : public CFileWriter{
+class CSU2MeshFileWriter final: public CFileWriter{
   
 private:
-  unsigned short iZone, nZone;
+  unsigned short iZone, //!< Index of the current zone
+  nZone;                //!< Number of zones
 
 public:
-  
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   * \param[in] iZone - Index of the current zone
+   * \param[in] nZone - Number of zones
+   */  
   CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone);
   
-  ~CSU2MeshFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CSU2MeshFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in SU2 mesh file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
index 828e94ba067d..e04c0f58599d 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFEMDataSorter.hpp
@@ -1,25 +1,72 @@
+/*!
+ * \file CSurfaceFEMDataSorter.hpp
+ * \brief Headers fo the surface FEM data sorter class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #include "CParallelDataSorter.hpp"
 #include "CFEMDataSorter.hpp"
 
-class CSurfaceFEMDataSorter : public CParallelDataSorter{
+class CSurfaceFEMDataSorter final: public CParallelDataSorter{
   
-  CFEMDataSorter* volume_sorter;
+  CFEMDataSorter* volume_sorter;                  //!< Pointer to the volume sorter instance
+   //! Structure to map the local sorted point ID to the global point ID
   std::vector<unsigned long> globalSurfaceDOFIDs;
     
 public:
   
+  /*!
+   * \brief Constructor
+   * \param[in] config - Pointer to the current config structure
+   * \param[in] geometry - Pointer to the current geometry
+   * \param[in] nFields - Number of output fields
+   * \param[in] volume_sorter - Pointer to the corresponding volume sorter instance
+   */
   CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields, CFEMDataSorter* volume_sorter);
   
-  ~CSurfaceFEMDataSorter();
+  /*!
+   * \brief Destructor
+   */
+  ~CSurfaceFEMDataSorter() override;
   
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void SortOutputData(CConfig *config, CGeometry *geometry);
+  void SortOutputData() override;
   
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
@@ -27,14 +74,16 @@ class CSurfaceFEMDataSorter : public CParallelDataSorter{
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
-  void SortConnectivity(CConfig *config, CGeometry *geometry,  bool val_sort);
+  void SortConnectivity(CConfig *config, CGeometry *geometry,  bool val_sort) override;
   
   /*!
-   * \brief Get the global index of the surface point
-   * \param Local surface index
-   * \return Global index
+   * \brief Get the global index of a point.
+   * \input iPoint - the point ID.
+   * \return Global index of a specific point.
    */
-  unsigned long GetGlobalIndex(unsigned long iPoint) { return globalSurfaceDOFIDs[iPoint]; }
+  unsigned long GetGlobalIndex(unsigned long iPoint) override {
+    return globalSurfaceDOFIDs[iPoint];
+  }
   
 private:
   
diff --git a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
index fc3d35f6c2ab..79d8c282912a 100644
--- a/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSurfaceFVMDataSorter.hpp
@@ -1,24 +1,71 @@
+/*!
+ * \file CSurfaceFVMDataSorter.hpp
+ * \brief Headers fo the surface FVM data sorter class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #include "CParallelDataSorter.hpp"
 #include "CFVMDataSorter.hpp"
 
-class CSurfaceFVMDataSorter : public CParallelDataSorter{
-  
-  CFVMDataSorter* volume_sorter;
-  map<unsigned long,unsigned long> Renumber2Global;
+class CSurfaceFVMDataSorter final: public CParallelDataSorter{
   
+  CFVMDataSorter* volume_sorter;                    //!< Pointer to the volume sorter instance
+  //! Structure to map the local sorted point ID to the global point ID
+  map<unsigned long,unsigned long> Renumber2Global; 
 public:
+  
+  /*!
+   * \brief Constructor
+   * \param[in] config - Pointer to the current config structure
+   * \param[in] geometry - Pointer to the current geometry
+   * \param[in] nFields - Number of output fields
+   * \param[in] volume_sorter - Pointer to the corresponding volume sorter instance
+   */
   CSurfaceFVMDataSorter(CConfig *config, CGeometry* geometry, unsigned short nFields, CFVMDataSorter* volume_sorter);
   
-  ~CSurfaceFVMDataSorter();
+  /*!
+   * \brief Destructor
+   */
+  ~CSurfaceFVMDataSorter() override;
   
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void SortOutputData(CConfig *config, CGeometry *geometry);
+  void SortOutputData() override;
   
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
@@ -26,14 +73,16 @@ class CSurfaceFVMDataSorter : public CParallelDataSorter{
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] surf - boolean controlling whether surface <TRUE> or volume connectivity <FALSE> should be sorted.
    */
-  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort);
+  void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) override;
   
   /*!
-   * \brief Get the global index of the surface point
-   * \param Local surface index
-   * \return Global index
-   */  
-  unsigned long GetGlobalIndex(unsigned long iPoint) { return Renumber2Global[iPoint]; }
+   * \brief Get the global index of a point.
+   * \input iPoint - the point ID.
+   * \return Global index of a specific point.
+   */
+  unsigned long GetGlobalIndex(unsigned long iPoint)  override{
+    return Renumber2Global[iPoint]; 
+  }
   
   
 private:
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
index d5ecf2077464..f2e3109a0095 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -1,21 +1,71 @@
+/*!
+ * \file CTecplotBinaryFileWriter.hpp
+ * \brief Headers fo the tecplot binary writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "CFileWriter.hpp"
 
 #include <assert.h>
 
-class CTecplotBinaryFileWriter : public CFileWriter{
+class CTecplotBinaryFileWriter final: public CFileWriter{
   
-  unsigned long time_iter;
-  su2double timestep;
+  unsigned long time_iter;  //!< Current value of the time iteration
+  su2double timestep;       //!< Current value of the time step
   
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
   
-  ~CTecplotBinaryFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CTecplotBinaryFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in tecplot binary file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
   /*!
    * \brief Calculate the partitioning of nodes to determine:
diff --git a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
index 8c28fcbc2700..4754ed77ea85 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
@@ -1,19 +1,68 @@
-#pragma once
+/*!
+ * \file CTecplotFileWriter.hpp
+ * \brief Headers fo the tecplot ASCII writer class.
+ * \author T. Albring
+ * \version 6.2.0 "Falcon"
+ *
+ * The current SU2 release has been coordinated by the
+ * SU2 International Developers Society <www.su2devsociety.org>
+ * with selected contributions from the open-source community.
+ *
+ * The main research teams contributing to the current release are:
+ *  - Prof. Juan J. Alonso's group at Stanford University.
+ *  - Prof. Piero Colonna's group at Delft University of Technology.
+ *  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+ *  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+ *  - Prof. Rafael Palacios' group at Imperial College London.
+ *  - Prof. Vincent Terrapon's group at the University of Liege.
+ *  - Prof. Edwin van der Weide's group at the University of Twente.
+ *  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+ *
+ * Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+ *                      Tim Albring, and the SU2 contributors.
+ *
+ * SU2 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, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
 
+#pragma once
 #include "CFileWriter.hpp"
 
-class CTecplotFileWriter : public CFileWriter{
-  
-  unsigned long time_iter;
-  su2double timestep;
+class CTecplotFileWriter final: public CFileWriter{
   
+  unsigned long time_iter;  //!< Current value of the time iteration
+  su2double timestep;       //!< Current value of the time step
+
 public:
   
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fields - A list of field names
+   * \param[in] nDim - Physical dimension
+   */  
   CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
   
-  ~CTecplotFileWriter();
+  /*!
+   * \brief Destructor
+   */
+  ~CTecplotFileWriter() override;
   
-  void Write_Data(string filename, CParallelDataSorter* data_sorter);
+  /*!
+   * \brief Write sorted data to file in tecplot ASCII file format
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
+   */
+  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
   
 };
 
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 0920efac9360..cd76a271e48b 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) {
                                        "Only execute preprocessing steps using a dummy geometry.");
   app.add_option("configfile", filename, "A config file.")->check(CLI::ExistingFile);
   
-  CLI11_PARSE(app, argc, argv);
+  CLI11_PARSE(app, argc, argv)
   
   /*--- MPI initialization, and buffer setting ---*/
   
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 4eaf9e405740..4f744accfbf9 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -4063,7 +4063,7 @@ bool CFluidDriver::Monitor(unsigned long ExtIter) {
   if (config_container[ZONE_0]->GetCFL_Adapt() == YES) {
     for (iZone = 0; iZone < nZone; iZone++){
       if (!(config_container[iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
-        output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
+        output_container[iZone]->SetCFL_Number(solver_container[iZone], config_container[iZone]);
     }
   }
 
@@ -4247,7 +4247,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
     if(mixingplane){
       CFL = 0;
       for (iZone = 0; iZone < nZone; iZone++){
-        output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
+        output_container[iZone]->SetCFL_Number(solver_container[iZone], config_container[iZone]);
         CFL += config_container[iZone]->GetCFL(MESH_0);
       }
       /*--- For fluid-multizone the new CFL number is the same for all the zones and it is equal to the zones' minimum value. ---*/
@@ -4256,7 +4256,7 @@ bool CTurbomachineryDriver::Monitor(unsigned long ExtIter) {
       }
     }
     else{
-      output_container[ZONE_0]->SetCFL_Number(solver_container, config_container, ZONE_0);
+      output_container[ZONE_0]->SetCFL_Number(solver_container[ZONE_0], config_container[ZONE_0]);
     }
   }
 
@@ -5065,8 +5065,8 @@ void CFSIDriver::Run() {
           surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
 
       /*--- Write the convergence history for the fluid (only screen output) ---*/
-      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-        output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst],geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
+//      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+//        output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst],geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
 
       /*--- If the convergence criteria is met for the flow, break the loop ---*/
       StopCalc_Flow = integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence();
@@ -5091,8 +5091,8 @@ void CFSIDriver::Run() {
     }
 
     /*--- Write the convergence history for the fluid (only screen output) ---*/
-    if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-      output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
+//    if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+//      output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
 
   } else {
 
@@ -5119,8 +5119,8 @@ void CFSIDriver::Run() {
                                   surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
 
     /*--- Write the convergence history for the structure (only screen output) ---*/
-   if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-     output_container[ZONE_STRUCT]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
+//   if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
+//     output_container[ZONE_STRUCT]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
 
     /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
 
@@ -5586,7 +5586,18 @@ CDiscAdjFSIDriver::CDiscAdjFSIDriver(char* confFile,
 //  /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
 //  config_container[ZONE_0]->SetnExtIter(1);
 //  config_container[ZONE_1]->SetnExtIter(1);
-
+  ConvHist_file = NULL;
+  ConvHist_file = new ofstream*[nZone];
+  for (iZone = 0; iZone < nZone; iZone++) {
+    ConvHist_file[iZone] = NULL;
+    if (rank == MASTER_NODE){
+      ConvHist_file[iZone] = new ofstream[nInst[iZone]];
+      for (iInst = 0; iInst < nInst[iZone]; iInst++) {
+        output_legacy->SetConvHistory_Header(&ConvHist_file[iZone][iInst], config_container[iZone], iZone, iInst);
+        config_container[iZone]->SetHistFile(&ConvHist_file[iZone][INST_0]);
+      }
+    }
+  }
 }
 
 CDiscAdjFSIDriver::~CDiscAdjFSIDriver(void) {
@@ -6723,9 +6734,9 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
   unsigned long BGS_Iter = config_container[ZONE_FLOW]->GetOuterIter();
 
 
-  if (rank == MASTER_NODE)  
-    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
-     output_container[ZONE_0]->GetLegacyOutput()->SetConvHistory_Header(&ConvHist_file[ZONE_0][INST_0], config_container[ZONE_0], ZONE_0, INST_0);
+//  if (rank == MASTER_NODE)  
+//    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
+//     output_container[ZONE_0]->GetLegacyOutput()->SetConvHistory_Header(&ConvHist_file[ZONE_0][INST_0], config_container[ZONE_0], ZONE_0, INST_0);
 
   if (kind_recording == FLOW_CONS_VARS) {
 
@@ -6749,12 +6760,12 @@ void CDiscAdjFSIDriver::ConvergenceHistory(unsigned long IntIter,
     }
   }
 
-  if (kind_recording == FEA_DISP_VARS) {
-    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
-    /*--- Set the convergence criteria (only residual possible) ---*/
-       output_container[ZONE_0]->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
+//  if (kind_recording == FEA_DISP_VARS) {
+//    if ((!config_container[ZONE_0]->GetMultizone_Problem() && !config_container[ZONE_0]->GetSinglezone_Driver()))
+//    /*--- Set the convergence criteria (only residual possible) ---*/
+//       output_container[ZONE_0]->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_STRUCT, INST_0);
 
-  }
+//  }
 
 
 }
@@ -7091,7 +7102,7 @@ void CMultiphysicsZonalDriver::Run() {
 
       // When running a unsteady simulation, we have to adapt CFL values here.
       if (unsteady && (config_container[ZONE_0]->GetCFL_Adapt() == YES)) {
-          output_container[iZone]->SetCFL_Number(solver_container, config_container, iZone);
+          output_container[iZone]->SetCFL_Number(solver_container[iZone], config_container[iZone]);
       }
 
       config_container[iZone]->SetInnerIter(IntIter);
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index cd5894ec9a37..8ed34c0aab14 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -711,22 +711,6 @@ void CMultiGridIntegration::NonDimensional_Parameters(CGeometry **geometry, CSol
           solver_container[FinestMesh][FLOW_SOL]->Buffet_Monitoring(geometry[FinestMesh], config);
       }
       
-      /*--- Evaluate convergence monitor ---*/
-      
-      if (config->GetConvCriteria() == CAUCHY) {
-        if (config->GetCauchy_Func_Flow() == DRAG_COEFFICIENT) (*monitor) = solver_container[FinestMesh][FLOW_SOL]->GetTotal_CD();
-        if (config->GetCauchy_Func_Flow() == LIFT_COEFFICIENT) (*monitor) = solver_container[FinestMesh][FLOW_SOL]->GetTotal_CL();
-        if (config->GetCauchy_Func_Flow() == NEARFIELD_PRESSURE) (*monitor) = solver_container[FinestMesh][FLOW_SOL]->GetTotal_CNearFieldOF();
-      }
-      
-      if (config->GetConvCriteria() == RESIDUAL) {
-        if (config->GetResidual_Func_Flow() == RHO_RESIDUAL) (*monitor) = log10(solver_container[FinestMesh][FLOW_SOL]->GetRes_RMS(0));
-        else if (config->GetResidual_Func_Flow() == RHO_ENERGY_RESIDUAL) {
-          if (nDim == 2) (*monitor) = log10(solver_container[FinestMesh][FLOW_SOL]->GetRes_RMS(3));
-          else (*monitor) = log10(solver_container[FinestMesh][FLOW_SOL]->GetRes_RMS(4));
-        }
-      }
-      
       break;
       
     case RUNTIME_ADJFLOW_SYS:
@@ -740,21 +724,6 @@ void CMultiGridIntegration::NonDimensional_Parameters(CGeometry **geometry, CSol
       
       if (config->GetKind_SensSmooth() != NONE) solver_container[FinestMesh][ADJFLOW_SOL]->Smooth_Sensitivity(geometry[FinestMesh], solver_container[FinestMesh], numerics_container[FinestMesh][ADJFLOW_SOL][CONV_BOUND_TERM], config);
       
-      /*--- Evaluate convergence monitor ---*/
-      
-      if (config->GetConvCriteria() == CAUCHY) {
-        if (config->GetCauchy_Func_AdjFlow() == SENS_GEOMETRY) (*monitor) = solver_container[FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Geo();
-        if (config->GetCauchy_Func_AdjFlow() == SENS_MACH) (*monitor) = solver_container[FinestMesh][ADJFLOW_SOL]->GetTotal_Sens_Mach();
-      }
-      
-      if (config->GetConvCriteria() == RESIDUAL) {
-        if (config->GetResidual_Func_Flow() == RHO_RESIDUAL) (*monitor) = log10(solver_container[FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0));
-        else if (config->GetResidual_Func_Flow() == RHO_ENERGY_RESIDUAL) {
-          if (nDim == 2) (*monitor) = log10(solver_container[FinestMesh][ADJFLOW_SOL]->GetRes_RMS(3));
-          else (*monitor) = log10(solver_container[FinestMesh][ADJFLOW_SOL]->GetRes_RMS(4));
-        }
-      }
-      
       break;
           
   }
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 91be0c12008c..4d1622f2c789 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -575,7 +575,7 @@ void CFluidIteration::Preprocess(COutput *output,
 
   /*--- Evaluate the new CFL number (adaptive). ---*/
   if ((config[val_iZone]->GetCFL_Adapt() == YES) && ( OuterIter != 0 ) ) {
-    output->SetCFL_Number(solver, config, val_iZone);
+    output->SetCFL_Number(solver[val_iZone], config[val_iZone]);
   }
 
 }
@@ -667,14 +667,6 @@ void CFluidIteration::Iterate(COutput *output,
     
   }
   
-  /*--- Write the convergence history ---*/
-
-  if ( unsteady && !config[val_iZone]->GetDiscrete_Adjoint() && (!config[val_iZone]->GetMultizone_Problem() && !config[val_iZone]->GetSinglezone_Driver())) {
-    
-    output->GetLegacyOutput()->SetConvHistory_Body(NULL, geometry, solver, config, integration, true, 0.0, val_iZone, val_iInst);
-    
-  }
-  
 }
 
 void CFluidIteration::Update(COutput *output,
@@ -755,7 +747,7 @@ bool CFluidIteration::Monitor(COutput *output,
   
   if (config[val_iZone]->GetCFL_Adapt() == YES) {
       if (!(config[val_iZone]->GetMultizone_Problem())) // This needs to be changed everywhere in the code, in a future PR
-        output->SetCFL_Number(solver, config, val_iZone);
+        output->SetCFL_Number(solver[val_iZone], config[val_iZone]);
   }
 
   /*--- If convergence was reached --*/
@@ -1248,7 +1240,7 @@ void CHeatIteration::Preprocess(COutput *output,
 
   /*--- Evaluate the new CFL number (adaptive). ---*/
   if ((config[val_iZone]->GetCFL_Adapt() == YES) && ( OuterIter != 0 ) ) {
-    output->SetCFL_Number(solver, config, val_iZone);
+    output->SetCFL_Number(solver[val_iZone], config[val_iZone]);
   }
 
 }
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 5ab3c18730c9..bfd120828a15 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -52,58 +52,58 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim)
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RESIDUALS");
-    RequestedHistoryFields.push_back("SENSITIVITY");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RESIDUALS");
+    requestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
   if (nRequestedScreenFields == 0){
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("ADJOINT_DISP_X");
-    RequestedScreenFields.push_back("ADJOINT_DISP_Y");
-    RequestedScreenFields.push_back("SENS_E");
-    RequestedScreenFields.push_back("SENS_NU");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("ADJOINT_DISP_X");
+    requestedScreenFields.push_back("ADJOINT_DISP_Y");
+    requestedScreenFields.push_back("SENS_E");
+    requestedScreenFields.push_back("SENS_NU");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
 
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
 
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
 
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetAdj_FileName();
+  volumeFilename = config->GetAdj_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  surfaceFilename = config->GetSurfAdjCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_AdjFileName();
+  restartFilename = config->GetRestart_AdjFileName();
   
   /*--- Add the obj. function extension --- */
   
-  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+  restartFilename = config->GetObjFunc_Extension(restartFilename);
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "ADJOINT_DISP_X";
+  if (convField.size() == 0 ) convField = "ADJOINT_DISP_X";
   
 }
 
 CAdjElasticityOutput::~CAdjElasticityOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index ea2f1fc701dd..1a899a799b8d 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -49,60 +49,60 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITY");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_ADJ_DENSITY");
-    RequestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
-    RequestedScreenFields.push_back("SENS_GEO");
-    RequestedScreenFields.push_back("SENS_AOA");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("RMS_ADJ_DENSITY");
+    requestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
+    requestedScreenFields.push_back("SENS_GEO");
+    requestedScreenFields.push_back("SENS_AOA");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");    
-    RequestedVolumeFields.push_back("SENSITIVITY");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");    
+    requestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Adj. Comp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetAdj_FileName();
+  volumeFilename = config->GetAdj_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  surfaceFilename = config->GetSurfAdjCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_AdjFileName();
+  restartFilename = config->GetRestart_AdjFileName();
   
   /*--- Add the obj. function extension --- */
   
-  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+  restartFilename = config->GetObjFunc_Extension(restartFilename);
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_DENSITY";
+  if (convField.size() == 0 ) convField = "RMS_ADJ_DENSITY";
   
 }
 
 CAdjFlowCompOutput::~CAdjFlowCompOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 }
@@ -258,7 +258,7 @@ void CAdjFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
     }
   }
   
-  if (multizone){
+  if (multiZone){
     SetHistoryOutputValue("BGS_ADJ_DENSITY", log10(adjflow_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_ADJ_MOMENTUM-X", log10(adjflow_solver->GetRes_BGS(1)));
     SetHistoryOutputValue("BGS_ADJ_MOMENTUM-Y", log10(adjflow_solver->GetRes_BGS(2)));
@@ -455,8 +455,8 @@ void CAdjFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
 
 bool CAdjFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curTimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 933f4ee73b34..4464fa36ddba 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -53,60 +53,60 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COu
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITY");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");    
-    RequestedScreenFields.push_back("RMS_ADJ_PRESSURE");
-    RequestedScreenFields.push_back("RMS_ADJ_VELOCITY-X");
-    RequestedScreenFields.push_back("SENS_GEO");
-    RequestedScreenFields.push_back("SENS_AOA");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");    
+    requestedScreenFields.push_back("RMS_ADJ_PRESSURE");
+    requestedScreenFields.push_back("RMS_ADJ_VELOCITY-X");
+    requestedScreenFields.push_back("SENS_GEO");
+    requestedScreenFields.push_back("SENS_AOA");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");    
-    RequestedVolumeFields.push_back("SENSITIVITY");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");    
+    requestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Adj. Incomp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetAdj_FileName();
+  volumeFilename = config->GetAdj_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  surfaceFilename = config->GetSurfAdjCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_AdjFileName();
+  restartFilename = config->GetRestart_AdjFileName();
   
   /*--- Add the obj. function extension --- */
   
-  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+  restartFilename = config->GetObjFunc_Extension(restartFilename);
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_PRESSURE";
+  if (convField.size() == 0 ) convField = "RMS_ADJ_PRESSURE";
 
 }
 
 CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 }
@@ -270,7 +270,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     }
   }
   
-  if (multizone){
+  if (multiZone){
     SetHistoryOutputValue("BGS_ADJ_PRESSURE", log10(adjflow_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_ADJ_VELOCITY-X", log10(adjflow_solver->GetRes_BGS(1)));
     SetHistoryOutputValue("BGS_ADJ_VELOCITY-Y", log10(adjflow_solver->GetRes_BGS(2)));
@@ -485,8 +485,8 @@ void CAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CS
 
 bool CAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curTimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 9de6250a1f01..cff8b56969ad 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -45,57 +45,57 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    RequestedHistoryFields.push_back("SENSITIVITY");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.push_back("SENSITIVITY");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");    
-    RequestedScreenFields.push_back("RMS_ADJ_TEMPERATURE");
-    RequestedScreenFields.push_back("SENS_GEO");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");    
+    requestedScreenFields.push_back("RMS_ADJ_TEMPERATURE");
+    requestedScreenFields.push_back("SENS_GEO");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("SENSITIVITY");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.push_back("SENSITIVITY");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Adj. Heat)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetAdj_FileName();
+  volumeFilename = config->GetAdj_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfAdjCoeff_FileName();
+  surfaceFilename = config->GetSurfAdjCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_AdjFileName();
+  restartFilename = config->GetRestart_AdjFileName();
   
   /*--- Add the obj. function extension --- */
   
-  RestartFilename = config->GetObjFunc_Extension(RestartFilename);
+  restartFilename = config->GetObjFunc_Extension(restartFilename);
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_ADJ_TEMPERATURE";
+  if (convField.size() == 0 ) convField = "RMS_ADJ_TEMPERATURE";
 
 }
 
 CAdjHeatOutput::~CAdjHeatOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 }
@@ -130,7 +130,7 @@ void CAdjHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
  
   SetHistoryOutputValue("MAX_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_Max(0)));
  
-  if (multizone)
+  if (multiZone)
     SetHistoryOutputValue("MAX_ADJ_TEMPERATURE", log10(adjheat_solver->GetRes_BGS(0)));
     
   SetHistoryOutputValue("SENS_GEO", adjheat_solver->GetTotal_Sens_Geo());
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 1690b9db0d7f..bad6abb58ba9 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -47,31 +47,31 @@ CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver*
 
   /*--- Set the requested volume fields to all fields in the solver ---*/
   
-  RequestedVolumeFields = solver->GetSolutionFields();
+  requestedVolumeFields = solver->GetSolutionFields();
   
   /*--- remove the point ID from the fields --- */
   
-  RequestedVolumeFields.erase(RequestedVolumeFields.begin());
+  requestedVolumeFields.erase(requestedVolumeFields.begin());
   
-  nRequestedVolumeFields = RequestedVolumeFields.size();
+  nRequestedVolumeFields = requestedVolumeFields.size();
     
   /*--- Remove first and last character of the strings (the quotation marks) ---*/
   
   for (iField = 0; iField < nRequestedVolumeFields; iField++){
-    RequestedVolumeFields[iField] = RequestedVolumeFields[iField].substr(1, RequestedVolumeFields[iField].size() - 2);
+    requestedVolumeFields[iField] = requestedVolumeFields[iField].substr(1, requestedVolumeFields[iField].size() - 2);
   }
      
   /*--- Set the volume filename --- */
   
-  VolumeFilename = "baseline";
+  volumeFilename = "baseline";
   
   /*--- Set the surface filename ---*/
   
-  SurfaceFilename = "surface_baseline";
+  surfaceFilename = "surface_baseline";
   
   /*--- Conv field --- */
   
-  Conv_Field = "NONE";
+  convField = "NONE";
   
 }
 
@@ -86,25 +86,25 @@ void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
     
   /*--- The first three fields should be the coordinates, if not, something is wrong ---*/
   
-  if (RequestedVolumeFields[0] != "x" || RequestedVolumeFields[1] != "y"){
+  if (requestedVolumeFields[0] != "x" || requestedVolumeFields[1] != "y"){
     SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
   }
   if (nDim == 3){
-    if (RequestedVolumeFields[2] != "z"){
+    if (requestedVolumeFields[2] != "z"){
       SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
     }
   }
   
   // Grid coordinates
-  AddVolumeOutput(RequestedVolumeFields[0], RequestedVolumeFields[0], "COORDINATES", "x-component of the coordinate vector");
-  AddVolumeOutput(RequestedVolumeFields[1], RequestedVolumeFields[1], "COORDINATES", "y-component of the coordinate vector");
+  AddVolumeOutput(requestedVolumeFields[0], requestedVolumeFields[0], "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput(requestedVolumeFields[1], requestedVolumeFields[1], "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput(RequestedVolumeFields[2], RequestedVolumeFields[2], "COORDINATES", "z-component of the coordinate vector");
+    AddVolumeOutput(requestedVolumeFields[2], requestedVolumeFields[2], "COORDINATES", "z-component of the coordinate vector");
 
   // Add all the remaining fields
   
   for (iField = nDim; iField < nRequestedVolumeFields; iField++){
-    AddVolumeOutput(RequestedVolumeFields[iField], RequestedVolumeFields[iField], "SOLUTION","");
+    AddVolumeOutput(requestedVolumeFields[iField], requestedVolumeFields[iField], "SOLUTION","");
   }
   
 }
@@ -122,7 +122,7 @@ void CBaselineOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   CVariable* Node_Sol  = solver[0]->node[iPoint];
    
   for (iField = 0; iField < nRequestedVolumeFields; iField++){
-    SetVolumeOutputValue(RequestedVolumeFields[iField], iPoint, Node_Sol->GetSolution(iField));
+    SetVolumeOutputValue(requestedVolumeFields[iField], iPoint, Node_Sol->GetSolution(iField));
   }
   
 }
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 6480e869a47d..0b9fad1fa903 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -45,7 +45,7 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
   
   nZone = driver_config->GetnZone();
 
-  field_width = 12;
+  fieldWidth = 12;
   
   bgs_res_name = "BGS_RES";
   
@@ -57,30 +57,30 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
   }
 
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("ITER");
     for (iZone = 0; iZone < nZone; iZone++){
-      RequestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");      
-      RequestedHistoryFields.push_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
+      requestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");      
+      requestedHistoryFields.push_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
     }
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (config[ZONE_0]->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");    
-    RequestedScreenFields.push_back("OUTER_ITER");
+    if (config[ZONE_0]->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
+    requestedScreenFields.push_back("OUTER_ITER");
     for (iZone = 0; iZone < nZone; iZone++){
-      RequestedScreenFields.push_back("AVG_" + bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]"); 
+      requestedScreenFields.push_back("AVG_" + bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]"); 
     }
-    nRequestedScreenFields = RequestedScreenFields.size();
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
-  MultiZoneHeaderString = "Multizone Summary";
+  multiZoneHeaderString = "Multizone Summary";
   
-  HistoryFilename = "multizone_history";
+  historyFilename = "multizone_history";
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "AVG_BGS_RES[0]";
+  if (convField.size() == 0 ) convField = "AVG_BGS_RES[0]";
 
 }
 
@@ -96,9 +96,9 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
   string name, header;
 
   if (config[ZONE_0]->GetTime_Domain()){
-    SetHistoryOutputValue("TIME_ITER", curr_TimeIter);
+    SetHistoryOutputValue("TIME_ITER", curTimeIter);
   }
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter);
+  SetHistoryOutputValue("OUTER_ITER", curOuterIter);
   
   
   for (iZone = 0; iZone < nZone; iZone++){
@@ -116,7 +116,7 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
         
         name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
         
-        SetHistoryOutputValue(name, ZoneHistoryFields[ZoneHistoryNames[iField]].Value);
+        SetHistoryOutputValue(name, ZoneHistoryFields[ZoneHistoryNames[iField]].value);
 
       }
     }
@@ -149,10 +149,10 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
       if (ZoneHistoryNames[iField] != "TIME_ITER" && ZoneHistoryNames[iField] != "OUTER_ITER"){
         
         name   = ZoneHistoryNames[iField]+ "[" + PrintingToolbox::to_string(iZone) + "]";
-        header = ZoneHistoryFields[ZoneHistoryNames[iField]].FieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
-        group  = ZoneHistoryFields[ZoneHistoryNames[iField]].OutputGroup + "[" + PrintingToolbox::to_string(iZone) + "]";
+        header = ZoneHistoryFields[ZoneHistoryNames[iField]].fieldName + "[" + PrintingToolbox::to_string(iZone) + "]";
+        group  = ZoneHistoryFields[ZoneHistoryNames[iField]].outputGroup + "[" + PrintingToolbox::to_string(iZone) + "]";
         
-        AddHistoryOutput(name, header, ZoneHistoryFields[ZoneHistoryNames[iField]].ScreenFormat, group, "", ZoneHistoryFields[ZoneHistoryNames[iField]].FieldType );
+        AddHistoryOutput(name, header, ZoneHistoryFields[ZoneHistoryNames[iField]].screenFormat, group, "", ZoneHistoryFields[ZoneHistoryNames[iField]].fieldType );
       }
     }
   }
@@ -163,7 +163,7 @@ bool CDriverOutput::WriteScreen_Header(CConfig *config) {
   bool write_header = true;
 
   /*--- If the outer iteration is zero ---*/
-  write_header = (write_header && (curr_OuterIter == 0)) || write_zone;
+  write_header = (write_header && (curOuterIter == 0)) || write_zone;
 
   return write_header;
 
@@ -176,17 +176,17 @@ bool CDriverOutput::WriteScreen_Output(CConfig *config) {
 
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
-      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+  if (!PrintOutput(curTimeIter, ScreenWrt_Freq_Time)&& 
+      !(curTimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
     
   }
   
-  if (Convergence) {return true;}
+  if (convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq_Outer) && 
-      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+  if (!PrintOutput(curOuterIter, ScreenWrt_Freq_Outer) && 
+      !(curOuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
@@ -202,17 +202,17 @@ bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq_Time)&& 
-      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+  if (!PrintOutput(curTimeIter, HistoryWrt_Freq_Time)&& 
+      !(curTimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
     
   }
   
-  if (Convergence) {return true;}
+  if (convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, HistoryWrt_Freq_Outer) && 
-      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+  if (!PrintOutput(curOuterIter, HistoryWrt_Freq_Outer) && 
+      !(curOuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 23dac4c7480f..921d41164438 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -52,64 +52,64 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
   /*--- Default fields for screen output ---*/
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   /*--- Default fields for screen output ---*/
   if (nRequestedScreenFields == 0){
-    if (dynamic) RequestedScreenFields.push_back("TIME_ITER");
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
+    if (dynamic) requestedScreenFields.push_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
     if(linear_analysis){
-      RequestedScreenFields.push_back("RMS_DISP_X");
-      RequestedScreenFields.push_back("RMS_DISP_Y");
-      RequestedScreenFields.push_back("RMS_DISP_Z");
+      requestedScreenFields.push_back("RMS_DISP_X");
+      requestedScreenFields.push_back("RMS_DISP_Y");
+      requestedScreenFields.push_back("RMS_DISP_Z");
     }
     if(nonlinear_analysis){
-      RequestedScreenFields.push_back("RMS_UTOL");
-      RequestedScreenFields.push_back("RMS_RTOL");
-      RequestedScreenFields.push_back("RMS_ETOL");
+      requestedScreenFields.push_back("RMS_UTOL");
+      requestedScreenFields.push_back("RMS_RTOL");
+      requestedScreenFields.push_back("RMS_ETOL");
     }
-    RequestedScreenFields.push_back("VMS");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    requestedScreenFields.push_back("VMS");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
   /*--- Default fields for volume output ---*/
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("STRESS");    
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.push_back("STRESS");    
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
 
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Structure)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetVolume_FileName();
+  volumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfCoeff_FileName();
+  surfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  restartFilename = config->GetRestart_FileName();
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DISP_X";
+  if (convField.size() == 0 ) convField = "RMS_DISP_X";
 
 }
 
 CElasticityOutput::~CElasticityOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
 
   }
 
@@ -137,7 +137,7 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     
   }
   
-  if (multizone){
+  if (multiZone){
     SetHistoryOutputValue("BGS_DISP_X", log10(fea_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_DISP_Y", log10(fea_solver->GetRes_BGS(1)));
     if (nDim == 3) SetHistoryOutputValue("BGS_DISP_Z", log10(fea_solver->GetRes_BGS(2)));
@@ -246,7 +246,7 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
 }
 bool CElasticityOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Domain() == NO && (curr_InnerIter  == 0));
+  return (config->GetTime_Domain() == NO && (curInnerIter  == 0));
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 1f099d5eb6cf..397b5a391af0 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -44,51 +44,51 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
     
   turb_model = config->GetKind_Turb_Model();
   
-  grid_movement = config->GetGrid_Movement(); 
+  gridMovement = config->GetGrid_Movement(); 
   
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_DENSITY");
-    RequestedScreenFields.push_back("RMS_MOMENTUM-X");
-    RequestedScreenFields.push_back("RMS_MOMENTUM-Y");
-    RequestedScreenFields.push_back("RMS_ENERGY");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("RMS_DENSITY");
+    requestedScreenFields.push_back("RMS_MOMENTUM-X");
+    requestedScreenFields.push_back("RMS_MOMENTUM-Y");
+    requestedScreenFields.push_back("RMS_ENERGY");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("PRIMITIVE");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetVolume_FileName();
+  volumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfCoeff_FileName();
+  surfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  restartFilename = config->GetRestart_FileName();
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DENSITY";
+  if (convField.size() == 0 ) convField = "RMS_DENSITY";
 
 
 }
@@ -96,7 +96,7 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
 CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
 
   }
 
@@ -358,8 +358,8 @@ su2double CFlowCompFEMOutput::GetQ_Criterion(CConfig *config, CGeometry *geometr
 
 bool CFlowCompFEMOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curTimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index d768d40c0fdb..a559cec9f986 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -44,52 +44,52 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
   
   turb_model = config->GetKind_Turb_Model();
   
-  grid_movement = config->GetGrid_Movement(); 
+  gridMovement = config->GetGrid_Movement(); 
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) RequestedScreenFields.push_back("TIME_ITER");
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_DENSITY");
-    RequestedScreenFields.push_back("RMS_MOMENTUM-X");
-    RequestedScreenFields.push_back("RMS_MOMENTUM-Y");
-    RequestedScreenFields.push_back("RMS_ENERGY");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("RMS_DENSITY");
+    requestedScreenFields.push_back("RMS_MOMENTUM-X");
+    requestedScreenFields.push_back("RMS_MOMENTUM-Y");
+    requestedScreenFields.push_back("RMS_ENERGY");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("PRIMITIVE");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Comp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetVolume_FileName();
+  volumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfCoeff_FileName();
+  surfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  restartFilename = config->GetRestart_FileName();
 
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_DENSITY";
+  if (convField.size() == 0 ) convField = "RMS_DENSITY";
 
   
 }
@@ -97,7 +97,7 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
 CFlowCompOutput::~CFlowCompOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
 
   }
 
@@ -531,9 +531,9 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];
   
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+  SetHistoryOutputValue("TIME_ITER",  curTimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curInnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curOuterIter); 
 
   
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
@@ -578,7 +578,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   default: break;
   }
   
-  if (multizone){
+  if (multiZone){
     SetHistoryOutputValue("BGS_DENSITY", log10(flow_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_MOMENTUM-X", log10(flow_solver->GetRes_BGS(1)));
     SetHistoryOutputValue("BGS_MOMENTUM-Y", log10(flow_solver->GetRes_BGS(2)));
@@ -658,14 +658,14 @@ su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry,
 
 bool CFlowCompOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))||
-        (config->GetTime_Marching() == STEADY && (curr_InnerIter < 2));
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == 0))||
+        (config->GetTime_Marching() == STEADY && (curInnerIter < 2));
   
 }
 
 bool CFlowCompOutput::SetUpdate_Averages(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && curr_InnerIter == 0);
+  return (config->GetTime_Marching() != STEADY && curInnerIter == 0);
       
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 5625fe9f5001..b7f72ac1862e 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -51,46 +51,46 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (multizone) RequestedScreenFields.push_back("OUTER_ITER");
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_PRESSURE");
-    RequestedScreenFields.push_back("RMS_VELOCITY-X");
-    RequestedScreenFields.push_back("RMS_VELOCITY-Y");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("RMS_PRESSURE");
+    requestedScreenFields.push_back("RMS_VELOCITY-X");
+    requestedScreenFields.push_back("RMS_VELOCITY-Y");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    RequestedVolumeFields.push_back("PRIMITIVE");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.push_back("PRIMITIVE");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Incomp. Fluid)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetVolume_FileName(); 
+  volumeFilename = config->GetVolume_FileName(); 
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfCoeff_FileName();
+  surfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  restartFilename = config->GetRestart_FileName();
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_PRESSURE";
+  if (convField.size() == 0 ) convField = "RMS_PRESSURE";
 
 
 }
@@ -98,7 +98,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
 CFlowIncOutput::~CFlowIncOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 
@@ -254,7 +254,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     break;
   }
   
-  if (multizone){
+  if (multiZone){
     SetHistoryOutputValue("BGS_PRESSURE", log10(flow_solver->GetRes_BGS(0)));
     SetHistoryOutputValue("BGS_VELOCITY-X", log10(flow_solver->GetRes_BGS(1)));
     SetHistoryOutputValue("BGS_VELOCITY-Y", log10(flow_solver->GetRes_BGS(2)));
@@ -277,7 +277,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
     SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
     SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
-    if (multizone) SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
+    if (multiZone) SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
@@ -288,7 +288,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     
     if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
-    if (multizone){
+    if (multiZone){
       if (nDim == 3) SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(4)));
       else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
     }
@@ -609,8 +609,8 @@ su2double CFlowIncOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, C
 
 bool CFlowIncOutput::SetInit_Residuals(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && (curr_InnerIter == 0))|| 
-        (config->GetTime_Marching() == STEADY && (curr_TimeIter < 2)); 
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == 0))|| 
+        (config->GetTime_Marching() == STEADY && (curTimeIter < 2)); 
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 496e01a77cfa..3c6ed6c43d9d 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -786,7 +786,7 @@ void CFlowOutput::Add_CpInverseDesignOutput(CConfig *config){
   
 }
 
-void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geometry, CConfig *config){
+void CFlowOutput::Set_CpInverseDesign(CSolver *solver, CGeometry *geometry, CConfig *config){
   
   unsigned short iMarker, icommas, Boundary, iDim;
   unsigned long iVertex, iPoint, (*Point2Vertex)[2], nPointLocal = 0, nPointGlobal = 0;
@@ -800,7 +800,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   surfCp_filename = "TargetCp";
   
-  surfCp_filename = config->GetUnsteady_FileName(surfCp_filename, (int)curr_TimeIter, ".dat");
+  surfCp_filename = config->GetUnsteady_FileName(surfCp_filename, (int)curTimeIter, ".dat");
   
   strcpy (cstr, surfCp_filename.c_str());
     
@@ -842,7 +842,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
             Point2Vertex[iPoint][0] = iMarker;
             Point2Vertex[iPoint][1] = iVertex;
             PointInDomain[iPoint] = true;
-            solver_container->SetCPressureTarget(iMarker, iVertex, 0.0);
+            solver->SetCPressureTarget(iMarker, iVertex, 0.0);
           }
           
         }
@@ -868,7 +868,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
         iMarker = Point2Vertex[iPoint][0];
         iVertex = Point2Vertex[iPoint][1];
         
-        solver_container->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
+        solver->SetCPressureTarget(iMarker, iVertex, PressureCoeff);
         
       }
       
@@ -893,8 +893,8 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
           
           Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
           
-          Cp = solver_container->GetCPressure(iMarker, iVertex);
-          CpTarget = solver_container->GetCPressureTarget(iMarker, iVertex);
+          Cp = solver->GetCPressure(iMarker, iVertex);
+          CpTarget = solver->GetCPressureTarget(iMarker, iVertex);
           
           Area = 0.0;
           for (iDim = 0; iDim < geometry->GetnDim(); iDim++)
@@ -916,7 +916,7 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver_container, CGeometry *geom
   
   /*--- Update the total Cp difference coeffient ---*/
   
-  solver_container->SetTotal_CpDiff(PressDiff);
+  solver->SetTotal_CpDiff(PressDiff);
   
   SetHistoryOutputValue("CP_DIFF", PressDiff);
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index aefb0f098b2d..ecfee615e53d 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -41,46 +41,46 @@
 
 CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
 
-  multizone = config->GetMultizone_Problem();
+  multiZone = config->GetMultizone_Problem();
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    RequestedHistoryFields.push_back("ITER");
-    RequestedHistoryFields.push_back("RMS_RES");
-    nRequestedHistoryFields = RequestedHistoryFields.size();
+    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.push_back("RMS_RES");
+    nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    RequestedScreenFields.push_back("OUTER_ITER");    
-    RequestedScreenFields.push_back("INNER_ITER");
-    RequestedScreenFields.push_back("RMS_TEMPERATURE");
-    nRequestedScreenFields = RequestedScreenFields.size();
+    requestedScreenFields.push_back("OUTER_ITER");    
+    requestedScreenFields.push_back("INNER_ITER");
+    requestedScreenFields.push_back("RMS_TEMPERATURE");
+    nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    RequestedVolumeFields.push_back("COORDINATES");
-    RequestedVolumeFields.push_back("SOLUTION");
-    nRequestedVolumeFields = RequestedVolumeFields.size();
+    requestedVolumeFields.push_back("COORDINATES");
+    requestedVolumeFields.push_back("SOLUTION");
+    nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
   stringstream ss;
   ss << "Zone " << config->GetiZone() << " (Solid Heat)";
-  MultiZoneHeaderString = ss.str();
+  multiZoneHeaderString = ss.str();
   
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetVolume_FileName();
+  volumeFilename = config->GetVolume_FileName();
   
   /*--- Set the surface filename --- */
   
-  SurfaceFilename = config->GetSurfCoeff_FileName();
+  surfaceFilename = config->GetSurfCoeff_FileName();
   
   /*--- Set the restart filename --- */
   
-  RestartFilename = config->GetRestart_FileName();
+  restartFilename = config->GetRestart_FileName();
 
   /*--- Set the default convergence field --- */
 
-  if (Conv_Field.size() == 0 ) Conv_Field = "RMS_TEMPERATURE";
+  if (convField.size() == 0 ) convField = "RMS_TEMPERATURE";
 
 
 }
@@ -88,7 +88,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config,
 CHeatOutput::~CHeatOutput(void) {
 
   if (rank == MASTER_NODE){
-    HistFile.close();
+    histFile.close();
   }
 
 }
@@ -102,7 +102,7 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
   SetHistoryOutputValue("AVG_TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
   SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
-  if (multizone)
+  if (multiZone)
     SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
   
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index 9bfd495c642d..b0d6c880a516 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -42,16 +42,16 @@ CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config,
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
-  RequestedVolumeFields.push_back("COORDINATES");
-  nRequestedVolumeFields = RequestedVolumeFields.size();
+  requestedVolumeFields.push_back("COORDINATES");
+  nRequestedVolumeFields = requestedVolumeFields.size();
     
   /*--- Set the volume filename --- */
   
-  VolumeFilename = config->GetMesh_Out_FileName();
+  volumeFilename = config->GetMesh_Out_FileName();
   
   /*--- Set the surface filename ---*/
   
-  SurfaceFilename = "surface_mesh";
+  surfaceFilename = "surface_mesh";
   
 }
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 6f996c059805..0a76130136ff 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -53,100 +53,92 @@
 #include "../../../Common/include/geometry_structure.hpp"
 #include "../../include/solver_structure.hpp"
 
-COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): fem_output(fem_output) {
+COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutput(fem_output) {
   
   this->nDim = nDim;
 
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
-  field_width = 12;
+  fieldWidth = 12;
   
-  ConvergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
-  MultiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  convergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  multiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
   
   /*--- Set default filenames ---*/
   
-  SurfaceFilename = "surface";
-  VolumeFilename  = "volume";
-  RestartFilename = "restart";
+  surfaceFilename = "surface";
+  volumeFilename  = "volume";
+  restartFilename = "restart";
   
   /*--- Retrieve the history filename ---*/
  
-  HistoryFilename = config->GetConv_FileName();
+  historyFilename = config->GetConv_FileName();
   
   /*--- Append the zone ID ---*/
  
  if(config->GetnZone() > 1){
-   HistoryFilename = config->GetMultizone_HistoryFileName(HistoryFilename, config->GetiZone());
+   historyFilename = config->GetMultizone_HistoryFileName(historyFilename, config->GetiZone());
  }
  
-  HistorySep = ","; 
-  
-  unsigned short iZone;
- 
+  historySep = ","; 
   
   /*--- Initialize residual ---*/
   
-  RhoRes_New = EPS;
-  RhoRes_Old = new su2double[config->GetnZone()];
-  for (iZone = 0; iZone < config->GetnZone(); iZone++) RhoRes_Old[iZone] = EPS;
-  
+  rhoResNew = EPS;
+  rhoResOld = EPS;
+
   nRequestedHistoryFields = config->GetnHistoryOutput();
   for (unsigned short iField = 0; iField < nRequestedHistoryFields; iField++){
-    RequestedHistoryFields.push_back(config->GetHistoryOutput_Field(iField));
+    requestedHistoryFields.push_back(config->GetHistoryOutput_Field(iField));
   }
   
   nRequestedScreenFields = config->GetnScreenOutput();
   for (unsigned short iField = 0; iField < nRequestedScreenFields; iField++){
-    RequestedScreenFields.push_back(config->GetScreenOutput_Field(iField));
+    requestedScreenFields.push_back(config->GetScreenOutput_Field(iField));
   }
   
   nRequestedVolumeFields = config->GetnVolumeOutput();
   for (unsigned short iField = 0; iField < nRequestedVolumeFields; iField++){
-    RequestedVolumeFields.push_back(config->GetVolumeOutput_Field(iField));
+    requestedVolumeFields.push_back(config->GetVolumeOutput_Field(iField));
   }
   
-  grid_movement = config->GetGrid_Movement(); 
+  gridMovement = config->GetGrid_Movement(); 
   
-  multizone     = config->GetMultizone_Problem();
+  multiZone     = config->GetMultizone_Problem();
 
   /*--- Default is to write history to file and screen --- */
 
-  no_writing = false;
+  noWriting = false;
 
-  Cauchy_Serie = new su2double[config->GetCauchy_Elems()];
+  cauchySerie = new su2double[config->GetCauchy_Elems()];
 
-  Conv_Field = config->GetConv_Field();
+  convField = config->GetConv_Field();
 
-  Cauchy_Value = 0.0;
+  cauchyValue = 0.0;
   for (unsigned short iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-    Cauchy_Serie[iCounter] = 0.0;
+    cauchySerie[iCounter] = 0.0;
 
-  Convergence = false;
+  convergence = false;
   
   /*--- Initialize all convergence flags to false. ---*/
   
-  Convergence        = false;
-  Convergence_FSI    = false;
-  Convergence_FullMG = false;
+  convergence        = false;
   
-  Build_Offset_Cache = false;
+  buildFieldIndexCache = false;
   
-  curr_InnerIter = 0;
-  curr_OuterIter = 0;
-  curr_TimeIter  = 0;
+  curInnerIter = 0;
+  curOuterIter = 0;
+  curTimeIter  = 0;
   
 }
 
 COutput::~COutput(void) {
-
-  if (RhoRes_Old != NULL) delete [] RhoRes_Old;
   
-  delete ConvergenceTable;
-  delete MultiZoneHeaderTable;
+  delete convergenceTable;
+  delete multiZoneHeaderTable;
 
-  delete [] Cauchy_Serie;
+  delete [] cauchySerie;
   
 }
 
@@ -159,9 +151,9 @@ void COutput::SetHistory_Output(CGeometry *geometry,
                                   unsigned long OuterIter,
                                   unsigned long InnerIter) {
 
-  curr_TimeIter  = TimeIter;
-  curr_OuterIter = OuterIter;
-  curr_InnerIter = InnerIter;
+  curTimeIter  = TimeIter;
+  curOuterIter = OuterIter;
+  curInnerIter = InnerIter;
   
   bool write_header, write_history, write_screen;
   
@@ -171,13 +163,13 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   
   LoadHistoryData(config, geometry, solver_container);
   
-  Convergence_Monitoring(config, curr_InnerIter);
+  Convergence_Monitoring(config, curInnerIter);
   
   Postprocess_HistoryData(config);
   
   /*--- Output using only the master node ---*/
   
-  if (rank == MASTER_NODE && !no_writing) {
+  if (rank == MASTER_NODE && !noWriting) {
     
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(config);
@@ -205,15 +197,15 @@ void COutput::SetHistory_Output(CGeometry *geometry,
   
   LoadHistoryData(config, geometry, solver_container);
   
-  Convergence_Monitoring(config, curr_InnerIter);  
+  Convergence_Monitoring(config, curInnerIter);  
   
   Postprocess_HistoryData(config);
 
 }
 void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter){
   
-  curr_TimeIter  = TimeIter;
-  curr_OuterIter = OuterIter;
+  curTimeIter  = TimeIter;
+  curOuterIter = OuterIter;
   
   bool write_header, write_screen, write_history;
   
@@ -221,11 +213,11 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CCo
   
   LoadMultizoneHistoryData(output, config);
   
-  Convergence_Monitoring(driver_config, curr_OuterIter);  
+  Convergence_Monitoring(driver_config, curOuterIter);  
   
   /*--- Output using only the master node ---*/
   
-  if (rank == MASTER_NODE && !no_writing) {
+  if (rank == MASTER_NODE && !noWriting) {
     
     /*--- Write the history file ---------------------------------------------------------------------------*/
     write_history = WriteHistoryFile_Output(driver_config);
@@ -242,96 +234,96 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CCo
   }
   
 }
-void COutput::SetCFL_Number(CSolver *****solver_container, CConfig **config, unsigned short val_iZone) {
+void COutput::SetCFL_Number(CSolver ****solver_container, CConfig *config) {
   
   su2double CFLFactor = 1.0, power = 1.0, CFL = 0.0, CFLMin = 0.0, CFLMax = 0.0, Div = 1.0, Diff = 0.0, MGFactor[100];
   unsigned short iMesh;
   
-  unsigned short FinestMesh = config[val_iZone]->GetFinestMesh();
+  unsigned short FinestMesh = config->GetFinestMesh();
   unsigned short nVar = 1;
 
-  bool energy = config[val_iZone]->GetEnergy_Equation();
-  bool weakly_coupled_heat = config[val_iZone]->GetWeakly_Coupled_Heat();
+  bool energy = config->GetEnergy_Equation();
+  bool weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
 
-  switch( config[val_iZone]->GetKind_Solver()) {
+  switch( config->GetKind_Solver()) {
     case EULER : case NAVIER_STOKES : case RANS:
     case INC_EULER : case INC_NAVIER_STOKES : case INC_RANS:
       if (energy) {
-        nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+        nVar = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+        rhoResNew = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
       }
       else if (weakly_coupled_heat) {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+        rhoResNew = solver_container[INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
       }
       else {
-        RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+        rhoResNew = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
       }
       break;
     case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+      rhoResNew = solver_container[INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
       break;
     case HEAT_EQUATION_FVM:
-      RhoRes_New = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+      rhoResNew = solver_container[INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
       break;
   }
   
-  if (RhoRes_New < EPS) RhoRes_New = EPS;
-  if (RhoRes_Old[val_iZone] < EPS) RhoRes_Old[val_iZone] = RhoRes_New;
+  if (rhoResNew < EPS) rhoResNew = EPS;
+  if (rhoResOld < EPS) rhoResOld = rhoResNew;
 
-  Div = RhoRes_Old[val_iZone]/RhoRes_New;
-  Diff = RhoRes_New-RhoRes_Old[val_iZone];
+  Div = rhoResOld/rhoResNew;
+  Diff = rhoResNew-rhoResOld;
 
   /*--- Compute MG factor ---*/
 
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
+  for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
     if (iMesh == MESH_0) MGFactor[iMesh] = 1.0;
-    else MGFactor[iMesh] = MGFactor[iMesh-1] * config[val_iZone]->GetCFL(iMesh)/config[val_iZone]->GetCFL(iMesh-1);
+    else MGFactor[iMesh] = MGFactor[iMesh-1] * config->GetCFL(iMesh)/config->GetCFL(iMesh-1);
   }
 
-  if (Div < 1.0) power = config[val_iZone]->GetCFL_AdaptParam(0);
-  else power = config[val_iZone]->GetCFL_AdaptParam(1);
+  if (Div < 1.0) power = config->GetCFL_AdaptParam(0);
+  else power = config->GetCFL_AdaptParam(1);
 
   /*--- Detect a stall in the residual ---*/
 
-  if ((fabs(Diff) <= RhoRes_New*1E-8) && (curr_InnerIter != 0)) { Div = 0.1; power = config[val_iZone]->GetCFL_AdaptParam(1); }
+  if ((fabs(Diff) <= rhoResNew*1E-8) && (curInnerIter != 0)) { Div = 0.1; power = config->GetCFL_AdaptParam(1); }
 
-  CFLMin = config[val_iZone]->GetCFL_AdaptParam(2);
-  CFLMax = config[val_iZone]->GetCFL_AdaptParam(3);
+  CFLMin = config->GetCFL_AdaptParam(2);
+  CFLMax = config->GetCFL_AdaptParam(3);
 
   CFLFactor = pow(Div, power);
 
-  for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-    CFL = config[val_iZone]->GetCFL(iMesh);
+  for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
+    CFL = config->GetCFL(iMesh);
     CFL *= CFLFactor;
 
     if ((iMesh == MESH_0) && (CFL <= CFLMin)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++) {
-        config[val_iZone]->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
+      for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
+        config->SetCFL(iMesh, 1.001*CFLMin*MGFactor[iMesh]);
       }
       break;
     }
     if ((iMesh == MESH_0) && (CFL >= CFLMax)) {
-      for (iMesh = 0; iMesh <= config[val_iZone]->GetnMGLevels(); iMesh++)
-        config[val_iZone]->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
+      for (iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++)
+        config->SetCFL(iMesh, 0.999*CFLMax*MGFactor[iMesh]);
       break;
     }
 
-    config[val_iZone]->SetCFL(iMesh, CFL);
+    config->SetCFL(iMesh, CFL);
   }
 
-  switch( config[val_iZone]->GetKind_Solver()) {
+  switch( config->GetKind_Solver()) {
   case EULER : case NAVIER_STOKES : case RANS:
   case INC_EULER : case INC_NAVIER_STOKES : case INC_RANS:      
-    nVar = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetnVar();
-    if (energy) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
-    else if (weakly_coupled_heat) RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
-    else RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
+    nVar = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetnVar();
+    if (energy) rhoResOld = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(nVar-1);
+    else if (weakly_coupled_heat) rhoResOld = solver_container[INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    else rhoResOld = solver_container[INST_0][FinestMesh][FLOW_SOL]->GetRes_RMS(0);
     break;
   case ADJ_EULER : case ADJ_NAVIER_STOKES: case ADJ_RANS:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
+    rhoResOld = solver_container[INST_0][FinestMesh][ADJFLOW_SOL]->GetRes_RMS(0);
     break;
   case HEAT_EQUATION_FVM:
-    RhoRes_Old[val_iZone] = solver_container[val_iZone][INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
+    rhoResOld = solver_container[INST_0][FinestMesh][HEAT_SOL]->GetRes_RMS(0);
     break;
   }
   
@@ -342,13 +334,13 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   /*---- Construct a data sorter object to partition and distribute
    *  the local data into linear chunks across the processors ---*/
   
-  if (fem_output){
+  if (femOutput){
   
-    data_sorter = new CFEMDataSorter(config, geometry, GlobalField_Counter);
+    volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
 
   }  else {
     
-    data_sorter = new CFVMDataSorter(config, geometry, GlobalField_Counter);
+    volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
     
   }  
 
@@ -367,17 +359,17 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   if (rank == MASTER_NODE) 
     cout << "Sorting output data across all ranks." << endl;
   
-  data_sorter->SortOutputData(config, geometry);
+  volumeDataSorter->SortOutputData();
   
 }
 
 
 void COutput::DeallocateData_Parallel(){
   
-  if (data_sorter != NULL)
-    delete data_sorter;
+  if (volumeDataSorter != NULL)
+    delete volumeDataSorter;
   
-  data_sorter = NULL;
+  volumeDataSorter = NULL;
   
 }
 
@@ -396,7 +388,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
           cout << "Writing CSV file." << endl;     
       }
          
-      filewriter = new CCSVFileWriter(Variable_Names, nDim);
+      filewriter = new CCSVFileWriter(volumeFieldNames, nDim);
           
       break;
     
@@ -406,7 +398,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
         cout << "Writing SU2 ASCII restart file." << endl;     
     }
        
-    filewriter = new CSU2FileWriter(Variable_Names, nDim);
+    filewriter = new CSU2FileWriter(volumeFieldNames, nDim);
         
     break;
     
@@ -416,7 +408,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing SU2 binary restart file." << endl;   
     }
 
-    filewriter = new CSU2BinaryFileWriter(Variable_Names, nDim);
+    filewriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim);
         
     break;
   
@@ -433,7 +425,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing SU2 mesh file." << endl;
     }
     
-    filewriter = new CSU2MeshFileWriter(Variable_Names, nDim, config->GetiZone(), config->GetnZone());
+    filewriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, config->GetiZone(), config->GetnZone());
     
     
     break;    
@@ -450,7 +442,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing Tecplot binary file solution file." << endl;
     }
     
-    filewriter = new CTecplotBinaryFileWriter(Variable_Names, nDim, curr_TimeIter, GetHistoryFieldValue("TIME_STEP"));
+    filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, curTimeIter, GetHistoryFieldValue("TIME_STEP"));
       
     break;
     
@@ -466,7 +458,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing Tecplot ASCII file solution file." << endl;
     }
     
-    filewriter = new CTecplotFileWriter(Variable_Names, nDim, curr_TimeIter, GetHistoryFieldValue("TIME_STEP"));
+    filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, curTimeIter, GetHistoryFieldValue("TIME_STEP"));
 
     break;
     
@@ -481,7 +473,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
       cout << "Writing Paraview binary file solution file." << endl;
     }
     
-    filewriter = new CParaviewBinaryFileWriter(Variable_Names, nDim);
+    filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim);
     
     break;
     
@@ -496,7 +488,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
         cout << "Writing Paraview ASCII file volume solution file." << endl;      
     }
     
-    filewriter = new CParaviewFileWriter(Variable_Names, nDim);
+    filewriter = new CParaviewFileWriter(volumeFieldNames, nDim);
 
     break;
     
@@ -511,10 +503,10 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   CParallelDataSorter* surface_sort = NULL;
   CFileWriter*         file_writer = NULL;
   
-  if (fem_output){
-    surface_sort = new CSurfaceFEMDataSorter(config, geometry, GlobalField_Counter, dynamic_cast<CFEMDataSorter*>(data_sorter));
+  if (femOutput){
+    surface_sort = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
   } else {
-    surface_sort = new CSurfaceFVMDataSorter(config, geometry,GlobalField_Counter, dynamic_cast<CFVMDataSorter*>(data_sorter));    
+    surface_sort = new CSurfaceFVMDataSorter(config, geometry,nVolumeFields, dynamic_cast<CFVMDataSorter*>(volumeDataSorter));    
   }
 
   /*--- Set the file writer --- */
@@ -523,9 +515,9 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
     
   /*--- Sort the surface output data --- */
   
-  surface_sort->SortOutputData(config, geometry);
+  surface_sort->SortOutputData();
   
-  string FileName = SurfaceFilename;
+  string FileName = surfaceFilename;
   
   /*--- Remove extension --- */
   
@@ -539,7 +531,7 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
   /*--- Add time iteration if requested --- */
   
   if (time_dep){
-    FileName = config->GetUnsteady_FileName(FileName, curr_TimeIter, "");
+    FileName = config->GetUnsteady_FileName(FileName, curTimeIter, "");
   }
   
   if (surface_sort->GetnElem() > 0){
@@ -557,10 +549,10 @@ void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned s
 
 void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep){
   
-  string FileName = VolumeFilename;
+  string FileName = volumeFilename;
   
   if(format == SU2_RESTART_ASCII || format == SU2_RESTART_BINARY){
-    FileName = RestartFilename;
+    FileName = restartFilename;
   }
   
   /*--- Remove extension --- */
@@ -575,18 +567,18 @@ void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned sh
   /*--- Add time iteration if requested --- */
   
   if (time_dep){
-    FileName = config->GetUnsteady_FileName(FileName, curr_TimeIter, "");
+    FileName = config->GetUnsteady_FileName(FileName, curTimeIter, "");
   }
   
   CFileWriter* file_writer = NULL;
 
   /*--- Set the file writer --- */
   
-  SetFileWriter(config, geometry, data_sorter, file_writer, format);
+  SetFileWriter(config, geometry, volumeDataSorter, file_writer, format);
   
   /*--- Write data to file --- */
   
-  file_writer->Write_Data(FileName, data_sorter);
+  file_writer->Write_Data(FileName, volumeDataSorter);
   
   if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
     cout << "Wrote " << file_writer->Get_Filesize()/(1.0e6) << " MB to disk in ";
@@ -606,50 +598,50 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
   unsigned short iCounter;
     
-  Convergence = false;
+  convergence = false;
   
-  if( HistoryOutput_Map.count(Conv_Field) > 0 ){
+  if( historyOutput_Map.count(convField) > 0 ){
     
-    su2double monitor = HistoryOutput_Map[Conv_Field].Value;
+    su2double monitor = historyOutput_Map[convField].value;
     
     /*--- Cauchy based convergence criteria ---*/
     
-    if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT) {
+    if (historyOutput_Map[convField].fieldType == TYPE_COEFFICIENT) {
       
       if (Iteration == 0){
         for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
-          Cauchy_Serie[iCounter] = 0.0;
+          cauchySerie[iCounter] = 0.0;
         }
-        New_Func = monitor;
+        newFunc = monitor;
       }
       
-      Old_Func = New_Func;
-      New_Func = monitor;
-      Cauchy_Func = fabs(New_Func - Old_Func);
+      oldFunc = newFunc;
+      newFunc = monitor;
+      cauchyFunc = fabs(newFunc - oldFunc);
       
-      Cauchy_Serie[Iteration % config->GetCauchy_Elems()] = Cauchy_Func;
-      Cauchy_Value = 1.0;
+      cauchySerie[Iteration % config->GetCauchy_Elems()] = cauchyFunc;
+      cauchyValue = 1.0;
       if (Iteration >= config->GetCauchy_Elems()){     
-        Cauchy_Value = 0.0;
+        cauchyValue = 0.0;
         for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-          Cauchy_Value += Cauchy_Serie[iCounter];
+          cauchyValue += cauchySerie[iCounter];
       }
       
-      if (Cauchy_Value >= config->GetCauchy_Eps()) { Convergence = false; Convergence_FullMG = false; }
-      else { Convergence = true; Convergence_FullMG = true; New_Func = 0.0;}
+      if (cauchyValue >= config->GetCauchy_Eps()) { convergence = false;}
+      else { convergence = true; newFunc = 0.0;}
       
-      SetHistoryOutputValue("CAUCHY", Cauchy_Value);
+      SetHistoryOutputValue("CAUCHY", cauchyValue);
       
     }
     
     /*--- Residual based convergence criteria ---*/
     
-    if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_RESIDUAL || HistoryOutput_Map[Conv_Field].FieldType == TYPE_AUTO_RESIDUAL) {
+    if (historyOutput_Map[convField].fieldType == TYPE_RESIDUAL || historyOutput_Map[convField].fieldType == TYPE_AUTO_RESIDUAL) {
       
       /*--- Check the convergence ---*/
       
-      if ((monitor <= config->GetMinLogResidual())) { Convergence = true; Convergence_FullMG = true; }
-      else { Convergence = false; Convergence_FullMG = false; }
+      if ((monitor <= config->GetMinLogResidual())) { convergence = true;  }
+      else { convergence = false; }
       
     }
     
@@ -657,8 +649,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
      of iterations is less than a particular value ---*/
     
     if (Iteration < config->GetStartConv_Iter()) {
-      Convergence = false;
-      Convergence_FullMG = false;
+      convergence = false;
     }
     
     /*--- Apply the same convergence criteria to all the processors ---*/
@@ -671,7 +662,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     
     /*--- Convergence criteria ---*/
     
-    sbuf_conv[0] = Convergence;
+    sbuf_conv[0] = convergence;
     SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
     
     /*-- Compute global convergence criteria in the master node --*/
@@ -684,8 +675,8 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     
     SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
     
-    if (sbuf_conv[0] == 1) { Convergence = true; Convergence_FullMG = true; }
-    else { Convergence = false; Convergence_FullMG = false; }
+    if (sbuf_conv[0] == 1) { convergence = true; }
+    else { convergence = false;  }
     
     delete [] sbuf_conv;
     delete [] rbuf_conv;
@@ -699,7 +690,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     }
     
   }
-  return Convergence;
+  return convergence;
 }
 
 void COutput::SetHistoryFile_Header(CConfig *config) { 
@@ -709,48 +700,48 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
       (config->GetOutput_FileFormat() == FIELDVIEW) ||
       (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
-    HistFile << "TITLE = \"SU2 Simulation\"" << endl;
-    HistFile << "VARIABLES = ";
+    histFile << "TITLE = \"SU2 Simulation\"" << endl;
+    histFile << "VARIABLES = ";
   }
   
   stringstream out;
   string RequestedField;
   std::vector<bool> found_field(nRequestedHistoryFields, false);
     
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];   
-      if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutput_List[iField_Output])){
+      RequestedField = requestedHistoryFields[iReqField];   
+      if (RequestedField == Field.outputGroup || (RequestedField == historyOutput_List[iField_Output])){
         found_field[iReqField] = true;        
-        out << "\"" << Field.FieldName << "\"" << HistorySep;
+        out << "\"" << Field.fieldName << "\"" << historySep;
       }
     }  
   }
   
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){  
-      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){  
+      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup || (RequestedField == HistoryOutputPerSurface_List[iField_Output])){
+        RequestedField = requestedHistoryFields[iReqField];   
+        if (RequestedField == Field.outputGroup || (RequestedField == historyOutputPerSurface_List[iField_Output])){
           found_field[iReqField] = true;          
-          out << "\"" << Field.FieldName << "\"" << HistorySep;        
+          out << "\"" << Field.fieldName << "\"" << historySep;        
         }
       }
     }
   }
   
   /*--- Print the string to file and remove the last character (a separator) ---*/
-  HistFile << out.str().substr(0, out.str().size() - 1);
-  HistFile << endl;
+  histFile << out.str().substr(0, out.str().size() - 1);
+  histFile << endl;
   if (config->GetOutput_FileFormat() == TECPLOT ||
       config->GetOutput_FileFormat() == TECPLOT_BINARY ||
       config->GetOutput_FileFormat() == FIELDVIEW ||
       config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
-    HistFile << "ZONE T= \"Convergence history\"" << endl;
+    histFile << "ZONE T= \"Convergence history\"" << endl;
   }
-  HistFile.flush();
+  histFile.flush();
   
 }
 
@@ -761,23 +752,23 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   string RequestedField;
   
   
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];   
-      if (RequestedField == Field.OutputGroup){
-        out << std::setprecision(10) << Field.Value << HistorySep << " ";
+      RequestedField = requestedHistoryFields[iReqField];   
+      if (RequestedField == Field.outputGroup){
+        out << std::setprecision(10) << Field.value << historySep << " ";
       }
     }
   }
   
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup){
-          out << std::setprecision(10) << Field.Value << HistorySep << " ";
+        RequestedField = requestedHistoryFields[iReqField];   
+        if (RequestedField == Field.outputGroup){
+          out << std::setprecision(10) << Field.value << historySep << " ";
         }
       }
     }
@@ -785,15 +776,15 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   
   /*--- Print the string to file and remove the last two characters (a separator and a space) ---*/
   
-  HistFile << out.str().substr(0, out.str().size()-2);
-  HistFile << endl;
-  HistFile.flush();
+  histFile << out.str().substr(0, out.str().size()-2);
+  histFile << endl;
+  histFile.flush();
 }
 
 void COutput::SetScreen_Header(CConfig *config) {
   if (config->GetMultizone_Problem()) 
-    MultiZoneHeaderTable->PrintHeader();
-  ConvergenceTable->PrintHeader();
+    multiZoneHeaderTable->PrintHeader();
+  convergenceTable->PrintHeader();
 }
 
 
@@ -803,40 +794,40 @@ void COutput::SetScreen_Output(CConfig *config) {
   
   for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
     stringstream out;
-    RequestedField = RequestedScreenFields[iReqField]; 
-    if (HistoryOutput_Map.count(RequestedField) > 0){  
-      switch (HistoryOutput_Map[RequestedField].ScreenFormat) {
+    RequestedField = requestedScreenFields[iReqField]; 
+    if (historyOutput_Map.count(RequestedField) > 0){  
+      switch (historyOutput_Map[RequestedField].screenFormat) {
         case FORMAT_INTEGER:
-          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutput_Map[RequestedField].Value), field_width);
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(historyOutput_Map[RequestedField].value), fieldWidth);
           break;
         case FORMAT_FIXED:
-          PrintingToolbox::PrintScreenFixed(out, HistoryOutput_Map[RequestedField].Value, field_width);
+          PrintingToolbox::PrintScreenFixed(out, historyOutput_Map[RequestedField].value, fieldWidth);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintingToolbox::PrintScreenScientific(out, HistoryOutput_Map[RequestedField].Value, field_width);
+          PrintingToolbox::PrintScreenScientific(out, historyOutput_Map[RequestedField].value, fieldWidth);
           break;      
       }
     }
-    if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
-      switch (HistoryOutputPerSurface_Map[RequestedField][0].ScreenFormat) {
+    if (historyOutputPerSurface_Map.count(RequestedField) > 0){
+      switch (historyOutputPerSurface_Map[RequestedField][0].screenFormat) {
         case FORMAT_INTEGER:
-          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(HistoryOutputPerSurface_Map[RequestedField][0].Value), field_width);
+          PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(historyOutputPerSurface_Map[RequestedField][0].value), fieldWidth);
           break;
         case FORMAT_FIXED:
-          PrintingToolbox::PrintScreenFixed(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
+          PrintingToolbox::PrintScreenFixed(out, historyOutputPerSurface_Map[RequestedField][0].value, fieldWidth);
           break;
         case FORMAT_SCIENTIFIC:
-          PrintingToolbox::PrintScreenScientific(out, HistoryOutputPerSurface_Map[RequestedField][0].Value, field_width);
+          PrintingToolbox::PrintScreenScientific(out, historyOutputPerSurface_Map[RequestedField][0].value, fieldWidth);
           break;   
       }
     }      
-    (*ConvergenceTable) << out.str();
+    (*convergenceTable) << out.str();
   }
 }
 
 void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
-    no_writing = !wrt;
+    noWriting = !wrt;
 
     /*--- Set the common output fields ---*/
     
@@ -850,7 +841,7 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
     
     Postprocess_HistoryFields(config);
     
-    if (rank == MASTER_NODE && !no_writing){
+    if (rank == MASTER_NODE && !noWriting){
       
       /*--- Check for consistency and remove fields that are requested but not available --- */
       
@@ -863,9 +854,9 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
       /*--- Set the multizone screen header ---*/
       
       if (config->GetMultizone_Problem()){
-        MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
-        MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
-        MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+        multiZoneHeaderTable->AddColumn(multiZoneHeaderString, nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1));      
+        multiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+        multiZoneHeaderTable->SetPrintHeaderBottomLine(false);
       }
       
     }
@@ -874,13 +865,13 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
   
-  no_writing = !wrt;
+  noWriting = !wrt;
 
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
-  if (rank == MASTER_NODE && !no_writing){
+  if (rank == MASTER_NODE && !noWriting){
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
    
@@ -897,9 +888,9 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
     /*--- Set the multizone screen header ---*/
 
     if (config[ZONE_0]->GetMultizone_Problem()){
-      MultiZoneHeaderTable->AddColumn(MultiZoneHeaderString, nRequestedScreenFields*field_width + (nRequestedScreenFields-1));      
-      MultiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
-      MultiZoneHeaderTable->SetPrintHeaderBottomLine(false);
+      multiZoneHeaderTable->AddColumn(multiZoneHeaderString, nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1));      
+      multiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+      multiZoneHeaderTable->SetPrintHeaderBottomLine(false);
     }
     
   }
@@ -912,7 +903,7 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   string history_filename;
   
-  strcpy (char_histfile, HistoryFilename.data());
+  strcpy (char_histfile, historyFilename.data());
   
    /*--- Append the restart iteration: if dynamic problem and restart ---*/
   
@@ -937,8 +928,8 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   /*--- Open the history file ---*/
   
-  HistFile.open(char_histfile, ios::out);
-  HistFile.precision(15);
+  histFile.open(char_histfile, ios::out);
+  histFile.precision(15);
   
   /*--- Add the header to the history file. ---*/
   
@@ -956,12 +947,12 @@ void COutput::CheckHistoryOutput(){
   vector<bool> FoundField(nRequestedHistoryFields, false);
   
   for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-    RequestedField = RequestedScreenFields[iReqField];  
-    if (HistoryOutput_Map.count(RequestedField) > 0){ 
-      ConvergenceTable->AddColumn(HistoryOutput_Map[RequestedField].FieldName, field_width);
+    RequestedField = requestedScreenFields[iReqField];  
+    if (historyOutput_Map.count(RequestedField) > 0){ 
+      convergenceTable->AddColumn(historyOutput_Map[RequestedField].fieldName, fieldWidth);
     }
-    else if (HistoryOutputPerSurface_Map.count(RequestedField) > 0){
-      ConvergenceTable->AddColumn(HistoryOutputPerSurface_Map[RequestedField][0].FieldName, field_width);
+    else if (historyOutputPerSurface_Map.count(RequestedField) > 0){
+      convergenceTable->AddColumn(historyOutputPerSurface_Map[RequestedField][0].fieldName, fieldWidth);
     }else {
       FieldsToRemove.push_back(RequestedField);
     }
@@ -981,16 +972,16 @@ void COutput::CheckHistoryOutput(){
         cout << endl;
       }
     }
-    RequestedScreenFields.erase(std::find(RequestedScreenFields.begin(), RequestedScreenFields.end(), FieldsToRemove[iReqField]));
+    requestedScreenFields.erase(std::find(requestedScreenFields.begin(), requestedScreenFields.end(), FieldsToRemove[iReqField]));
   }
   
-  nRequestedScreenFields = RequestedScreenFields.size();
+  nRequestedScreenFields = requestedScreenFields.size();
   
   if (rank == MASTER_NODE){
     cout <<"Screen output fields: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-      RequestedField = RequestedScreenFields[iReqField];            
-      cout << RequestedScreenFields[iReqField];
+      RequestedField = requestedScreenFields[iReqField];            
+      cout << requestedScreenFields[iReqField];
       if (iReqField != nRequestedScreenFields - 1) cout << ", ";
     }
     cout << endl;
@@ -1001,22 +992,22 @@ void COutput::CheckHistoryOutput(){
   FieldsToRemove.clear();
   FoundField = vector<bool>(nRequestedHistoryFields, false);
   
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField_Output]];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
+    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];   
-      if (RequestedField == Field.OutputGroup){
+      RequestedField = requestedHistoryFields[iReqField];   
+      if (RequestedField == Field.outputGroup){
         FoundField[iReqField] = true;
       }
     }
   }
   
-  for (unsigned short iField_Output = 0; iField_Output < HistoryOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      HistoryOutputField &Field = HistoryOutputPerSurface_Map[HistoryOutputPerSurface_List[iField_Output]][iMarker];
+  for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
+    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = RequestedHistoryFields[iReqField];   
-        if (RequestedField == Field.OutputGroup){
+        RequestedField = requestedHistoryFields[iReqField];   
+        if (RequestedField == Field.outputGroup){
           FoundField[iReqField] = true;
         }
       }
@@ -1025,7 +1016,7 @@ void COutput::CheckHistoryOutput(){
   
   for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
     if (!FoundField[iReqField]){
-      FieldsToRemove.push_back(RequestedHistoryFields[iReqField]);
+      FieldsToRemove.push_back(requestedHistoryFields[iReqField]);
     }
   }
   
@@ -1043,16 +1034,16 @@ void COutput::CheckHistoryOutput(){
         cout << endl;
       }
     }
-    RequestedHistoryFields.erase(std::find(RequestedHistoryFields.begin(), RequestedHistoryFields.end(), FieldsToRemove[iReqField]));
+    requestedHistoryFields.erase(std::find(requestedHistoryFields.begin(), requestedHistoryFields.end(), FieldsToRemove[iReqField]));
   }
   
-  nRequestedHistoryFields = RequestedHistoryFields.size();
+  nRequestedHistoryFields = requestedHistoryFields.size();
   
   if (rank == MASTER_NODE){
     cout <<"History output groups: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = RequestedHistoryFields[iReqField];            
-      cout << RequestedHistoryFields[iReqField];
+      RequestedField = requestedHistoryFields[iReqField];            
+      cout << requestedHistoryFields[iReqField];
       if (iReqField != nRequestedHistoryFields - 1) cout << ", ";
     }
     cout << endl;
@@ -1060,8 +1051,8 @@ void COutput::CheckHistoryOutput(){
   
   /*--- Check that the requested convergence monitoring field is available ---*/
 
-  if (HistoryOutput_Map.count(Conv_Field) == 0){
-    SU2_MPI::Error(string("Convergence monitoring field ") + Conv_Field + string(" not available"), CURRENT_FUNCTION);
+  if (historyOutput_Map.count(convField) == 0){
+    SU2_MPI::Error(string("Convergence monitoring field ") + convField + string(" not available"), CURRENT_FUNCTION);
   }
 }
 
@@ -1071,7 +1062,7 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
   
   SetVolumeOutputFields(config);
    
-  GlobalField_Counter = 0;
+  nVolumeFields = 0;
   
   string RequestedField;
   std::vector<bool> FoundField(nRequestedVolumeFields, false);
@@ -1083,20 +1074,20 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
  * object gets an offset so that we know where to find the data in the Local_Data() array.
  *  Note that the default offset is -1. An index !=-1 defines this field as part of the output. ---*/
 
-  for (unsigned short iField_Output = 0; iField_Output < VolumeOutput_List.size(); iField_Output++){
+  for (unsigned short iField_Output = 0; iField_Output < volumeOutput_List.size(); iField_Output++){
     
-    VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField_Output]];
+    VolumeOutputField &Field = volumeOutput_Map[volumeOutput_List[iField_Output]];
     
     /*--- Loop through all fields specified in the config ---*/
     
     for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
       
-      RequestedField = RequestedVolumeFields[iReqField];  
+      RequestedField = requestedVolumeFields[iReqField];  
             
-      if (((RequestedField == Field.OutputGroup) || (RequestedField == VolumeOutput_List[iField_Output])) && (Field.Offset == -1)){
-        Field.Offset = GlobalField_Counter;
-        Variable_Names.push_back(Field.FieldName);
-        GlobalField_Counter++;
+      if (((RequestedField == Field.outputGroup) || (RequestedField == volumeOutput_List[iField_Output])) && (Field.offset == -1)){
+        Field.offset = nVolumeFields;
+        volumeFieldNames.push_back(Field.fieldName);
+        nVolumeFields++;
         
         FoundField[iReqField] = true;
       }
@@ -1105,7 +1096,7 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
   
   for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
     if (!FoundField[iReqField]){
-      FieldsToRemove.push_back(RequestedVolumeFields[iReqField]);
+      FieldsToRemove.push_back(requestedVolumeFields[iReqField]);
     }
   }
   
@@ -1124,14 +1115,14 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
         cout << endl;
       }
     }
-    RequestedVolumeFields.erase(std::find(RequestedVolumeFields.begin(), RequestedVolumeFields.end(), FieldsToRemove[iReqField]));
+    requestedVolumeFields.erase(std::find(requestedVolumeFields.begin(), requestedVolumeFields.end(), FieldsToRemove[iReqField]));
   }
   
   if (rank == MASTER_NODE){
     cout <<"Volume output fields: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
-      RequestedField = RequestedVolumeFields[iReqField];            
-      cout << RequestedVolumeFields[iReqField];
+      RequestedField = requestedVolumeFields[iReqField];            
+      cout << requestedVolumeFields[iReqField];
       if (iReqField != nRequestedVolumeFields - 1) cout << ", ";
     }
     cout << endl;
@@ -1145,10 +1136,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   unsigned long iVertex = 0;
   
   /*--- Reset the offset cache and index --- */
-  Offset_Cache_Index = 0;
-  Offset_Cache.clear();
+  curFieldIndex = 0;
+  fieldIndexCache.clear();
   
-  if (fem_output){
+  if (femOutput){
     
     /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
      geometrical information for the FEM DG solver. ---*/
@@ -1165,14 +1156,12 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
       for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
         
-        Build_Offset_Cache = !Offset_Cache.size() ? true : false;
+        buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
         
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
         jPoint++;
         
-        CheckOffsetCache();        
-
       }
     }
     
@@ -1183,15 +1172,15 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       /*--- Check for halos & write only if requested ---*/
       /*--- Load the volume data into the Local_Data() array. --- */
       
-      Build_Offset_Cache = !Offset_Cache.size() ? true : false;
+      buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
 
       LoadVolumeData(config, geometry, solver, iPoint);
 
     }
     
     /*--- Reset the offset cache and index --- */
-    Offset_Cache_Index = 0;
-    Offset_Cache.clear(); 
+    curFieldIndex = 0;
+    fieldIndexCache.clear(); 
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
       for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
@@ -1199,7 +1188,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   
         if(geometry->node[iPoint]->GetDomain()){
           
-          Build_Offset_Cache = !Offset_Cache.size() ? true : false;
+          buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
    
           LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
           
@@ -1211,17 +1200,17 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
 void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double value){
   
-  if (Build_Offset_Cache){ 
+  if (buildFieldIndexCache){ 
     
     /*--- Build up the offset cache to speed up subsequent 
      * calls of this routine since the order of calls is 
      * the same for every value of iPoint --- */
     
-    if (VolumeOutput_Map.count(name) > 0){
-      const short Offset = VolumeOutput_Map[name].Offset;
-      Offset_Cache.push_back(Offset);        
+    if (volumeOutput_Map.count(name) > 0){
+      const short Offset = volumeOutput_Map[name].offset;
+      fieldIndexCache.push_back(Offset);        
       if (Offset != -1){
-        data_sorter->SetUnsorted_Data(iPoint, Offset, value);
+        volumeDataSorter->SetUnsorted_Data(iPoint, Offset, value);
       }
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
@@ -1230,36 +1219,14 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
     
     /*--- Use the offset cache for the access ---*/
     
-    const short Offset = Offset_Cache[Offset_Cache_Index++];
+    const short Offset = fieldIndexCache[curFieldIndex++];
     if (Offset != -1){
-      data_sorter->SetUnsorted_Data(iPoint, Offset, value);
+      volumeDataSorter->SetUnsorted_Data(iPoint, Offset, value);
     }   
-    if (Offset_Cache_Index == Offset_Cache.size()){
-      Offset_Cache_Index = 0;
-    }
-  }
-  
-}
-
-void COutput::CheckOffsetCache(){
-  
-  if (!Offset_Cache_Checked){
-    vector<short> Offset_Cache_Copy = Offset_Cache;
-    
-    /*--- Remove the -1 offset --- */
-    
-    Offset_Cache_Copy.erase(std::remove(Offset_Cache_Copy.begin(), Offset_Cache_Copy.end(), -1), 
-                            Offset_Cache_Copy.end());
-    
-    /*--- Check if all offsets are unique. If thats not the case, then SetVolumeOutputValue() was called
-       * more than once for the same output field. --- */
-    
-    vector<short>::iterator it = std::unique( Offset_Cache_Copy.begin(), Offset_Cache_Copy.end() );
-    if (it != Offset_Cache_Copy.end() ){
-      SU2_MPI::Error("Offset cache contains duplicate entries.", CURRENT_FUNCTION);
+    if (curFieldIndex == fieldIndexCache.size()){
+      curFieldIndex = 0;
     }
   }
-  Offset_Cache_Checked = true;
   
 }
 
@@ -1268,25 +1235,25 @@ void COutput::Postprocess_HistoryData(CConfig *config){
   map<string, su2double> Average;
   map<string, int> Count;
   
-  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
-    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
-    if (currentField.FieldType == TYPE_RESIDUAL){
-      if ( SetInit_Residuals(config) || (currentField.Value > Init_Residuals[HistoryOutput_List[iField]]) ) {
-        Init_Residuals[HistoryOutput_List[iField]] = currentField.Value;
+  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    if (currentField.fieldType == TYPE_RESIDUAL){
+      if ( SetInit_Residuals(config) || (currentField.value > initialResiduals[historyOutput_List[iField]]) ) {
+        initialResiduals[historyOutput_List[iField]] = currentField.value;
       }
-      SetHistoryOutputValue("REL_" + HistoryOutput_List[iField], currentField.Value - Init_Residuals[HistoryOutput_List[iField]]);
+      SetHistoryOutputValue("REL_" + historyOutput_List[iField], currentField.value - initialResiduals[historyOutput_List[iField]]);
       
-      Average[currentField.OutputGroup] += currentField.Value;
-      Count[currentField.OutputGroup]++;
+      Average[currentField.outputGroup] += currentField.value;
+      Count[currentField.outputGroup]++;
            
     }
-    if (currentField.FieldType == TYPE_COEFFICIENT){
+    if (currentField.fieldType == TYPE_COEFFICIENT){
       if(SetUpdate_Averages(config)){
-        SetHistoryOutputValue("TAVG_" + HistoryOutput_List[iField], RunningAverages[HistoryOutput_List[iField]].Update(currentField.Value));
+        SetHistoryOutputValue("TAVG_" + historyOutput_List[iField], runningAverages[historyOutput_List[iField]].Update(currentField.value));
       }
       if (config->GetDirectDiff() != NO_DERIVATIVE){
-        SetHistoryOutputValue("D_" + HistoryOutput_List[iField], SU2_TYPE::GetDerivative(currentField.Value));      
-        SetHistoryOutputValue("D_TAVG_" + HistoryOutput_List[iField], SU2_TYPE::GetDerivative(RunningAverages[HistoryOutput_List[iField]].Get()));
+        SetHistoryOutputValue("D_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(currentField.value));      
+        SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
         
       }
     }
@@ -1304,11 +1271,11 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   map<string, bool> Average;
   map<string, string> AverageGroupName =  CCreateMap<string, string>("BGS_RES", "bgs")("RMS_RES","rms")("MAX_RES", "max");
   
-  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
-    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
-    if (currentField.FieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + HistoryOutput_List[iField], "rel" + currentField.FieldName, currentField.ScreenFormat, "REL_" + currentField.OutputGroup, "Relative residual.", TYPE_AUTO_RESIDUAL);
-      Average[currentField.OutputGroup] = true;
+  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    if (currentField.fieldType == TYPE_RESIDUAL){
+      AddHistoryOutput("REL_" + historyOutput_List[iField], "rel" + currentField.fieldName, currentField.screenFormat, "REL_" + currentField.outputGroup, "Relative residual.", TYPE_AUTO_RESIDUAL);
+      Average[currentField.outputGroup] = true;
     }
   }
   
@@ -1317,28 +1284,28 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
   }  
   
-  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
-    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
-    if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_"   + HistoryOutput_List[iField], "tavg["  + currentField.FieldName + "]", currentField.ScreenFormat, "TAVG_"   + currentField.OutputGroup, "Time averaged values.", TYPE_AUTO_COEFFICIENT);
+  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    if (currentField.fieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]", currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", TYPE_AUTO_COEFFICIENT);
     }
   }
-  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
-    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
-    if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_"      + HistoryOutput_List[iField], "d["     + currentField.FieldName + "]", currentField.ScreenFormat, "D_"      + currentField.OutputGroup, "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    if (currentField.fieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]", currentField.screenFormat, "D_"      + currentField.outputGroup, "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
     }
   }
   
-  for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
-    HistoryOutputField &currentField = HistoryOutput_Map[HistoryOutput_List[iField]];
-    if (currentField.FieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_TAVG_" + HistoryOutput_List[iField], "dtavg[" + currentField.FieldName + "]", currentField.ScreenFormat, "D_TAVG_" + currentField.OutputGroup, "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    if (currentField.fieldType == TYPE_COEFFICIENT){
+      AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]", currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
     }
   }
   
-  if (HistoryOutput_Map[Conv_Field].FieldType == TYPE_COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + HistoryOutput_Map[Conv_Field].FieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY","Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
+  if (historyOutput_Map[convField].fieldType == TYPE_COEFFICIENT){
+    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY","Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
   }
 
 }
@@ -1363,14 +1330,14 @@ bool COutput::WriteScreen_Header(CConfig *config) {
 
   /* --- Always print header in the first iteration --- */
   
-  if ((curr_InnerIter == 0) && 
-      (curr_OuterIter == 0) && 
-      (curr_TimeIter == RestartIter)){
+  if ((curInnerIter == 0) && 
+      (curOuterIter == 0) && 
+      (curTimeIter == RestartIter)){
     return true;
   }
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
-      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+  if (!PrintOutput(curTimeIter, ScreenWrt_Freq_Time)&& 
+      !(curTimeIter == config->GetnTime_Iter() - 1)){
     return false;
   }
    
@@ -1381,7 +1348,7 @@ bool COutput::WriteScreen_Header(CConfig *config) {
   
   /*--- Print header if we are at the first inner iteration ---*/
   
-  if (curr_InnerIter == 0){
+  if (curInnerIter == 0){
     return true;
   }
   
@@ -1402,24 +1369,24 @@ bool COutput::WriteScreen_Output(CConfig *config) {
   
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, ScreenWrt_Freq_Time)&& 
-      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+  if (!PrintOutput(curTimeIter, ScreenWrt_Freq_Time)&& 
+      !(curTimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
     
   }
   
-  if (Convergence) {return true;}
+  if (convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter, ScreenWrt_Freq_Outer) && 
-      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+  if (!PrintOutput(curOuterIter, ScreenWrt_Freq_Outer) && 
+      !(curOuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, ScreenWrt_Freq_Inner) &&
-      !(curr_InnerIter == config->GetnInner_Iter() - 1)){
+  if (!PrintOutput(curInnerIter, ScreenWrt_Freq_Inner) &&
+      !(curInnerIter == config->GetnInner_Iter() - 1)){
     
     return false;
     
@@ -1437,24 +1404,24 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
     
   /*--- Check if screen output should be written --- */
   
-  if (!PrintOutput(curr_TimeIter, HistoryWrt_Freq_Time)&& 
-      !(curr_TimeIter == config->GetnTime_Iter() - 1)){
+  if (!PrintOutput(curTimeIter, HistoryWrt_Freq_Time)&& 
+      !(curTimeIter == config->GetnTime_Iter() - 1)){
     
     return false;
     
   }
   
-  if (Convergence) {return true;}
+  if (convergence) {return true;}
   
-  if (!PrintOutput(curr_OuterIter,HistoryWrt_Freq_Outer) && 
-      !(curr_OuterIter == config->GetnOuter_Iter() - 1)){
+  if (!PrintOutput(curOuterIter,HistoryWrt_Freq_Outer) && 
+      !(curOuterIter == config->GetnOuter_Iter() - 1)){
     
     return false;
     
   }
   
-  if (!PrintOutput(curr_InnerIter, HistoryWrt_Freq_Inner) &&
-      !(curr_InnerIter == config->GetnInner_Iter() - 1)){
+  if (!PrintOutput(curInnerIter, HistoryWrt_Freq_Inner) &&
+      !(curInnerIter == config->GetnInner_Iter() - 1)){
     
     return false;
     
@@ -1488,13 +1455,13 @@ void COutput::SetCommonHistoryFields(CConfig *config){
 
 void COutput::LoadCommonHistoryData(CConfig *config){
   
-  SetHistoryOutputValue("TIME_ITER",  curr_TimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curr_InnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curr_OuterIter); 
+  SetHistoryOutputValue("TIME_ITER",  curTimeIter);  
+  SetHistoryOutputValue("INNER_ITER", curInnerIter);
+  SetHistoryOutputValue("OUTER_ITER", curOuterIter); 
   
   if (config->GetTime_Domain()){
     SetHistoryOutputValue("TIME_STEP", config->GetDelta_UnstTimeND()*config->GetTime_Ref());           
-    if (curr_InnerIter == 0){
+    if (curInnerIter == 0){
       SetHistoryOutputValue("CUR_TIME",  GetHistoryFieldValue("CUR_TIME") + GetHistoryFieldValue("TIME_STEP"));      
     }
   }
@@ -1506,7 +1473,7 @@ void COutput::LoadCommonHistoryData(CConfig *config){
   StopTime = MPI_Wtime();
 #endif
   
-  UsedTime = (StopTime - config->Get_StartTime())/((curr_OuterIter + 1) * (curr_InnerIter+1));
+  UsedTime = (StopTime - config->Get_StartTime())/((curOuterIter + 1) * (curInnerIter+1));
   
   SetHistoryOutputValue("PHYS_TIME", UsedTime);
   
@@ -1521,24 +1488,24 @@ void COutput::PrintHistoryFields(){
     
     unsigned short NameSize = 0, GroupSize = 0, DescrSize = 0;
     
-    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField]];
       
-      if (Field.Description != ""){
-        if (HistoryOutput_List[iField].size() > NameSize){
-          NameSize = HistoryOutput_List[iField].size();
+      if (Field.description != ""){
+        if (historyOutput_List[iField].size() > NameSize){
+          NameSize = historyOutput_List[iField].size();
         }
-        if (Field.OutputGroup.size() > GroupSize){
-          GroupSize = Field.OutputGroup.size();
+        if (Field.outputGroup.size() > GroupSize){
+          GroupSize = Field.outputGroup.size();
         }
-        if (Field.Description.size() > DescrSize){
-          DescrSize = Field.Description.size();
+        if (Field.description.size() > DescrSize){
+          DescrSize = Field.description.size();
         }
       }
     }
     
-    cout << "Available output fields for the current configuration in " << MultiZoneHeaderString << ":" << endl;
+    cout << "Available output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
     
     HistoryFieldTable.AddColumn("Name", NameSize);
     HistoryFieldTable.AddColumn("Group Name", GroupSize);
@@ -1548,13 +1515,13 @@ void COutput::PrintHistoryFields(){
     
     HistoryFieldTable.PrintHeader();
     
-    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField]];
       
-      if (Field.FieldType == TYPE_DEFAULT || Field.FieldType == TYPE_COEFFICIENT || Field.FieldType == TYPE_RESIDUAL){
+      if (Field.fieldType == TYPE_DEFAULT || Field.fieldType == TYPE_COEFFICIENT || Field.fieldType == TYPE_RESIDUAL){
         string type;
-        switch (Field.FieldType) {
+        switch (Field.fieldType) {
           case TYPE_COEFFICIENT:
             type = "C";
             break;
@@ -1566,8 +1533,8 @@ void COutput::PrintHistoryFields(){
             break;
         }
         
-        if (Field.Description != "")
-          HistoryFieldTable << HistoryOutput_List[iField] << Field.OutputGroup << type << Field.Description;
+        if (Field.description != "")
+          HistoryFieldTable << historyOutput_List[iField] << Field.outputGroup << type << Field.description;
         
       }
     }
@@ -1589,13 +1556,13 @@ void COutput::PrintHistoryFields(){
     
     std::map<string, bool> GroupVisited;
     
-    for (unsigned short iField = 0; iField < HistoryOutput_List.size(); iField++){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       
-      HistoryOutputField &Field = HistoryOutput_Map[HistoryOutput_List[iField]];
+      HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField]];
       
-      if ((Field.FieldType == TYPE_AUTO_COEFFICIENT || Field.FieldType == TYPE_AUTO_RESIDUAL) && (GroupVisited.count(Field.OutputGroup) == 0)){
+      if ((Field.fieldType == TYPE_AUTO_COEFFICIENT || Field.fieldType == TYPE_AUTO_RESIDUAL) && (GroupVisited.count(Field.outputGroup) == 0)){
         string type;
-        switch (Field.FieldType) {
+        switch (Field.fieldType) {
           case TYPE_AUTO_COEFFICIENT:
             type = "AC";
             break;
@@ -1607,10 +1574,10 @@ void COutput::PrintHistoryFields(){
             break;
         }
         
-        if (Field.Description != "")
-          ModifierTable << HistoryOutput_List[iField] << Field.OutputGroup << type << Field.Description;
+        if (Field.description != "")
+          ModifierTable << historyOutput_List[iField] << Field.outputGroup << type << Field.description;
         
-        GroupVisited[Field.OutputGroup] = true;
+        GroupVisited[Field.outputGroup] = true;
       }
     }   
     ModifierTable.PrintFooter();
@@ -1626,24 +1593,24 @@ void COutput::PrintVolumeFields(){
     
     unsigned short NameSize = 0, GroupSize = 0, DescrSize = 0;
     
-    for (unsigned short iField = 0; iField < VolumeOutput_List.size(); iField++){
+    for (unsigned short iField = 0; iField < volumeOutput_List.size(); iField++){
       
-      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField]];
+      VolumeOutputField &Field = volumeOutput_Map[volumeOutput_List[iField]];
       
-      if (Field.Description != ""){
-        if (VolumeOutput_List[iField].size() > NameSize){
-          NameSize = VolumeOutput_List[iField].size();
+      if (Field.description != ""){
+        if (volumeOutput_List[iField].size() > NameSize){
+          NameSize = volumeOutput_List[iField].size();
         }
-        if (Field.OutputGroup.size() > GroupSize){
-          GroupSize = Field.OutputGroup.size();
+        if (Field.outputGroup.size() > GroupSize){
+          GroupSize = Field.outputGroup.size();
         }
-        if (Field.Description.size() > DescrSize){
-          DescrSize = Field.Description.size();
+        if (Field.description.size() > DescrSize){
+          DescrSize = Field.description.size();
         }
       }
     }
     
-    cout << "Available output fields for the current configuration in " << MultiZoneHeaderString << ":" << endl;
+    cout << "Available output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
     
     VolumeFieldTable.AddColumn("Name", NameSize);
     VolumeFieldTable.AddColumn("Group Name", GroupSize);
@@ -1652,12 +1619,12 @@ void COutput::PrintVolumeFields(){
     
     VolumeFieldTable.PrintHeader();
     
-    for (unsigned short iField = 0; iField < VolumeOutput_List.size(); iField++){
+    for (unsigned short iField = 0; iField < volumeOutput_List.size(); iField++){
       
-      VolumeOutputField &Field = VolumeOutput_Map[VolumeOutput_List[iField]];
+      VolumeOutputField &Field = volumeOutput_Map[volumeOutput_List[iField]];
 
-      if (Field.Description != "")
-        VolumeFieldTable << VolumeOutput_List[iField] << Field.OutputGroup << Field.Description;
+      if (Field.description != "")
+        VolumeFieldTable << volumeOutput_List[iField] << Field.outputGroup << Field.description;
       
     }
     
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index f0ebd7f42944..3bb0b9badf6d 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -2,11 +2,7 @@
 #include "../../../include/output/filewriter/CParallelDataSorter.hpp"
 
 CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".csv";
-    
-}
+  CFileWriter(fields, ".csv", nDim){}
 
 
 CCSVFileWriter::~CCSVFileWriter(){
@@ -56,10 +52,10 @@ void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   /*--- Allocate buffers for send/recv of the data and global IDs. ---*/
   
-  su2double *bufD_Send = new su2double[MaxLocalVertex_Surface*fieldnames.size()];
+  su2double *bufD_Send = new su2double[MaxLocalVertex_Surface*fieldnames.size()]();
   su2double *bufD_Recv = NULL;
   
-  unsigned long *bufL_Send = new unsigned long [MaxLocalVertex_Surface];
+  unsigned long *bufL_Send = new unsigned long [MaxLocalVertex_Surface]();
   unsigned long *bufL_Recv = NULL;
   
   /*--- Load send buffers with the local data on this rank. ---*/
@@ -83,7 +79,7 @@ void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   /*--- Only the master rank allocates buffers for the recv. ---*/
   
   if (rank == MASTER_NODE) {
-    bufD_Recv = new su2double[nProcessor*MaxLocalVertex_Surface*fieldnames.size()];
+    bufD_Recv = new su2double[nProcessor*MaxLocalVertex_Surface*fieldnames.size()]();
     bufL_Recv = new unsigned long[nProcessor*MaxLocalVertex_Surface];
   }
   
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 711cc5a1944b..19606976b397 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -37,15 +37,9 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   nGlobalPoint_Sort = nLocalPoint_Sort;
 #endif
 
-  /*--- Set a final variable for the number of points in the restart
-   file. We do not write the periodic points for the FV solver, even if
-   they show up in the viz. files. ---*/
-
-  nPoint_Restart = nGlobalPoint_Sort;
-  
   /*--- Create a linear partition --- */
   
-  CreateLinearPartition(nGlobalPoint_Sort);  
+  linearPartitioner = new CLinearPartitioner(nGlobalPoint_Sort, 0);
   
   /*--- Prepare the send buffers ---*/
   
@@ -54,20 +48,16 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
 }
 
 CFEMDataSorter::~CFEMDataSorter(){
-  
-  delete [] beg_node;
-  delete [] end_node;
-  delete [] nPoint_Cum;
-  delete [] nPoint_Lin;
 
   if (connSend != NULL)    delete [] connSend;
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
+  if (linearPartitioner != NULL) delete linearPartitioner;
   
 }
 
 
-void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+void CFEMDataSorter::SortOutputData() {
 
   /* For convenience, set the total number of variables stored at each DOF. */
 
@@ -85,11 +75,11 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
    directly copy our own data later. ---*/
 
   su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
   for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
     connRecv[ii] = 0;
 
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
   for (int ii = 0; ii < nPoint_Recv[size]; ii++)
     idRecv[ii] = 0;
 
@@ -201,7 +191,7 @@ void CFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
 
   Parallel_Data = new su2double*[VARS_PER_POINT];
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]]();
     for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
       Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
     }
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 6f00e3b36195..c50192720d4c 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -8,7 +8,7 @@ CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
   nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
   nLocalPoint_Sort  = geometry->GetnPointDomain();
 
-  Local_Halo = new int[geometry->GetnPoint()];
+  Local_Halo = new int[geometry->GetnPoint()]();
   
   for (unsigned long iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++){
   
@@ -27,9 +27,9 @@ CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
 
   SetHaloPoints(geometry, config);
   
-  /*--- Create a linear partition --- */
+  /*--- Create the linear partitioner --- */
   
-  CreateLinearPartition(nGlobalPoint_Sort);  
+  linearPartitioner = new CLinearPartitioner(nGlobalPoint_Sort, 0);
   
   /*--- Prepare the send buffers ---*/
   
@@ -39,15 +39,12 @@ CFVMDataSorter::CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
 
 CFVMDataSorter::~CFVMDataSorter(){
   
-  delete [] beg_node;
-  delete [] end_node;
-  delete [] nPoint_Cum;
-  delete [] nPoint_Lin;
   delete [] Local_Halo;
   
   if (connSend != NULL)    delete [] connSend;
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
+  if (linearPartitioner != NULL) delete linearPartitioner;
 }
 
 void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
@@ -80,7 +77,7 @@ void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
 }
 
 
-void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+void CFVMDataSorter::SortOutputData() {
   
   int VARS_PER_POINT = GlobalField_Counter;
   
@@ -96,13 +93,9 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
    directly copy our own data later. ---*/
   
   su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
-    connRecv[ii] = 0;
+  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
   
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]];
-  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
-    idRecv[ii] = 0;
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
   
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
@@ -212,7 +205,7 @@ void CFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
   
   Parallel_Data = new su2double*[VARS_PER_POINT];
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]];
+    Parallel_Data[jj] = new su2double[nPoint_Recv[size]]();
     for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
       Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
     }
@@ -324,9 +317,9 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
    nodes, i.e., rank 0 holds the first nPoint()/nProcessors nodes.
    First, initialize a counter and flag. ---*/
   
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
+  int *nElem_Send = new int[size+1](); nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1](); nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size]();
   
   for (int ii=0; ii < size; ii++) {
     nElem_Send[ii] = 0;
@@ -360,7 +353,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
          own elements into the connectivity data structure. ---*/
         
         if (val_sort) {
-          iProcessor = FindProcessor(Global_Index);
+          iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);
         } else {
           iProcessor = rank;
         }
@@ -409,23 +402,21 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
    sending. ---*/
   
   unsigned long *connSend = NULL;
-  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Send[size]; ii++)
-    connSend[ii] = 0;
+  connSend = new unsigned long[NODES_PER_ELEMENT*nElem_Send[size]]();
   
   /*--- Allocate arrays for storing halo flags. ---*/
   
-  unsigned short *haloSend = new unsigned short[nElem_Send[size]];
+  unsigned short *haloSend = new unsigned short[nElem_Send[size]]();
   for (int ii = 0; ii < nElem_Send[size]; ii++)
     haloSend[ii] = false;
   
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
-  unsigned long *index = new unsigned long[size];
+  unsigned long *index = new unsigned long[size]();
   for (int ii=0; ii < size; ii++) index[ii] = NODES_PER_ELEMENT*nElem_Send[ii];
   
-  unsigned long *haloIndex = new unsigned long[size];
+  unsigned long *haloIndex = new unsigned long[size]();
   for (int ii=0; ii < size; ii++) haloIndex[ii] = nElem_Send[ii];
   
   /*--- Loop through our elements and load the elems and their
@@ -456,7 +447,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
          own elements into the connectivity data structure. ---*/
         
         if (val_sort) {
-          iProcessor = FindProcessor(Global_Index);    
+          iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);
         } else {
           iProcessor = rank;
         }
@@ -505,13 +496,9 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
    directly copy our own data later. ---*/
   
   unsigned long *connRecv = NULL;
-  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]];
-  for (int ii = 0; ii < NODES_PER_ELEMENT*nElem_Recv[size]; ii++)
-    connRecv[ii] = 0;
+  connRecv = new unsigned long[NODES_PER_ELEMENT*nElem_Recv[size]]();
   
-  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    haloRecv[ii] = false;
+  unsigned short *haloRecv = new unsigned short[nElem_Recv[size]]();
   
 #ifdef HAVE_MPI
 
@@ -617,7 +604,7 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
    to the connectivity for vizualization packages. First, allocate
    appropriate amount of memory for this section. ---*/
   
-  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]];
+  if (nElem_Recv[size] > 0) Conn_Elem = new int[NODES_PER_ELEMENT*nElem_Recv[size]]();
   int count = 0; nElem_Total = 0;
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
     if (!haloRecv[ii]) {
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index 4d7a88fd0248..e336f434a9f3 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -36,14 +36,10 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   nLocalPoint_Sort  = 0;
   nGlobalPoint_Sort = 0;
   
-  nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  nPoint_Send = new int[size+1]();
+  nPoint_Recv = new int[size+1](); 
   
-  for (int ii=0; ii < size; ii++) {
-    nPoint_Send[ii] = 0;
-    nPoint_Recv[ii] = 0;
-  }
-  nPoint_Send[size] = 0; nPoint_Recv[size] = 0;
+  linearPartitioner = NULL;
 
 }
 
@@ -52,66 +48,24 @@ CParallelDataSorter::~CParallelDataSorter(){
   if (nPoint_Send != NULL) delete [] nPoint_Send;
   if (nPoint_Recv != NULL) delete [] nPoint_Recv;
   
-  DeallocateConnectivity();
+  /*--- Deallocate memory for connectivity data on each processor. ---*/
   
-  DeallocateData();
+  if (nParallel_Line > 0 && Conn_Line_Par != NULL) delete [] Conn_Line_Par;
+  if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
+  if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
+  if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
+  if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
+  if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
+  if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
   
-}
-
-void CParallelDataSorter::CreateLinearPartition(unsigned long nGlobalPoint){
-    
-  /*--- Now that we know the actual number of points we need to output,
-   compute the number of points that will be on each processor.
-   This is a linear partitioning with the addition of a simple load
-   balancing for any remainder points. ---*/
-
-  beg_node = new unsigned long[size];
-  end_node = new unsigned long[size];
-
-  nPoint_Lin = new unsigned long[size];
-  nPoint_Cum = new unsigned long[size+1];
-
-  unsigned long total_points = 0;
-  for (int ii = 0; ii < size; ii++) {
-    nPoint_Lin[ii] = nGlobalPoint/size;
-    total_points  += nPoint_Lin[ii];
-  }
-
-  /*--- Get the number of remainder points after the even division. ---*/
-
-  unsigned long remainder = nGlobalPoint - total_points;
-  for (unsigned long ii = 0; ii < remainder; ii++) {
-    nPoint_Lin[ii]++;
-  }
-
-  /*--- Store the local number of nodes on each proc in the linear
-   partitioning, the beginning/end index, and the linear partitioning
-   within an array in cumulative storage format. ---*/
-
-  beg_node[0] = 0;
-  end_node[0] = beg_node[0] + nPoint_Lin[0];
-  nPoint_Cum[0] = 0;
-  for (int ii = 1; ii < size; ii++) {
-    beg_node[ii]   = end_node[ii-1];
-    end_node[ii]   = beg_node[ii] + nPoint_Lin[ii];
-    nPoint_Cum[ii] = nPoint_Cum[ii-1] + nPoint_Lin[ii-1];
-  }
-  nPoint_Cum[size] = nGlobalPoint;
+  /*--- Deallocate memory for solution data ---*/
   
+  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  }
+  if (Parallel_Data != NULL) delete [] Parallel_Data;  
 }
 
-unsigned short CParallelDataSorter::FindProcessor(unsigned long global_index){
-  
-  unsigned short iProcessor = global_index/nPoint_Lin[0];
-  if (iProcessor >= (unsigned long)size)
-    iProcessor = (unsigned long)size-1;
-  if (global_index >= nPoint_Cum[iProcessor])
-    while(global_index >= nPoint_Cum[iProcessor+1]) iProcessor++;
-  else
-    while(global_index <  nPoint_Cum[iProcessor])   iProcessor--;
-  
-  return iProcessor;
-}
 
 unsigned long CParallelDataSorter::GetnElem(GEO_TYPE type){
   
@@ -163,7 +117,7 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
   
   for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++ ) {
     
-    iProcessor = FindProcessor(globalID[iPoint]);
+    iProcessor = linearPartitioner->GetRankContainingIndex(globalID[iPoint]);      
     
     /*--- If we have not visited this node yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -201,39 +155,34 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
    sending. ---*/
   
   connSend = NULL;
-  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]];
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Send[size]; ii++)
-    connSend[ii] = 0;
-  
+  connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]]();
   /*--- Allocate arrays for sending the global ID. ---*/
   
-  idSend = new unsigned long[nPoint_Send[size]];
-  for (int ii = 0; ii < nPoint_Send[size]; ii++)
-    idSend[ii] = 0;
-  
+  idSend = new unsigned long[nPoint_Send[size]]();
+
   /*--- Create an index variable to keep track of our index
    positions as we load up the send buffer. ---*/
   
-  unsigned long *index = new unsigned long[size];
+  unsigned long *index = new unsigned long[size]();
   for (int ii=0; ii < size; ii++) index[ii] = VARS_PER_POINT*nPoint_Send[ii];
   
-  unsigned long *idIndex = new unsigned long[size];
+  unsigned long *idIndex = new unsigned long[size]();
   for (int ii=0; ii < size; ii++) idIndex[ii] = nPoint_Send[ii];
   
-  Index = new unsigned long[nLocalPoint_Sort];
+  Index = new unsigned long[nLocalPoint_Sort]();
 
   /*--- Loop through our elements and load the elems and their
    additional data that we will send to the other procs. ---*/
   
   for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
     
-    iProcessor = FindProcessor(globalID[iPoint]);
+    iProcessor = linearPartitioner->GetRankContainingIndex(globalID[iPoint]);      
 
     /*--- Load the global ID (minus offset) for sorting the
          points once they all reach the correct processor. ---*/
     
     unsigned long nn = idIndex[iProcessor];
-    idSend[nn] = globalID[iPoint] - beg_node[iProcessor];
+    idSend[nn] = globalID[iPoint] - linearPartitioner->GetFirstIndexOnRank(iProcessor);
     
     /*--- Store the index this point has in the send buffer ---*/
     
@@ -286,28 +235,3 @@ unsigned long CParallelDataSorter::GetElem_Connectivity(GEO_TYPE type, unsigned
   return 0;
 }
 
-void CParallelDataSorter::DeallocateConnectivity() {
-  
-  /*--- Deallocate memory for connectivity data on each processor. ---*/
-  
-  if (nParallel_Line > 0 && Conn_Line_Par != NULL) delete [] Conn_Line_Par;
-  if (nParallel_Tria > 0 && Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
-  if (nParallel_Quad > 0 && Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;
-  if (nParallel_Tetr > 0 && Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;
-  if (nParallel_Hexa > 0 && Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;
-  if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
-  if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
-  
-  
-}
-
-void CParallelDataSorter::DeallocateData() {
-  
-  /*--- Deallocate memory for solution data ---*/
-  
-  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
-  }
-  if (Parallel_Data != NULL) delete [] Parallel_Data;
-
-}
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
index d66e1d976bdd..b7e38379ff27 100644
--- a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -1,15 +1,13 @@
 #include "../../../include/output/filewriter/CFileWriter.hpp"
 
 
-CFileWriter::CFileWriter(vector<string> fields, unsigned short nDim){
+CFileWriter::CFileWriter(vector<string> fields, string file_ext, unsigned short nDim): fieldnames(fields),
+                                                                                       nDim(nDim),
+                                                                                       file_ext(file_ext){
   
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
-  this->nDim = nDim;
-    
-  this->fieldnames = fields;
-  
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 4ebec2eece00..4ff7f866bc94 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -2,11 +2,7 @@
 
 
 CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, nDim){
-  
-  file_ext = ".vtk";
-    
-}
+  CFileWriter(fields, ".vtk", nDim){}
 
 
 CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
@@ -27,7 +23,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   ofstream Paraview_File;
     
-  int MAX_STRING_LENGTH = 255;
+  const int MAX_STRING_LENGTH = 255;
   char str_buf[MAX_STRING_LENGTH], fname[100];
   
   const int NCOORDS = 3;
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index bacd54891f85..89297486a5a9 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -2,16 +2,10 @@
 
 
 CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".vtk";
-    
-}
+  CFileWriter(fields, ".vtk", nDim){}
 
 
-CParaviewFileWriter::~CParaviewFileWriter(){
-  
-}
+CParaviewFileWriter::~CParaviewFileWriter(){}
 
 void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 5914b0937be3..d3166e446beb 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -1,11 +1,7 @@
 #include "../../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
 
 CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".dat";
-    
-}
+  CFileWriter(fields,".dat", nDim){}
 
 
 CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 8fe6636c8ede..e8fdd261cd2c 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -4,11 +4,7 @@
 
 
 CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".dat";
-    
-}
+  CFileWriter(fields, ".dat", nDim){}
 
 
 CSU2FileWriter::~CSU2FileWriter(){
@@ -59,7 +55,7 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   /*--- Write the restart file in parallel, processor by processor. ---*/
   
-  unsigned long myPoint = 0, offset = 0, Global_Index;
+  unsigned long myPoint = 0, Global_Index;
   for (iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
       for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
@@ -84,10 +80,6 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     }
     /*--- Flush the file and wait for all processors to arrive. ---*/
     restart_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&myPoint, &offset, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
     
   }
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index a49d319c16a9..880ec9b9d90c 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -4,15 +4,9 @@
 
 
 
-CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".su2";
-    
-  this->iZone = iZone;
-  this->nZone = nZone;
-  
-}
+CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, 
+                                       unsigned short iZone, unsigned short nZone) : 
+  iZone(iZone), nZone(nZone), CFileWriter(fields, ".su2", nDim){}
 
 
 CSU2MeshFileWriter::~CSU2MeshFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 8f3ff5945c97..875d6ef3847d 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -33,25 +33,22 @@ CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometr
 #else
   nGlobalPoint_Sort = nLocalPoint_Sort;
 #endif
-
-  /*--- Set a final variable for the number of points in the restart
-   file. We do not write the periodic points for the FV solver, even if
-   they show up in the viz. files. ---*/
-
-  nPoint_Restart = nGlobalPoint_Sort;
-  
-  
-  /*--- Create a linear partition --- */
   
-  CreateLinearPartition(nGlobalPoint_Sort);
+  /*--- Create the linear partitioner --- */
   
+  linearPartitioner = new CLinearPartitioner(nGlobalPoint_Sort, 0);
+
 }
 
-CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){}
+CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){
+
+  if (linearPartitioner != NULL) delete linearPartitioner;
+  
+}
 
 
 
-void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+void CSurfaceFEMDataSorter::SortOutputData() {
   
   if (!connectivity_sorted){
     SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
@@ -108,7 +105,7 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   for(unsigned long i=0; i<globalSurfaceDOFIDs.size(); ++i) {
 
     /* Search for the processor that owns this point. */
-    unsigned long iProcessor = FindProcessor(globalSurfaceDOFIDs[i]);
+    unsigned long iProcessor = linearPartitioner->GetRankContainingIndex(globalSurfaceDOFIDs[i]);
 
     /* Store the global ID in the send buffer for iProcessor. */
     sendBuf[iProcessor].push_back(globalSurfaceDOFIDs[i]);
@@ -198,12 +195,12 @@ void CSurfaceFEMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
 
   Parallel_Data = new su2double*[VARS_PER_POINT];
   for(int jj=0; jj<VARS_PER_POINT; jj++)
-    Parallel_Data[jj] = new su2double[nParallel_Poin];
+    Parallel_Data[jj] = new su2double[nParallel_Poin]();
 
   /* Determine the local index of the global surface DOFs and
      copy the data into Parallel_Surf_Data. */
   for(unsigned long i=0; i<nParallel_Poin; ++i) {
-    const unsigned long ii = globalSurfaceDOFIDs[i] - volume_sorter->GetnPointCumulative(rank);
+    const unsigned long ii = globalSurfaceDOFIDs[i] - linearPartitioner->GetCumulativeSizeBeforeRank(rank);
 
     for(int jj=0; jj<VARS_PER_POINT; jj++)
       Parallel_Data[jj][i] = volume_sorter->GetData(jj,ii);
@@ -392,7 +389,7 @@ void CSurfaceFEMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
     /* Allocate the memory to store the connectivity if the size is
        larger than zero. */
     int *Conn_SubElem = NULL;
-    if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT];
+    if(nSubElem_Local > 0) Conn_SubElem = new int[nSubElem_Local*NODES_PER_ELEMENT]();
   
     /*--- Repeat the loop over the surface elements of the boundary markers
           that must be plotted, but now store the connectivity. ---*/
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 778c5bffaa50..8482946f7fb6 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -10,23 +10,19 @@ CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, CGeometry *geometr
   nGlobalPoint_Sort = geometry->GetGlobal_nPointDomain();
   nLocalPoint_Sort  = geometry->GetnPointDomain();
   
-  /*--- Create a linear partition --- */
+  /*--- Create the linear partitioner --- */
   
-  CreateLinearPartition(nGlobalPoint_Sort);
+  linearPartitioner = new CLinearPartitioner(nGlobalPoint_Sort, 0);
 
 }
 
 CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){
   
-  delete [] beg_node;
-  delete [] end_node;
-  
-  delete [] nPoint_Cum;
-  delete [] nPoint_Lin;
+  if (linearPartitioner != NULL) delete linearPartitioner;
   
 }
 
-void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry) {
+void CSurfaceFVMDataSorter::SortOutputData() {
   
   if (!connectivity_sorted){
     SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
@@ -50,9 +46,9 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   /*--- Prepare to check and communicate the nodes that each proc has
    locally from the surface connectivity. ---*/
   
-  int *nElem_Send = new int[size+1]; nElem_Send[0] = 0;
-  int *nElem_Recv = new int[size+1]; nElem_Recv[0] = 0;
-  int *nElem_Flag = new int[size];
+  int *nElem_Send = new int[size+1](); nElem_Send[0] = 0;
+  int *nElem_Recv = new int[size+1](); nElem_Recv[0] = 0;
+  int *nElem_Flag = new int[size]();
   
   for (int ii=0; ii < size; ii++) {
     nElem_Send[ii] = 0;
@@ -74,7 +70,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);      
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
       
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -102,7 +98,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -130,7 +126,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
@@ -172,14 +168,12 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   
   /*--- Allocate arrays for sending the global ID. ---*/
   
-  unsigned long *idSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++) idSend[ii] = 0;
+  unsigned long *idSend = new unsigned long[nElem_Send[size]]();
   
   /*--- Create an index variable to keep track of our index
    positions as we load up the send buffer. ---*/
   
-  unsigned long *idIndex = new unsigned long[size];
-  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
+  unsigned long *idIndex = new unsigned long[size]();
   
   /*--- Now loop back through the local connectivities for the surface
    elements and load up the global IDs for sending to their home proc. ---*/
@@ -194,7 +188,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
    
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -228,7 +222,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -262,7 +256,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- Load global ID into the buffer for sending ---*/
       
@@ -289,10 +283,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
   
-  unsigned long *idRecv = NULL;
-  idRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    idRecv[ii] = 0;
+  unsigned long *idRecv = new unsigned long[nElem_Recv[size]]();
   
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
@@ -370,17 +361,17 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   /*--- Create a local data structure that acts as a mask to extract the
    set of points within the local set that are on the surface. ---*/
   
-  int *surfPoint = new int[volume_sorter->GetnPoints()];
-  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) surfPoint[iPoint] = -1;
+  int *surfPoint = new int[nLocalPoint_Sort];
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) surfPoint[iPoint] = -1;
   
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    surfPoint[(int)idRecv[ii]- volume_sorter->GetNodeBegin(rank)] = (int)idRecv[ii];
+    surfPoint[(int)idRecv[ii]- linearPartitioner->GetFirstIndexOnRank(rank)] = (int)idRecv[ii];
   }
   
   /*--- First, add up the number of surface points I have on my rank. ---*/
   
   nParallel_Poin = 0;
-  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
     if (surfPoint[iPoint] != -1) {
       
       /*--- Save the global index values for CSV output. ---*/
@@ -398,8 +389,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    processors so that it can be used to create offsets for the new
    global numbering for the surface points. ---*/
   
-  int *nPoint_Send = new int[size+1]; nPoint_Send[0] = 0;
-  int *nPoint_Recv = new int[size+1]; nPoint_Recv[0] = 0;
+  int *nPoint_Send = new int[size+1](); nPoint_Send[0] = 0;
+  int *nPoint_Recv = new int[size+1](); nPoint_Recv[0] = 0;
   
   for (int ii=1; ii < size+1; ii++) nPoint_Send[ii]= (int)nParallel_Poin;
   
@@ -423,9 +414,9 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
   
   Parallel_Data = new su2double*[VARS_PER_POINT];
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nParallel_Poin];
+    Parallel_Data[jj] = new su2double[nParallel_Poin]();
     count = 0;
-    for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
+    for (int ii = 0; ii < (int)nLocalPoint_Sort; ii++) {
       if (surfPoint[ii] !=-1) {
         Parallel_Data[jj][count] = volume_sorter->GetData(jj,ii);
         count++;
@@ -448,11 +439,11 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    create a new mapping using two arrays, which will need to be
    communicated. We use our mask again here.  ---*/
   
-  unsigned long *globalP = new unsigned long[nParallel_Poin];
-  unsigned long *renumbP = new unsigned long[nParallel_Poin];
+  unsigned long *globalP = new unsigned long[nParallel_Poin]();
+  unsigned long *renumbP = new unsigned long[nParallel_Poin]();
   
   count = 0;
-  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
+  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
     if (surfPoint[iPoint] != -1) {
       globalP[count] = surfPoint[iPoint];
       renumbP[count] = count + nPoint_Recv[rank];
@@ -491,7 +482,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = FindProcessor(Global_Index);
+    iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -534,22 +525,18 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    sending. ---*/
   
   unsigned long *globalSend = NULL;
-  globalSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    globalSend[ii] = 0;
+  globalSend = new unsigned long[nElem_Send[size]]();
   
   /*--- Allocate memory to hold the renumbering that we are
    sending. ---*/
   
   unsigned long *renumbSend = NULL;
-  renumbSend = new unsigned long[nElem_Send[size]];
-  for (int ii = 0; ii < nElem_Send[size]; ii++)
-    renumbSend[ii] = 0;
+  renumbSend = new unsigned long[nElem_Send[size]]();
   
   /*--- Create an index variable to keep track of our index
    position as we load up the send buffer. ---*/
   
-  unsigned long *index = new unsigned long[size];
+  unsigned long *index = new unsigned long[size]();
   for (int ii=0; ii < size; ii++) index[ii] = nElem_Send[ii];
   
   /*--- Loop back through and load up the buffers for the global IDs
@@ -561,7 +548,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = FindProcessor(Global_Index);
+    iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
     if (nElem_Flag[iProcessor] != ii) {
       
@@ -588,15 +575,11 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    directly copy our own data later. ---*/
   
   unsigned long *globalRecv = NULL;
-  globalRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    globalRecv[ii] = 0;
+  globalRecv = new unsigned long[nElem_Recv[size]]();
   
   unsigned long *renumbRecv = NULL;
-  renumbRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    renumbRecv[ii] = 0;
-  
+  renumbRecv = new unsigned long[nElem_Recv[size]]();
+
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
    and the flags for the halo cells. ---*/
@@ -727,7 +710,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
@@ -748,7 +731,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
@@ -769,7 +752,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
       
       /*--- Search for the processor that owns this point ---*/
       
-      iProcessor = FindProcessor(Global_Index);
+      iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
       /*--- Store the global ID if it is outside our own linear partition. ---*/
       
@@ -804,7 +787,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = FindProcessor(Global_Index);
+    iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -860,7 +843,7 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
     
     /*--- Search for the processor that owns this point ---*/
     
-    iProcessor = FindProcessor(Global_Index);
+    iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);      
 
     /*--- If we have not visited this element yet, increment our
      number of elements that must be sent to a particular proc. ---*/
@@ -887,10 +870,8 @@ void CSurfaceFVMDataSorter::SortOutputData(CConfig *config, CGeometry *geometry)
    directly copy our own data later. ---*/
   
   delete [] idRecv;
-  idRecv = new unsigned long[nElem_Recv[size]];
-  for (int ii = 0; ii < nElem_Recv[size]; ii++)
-    idRecv[ii] = 0;
-  
+  idRecv = new unsigned long[nElem_Recv[size]]();
+
 #ifdef HAVE_MPI
   /*--- We need double the number of messages to send both the conn.
    and the flags for the halo cells. ---*/
@@ -1195,7 +1176,7 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
             
             /*--- Search for the processor that owns this point ---*/
             
-            iProcessor = FindProcessor(Global_Index);
+            iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);
 
             /*--- If we have not visited this element yet, increment our
              number of elements that must be sent to a particular proc. ---*/
@@ -1289,7 +1270,7 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
             
             /*--- Search for the processor that owns this point ---*/
             
-            iProcessor = FindProcessor(Global_Index);
+            iProcessor = linearPartitioner->GetRankContainingIndex(Global_Index);
 
             /*--- Load connectivity into the buffer for sending ---*/
             
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 5402dcc64ed9..d6b0a6fdc744 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -5,21 +5,9 @@
 #include <set>
 
 CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  CFileWriter(fields, nDim){
-
-  file_ext = ".szplt";
-    
-  this->time_iter = time_iter;
-  
-  this->timestep = timestep;
-  
-}
-
-
-CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){
-  
-}
+  time_iter(time_iter), timestep(timestep), CFileWriter(fields, ".szplt", nDim){}
 
+CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){}
 
 void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
   
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index d4320ec3e4b8..004ca97cf679 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,20 +1,9 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
 CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  CFileWriter(fields, nDim){
+  time_iter(time_iter), timestep(timestep), CFileWriter(fields, ".dat", nDim){}
 
-  file_ext = ".dat";
-    
-  this->time_iter = time_iter;
-  
-  this->timestep = timestep;
-  
-}
-
-
-CTecplotFileWriter::~CTecplotFileWriter(){
-  
-}
+CTecplotFileWriter::~CTecplotFileWriter(){}
 
 void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
   

From 789b2f4cfefd31fa35e7d6e57b27bbaf785f1fba Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 27 Aug 2019 17:13:28 +0200
Subject: [PATCH 433/539] Fixing surface sort

---
 .../src/output/filewriter/CSurfaceFVMDataSorter.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 8482946f7fb6..fe00a2c3c3d0 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -174,6 +174,7 @@ void CSurfaceFVMDataSorter::SortOutputData() {
    positions as we load up the send buffer. ---*/
   
   unsigned long *idIndex = new unsigned long[size]();
+  for (int ii=0; ii < size; ii++) idIndex[ii] = nElem_Send[ii];
   
   /*--- Now loop back through the local connectivities for the surface
    elements and load up the global IDs for sending to their home proc. ---*/
@@ -361,17 +362,17 @@ void CSurfaceFVMDataSorter::SortOutputData() {
   /*--- Create a local data structure that acts as a mask to extract the
    set of points within the local set that are on the surface. ---*/
   
-  int *surfPoint = new int[nLocalPoint_Sort];
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) surfPoint[iPoint] = -1;
+  int *surfPoint = new int[volume_sorter->GetnPoints()];
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) surfPoint[iPoint] = -1;
   
   for (int ii = 0; ii < nElem_Recv[size]; ii++) {
-    surfPoint[(int)idRecv[ii]- linearPartitioner->GetFirstIndexOnRank(rank)] = (int)idRecv[ii];
+    surfPoint[(int)idRecv[ii] - volume_sorter->GetNodeBegin(rank)] = (int)idRecv[ii];
   }
   
   /*--- First, add up the number of surface points I have on my rank. ---*/
   
   nParallel_Poin = 0;
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
     if (surfPoint[iPoint] != -1) {
       
       /*--- Save the global index values for CSV output. ---*/
@@ -416,7 +417,7 @@ void CSurfaceFVMDataSorter::SortOutputData() {
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
     Parallel_Data[jj] = new su2double[nParallel_Poin]();
     count = 0;
-    for (int ii = 0; ii < (int)nLocalPoint_Sort; ii++) {
+    for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
       if (surfPoint[ii] !=-1) {
         Parallel_Data[jj][count] = volume_sorter->GetData(jj,ii);
         count++;
@@ -443,7 +444,7 @@ void CSurfaceFVMDataSorter::SortOutputData() {
   unsigned long *renumbP = new unsigned long[nParallel_Poin]();
   
   count = 0;
-  for (iPoint = 0; iPoint < nLocalPoint_Sort; iPoint++) {
+  for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
     if (surfPoint[iPoint] != -1) {
       globalP[count] = surfPoint[iPoint];
       renumbP[count] = count + nPoint_Recv[rank];

From 887493367bea63da5be65f0d86bc57817e95218a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 28 Aug 2019 10:29:25 +0200
Subject: [PATCH 434/539] Adapted FEA test cases

---
 TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg | 5 ++---
 TestCases/parallel_regression.py               | 2 +-
 TestCases/serial_regression.py                 | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index 2a84ad761503..deb1b7b5126f 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -16,8 +16,7 @@ SINGLEZONE_DRIVER=YES
 RESTART_SOL= YES
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
-DYN_RESTART_ITER= 1
-NONLINEAR_FEM_INT_ITER = 10
+RESTART_ITER= 1
 ELASTICITY_MODULUS=3E7
 POISSON_RATIO=0.3
 MATERIAL_DENSITY=7854
@@ -25,7 +24,7 @@ FORMULATION_ELASTICITY_2D = PLANE_STRESS
 TIME_DOMAIN=YES
 TIME_STEP=0.01
 MAX_TIME= 0.1
-INNER_ITER=7
+INNER_ITER=10
 TIME_ITER=7
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.2601
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 9ea63cf4b86a..86043075affe 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -1036,7 +1036,7 @@ def main():
     dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
     dynbeam2d.cfg_file  = "configBeam_2d.cfg"
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
+    dynbeam2d.test_vals = [-3.240015, 2.895057, -0.353146, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "parallel_computation_fsi.py -f"
     dynbeam2d.timeout   = 1600
     dynbeam2d.unsteady  = True
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index a2990ee560a5..af12dc6a2aa7 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1121,7 +1121,7 @@ def main():
     dynbeam2d.unsteady  = True
     dynbeam2d.new_output= True
     dynbeam2d.test_iter = 6
-    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 6.6127e+04] #last 4 columns
+    dynbeam2d.test_vals = [-3.240015, 2.895057, -0.353146, 6.6127e+04] #last 4 columns
     dynbeam2d.su2_exec  = "SU2_CFD"
     dynbeam2d.timeout   = 1600
     dynbeam2d.tol       = 0.00001

From eaa48c793467e2e99d1ecda6519169f514ead660 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 28 Aug 2019 16:30:39 +0200
Subject: [PATCH 435/539] Fixed conflicts and mem leaks

---
 Common/include/config_structure.inl        |  2 +-
 Common/src/config_structure.cpp            |  4 +-
 Common/src/linear_algebra/CSysSolve.cpp    |  1 +
 SU2_CFD/src/drivers/CDriver.cpp            | 19 +++++-
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp  |  2 +-
 SU2_CFD/src/iteration_structure.cpp        |  6 +-
 SU2_CFD/src/numerics_direct_elasticity.cpp |  5 ++
 SU2_CFD/src/solver_direct_elasticity.cpp   | 32 +++++-----
 SU2_CFD/src/solver_direct_mean.cpp         |  4 +-
 SU2_CFD/src/solver_direct_mean_fem.cpp     |  4 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp     |  4 +-
 SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp |  2 +-
 SU2_CFD/src/solvers/CMeshSolver.cpp        | 73 +++++-----------------
 SU2_CFD/src/variables/CVariable.cpp        |  3 +
 TestCases/fea_fsi/dyn_fsi/configFEA.cfg    | 15 ++---
 TestCases/fea_fsi/dyn_fsi/configFlow.cfg   | 22 +++----
 TestCases/fea_fsi/stat_fsi/configFEA.cfg   | 20 ++----
 TestCases/fea_fsi/stat_fsi/configFlow.cfg  | 30 +++------
 18 files changed, 100 insertions(+), 148 deletions(-)

diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 8a7101b63230..19bef7829d71 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1588,7 +1588,7 @@ inline bool CConfig::GetGrid_Movement(void) { return (Kind_GridMovement != NO_MO
 inline bool CConfig::GetDynamic_Grid(void) {
   return (Kind_GridMovement != NO_MOVEMENT)
       || ((nKind_SurfaceMovement > 0) && !GetSurface_Movement(FLUID_STRUCTURE_STATIC))
-      || (Deform_Mesh && (Unsteady_Simulation != NO));
+      || (Deform_Mesh && (Time_Domain));
 }
 
 inline unsigned short CConfig::GetKind_SurfaceMovement(unsigned short iMarkerMoving){return Kind_SurfaceMovement[iMarkerMoving];}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 9965d36746f0..095e60faf007 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -768,8 +768,8 @@ void CConfig::SetPointersNull(void) {
 
   /*--- Variable initialization ---*/
   
-  ExtIter    = 0;
-  IntIter    = 0;
+  TimeIter    = 0;
+  InnerIter    = 0;
   nIntCoeffs = 0;
   OuterIter  = 0;
   
diff --git a/Common/src/linear_algebra/CSysSolve.cpp b/Common/src/linear_algebra/CSysSolve.cpp
index 4a19ec71e8d2..fb0623eab025 100644
--- a/Common/src/linear_algebra/CSysSolve.cpp
+++ b/Common/src/linear_algebra/CSysSolve.cpp
@@ -44,6 +44,7 @@ CSysSolve<ScalarType>::CSysSolve(const bool mesh_deform_mode) : cg_ready(false),
   mesh_deform = mesh_deform_mode;
   LinSysRes_ptr = NULL;
   LinSysSol_ptr = NULL;
+  Residual = 0.0;
 }
 
 template<class ScalarType>
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index a13346c26946..4d1f467d1786 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -1543,7 +1543,7 @@ void CDriver::Solver_Restart(CSolver ***solver, CGeometry **geometry,
 
   if ((restart || restart_flow) && config->GetDeform_Mesh() && update_geo){
     /*--- Always restart with the last state ---*/
-    val_iter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
+    val_iter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     solver[MESH_0][MESH_SOL]->LoadRestart(geometry, solver, config, val_iter, update_geo);
   }
 
@@ -1672,10 +1672,19 @@ void CDriver::Solver_Postprocessing(CSolver ****solver, CGeometry **geometry,
     if (disc_adj_fem) {
       delete solver[val_iInst][iMGlevel][ADJFEA_SOL];
     }
-    
+
+    if (iMGlevel == 0){
+      if (config->GetDeform_Mesh()){
+        delete solver[val_iInst][MESH_0][MESH_SOL];
+        if (config->GetDiscrete_Adjoint())
+          delete solver[val_iInst][MESH_0][ADJMESH_SOL];
+      }
+    }
+        
     delete [] solver[val_iInst][iMGlevel];
+    
   }
-  
+
   delete [] solver[val_iInst];
 
 }
@@ -3075,6 +3084,10 @@ void CDriver::Numerics_Postprocessing(CNumerics *****numerics,
     
   }
   
+  /*--- We initialize the numerics for the mesh solver ---*/
+  if (config->GetDeform_Mesh())
+    delete [] numerics[val_iInst][MESH_0][MESH_SOL][FEA_TERM];
+  
   /*--- Definition of the Class for the numerical method: numerics_container[INST_LEVEL][MESH_LEVEL][EQUATION][EQ_TERM] ---*/
   for (iMGlevel = 0; iMGlevel <= config->GetnMGLevels(); iMGlevel++) {
     for (iSol = 0; iSol < MAX_SOLS; iSol++) {
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 986e4c6ae7c0..1e4ab837208d 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -165,7 +165,7 @@ void CSinglezoneDriver::Run() {
 
 void CSinglezoneDriver::Postprocess() {
 
-    iteration_container[ZONE_0][INST_0]->Postprocess(output, integration_container, geometry_container, solver_container,
+    iteration_container[ZONE_0][INST_0]->Postprocess(output_container[ZONE_0], integration_container, geometry_container, solver_container,
         numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
     /*--- A corrector step can help preventing numerical instabilities ---*/
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 2523a8dac9a5..266e058ff9cc 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -1802,10 +1802,12 @@ bool CFEAIteration::Monitor(COutput *output,
 #endif
   UsedTime = StopTime - StartTime;
 
-  solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
+  solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->Compute_NodalStress(geometry[val_iZone][val_iInst][MESH_0],
+                                                                     numerics[val_iZone][val_iInst][MESH_0][FEA_SOL], config[val_iZone]);
 
   if (config[val_iZone]->GetMultizone_Problem() || config[val_iZone]->GetSinglezone_Driver()){
-    output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), config[val_iZone]->GetInnerIter());
+    output->SetHistory_Output(geometry[val_iZone][INST_0][MESH_0], solver[val_iZone][INST_0][MESH_0], config[val_iZone],
+                              config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(), config[val_iZone]->GetInnerIter());
   }
   
   StopCalc = output->GetConvergence();
diff --git a/SU2_CFD/src/numerics_direct_elasticity.cpp b/SU2_CFD/src/numerics_direct_elasticity.cpp
index 94a8a06d874e..cd34693c4bdd 100644
--- a/SU2_CFD/src/numerics_direct_elasticity.cpp
+++ b/SU2_CFD/src/numerics_direct_elasticity.cpp
@@ -235,6 +235,11 @@ CFEAElasticity::~CFEAElasticity(void) {
 
   if (FAux_Dead_Load     != NULL) delete [] FAux_Dead_Load;
 
+  if (E_i != NULL) delete [] E_i;
+  if (Nu_i != NULL) delete [] Nu_i;
+  if (Rho_s_i != NULL) delete [] Rho_s_i;
+  if (Rho_s_DL_i != NULL) delete [] Rho_s_DL_i;
+  if (Ni_Vec != NULL) delete [] Ni_Vec;
 }
 
 void CFEAElasticity::Compute_Mass_Matrix(CElement *element, CConfig *config) {
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 3bdf4cfe2985..fb801d96ea10 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -58,6 +58,11 @@ CFEASolver::CFEASolver(bool mesh_deform_mode) : CSolver(mesh_deform_mode) {
   loadIncrement = 1.0;
   
   element_container = NULL;
+  unsigned short iTerm;  
+  element_container = new CElement** [MAX_TERMS]();
+  for (iTerm = 0; iTerm < MAX_TERMS; iTerm++)
+    element_container[iTerm] = new CElement* [MAX_FE_KINDS]();
+  
   node = NULL;
   
   element_properties = NULL;
@@ -95,6 +100,8 @@ CFEASolver::CFEASolver(bool mesh_deform_mode) : CSolver(mesh_deform_mode) {
   iElem_iDe   = NULL;
   
   topol_filter_applied = false;
+  
+  element_based = false;
 }
 
 CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
@@ -128,15 +135,10 @@ CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
   /*--- Here is where we assign the kind of each element ---*/
   
   /*--- First level: different possible terms of the equations ---*/
-  element_container = new CElement** [MAX_TERMS];
+  element_container = new CElement** [MAX_TERMS]();
   for (iTerm = 0; iTerm < MAX_TERMS; iTerm++)
-    element_container[iTerm] = new CElement* [MAX_FE_KINDS];
+    element_container[iTerm] = new CElement* [MAX_FE_KINDS]();
   
-  for (iTerm = 0; iTerm < MAX_TERMS; iTerm++) {
-    for (iKind = 0; iKind < MAX_FE_KINDS; iKind++) {
-      element_container[iTerm][iKind] = NULL;
-    }
-  }
   
   if (nDim == 2) {
 
@@ -487,11 +489,11 @@ CFEASolver::~CFEASolver(void) {
   }
   
   for (iVar = 0; iVar < nVar; iVar++) {
-    if (Jacobian_s_ij != NULL) delete [] Jacobian_s_ij[iVar];
+    if (Jacobian_s_ij!= NULL) delete [] Jacobian_s_ij[iVar];
     if (Jacobian_c_ij != NULL) delete [] Jacobian_c_ij[iVar];
-    delete [] mZeros_Aux[iVar];
-    delete [] mId_Aux[iVar];
-    delete [] stressTensor[iVar];
+    if (mZeros_Aux != NULL) delete [] mZeros_Aux[iVar];
+    if (mId_Aux != NULL) delete [] mId_Aux[iVar];
+    if (stressTensor!= NULL) delete [] stressTensor[iVar];
   }
   
   if (Jacobian_s_ij != NULL) delete [] Jacobian_s_ij;
@@ -504,13 +506,13 @@ CFEASolver::~CFEASolver(void) {
   delete [] GradN_X;
   delete [] GradN_x;
   
-  delete [] mZeros_Aux;
-  delete [] mId_Aux;
+  if (mZeros_Aux != NULL) delete [] mZeros_Aux;
+  if (mId_Aux != NULL) delete [] mId_Aux;
   
   delete [] nodeReactions;
   
   delete [] normalVertex;
-  delete [] stressTensor;
+  if (stressTensor != NULL) delete [] stressTensor;
   
   if (solutionPredictor != NULL) delete [] solutionPredictor;
   
@@ -518,6 +520,8 @@ CFEASolver::~CFEASolver(void) {
   
   delete [] elProperties;
   
+  if (Res_FSI_Cont != NULL) delete [] Res_FSI_Cont;
+  
 }
 
 void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 6dbf615b7c90..50cdd6da860b 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -2757,9 +2757,9 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
-      NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
       NonDimTable.PrintFooter();
     }
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index 4ecd2b0c9bc0..3831a5101d68 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -1298,9 +1298,9 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
-      NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
       NonDimTable.PrintFooter();
     }
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 58848d4d027c..5c7c1c0a0244 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -1387,9 +1387,9 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetTotal_UnstTime() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
       Unit.str("");
-      NonDimTable << "Time Step" << config->GetDelta_UnstTime() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
+      NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
       NonDimTable.PrintFooter();
     }
diff --git a/SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp b/SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp
index 437440c9cf9b..c9a66616f636 100644
--- a/SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp
@@ -231,7 +231,7 @@ void CDiscAdjMeshSolver::SetSensitivity(CGeometry *geometry, CSolver **solver, C
   unsigned long iPoint;
   unsigned short iDim;
   su2double Sensitivity, eps;
-  bool time_stepping = (config->GetUnsteady_Simulation() != STEADY);
+  bool time_stepping = (config->GetTime_Marching() != STEADY);
 
   /*--- Extract the sensitivities ---*/
   ExtractAdjoint_Solution(geometry, config);
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index 80c64b9666fa..7458cfe3f74a 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -135,15 +135,6 @@ CMeshSolver::CMeshSolver(CGeometry *geometry, CConfig *config) : CFEASolver(true
 
     /*--- Element container structure ---*/
 
-    /*--- First level: only the FEA_TERM is considered ---*/
-    element_container = new CElement** [1];
-    element_container[FEA_TERM] = new CElement* [MAX_FE_KINDS];
-
-    /*--- Initialize all subsequent levels ---*/
-    for (unsigned short iKind = 0; iKind < MAX_FE_KINDS; iKind++) {
-      element_container[FEA_TERM][iKind] = NULL;
-    }
-
     if (nDim == 2) {
         element_container[FEA_TERM][EL_TRIA] = new CTRIA1(nDim, config);
         element_container[FEA_TERM][EL_QUAD] = new CQUAD4(nDim, config);
@@ -216,29 +207,9 @@ CMeshSolver::CMeshSolver(CGeometry *geometry, CConfig *config) : CFEASolver(true
 }
 
 CMeshSolver::~CMeshSolver(void) {
-
-  unsigned short iDim;
-
-  delete [] Residual;
-  delete [] Solution;
-
-  for (iDim = 0; iDim < nDim; iDim++) {
-    delete [] mZeros_Aux[iDim];
-    delete [] mId_Aux[iDim];
-    delete [] Jacobian_ij[iDim];
-  }
-  delete [] mZeros_Aux;
-  delete [] mId_Aux;
-  delete [] Jacobian_ij;
-
-  if (element_container != NULL) {
-    for (unsigned short jVar = 0; jVar < MAX_FE_KINDS; jVar++) {
-       if (element_container[FEA_TERM][jVar] != NULL) delete element_container[FEA_TERM][jVar];
-    }
-    delete [] element_container[FEA_TERM];
-    delete [] element_container;
-  }
-
+  
+  if (Coordinate != NULL) delete [] Coordinate;
+  if (element  !=NULL ) delete [] element;
 }
 
 void CMeshSolver::SetMinMaxVolume(CGeometry *geometry, CConfig *config, bool updated) {
@@ -642,9 +613,9 @@ void CMeshSolver::ComputeGridVelocity(CGeometry *geometry, CConfig *config){
     /*--- Compute mesh velocity with 1st or 2nd-order approximation ---*/
 
     for (iDim = 0; iDim < nDim; iDim++) {
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_1ST)
+      if (config->GetTime_Marching() == DT_STEPPING_1ST)
         GridVel = ( Disp_nP1[iDim] - Disp_n[iDim] ) / TimeStep;
-      if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND)
+      if (config->GetTime_Marching() == DT_STEPPING_2ND)
         GridVel = ( 3.0*Disp_nP1[iDim] - 4.0*Disp_n[iDim]
                     +  1.0*Disp_nM1[iDim] ) / (2.0*TimeStep);
 
@@ -764,35 +735,21 @@ void CMeshSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
   /*--- Restart the solution from file information ---*/
   unsigned short iDim;
   unsigned long index;
-  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-  bool time_stepping = config->GetUnsteady_Simulation() == TIME_STEPPING;
 
   su2double curr_coord, displ;
 
   string UnstExt, text_line;
   ifstream restart_file;
 
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = config->GetnZone();
-
-  string restart_filename = config->GetSolution_FlowFileName();
+  string restart_filename = config->GetSolution_FileName();
 
   int counter = 0;
   long iPoint_Local = 0; unsigned long iPoint_Global = 0;
   unsigned long iPoint_Global_Local = 0;
   unsigned short rbuf_NotMatching = 0, sbuf_NotMatching = 0;
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    restart_filename = config->GetMultizone_FileName(restart_filename, iZone);
-
-  /*--- Modify file name for an unsteady restart ---*/
-
-  if (dual_time || time_stepping)
-    restart_filename = config->GetUnsteady_FileName(restart_filename, val_iter);
-
+  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
@@ -919,7 +876,7 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   unsigned short iZone = config->GetiZone();
   unsigned short nZone = geometry->GetnZone();
   unsigned short iDim;
-  string filename = config->GetSolution_FlowFileName();
+  string filename = config->GetSolution_FileName();
   string filename_n;
 
   /*--- Auxiliary variables for storing the coordinates ---*/
@@ -934,15 +891,15 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone);
+    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   /*-------------------------------------------------------------------------------------------*/
   /*----------------------- First, load the restart file for time n ---------------------------*/
   /*-------------------------------------------------------------------------------------------*/
 
   /*--- Modify file name for an unsteady restart ---*/
-  Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-1;
-  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter);
+  Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
+  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
@@ -1007,7 +964,7 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   /*------------ Now, load the restart file for time n-1, if the simulation is 2nd Order ------*/
   /*-------------------------------------------------------------------------------------------*/
 
-  if (config->GetUnsteady_Simulation() == DT_STEPPING_2ND) {
+  if (config->GetTime_Marching() == DT_STEPPING_2ND) {
 
     ifstream restart_file_n1;
     string filename_n1;
@@ -1017,8 +974,8 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
     rbuf_NotMatching = 0; sbuf_NotMatching = 0;
 
     /*--- Modify file name for an unsteady restart ---*/
-    Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_RestartIter())-2;
-    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter);
+    Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
+    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
 
     /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/variables/CVariable.cpp b/SU2_CFD/src/variables/CVariable.cpp
index 22c5d61d67da..1a36edec7b3f 100644
--- a/SU2_CFD/src/variables/CVariable.cpp
+++ b/SU2_CFD/src/variables/CVariable.cpp
@@ -92,6 +92,9 @@ CVariable::CVariable(unsigned short val_nvar, CConfig *config) {
   for (unsigned short iVar = 0; iVar < nVar; iVar++)
     Solution[iVar] = 0.0;
 
+  if (config->GetMultizone_Problem()){
+    Solution_BGS_k = new su2double[nVar]();
+  }
 }
 
 CVariable::CVariable(unsigned short val_nDim, unsigned short val_nvar, CConfig *config) {
diff --git a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
index b9c5bc7c3ecf..4f1d815291ea 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
@@ -16,8 +16,6 @@ MARKER_ZONE_INTERFACE = (wallUpperF, wallUpperS, wallUpwF, wallUpwS, wallDownF,
 
 BGS_RELAXATION = FIXED_PARAMETER
 STAT_RELAX_PARAMETER= 0.5
-RESIDUAL_REDUCTION_FSI= 5
-RESIDUAL_MINVAL_FSI= -8
 
 LINEAR_SOLVER= CONJUGATE_GRADIENT
 LINEAR_SOLVER_PREC= ILU
@@ -28,8 +26,6 @@ ELASTICITY_MODULUS=5E4
 MATERIAL_DENSITY=50
 FORMULATION_ELASTICITY_2D = PLANE_STRESS
 POISSON_RATIO=0.3
-DYNAMIC_ANALYSIS= YES
-DYN_TIME= 4.01
 TIME_DISCRE_FEA= NEWMARK_IMPLICIT
 NEWMARK_BETA=0.36
 NEWMARK_GAMMA=0.7
@@ -39,10 +35,7 @@ RELAXATION = YES
 
 GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
-NONLINEAR_FEM_INT_ITER = 10
-RESIDUAL_FEM_UTOL = -7.0
-RESIDUAL_FEM_RTOL = -7.0
-RESIDUAL_FEM_ETOL = -7.0
+INNER_ITER = 10
 
 MARKER_CLAMPED = ( clamped )
 MARKER_PRESSURE= ( wallDownS, 0.0, wallUpperS, 0.0, wallUpwS, 0.0)
@@ -59,9 +52,9 @@ WRT_CON_FREQ_DUALTIME= 100
 WRT_SOL_FREQ= 100
 WRT_SOL_FREQ_DUALTIME= 100
 
-VOLUME_STRUCTURE_FILENAME= results_wall
-RESTART_STRUCTURE_FILENAME= restart_wall.dat
-SOLUTION_STRUCTURE_FILENAME= solution_wall.dat
+VOLUME_FILENAME= results_wall
+RESTART_FILENAME= restart_wall.dat
+SOLUTION_FILENAME= solution_wall.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
index e7adc43f6c8f..debd96245687 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
@@ -10,18 +10,14 @@ SOLVER= NAVIER_STOKES
 DEFORM_MESH = YES
 MARKER_DEFORM_MESH= ( wallUpwF, wallDownF, wallUpperF )
 
-UNST_INT_ITER= 50
 INNER_ITER=50
 
-TIME_DOMAIN = YES
 
 MATH_PROBLEM= DIRECT
 WRT_BINARY_RESTART= NO
 READ_BINARY_RESTART= NO
 
-RESIDUAL_MINVAL_FSI= -8
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIME= 4.01
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 
 KIND_TURB_MODEL= NONE
 AOA= 0.0
@@ -60,12 +56,10 @@ VENKAT_LIMITER_COEFF= 1.0
 JST_SENSOR_COEFF= ( 0.5, 0.02 )
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 3
-RESIDUAL_MINVAL= -10
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
-CAUCHY_FUNC_FLOW= DRAG
+CONV_RESIDUAL_MINVAL= -10
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 
 MESH_FILENAME= meshFlow.su2
 DEFORM_NONLINEAR_ITER= 1
@@ -82,9 +76,9 @@ WRT_CON_FREQ_DUALTIME= 100
 WRT_SOL_FREQ= 100
 WRT_SOL_FREQ_DUALTIME= 100
 
-VOLUME_FLOW_FILENAME= results_flow
-RESTART_FLOW_FILENAME= restart_flow.dat
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+VOLUME_FILENAME= results_flow
+RESTART_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/stat_fsi/configFEA.cfg b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
index f46e0aa11992..6abba8f25a7d 100755
--- a/TestCases/fea_fsi/stat_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
@@ -22,17 +22,14 @@ GEOMETRIC_CONDITIONS= LARGE_DEFORMATIONS
 MATERIAL_MODEL= NEO_HOOKEAN
 MATERIAL_COMPRESSIBILITY= COMPRESSIBLE
 NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
-NONLINEAR_FEM_INT_ITER = 10
+INNER_ITER = 10
 
-RESIDUAL_FEM_UTOL = -8.0
-RESIDUAL_FEM_RTOL = -8.0
-RESIDUAL_FEM_ETOL = -8.0
 
 INCREMENTAL_LOAD = NO
 
 % --------------------------- TIME STEP ISSUES --------------------------------%
 
-EXT_ITER= 1
+TIME_ITER= 1
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 
@@ -48,22 +45,15 @@ STAT_RELAX_PARAMETER= 1.0
 BGS_RELAXATION = FIXED_PARAMETER
 PREDICTOR_ORDER = 0
 
-RESIDUAL_REDUCTION_FSI= 5
-RESIDUAL_MINVAL_FSI= -10.0
 
 % ----------------------------- INPUT/OUTPUT ----------------------------------%
 
-VOLUME_STRUCTURE_FILENAME= result_beam
-
-CONV_FILENAME= history
-
-WRITE_CONV_FILENAME_FSI = YES
-CONV_FILENAME_FSI= historyFSI.csv
+VOLUME_FILENAME= result_beam
 
 BREAKDOWN_FILENAME= forces_breakdown.dat
 
-SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam.dat
+RESTART_FILENAME= restart_beam.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index a7d0db4be37e..de7ad9145fa9 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -35,24 +35,20 @@ DEFORM_CONSOLE_OUTPUT = NO
 
 % -----------------------------------------------------------------------------%
 
-EXT_ITER= 1
 WRT_SOL_FREQ= 1
 WRT_SOL_FREQ_DUALTIME= 1
 
-INNER_ITER= 200
+INNER_ITER= 1
 
 % ----------------------------- INPUT/OUTPUT ----------------------------------%
 
-VOLUME_FLOW_FILENAME= result_flow
+VOLUME_FILENAME= result_flow
 CONV_FILENAME= history
 
-WRITE_CONV_FILENAME_FSI = YES
-
-CONV_FILENAME_FSI= historyFSI.csv
 BREAKDOWN_FILENAME= forces_breakdown.dat
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
-RESTART_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
+RESTART_FILENAME= restart_flow.dat
 
 WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
@@ -69,13 +65,9 @@ MARKER_MONITORING= ( wallF )
 
 % -------------------------- FLUID SIMULATION ---------------------------------%
 
-UNSTEADY_SIMULATION= NO
-%
+TIME_DOMAIN=NO
 % Total Physical Time for dual time stepping simulations (s)
-UNST_TIME= 4.01
-%
-% Dynamic analysis total time
-DYN_TIME= 4.01
+MAX_TIME= 4.01
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 
@@ -136,12 +128,10 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
 CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 4
-RESIDUAL_MINVAL= -10
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
-CAUCHY_FUNC_FLOW= DRAG
+CONV_RESIDUAL_MINVAL= -10
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 

From 30c95946da678ed8474dcbf3c689aa4e617ba823 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 28 Aug 2019 16:44:41 +0200
Subject: [PATCH 436/539] Small fix

---
 SU2_CFD/src/drivers/CDriver.cpp    | 2 +-
 SU2_CFD/src/numerics_structure.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 4d1f467d1786..557d0c6055d1 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3086,7 +3086,7 @@ void CDriver::Numerics_Postprocessing(CNumerics *****numerics,
   
   /*--- We initialize the numerics for the mesh solver ---*/
   if (config->GetDeform_Mesh())
-    delete [] numerics[val_iInst][MESH_0][MESH_SOL][FEA_TERM];
+    delete numerics[val_iInst][MESH_0][MESH_SOL][FEA_TERM];
   
   /*--- Definition of the Class for the numerical method: numerics_container[INST_LEVEL][MESH_LEVEL][EQUATION][EQ_TERM] ---*/
   for (iMGlevel = 0; iMGlevel <= config->GetnMGLevels(); iMGlevel++) {
diff --git a/SU2_CFD/src/numerics_structure.cpp b/SU2_CFD/src/numerics_structure.cpp
index a97ee48883b4..c1700c085199 100644
--- a/SU2_CFD/src/numerics_structure.cpp
+++ b/SU2_CFD/src/numerics_structure.cpp
@@ -64,6 +64,8 @@ CNumerics::CNumerics(void) {
 
   l = NULL;
   m = NULL;
+  
+  using_uq = false;
 
 }
 

From 42c0fef3728b4ecac6e2be47732bac4c00503b04 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 28 Aug 2019 17:34:50 +0200
Subject: [PATCH 437/539] Fixed SU2 file writer

---
 SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index e8fdd261cd2c..0068e3749917 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -80,6 +80,9 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     }
     /*--- Flush the file and wait for all processors to arrive. ---*/
     restart_file.flush();
+#ifdef HAVE_MPI
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
+#endif
     
   }
   

From 5e5cbdd17487da09451ad9a0dd505c49e1f88bae Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 10:21:05 +0200
Subject: [PATCH 438/539] Added min/max volume to history output

---
 SU2_CFD/include/solver_structure.hpp    | 12 ++++++++++++
 SU2_CFD/include/solvers/CMeshSolver.hpp | 12 ++++++++++++
 SU2_CFD/src/iteration_structure.cpp     |  3 ---
 SU2_CFD/src/output/CFlowCompOutput.cpp  | 20 ++++++++++++++------
 SU2_CFD/src/output/CFlowIncOutput.cpp   | 14 ++++++++++++++
 SU2_CFD/src/solvers/CMeshSolver.cpp     | 22 ----------------------
 6 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 7b8bc0a51b7d..293fac559095 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -4446,6 +4446,18 @@ class CSolver {
    */
   void SetVertexTractionsAdjoint(CGeometry *geometry, CConfig *config);
   
+  /*!
+   * \brief Get minimun volume in the mesh
+   * \return 
+   */
+  virtual su2double GetMinimum_Volume(){ return 0.0; }
+  
+  /*!
+   * \brief Get maximum volume in the mesh
+   * \return 
+   */
+  virtual su2double GetMaximum_Volume(){ return 0.0; }
+  
 protected:
   /*!
    * \brief Allocate the memory for the verification solution, if necessary.
diff --git a/SU2_CFD/include/solvers/CMeshSolver.hpp b/SU2_CFD/include/solvers/CMeshSolver.hpp
index fbc32516efce..614fbe06a50f 100644
--- a/SU2_CFD/include/solvers/CMeshSolver.hpp
+++ b/SU2_CFD/include/solvers/CMeshSolver.hpp
@@ -189,4 +189,16 @@ class CMeshSolver : public CFEASolver {
       node[iPoint]->Set_OldSolution();
   }
 
+  /*!
+   * \brief Get minimun volume in the mesh
+   * \return 
+   */
+  su2double GetMinimum_Volume(){return MinVolume_Curr;}
+  
+  /*!
+   * \brief Get maximum volume in the mesh
+   * \return 
+   */
+  su2double GetMaximum_Volume(){return MaxVolume_Curr;}
+  
 };
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 266e058ff9cc..62ca22db3571 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -341,9 +341,6 @@ void CIteration::SetMesh_Deformation(CGeometry **geometry,
 
   bool ActiveTape = NO;
 
-  if ((rank == MASTER_NODE) && (!config->GetDiscrete_Adjoint()))
-    cout << endl << "Deforming the grid for imposed boundary displacements." << endl;
-
   /*--- Perform the elasticity mesh movement ---*/
   if (config->GetDeform_Mesh()) {
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index a559cec9f986..5655e61793f9 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -243,6 +243,12 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
   
+  if (config->GetDeform_Mesh()){
+    AddHistoryOutput("MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "MESH", "Minimum volume in the mesh");
+    AddHistoryOutput("MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "MESH", "Maximum volume in the mesh");
+    AddHistoryOutput("MESH_DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "MESH", "Linear solver iterations for the mesh deformation");
+  }
+  
   /*--- Add analyze surface history fields --- */
   
   AddAnalyzeSurfaceOutput(config);
@@ -530,11 +536,7 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];
-  
-  SetHistoryOutputValue("TIME_ITER",  curTimeIter);  
-  SetHistoryOutputValue("INNER_ITER", curInnerIter);
-  SetHistoryOutputValue("OUTER_ITER", curOuterIter); 
-
+  CSolver* mesh_solver = solver[MESH_SOL];
   
   SetHistoryOutputValue("RMS_DENSITY", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_MOMENTUM-X", log10(flow_solver->GetRes_RMS(1)));
@@ -608,7 +610,13 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
- 
+  
+  if (config->GetDeform_Mesh()){
+    SetHistoryOutputValue("MIN_VOLUME", mesh_solver->GetMinimum_Volume());
+    SetHistoryOutputValue("MAX_VOLUME", mesh_solver->GetMaximum_Volume());
+    SetHistoryOutputValue("MESH_DEFORM_ITER", mesh_solver->GetIterLinSolver());
+  }
+  
   /*--- Set the analyse surface history values --- */
   
   SetAnalyzeSurface(flow_solver, geometry, config, false);
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index b7f72ac1862e..534282f7cc4e 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -208,6 +208,12 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
   
+  if (config->GetDeform_Mesh()){
+    AddHistoryOutput("MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "MESH", "Minimum volume in the mesh");
+    AddHistoryOutput("MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "MESH", "Maximum volume in the mesh");
+    AddHistoryOutput("MESH_DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "MESH", "Linear solver iterations for the mesh deformation");
+  }
+  
   /*--- Add analyze surface history fields --- */
   
   AddAnalyzeSurfaceOutput(config);
@@ -223,6 +229,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   CSolver* flow_solver = solver[FLOW_SOL];
   CSolver* turb_solver = solver[TURB_SOL];  
   CSolver* heat_solver = solver[HEAT_SOL];
+  CSolver* mesh_solver = solver[MESH_SOL];
   
   SetHistoryOutputValue("RMS_PRESSURE", log10(flow_solver->GetRes_RMS(0)));
   SetHistoryOutputValue("RMS_VELOCITY-X", log10(flow_solver->GetRes_RMS(1)));
@@ -294,6 +301,13 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     }
 
   }  
+  
+  if (config->GetDeform_Mesh()){
+    SetHistoryOutputValue("MIN_VOLUME", mesh_solver->GetMinimum_Volume());
+    SetHistoryOutputValue("MAX_VOLUME", mesh_solver->GetMaximum_Volume());
+    SetHistoryOutputValue("MESH_DEFORM_ITER", mesh_solver->GetIterLinSolver());
+  }
+  
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
 
   
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index 7458cfe3f74a..61ff9273a55e 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -221,15 +221,10 @@ void CMeshSolver::SetMinMaxVolume(CGeometry *geometry, CConfig *config, bool upd
   su2double MaxVolume, MinVolume;
   int EL_KIND = 0;
 
-  bool discrete_adjoint = config->GetDiscrete_Adjoint();
-
   bool RightVol = true;
 
   su2double ElemVolume;
 
-  if ((rank == MASTER_NODE) && (!discrete_adjoint))
-    cout << "Computing volumes of the grid elements." << endl;
-
   MaxVolume = -1E22; MinVolume = 1E22;
 
   /*--- Loops over all the elements ---*/
@@ -471,22 +466,11 @@ void CMeshSolver::SetMesh_Stiffness(CGeometry **geometry, CNumerics **numerics,
 
 void CMeshSolver::DeformMesh(CGeometry **geometry, CNumerics **numerics, CConfig *config){
 
-  bool discrete_adjoint = config->GetDiscrete_Adjoint();
-
   if (multizone) SetSolution_Old();
 
   /*--- Initialize sparse matrix ---*/
   Jacobian.SetValZero();
 
-  /*--- Compute the minimum and maximum area/volume for the mesh. ---*/
-  if (rank == MASTER_NODE) {
-    if (discrete_adjoint) cout << scientific; // Ensure the mesh deformation output, if requested, remains scientific
-    else{
-      if (nDim == 2) cout << scientific << "Min. area in the undeformed mesh: "<< MinVolume_Ref <<", max. area: " << MaxVolume_Ref <<"." << endl;
-      else           cout << scientific << "Min. volume in the undeformed mesh: "<< MinVolume_Ref <<", max. volume: " << MaxVolume_Ref <<"." << endl;
-    }
-  }
-
   /*--- Compute the stiffness matrix. ---*/
   Compute_StiffMatrix(geometry[MESH_0], numerics, config);
 
@@ -525,12 +509,6 @@ void CMeshSolver::DeformMesh(CGeometry **geometry, CNumerics **numerics, CConfig
   /*--- In order to do this, we recompute the minimum and maximum area/volume for the mesh using the current coordinates. ---*/
   SetMinMaxVolume(geometry[MESH_0], config, true);
 
-  if ((rank == MASTER_NODE) && (!discrete_adjoint)) {
-    cout << scientific << "Linear solver iter.: " << IterLinSol << ". ";
-    if (nDim == 2) cout << "Min. area in the deformed mesh: " << MinVolume_Curr << ". Error: " << valResidual << "." << endl;
-    else cout << "Min. volume in the deformed mesh: " << MinVolume_Curr << ". Error: " << valResidual << "." << endl;
-  }
-
   /*--- The Grid Velocity is only computed if the problem is time domain ---*/
   if (time_domain) ComputeGridVelocity(geometry[MESH_0], config);
 

From 3b59f8e3a623fb5b8febc57304bdb12c95f652d9 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 11:20:52 +0200
Subject: [PATCH 439/539] Added lin sol residual to history output

---
 SU2_CFD/include/solver_structure.hpp     | 11 +++++++++--
 SU2_CFD/src/output/CElasticityOutput.cpp |  6 +++++-
 SU2_CFD/src/output/CFlowCompOutput.cpp   | 21 +++++++++++++--------
 SU2_CFD/src/output/CFlowIncOutput.cpp    | 21 +++++++++++++--------
 SU2_CFD/src/solver_direct_mean.cpp       |  4 ++++
 SU2_CFD/src/solver_direct_mean_inc.cpp   |  4 ++++
 6 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 293fac559095..a89c616fe6a4 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -155,6 +155,9 @@ class CSolver {
   su2double ***VertexTractionAdjoint;   /*- Also temporary -*/
   
   string SolverName;      /*!< \brief Store the name of the solver for output purposes. */
+  
+  su2double valResidual;          /*!< \brief Store the residual of the linear system solution. */
+  
 public:
   
   CSysVector<su2double> LinSysSol;    /*!< \brief vector to store iterative solution of implicit linear system. */
@@ -4458,6 +4461,12 @@ class CSolver {
    */
   virtual su2double GetMaximum_Volume(){ return 0.0; }
   
+  /*!
+   * \brief Get residual of the linear solver
+   * \return 
+   */
+  su2double GetLinSol_Residual(){ return valResidual; }
+  
 protected:
   /*!
    * \brief Allocate the memory for the verification solution, if necessary.
@@ -11596,8 +11605,6 @@ class CFEASolver : public CSolver {
 
   su2double *Res_Stress_i;        /*!< \brief Submatrix to store the nodal stress contribution of node i. */
 
-  su2double valResidual;          /*!< \brief Store the residual of the linear system solution. */
-
 public:
   
   CSysVector<su2double> TimeRes_Aux;      /*!< \brief Auxiliary vector for adding mass and damping contributions to the residual. */
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 921d41164438..72e9238bf1a3 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -147,11 +147,15 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   SetHistoryOutputValue("LOAD_INCREMENT", fea_solver->GetLoad_Increment());
   SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
   
+  SetHistoryOutputValue("LINSOL_ITER", fea_solver->GetIterLinSolver());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", fea_solver->GetLinSol_Residual());
+  
 } 
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER",  "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL",  "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL",  "Residual of the linear solver.");
   
   // Residuals
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 5655e61793f9..f6135439f52e 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -203,7 +203,8 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
    
 
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL", "Residual of the linear solver.");
  
   /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
   /// DESCRIPTION: Aero CD drag
@@ -244,9 +245,10 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
   
   if (config->GetDeform_Mesh()){
-    AddHistoryOutput("MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "MESH", "Minimum volume in the mesh");
-    AddHistoryOutput("MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "MESH", "Maximum volume in the mesh");
-    AddHistoryOutput("MESH_DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "MESH", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
+    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
+    AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_SCIENTIFIC, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
@@ -608,13 +610,16 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
   SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
   
-  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
   
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", flow_solver->GetLinSol_Residual());
+  
   if (config->GetDeform_Mesh()){
-    SetHistoryOutputValue("MIN_VOLUME", mesh_solver->GetMinimum_Volume());
-    SetHistoryOutputValue("MAX_VOLUME", mesh_solver->GetMaximum_Volume());
-    SetHistoryOutputValue("MESH_DEFORM_ITER", mesh_solver->GetIterLinSolver());
+    SetHistoryOutputValue("DEFORM_MIN_VOLUME", mesh_solver->GetMinimum_Volume());
+    SetHistoryOutputValue("DEFORM_MAX_VOLUME", mesh_solver->GetMaximum_Volume());
+    SetHistoryOutputValue("DEFORM_ITER", mesh_solver->GetIterLinSolver());
+    SetHistoryOutputValue("DEFORM_RESIDUAL", mesh_solver->GetLinSol_Residual());    
   }
   
   /*--- Set the analyse surface history values --- */
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 534282f7cc4e..2d146ace9fc4 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -204,14 +204,15 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Angle of attack  
   AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC,"AOA", "Angle of attack");
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver");
-  
+  AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL", "Residual of the linear solver.");
   AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
   
   if (config->GetDeform_Mesh()){
-    AddHistoryOutput("MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "MESH", "Minimum volume in the mesh");
-    AddHistoryOutput("MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "MESH", "Maximum volume in the mesh");
-    AddHistoryOutput("MESH_DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "MESH", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
+    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
+    AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_SCIENTIFIC, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
@@ -302,10 +303,14 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 
   }  
   
+  SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", flow_solver->GetLinSol_Residual());
+  
   if (config->GetDeform_Mesh()){
-    SetHistoryOutputValue("MIN_VOLUME", mesh_solver->GetMinimum_Volume());
-    SetHistoryOutputValue("MAX_VOLUME", mesh_solver->GetMaximum_Volume());
-    SetHistoryOutputValue("MESH_DEFORM_ITER", mesh_solver->GetIterLinSolver());
+    SetHistoryOutputValue("DEFORM_MIN_VOLUME", mesh_solver->GetMinimum_Volume());
+    SetHistoryOutputValue("DEFORM_MAX_VOLUME", mesh_solver->GetMaximum_Volume());
+    SetHistoryOutputValue("DEFORM_ITER", mesh_solver->GetIterLinSolver());
+    SetHistoryOutputValue("DEFOMR_RESIDUAL", mesh_solver->GetLinSol_Residual());    
   }
   
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 50cdd6da860b..f51f2161e2b6 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -5193,6 +5193,10 @@ void CEulerSolver::ImplicitEuler_Iteration(CGeometry *geometry, CSolver **solver
   
   SetIterLinSolver(IterLinSol);
   
+  /*--- Set the residual --- */
+  
+  valResidual = System.GetResidual();
+  
   /*--- Update solution (system written in terms of increments) ---*/
   
   if (!adjoint) {
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 5c7c1c0a0244..bdcb65dce08d 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -3481,6 +3481,10 @@ void CIncEulerSolver::ImplicitEuler_Iteration(CGeometry *geometry, CSolver **sol
   
   SetIterLinSolver(IterLinSol);
   
+  /*--- Set the residual --- */
+  
+  valResidual = System.GetResidual();
+  
   /*--- Update solution (system written in terms of increments) ---*/
   
   if (!adjoint) {

From fbf00e7f8620502d53bd551545d6094a69b448df Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 11:21:36 +0200
Subject: [PATCH 440/539] Adapted new fsi test cases

---
 TestCases/fea_fsi/dyn_fsi/config.cfg          |  4 ++--
 TestCases/fea_fsi/stat_fsi/config.cfg         |  5 +++--
 TestCases/fea_fsi/stat_fsi/configFEA.cfg      |  2 ++
 TestCases/fea_fsi/stat_fsi/configFlow.cfg     |  6 +++---
 TestCases/fea_fsi/stat_fsi/config_restart.cfg |  5 ++---
 TestCases/parallel_regression.py              | 16 ++++++++++------
 TestCases/serial_regression.py                | 16 ++++++++++------
 7 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/TestCases/fea_fsi/dyn_fsi/config.cfg b/TestCases/fea_fsi/dyn_fsi/config.cfg
index 95110904cf88..2af6a8bc53ad 100644
--- a/TestCases/fea_fsi/dyn_fsi/config.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/config.cfg
@@ -15,9 +15,9 @@ MARKER_ZONE_INTERFACE = (wallUpperF, wallUpperS, wallUpwF, wallUpwS, wallDownF,
 MULTIZONE_MESH = NO
 
 TIME_DOMAIN = YES
-TIME_ITER = 3
+TIME_ITER = 5
 TIME_STEP = 0.005
-
+SCREEN_OUTPUT= (TIME_ITER, OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
 RESTART_SOL= YES
 RESTART_ITER = 2 
 
diff --git a/TestCases/fea_fsi/stat_fsi/config.cfg b/TestCases/fea_fsi/stat_fsi/config.cfg
index 670b3aa94aa4..0c491ae2c391 100755
--- a/TestCases/fea_fsi/stat_fsi/config.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config.cfg
@@ -16,9 +16,10 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
 RESTART_SOL= NO
 RESTART_ITER = 0
 
 TIME_DOMAIN = NO
-OUTER_ITER = 10
+OUTER_ITER = 8
+
diff --git a/TestCases/fea_fsi/stat_fsi/configFEA.cfg b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
index 6abba8f25a7d..d59a7f81a96a 100755
--- a/TestCases/fea_fsi/stat_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
@@ -45,6 +45,8 @@ STAT_RELAX_PARAMETER= 1.0
 BGS_RELAXATION = FIXED_PARAMETER
 PREDICTOR_ORDER = 0
 
+CONV_FIELD=RMS_UTOL
+CONV_RESIDUAL_MINVAL=-10
 
 % ----------------------------- INPUT/OUTPUT ----------------------------------%
 
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index de7ad9145fa9..cf4e25d52159 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -35,10 +35,10 @@ DEFORM_CONSOLE_OUTPUT = NO
 
 % -----------------------------------------------------------------------------%
 
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+WRT_SOL_FREQ= 10
+WRT_SOL_FREQ_DUALTIME= 10
 
-INNER_ITER= 1
+INNER_ITER= 200
 
 % ----------------------------- INPUT/OUTPUT ----------------------------------%
 
diff --git a/TestCases/fea_fsi/stat_fsi/config_restart.cfg b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
index a8a84f997ce6..e2325573c50d 100755
--- a/TestCases/fea_fsi/stat_fsi/config_restart.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
@@ -16,9 +16,8 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
 RESTART_SOL= YES
 RESTART_ITER = 0
-
 TIME_DOMAIN = NO
-OUTER_ITER = 10
+OUTER_ITER = 2
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index a92405ca6bf9..3b2837b93454 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -1060,9 +1060,10 @@ def main():
     stat_fsi           = TestCase('stat_fsi')
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
-    stat_fsi.test_iter = 7000
-    stat_fsi.test_vals = [-6.762763, -6.522814, -9.205275, -10.113188] #last 4 columns
+    stat_fsi.test_iter = 7
+    stat_fsi.test_vals = [-3.498815, -5.272652, 4.1230e-08, 1.6803e-12, 4.6810e-21] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
+    stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
     stat_fsi.tol       = 0.00001
     test_list.append(stat_fsi)
@@ -1071,8 +1072,10 @@ def main():
     dyn_fsi           = TestCase('dyn_fsi')
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
-    dyn_fsi.test_iter = 4000
-    dyn_fsi.test_vals = [-4.828420, -3.010379, -7.776603, -8.791332] #last 4 columns
+    dyn_fsi.test_iter = 4
+    dyn_fsi.test_vals = [-4.413915, -4.837068, 4.7367e-08, 6.5153e-22, 1.6950e-17] #last 5 columns
+    dyn_fsi.multizone = True
+    dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"
     dyn_fsi.timeout   = 1600
     dyn_fsi.tol       = 0.00001
@@ -1082,9 +1085,10 @@ def main():
     stat_fsi_restart           = TestCase('stat_fsi_restart')
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
-    stat_fsi_restart.test_iter = 1000
-    stat_fsi_restart.test_vals = [-9.692985, -9.452006, -12.132021, -13.042439] #last 4 columns
+    stat_fsi_restart.test_iter = 1
+    stat_fsi_restart.test_vals = [-9.197015, -7.442300, 4.1223e-08, 1.6809e-12, 3.9533e-21] #last 5 columns
     stat_fsi_restart.su2_exec  = "SU2_CFD"
+    stat_fsi_restart.multizone = True
     stat_fsi_restart.timeout   = 1600
     stat_fsi_restart.tol       = 0.00001
     test_list.append(stat_fsi_restart)
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 32a2ec78458b..09fd611a74fc 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1144,10 +1144,11 @@ def main():
     stat_fsi           = TestCase('stat_fsi')
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
-    stat_fsi.test_iter = 7000
-    stat_fsi.test_vals = [-6.762763, -6.522814, -9.205275, -10.113188] #last 4 columns
+    stat_fsi.test_iter = 7
+    stat_fsi.test_vals = [-6.762767, -6.439588, 4.1223e-08, 2.0107e-12 ,1.4315e-21] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
     stat_fsi.timeout   = 1600
+    stat_fsi.multizone = True
     stat_fsi.tol       = 0.00001
     test_list.append(stat_fsi)
 
@@ -1155,8 +1156,9 @@ def main():
     stat_fsi_restart           = TestCase('stat_fsi_restart')
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
-    stat_fsi_restart.test_iter = 1000
-    stat_fsi_restart.test_vals = [-9.692985, -9.452006, -12.132021, -13.042439] #last 4 columns
+    stat_fsi_restart.test_iter = 1
+    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 4.1223e-08, 2.0107e-12, 5.5044e-21] #last 5 columns
+    stat_fsi_restart.multizone = True
     stat_fsi_restart.su2_exec  = "SU2_CFD"
     stat_fsi_restart.timeout   = 1600
     stat_fsi_restart.tol       = 0.00001
@@ -1166,8 +1168,10 @@ def main():
     dyn_fsi           = TestCase('dyn_fsi')
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
-    dyn_fsi.test_iter = 4000
-    dyn_fsi.test_vals = [-4.828422, -3.010379, -7.776602, -8.791331] #last 4 columns
+    dyn_fsi.test_iter = 4
+    dyn_fsi.test_vals = [-4.413915, -4.837080, 4.7367e-08, 1.0297e-21,  5.0771e-17] #last 5 columns
+    dyn_fsi.multizone = True
+    dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"
     dyn_fsi.timeout   = 1600
     dyn_fsi.tol       = 0.00001

From 57c81a347e2a8e05b970000f8cd5ede5b83d7dc2 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 14:23:40 +0200
Subject: [PATCH 441/539] Small fix for dynamic multizone.

---
 SU2_CFD/src/iteration_structure.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index 62ca22db3571..db39237082ba 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -875,7 +875,7 @@ void CFluidIteration::Solve(COutput *output,
 
     }
 
-    if (multizone){
+    if (multizone && steady){
       
       Output(output, geometry, solver, config,
              config[val_iZone]->GetOuterIter(), StopCalc, val_iZone, val_iInst);

From 3658b9954f1488c3fd28d385f8eaa54337c5fb8f Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 16:50:52 +0200
Subject: [PATCH 442/539] Fix preaccummulation in WLS gradient.

---
 SU2_CFD/include/variables/CVariable.hpp | 8 ++++++++
 SU2_CFD/src/output/CFlowIncOutput.cpp   | 2 +-
 SU2_CFD/src/solver_direct_mean.cpp      | 1 +
 SU2_CFD/src/solver_direct_mean_inc.cpp  | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/SU2_CFD/include/variables/CVariable.hpp b/SU2_CFD/include/variables/CVariable.hpp
index 348a0d6383ac..b131948923cb 100644
--- a/SU2_CFD/include/variables/CVariable.hpp
+++ b/SU2_CFD/include/variables/CVariable.hpp
@@ -674,6 +674,14 @@ class CVariable {
    */
   inline su2double GetRmatrix(unsigned short val_iDim, unsigned short val_jDim) {return Rmatrix[val_iDim][val_jDim]; }
 
+  /*!
+   * \brief Get the value of the Rmatrix entry for least squares gradient calculations.
+   * \param[in] val_iDim - Index of the dimension.
+   * \param[in] val_jDim - Index of the dimension.
+   * \return Value of the Rmatrix entry.
+   */
+  inline su2double **GetRmatrix(void) {return Rmatrix; }
+
   /*!
    * \brief Set the value of the limiter.
    * \param[in] val_var - Index of the variable.
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 2d146ace9fc4..1f06394414ed 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -310,7 +310,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("DEFORM_MIN_VOLUME", mesh_solver->GetMinimum_Volume());
     SetHistoryOutputValue("DEFORM_MAX_VOLUME", mesh_solver->GetMaximum_Volume());
     SetHistoryOutputValue("DEFORM_ITER", mesh_solver->GetIterLinSolver());
-    SetHistoryOutputValue("DEFOMR_RESIDUAL", mesh_solver->GetLinSol_Residual());    
+    SetHistoryOutputValue("DEFORM_RESIDUAL", mesh_solver->GetLinSol_Residual());
   }
   
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index f51f2161e2b6..0b48febaf9f8 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -5404,6 +5404,7 @@ void CEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *config
         }
       }
     }
+    AD::SetPreaccOut(node[iPoint]->GetRmatrix(), nDim, nDim);
     AD::SetPreaccOut(node[iPoint]->GetGradient_Primitive(), nPrimVarGrad, nDim);
     AD::EndPreacc();
   }
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index bdcb65dce08d..09c14c26d738 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -3688,6 +3688,7 @@ void CIncEulerSolver::SetPrimitive_Gradient_LS(CGeometry *geometry, CConfig *con
         
       }
     }
+    AD::SetPreaccOut(node[iPoint]->GetRmatrix(), nDim, nDim);
     AD::SetPreaccOut(node[iPoint]->GetGradient_Primitive(), nPrimVarGrad, nDim);
     AD::EndPreacc();
   }

From 6d45d39a3c67b43d33242939ce72b58b34d98a80 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 16:51:20 +0200
Subject: [PATCH 443/539] Adapt test cases for py_sensitivities to new output.

---
 .../flow_load_sens/configAD_fem.cfg           | 16 ++++---------
 .../mesh_disp_sens/configAD_flow.cfg          | 23 ++++++++-----------
 TestCases/serial_regression_AD.py             |  4 ++--
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
index fa326a496534..ebd60ffac48d 100644
--- a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
+++ b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
@@ -15,8 +15,6 @@ MATH_PROBLEM= DISCRETE_ADJOINT
 
 RESTART_SOL= NO
 
-ITER = 1
-
 OBJECTIVE_FUNCTION= REFERENCE_NODE
 REFERENCE_NODE= 127
 REFERENCE_NODE_DISPLACEMENT= (0.0, 0.0)
@@ -42,20 +40,14 @@ DEAD_LOAD=NO
 FORMULATION_ELASTICITY_2D = PLANE_STRAIN
 
 NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
-NONLINEAR_FEM_INT_ITER = 10
-RESIDUAL_FEM_UTOL = -9.0
-RESIDUAL_FEM_RTOL = -9.0
-RESIDUAL_FEM_ETOL = -9.0
-
-RESIDUAL_CRITERIA_FEM = ABSOLUTE
+INNER_ITER = 1
 
 CONV_FILENAME= history
-VOLUME_STRUCTURE_FILENAME= beam
-WRITE_CONV_FILENAME_FSI = NO
+VOLUME_FILENAME= beam
 BREAKDOWN_FILENAME= forces_breakdown.dat
 
-SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam.dat
+RESTART_FILENAME= restart_beam.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
index 0adb534ea182..d0e6d6d7cb8b 100644
--- a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
+++ b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
@@ -29,8 +29,6 @@ INNER_ITER = 181
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 
-UNSTEADY_SIMULATION= NO
-
 OBJECTIVE_FUNCTION = DRAG
 
 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
@@ -123,15 +121,12 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 
+CONV_FIELD = RMS_ADJ_DENSITY
 CONV_CRITERIA= RESIDUAL
-
-RESIDUAL_REDUCTION= 10
-RESIDUAL_MINVAL= -16
-
-STARTCONV_ITER= 10
-CAUCHY_ELEMS= 100
-CAUCHY_EPS= 1E-5
-CAUCHY_FUNC_FLOW= DRAG
+CONV_RESIDUAL_MINVAL= -16
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-5
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
@@ -140,14 +135,14 @@ MESH_FILENAME= meshFlow.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 
-SOLUTION_FLOW_FILENAME= solution_flow.dat
-RESTART_FLOW_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
+RESTART_FILENAME= restart_flow.dat
 
 OUTPUT_FORMAT= PARAVIEW
 CONV_FILENAME= history
 
-VOLUME_FLOW_FILENAME= flow
-SURFACE_FLOW_FILENAME= surface_flow
+VOLUME_FILENAME= flow
+SURFACE_FILENAME= surface_flow
 
 WRT_SOL_FREQ= 1000
 WRT_SOL_FREQ_DUALTIME= 1
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 6e3faefa1c0e..e0d3952a3e35 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -322,7 +322,7 @@ def main():
     pywrapper_FEA_AD_FlowLoad.test_vals     = [-0.13945587401579657, -0.585985886606256, -0.00036377840086080753, -0.0031005670174756375] #last 4 columns
     pywrapper_FEA_AD_FlowLoad.su2_exec      = "python run_adjoint.py -f"
     pywrapper_FEA_AD_FlowLoad.timeout       = 1600
-    pywrapper_FEA_AD_FlowLoad.tol           = 0.00001
+    pywrapper_FEA_AD_FlowLoad.tol           = 0.000001
     pywrapper_FEA_AD_FlowLoad.unsteady      = True
     test_list.append(pywrapper_FEA_AD_FlowLoad)
     pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test())
@@ -335,7 +335,7 @@ def main():
     pywrapper_FEA_AD_FlowLoad.test_vals     = [30, -2.4701936842091294, 1.4366255094753457, 0.0] #last 4 columns
     pywrapper_FEA_AD_FlowLoad.su2_exec      = "python run_adjoint.py -f"
     pywrapper_FEA_AD_FlowLoad.timeout       = 1600
-    pywrapper_FEA_AD_FlowLoad.tol           = 0.00001
+    pywrapper_FEA_AD_FlowLoad.tol           = 0.000001
     pywrapper_FEA_AD_FlowLoad.unsteady      = True
     test_list.append(pywrapper_FEA_AD_FlowLoad)
     pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test())

From 0a721a9987e03ae8085e82505d4497302073ed84 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 29 Aug 2019 17:17:00 +0200
Subject: [PATCH 444/539] Changed lin sol residual to log10

---
 SU2_CFD/src/output/CElasticityOutput.cpp |  4 ++--
 SU2_CFD/src/output/CFlowCompOutput.cpp   |  8 ++++----
 SU2_CFD/src/output/CFlowIncOutput.cpp    |  8 ++++----
 SU2_CFD/src/solver_structure.cpp         |  2 ++
 SU2_CFD/src/solvers/CMeshSolver.cpp      |  2 --
 TestCases/parallel_regression.py         | 12 ++++++------
 TestCases/serial_regression.py           |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 72e9238bf1a3..99e251444b78 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -148,14 +148,14 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   SetHistoryOutputValue("LOAD_RAMP", fea_solver->GetForceCoeff());
   
   SetHistoryOutputValue("LINSOL_ITER", fea_solver->GetIterLinSolver());
-  SetHistoryOutputValue("LINSOL_RESIDUAL", fea_solver->GetLinSol_Residual());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", log10(fea_solver->GetLinSol_Residual()));
   
 } 
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL",  "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL",  "Residual of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL",  "Residual of the linear solver.");
   
   // Residuals
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index f6135439f52e..3461326f53ea 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -204,7 +204,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL", "Residual of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL", "Residual of the linear solver.");
  
   /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
   /// DESCRIPTION: Aero CD drag
@@ -248,7 +248,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
     AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
     AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
     AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
-    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_SCIENTIFIC, "DEFORM", "Residual of the linear solver for the mesh deformation");    
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
@@ -613,13 +613,13 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
   
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
-  SetHistoryOutputValue("LINSOL_RESIDUAL", flow_solver->GetLinSol_Residual());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", log10(flow_solver->GetLinSol_Residual()));
   
   if (config->GetDeform_Mesh()){
     SetHistoryOutputValue("DEFORM_MIN_VOLUME", mesh_solver->GetMinimum_Volume());
     SetHistoryOutputValue("DEFORM_MAX_VOLUME", mesh_solver->GetMaximum_Volume());
     SetHistoryOutputValue("DEFORM_ITER", mesh_solver->GetIterLinSolver());
-    SetHistoryOutputValue("DEFORM_RESIDUAL", mesh_solver->GetLinSol_Residual());    
+    SetHistoryOutputValue("DEFORM_RESIDUAL", log10(mesh_solver->GetLinSol_Residual()));    
   }
   
   /*--- Set the analyse surface history values --- */
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 1f06394414ed..61d37b27bf27 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -205,14 +205,14 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC,"AOA", "Angle of attack");
   /// DESCRIPTION: Linear solver iterations   
   AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_SCIENTIFIC, "LINSOL", "Residual of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL", "Residual of the linear solver.");
   AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
   
   if (config->GetDeform_Mesh()){
     AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
     AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
     AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
-    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_SCIENTIFIC, "DEFORM", "Residual of the linear solver for the mesh deformation");    
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
@@ -304,13 +304,13 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   }  
   
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
-  SetHistoryOutputValue("LINSOL_RESIDUAL", flow_solver->GetLinSol_Residual());
+  SetHistoryOutputValue("LINSOL_RESIDUAL", log10(flow_solver->GetLinSol_Residual()));
   
   if (config->GetDeform_Mesh()){
     SetHistoryOutputValue("DEFORM_MIN_VOLUME", mesh_solver->GetMinimum_Volume());
     SetHistoryOutputValue("DEFORM_MAX_VOLUME", mesh_solver->GetMaximum_Volume());
     SetHistoryOutputValue("DEFORM_ITER", mesh_solver->GetIterLinSolver());
-    SetHistoryOutputValue("DEFORM_RESIDUAL", mesh_solver->GetLinSol_Residual());
+    SetHistoryOutputValue("DEFORM_RESIDUAL", log10(mesh_solver->GetLinSol_Residual()));
   }
   
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 3ce006075d28..2a644cc1644a 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -101,6 +101,8 @@ CSolver::CSolver(bool mesh_deform_mode) : System(mesh_deform_mode) {
   Restart_Data       = NULL;
   node               = NULL;
   nOutputVariables   = 0;
+  valResidual = 0.0;
+  
 
   /*--- Inlet profile data structures. ---*/
 
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index 61ff9273a55e..287e0cd8aa9b 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -71,8 +71,6 @@ CMeshSolver::CMeshSolver(CGeometry *geometry, CConfig *config) : CFEASolver(true
     nPointDomain = geometry->GetnPointDomain();
     nElement     = geometry->GetnElem();
 
-    valResidual = 0.0;
-
     MinVolume_Ref = 0.0;
     MinVolume_Curr = 0.0;
 
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 3b2837b93454..7833987912e3 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -1061,8 +1061,8 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-3.498815, -5.272652, 4.1230e-08, 1.6803e-12, 4.6810e-21] #last 5 columns
-    stat_fsi.su2_exec  = "SU2_CFD"
+    stat_fsi.test_vals = [ -3.498815, -5.272652, 4.1230e-08, -11.774623, -20.329666] #last 5 columns
+    stat_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
     stat_fsi.tol       = 0.00001
@@ -1073,10 +1073,10 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [-4.413915, -4.837068, 4.7367e-08, 6.5153e-22, 1.6950e-17] #last 5 columns
+    dyn_fsi.test_vals = [-4.413915, -4.837068, 4.7367e-08, -21.186062, -16.770842] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
-    dyn_fsi.su2_exec  = "SU2_CFD"
+    dyn_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     dyn_fsi.timeout   = 1600
     dyn_fsi.tol       = 0.00001
     test_list.append(dyn_fsi)
@@ -1086,8 +1086,8 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-9.197015, -7.442300, 4.1223e-08, 1.6809e-12, 3.9533e-21] #last 5 columns
-    stat_fsi_restart.su2_exec  = "SU2_CFD"
+    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 0.000000, -11.696645, -20.259286] #last 5 columns
+    stat_fsi_restart.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi_restart.multizone = True
     stat_fsi_restart.timeout   = 1600
     stat_fsi_restart.tol       = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 09fd611a74fc..1bc396fc544e 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1145,7 +1145,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-6.762767, -6.439588, 4.1223e-08, 2.0107e-12 ,1.4315e-21] #last 5 columns
+    stat_fsi.test_vals = [-6.762767, -6.439588, 4.1223e-08, -11.696645, -20.844194] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
     stat_fsi.timeout   = 1600
     stat_fsi.multizone = True
@@ -1157,7 +1157,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 4.1223e-08, 2.0107e-12, 5.5044e-21] #last 5 columns
+    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 4.1223e-08, -11.696645, -20.259286] #last 5 columns
     stat_fsi_restart.multizone = True
     stat_fsi_restart.su2_exec  = "SU2_CFD"
     stat_fsi_restart.timeout   = 1600
@@ -1169,7 +1169,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [-4.413915, -4.837080, 4.7367e-08, 1.0297e-21,  5.0771e-17] #last 5 columns
+    dyn_fsi.test_vals = [-4.413915, -4.837080, 4.7367e-08, -20.987299,-16.294380] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"

From 0cdaf78e000b7147bd639aadd335d2aee47ed9c5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 30 Aug 2019 10:05:19 +0200
Subject: [PATCH 445/539] Changed residual to lin sol iter for FSI cases

---
 TestCases/fea_fsi/dyn_fsi/config.cfg          | 2 +-
 TestCases/fea_fsi/stat_fsi/config.cfg         | 2 +-
 TestCases/fea_fsi/stat_fsi/config_restart.cfg | 2 +-
 TestCases/parallel_regression.py              | 6 +++---
 TestCases/serial_regression.py                | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TestCases/fea_fsi/dyn_fsi/config.cfg b/TestCases/fea_fsi/dyn_fsi/config.cfg
index 2af6a8bc53ad..054d41d1bfa4 100644
--- a/TestCases/fea_fsi/dyn_fsi/config.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/config.cfg
@@ -17,7 +17,7 @@ MULTIZONE_MESH = NO
 TIME_DOMAIN = YES
 TIME_ITER = 5
 TIME_STEP = 0.005
-SCREEN_OUTPUT= (TIME_ITER, OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
+SCREEN_OUTPUT= (TIME_ITER, OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
 RESTART_SOL= YES
 RESTART_ITER = 2 
 
diff --git a/TestCases/fea_fsi/stat_fsi/config.cfg b/TestCases/fea_fsi/stat_fsi/config.cfg
index 0c491ae2c391..da0a8298ce67 100755
--- a/TestCases/fea_fsi/stat_fsi/config.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config.cfg
@@ -16,7 +16,7 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
 RESTART_SOL= NO
 RESTART_ITER = 0
 
diff --git a/TestCases/fea_fsi/stat_fsi/config_restart.cfg b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
index e2325573c50d..36a2d85887e0 100755
--- a/TestCases/fea_fsi/stat_fsi/config_restart.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
@@ -16,7 +16,7 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_RESIDUAL[0], LINSOL_RESIDUAL[1])
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
 RESTART_SOL= YES
 RESTART_ITER = 0
 TIME_DOMAIN = NO
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 7833987912e3..e1486b9c088a 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -1061,7 +1061,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [ -3.498815, -5.272652, 4.1230e-08, -11.774623, -20.329666] #last 5 columns
+    stat_fsi.test_vals = [ -3.498815, -5.272652, 4.1230e-08, 46.0000, 291.00000] #last 5 columns
     stat_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
@@ -1073,7 +1073,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [-4.413915, -4.837068, 4.7367e-08, -21.186062, -16.770842] #last 5 columns
+    dyn_fsi.test_vals = [-4.413915, -4.837068, 4.7367e-08, 64.000000, 40.000000] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
@@ -1086,7 +1086,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 0.000000, -11.696645, -20.259286] #last 5 columns
+    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 0.000000, 46.00000, 290.00000] #last 5 columns
     stat_fsi_restart.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi_restart.multizone = True
     stat_fsi_restart.timeout   = 1600
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 1bc396fc544e..d04534401b8e 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1145,7 +1145,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-6.762767, -6.439588, 4.1223e-08, -11.696645, -20.844194] #last 5 columns
+    stat_fsi.test_vals = [-6.762767, -6.439588, 4.1223e-08, 47.000000, 292.00000] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
     stat_fsi.timeout   = 1600
     stat_fsi.multizone = True
@@ -1157,7 +1157,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 4.1223e-08, -11.696645, -20.259286] #last 5 columns
+    stat_fsi_restart.test_vals = [-9.685290, -8.386780, 4.1223e-08, 47.00000, 290.0000] #last 5 columns
     stat_fsi_restart.multizone = True
     stat_fsi_restart.su2_exec  = "SU2_CFD"
     stat_fsi_restart.timeout   = 1600
@@ -1169,7 +1169,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [-4.413915, -4.837080, 4.7367e-08, -20.987299,-16.294380] #last 5 columns
+    dyn_fsi.test_vals = [-4.413915, -4.837080, 4.7367e-08, 59.000000, 33.000000] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"

From 312e9c2949f82b7e37e735bd01c858c232676985 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 30 Aug 2019 10:32:23 +0200
Subject: [PATCH 446/539] Fix pywrapper case

---
 TestCases/serial_regression_AD.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index e0d3952a3e35..48d8c3bff9c8 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -323,7 +323,7 @@ def main():
     pywrapper_FEA_AD_FlowLoad.su2_exec      = "python run_adjoint.py -f"
     pywrapper_FEA_AD_FlowLoad.timeout       = 1600
     pywrapper_FEA_AD_FlowLoad.tol           = 0.000001
-    pywrapper_FEA_AD_FlowLoad.unsteady      = True
+    pywrapper_FEA_AD_FlowLoad.new_output    = False
     test_list.append(pywrapper_FEA_AD_FlowLoad)
     pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test())
 
@@ -336,7 +336,7 @@ def main():
     pywrapper_FEA_AD_FlowLoad.su2_exec      = "python run_adjoint.py -f"
     pywrapper_FEA_AD_FlowLoad.timeout       = 1600
     pywrapper_FEA_AD_FlowLoad.tol           = 0.000001
-    pywrapper_FEA_AD_FlowLoad.unsteady      = True
+    pywrapper_FEA_AD_FlowLoad.new_output    = False
     test_list.append(pywrapper_FEA_AD_FlowLoad)
     pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test())
 

From 01b85206b9065eea85fa7bcdac12df37cfce1307 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 4 Sep 2019 18:35:23 +0200
Subject: [PATCH 447/539] Fixing Cp volume output

---
 SU2_CFD/src/output/CFlowCompOutput.cpp | 8 ++++++--
 SU2_CFD/src/output/CFlowIncOutput.cpp  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 3461326f53ea..fe386f5fec3d 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -440,8 +440,12 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   SetVolumeOutputValue("PRESSURE", iPoint, Node_Flow->GetPressure());
   SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
   SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
-  su2double factor = 1.0/(0.5*config->GetDensity_Ref()*config->GetVelocity_Ref()*config->GetVelocity_Ref());
-  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_Ref())/factor);
+  su2double VelMag = 0.0;
+  for (unsigned short iDim = 0; iDim < nDim; iDim++){
+    VelMag += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);    
+  }
+  su2double factor = 1.0/(0.5*solver[FLOW_SOL]->GetDensity_Inf()*VelMag); 
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - solver[FLOW_SOL]->GetPressure_Inf())*factor);
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 61d37b27bf27..5172fe54b047 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -504,8 +504,12 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
       SetVolumeOutputValue("GRID_VELOCITY-Z", iPoint, Node_Geo->GetGridVel()[2]);
   }
   
-  su2double factor = 1.0/(0.5*config->GetDensity_Ref()*config->GetVelocity_Ref()*config->GetVelocity_Ref()); 
-  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_Ref())/factor);
+  su2double VelMag = 0.0;
+  for (unsigned short iDim = 0; iDim < nDim; iDim++){
+    VelMag += solver[FLOW_SOL]->GetVelocity_Inf(iDim)*solver[FLOW_SOL]->GetVelocity_Inf(iDim);    
+  }
+  su2double factor = 1.0/(0.5*solver[FLOW_SOL]->GetDensity_Inf()*VelMag); 
+  SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_FreeStreamND())*factor);
   SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetDensity());
   
   if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){

From 4ca1cdef292857cf7176fa580e509522892ff22d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 5 Sep 2019 11:56:40 +0200
Subject: [PATCH 448/539] Changed ASCII restart writer to CSV format

---
 SU2_CFD/src/output/COutput.cpp                   |  2 +-
 SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 0a76130136ff..3bc043012de7 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -388,7 +388,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataS
           cout << "Writing CSV file." << endl;     
       }
          
-      filewriter = new CCSVFileWriter(volumeFieldNames, nDim);
+      filewriter = new CSU2FileWriter(volumeFieldNames, nDim);
           
       break;
     
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 0068e3749917..c067f454a8d9 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -4,7 +4,7 @@
 
 
 CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, ".dat", nDim){}
+  CFileWriter(fields, ".csv", nDim){}
 
 
 CSU2FileWriter::~CSU2FileWriter(){
@@ -39,8 +39,8 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     restart_file.precision(15);
     restart_file << "\"PointID\"";
     for (iVar = 0; iVar < fieldnames.size()-1; iVar++)
-      restart_file << "\t\"" << fieldnames[iVar] << "\"";
-    restart_file << "\t\"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
+      restart_file << ", \"" << fieldnames[iVar] << "\"";
+    restart_file << ", \"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
     restart_file.close();
   }
   
@@ -66,15 +66,15 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
         
         /*--- Write global index. (note outer loop over procs) ---*/
         
-        restart_file << Global_Index << "\t";
+        restart_file << Global_Index << ", ";
         myPoint++;
         
         /*--- Loop over the variables and write the values to file ---*/
         
-        for (iVar = 0; iVar < fieldnames.size(); iVar++) {
-          restart_file << scientific << data_sorter->GetData(iVar, iPoint) << "\t";
+        for (iVar = 0; iVar < fieldnames.size()-1; iVar++) {
+          restart_file << scientific << data_sorter->GetData(iVar, iPoint) << ", ";
         }
-        restart_file << "\n";
+        restart_file << scientific << data_sorter->GetData(fieldnames.size()-1, iPoint) << "\n";        
       }
       
     }

From b3503d451d5bd3e0abb0204d4b22b69467b4e8b5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 11:21:39 +0200
Subject: [PATCH 449/539] Changed ASCII restart reader to csv format

---
 SU2_CFD/src/solver_adjoint_discrete.cpp   |  2 +-
 SU2_CFD/src/solver_adjoint_elasticity.cpp |  2 +-
 SU2_CFD/src/solver_adjoint_mean.cpp       |  2 +-
 SU2_CFD/src/solver_direct_elasticity.cpp  |  2 +-
 SU2_CFD/src/solver_direct_heat.cpp        |  2 +-
 SU2_CFD/src/solver_direct_mean.cpp        |  2 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp    |  2 +-
 SU2_CFD/src/solver_direct_turbulent.cpp   |  2 +-
 SU2_CFD/src/solver_structure.cpp          | 25 ++++++++++++-----------
 SU2_CFD/src/solvers/CMeshSolver.cpp       |  8 ++++----
 10 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/SU2_CFD/src/solver_adjoint_discrete.cpp b/SU2_CFD/src/solver_adjoint_discrete.cpp
index 5a6f366a38ca..4cc42e00e070 100644
--- a/SU2_CFD/src/solver_adjoint_discrete.cpp
+++ b/SU2_CFD/src/solver_adjoint_discrete.cpp
@@ -942,7 +942,7 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
   filename = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
   
-  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  restart_filename = config->GetFilename(restart_filename, "", val_iter);
   
 
   /*--- Read and store the restart metadata. ---*/
diff --git a/SU2_CFD/src/solver_adjoint_elasticity.cpp b/SU2_CFD/src/solver_adjoint_elasticity.cpp
index 683009b01683..bbd221d050a4 100644
--- a/SU2_CFD/src/solver_adjoint_elasticity.cpp
+++ b/SU2_CFD/src/solver_adjoint_elasticity.cpp
@@ -1151,7 +1151,7 @@ void CDiscAdjFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCo
 
   filename = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
-  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  restart_filename = config->GetFilename(restart_filename, "", val_iter);
 
   /*--- Read and store the restart metadata. ---*/
 
diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp
index 0fa97dae5f87..cbafe1d049e0 100644
--- a/SU2_CFD/src/solver_adjoint_mean.cpp
+++ b/SU2_CFD/src/solver_adjoint_mean.cpp
@@ -4751,7 +4751,7 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
 
   filename         = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
-  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  restart_filename = config->GetFilename(restart_filename, "", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index fb801d96ea10..3fdd1d1379a3 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -4362,7 +4362,7 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
+  filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
 
   /*--- Read all lines in the restart file ---*/
 
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index 9d0f1c51a589..ca97a11dae29 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -296,7 +296,7 @@ void CHeatSolverFVM::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
 
   su2double Area_Children, Area_Parent, *Coord, *Solution_Fine;
 
-  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 0b48febaf9f8..9cebc034324c 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -12773,7 +12773,7 @@ void CEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig
   bool steady_restart = config->GetSteadyRestart();
   bool turbulent     = (config->GetKind_Turb_Model() != NONE);
 
-  string  restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
+  string  restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index 792c2f92d5e5..afe118bdd5bf 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -6478,7 +6478,7 @@ void CIncEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   bool steady_restart = config->GetSteadyRestart();
   bool turbulent     = (config->GetKind_Solver() == INC_RANS) || (config->GetKind_Solver() == DISC_ADJ_INC_RANS);
   
-  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp
index fddbfecac8a7..800709a0d2e5 100644
--- a/SU2_CFD/src/solver_direct_turbulent.cpp
+++ b/SU2_CFD/src/solver_direct_turbulent.cpp
@@ -761,7 +761,7 @@ void CTurbSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
   unsigned long iPoint, index, iChildren, Point_Fine;
   su2double Area_Children, Area_Parent, *Solution_Fine;
 
-  string restart_filename = config->GetFilename(config->GetSolution_FileName(), ".dat", val_iter);
+  string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index e5d77434a544..1637840b39c5 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -49,6 +49,7 @@
 #include "../../Common/include/toolboxes/MMS/CRinglebSolution.hpp"
 #include "../../Common/include/toolboxes/MMS/CTGVSolution.hpp"
 #include "../../Common/include/toolboxes/MMS/CUserDefinedSolution.hpp"
+#include "../include/toolboxes/printing_toolbox.hpp"
 
 
 CSolver::CSolver(bool mesh_deform_mode) : System(mesh_deform_mode) {
@@ -4158,6 +4159,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   /*--- First, check that this is not a binary restart file. ---*/
 
   char fname[100];
+  val_filename += ".csv";
   strcpy(fname, val_filename.c_str());
   int magic_number;
 
@@ -4247,11 +4249,9 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   /*--- Identify the number of fields (and names) in the restart file ---*/
 
   getline (restart_file, text_line);
-  stringstream ss(text_line);
-  while (ss >> Tag) {
-    fields.push_back(Tag);
-    if (ss.peek() == ',') ss.ignore();
-  }
+  
+  char delimiter = ',';
+  fields = PrintingToolbox::split(text_line, delimiter);
 
   /*--- Set the number of variables, one per field in the
    restart file (without including the PointID) ---*/
@@ -4267,8 +4267,8 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   for (iPoint_Global = 0; iPoint_Global < geometry->GetGlobal_nPointDomain(); iPoint_Global++ ) {
 
     getline (restart_file, text_line);
-
-    istringstream point_line(text_line);
+    
+    vector<string> point_line = PrintingToolbox::split(text_line, delimiter);
 
     /*--- Retrieve local index. If this node from the restart file lives
      on the current processor, we will load and instantiate the vars. ---*/
@@ -4279,12 +4279,12 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
 
       /*--- The PointID is not stored --*/
 
-      point_line >> index;
+      index = PrintingToolbox::stoi(point_line[0]);
 
       /*--- Store the solution (starting with node coordinates) --*/
 
       for (iVar = 0; iVar < Restart_Vars[1]; iVar++)
-        point_line >> Restart_Data[counter*Restart_Vars[1] + iVar];
+        Restart_Data[counter*Restart_Vars[1] + iVar] = PrintingToolbox::stod(point_line[iVar+1]);
 
       /*--- Increment our local point counter. ---*/
 
@@ -4299,6 +4299,7 @@ void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, CConfig *config, stri
 
   char str_buf[CGNS_STRING_SIZE], fname[100];
   unsigned short iVar;
+  val_filename += ".dat";  
   strcpy(fname, val_filename.c_str());
   int nRestart_Vars = 5, nFields;
   Restart_Vars = new int[5];
@@ -6006,7 +6007,7 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
     filename = config->GetSolution_FileName();
   }
 
-  filename = config->GetFilename(filename, ".dat", val_iter);
+  filename = config->GetFilename(filename, "", val_iter);
 
   /*--- Output the file name to the console. ---*/
 
@@ -6132,7 +6133,7 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
 
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-  filename = config->GetFilename(filename, ".dat", val_iter);
+  filename = config->GetFilename(filename, "", val_iter);
 
   /*--- Output the file name to the console. ---*/
 
@@ -6476,7 +6477,7 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   string restart_filename = config->GetSolution_FileName();
 
   if (config->GetTime_Domain()) {
-    restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), ".dat");
+    restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), "");
   }
 
   int counter = 0;
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index 287e0cd8aa9b..628f63f1a7b4 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -724,7 +724,7 @@ void CMeshSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
   unsigned long iPoint_Global_Local = 0;
   unsigned short rbuf_NotMatching = 0, sbuf_NotMatching = 0;
 
-  restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+  restart_filename = config->GetFilename(restart_filename, "", val_iter);
   
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
@@ -867,7 +867,7 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   /*--- Multizone problems require the number of the zone to be appended. ---*/
 
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
+    filename = config->GetMultizone_FileName(filename, iZone, "");
 
   /*-------------------------------------------------------------------------------------------*/
   /*----------------------- First, load the restart file for time n ---------------------------*/
@@ -875,7 +875,7 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- Modify file name for an unsteady restart ---*/
   Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
-  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
+  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, "");
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
@@ -951,7 +951,7 @@ void CMeshSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
     /*--- Modify file name for an unsteady restart ---*/
     Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
-    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
+    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, "");
 
     /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 

From 7b751923916d0d260837780bb9b5a58653a500c0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:07:30 +0200
Subject: [PATCH 450/539] Added reading/writing of meta data file

---
 SU2_CFD/include/output/CFlowOutput.hpp        |   7 +
 SU2_CFD/include/output/COutput.hpp            |   8 +
 SU2_CFD/src/output/CFlowOutput.cpp            |  37 ++
 SU2_CFD/src/output/COutput.cpp                |   4 +
 .../src/output/filewriter/CSU2FileWriter.cpp  |  22 -
 SU2_CFD/src/solver_direct_mean.cpp            |  24 +-
 SU2_CFD/src/solver_direct_mean_fem.cpp        |   2 +
 SU2_CFD/src/solver_structure.cpp              | 419 ++++--------------
 8 files changed, 152 insertions(+), 371 deletions(-)

diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index 98b6e6f7e18f..96f82ad2d07d 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -94,4 +94,11 @@ class CFlowOutput : public COutput{
    */
   void Set_CpInverseDesign(CSolver *solver, CGeometry *geometry, CConfig *config);
   
+  /*!
+   * \brief Write information to meta data file
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] solver - The container holding all solution data.
+   */
+  void WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
 };
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 67b2dd713084..315c2a318f2d 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -739,6 +739,14 @@ class COutput {
    * \param[in] config - Definition of the particular problem per zone.
    */
   inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
+  
+  /*!
+   * \brief Write information to meta data file
+   * \param[in] output - Container holding the output instances per zone.   
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] solver - The container holding all solution data.
+   */
+  inline virtual void WriteMetaData(CConfig *config, CGeometry *geometry, CSolver** solver) {}
 
 };
 
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 3c6ed6c43d9d..90ab596df0b0 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -921,3 +921,40 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver, CGeometry *geometry, CCon
   SetHistoryOutputValue("CP_DIFF", PressDiff);
 
 }
+
+void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **solver){
+    
+  ofstream meta_file;
+  
+  string filename = "flow";
+  
+  filename = config->GetFilename(filename, "meta", curTimeIter);
+  
+  /*--- All processors open the file. ---*/
+
+  if (rank == MASTER_NODE) {
+    meta_file.open(filename.c_str(), ios::out);
+    meta_file.precision(15);
+    
+    if (config->GetTime_Marching() == DT_STEPPING_1ST || config->GetTime_Marching() == DT_STEPPING_2ND)
+      meta_file <<"ITER= " << curTimeIter + 1 << endl;
+    else
+      meta_file <<"ITER= " << curInnerIter + config->GetExtIter_OffSet() + 1 << endl;
+    meta_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
+    meta_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
+    meta_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
+    meta_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
+    meta_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
+    meta_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
+    meta_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
+    
+    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
+          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
+          config->GetKind_Solver() == DISC_ADJ_RANS )) {
+      meta_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+    }
+  }
+  
+  meta_file.close();
+  
+}
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 3bc043012de7..0639ac716e8a 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -361,6 +361,10 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   
   volumeDataSorter->SortOutputData();
   
+  if (config->GetFixed_CL_Mode() || config->GetFixed_CM_Mode()){
+    WriteMetaData(config, geometry, solver_container);
+  }
+  
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index c067f454a8d9..a3c8fe574c58 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -103,28 +103,6 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   Bandwidth = file_size/(1.0e6)/UsedTime;
   
-  /*--- Write the metadata (master rank alone) ----*/
-
-//  if (rank == MASTER_NODE) {
-//    if (dual_time)
-//      restart_file <<"EXT_ITER= " << config->GetExtIter() + 1 << endl;
-//    else
-//      restart_file <<"EXT_ITER= " << config->GetExtIter() + config->GetExtIter_OffSet() + 1 << endl;
-//    restart_file <<"AOA= " << config->GetAoA() - config->GetAoA_Offset() << endl;
-//    restart_file <<"SIDESLIP_ANGLE= " << config->GetAoS() - config->GetAoS_Offset() << endl;
-//    restart_file <<"INITIAL_BCTHRUST= " << config->GetInitial_BCThrust() << endl;
-//    restart_file <<"DCD_DCL_VALUE= " << config->GetdCD_dCL() << endl;
-//    restart_file <<"DCMX_DCL_VALUE= " << config->GetdCMx_dCL() << endl;
-//    restart_file <<"DCMY_DCL_VALUE= " << config->GetdCMy_dCL() << endl;
-//    restart_file <<"DCMZ_DCL_VALUE= " << config->GetdCMz_dCL() << endl;
-
-//    if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-//          config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-//          config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-//      restart_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
-//    }
-//  }
-
   /*--- All processors close the file. ---*/
 
   restart_file.close();
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 9cebc034324c..5a3355cfcbf5 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -193,7 +193,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
   bool fsi     = config->GetFSI_Simulation();
   bool multizone = config->GetMultizone_Problem();
-  string filename_ = config->GetSolution_FileName();
+  string filename_ = "flow";
 
   /*--- Store the multigrid level. ---*/
   MGLevel = iMesh;
@@ -203,10 +203,6 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
 
   if (!(!restart || (iMesh != MESH_0) || nZone > 1)) {
 
-    /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
-
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
     if (dual_time) {
@@ -214,7 +210,6 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
       else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -222,12 +217,13 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
+    
+    filename_ = config->GetFilename(filename_, "meta", Unst_RestartIter);
 
     /*--- Read and store the restart metadata. ---*/
 
-//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
 
   }
 
@@ -14176,7 +14172,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
   bool low_mach_prec = config->Low_Mach_Preconditioning();
   
   bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
-  string filename_ = config->GetSolution_FileName();
+  string filename_ = "flow";
 
   unsigned short direct_diff = config->GetDirectDiff();
   bool rans = (config->GetKind_Turb_Model() != NONE);
@@ -14189,10 +14185,6 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
 
   if (!(!restart || (iMesh != MESH_0) || nZone > 1)) {
 
-    /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
-
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
     if (dual_time) {
@@ -14200,7 +14192,6 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
       else if (config->GetTime_Marching() == DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
@@ -14208,12 +14199,13 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
     }
+    
+    filename_ = config->GetFilename(filename_, "meta", Unst_RestartIter);
 
     /*--- Read and store the restart metadata. ---*/
 
-//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
     
   }
 
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index 3831a5101d68..eebbbc3006a4 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -9420,6 +9420,8 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C
   /*--- Skip coordinates ---*/
 
   unsigned short skipVars = geometry[MESH_0]->GetnDim();
+  
+  restart_filename = config->GetFilename(restart_filename, "", val_iter);
 
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 1637840b39c5..82e0b7558a30 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -4520,343 +4520,96 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
 	unsigned long InnerIter_ = 0;
 	ifstream restart_file;
 	bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint());
-
-	if (config->GetRead_Binary_Restart()) {
-
-		char fname[100];
-		strcpy(fname, val_filename.c_str());
-		int nVar_Buf = 5;
-		int var_buf[5];
-		int Restart_Iter = 0;
-		passivedouble Restart_Meta_Passive[8] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-		su2double Restart_Meta[8] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-
-#ifndef HAVE_MPI
-
-		/*--- Serial binary input. ---*/
-
-		FILE *fhw;
-		fhw = fopen(fname,"rb");
-    size_t ret;
-
-		/*--- Error check for opening the file. ---*/
-
-		if (!fhw) {
-      SU2_MPI::Error(string("Unable to open restart file ") + string(fname), CURRENT_FUNCTION);
-		}
-
-		/*--- First, read the number of variables and points. ---*/
-
-		ret = fread(var_buf, sizeof(int), nVar_Buf, fhw);
-    if (ret != (unsigned long)nVar_Buf) {
-      SU2_MPI::Error("Error reading restart file.", CURRENT_FUNCTION);
-    }
-
-    /*--- Check that this is an SU2 binary file. SU2 binary files
-     have the hex representation of "SU2" as the first int in the file. ---*/
-
-    if (var_buf[0] != 535532) {
-      SU2_MPI::Error(string("File ") + string(fname) + string(" is not a binary SU2 restart file.\n") +
-                     string("SU2 reads/writes binary restart files by default.\n") +
-                     string("Note that backward compatibility for ASCII restart files is\n") +
-                     string("possible with the WRT_BINARY_RESTART / READ_BINARY_RESTART options."), CURRENT_FUNCTION);
-    }
-
-    /*--- Compute (negative) displacements and grab the metadata. ---*/
-
-    ret = sizeof(int) + 8*sizeof(passivedouble);
-    fseek(fhw,-ret, SEEK_END);
-
-    /*--- Read the external iteration. ---*/
-
-    ret = fread(&Restart_Iter, sizeof(int), 1, fhw);
-    if (ret != 1) {
-      SU2_MPI::Error("Error reading restart file.", CURRENT_FUNCTION);
-    }
-
-    /*--- Read the metadata. ---*/
-
-    ret = fread(Restart_Meta_Passive, sizeof(passivedouble), 8, fhw);
-    if (ret != 8) {
-      SU2_MPI::Error("Error reading restart file.", CURRENT_FUNCTION);
-    }
-
-    for (unsigned short iVar = 0; iVar < 8; iVar++)
-      Restart_Meta[iVar] = Restart_Meta_Passive[iVar];
-
-    /*--- Close the file. ---*/
-
-    fclose(fhw);
-
-#else
-
-		/*--- Parallel binary input using MPI I/O. ---*/
-
-		MPI_File fhw;
-		MPI_Offset disp;
-    int ierr;
-
-		/*--- All ranks open the file using MPI. ---*/
-
-		ierr = MPI_File_open(MPI_COMM_WORLD, fname, MPI_MODE_RDONLY, MPI_INFO_NULL, &fhw);
-
-		/*--- Error check opening the file. ---*/
-
-		if (ierr) {
-      SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
-		}
-
-		/*--- First, read the number of variables and points (i.e., cols and rows),
-     which we will need in order to read the file later. Also, read the
-     variable string names here. Only the master rank reads the header. ---*/
-
-		if (rank == MASTER_NODE)
-			MPI_File_read(fhw, var_buf, nVar_Buf, MPI_INT, MPI_STATUS_IGNORE);
-
-		/*--- Broadcast the number of variables to all procs and store clearly. ---*/
-
-		SU2_MPI::Bcast(var_buf, nVar_Buf, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-
-    /*--- Check that this is an SU2 binary file. SU2 binary files
-     have the hex representation of "SU2" as the first int in the file. ---*/
-
-    if (var_buf[0] != 535532) {
-      SU2_MPI::Error(string("File ") + string(fname) + string(" is not a binary SU2 restart file.\n") +
-                     string("SU2 reads/writes binary restart files by default.\n") +
-                     string("Note that backward compatibility for ASCII restart files is\n") +
-                     string("possible with the WRT_BINARY_RESTART / READ_BINARY_RESTART options."), CURRENT_FUNCTION);
-    }
-
-    /*--- Access the metadata. ---*/
-
-		if (rank == MASTER_NODE) {
-
-      /*--- External iteration. ---*/
-
-      disp = (nVar_Buf*sizeof(int) + var_buf[1]*CGNS_STRING_SIZE*sizeof(char) +
-              var_buf[1]*var_buf[2]*sizeof(passivedouble));
-      MPI_File_read_at(fhw, disp, &Restart_Iter, 1, MPI_INT, MPI_STATUS_IGNORE);
-
-			/*--- Additional doubles for AoA, AoS, etc. ---*/
-
-      disp = (nVar_Buf*sizeof(int) + var_buf[1]*CGNS_STRING_SIZE*sizeof(char) +
-              var_buf[1]*var_buf[2]*sizeof(passivedouble) + 1*sizeof(int));
-      MPI_File_read_at(fhw, disp, Restart_Meta_Passive, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
-
-		}
-
-		/*--- Communicate metadata. ---*/
-
-		SU2_MPI::Bcast(&Restart_Iter, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-
-		/*--- Copy to a su2double structure (because of the SU2_MPI::Bcast
-              doesn't work with passive data)---*/
-
-		for (unsigned short iVar = 0; iVar < 8; iVar++)
-			Restart_Meta[iVar] = Restart_Meta_Passive[iVar];
-
-		SU2_MPI::Bcast(Restart_Meta, 8, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
-
-		/*--- All ranks close the file after writing. ---*/
-
-		MPI_File_close(&fhw);
-
-#endif
-
-		/*--- Store intermediate vals from file I/O in correct variables. ---*/
-
-		InnerIter_  = Restart_Iter;
-		AoA_      = Restart_Meta[0];
-		AoS_      = Restart_Meta[1];
-		BCThrust_ = Restart_Meta[2];
-		dCD_dCL_  = Restart_Meta[3];
-  dCMx_dCL_  = Restart_Meta[4];
-  dCMy_dCL_  = Restart_Meta[5];
-  dCMz_dCL_  = Restart_Meta[6];
-
-	} else {
-
-    /*--- First, check that this is not a binary restart file. ---*/
-
-    char fname[100];
-    strcpy(fname, val_filename.c_str());
-    int magic_number;
-
-#ifndef HAVE_MPI
-
-    /*--- Serial binary input. ---*/
-
-    FILE *fhw;
-    fhw = fopen(fname,"rb");
-    size_t ret;
-
-    /*--- Error check for opening the file. ---*/
-
-    if (!fhw) {
-      SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
-    }
-
-    /*--- Attempt to read the first int, which should be our magic number. ---*/
-
-    ret = fread(&magic_number, sizeof(int), 1, fhw);
-    if (ret != 1) {
-      SU2_MPI::Error("Error reading restart file.", CURRENT_FUNCTION);
-    }
-
-    /*--- Check that this is an SU2 binary file. SU2 binary files
-     have the hex representation of "SU2" as the first int in the file. ---*/
-
-    if (magic_number == 535532) {
-      SU2_MPI::Error(string("File ") + string(fname) + string(" is a binary SU2 restart file, expected ASCII.\n") +
-                     string("SU2 reads/writes binary restart files by default.\n") +
-                     string("Note that backward compatibility for ASCII restart files is\n") +
-                     string("possible with the WRT_BINARY_RESTART / READ_BINARY_RESTART options."), CURRENT_FUNCTION);
-    }
-
-    fclose(fhw);
-
-#else
-
-    /*--- Parallel binary input using MPI I/O. ---*/
-
-    MPI_File fhw;
-    int ierr;
-
-    /*--- All ranks open the file using MPI. ---*/
-
-    ierr = MPI_File_open(MPI_COMM_WORLD, fname, MPI_MODE_RDONLY, MPI_INFO_NULL, &fhw);
-
-    /*--- Error check opening the file. ---*/
-
-    if (ierr) {
-      SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+  
+  /*--- Carry on with ASCII metadata reading. ---*/
+  
+  restart_file.open(val_filename.data(), ios::in);
+  if (restart_file.fail()) {
+    if (rank == MASTER_NODE) {
+      cout << " Warning: There is no restart file (" << val_filename.data() << ")."<< endl;
+      cout << " Computation will continue without updating metadata parameters." << endl;
     }
-
-    /*--- Have the master attempt to read the magic number. ---*/
-
-    if (rank == MASTER_NODE)
-      MPI_File_read(fhw, &magic_number, 1, MPI_INT, MPI_STATUS_IGNORE);
-
-    /*--- Broadcast the number of variables to all procs and store clearly. ---*/
-
-    SU2_MPI::Bcast(&magic_number, 1, MPI_INT, MASTER_NODE, MPI_COMM_WORLD);
-
-    /*--- Check that this is an SU2 binary file. SU2 binary files
-     have the hex representation of "SU2" as the first int in the file. ---*/
-
-    if (magic_number == 535532) {
-      SU2_MPI::Error(string("File ") + string(fname) + string(" is a binary SU2 restart file, expected ASCII.\n") +
-                     string("SU2 reads/writes binary restart files by default.\n") +
-                     string("Note that backward compatibility for ASCII restart files is\n") +
-                     string("possible with the WRT_BINARY_RESTART / READ_BINARY_RESTART options."), CURRENT_FUNCTION);
+  } else {
+    
+    string text_line;
+    
+    /*--- Space for extra info (if any) ---*/
+    
+    while (getline (restart_file, text_line)) {
+      
+      /*--- External iteration ---*/
+      
+      position = text_line.find ("EXT_ITER=",0);
+      if (position != string::npos) {
+        text_line.erase (0,9); InnerIter_ = atoi(text_line.c_str());
+      }
+      
+      /*--- Angle of attack ---*/
+      
+      position = text_line.find ("AOA=",0);
+      if (position != string::npos) {
+        text_line.erase (0,4); AoA_ = atof(text_line.c_str());
+      }
+      
+      /*--- Sideslip angle ---*/
+      
+      position = text_line.find ("SIDESLIP_ANGLE=",0);
+      if (position != string::npos) {
+        text_line.erase (0,15); AoS_ = atof(text_line.c_str());
+      }
+      
+      /*--- BCThrust angle ---*/
+      
+      position = text_line.find ("INITIAL_BCTHRUST=",0);
+      if (position != string::npos) {
+        text_line.erase (0,17); BCThrust_ = atof(text_line.c_str());
+      }
+      
+      if (adjoint_run) {
+        
+        if (config->GetEval_dOF_dCX() == true) {
+          
+          /*--- dCD_dCL coefficient ---*/
+          
+          position = text_line.find ("DCD_DCL_VALUE=",0);
+          if (position != string::npos) {
+            text_line.erase (0,14); dCD_dCL_ = atof(text_line.c_str());
+          }
+          
+          /*--- dCMx_dCL coefficient ---*/
+          
+          position = text_line.find ("DCMX_DCL_VALUE=",0);
+          if (position != string::npos) {
+            text_line.erase (0,15); dCMx_dCL_ = atof(text_line.c_str());
+          }
+          
+          /*--- dCMy_dCL coefficient ---*/
+          
+          position = text_line.find ("DCMY_DCL_VALUE=",0);
+          if (position != string::npos) {
+            text_line.erase (0,15); dCMy_dCL_ = atof(text_line.c_str());
+          }
+          
+          /*--- dCMz_dCL coefficient ---*/
+          
+          position = text_line.find ("DCMZ_DCL_VALUE=",0);
+          if (position != string::npos) {
+            text_line.erase (0,15); dCMz_dCL_ = atof(text_line.c_str());
+          }
+          
+        }
+        
+      }
+      
     }
     
-    MPI_File_close(&fhw);
     
-#endif
-
-    /*--- Carry on with ASCII metadata reading. ---*/
-
-		restart_file.open(val_filename.data(), ios::in);
-		if (restart_file.fail()) {
-			if (rank == MASTER_NODE) {
-				cout << " Warning: There is no restart file (" << val_filename.data() << ")."<< endl;
-				cout << " Computation will continue without updating metadata parameters." << endl;
-			}
-		} else {
-
-			unsigned long iPoint_Global = 0;
-			string text_line;
-
-			/*--- The first line is the header (General description) ---*/
-
-			getline (restart_file, text_line);
-
-			/*--- Space for the solution ---*/
-
-			for (iPoint_Global = 0; iPoint_Global < geometry->GetGlobal_nPointDomain(); iPoint_Global++ ) {
-
-				getline (restart_file, text_line);
-
-			}
-
-			/*--- Space for extra info (if any) ---*/
-
-			while (getline (restart_file, text_line)) {
-
-				/*--- External iteration ---*/
-
-				position = text_line.find ("EXT_ITER=",0);
-				if (position != string::npos) {
-					text_line.erase (0,9); InnerIter_ = atoi(text_line.c_str());
-				}
-
-				/*--- Angle of attack ---*/
-
-				position = text_line.find ("AOA=",0);
-				if (position != string::npos) {
-					text_line.erase (0,4); AoA_ = atof(text_line.c_str());
-				}
-
-				/*--- Sideslip angle ---*/
-
-				position = text_line.find ("SIDESLIP_ANGLE=",0);
-				if (position != string::npos) {
-					text_line.erase (0,15); AoS_ = atof(text_line.c_str());
-				}
-
-				/*--- BCThrust angle ---*/
-
-				position = text_line.find ("INITIAL_BCTHRUST=",0);
-				if (position != string::npos) {
-					text_line.erase (0,17); BCThrust_ = atof(text_line.c_str());
-				}
-
-				if (adjoint_run) {
-
-					if (config->GetEval_dOF_dCX() == true) {
-
-						/*--- dCD_dCL coefficient ---*/
-
-       position = text_line.find ("DCD_DCL_VALUE=",0);
-       if (position != string::npos) {
-         text_line.erase (0,14); dCD_dCL_ = atof(text_line.c_str());
-       }
-       
-       /*--- dCMx_dCL coefficient ---*/
-       
-       position = text_line.find ("DCMX_DCL_VALUE=",0);
-       if (position != string::npos) {
-         text_line.erase (0,15); dCMx_dCL_ = atof(text_line.c_str());
-       }
-       
-       /*--- dCMy_dCL coefficient ---*/
-       
-       position = text_line.find ("DCMY_DCL_VALUE=",0);
-       if (position != string::npos) {
-         text_line.erase (0,15); dCMy_dCL_ = atof(text_line.c_str());
-       }
-       
-       /*--- dCMz_dCL coefficient ---*/
-       
-       position = text_line.find ("DCMZ_DCL_VALUE=",0);
-       if (position != string::npos) {
-         text_line.erase (0,15); dCMz_dCL_ = atof(text_line.c_str());
-       }
-       
-					}
-
-				}
-
-			}
-
-
-			/*--- Close the restart meta file. ---*/
-
-			restart_file.close();
-
-		}
-	}
+    /*--- Close the restart meta file. ---*/
+    
+    restart_file.close();
+    
+  }
+  
 
 	/*--- Load the metadata. ---*/
 

From 277e00d9e40c431f8497eadc6b55c35cecf40330 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:07:59 +0200
Subject: [PATCH 451/539] adapted FSI cases

---
 TestCases/fea_fsi/dyn_fsi/config.cfg          | 2 +-
 TestCases/fea_fsi/stat_fsi/config.cfg         | 2 +-
 TestCases/fea_fsi/stat_fsi/config_restart.cfg | 2 +-
 TestCases/parallel_regression.py              | 6 +++---
 TestCases/serial_regression.py                | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TestCases/fea_fsi/dyn_fsi/config.cfg b/TestCases/fea_fsi/dyn_fsi/config.cfg
index 054d41d1bfa4..00f2925f0157 100644
--- a/TestCases/fea_fsi/dyn_fsi/config.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/config.cfg
@@ -17,7 +17,7 @@ MULTIZONE_MESH = NO
 TIME_DOMAIN = YES
 TIME_ITER = 5
 TIME_STEP = 0.005
-SCREEN_OUTPUT= (TIME_ITER, OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
+SCREEN_OUTPUT= (TIME_ITER, OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0])
 RESTART_SOL= YES
 RESTART_ITER = 2 
 
diff --git a/TestCases/fea_fsi/stat_fsi/config.cfg b/TestCases/fea_fsi/stat_fsi/config.cfg
index da0a8298ce67..8e74726c7a91 100755
--- a/TestCases/fea_fsi/stat_fsi/config.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config.cfg
@@ -16,7 +16,7 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0])
 RESTART_SOL= NO
 RESTART_ITER = 0
 
diff --git a/TestCases/fea_fsi/stat_fsi/config_restart.cfg b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
index 36a2d85887e0..fa395744db71 100755
--- a/TestCases/fea_fsi/stat_fsi/config_restart.cfg
+++ b/TestCases/fea_fsi/stat_fsi/config_restart.cfg
@@ -16,7 +16,7 @@ MULTIZONE_SOLVER = BLOCK_GAUSS_SEIDEL
 MARKER_ZONE_INTERFACE = (wallF, wallS)
 
 MULTIZONE_MESH = NO
-SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0], LINSOL_ITER[1])
+SCREEN_OUTPUT=(OUTER_ITER, BGS_DENSITY[0], AVG_BGS_RES[1], DEFORM_MIN_VOLUME[0], DEFORM_ITER[0])
 RESTART_SOL= YES
 RESTART_ITER = 0
 TIME_DOMAIN = NO
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 82a89f4eb334..0cd5add28e9d 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -1073,7 +1073,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-3.307431, -4.955885, 4.1224e-08, 46.0000, 71.00000] #last 5 columns
+    stat_fsi.test_vals = [-3.307431, -4.955885, 4.1224e-08, 46.0000] #last 5 columns
     stat_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
@@ -1085,7 +1085,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [ -4.413916, -4.837043, 4.7367e-08, 64.0000,  39.00000] #last 5 columns
+    dyn_fsi.test_vals = [ -4.413916, -4.837043, 4.7367e-08, 64.0000] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
@@ -1098,7 +1098,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-3.388879, -4.968790, 4.1230e-08, 46.00000, 103.0000] #last 5 columns
+    stat_fsi_restart.test_vals = [-3.388879, -4.968790, 4.1230e-08, 46.00000] #last 5 columns
     stat_fsi_restart.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi_restart.multizone = True
     stat_fsi_restart.timeout   = 1600
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 54ceae078f49..67aef367d55a 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -1157,7 +1157,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-3.316390, -4.968266, 4.1223e-08, 47, 111] #last 5 columns
+    stat_fsi.test_vals = [-3.316390, -4.968266, 4.1223e-08, 47] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
     stat_fsi.timeout   = 1600
     stat_fsi.multizone = True
@@ -1169,7 +1169,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [ -3.384533, -5.026176, 4.1231e-08, 47, 148] #last 5 columns
+    stat_fsi_restart.test_vals = [ -3.384533, -5.026176, 4.1231e-08, 47] #last 5 columns
     stat_fsi_restart.multizone = True
     stat_fsi_restart.su2_exec  = "SU2_CFD"
     stat_fsi_restart.timeout   = 1600
@@ -1181,7 +1181,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [ -4.413915, -4.837076, 4.7367e-08, 59, 33] #last 5 columns
+    dyn_fsi.test_vals = [ -4.413915, -4.837076, 4.7367e-08, 59] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"

From b1afd1375e7d008bfaca925b5d7281712578d190 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:08:31 +0200
Subject: [PATCH 452/539] Adapted unst inc case

---
 .../nPoly4/fem_unst_cylinder.cfg              |  1 +
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |  2 ++
 TestCases/parallel_regression.py              |  2 +-
 TestCases/serial_regression.py                |  2 +-
 .../config_incomp_turb_sa.cfg                 | 36 ++++++++-----------
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index b57e083215a6..68e143119d8e 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -23,6 +23,7 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= YES
 %
+RESTAR_ITER=1
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 59df22f7e477..9185aa26d4d7 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -23,6 +23,8 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= YES
 %
+RESTART_ITER= 1
+
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
 
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 0cd5add28e9d..ccb808ff4716 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -813,7 +813,7 @@ def main():
     unst_inc_turb_naca0015_sa.cfg_dir   = "unsteady/pitching_naca0015_rans_inc"
     unst_inc_turb_naca0015_sa.cfg_file  = "config_incomp_turb_sa.cfg"
     unst_inc_turb_naca0015_sa.test_iter = 1
-    unst_inc_turb_naca0015_sa.test_vals = [-3.735742, -7.020535, 1.185211, 0.283184] #last 4 columns
+    unst_inc_turb_naca0015_sa.test_vals = [-2.990702, -6.861616, 1.475736, 0.419771] #last 4 columns
     unst_inc_turb_naca0015_sa.su2_exec  = "parallel_computation.py -f"
     unst_inc_turb_naca0015_sa.timeout   = 1600
     unst_inc_turb_naca0015_sa.tol       = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 67aef367d55a..6d6f4178188a 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -868,7 +868,7 @@ def main():
     unst_inc_turb_naca0015_sa.cfg_dir   = "unsteady/pitching_naca0015_rans_inc"
     unst_inc_turb_naca0015_sa.cfg_file  = "config_incomp_turb_sa.cfg"
     unst_inc_turb_naca0015_sa.test_iter = 1
-    unst_inc_turb_naca0015_sa.test_vals = [-3.734989, -7.016510, 1.176112, 0.282917] #last 4 columns
+    unst_inc_turb_naca0015_sa.test_vals = [ -2.994996, -6.865786, 1.434864, 0.416627] #last 4 columns
     unst_inc_turb_naca0015_sa.su2_exec  = "SU2_CFD"
     unst_inc_turb_naca0015_sa.timeout   = 1600
     unst_inc_turb_naca0015_sa.tol       = 0.00001
diff --git a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
index 7905138ebaef..ea4e0c9dd6df 100644
--- a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
+++ b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
@@ -7,19 +7,14 @@ RESTART_SOL= NO
 
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
-UNST_TIMESTEP= 0.016849% 25 time steps per period
-UNST_TIME= 2.528% 6 periods
-%
-% Old driver
-EXT_ITER= 151
-UNST_INT_ITER= 201
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_STEP= 0.016849% 25 time steps per period
+MAX_TIME= 2.528% 6 periods
 %
 % New driver
-%SINGLEZONE_DRIVER= YES
-%TIME_DOMAIN= YES
-%TIME_ITER= 151
-%ITER= 201
+TIME_DOMAIN= YES
+TIME_ITER= 2
+INNER_ITER= 50
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
 GRID_MOVEMENT= RIGID_MOTION
@@ -98,31 +93,28 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-CONV_CRITERIA= RESIDUAL
-RESIDUAL_REDUCTION= 3
-RESIDUAL_MINVAL= -12
-STARTCONV_ITER= 1
-CAUCHY_ELEMS= 100
-CAUCHY_FUNC_FLOW= DRAG
+CONV_RESIDUAL_MINVAL= -12
+CONV_STARTITER= 1
+CONV_CAUCHY_ELEMS= 100
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
 MESH_FILENAME= mesh_naca0015_ogrid_m151_cvc_v2_147.su2
 MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 OUTPUT_FORMAT= PARAVIEW_BINARY
 CONV_FILENAME= history
-RESTART_FLOW_FILENAME= solution_flow.dat
+RESTART_FILENAME= solution_flow.dat
 RESTART_ADJ_FILENAME= solution_adj.dat
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 WRT_SOL_FREQ= 100
 WRT_SOL_FREQ_DUALTIME= 1
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 10
-
+SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)

From 51e650d32d52c3517e41bdcc04c25cfe63a869f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:08:50 +0200
Subject: [PATCH 453/539] Changed travis to checkout test cases branch

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92da0b1a3ece..09224bc7c3da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,11 +72,11 @@ install:
 
 before_script:
     # Get the test cases
-    - git clone -b develop https://github.com/su2code/TestCases.git ./TestData
+    - git clone --depth=1 -b feature_input_output https://github.com/su2code/TestCases.git ./TestData
     - cp -R ./TestData/* ./TestCases/
 
     # Get the tutorial cases
-    - git clone -b feature_input_output https://github.com/su2code/su2code.github.io ./Tutorials
+    - git clone --depth=1 -b feature_input_output https://github.com/su2code/su2code.github.io ./Tutorials
     
     # Enter the SU2/TestCases/ directory, which is now ready to run
     - cd TestCases/

From 490941e7cf3c88a7e4fbf0f5bd107210774b17fc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:48:00 +0200
Subject: [PATCH 454/539] Fixing warnings

---
 SU2_CFD/src/drivers/CDriver.cpp                            | 4 ++--
 SU2_CFD/src/drivers/CMultizoneDriver.cpp                   | 7 -------
 SU2_CFD/src/integration_time.cpp                           | 4 +---
 SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp | 2 +-
 SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp       | 2 +-
 SU2_CFD/src/solver_direct_elasticity.cpp                   | 7 ++-----
 SU2_CFD/src/solver_direct_mean.cpp                         | 4 +---
 7 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 3e4197e278ed..a8c49a356f76 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -5019,7 +5019,7 @@ CFSIDriver::CFSIDriver(char* confFile,
   unsigned short iVar;
   unsigned short nVar_Flow = 0, nVar_Struct = 0;
 
-  unsigned short iZone;
+//  unsigned short iZone;
 //  for (iZone = 0; iZone < nZone; iZone++){
 //    switch (config_container[iZone]->GetKind_Solver()) {
 //       case RANS: case EULER: case NAVIER_STOKES:
@@ -6725,7 +6725,7 @@ bool CDiscAdjFSIDriver::CheckConvergence(unsigned long IntIter,
 
   bool adjoint_convergence = false;
 
-  su2double residual_1, residual_2;
+//  su2double residual_1, residual_2;
 
 //  if (kind_recording == FLOW_CONS_VARS) {
 
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 0779c25c898e..8f35a0937e32 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -399,13 +399,6 @@ void CMultizoneDriver::Corrector(unsigned short val_iZone) {
 }
 
 bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
-
-  int rank = MASTER_NODE;
-#ifdef HAVE_MPI
-  int size;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &size);
-#endif
   
   /*--- Update the residual for the all the zones ---*/
   
diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp
index 8ed34c0aab14..78b93d3fecc6 100644
--- a/SU2_CFD/src/integration_time.cpp
+++ b/SU2_CFD/src/integration_time.cpp
@@ -692,9 +692,7 @@ void CMultiGridIntegration::SetRestricted_Gradient(unsigned short RunTime_EqSyst
 void CMultiGridIntegration::NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container,
                                                       CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem, 
                                                       su2double *monitor) {
-  
-  const unsigned short nDim = geometry[FinestMesh]->GetnDim();
-  
+    
   switch (RunTime_EqSystem) {
       
     case RUNTIME_FLOW_SYS:
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index d6b0a6fdc744..9e359375fee1 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -5,7 +5,7 @@
 #include <set>
 
 CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  time_iter(time_iter), timestep(timestep), CFileWriter(fields, ".szplt", nDim){}
+  CFileWriter(fields, ".szplt", nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){}
 
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 004ca97cf679..b3c629181776 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,7 +1,7 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
 CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  time_iter(time_iter), timestep(timestep), CFileWriter(fields, ".dat", nDim){}
+   CFileWriter(fields, ".dat", nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotFileWriter::~CTecplotFileWriter(){}
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 3fdd1d1379a3..377b3fcaa1e5 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -108,7 +108,7 @@ CFEASolver::CFEASolver(CGeometry *geometry, CConfig *config) : CSolver() {
   
   unsigned long iPoint;
   unsigned short iVar, jVar, iDim, jDim;
-  unsigned short iTerm, iKind;
+  unsigned short iTerm;
 
   bool dynamic = (config->GetTime_Domain());              // Dynamic simulations.
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);  // Nonlinear analysis.
@@ -2135,12 +2135,9 @@ void CFEASolver::Postprocessing(CGeometry *geometry, CSolver **solver_container,
   unsigned short iVar;
   unsigned long iPoint, total_index;
   
-  bool first_iter = (config->GetInnerIter() == 0);
   bool nonlinear_analysis = (config->GetGeometricConditions() == LARGE_DEFORMATIONS);    // Nonlinear analysis.
   bool disc_adj_fem = (config->GetKind_Solver() == DISC_ADJ_FEM);
-  
-  su2double solNorm = 0.0, solNorm_recv = 0.0;
-  
+    
   if (disc_adj_fem) {
 
     if (nonlinear_analysis) {
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 5a3355cfcbf5..ef8484a4f743 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -179,8 +179,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
   bool roe_turkel = (config->GetKind_Upwind_Flow() == TURKEL);
   bool rans = (config->GetKind_Turb_Model() != NONE);
   unsigned short direct_diff = config->GetDirectDiff();
-  int Unst_RestartIter;
-  unsigned short iZone = config->GetiZone();
+  int Unst_RestartIter = 0;
   bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
                     (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
@@ -14160,7 +14159,6 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
   unsigned short nZone = geometry->GetnZone();
   bool restart    = (config->GetRestart() || config->GetRestart_Flow());
   int Unst_RestartIter;
-  unsigned short iZone = config->GetiZone();
   bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
                     (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;

From ba8dbd3962e0aa24b6b91a62cd9e747ac4d80281 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 15:48:36 +0200
Subject: [PATCH 455/539] Small fix

---
 .../UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 68e143119d8e..56622cb4c21d 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -23,7 +23,7 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= YES
 %
-RESTAR_ITER=1
+RESTART_ITER=1
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%

From 84ff015849b8bfb5abc07bfa4dec5f7064c8742e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 17:28:11 +0200
Subject: [PATCH 456/539] Couple of fixes

---
 .../src/output/filewriter/CSU2FileWriter.cpp  |  4 +-
 SU2_CFD/src/solver_structure.cpp              | 12 ++----
 SU2_PY/SU2/io/tools.py                        | 18 +++++++++
 TestCases/parallel_regression.py              | 40 +++++++++----------
 TestCases/serial_regression.py                | 20 +++++-----
 5 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index a3c8fe574c58..3eb488717b22 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -39,8 +39,8 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     restart_file.precision(15);
     restart_file << "\"PointID\"";
     for (iVar = 0; iVar < fieldnames.size()-1; iVar++)
-      restart_file << ", \"" << fieldnames[iVar] << "\"";
-    restart_file << ", \"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
+      restart_file << ",\"" << fieldnames[iVar] << "\"";
+    restart_file << ",\"" << fieldnames[fieldnames.size()-1] << "\"" << endl;
     restart_file.close();
   }
   
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 82e0b7558a30..24c6efed71b3 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3976,8 +3976,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
   int Unst_RestartIter;
   ifstream restart_file_n;
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry->GetnZone();
+
   string filename = config->GetSolution_FileName();
   string filename_n;
 
@@ -3991,18 +3990,13 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
   unsigned long iPoint_Global_Local = 0, iPoint_Global = 0;
   unsigned short rbuf_NotMatching, sbuf_NotMatching;
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-
-  if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
-
   /*--- First, we load the restart file for time n ---*/
 
   /*-------------------------------------------------------------------------------------------*/
 
   /*--- Modify file name for an unsteady restart ---*/
   Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
-  filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
+  filename_n = config->GetFilename(filename, ".csv", Unst_RestartIter);
 
   /*--- Open the restart file, throw an error if this fails. ---*/
 
@@ -4073,7 +4067,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
     /*--- Modify file name for an unsteady restart ---*/
     Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
-    filename_n1 = config->GetUnsteady_FileName(filename, Unst_RestartIter, ".dat");
+    filename_n1 = config->GetFilename(filename, ".csv", Unst_RestartIter);
 
     /*--- Open the restart file, throw an error if this fails. ---*/
 
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index cfd2359df68a..862b9d0d655f 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -1166,7 +1166,16 @@ def restart2solution(config,state={}):
     if config.MATH_PROBLEM == 'DIRECT':
         restart  = config.RESTART_FILENAME
         solution = config.SOLUTION_FILENAME
+        restart = restart.split('.')[0]
+        solution = solution.split('.')[0]
         
+        if config.get('WRT_BINARY_RESTART', 'YES') == 'NO':
+            restart += '.csv'
+            solution += '.csv'
+        else:
+            restart += '.dat'
+            solution += '.dat'
+
         # expand zones
         restarts  = expand_zones(restart,config)
         solutions = expand_zones(solution,config)
@@ -1183,6 +1192,15 @@ def restart2solution(config,state={}):
     elif any([config.MATH_PROBLEM == 'CONTINUOUS_ADJOINT', config.MATH_PROBLEM == 'DISCRETE_ADJOINT']):
         restart  = config.RESTART_ADJ_FILENAME
         solution = config.SOLUTION_ADJ_FILENAME           
+        restart = restart.split('.')[0]
+        solution = solution.split('.')[0]
+
+        if config.get('WRT_BINARY_RESTART', 'YES') == 'NO':
+            restart += '.csv'
+            solution += '.csv'
+        else:
+            restart += '.dat'
+            solution += '.dat'
         # add suffix
         func_name = config.OBJECTIVE_FUNCTION
         suffix    = get_adjointSuffix(func_name)
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index ccb808ff4716..d2d8867810fb 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -96,16 +96,16 @@ def main():
     oneram6.tol       = 0.00001
     test_list.append(oneram6)
 
-#    # Fixed CL NACA0012
-#    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
-#    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-#    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
-#    fixedCL_naca0012.test_iter = 100
-#    fixedCL_naca0012.test_vals = [-2.474140, 2.927471, 0.290169, 0.019080] #last 4 columns
-#    fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
-#    fixedCL_naca0012.timeout   = 1600
-#    fixedCL_naca0012.tol       = 0.00001
-#    test_list.append(fixedCL_naca0012)
+    # Fixed CL NACA0012
+    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
+    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
+    fixedCL_naca0012.test_iter = 100
+    fixedCL_naca0012.test_vals = [-2.474140, 2.927471, 0.290169, 0.019080] #last 4 columns
+    fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
+    fixedCL_naca0012.timeout   = 1600
+    fixedCL_naca0012.tol       = 0.00001
+    test_list.append(fixedCL_naca0012)
     
     # Polar sweep of the inviscid NACA0012
     polar_naca0012           = TestCase('polar_naca0012')
@@ -558,16 +558,16 @@ def main():
     contadj_wedge.tol       = 0.00001
     test_list.append(contadj_wedge)
 
-#    # Inviscid fixed CL NACA0012
-#    contadj_fixed_CL_naca0012           = TestCase('contadj_fixedcl_naca0012')
-#    contadj_fixed_CL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-#    contadj_fixed_CL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
-#    contadj_fixed_CL_naca0012.test_iter = 100
-#    contadj_fixed_CL_naca0012.test_vals = [0.378865, -5.157403, 0.268320, -0.000149] #last 4 columns
-#    contadj_fixed_CL_naca0012.su2_exec  = "parallel_computation.py -f"
-#    contadj_fixed_CL_naca0012.timeout   = 1600
-#    contadj_fixed_CL_naca0012.tol       = 0.00001
-#    test_list.append(contadj_fixed_CL_naca0012)
+    # Inviscid fixed CL NACA0012
+    contadj_fixed_CL_naca0012           = TestCase('contadj_fixedcl_naca0012')
+    contadj_fixed_CL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+    contadj_fixed_CL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
+    contadj_fixed_CL_naca0012.test_iter = 100
+    contadj_fixed_CL_naca0012.test_vals = [0.378865, -5.157403, 0.268320, -0.000149] #last 4 columns
+    contadj_fixed_CL_naca0012.su2_exec  = "parallel_computation.py -f"
+    contadj_fixed_CL_naca0012.timeout   = 1600
+    contadj_fixed_CL_naca0012.tol       = 0.00001
+    test_list.append(contadj_fixed_CL_naca0012)
 
     ###################################
     ### Cont. adj. compressible N-S ###
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 6d6f4178188a..1de122c429cc 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -596,16 +596,16 @@ def main():
     test_list.append(contadj_wedge)
     
     # Inviscid fixed CL NACA0012
-#    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
-#    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-#    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
-#    contadj_fixedCL_naca0012.test_iter = 100
-#    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
-#    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
-#    contadj_fixedCL_naca0012.new_output= True
-#    contadj_fixedCL_naca0012.timeout   = 1600
-#    contadj_fixedCL_naca0012.tol       = 0.00001
-#    test_list.append(contadj_fixedCL_naca0012)
+    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
+    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
+    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
+    contadj_fixedCL_naca0012.test_iter = 100
+    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
+    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
+    contadj_fixedCL_naca0012.new_output= True
+    contadj_fixedCL_naca0012.timeout   = 1600
+    contadj_fixedCL_naca0012.tol       = 0.00001
+    test_list.append(contadj_fixedCL_naca0012)
 
     ###################################
     ### Cont. adj. compressible N-S ###

From 51b3b91169b6983cb0f7e5c35a2637529fd22acf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 6 Sep 2019 17:37:49 +0200
Subject: [PATCH 457/539] Small fix for AD compilation

---
 SU2_CFD/src/solver_structure.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 24c6efed71b3..816b9d6568c6 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -4278,7 +4278,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
       /*--- Store the solution (starting with node coordinates) --*/
 
       for (iVar = 0; iVar < Restart_Vars[1]; iVar++)
-        Restart_Data[counter*Restart_Vars[1] + iVar] = PrintingToolbox::stod(point_line[iVar+1]);
+        Restart_Data[counter*Restart_Vars[1] + iVar] = SU2_TYPE::GetValue(PrintingToolbox::stod(point_line[iVar+1]));
 
       /*--- Increment our local point counter. ---*/
 

From 6e1d9a0c2544c4611b7b5703e5fa67917a6e5bad Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 9 Sep 2019 15:10:22 +0200
Subject: [PATCH 458/539] Fix for meta data file

---
 SU2_CFD/src/solver_direct_mean.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index ef8484a4f743..17019edf5da2 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -218,7 +218,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, unsigned short
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     }
     
-    filename_ = config->GetFilename(filename_, "meta", Unst_RestartIter);
+    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
 
     /*--- Read and store the restart metadata. ---*/
 
@@ -14199,7 +14199,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     }
     
-    filename_ = config->GetFilename(filename_, "meta", Unst_RestartIter);
+    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
 
     /*--- Read and store the restart metadata. ---*/
 

From 590a0b7138e8cf01afdf7a9f36a2f532aae801e2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 10 Sep 2019 10:18:24 +0200
Subject: [PATCH 459/539] Fix Restart_OldGeometry

---
 SU2_CFD/src/solver_structure.cpp | 33 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 816b9d6568c6..5aede76a123c 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -4017,7 +4017,7 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
     
     getline (restart_file_n, text_line);
     
-    istringstream point_line(text_line);
+    vector<string> point_line = PrintingToolbox::split(text_line, ',');
 
     /*--- Retrieve local index. If this node from the restart file lives
      on the current processor, we will load and instantiate the vars. ---*/
@@ -4025,10 +4025,12 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
     iPoint_Local = geometry->GetGlobal_to_Local_Point(iPoint_Global);
 
     if (iPoint_Local > -1) {
-
-      if (nDim == 2) point_line >> index >> Coord[0] >> Coord[1];
-      if (nDim == 3) point_line >> index >> Coord[0] >> Coord[1] >> Coord[2];
-
+      
+      Coord[0] = PrintingToolbox::stod(point_line[1]);
+      Coord[1] = PrintingToolbox::stod(point_line[2]);
+      if (nDim == 3){
+        Coord[2] = PrintingToolbox::stod(point_line[3]);          
+      } 
       geometry->node[iPoint_Local]->SetCoord_n(Coord);
 
       iPoint_Global_Local++;
@@ -4071,8 +4073,8 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
     /*--- Open the restart file, throw an error if this fails. ---*/
 
-    restart_file_n.open(filename_n1.data(), ios::in);
-    if (restart_file_n.fail()) {
+    restart_file_n1.open(filename_n1.data(), ios::in);
+    if (restart_file_n1.fail()) {
         SU2_MPI::Error(string("There is no flow restart file ") + filename_n1, CURRENT_FUNCTION);
 
     }
@@ -4083,23 +4085,26 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
     /*--- Read all lines in the restart file ---*/
     /*--- The first line is the header ---*/
 
-    getline (restart_file_n, text_line);
+    getline (restart_file_n1, text_line);
 
     for (iPoint_Global = 0; iPoint_Global < geometry->GetGlobal_nPointDomain(); iPoint_Global++ ) {
       
-      getline (restart_file_n, text_line);
-      
-      istringstream point_line(text_line);
+      getline (restart_file_n1, text_line);
 
+      vector<string> point_line = PrintingToolbox::split(text_line, ',');
+      
       /*--- Retrieve local index. If this node from the restart file lives
        on the current processor, we will load and instantiate the vars. ---*/
 
       iPoint_Local = geometry->GetGlobal_to_Local_Point(iPoint_Global);
 
       if (iPoint_Local > -1) {
-
-        if (nDim == 2) point_line >> index >> Coord[0] >> Coord[1];
-        if (nDim == 3) point_line >> index >> Coord[0] >> Coord[1] >> Coord[2];
+        
+        Coord[0] = PrintingToolbox::stod(point_line[1]);
+        Coord[1] = PrintingToolbox::stod(point_line[2]);
+        if (nDim == 3){
+          Coord[2] = PrintingToolbox::stod(point_line[3]);          
+        } 
 
         geometry->node[iPoint_Local]->SetCoord_n1(Coord);
 

From 6d8128dfaf4afde956718d23b793977093a62ccf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 10 Sep 2019 13:12:17 +0200
Subject: [PATCH 460/539] some fixes for reading restart files

---
 Common/src/geometry_structure.cpp        |  5 ++++-
 SU2_CFD/src/solver_direct_elasticity.cpp | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index d4b57592fcc1..7e4d74f08c2f 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -13578,9 +13578,10 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
 
   filename = config->GetObjFunc_Extension(filename);
   
-  filename = config->GetFilename(filename, ".dat", nTimeIter-1);
 
   if (config->GetRead_Binary_Restart()) {
+    
+    filename = config->GetFilename(filename, ".dat", nTimeIter-1);
 
     char str_buf[CGNS_STRING_SIZE], fname[100];
     unsigned short iVar;
@@ -13874,6 +13875,8 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     config->SetAoA_Sens(Restart_Meta[4]);
 
   } else {
+    
+    filename = config->GetFilename(filename, ".csv", nTimeIter-1);
 
     /*--- First, check that this is not a binary restart file. ---*/
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 377b3fcaa1e5..478113be2ebd 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -858,7 +858,7 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".dat");
+    filename = config->GetMultizone_FileName(filename, iZone, ".csv");
 
   reference_file.open(filename.data(), ios::in);
 
@@ -896,7 +896,8 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
   getline (reference_file, text_line);
 
   while (getline (reference_file, text_line)) {
-    istringstream point_line(text_line);
+    
+    vector<string> point_line = PrintingToolbox::split(text_line, ',');
 
     /*--- Retrieve local index. If this node from the restart file lives
        on a different processor, the value of iPoint_Local will be -1.
@@ -906,9 +907,15 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
     iPoint_Local = Global2Local[iPoint_Global];
 
     if (iPoint_Local >= 0) {
-
-      if (nDim == 2) point_line >> index >> dull_val >> dull_val >> Solution[0] >> Solution[1];
-      if (nDim == 3) point_line >> index >> dull_val >> dull_val >> dull_val >> Solution[0] >> Solution[1] >> Solution[2];
+      
+      if (nDim == 2){
+        Solution[0] = PrintingToolbox::stod(point_line[3]);
+        Solution[1] = PrintingToolbox::stod(point_line[4]);
+      } else {
+        Solution[0] = PrintingToolbox::stod(point_line[4]);
+        Solution[1] = PrintingToolbox::stod(point_line[5]);
+        Solution[2] = PrintingToolbox::stod(point_line[6]);        
+      }
 
       for (iVar = 0; iVar < nVar; iVar++) node[iPoint_Local]->SetReference_Geometry(iVar, Solution[iVar]);
 

From e18b4fe49220de851bcbfa91437a17502dcff8f5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 10 Sep 2019 13:16:33 +0200
Subject: [PATCH 461/539] Fix missing include

---
 SU2_CFD/src/solver_direct_elasticity.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 478113be2ebd..6f2e9228bf6d 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -39,6 +39,7 @@
 #include "../include/variables/CFEAFSIBoundVariable.hpp"
 #include "../include/variables/CFEABoundVariable.hpp"
 #include "../include/variables/CFEAVariable.hpp"
+#include "../include/toolboxes/printing_toolbox.hpp"
 #include <algorithm>
 
 CFEASolver::CFEASolver(bool mesh_deform_mode) : CSolver(mesh_deform_mode) {

From 1713a4acedb9c1084e59cfa5ef7b4c052bd1165b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 11 Sep 2019 11:30:19 +0200
Subject: [PATCH 462/539] Added output file list option.

---
 Common/include/config_structure.hpp           |  24 +-
 Common/include/config_structure.inl           |   5 +
 Common/include/option_structure.hpp           |  34 +-
 Common/src/config_structure.cpp               |  12 +-
 SU2_CFD/include/output/COutput.hpp            |  15 +-
 .../output/filewriter/CCSVFileWriter.hpp      |   4 +-
 .../include/output/filewriter/CFileWriter.hpp |  16 +-
 .../filewriter/CParaviewBinaryFileWriter.hpp  |   9 +-
 .../output/filewriter/CParaviewFileWriter.hpp |   7 +-
 .../filewriter/CSU2BinaryFileWriter.hpp       |   9 +-
 .../output/filewriter/CSU2FileWriter.hpp      |   9 +-
 .../output/filewriter/CSU2MeshFileWriter.hpp  |   8 +-
 .../filewriter/CTecplotBinaryFileWriter.hpp   |   8 +-
 .../output/filewriter/CTecplotFileWriter.hpp  |  10 +-
 SU2_CFD/src/drivers/CMultizoneDriver.cpp      | 116 +---
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     | 121 +----
 SU2_CFD/src/iteration_structure.cpp           |  81 +--
 SU2_CFD/src/output/CFlowOutput.cpp            |   2 +-
 SU2_CFD/src/output/COutput.cpp                | 498 ++++++++++--------
 .../src/output/filewriter/CCSVFileWriter.cpp  |  17 +-
 .../output/filewriter/CParallelDataSorter.cpp |   8 +-
 .../output/filewriter/CParallelFileWriter.cpp |  12 +-
 .../filewriter/CParaviewBinaryFileWriter.cpp  | 197 ++++---
 .../output/filewriter/CParaviewFileWriter.cpp | 119 +++--
 .../filewriter/CSU2BinaryFileWriter.cpp       |  25 +-
 .../src/output/filewriter/CSU2FileWriter.cpp  |  25 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  93 ++--
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  21 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      |  39 +-
 .../filewriter/CTecplotBinaryFileWriter.cpp   | 282 +++++-----
 .../output/filewriter/CTecplotFileWriter.cpp  |  92 ++--
 .../src/output/output_structure_legacy.cpp    | 111 +---
 SU2_DEF/src/SU2_DEF.cpp                       |  56 +-
 SU2_DOT/src/SU2_DOT.cpp                       |  16 +-
 SU2_PY/SU2/io/config.py                       |  16 +-
 SU2_PY/SU2/io/tools.py                        |   7 +-
 SU2_SOL/src/SU2_SOL.cpp                       | 112 ++--
 37 files changed, 1009 insertions(+), 1227 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 9b75c7830fab..aa59a62f8e6a 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -1067,6 +1067,10 @@ class CConfig {
   su2double *default_wrt_freq;
   unsigned long HistoryWrtFreq[3],    /*!< \brief Array containing history writing frequencies for timer iter, outer iter, inner iter */
                 ScreenWrtFreq[3];     /*!< \brief Array containing screen writing frequencies for timer iter, outer iter, inner iter */
+  unsigned long VolumeWrtFreq;    /*!< \brief Writing frequency for solution files. */
+  unsigned short* VolumeOutputFiles; /*!< \brief File formats to output */
+  unsigned short nVolumeOutputFiles; /*!< \brief Number of File formats to output */
+  
   bool Multizone_Mesh;          /*!< \brief Determines if the mesh contains multiple zones. */
   bool SinglezoneDriver;        /*!< \brief Determines if the single-zone driver is used. (TEMPORARY) */
   bool Wrt_ZoneConv;            /*!< \brief Write the convergence history of each individual zone to screen. */
@@ -9176,7 +9180,25 @@ class CConfig {
    * \return 
    */
   unsigned long GetScreen_Wrt_Freq(unsigned short iter);
-
+  
+  /*!
+   * \brief GetScreen_Wrt_Freq_Inner
+   * \return 
+   */
+  unsigned long GetVolume_Wrt_Freq();
+  
+  /*!
+   * \brief GetVolumeOutputFiles
+   * \return 
+   */
+  unsigned short* GetVolumeOutputFiles();
+  
+  /*!
+   * \brief GetnVolumeOutputFiles
+   * \return 
+   */
+  unsigned short GetnVolumeOutputFiles();
+  
   /*!
    * \brief Get the desired factorization frequency for PaStiX
    * \return Number of calls to 'Build' that trigger re-factorization.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index c8d733e253cf..36fffda58754 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2066,3 +2066,8 @@ inline unsigned long CConfig::GetHistory_Wrt_Freq(unsigned short iter) {return H
 
 inline unsigned long CConfig::GetScreen_Wrt_Freq(unsigned short iter) {return ScreenWrtFreq[iter];}
 
+inline unsigned long CConfig::GetVolume_Wrt_Freq() {return VolumeWrtFreq;}
+
+inline unsigned short* CConfig::GetVolumeOutputFiles() {return VolumeOutputFiles;}
+
+inline unsigned short CConfig::GetnVolumeOutputFiles() {return nVolumeOutputFiles;}
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index ef918a2527dd..4c43d92ce1a0 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1538,26 +1538,32 @@ static const map<string, ENUM_INPUT> Input_Map = CCreateMap<string, ENUM_INPUT>
 enum ENUM_OUTPUT {
   TECPLOT = 1,  		     /*!< \brief Tecplot format for the solution output. */
   TECPLOT_BINARY = 2,    /*!< \brief Tecplot binary format for the solution output. */
-  FIELDVIEW = 3,  		   /*!< \brief FieldView format for the solution output. */
-  FIELDVIEW_BINARY = 4,  /*!< \brief FieldView binary format for the solution output. */
+  SURFACE_TECPLOT = 3,  		     /*!< \brief Tecplot format for the solution output. */
+  SURFACE_TECPLOT_BINARY = 4,    /*!< \brief Tecplot binary format for the solution output. */
   CSV = 5,			         /*!< \brief Comma-separated values format for the solution output. */
-  CGNS_SOL = 6,  	     	 /*!< \brief CGNS format for the solution output. */
+  SURFACE_CSV = 6,			 /*!< \brief Comma-separated values format for the solution output. */  
   PARAVIEW = 7,  		     /*!< \brief Paraview ASCII format for the solution output. */
-  PARAVIEW_BINARY = 8,    /*!< \brief Paraview binary format for the solution output. */
-  SU2_MESH      = 9,      /*!< \brief SU2 mesh format (only used internally). */
-  SU2_RESTART_BINARY = 10,/*!< \brief SU2 binary restart format (only used internally). */
-  SU2_RESTART_ASCII = 11  /*!< \brief SU2 ASCII restart format (only used internally). */
+  PARAVIEW_BINARY = 8,   /*!< \brief Paraview binary format for the solution output. */
+  SURFACE_PARAVIEW = 9,  		     /*!< \brief Paraview ASCII format for the solution output. */
+  SURFACE_PARAVIEW_BINARY = 10,   /*!< \brief Paraview binary format for the solution output. */
+  MESH      = 11,      /*!< \brief SU2 mesh format. */
+  RESTART_BINARY = 12,/*!< \brief SU2 binary restart format. */
+  RESTART_ASCII = 13  /*!< \brief SU2 ASCII restart format. */
 };
 
 static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPUT>
-("TECPLOT", TECPLOT)
-("TECPLOT_BINARY", TECPLOT_BINARY)
-("FIELDVIEW", FIELDVIEW)
-("FIELDVIEW_BINARY", FIELDVIEW_BINARY)
+("TECPLOT_ASCII", TECPLOT)
+("TECPLOT", TECPLOT_BINARY)
+("SURFACE_TECPLOT_ASCII", SURFACE_TECPLOT)
+("SURFACE_TECPLOT", SURFACE_TECPLOT_BINARY)
 ("CSV", CSV)
-("CGNS", CGNS_SOL)
-("PARAVIEW", PARAVIEW)
-("PARAVIEW_BINARY", PARAVIEW_BINARY);
+("SURFACE_CSV", SURFACE_CSV)
+("PARAVIEW_ASCII", PARAVIEW)
+("PARAVIEW", PARAVIEW_BINARY)
+("SURFACE_PARAVIEW_ASCII", SURFACE_PARAVIEW)
+("SURFACE_PARAVIEW", SURFACE_PARAVIEW_BINARY)
+("RESTART_ASCII", RESTART_ASCII)
+("RESTART", RESTART_BINARY);
 
 /*!
  * \brief type of volume sensitivity file formats (inout to SU2_DOT)
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index d91bb5c7c466..d3cfb597ed3d 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2490,7 +2490,10 @@ void CConfig::SetConfig_Options() {
   addUnsignedLongOption("SCREEN_WRT_FREQ_OUTER", ScreenWrtFreq[1], 1); 
   /* DESCRIPTION: Screen writing frequency (TIME_ITER) */
   addUnsignedLongOption("SCREEN_WRT_FREQ_TIME", ScreenWrtFreq[0], 1);
-  
+  /* DESCRIPTION: Volume solution writing frequency */
+  addUnsignedLongOption("OUTPUT_WRT_FREQ", VolumeWrtFreq, 250);
+  /* DESCRIPTION: Volume solution files */  
+  addEnumListOption("OUTPUT_FILES", nVolumeOutputFiles, VolumeOutputFiles, Output_Map);
   
   /* DESCRIPTION: Using Uncertainty Quantification with SST Turbulence Model */
   addBoolOption("USING_UQ", using_uq, false);
@@ -6262,9 +6265,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       case PARAVIEW_BINARY: cout << "The output file format is Paraview binary legacy (.vtk)." << endl; break;
       case TECPLOT: cout << "The output file format is Tecplot ASCII (.dat)." << endl; break;
       case TECPLOT_BINARY: cout << "The output file format is Tecplot binary (.plt)." << endl; break;
-      case FIELDVIEW: cout << "The output file format is FieldView ASCII (.uns)." << endl; break;
-      case FIELDVIEW_BINARY: cout << "The output file format is FieldView binary (.uns)." << endl; break;
-      case CGNS_SOL: cout << "The output file format is CGNS (.cgns)." << endl; break;
     }
 
     cout << "Convergence history file name: " << Conv_FileName << "." << endl;
@@ -6294,9 +6294,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       case PARAVIEW_BINARY: cout << "The output file format is Paraview binary legacy (.vtk)." << endl; break;
       case TECPLOT: cout << "The output file format is Tecplot ASCII (.dat)." << endl; break;
       case TECPLOT_BINARY: cout << "The output file format is Tecplot binary (.plt)." << endl; break;
-      case FIELDVIEW: cout << "The output file format is FieldView ASCII (.uns)." << endl; break;
-      case FIELDVIEW_BINARY: cout << "The output file format is FieldView binary (.uns)." << endl; break;
-      case CGNS_SOL: cout << "The output file format is CGNS (.cgns)." << endl; break;
     }
     cout << "Flow variables file name: " << Volume_FileName << "." << endl;
   }
@@ -7449,6 +7446,7 @@ CConfig::~CConfig(void) {
   if (HistoryOutput != NULL) delete [] HistoryOutput;
   if (VolumeOutput != NULL) delete [] VolumeOutput;
   if (Mesh_Box_Size != NULL) delete [] Mesh_Box_Size;
+  if (VolumeOutputFiles != NULL) delete [] VolumeOutputFiles;
 
 }
 
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 315c2a318f2d..6d27aed07e5d 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -168,6 +168,7 @@ class COutput {
    /*----------------------------- Volume output ----------------------------*/     
    
    CParallelDataSorter* volumeDataSorter;    //!< Volume data sorter
+   CParallelDataSorter* surfaceDataSorter;   //!< Surface data sorter
    
    vector<string> volumeFieldNames;     //!< Vector containing the volume field names
    unsigned short nVolumeFields;        /*!< \brief Number of fields in the volume output */ 
@@ -456,7 +457,9 @@ class COutput {
    * \brief Print a list of all volume output fields to screen.
    */
   void PrintVolumeFields();
-
+  
+  bool SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing = false);
+ 
 protected:
   
   /*----------------------------- Protected member functions ----------------------------*/  
@@ -465,11 +468,10 @@ class COutput {
    * \brief Allocates the appropriate file writer based on the chosen format.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] sorter - The parallel file sorter.
    * \param[out] filewriter - The allocated filewriter.
    * \param[in] format - The output format.
    */
-  void SetFileWriter(CConfig *config, CGeometry *geomery, CParallelDataSorter *sorter, CFileWriter *&filewriter, unsigned short format);  
+  void SetFileWriter(CConfig *config, CGeometry *geomery, CFileWriter *&filewriter, unsigned short format);  
   
   
   /*!
@@ -660,6 +662,13 @@ class COutput {
    */
   virtual bool WriteScreen_Output(CConfig *config);
 
+  /*!
+   * \brief Determines if the screen header should be written.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] Iter - Current iteration index.
+   */
+  virtual bool WriteVolume_Output(CConfig *config, unsigned long Iter);
+  
   /*!
    * \brief Set the values of the volume output fields for a point.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
index 430f1aa4ea76..0f34e3e207cc 100644
--- a/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp
@@ -47,7 +47,7 @@ class CCSVFileWriter final: public CFileWriter{
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
    */  
-  CCSVFileWriter(vector<string> fields, unsigned short nDim);
+  CCSVFileWriter(vector<string> fields, unsigned short nDim, string fileName, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Destructor
@@ -59,7 +59,7 @@ class CCSVFileWriter final: public CFileWriter{
    * \param[in] - The name of the file
    * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CFileWriter.hpp b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
index 0485c71d2e8d..edd3fd0d136f 100644
--- a/SU2_CFD/include/output/filewriter/CFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFileWriter.hpp
@@ -93,6 +93,16 @@ class CFileWriter{
       return rc == 0 ? stat_buf.st_size : -1;
   }
   
+  /*!
+   * \brief Filename
+   */
+  string fileName;
+  
+  /*!
+   * \brief The parallel data sorter
+   */
+  CParallelDataSorter* dataSorter;
+  
 public:
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
@@ -100,7 +110,7 @@ class CFileWriter{
    * \param[in] file_ext - The file extension to be attached to the filename
    * \param[in] nDim - Physical dimension
    */  
-  CFileWriter(std::vector<std::string> fields, string file_ext, unsigned short nDim);
+  CFileWriter(std::vector<std::string> fields, string fileName, CParallelDataSorter* dataSorter, string file_ext, unsigned short nDim);
   
   /*!
    * \brief Destructor
@@ -109,10 +119,8 @@ class CFileWriter{
   
   /*!
    * \brief Write sorted data to file
-   * \param[in] - The name of the file
-   * \param[in] - The parallel sorted data to write
    */
-  virtual void Write_Data(std::string filename, CParallelDataSorter* data_sorter){}
+  virtual void Write_Data(){}
   
   /*!
    * \brief Get the bandwith used for the last writing
diff --git a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
index eeff951a3566..8c575862302f 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
@@ -47,8 +47,11 @@ class CParaviewBinaryFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    */
-  CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim);
+  CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim,
+                            string fileName, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Destructor
@@ -57,10 +60,8 @@ class CParaviewBinaryFileWriter final: public CFileWriter{
   
   /*!
    * \brief Write sorted data to file in paraview binary file format
-   * \param[in] - The name of the file
-   * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 private:
   
diff --git a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
index c8885c4384e8..9976523b1562 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
@@ -46,8 +46,11 @@ class CParaviewFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    */  
-  CParaviewFileWriter(vector<string> fields, unsigned short nDim);
+  CParaviewFileWriter(vector<string> fields, unsigned short nDim, 
+                      string fileName, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Destructor
@@ -59,7 +62,7 @@ class CParaviewFileWriter final: public CFileWriter{
    * \param[in] - The name of the file
    * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
index a587b47f836b..e3503af7a362 100644
--- a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
@@ -47,8 +47,11 @@ class CSU2BinaryFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    */  
-  CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim);
+  CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim, 
+                       string fileName, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Destructor
@@ -57,9 +60,7 @@ class CSU2BinaryFileWriter final: public CFileWriter{
   
   /*!
    * \brief Write sorted data to file in SU2 binary file format
-   * \param[in] - The name of the file
-   * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
diff --git a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
index 4c0f38b0dcaf..3bb4847ac97c 100644
--- a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
@@ -46,8 +46,11 @@ class CSU2FileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    */  
-  CSU2FileWriter(vector<string> fields, unsigned short nDim);
+  CSU2FileWriter(vector<string> fields, unsigned short nDim, 
+                 string fileName, CParallelDataSorter* data_sorter);
   
   /*!
    * \brief Destructor
@@ -56,10 +59,8 @@ class CSU2FileWriter final: public CFileWriter{
   
   /*!
    * \brief Write sorted data to file in SU2 ASCII file format
-   * \param[in] - The name of the file
-   * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
index 5f22b3e6400c..9c0a49c675da 100644
--- a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
@@ -48,10 +48,14 @@ class CSU2MeshFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    * \param[in] iZone - Index of the current zone
    * \param[in] nZone - Number of zones
    */  
-  CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, unsigned short iZone, unsigned short nZone);
+  CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, 
+                     string fileName, CParallelDataSorter* data_sorter,
+                     unsigned short iZone, unsigned short nZone);
   
   /*!
    * \brief Destructor
@@ -63,7 +67,7 @@ class CSU2MeshFileWriter final: public CFileWriter{
    * \param[in] - The name of the file
    * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
 
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
index f2e3109a0095..af114de87908 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -52,8 +52,12 @@ class CTecplotBinaryFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] fileName - The name of the file
+   * \param[in] data_sorter - The parallel sorted data to write
    */  
-  CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, 
+                           string fileName, CParallelDataSorter* data_sorter,
+                           unsigned long time_iter, su2double timestep);
   
   /*!
    * \brief Destructor
@@ -65,7 +69,7 @@ class CTecplotBinaryFileWriter final: public CFileWriter{
    * \param[in] - The name of the file
    * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
   /*!
    * \brief Calculate the partitioning of nodes to determine:
diff --git a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
index 4754ed77ea85..a225fcb5bbd9 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
@@ -49,8 +49,12 @@ class CTecplotFileWriter final: public CFileWriter{
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
+   * \param[in] - The name of the file
+   * \param[in] - The parallel sorted data to write
    */  
-  CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep);
+  CTecplotFileWriter(vector<string> fields, unsigned short nDim,
+                     string fileName, CParallelDataSorter *dataSorter, 
+                     unsigned long time_iter, su2double timestep);
   
   /*!
    * \brief Destructor
@@ -59,10 +63,8 @@ class CTecplotFileWriter final: public CFileWriter{
   
   /*!
    * \brief Write sorted data to file in tecplot ASCII file format
-   * \param[in] - The name of the file
-   * \param[in] - The parallel sorted data to write
    */
-  void Write_Data(string filename, CParallelDataSorter* data_sorter) override;
+  void Write_Data() override;
   
 };
 
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 8f35a0937e32..ed3d2ea95423 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -473,114 +473,18 @@ void CMultizoneDriver::Update() {
 }
 
 void CMultizoneDriver::Output(unsigned long TimeIter) {
-
-  unsigned short RestartFormat = SU2_RESTART_ASCII;
-  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
-  bool TimeDomain = driver_config->GetTime_Domain();
+  
+  
+  bool wrote_files = false;
   
   for (iZone = 0; iZone < nZone; iZone++){
-    
-    bool Wrt_Surf = config_container[iZone]->GetWrt_Srf_Sol();
-    bool Wrt_Vol  = config_container[iZone]->GetWrt_Vol_Sol();
-    bool Wrt_CSV  = config_container[iZone]->GetWrt_Csv_Sol();
-    
-    if (config_container[iZone]->GetWrt_Binary_Restart()){
-      RestartFormat = SU2_RESTART_BINARY;
-    }
-    
-    bool output_files = false;
-    
-    /*--- Determine whether a solution needs to be written
-   after the current iteration ---*/
-    
-    if (
-        
-        /*--- General if statements to print output statements ---*/
-        
-        (TimeIter+1 >= config_container[iZone]->GetnTime_Iter()) || (StopCalc) ||
-        
-        /*--- Unsteady problems ---*/
-        
-        (((config_container[iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
-          (config_container[iZone]->GetTime_Marching() == TIME_STEPPING)) &&
-         ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-        
-        ((config_container[iZone]->GetTime_Marching() == DT_STEPPING_2ND) &&
-         ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0) ||
-                              ((TimeIter-1) % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-        
-        ((config_container[iZone]->GetTime_Marching() == DT_STEPPING_2ND) &&
-         ((TimeIter == 0) || ((TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-        
-        ((config_container[iZone]->GetTime_Domain()) &&
-         ((TimeIter == 0) || (TimeIter % config_container[iZone]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-        
-        /*--- No inlet profile file found. Print template. ---*/
-        
-        (config_container[iZone]->GetWrt_InletFile())
-        
-        ) {
-      
-      output_files = true;
-      
-    }
-    
-//    /*--- Determine whether a solution doesn't need to be written
-//   after the current iteration ---*/
-    
-//    if (config_container[iZone]->GetFixed_CL_Mode()) {
-//      if (config_container[iZone]->GetnExtIter()-config_container[iZone]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-//      if (config_container[iZone]->GetnExtIter() - 1 == ExtIter) output_files = true;
-//    }
-    
-    /*--- write the solution ---*/
-    
-    if (output_files) {
-      
-      /*--- Time the output for performance benchmarking. ---*/
-#ifndef HAVE_MPI
-      StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-      StopTime = MPI_Wtime();
-#endif
-      UsedTimeCompute += StopTime-StartTime;
-#ifndef HAVE_MPI
-      StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-      StartTime = MPI_Wtime();
-#endif
-      
-      if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
-      
-      /*--- Execute the routine for writing restart, volume solution,
-       surface solution, and surface comma-separated value files. ---*/
-      for (unsigned short iInst = 0; iInst < nInst[iZone]; iInst++){
-        
-        config_container[iZone]->SetiInst(iInst);
-        
-        output_container[iZone]->Load_Data(geometry_container[iZone][iInst][MESH_0], config_container[iZone], solver_container[iZone][iInst][MESH_0]);
-        
-        /*--- Write restart files ---*/
-        
-        output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], RestartFormat, TimeDomain);
-        
-        /*--- Write visualization files ---*/
-        
-        if (Wrt_Vol)
-          output_container[iZone]->SetVolume_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat, TimeDomain);
-        
-        if (Wrt_Surf)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], OutputFormat, TimeDomain);
-        if (Wrt_CSV)
-          output_container[iZone]->SetSurface_Output(geometry_container[iZone][iInst][MESH_0], config_container[iZone], CSV, TimeDomain);    
-        
-        output_container[iZone]->DeallocateData_Parallel();
-        
-      }
-      
-      if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
-      
-    }
+    wrote_files = output_container[iZone]->SetResult_Files(geometry_container[iZone][INST_0][MESH_0],
+                                                            config_container[iZone],
+                                                            solver_container[iZone][INST_0][MESH_0], TimeIter, StopCalc);
+  }
+  
+  if (wrote_files){
+
     /*--- Store output time and restart the timer for the compute phase. ---*/
 #ifndef HAVE_MPI
     StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 1e4ab837208d..4f95a97ffde6 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -186,109 +186,12 @@ void CSinglezoneDriver::Update() {
 
 void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
-  bool output_files = false;
   
-  unsigned short RestartFormat = SU2_RESTART_ASCII;
-  unsigned short OutputFormat = config_container[ZONE_0]->GetOutput_FileFormat();
+  bool wrote_files = output_container[ZONE_0]->SetResult_Files(geometry_container[ZONE_0][INST_0][MESH_0],
+                                                               config_container[ZONE_0],
+                                                               solver_container[ZONE_0][INST_0][MESH_0], TimeIter, StopCalc);
   
-  bool Wrt_Surf = config_container[ZONE_0]->GetWrt_Srf_Sol();
-  bool Wrt_Vol  = config_container[ZONE_0]->GetWrt_Vol_Sol();
-  bool Wrt_CSV  = config_container[ZONE_0]->GetWrt_Csv_Sol();
-  bool TimeDomain = config_container[ZONE_0]->GetTime_Domain();
-  
-  if (config_container[ZONE_0]->GetWrt_Binary_Restart()){
-    RestartFormat = SU2_RESTART_BINARY;
-  }
-
-  /*--- Determine whether a solution needs to be written
-   after the current iteration ---*/
-
-  if (
-
-      /*--- General if statements to print output statements ---*/
-
-      (StopCalc) ||
-
-      /*--- Unsteady problems ---*/
-
-      (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
-        (config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING)) &&
-       ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-
-      ((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND) &&
-       ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0) ||
-                           ((TimeIter-1) % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-
-      ((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND) &&
-       ((TimeIter == 0) || ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) ||
-
-      ((config_container[ZONE_0]->GetTime_Domain()) &&
-       ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))) ||
-
-      /*--- No inlet profile file found. Print template. ---*/
-
-      (config_container[ZONE_0]->GetWrt_InletFile())
-
-      ) {
-
-    output_files = true;
-
-  }
-
-  /*--- Determine whether a solution doesn't need to be written
-   after the current iteration ---*/
-
-//  if (config_container[ZONE_0]->GetFixed_CL_Mode()) {
-//    if (config_container[ZONE_0]->GetnExtIter()-config_container[ZONE_0]->GetIter_dCL_dAlpha() - 1 < ExtIter) output_files = false;
-//    if (config_container[ZONE_0]->GetnExtIter() - 1 == ExtIter) output_files = true;
-//  }
-
-  /*--- write the solution ---*/
-
-  if (output_files && config_container[ZONE_0]->GetWrt_Output()) {
-
-    /*--- Time the output for performance benchmarking. ---*/
-#ifndef HAVE_MPI
-    StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StopTime = MPI_Wtime();
-#endif
-    UsedTimeCompute += StopTime-StartTime;
-#ifndef HAVE_MPI
-    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
-#else
-    StartTime = MPI_Wtime();
-#endif
-
-    if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
-
-    /*--- Execute the routine for writing restart, volume solution,
-     surface solution, and surface comma-separated value files. ---*/
-    
-    for (unsigned short iInst = 0; iInst < nInst[ZONE_0]; iInst++){
-      
-      config_container[ZONE_0]->SetiInst(iInst);
-      
-      output_container[ZONE_0]->Load_Data(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], solver_container[ZONE_0][iInst][MESH_0]);
-      
-      /*--- Write restart files ---*/
-      
-      output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], RestartFormat, TimeDomain);
-      
-      /*--- Write visualization files ---*/
-      
-      if (Wrt_Vol)
-        output_container[ZONE_0]->SetVolume_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat, TimeDomain);
-      if (Wrt_Surf)
-        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], OutputFormat, TimeDomain);
-      if (Wrt_CSV)
-        output_container[ZONE_0]->SetSurface_Output(geometry_container[ZONE_0][iInst][MESH_0], config_container[ZONE_0], CSV, TimeDomain);    
-      
-      output_container[ZONE_0]->DeallocateData_Parallel();
-      
-    }
-    if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
-
+  if (wrote_files){
     /*--- Store output time and restart the timer for the compute phase. ---*/
 #ifndef HAVE_MPI
     StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
@@ -298,17 +201,17 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
     UsedTimeOutput += StopTime-StartTime;
     OutputCount++;
     BandwidthSum = config_container[ZONE_0]->GetRestart_Bandwidth_Agg();
-
-  }
-  
+    
+    
+    
 #ifndef HAVE_MPI
-  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+    StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
-  StartTime = MPI_Wtime();
+    StartTime = MPI_Wtime();
 #endif
-  config_container[ZONE_0]->Set_StartTime(StartTime);
-  
-}
+    config_container[ZONE_0]->Set_StartTime(StartTime);
+  }
+}  
 
 void CSinglezoneDriver::DynamicMeshUpdate(unsigned long TimeIter) {
 
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index db39237082ba..d14cf2ed3fd7 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -456,85 +456,10 @@ void CIteration::Output(COutput *output,
     unsigned short val_iInst)      {
 
   
-  bool output_files = false;
+  output->SetResult_Files(geometry[ZONE_0][INST_0][MESH_0],
+                          config[ZONE_0],
+                          solver[ZONE_0][INST_0][MESH_0], InnerIter);
   
-  unsigned short RestartFormat = SU2_RESTART_ASCII;
-  unsigned short OutputFormat = config[val_iZone]->GetOutput_FileFormat();
-  
-  bool Wrt_Surf = config[val_iZone]->GetWrt_Srf_Sol();
-  bool Wrt_Vol  = config[val_iZone]->GetWrt_Vol_Sol();
-  bool Wrt_CSV  = config[val_iZone]->GetWrt_Csv_Sol();
-  
-  if (config[val_iZone]->GetWrt_Binary_Restart()){
-    RestartFormat = SU2_RESTART_BINARY;
-  }
-  
-  /*--- Determine whether a solution needs to be written
-   after the current iteration ---*/
-
-  if ( 
-
-      /*--- Fixed CL problem ---*/
-
-      ((config[val_iZone]->GetFixed_CL_Mode()) &&
-       (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 == InnerIter)) ||
-
-      /*--- Steady problems ---*/
-
-      ((InnerIter % config[val_iZone]->GetWrt_Sol_Freq() == 0) && (InnerIter != 0)) ||
-
-      /*--- No inlet profile file found. Print template. ---*/
-
-      (config[val_iZone]->GetWrt_InletFile())
-
-      ) {
-
-    output_files = true;
-
-  }
-
-  /*--- Determine whether a solution doesn't need to be written
-   after the current iteration ---*/
-
-  if (config[val_iZone]->GetFixed_CL_Mode()) {
-    if (config[val_iZone]->GetnInner_Iter()-config[val_iZone]->GetIter_dCL_dAlpha() - 1 < InnerIter) output_files = false;
-    if (config[val_iZone]->GetnInner_Iter() - 1 == InnerIter) output_files = true;
-  }
-
-  /*--- write the solution ---*/
-
-  if (output_files && config[val_iZone]->GetWrt_Output()) {
-
-    if (rank == MASTER_NODE) cout << endl << "-------------------------- File Output Summary --------------------------";
-
-    /*--- Execute the routine for writing restart, volume solution,
-     surface solution, and surface comma-separated value files. ---*/
-
-      config[val_iZone]->SetiInst(val_iInst);
-      
-      output->Load_Data(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], solver[val_iZone][val_iInst][MESH_0]);
-      
-      /*--- Write restart files ---*/
-      
-      output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], RestartFormat, false);
-      
-      /*--- Write visualization files ---*/
-      
-      if (Wrt_Vol)
-        output->SetVolume_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat, false);
-      if (Wrt_Surf)
-        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], OutputFormat,false);
-      if (Wrt_CSV)
-        output->SetSurface_Output(geometry[val_iZone][val_iInst][MESH_0], config[val_iZone], CSV, false);    
-      
-      output->DeallocateData_Parallel();      
-    
-    /*--- Execute the routine for writing special output. ---*/
-    //output->SetSpecial_Output(solver, geometry, config, Iter, nZone);
-
-    if (rank == MASTER_NODE) cout << "-------------------------------------------------------------------------" << endl << endl;
-
-  }
 
 }
 void CIteration::Postprocess(COutput *output,
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 90ab596df0b0..9d4921902e08 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -951,7 +951,7 @@ void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **
     if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
           config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
           config->GetKind_Solver() == DISC_ADJ_RANS )) {
-      meta_file << "SENS_AOA=" << solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0 << endl;
+      meta_file << "SENS_AOA=" << GetHistoryFieldValue("SENS_AOA") * PI_NUMBER / 180.0 << endl;
     }
   }
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 0639ac716e8a..ae8e6aadf239 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -335,18 +335,21 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
    *  the local data into linear chunks across the processors ---*/
   
   if (femOutput){
-  
+
     volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
+    
+    surfaceDataSorter = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, 
+                                                  dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
 
   }  else {
     
     volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
     
+    surfaceDataSorter = new CSurfaceFVMDataSorter(config, geometry, nVolumeFields,
+                                                  dynamic_cast<CFVMDataSorter*>(volumeDataSorter));  
+    
   }  
 
-  /*--- Now that we know the number of fields, create the local data array to temporarily store the volume output 
-   * before writing it to file ---*/
-    
   /*--- Collect that data defined in the subclasses from the different processors ---*/
   
   if (rank == MASTER_NODE)
@@ -361,10 +364,6 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   
   volumeDataSorter->SortOutputData();
   
-  if (config->GetFixed_CL_Mode() || config->GetFixed_CM_Mode()){
-    WriteMetaData(config, geometry, solver_container);
-  }
-  
 }
 
 
@@ -375,226 +374,277 @@ void COutput::DeallocateData_Parallel(){
   
   volumeDataSorter = NULL;
   
+  if (surfaceDataSorter != NULL)
+    delete surfaceDataSorter;
+  
+  surfaceDataSorter = NULL;
+  
 }
 
 
-void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CParallelDataSorter *sorter, CFileWriter *&filewriter, unsigned short format){
+void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&filewriter, unsigned short format){
+  
+  string fileName;
   
   /*--- Write files depending on the format --- */
   
   switch (format) {
     
-    case CSV:
-
-      sorter->SortConnectivity(config, geometry, true);
+    case SURFACE_CSV:
+      
+      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      
+      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      
+      surfaceDataSorter->SortOutputData();
       
       if (rank == MASTER_NODE) {
-          cout << "Writing CSV file." << endl;     
+        cout << "Writing CSV file." << endl;     
       }
-         
-      filewriter = new CSU2FileWriter(volumeFieldNames, nDim);
-          
+      
+      filewriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      
       break;
-    
-  case SU2_RESTART_ASCII:
-    
-    if (rank == MASTER_NODE) {
-        cout << "Writing SU2 ASCII restart file." << endl;     
-    }
-       
-    filewriter = new CSU2FileWriter(volumeFieldNames, nDim);
-        
-    break;
-    
-  case SU2_RESTART_BINARY:
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing SU2 binary restart file." << endl;   
-    }
+      
+    case RESTART_ASCII: case CSV:
+      
+      fileName = config->GetFilename(restartFilename, "", curTimeIter);
+      
+      if (rank == MASTER_NODE) {
+        cout << "Writing SU2 CSV restart file." << endl;     
+      }
+      
+      filewriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      
+      break;
+      
+    case RESTART_BINARY:
+      
+      fileName = config->GetFilename(restartFilename, "", curTimeIter);
+      
+      if (rank == MASTER_NODE) {
+        cout << "Writing SU2 binary restart file." << endl;   
+      }
+      
+      filewriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      
+      break;
+      
+    case MESH:
+      
+      fileName = volumeFilename;
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      volumeDataSorter->SortConnectivity(config, geometry, true);
+      
+      /*--- Set the mesh ASCII format ---*/
+      
+      if (rank == MASTER_NODE) {
+        cout << "Writing SU2 mesh file." << endl;
+      }
+      
+      filewriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+                                          config->GetiZone(), config->GetnZone());
+      
+      
+      break;    
+      
+    case TECPLOT_BINARY:
+      
+      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      volumeDataSorter->SortConnectivity(config, geometry, true);
+      
+      /*--- Write tecplot binary ---*/
+      
+      if (rank == MASTER_NODE) {
+        cout << "Writing Tecplot binary solution file." << endl;
+      }
+      
+      filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+                                                curTimeIter, GetHistoryFieldValue("TIME_STEP"));
+      
+      break;
+      
+    case TECPLOT:
+      
+      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      volumeDataSorter->SortConnectivity(config, geometry, true);
+      
+      /*--- Write tecplot binary ---*/
+      
+      if (rank == MASTER_NODE) {
+        cout << "Writing Tecplot ASCII solution file." << endl;
+      }
+      
+      filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+                                          curTimeIter, GetHistoryFieldValue("TIME_STEP"));
+      
+      break;
+      
+    case PARAVIEW_BINARY:
+      
+      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      volumeDataSorter->SortConnectivity(config, geometry, true);
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Paraview binary solution file." << endl;
+      }
+      
+      filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      
+      break;
+      
+    case PARAVIEW:
+      
+      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      volumeDataSorter->SortConnectivity(config, geometry, true);
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Paraview ASCII volume solution file." << endl;      
+      }
+      
+      filewriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      
+      break;
+      
+    case SURFACE_PARAVIEW:
+      
+      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortOutputData();
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Paraview ASCII surface file." << endl;      
+      }
+      
+      filewriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      
+      break;
+      
+    case SURFACE_PARAVIEW_BINARY:
+      
+      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortOutputData();
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Paraview Binary surface file." << endl;      
+      }
+      
+      filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      
+      break;
+      
+    case SURFACE_TECPLOT:
+      
+      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortOutputData();
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Tecplot ASCII surface file." << endl;      
+      }
+      
+      filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
+                                          curTimeIter, GetHistoryFieldValue("TIME_STEP"));
+      
+      break;
+      
+    case SURFACE_TECPLOT_BINARY:
+      
+      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      
+      /*--- Load and sort the output data and connectivity. ---*/
+      
+      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortOutputData();
+      
+      /*--- Write paraview binary ---*/
+      if (rank == MASTER_NODE) {
+        cout << "Writing Tecplot ASCII surface file." << endl;      
+      }
+      
+      filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
+                                                curTimeIter, GetHistoryFieldValue("TIME_STEP"));
+      
+      break;
+      
+    default:
+      filewriter = NULL;
+      break;
+  } 
+}
 
-    filewriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim);
-        
-    break;
+
+
+bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing){
   
-  case SU2_MESH:
-    
-    /*--- Load and sort the output data and connectivity.
-     *  Note that the solver container is not need in this case. ---*/
-    
-    sorter->SortConnectivity(config, geometry, true);
-    
-    /*--- Set the mesh ASCII format ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing SU2 mesh file." << endl;
-    }
-    
-    filewriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, config->GetiZone(), config->GetnZone());
-    
-    
-    break;    
-    
-  case TECPLOT_BINARY:
+  if (WriteVolume_Output(config, Iter) || force_writing){
+   
+    /*--- Load the volume data from the solver and sort it ---*/
     
-    /*--- Load and sort the output data and connectivity. ---*/
+    Load_Data(geometry, config, solver_container);
     
-     sorter->SortConnectivity(config, geometry, false);
+    unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
+    unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
     
-    /*--- Write tecplot binary ---*/
+    CFileWriter* fileWriter = NULL;
     
-    if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot binary file solution file." << endl;
-    }
+    /*--- Loop through all requested output files ---*/
     
-    filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, curTimeIter, GetHistoryFieldValue("TIME_STEP"));
+    for (unsigned short iFile = 0; iFile < nVolumeFiles; iFile++){
       
-    break;
-    
-  case TECPLOT:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    sorter->SortConnectivity(config, geometry, true);
-    
-    /*--- Write tecplot binary ---*/
-    
-    if (rank == MASTER_NODE) {
-      cout << "Writing Tecplot ASCII file solution file." << endl;
-    }
-    
-    filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, curTimeIter, GetHistoryFieldValue("TIME_STEP"));
-
-    break;
-    
-  case PARAVIEW_BINARY:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
-    
-    sorter->SortConnectivity(config, geometry, true);
-    
-    /*--- Write paraview binary ---*/
-    if (rank == MASTER_NODE) {
-      cout << "Writing Paraview binary file solution file." << endl;
+      SetFileWriter(config, geometry, fileWriter, VolumeFiles[iFile]);
+      
+      if (fileWriter != NULL){
+        
+        fileWriter->Write_Data(); 
+        
+        delete fileWriter;
+        
+        fileWriter = NULL;
+      }
     }
     
-    filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim);
-    
-    break;
-    
-  case PARAVIEW:
-    
-    /*--- Load and sort the output data and connectivity. ---*/
+    /*--- Write any additonal files ----*/
     
-    sorter->SortConnectivity(config, geometry, true);
-    
-    /*--- Write paraview binary ---*/
-    if (rank == MASTER_NODE) {
-        cout << "Writing Paraview ASCII file volume solution file." << endl;      
-    }
+    WriteAdditionalFiles(config, geometry, solver_container);
     
-    filewriter = new CParaviewFileWriter(volumeFieldNames, nDim);
-
-    break;
+    /*--- Free the data sorters ---*/
     
-  default:
-    SU2_MPI::Error("Requested volume output format not available.", CURRENT_FUNCTION);
-    break;
-  } 
-}
-
-void COutput::SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep){
-  
-  CParallelDataSorter* surface_sort = NULL;
-  CFileWriter*         file_writer = NULL;
-  
-  if (femOutput){
-    surface_sort = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
-  } else {
-    surface_sort = new CSurfaceFVMDataSorter(config, geometry,nVolumeFields, dynamic_cast<CFVMDataSorter*>(volumeDataSorter));    
-  }
-
-  /*--- Set the file writer --- */
-  
-  SetFileWriter(config, geometry, surface_sort, file_writer, format);
+    DeallocateData_Parallel();
     
-  /*--- Sort the surface output data --- */
-  
-  surface_sort->SortOutputData();
-  
-  string FileName = surfaceFilename;
-  
-  /*--- Remove extension --- */
-  
-  unsigned short lastindex = FileName.find_last_of(".");
-  FileName = FileName.substr(0, lastindex);
-  
-  if (format != SU2_MESH){
-    FileName = config->GetMultizone_FileName(FileName, config->GetiZone(),"");
-  }
-
-  /*--- Add time iteration if requested --- */
-  
-  if (time_dep){
-    FileName = config->GetUnsteady_FileName(FileName, curTimeIter, "");
-  }
-  
-  if (surface_sort->GetnElem() > 0){
-  
-    /*--- Write data to file --- */
-  
-    file_writer->Write_Data(FileName, surface_sort);
-  
-  }
-  
-  delete file_writer;
-  delete surface_sort;
-  
-}
-
-void COutput::SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep){
-  
-  string FileName = volumeFilename;
-  
-  if(format == SU2_RESTART_ASCII || format == SU2_RESTART_BINARY){
-    FileName = restartFilename;
-  }
-  
-  /*--- Remove extension --- */
-  
-  unsigned short lastindex = FileName.find_last_of(".");
-  FileName = FileName.substr(0, lastindex);
-  
-  if (format != SU2_MESH){
-    FileName = config->GetMultizone_FileName(FileName, config->GetiZone(),"");
-  }
-
-  /*--- Add time iteration if requested --- */
-  
-  if (time_dep){
-    FileName = config->GetUnsteady_FileName(FileName, curTimeIter, "");
-  }
-  
-  CFileWriter* file_writer = NULL;
-
-  /*--- Set the file writer --- */
-  
-  SetFileWriter(config, geometry, volumeDataSorter, file_writer, format);
-  
-  /*--- Write data to file --- */
-  
-  file_writer->Write_Data(FileName, volumeDataSorter);
-  
-  if ((rank == MASTER_NODE) && config->GetWrt_Performance()) {
-    cout << "Wrote " << file_writer->Get_Filesize()/(1.0e6) << " MB to disk in ";
-    cout << file_writer->Get_UsedTime() << " s. (" << file_writer->Get_Bandwidth() << " MB/s)." << endl;
-  }
-  
-  if(format == SU2_RESTART_ASCII || format == SU2_RESTART_BINARY){
-    config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg() + file_writer->Get_Bandwidth());
+    return true;
   }
-
-  delete file_writer;
   
+  return false;
 }
 
 
@@ -701,9 +751,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
 
   
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY)) {
     histFile << "TITLE = \"SU2 Simulation\"" << endl;
     histFile << "VARIABLES = ";
   }
@@ -740,9 +788,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   histFile << out.str().substr(0, out.str().size() - 1);
   histFile << endl;
   if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+      config->GetOutput_FileFormat() == TECPLOT_BINARY) {
     histFile << "ZONE T= \"Convergence history\"" << endl;
   }
   histFile.flush();
@@ -923,10 +969,8 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   /*--- Add the correct file extension depending on the file format ---*/
   
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  if ((config->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
   else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
   strcat(char_histfile, buffer);
   
@@ -1245,7 +1289,8 @@ void COutput::Postprocess_HistoryData(CConfig *config){
       if ( SetInit_Residuals(config) || (currentField.value > initialResiduals[historyOutput_List[iField]]) ) {
         initialResiduals[historyOutput_List[iField]] = currentField.value;
       }
-      SetHistoryOutputValue("REL_" + historyOutput_List[iField], currentField.value - initialResiduals[historyOutput_List[iField]]);
+      SetHistoryOutputValue("REL_" + historyOutput_List[iField], 
+                            currentField.value - initialResiduals[historyOutput_List[iField]]);
       
       Average[currentField.outputGroup] += currentField.value;
       Count[currentField.outputGroup]++;
@@ -1253,11 +1298,13 @@ void COutput::Postprocess_HistoryData(CConfig *config){
     }
     if (currentField.fieldType == TYPE_COEFFICIENT){
       if(SetUpdate_Averages(config)){
-        SetHistoryOutputValue("TAVG_" + historyOutput_List[iField], runningAverages[historyOutput_List[iField]].Update(currentField.value));
+        SetHistoryOutputValue("TAVG_" + historyOutput_List[iField],
+                              runningAverages[historyOutput_List[iField]].Update(currentField.value));
       }
       if (config->GetDirectDiff() != NO_DERIVATIVE){
         SetHistoryOutputValue("D_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(currentField.value));      
-        SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
+        SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], 
+                              SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
         
       }
     }
@@ -1278,38 +1325,47 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
     if (currentField.fieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + historyOutput_List[iField], "rel" + currentField.fieldName, currentField.screenFormat, "REL_" + currentField.outputGroup, "Relative residual.", TYPE_AUTO_RESIDUAL);
+      AddHistoryOutput("REL_" + historyOutput_List[iField], "rel" + currentField.fieldName, currentField.screenFormat,
+                       "REL_" + currentField.outputGroup,  "Relative residual.", TYPE_AUTO_RESIDUAL);
       Average[currentField.outputGroup] = true;
     }
   }
   
   map<string, bool>::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
-    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED, "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
+    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED,
+                     "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
   }  
   
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
     if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]", currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", TYPE_AUTO_COEFFICIENT);
+      AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]",
+                       currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", 
+                       TYPE_AUTO_COEFFICIENT);
     }
   }
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
     if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]", currentField.screenFormat, "D_"      + currentField.outputGroup, "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+      AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]",
+                       currentField.screenFormat, "D_"      + currentField.outputGroup, 
+                       "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
     }
   }
   
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
     if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]", currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+      AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]",
+                       currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, 
+                       "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
     }
   }
   
   if (historyOutput_Map[convField].fieldType == TYPE_COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY","Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
+    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY",
+                     "Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
   }
 
 }
@@ -1435,6 +1491,10 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
 
 }
 
+bool COutput::WriteVolume_Output(CConfig *config, unsigned long Iter){
+  return ((Iter > 0) && (Iter % config->GetVolume_Wrt_Freq() == 0));
+}
+
 void COutput::SetCommonHistoryFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index 3bb0b9badf6d..df294213cbb5 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -1,17 +1,16 @@
 #include "../../../include/output/filewriter/CCSVFileWriter.hpp"
 #include "../../../include/output/filewriter/CParallelDataSorter.hpp"
 
-CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, ".csv", nDim){}
+CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim, 
+                               string fileName, CParallelDataSorter *dataSorter) : 
+  CFileWriter(fields, fileName, dataSorter, ".csv", nDim){}
 
 
 CCSVFileWriter::~CCSVFileWriter(){
   
 }
 
-void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
+void CCSVFileWriter::Write_Data(){
   
   /*--- Routine to write the surface CSV files (ASCII). We
    assume here that, as an ASCII file, it is safer to merge the
@@ -36,7 +35,7 @@ void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
    partitions so we can set up buffers. The master node will handle
    the writing of the CSV file after gathering all of the data. ---*/
   
-  nLocalVertex_Surface   = data_sorter->GetnPoints();
+  nLocalVertex_Surface   = dataSorter->GetnPoints();
   Buffer_Send_nVertex[0] = nLocalVertex_Surface;
   if (rank == MASTER_NODE) Buffer_Recv_nVertex = new unsigned long[nProcessor];
   
@@ -65,12 +64,12 @@ void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     
     /*--- Global index values. ---*/
     
-    bufL_Send[iPoint] = data_sorter->GetGlobalIndex(iPoint);
+    bufL_Send[iPoint] = dataSorter->GetGlobalIndex(iPoint);
     
     /*--- Solution data. ---*/
     
     for (iVar = 0; iVar < fieldnames.size(); iVar++){
-      bufD_Send[index] = data_sorter->GetData(iVar, iPoint);
+      bufD_Send[index] = dataSorter->GetData(iVar, iPoint);
       index++;
     }
     
@@ -97,7 +96,7 @@ void CCSVFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
     
     /*--- Open the CSV file and write the header with variable names. ---*/
     
-    Surf_file.open(filename.c_str(), ios::out);
+    Surf_file.open(fileName.c_str(), ios::out);
     Surf_file << "\"Point\",";
     for (iVar = 0; iVar < fieldnames.size()-1; iVar++) {
       Surf_file << "\"" << fieldnames[iVar] << "\",";
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index e336f434a9f3..51aaf5ac2495 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -60,10 +60,12 @@ CParallelDataSorter::~CParallelDataSorter(){
   
   /*--- Deallocate memory for solution data ---*/
   
-  for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-    if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+  if (Parallel_Data != NULL){
+    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+      if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+    }
+    delete [] Parallel_Data;  
   }
-  if (Parallel_Data != NULL) delete [] Parallel_Data;  
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
index b7e38379ff27..90d5f853d1d4 100644
--- a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -1,13 +1,19 @@
 #include "../../../include/output/filewriter/CFileWriter.hpp"
 
 
-CFileWriter::CFileWriter(vector<string> fields, string file_ext, unsigned short nDim): fieldnames(fields),
-                                                                                       nDim(nDim),
-                                                                                       file_ext(file_ext){
+CFileWriter::CFileWriter(vector<string> fields, string fileName,
+                         CParallelDataSorter *dataSorter, string file_ext, unsigned short nDim): 
+  fieldnames(fields),
+  nDim(nDim),
+  file_ext(file_ext),
+  fileName(fileName),
+  dataSorter(dataSorter){
   
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
   
+  this->fileName += file_ext;
+  
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 4ff7f866bc94..b414e04b6ba3 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -1,19 +1,18 @@
 #include "../../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
 
 
-CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, ".vtk", nDim){}
+CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim, string fileName, 
+                                                     CParallelDataSorter *dataSorter) : 
+  CFileWriter(fields, fileName, dataSorter, ".vtk", nDim){}
 
 
 CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
   
 }
 
-void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
-  if (!data_sorter->GetConnectivitySorted()){
+void CParaviewBinaryFileWriter::Write_Data(){
+    
+  if (!dataSorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
   }
   
@@ -28,7 +27,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   const int NCOORDS = 3;
 
-  strcpy(fname, filename.c_str());
+  strcpy(fname, fileName.c_str());
   
   /*--- Check for big endian. We have to swap bytes otherwise. ---*/
   
@@ -85,7 +84,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   /*--- Write the point coordinates. ---*/
   
-  unsigned long GlobalPoint = data_sorter->GetnPointsGlobal();
+  unsigned long GlobalPoint = dataSorter->GetnPointsGlobal();
   
   SPRINTF(str_buf, "POINTS %i float\n", (int)GlobalPoint);
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
@@ -99,7 +98,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       if (nDim == 2 && iDim == 2) {
         coord_buf[iPoint*NCOORDS + iDim] = 0.0;
       } else {
-        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(iDim,iPoint));
+        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(iDim,iPoint));
         coord_buf[iPoint*NCOORDS + iDim] = val;
       }
     }
@@ -116,24 +115,24 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   unsigned long nTot_Line;
   unsigned long nTot_Tria, nTot_Quad;
   unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  nTot_Line = data_sorter->GetnElem(LINE);  
-  nTot_Tria = data_sorter->GetnElem(TRIANGLE);
-  nTot_Quad = data_sorter->GetnElem(QUADRILATERAL);
-  nTot_Tetr = data_sorter->GetnElem(TETRAHEDRON);
-  nTot_Hexa = data_sorter->GetnElem(HEXAHEDRON);
-  nTot_Pris = data_sorter->GetnElem(PRISM);
-  nTot_Pyra = data_sorter->GetnElem(PYRAMID);
+  nTot_Line = dataSorter->GetnElem(LINE);  
+  nTot_Tria = dataSorter->GetnElem(TRIANGLE);
+  nTot_Quad = dataSorter->GetnElem(QUADRILATERAL);
+  nTot_Tetr = dataSorter->GetnElem(TETRAHEDRON);
+  nTot_Hexa = dataSorter->GetnElem(HEXAHEDRON);
+  nTot_Pris = dataSorter->GetnElem(PRISM);
+  nTot_Pyra = dataSorter->GetnElem(PYRAMID);
   nGlobal_Elem_Storage = (nTot_Line*3 + nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 +
                           nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6);
   
   int *conn_buf = NULL;
   
-  SPRINTF (str_buf, "\nCELLS %i %i\n", (int)data_sorter->GetnElem(),
+  SPRINTF (str_buf, "\nCELLS %i %i\n", (int)dataSorter->GetnElem(),
            (int)nGlobal_Elem_Storage);
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
   file_size += sizeof(char)*strlen(str_buf);
   
-  conn_buf = new int[data_sorter->GetnElem()*(N_POINTS_HEXAHEDRON+1)];
+  conn_buf = new int[dataSorter->GetnElem()*(N_POINTS_HEXAHEDRON+1)];
   
   
   /*--- Load/write 1D buffers for the connectivity of each element type. ---*/
@@ -142,8 +141,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Line; iElem++) {
     iNode2 = iElem*(N_POINTS_LINE+1);
     conn_buf[iNode2+0] = N_POINTS_LINE;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(LINE, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(LINE, iElem, 1)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Line*(N_POINTS_LINE+1));
@@ -155,9 +154,9 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Tria; iElem++) {
     iNode2 = iElem*(N_POINTS_TRIANGLE+1);
     conn_buf[iNode2+0] = N_POINTS_TRIANGLE;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Tria*(N_POINTS_TRIANGLE+1));
@@ -168,10 +167,10 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Quad; iElem++) {
     iNode2 = iElem*(N_POINTS_QUADRILATERAL+1);
     conn_buf[iNode2+0] = N_POINTS_QUADRILATERAL;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
-    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
+    conn_buf[iNode2+4] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Quad*(N_POINTS_QUADRILATERAL+1));
@@ -182,10 +181,10 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Tetr; iElem++) {
     iNode2 = iElem*(N_POINTS_TETRAHEDRON+1);
     conn_buf[iNode2+0] = N_POINTS_TETRAHEDRON;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
-    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
+    conn_buf[iNode2+4] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Tetr*(N_POINTS_TETRAHEDRON+1));
@@ -196,14 +195,14 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Hexa; iElem++) {
     iNode2 = iElem*(N_POINTS_HEXAHEDRON+1);
     conn_buf[iNode2+0] = N_POINTS_HEXAHEDRON;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
-    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
-    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
-    conn_buf[iNode2+6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
-    conn_buf[iNode2+7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
-    conn_buf[iNode2+8] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
+    conn_buf[iNode2+4] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
+    conn_buf[iNode2+5] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
+    conn_buf[iNode2+6] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
+    conn_buf[iNode2+7] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
+    conn_buf[iNode2+8] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Hexa*(N_POINTS_HEXAHEDRON+1));
@@ -214,12 +213,12 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Pris; iElem++) {
     iNode2 = iElem*(N_POINTS_PRISM+1);
     conn_buf[iNode2+0] = N_POINTS_PRISM;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
-    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
-    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
-    conn_buf[iNode2+6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
+    conn_buf[iNode2+4] = dataSorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
+    conn_buf[iNode2+5] = dataSorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
+    conn_buf[iNode2+6] = dataSorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Pris*(N_POINTS_PRISM+1));
@@ -230,11 +229,11 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   for (iElem = 0; iElem < nTot_Pyra; iElem++) {
     iNode2 = iElem*(N_POINTS_PYRAMID+1);
     conn_buf[iNode2+0] = N_POINTS_PYRAMID;
-    conn_buf[iNode2+1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
-    conn_buf[iNode2+2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
-    conn_buf[iNode2+3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
-    conn_buf[iNode2+4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
-    conn_buf[iNode2+5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
+    conn_buf[iNode2+1] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
+    conn_buf[iNode2+2] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
+    conn_buf[iNode2+3] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
+    conn_buf[iNode2+4] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
+    conn_buf[iNode2+5] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
   }
   if (!BigEndian) SwapBytes((char *)conn_buf, sizeof(int),
                             nTot_Pyra*(N_POINTS_PYRAMID+1));
@@ -248,13 +247,13 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   /*--- Load/write the cell type for all elements in the file. ---*/
   
 
-  SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(data_sorter->GetnElem()));
+  SPRINTF (str_buf, "\nCELL_TYPES %i\n", SU2_TYPE::Int(dataSorter->GetnElem()));
   fwrite(str_buf, sizeof(char), strlen(str_buf), fhw);
   file_size += sizeof(char)*strlen(str_buf);
   
   int *type_buf = NULL;
   
-  type_buf = new int[data_sorter->GetnElem()];
+  type_buf = new int[dataSorter->GetnElem()];
   
   for (iElem = 0; iElem < nTot_Line; iElem++) {
     type_buf[iElem] = LINE;
@@ -372,7 +371,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
           if (nDim == 2 && iDim == 2) {
             vec_buf[iPoint*NCOORDS + iDim] = 0.0;
           } else {
-            val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter+iDim,iPoint));
+            val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter+iDim,iPoint));
             vec_buf[iPoint*NCOORDS + iDim] = val;
           }
         }
@@ -403,7 +402,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
        This will be replaced with a derived data type most likely. ---*/
       
       for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter,iPoint));
+        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter,iPoint));
         scalar_buf[iPoint] = val;
       }
       if (!BigEndian)
@@ -496,8 +495,8 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   unsigned long myPoint, GlobalPoint;
   
-  GlobalPoint = data_sorter->GetnPointsGlobal();
-  myPoint     = data_sorter->GetnPoints();
+  GlobalPoint = dataSorter->GetnPointsGlobal();
+  myPoint     = dataSorter->GetnPoints();
   
   
   int *nPoint_Snd = new int[size+1];
@@ -536,7 +535,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
       if (nDim == 2 && iDim == 2) {
         coord_buf[iPoint*NCOORDS + iDim] = 0.0;
       } else {
-        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(iDim, iPoint));
+        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(iDim, iPoint));
         coord_buf[iPoint*NCOORDS + iDim] = val;
       }
     }
@@ -587,13 +586,13 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   unsigned long nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
   unsigned long myElem, myElemStorage, GlobalElem, GlobalElemStorage;
   
-  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
-                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
-                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
-                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
-                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
-                nParallel_Pris = data_sorter->GetnElem(PRISM),
-                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+  unsigned long nParallel_Line = dataSorter->GetnElem(LINE),
+                nParallel_Tria = dataSorter->GetnElem(TRIANGLE),
+                nParallel_Quad = dataSorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = dataSorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = dataSorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = dataSorter->GetnElem(PRISM),
+                nParallel_Pyra = dataSorter->GetnElem(PYRAMID);
   
   SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1,
                      MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
@@ -673,70 +672,70 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
   
   for (iElem = 0; iElem < nParallel_Line; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_LINE;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(LINE, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(LINE, iElem, 1)-1;
     iStorage += (N_POINTS_LINE+1);
   }
   
   for (iElem = 0; iElem < nParallel_Tria; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_TRIANGLE;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 ;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 ;
     iStorage += (N_POINTS_TRIANGLE+1);
   }
   
   for (iElem = 0; iElem < nParallel_Quad; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_QUADRILATERAL;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
-    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1;
+    conn_buf[iStorage+4] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1;
     iStorage += (N_POINTS_QUADRILATERAL+1);
     
   }
   
   for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_TETRAHEDRON;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
-    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1;
+    conn_buf[iStorage+4] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1;
     iStorage += (N_POINTS_TETRAHEDRON+1);
     
   }
   
   for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_HEXAHEDRON;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
-    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
-    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
-    conn_buf[iStorage+6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
-    conn_buf[iStorage+7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
-    conn_buf[iStorage+8] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1;
+    conn_buf[iStorage+4] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1;
+    conn_buf[iStorage+5] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1;
+    conn_buf[iStorage+6] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1;
+    conn_buf[iStorage+7] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1;
+    conn_buf[iStorage+8] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1;
     iStorage += (N_POINTS_HEXAHEDRON+1);
   }
   
   for (iElem = 0; iElem < nParallel_Pris; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_PRISM;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
-    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
-    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
-    conn_buf[iStorage+6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(PRISM, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(PRISM, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(PRISM, iElem, 2)-1;
+    conn_buf[iStorage+4] = dataSorter->GetElem_Connectivity(PRISM, iElem, 3)-1;
+    conn_buf[iStorage+5] = dataSorter->GetElem_Connectivity(PRISM, iElem, 4)-1;
+    conn_buf[iStorage+6] = dataSorter->GetElem_Connectivity(PRISM, iElem, 5)-1;
     iStorage += (N_POINTS_PRISM+1);
   }
   
   for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
     conn_buf[iStorage+0] = N_POINTS_PYRAMID;
-    conn_buf[iStorage+1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
-    conn_buf[iStorage+2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
-    conn_buf[iStorage+3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
-    conn_buf[iStorage+4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
-    conn_buf[iStorage+5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
+    conn_buf[iStorage+1] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1;
+    conn_buf[iStorage+2] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1;
+    conn_buf[iStorage+3] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1;
+    conn_buf[iStorage+4] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1;
+    conn_buf[iStorage+5] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1;
     iStorage += (N_POINTS_PYRAMID+1);
   }
   
@@ -929,7 +928,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
           if (nDim == 2 && iDim == 2) {
             vec_buf[iPoint*NCOORDS + iDim] = 0.0;
           } else {
-            val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter+iDim,iPoint));
+            val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter+iDim,iPoint));
             vec_buf[iPoint*NCOORDS + iDim] = val;
           }
         }
@@ -1004,7 +1003,7 @@ void CParaviewBinaryFileWriter::Write_Data(string filename, CParallelDataSorter
        This will be replaced with a derived data type most likely. ---*/
       
       for (iPoint = 0; iPoint < myPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(data_sorter->GetData(VarCounter,iPoint));
+        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter,iPoint));
         scalar_buf[iPoint] = val;
       }
       if (!BigEndian) SwapBytes((char *)scalar_buf, sizeof(float), myPoint);
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index 89297486a5a9..cd329901fb26 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -1,17 +1,16 @@
 #include "../../../include/output/filewriter/CParaviewFileWriter.hpp"
 
 
-CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, ".vtk", nDim){}
+CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim, 
+                                         string fileName, CParallelDataSorter *dataSorter) : 
+  CFileWriter(fields, fileName, dataSorter, ".vtk", nDim){}
 
 
 CParaviewFileWriter::~CParaviewFileWriter(){}
 
-void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
-  if (!data_sorter->GetConnectivitySorted()){
+void CParaviewFileWriter::Write_Data(){
+    
+  if (!dataSorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
   }
   
@@ -36,7 +35,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
   /*--- Open Paraview ASCII file and write the header. ---*/
   
   if (rank == MASTER_NODE) {
-    Paraview_File.open(filename.c_str(), ios::out);
+    Paraview_File.open(fileName.c_str(), ios::out);
     Paraview_File.precision(6);
     Paraview_File << "# vtk DataFile Version 3.0\n";
     Paraview_File << "vtk output\n";
@@ -44,7 +43,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
     Paraview_File << "DATASET UNSTRUCTURED_GRID\n";
     
     /*--- Write the header ---*/
-    Paraview_File << "POINTS "<< data_sorter->GetnPointsGlobal() <<" double\n";
+    Paraview_File << "POINTS "<< dataSorter->GetnPointsGlobal() <<" double\n";
     
   }
 
@@ -56,7 +55,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
 
   /*--- Each processor opens the file. ---*/
 
-  Paraview_File.open(filename.c_str(), ios::out | ios::app);
+  Paraview_File.open(fileName.c_str(), ios::out | ios::app);
 
   /*--- Write surface and volumetric point coordinates. ---*/
 
@@ -66,9 +65,9 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
       /*--- Write the node data from this proc ---*/
       
       
-      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+      for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
         for (iDim = 0; iDim < nDim; iDim++)
-          Paraview_File << scientific << data_sorter->GetData(iDim, iPoint) << "\t";
+          Paraview_File << scientific << dataSorter->GetData(iDim, iPoint) << "\t";
         if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
       }
     }
@@ -82,13 +81,13 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
   /*--- Reduce the total number of each element. ---*/
 
   unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
-                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
-                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
-                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
-                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
-                nParallel_Pris = data_sorter->GetnElem(PRISM),
-                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+  unsigned long nParallel_Line = dataSorter->GetnElem(LINE),
+                nParallel_Tria = dataSorter->GetnElem(TRIANGLE),
+                nParallel_Quad = dataSorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = dataSorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = dataSorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = dataSorter->GetnElem(PRISM),
+                nParallel_Pyra = dataSorter->GetnElem(PYRAMID);
 #ifdef HAVE_MPI
   SU2_MPI::Reduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
   SU2_MPI::Reduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
@@ -113,7 +112,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
     /*--- Write the header ---*/
     nGlobal_Elem_Storage = nTot_Line*3 + nTot_Tria*4 + nTot_Quad*5 + nTot_Tetr*5 + nTot_Hexa*9 + nTot_Pris*7 + nTot_Pyra*6;
     
-    Paraview_File << "\nCELLS " << data_sorter->GetnElem() << "\t" << nGlobal_Elem_Storage << "\n";
+    Paraview_File << "\nCELLS " << dataSorter->GetnElem() << "\t" << nGlobal_Elem_Storage << "\n";
     
   }
 
@@ -130,63 +129,63 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
       
       for (iElem = 0; iElem < nParallel_Line; iElem++) {
         Paraview_File << N_POINTS_LINE << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(LINE, iElem, 0)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(LINE, iElem, 1)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(LINE, iElem, 0)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(LINE, iElem, 1)-1 << "\t";
       }
       
       for (iElem = 0; iElem < nParallel_Tria; iElem++) {
         Paraview_File << N_POINTS_TRIANGLE << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1 << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1 << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2)-1 << "\t";
       }
       
       for (iElem = 0; iElem < nParallel_Quad; iElem++) {
         Paraview_File << N_POINTS_QUADRILATERAL << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1 << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1 << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1 << "\t";
-        Paraview_File <<  data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2)-1 << "\t";
+        Paraview_File <<  dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3)-1 << "\t";
       }
       
       
       for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
         Paraview_File << N_POINTS_TETRAHEDRON << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3)-1 << "\t";
       }
       
       for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
         Paraview_File << N_POINTS_HEXAHEDRON << "\t"; 
-        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7)-1 << "\t";
       }
       
       for (iElem = 0; iElem < nParallel_Pris; iElem++) {
         Paraview_File << N_POINTS_PRISM << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 0)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 1)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 2)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 3)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 4)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(PRISM, iElem, 5)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 0)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(PRISM, iElem, 1)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 2)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(PRISM, iElem, 3)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 4)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(PRISM, iElem, 5)-1 << "\t";
       }
       
       for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
         Paraview_File << N_POINTS_PYRAMID << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1 << "\t" 
-                      << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1 << "\t";
-        Paraview_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2)-1 << "\t" 
+                      << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3)-1 << "\t";
+        Paraview_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4)-1 << "\t";
       }
       
     }    Paraview_File.flush();
@@ -198,7 +197,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
   if (rank == MASTER_NODE) {
     
     /*--- Write the header ---*/
-    Paraview_File << "\nCELL_TYPES " << data_sorter->GetnElem() << "\n";
+    Paraview_File << "\nCELL_TYPES " << dataSorter->GetnElem() << "\n";
     
   }
 
@@ -225,7 +224,7 @@ void CParaviewFileWriter::Write_Data(string filename, CParallelDataSorter *data_
   
   if (rank == MASTER_NODE) {
     /*--- Write the header ---*/
-    Paraview_File << "\nPOINT_DATA "<< data_sorter->GetnPointsGlobal() <<"\n";
+    Paraview_File << "\nPOINT_DATA "<< dataSorter->GetnPointsGlobal() <<"\n";
     
   }
 
@@ -293,9 +292,9 @@ found = fieldnames[iField].find("_z");
           
           /*--- Write the node data from this proc ---*/
           
-          for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
-            Paraview_File << scientific << data_sorter->GetData(VarCounter+0, iPoint) << "\t" << data_sorter->GetData(VarCounter+1, iPoint) << "\t";
-            if (nDim == 3) Paraview_File << scientific << data_sorter->GetData(VarCounter+2, iPoint) << "\t";
+          for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
+            Paraview_File << scientific << dataSorter->GetData(VarCounter+0, iPoint) << "\t" << dataSorter->GetData(VarCounter+1, iPoint) << "\t";
+            if (nDim == 3) Paraview_File << scientific << dataSorter->GetData(VarCounter+2, iPoint) << "\t";
             if (nDim == 2) Paraview_File << scientific << "0.0" << "\t";
           }
         }
@@ -328,8 +327,8 @@ found = fieldnames[iField].find("_z");
 
           /*--- Write the node data from this proc ---*/
           
-          for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
-            Paraview_File << scientific << data_sorter->GetData(VarCounter, iPoint) << "\t";
+          for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
+            Paraview_File << scientific << dataSorter->GetData(VarCounter, iPoint) << "\t";
           }
           
         }
@@ -356,7 +355,7 @@ found = fieldnames[iField].find("_z");
 #endif
   UsedTime = StopTime-StartTime;
   
-  file_size = Determine_Filesize(filename);
+  file_size = Determine_Filesize(fileName);
   
   /*--- Compute and store the bandwidth ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index d3166e446beb..245d48385043 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -1,17 +1,16 @@
 #include "../../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
 
-CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields,".dat", nDim){}
+CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim, 
+                                           string fileName, CParallelDataSorter *dataSorter)  : 
+  CFileWriter(fields, fileName, dataSorter, ".dat", nDim){}
 
 
 CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
   
 }
 
-void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
+void CSU2BinaryFileWriter::Write_Data(){
+    
   /*--- Local variables ---*/
 
   unsigned short iVar;
@@ -21,14 +20,14 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
 //  bool wrt_perf  = config->GetWrt_Performance();
   
   unsigned short GlobalField_Counter = fieldnames.size();
-  unsigned long nParallel_Poin = data_sorter->GetnPoints();
+  unsigned long nParallel_Poin = dataSorter->GetnPoints();
   
   ofstream restart_file;
   char str_buf[CGNS_STRING_SIZE], fname[100];
 
   file_size = 0.0;
   
-  strcpy(fname, filename.c_str());
+  strcpy(fname, fileName.c_str());
 
   /*--- Prepare the first ints containing the counts. The first is a
    magic number that we can use to check for binary files (it is the hex
@@ -37,7 +36,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
    one int for ExtIter and 8 su2doubles. ---*/
 
   int var_buf_size = 5;
-  int var_buf[5] = {535532, GlobalField_Counter, (int)data_sorter->GetnPointsGlobal(), 0, 0};
+  int var_buf[5] = {535532, GlobalField_Counter, (int)dataSorter->GetnPointsGlobal(), 0, 0};
 
   /*--- Prepare the 1D data buffer on this rank. ---*/
 
@@ -48,7 +47,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
 
   for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
     for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,iPoint));
+      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,iPoint));
 
 //  /*--- Prepare metadata. ---*/
 
@@ -196,7 +195,7 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
    in cumulative storage format. ---*/
 
   disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-          GlobalField_Counter*data_sorter->GetnPointCumulative(rank)*sizeof(passivedouble));
+          GlobalField_Counter*dataSorter->GetnPointCumulative(rank)*sizeof(passivedouble));
 
   /*--- Set the view for the MPI file write, i.e., describe the location in
    the file that this rank "sees" for writing its piece of the restart file. ---*/
@@ -223,14 +222,14 @@ void CSU2BinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data
     /*--- External iteration. ---*/
 
 //    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-//            GlobalField_Counter*data_sorter->GetnPointsGlobal()*sizeof(passivedouble));
+//            GlobalField_Counter*dataSorter->GetnPointsGlobal()*sizeof(passivedouble));
 //    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
 //    file_size += (su2double)sizeof(int);
 
     /*--- Additional doubles for AoA, AoS, etc. ---*/
 
 //    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-//            GlobalField_Counter*data_sorter->GetnPointsGlobal()*sizeof(passivedouble) + 1*sizeof(int));
+//            GlobalField_Counter*dataSorter->GetnPointsGlobal()*sizeof(passivedouble) + 1*sizeof(int));
 //    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
 //    file_size += (su2double)8*sizeof(passivedouble);
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 3eb488717b22..34b40f78d867 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -3,18 +3,17 @@
 
 
 
-CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim) : 
-  CFileWriter(fields, ".csv", nDim){}
+CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim, 
+                               string fileName, CParallelDataSorter *dataSorter) : 
+  CFileWriter(fields, fileName, dataSorter, ".csv", nDim){}
 
 
 CSU2FileWriter::~CSU2FileWriter(){
   
 }
 
-void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
+void CSU2FileWriter::Write_Data(){
+    
   /*--- Local variables ---*/
   
   unsigned short iVar;
@@ -35,7 +34,7 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   /*--- Only the master node writes the header. ---*/
   
   if (rank == MASTER_NODE) {
-    restart_file.open(filename.c_str(), ios::out);
+    restart_file.open(fileName.c_str(), ios::out);
     restart_file.precision(15);
     restart_file << "\"PointID\"";
     for (iVar = 0; iVar < fieldnames.size()-1; iVar++)
@@ -50,7 +49,7 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   /*--- All processors open the file. ---*/
   
-  restart_file.open(filename.c_str(), ios::out | ios::app);
+  restart_file.open(fileName.c_str(), ios::out | ios::app);
   restart_file.precision(15);
   
   /*--- Write the restart file in parallel, processor by processor. ---*/
@@ -58,11 +57,11 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   unsigned long myPoint = 0, Global_Index;
   for (iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+      for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
         
         /*--- Global Index of the current point. (note outer loop over procs) ---*/
         
-        Global_Index = data_sorter->GetGlobalIndex(iPoint);
+        Global_Index = dataSorter->GetGlobalIndex(iPoint);
         
         /*--- Write global index. (note outer loop over procs) ---*/
         
@@ -72,9 +71,9 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
         /*--- Loop over the variables and write the values to file ---*/
         
         for (iVar = 0; iVar < fieldnames.size()-1; iVar++) {
-          restart_file << scientific << data_sorter->GetData(iVar, iPoint) << ", ";
+          restart_file << scientific << dataSorter->GetData(iVar, iPoint) << ", ";
         }
-        restart_file << scientific << data_sorter->GetData(fieldnames.size()-1, iPoint) << "\n";        
+        restart_file << scientific << dataSorter->GetData(fieldnames.size()-1, iPoint) << "\n";        
       }
       
     }
@@ -97,7 +96,7 @@ void CSU2FileWriter::Write_Data(string filename, CParallelDataSorter *data_sorte
   
   /*--- Determine the file size ---*/
   
-  file_size = Determine_Filesize(filename);
+  file_size = Determine_Filesize(fileName);
   
   /*--- Compute and store the bandwidth ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 880ec9b9d90c..2218081d2e7a 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -4,9 +4,10 @@
 
 
 
-CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim, 
+CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim,  
+                                       string fileName, CParallelDataSorter *dataSorter,
                                        unsigned short iZone, unsigned short nZone) : 
-  iZone(iZone), nZone(nZone), CFileWriter(fields, ".su2", nDim){}
+  iZone(iZone), nZone(nZone), CFileWriter(fields, fileName, dataSorter, ".su2", nDim){}
 
 
 CSU2MeshFileWriter::~CSU2MeshFileWriter(){
@@ -14,10 +15,8 @@ CSU2MeshFileWriter::~CSU2MeshFileWriter(){
 }
 
 
-void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
+void CSU2MeshFileWriter::Write_Data(){
+    
   unsigned long iElem, iPoint, iElem_Bound, nElem_Bound_, vnodes_edge[2], vnodes_triangle[3], vnodes_quad[4], offset, nElem;
   unsigned short iMarker, iDim, iChar, VTK_Type, nMarker_;
   short SendTo;
@@ -29,7 +28,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   ofstream output_file;
   char cstr[MAX_STRING_SIZE], out_file[MAX_STRING_SIZE];
   
-  strcpy (out_file, filename.c_str());
+  strcpy (out_file, fileName.c_str());
   strcpy (cstr, out_file); 
   
   if (rank == MASTER_NODE){
@@ -53,7 +52,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
     
 //    output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
     
-    output_file << "NELEM= " << data_sorter->GetnElem() << endl;
+    output_file << "NELEM= " << dataSorter->GetnElem() << endl;
     
     output_file.close();
   }
@@ -65,59 +64,59 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   for (iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
-      for (iElem = 0; iElem < data_sorter->GetnElem(TRIANGLE); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(TRIANGLE); iElem++) {
         output_file << "5\t";                
-        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }
-      for (iElem = 0; iElem < data_sorter->GetnElem(QUADRILATERAL); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(QUADRILATERAL); iElem++) {
         output_file << "9\t";
-        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }
-      for (iElem = 0; iElem < data_sorter->GetnElem(TETRAHEDRON); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(TETRAHEDRON); iElem++) {
         output_file << "10\t";
-        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }  
-      for (iElem = 0; iElem < data_sorter->GetnElem(HEXAHEDRON); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(HEXAHEDRON); iElem++) {
         output_file << "12\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }
-      for (iElem = 0; iElem < data_sorter->GetnElem(PRISM); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(PRISM); iElem++) {
         output_file << "13\t";
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 3) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(PRISM, iElem, 5) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 0) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 3) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 4) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(PRISM, iElem, 5) - 1 << "\t";
         output_file << nElem + offset << "\n"; nElem++;
       }
       
-      for (iElem = 0; iElem < data_sorter->GetnElem(PYRAMID); iElem++) {
+      for (iElem = 0; iElem < dataSorter->GetnElem(PYRAMID); iElem++) {
         output_file << "14\t";
-        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0) - 1 << "\t"; 
-        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3) - 1 << "\t";
-        output_file << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0) - 1 << "\t"; 
+        output_file << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3) - 1 << "\t";
+        output_file << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4) - 1 << "\t"; 
         output_file << nElem + offset << "\n"; nElem++;
       }
     }
@@ -131,7 +130,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   /*--- Write the node coordinates ---*/
   if (rank == MASTER_NODE){
-    output_file << "NPOIN= " << data_sorter->GetnPointsGlobal();
+    output_file << "NPOIN= " << dataSorter->GetnPointsGlobal();
 //    if (geometry->GetGlobal_nPointDomain() != nGlobal_Poin_Par)
 //      output_file << "\t" << geometry->GetGlobal_nPointDomain();
     output_file << endl;
@@ -144,7 +143,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   for (iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
-      for (iPoint = 0; iPoint <  data_sorter->GetnPoints(); iPoint++) {
+      for (iPoint = 0; iPoint <  dataSorter->GetnPoints(); iPoint++) {
         
         /*--- Global Index of the current point. (note outer loop over procs) ---*/
         
@@ -158,7 +157,7 @@ void CSU2MeshFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
           /*--- Loop over the variables and write the values to file ---*/
           
           for (iDim = 0; iDim < nDim; iDim++) {
-            output_file << scientific << data_sorter->GetData(iDim, iPoint) << "\t";
+            output_file << scientific << dataSorter->GetData(iDim, iPoint) << "\t";
           }
           
           /*--- Write global index. (note outer loop over procs) ---*/
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 875d6ef3847d..257c67c40e5b 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -307,15 +307,16 @@ void CSurfaceFEMDataSorter::SortOutputData() {
 
 void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
 
-  
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting surface grid connectivity." << endl;
-  
-  
-  SortSurfaceConnectivity(config, geometry, LINE         );
-  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
-  
+  if (!connectivity_sorted){
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting surface grid connectivity." << endl;
+    
+    
+    SortSurfaceConnectivity(config, geometry, LINE         );
+    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+    
     
     unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
@@ -325,7 +326,7 @@ void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometr
 #endif
     
     connectivity_sorted = true;
-
+  }
 }
 
 
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index fe00a2c3c3d0..dc988a1afc80 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1070,30 +1070,31 @@ void CSurfaceFVMDataSorter::SortOutputData() {
 
 void CSurfaceFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
   
-  /*--- Sort connectivity for each type of element (excluding halos). Note
+  if (!connectivity_sorted){
+    /*--- Sort connectivity for each type of element (excluding halos). Note
    In these routines, we sort the connectivity into a linear partitioning
    across all processors based on the global index of the grid nodes. ---*/
-  
-  /*--- Sort volumetric grid connectivity. ---*/
-  
-  
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting surface grid connectivity." << endl;
-
-  SortSurfaceConnectivity(config, geometry, LINE         );
-  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
-  
-  
-  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
+    
+    /*--- Sort volumetric grid connectivity. ---*/
+    
+    
+    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+      cout <<"Sorting surface grid connectivity." << endl;
+    
+    SortSurfaceConnectivity(config, geometry, LINE         );
+    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+    
+    
+    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
-  nGlobal_Elem_Par   = nTotal_Surf_Elem;
+    nGlobal_Elem_Par   = nTotal_Surf_Elem;
 #else
-  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
-  
-  connectivity_sorted = true;
-  
+    
+    connectivity_sorted = true;
+  }
 }
 
 void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 9e359375fee1..df220f0bf430 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -4,16 +4,16 @@
 #endif
 #include <set>
 
-CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-  CFileWriter(fields, ".szplt", nDim), time_iter(time_iter), timestep(timestep){}
+CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim,
+                                                   string fileName, CParallelDataSorter *dataSorter,
+                                                   unsigned long time_iter, su2double timestep) : 
+  CFileWriter(fields, fileName, dataSorter, ".szplt", nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){}
 
-void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
-  if (!data_sorter->GetConnectivitySorted()){
+void CTecplotBinaryFileWriter::Write_Data(){
+    
+  if (!dataSorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
   }
   
@@ -30,13 +30,13 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   /*--- Reduce the total number of each element. ---*/
 
   unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
-                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
-                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
-                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
-                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
-                nParallel_Pris = data_sorter->GetnElem(PRISM),
-                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+  unsigned long nParallel_Line = dataSorter->GetnElem(LINE),
+                nParallel_Tria = dataSorter->GetnElem(TRIANGLE),
+                nParallel_Quad = dataSorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = dataSorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = dataSorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = dataSorter->GetnElem(PRISM),
+                nParallel_Pyra = dataSorter->GetnElem(PYRAMID);
 #ifdef HAVE_MPI
   SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
   SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
@@ -65,9 +65,9 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   tecplot_variable_names << fieldnames[fieldnames.size()-1];
 
   void* file_handle = NULL;
-  int32_t err = tecFileWriterOpen(filename.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
+  int32_t err = tecFileWriterOpen(fileName.c_str(), data_set_title.c_str(), tecplot_variable_names.str().c_str(),
     FILEFORMAT_SZL, FILETYPE_FULL, (int32_t)FieldDataType_Double, NULL, &file_handle);
-  if (err) cout << "Error opening Tecplot file '" << filename << "'" << endl;
+  if (err) cout << "Error opening Tecplot file '" << fileName << "'" << endl;
 
 #ifdef HAVE_MPI
   err = tecMPIInitialize(file_handle, MPI_COMM_WORLD, MASTER_NODE);
@@ -81,8 +81,8 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   int32_t zone_type;
   
   
-  num_nodes = static_cast<int64_t>(data_sorter->GetnPointsGlobal());
-  num_cells = static_cast<int64_t>(data_sorter->GetnElem());
+  num_nodes = static_cast<int64_t>(dataSorter->GetnPointsGlobal());
+  num_cells = static_cast<int64_t>(dataSorter->GetnElem());
   if (nDim == 3){
     if ((nTot_Quad > 0 || nTot_Tria > 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
       zone_type = ZONETYPE_FEQUADRILATERAL;
@@ -151,40 +151,40 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     /* Gather a list of nodes we refer to but are not outputting. */
 
     for (unsigned long i = 0; i < nParallel_Tria * N_POINTS_TRIANGLE; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(TRIANGLE, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(TRIANGLE, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(TRIANGLE, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(TRIANGLE, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(TRIANGLE, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(TRIANGLE, 0, i));
   
     for (unsigned long i = 0; i < nParallel_Quad * N_POINTS_QUADRILATERAL; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(QUADRILATERAL, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(QUADRILATERAL, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(QUADRILATERAL, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(QUADRILATERAL, 0, i));
 
     for (unsigned long i = 0; i < nParallel_Tetr * N_POINTS_TETRAHEDRON; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(TETRAHEDRON, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(TETRAHEDRON, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(TETRAHEDRON, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(TETRAHEDRON, 0, i));
 
     for (unsigned long i = 0; i < nParallel_Hexa * N_POINTS_HEXAHEDRON; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(HEXAHEDRON, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(HEXAHEDRON, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(HEXAHEDRON, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(HEXAHEDRON, 0, i));
       
     for (unsigned long i = 0; i < nParallel_Pris * N_POINTS_PRISM; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(PRISM, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(PRISM, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(PRISM, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(PRISM, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(PRISM, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(PRISM, 0, i));
     
     for (unsigned long i = 0; i < nParallel_Pyra * N_POINTS_PYRAMID; ++i)
-      if ((unsigned long)data_sorter->GetElem_Connectivity(PYRAMID, 0, i) <= data_sorter->GetNodeBegin(rank) || 
-          data_sorter->GetNodeEnd(rank) < (unsigned long)data_sorter->GetElem_Connectivity(PYRAMID, 0, i))
-        halo_nodes.insert(data_sorter->GetElem_Connectivity(PYRAMID, 0, i));
+      if ((unsigned long)dataSorter->GetElem_Connectivity(PYRAMID, 0, i) <= dataSorter->GetNodeBegin(rank) || 
+          dataSorter->GetNodeEnd(rank) < (unsigned long)dataSorter->GetElem_Connectivity(PYRAMID, 0, i))
+        halo_nodes.insert(dataSorter->GetElem_Connectivity(PYRAMID, 0, i));
 
     /* Sorted list of halo nodes for this MPI rank. */
     sorted_halo_nodes.assign(halo_nodes.begin(), halo_nodes.end());
         
     /* Have to include all nodes our cells refer to or TecIO will barf, so add the halo node count to the number of local nodes. */
-    int64_t partition_num_nodes = data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank) + static_cast<int64_t>(halo_nodes.size());
+    int64_t partition_num_nodes = dataSorter->GetNodeEnd(rank) - dataSorter->GetNodeBegin(rank) + static_cast<int64_t>(halo_nodes.size());
     int64_t partition_num_cells = nParallel_Tetr + nParallel_Hexa + nParallel_Pris + nParallel_Pyra;
 
     /*--- We effectively tack the halo nodes onto the end of the node list for this partition.
@@ -194,7 +194,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     vector<int32_t> neighbor_partitions(max((size_t)1, num_halo_nodes));
     vector<int64_t> neighbor_nodes(max((size_t)1, num_halo_nodes));
     for(int64_t i = 0; i < static_cast<int64_t>(num_halo_nodes); ++i) {
-      halo_node_local_numbers[i] = data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank) + i + 1;
+      halo_node_local_numbers[i] = dataSorter->GetNodeEnd(rank) - dataSorter->GetNodeBegin(rank) + i + 1;
       int owning_rank;
       unsigned long node_number;
       node_partitioner.GetOwningRankAndNodeNumber(sorted_halo_nodes[i], owning_rank, node_number);
@@ -249,8 +249,8 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
       values_to_receive_displacements[iRank] = nodes_to_receive_displacements[iRank] * fieldnames.size();
       for(iVar = 0; iVar < fieldnames.size(); ++iVar)
         for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
-          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - data_sorter->GetNodeBegin(rank) - 1;
-          data_to_send[index++] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,node_offset));
+          unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - dataSorter->GetNodeBegin(rank) - 1;
+          data_to_send[index++] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,node_offset));
         }
     }
     SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
@@ -266,11 +266,11 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   /*--- Write surface and volumetric solution data. ---*/
   
   if (zone_type == ZONETYPE_FEBRICK) {
-    std::vector<passivedouble> values_to_write(data_sorter->GetnPoints());
+    std::vector<passivedouble> values_to_write(dataSorter->GetnPoints());
     for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
-      for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
-        values_to_write[i] = SU2_TYPE::GetValue(data_sorter->GetData(iVar, i));
-      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, data_sorter->GetnPoints(), &values_to_write[0]);
+      for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
+        values_to_write[i] = SU2_TYPE::GetValue(dataSorter->GetData(iVar, i));
+      err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, dataSorter->GetnPoints(), &values_to_write[0]);
       if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
       for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
         if (num_nodes_to_receive[iRank] > 0) {
@@ -283,7 +283,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   } else {
     if (rank == MASTER_NODE) {
       vector<passivedouble> var_data;
-      unsigned long nPoint = data_sorter->GetnPoints();
+      unsigned long nPoint = dataSorter->GetnPoints();
       vector<unsigned long> num_points(size);
       SU2_MPI::Gather(&nPoint, 1, MPI_UNSIGNED_LONG, &num_points[0], 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
       
@@ -296,7 +296,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
             for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
               values_to_write.resize(rank_num_points);
               for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
-                values_to_write[i] = SU2_TYPE::GetValue(data_sorter->GetData(iVar,i));
+                values_to_write[i] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,i));
               err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]); 
               if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
             }
@@ -313,16 +313,16 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
       }
     }
     else { /* Send data to MASTER_NODE */
-      unsigned long nPoint = data_sorter->GetnPoints();
+      unsigned long nPoint = dataSorter->GetnPoints();
       
       SU2_MPI::Gather(&nPoint, 1, MPI_UNSIGNED_LONG, NULL, 1, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
     
       vector<passivedouble> var_data;
-      size_t var_data_size = fieldnames.size() * data_sorter->GetnPoints();
+      size_t var_data_size = fieldnames.size() * dataSorter->GetnPoints();
       var_data.reserve(var_data_size);
       for (iVar = 0; err == 0 && iVar < fieldnames.size() ; iVar++)
-          for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
-            var_data.push_back(SU2_TYPE::GetValue(data_sorter->GetData(iVar,i)));
+          for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
+            var_data.push_back(SU2_TYPE::GetValue(dataSorter->GetData(iVar,i)));
       
       if (var_data.size() > 0)
         SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
@@ -334,14 +334,14 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   unsigned short iVar;
   
   vector<passivedouble> var_data;
-  size_t var_data_size = fieldnames.size() * data_sorter->GetnPoints();
+  size_t var_data_size = fieldnames.size() * dataSorter->GetnPoints();
   var_data.reserve(var_data_size);
   
 
   for (iVar = 0; err == 0 && iVar <  fieldnames.size(); iVar++) {
-    for(unsigned long i = 0; i < data_sorter->GetnPoints(); ++i)
-      var_data.push_back(SU2_TYPE::GetValue(data_sorter->GetData(iVar,i)));
-    err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, data_sorter->GetnPoints(), &var_data[iVar * data_sorter->GetnPoints()]);
+    for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
+      var_data.push_back(SU2_TYPE::GetValue(dataSorter->GetData(iVar,i)));
+    err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, dataSorter->GetnPoints(), &var_data[iVar * dataSorter->GetnPoints()]);
     if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
   }
   
@@ -362,16 +362,16 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
      *  Ghost (halo) nodes identified above are numbered sequentially just beyond the end of the actual, local nodes.
      *  Note that beg_node and end_node refer to zero-based node numbering, but Conn_* contain one-based node numbers.
      */
-#define MAKE_LOCAL(n) data_sorter->GetNodeBegin(rank) < (unsigned long)n && (unsigned long)n <= data_sorter->GetNodeEnd(rank) \
-  ? (int64_t)((unsigned long)n - data_sorter->GetNodeBegin(rank)) \
-  : GetHaloNodeNumber(n, data_sorter->GetNodeEnd(rank) - data_sorter->GetNodeBegin(rank), sorted_halo_nodes)
+#define MAKE_LOCAL(n) dataSorter->GetNodeBegin(rank) < (unsigned long)n && (unsigned long)n <= dataSorter->GetNodeEnd(rank) \
+  ? (int64_t)((unsigned long)n - dataSorter->GetNodeBegin(rank)) \
+  : GetHaloNodeNumber(n, dataSorter->GetNodeEnd(rank) - dataSorter->GetNodeBegin(rank), sorted_halo_nodes)
 
     for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0));
-      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1));
-      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2));
+      nodes[0] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0));
+      nodes[1] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1));
+      nodes[2] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2));
       nodes[3] = nodes[2];
-      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3));
+      nodes[4] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3));
       nodes[5] = nodes[4];
       nodes[6] = nodes[4];
       nodes[7] = nodes[4];
@@ -380,37 +380,37 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
     }
 
     for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0));
-      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1));
-      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2));
-      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3));
-      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4));
-      nodes[5] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5));
-      nodes[6] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6));
-      nodes[7] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7));
+      nodes[0] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0));
+      nodes[1] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1));
+      nodes[2] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2));
+      nodes[3] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3));
+      nodes[4] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4));
+      nodes[5] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5));
+      nodes[6] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6));
+      nodes[7] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7));
       err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
       if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
       
     for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 0));
-      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 1));
+      nodes[0] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 0));
+      nodes[1] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 1));
       nodes[2] = nodes[1];
-      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 2));
-      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 3));
-      nodes[5] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 4));
+      nodes[3] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 2));
+      nodes[4] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 3));
+      nodes[5] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 4));
       nodes[6] = nodes[5];
-      nodes[7] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PRISM, iElem, 5));
+      nodes[7] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PRISM, iElem, 5));
       err = tecZoneNodeMapWrite64(file_handle, zone, rank + 1, 1, 8, nodes);
       if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
     }
     
     for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-      nodes[0] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0));
-      nodes[1] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1));
-      nodes[2] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2));
-      nodes[3] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3));
-      nodes[4] = MAKE_LOCAL(data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4));
+      nodes[0] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0));
+      nodes[1] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1));
+      nodes[2] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2));
+      nodes[3] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3));
+      nodes[4] = MAKE_LOCAL(dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4));
       nodes[5] = nodes[4];
       nodes[6] = nodes[4];
       nodes[7] = nodes[4];
@@ -431,26 +431,26 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
       for(int iRank = 0; iRank < size; ++iRank) {
         if (iRank == rank) {
           for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-            nodes[0] = data_sorter->GetElem_Connectivity(LINE, iElem, 0);
-            nodes[1] = data_sorter->GetElem_Connectivity(LINE, iElem, 1);
+            nodes[0] = dataSorter->GetElem_Connectivity(LINE, iElem, 0);
+            nodes[1] = dataSorter->GetElem_Connectivity(LINE, iElem, 1);
             err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 2, nodes);
             if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
           }
           
           for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-            nodes[0] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
-            nodes[1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
-            nodes[2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
-            nodes[3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+            nodes[0] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
+            nodes[1] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
+            nodes[2] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+            nodes[3] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
             err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
             if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
           }
           
           for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-            nodes[0] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
-            nodes[1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
-            nodes[2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
-            nodes[3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
+            nodes[0] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
+            nodes[1] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
+            nodes[2] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
+            nodes[3] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
             err = tecZoneNodeMapWrite64(file_handle, zone, 0, 1, 4, nodes);
             if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
           }
@@ -472,22 +472,22 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
       vector<int64_t> connectivity;
       connectivity.reserve(connectivity_size);
       for (iElem = 0; err == 0 && iElem < nParallel_Line; iElem++) {
-        connectivity.push_back(data_sorter->GetElem_Connectivity(LINE, iElem, 0));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(LINE, iElem, 0));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(LINE, iElem, 0));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(LINE, iElem, 0));
       }
       
       for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2));
       }
       
       for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2));
-        connectivity.push_back(data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2));
+        connectivity.push_back(dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3));
       }
       
       if (connectivity.empty()) connectivity.resize(1); /* Avoid crash */
@@ -499,71 +499,71 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
   int64_t nodes[8];
   
   for (iElem = 0; err == 0 && iElem < nParallel_Tria; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
-    nodes[3] = data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+    nodes[0] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
+    nodes[3] = dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
   
   for (iElem = 0; err == 0 && iElem < nParallel_Quad; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
-    nodes[3] = data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
+    nodes[0] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2);
+    nodes[3] = dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 4, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
   
   for (iElem = 0; err == 0 && iElem < nParallel_Tetr; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
-    nodes[3] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
-    nodes[4] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
-    nodes[5] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
-    nodes[6] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
-    nodes[7] = data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[0] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
+    nodes[3] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2);
+    nodes[4] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[5] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[6] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
+    nodes[7] = dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
   
   for (iElem = 0; err == 0 && iElem < nParallel_Hexa; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2);
-    nodes[3] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3);
-    nodes[4] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4);
-    nodes[5] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5);
-    nodes[6] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6);
-    nodes[7] = data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7);
+    nodes[0] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2);
+    nodes[3] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3);
+    nodes[4] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4);
+    nodes[5] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5);
+    nodes[6] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6);
+    nodes[7] = dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
   
   for (iElem = 0; err == 0 && iElem < nParallel_Pris; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(PRISM, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(PRISM, iElem, 1);
-    nodes[3] = data_sorter->GetElem_Connectivity(PRISM, iElem, 2);
-    nodes[4] = data_sorter->GetElem_Connectivity(PRISM, iElem, 3);
-    nodes[5] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4);
-    nodes[6] = data_sorter->GetElem_Connectivity(PRISM, iElem, 4);
-    nodes[7] = data_sorter->GetElem_Connectivity(PRISM, iElem, 5);
+    nodes[0] = dataSorter->GetElem_Connectivity(PRISM, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(PRISM, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(PRISM, iElem, 1);
+    nodes[3] = dataSorter->GetElem_Connectivity(PRISM, iElem, 2);
+    nodes[4] = dataSorter->GetElem_Connectivity(PRISM, iElem, 3);
+    nodes[5] = dataSorter->GetElem_Connectivity(PRISM, iElem, 4);
+    nodes[6] = dataSorter->GetElem_Connectivity(PRISM, iElem, 4);
+    nodes[7] = dataSorter->GetElem_Connectivity(PRISM, iElem, 5);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
   
   for (iElem = 0; err == 0 && iElem < nParallel_Pyra; iElem++) {
-    nodes[0] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0);
-    nodes[1] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1);
-    nodes[2] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2);
-    nodes[3] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3);
-    nodes[4] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
-    nodes[5] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
-    nodes[6] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
-    nodes[7] = data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[0] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0);
+    nodes[1] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1);
+    nodes[2] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2);
+    nodes[3] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3);
+    nodes[4] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[5] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[6] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4);
+    nodes[7] = dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4);
     err = tecZoneNodeMapWrite64(file_handle, zone, rank, 1, 8, nodes);
     if (err) cout << rank << ": Error outputting Tecplot node values." << endl;
   }
@@ -586,7 +586,7 @@ void CTecplotBinaryFileWriter::Write_Data(string filename, CParallelDataSorter *
 #endif
   UsedTime = StopTime-StartTime;
 
-  file_size = Determine_Filesize(filename);
+  file_size = Determine_Filesize(fileName);
   
   /*--- Compute and store the bandwidth ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index b3c629181776..22068e1d9056 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,15 +1,15 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
-CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, unsigned long time_iter, su2double timestep) : 
-   CFileWriter(fields, ".dat", nDim), time_iter(time_iter), timestep(timestep){}
+CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, 
+                                       string fileName, CParallelDataSorter *dataSorter,
+                                       unsigned long time_iter, su2double timestep) : 
+   CFileWriter(fields, fileName, dataSorter, ".dat", nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotFileWriter::~CTecplotFileWriter(){}
 
-void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_sorter){
-  
-  filename += file_ext;
-  
-  if (!data_sorter->GetConnectivitySorted()){
+void CTecplotFileWriter::Write_Data(){
+    
+  if (!dataSorter->GetConnectivitySorted()){
     SU2_MPI::Error("Connectivity must be sorted.", CURRENT_FUNCTION);
   }
   
@@ -34,13 +34,13 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   /*--- Reduce the total number of each element. ---*/
 
   unsigned long nTot_Line, nTot_Tria, nTot_Quad, nTot_Tetr, nTot_Hexa, nTot_Pris, nTot_Pyra;
-  unsigned long nParallel_Line = data_sorter->GetnElem(LINE),
-                nParallel_Tria = data_sorter->GetnElem(TRIANGLE),
-                nParallel_Quad = data_sorter->GetnElem(QUADRILATERAL),
-                nParallel_Tetr = data_sorter->GetnElem(TETRAHEDRON),
-                nParallel_Hexa = data_sorter->GetnElem(HEXAHEDRON),
-                nParallel_Pris = data_sorter->GetnElem(PRISM),
-                nParallel_Pyra = data_sorter->GetnElem(PYRAMID);
+  unsigned long nParallel_Line = dataSorter->GetnElem(LINE),
+                nParallel_Tria = dataSorter->GetnElem(TRIANGLE),
+                nParallel_Quad = dataSorter->GetnElem(QUADRILATERAL),
+                nParallel_Tetr = dataSorter->GetnElem(TETRAHEDRON),
+                nParallel_Hexa = dataSorter->GetnElem(HEXAHEDRON),
+                nParallel_Pris = dataSorter->GetnElem(PRISM),
+                nParallel_Pyra = dataSorter->GetnElem(PYRAMID);
 #ifdef HAVE_MPI
   SU2_MPI::Allreduce(&nParallel_Line, &nTot_Line, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
   SU2_MPI::Allreduce(&nParallel_Tria, &nTot_Tria, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
@@ -63,7 +63,7 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   /*--- Open Tecplot ASCII file and write the header. ---*/
   
   if (rank == MASTER_NODE) {
-    Tecplot_File.open(filename.c_str(), ios::out);
+    Tecplot_File.open(fileName.c_str(), ios::out);
     Tecplot_File.precision(6);
     Tecplot_File << "TITLE = \"Visualization of the solution\"" << endl;
     
@@ -97,7 +97,7 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
 //      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
 //    }
     
-    Tecplot_File << "NODES= "<< data_sorter->GetnPointsGlobal() <<", ELEMENTS= "<< data_sorter->GetnElem();
+    Tecplot_File << "NODES= "<< dataSorter->GetnPointsGlobal() <<", ELEMENTS= "<< dataSorter->GetnElem();
     
     if (nDim == 3){
       if ((nTot_Quad > 0 || nTot_Tria > 0) && (nTot_Hexa + nTot_Pris + nTot_Pyra + nTot_Tetr == 0)){
@@ -124,7 +124,7 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
   
   /*--- Each processor opens the file. ---*/
   
-  Tecplot_File.open(filename.c_str(), ios::out | ios::app);
+  Tecplot_File.open(fileName.c_str(), ios::out | ios::app);
   
   /*--- Write surface and volumetric solution data. ---*/
   
@@ -134,9 +134,9 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
       /*--- Write the node data from this proc ---*/
       
       
-      for (iPoint = 0; iPoint < data_sorter->GetnPoints(); iPoint++) {
+      for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
         for (iVar = 0; iVar < fieldnames.size(); iVar++)
-          Tecplot_File << scientific << data_sorter->GetData(iVar, iPoint) << "\t";
+          Tecplot_File << scientific << dataSorter->GetData(iVar, iPoint) << "\t";
         Tecplot_File << endl;
       }
     }
@@ -154,51 +154,51 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
     if (rank == iProcessor) {
       
       for (iElem = 0; iElem < nParallel_Line; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(LINE, iElem, 0) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(LINE, iElem, 1)<< "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(LINE, iElem, 0) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(LINE, iElem, 1)<< "\n";
       }
       
       
       for (iElem = 0; iElem < nParallel_Tria; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 0) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 0) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TRIANGLE, iElem, 2) << "\n";
       }
       
       for (iElem = 0; iElem < nParallel_Quad; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) << "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 0) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 2) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(QUADRILATERAL, iElem, 3) << "\n";
       }
       
       for (iElem = 0; iElem < nParallel_Tetr; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\n";        
+        Tecplot_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 0) << "\t" << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t" << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 2) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\t" << dataSorter->GetElem_Connectivity(TETRAHEDRON, iElem, 3) << "\n";        
       }
       
       for (iElem = 0; iElem < nParallel_Hexa; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) << "\t" << data_sorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) << "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 0) << "\t" << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 2) << "\t" << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 3) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 4) << "\t" << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 5) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 6) << "\t" << dataSorter->GetElem_Connectivity(HEXAHEDRON, iElem, 7) << "\n";
       }
       
       for (iElem = 0; iElem < nParallel_Pris; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 2) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 3) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PRISM, iElem, 5) << "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 0) << "\t" << dataSorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 1) << "\t" << dataSorter->GetElem_Connectivity(PRISM, iElem, 2) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 3) << "\t" << dataSorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PRISM, iElem, 4) << "\t" << dataSorter->GetElem_Connectivity(PRISM, iElem, 5) << "\n";
       }
       
       for (iElem = 0; iElem < nParallel_Pyra; iElem++) {
-        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 0) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 1) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 2) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 3) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t";
-        Tecplot_File << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << data_sorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\n";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 0) << "\t" << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 1) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 2) << "\t" << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 3) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t";
+        Tecplot_File << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\t" << dataSorter->GetElem_Connectivity(PYRAMID, iElem, 4) << "\n";
       }
       
       
@@ -220,7 +220,7 @@ void CTecplotFileWriter::Write_Data(string filename, CParallelDataSorter *data_s
 #endif
   UsedTime = StopTime-StartTime;
   
-  file_size = Determine_Filesize(filename);
+  file_size = Determine_Filesize(fileName);
   
   /*--- Compute and store the bandwidth ---*/
   
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 8ed5101b8c9b..716a90f7074d 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -4408,10 +4408,8 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
     strcat(cstr, buffer);
   }
   
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-           (config->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+  if ((config->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
+  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
   else if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".csv");
   strcat(cstr, buffer);
   
@@ -4520,9 +4518,7 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
   
   if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW) ||
-      (config->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+      (config->GetOutput_FileFormat() == TECPLOT_BINARY)) {
     ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
     ConvHist_file[0] << "VARIABLES = ";
   }
@@ -4600,9 +4596,7 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   }
 
   if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY ||
-      config->GetOutput_FileFormat() == FIELDVIEW ||
-      config->GetOutput_FileFormat() == FIELDVIEW_BINARY) {
+      config->GetOutput_FileFormat() == TECPLOT_BINARY) {
     ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
   }
   
@@ -8431,14 +8425,7 @@ void COutputLegacy::SetResult_Files(CSolver *****solver_container, CGeometry ***
             DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
             break;
             
-          case FIELDVIEW:
-            
-            /*--- Write a FieldView ASCII file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
-//            SetFieldViewASCII(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
+       
             
           case TECPLOT_BINARY:
             
@@ -8448,15 +8435,7 @@ void COutputLegacy::SetResult_Files(CSolver *****solver_container, CGeometry ***
 //            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][INST_0][MESH_0], iZone);
             break;
             
-          case FIELDVIEW_BINARY:
-            
-            /*--- Write a FieldView binary file ---*/
-            
-            if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
-//            SetFieldViewBinary(config[iZone], geometry[iZone][INST_0][MESH_0], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][INST_0][MESH_0], false);
-            break;
-            
+     
           case PARAVIEW:
             
             /*--- Write a Paraview ASCII file ---*/
@@ -8605,15 +8584,6 @@ void COutputLegacy::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geom
             DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
             break;
 
-          case FIELDVIEW:
-
-            /*--- Write a FieldView ASCII file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-//            SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
-
           case TECPLOT_BINARY:
 
             /*--- Write a Tecplot binary solution file ---*/
@@ -8623,14 +8593,6 @@ void COutputLegacy::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geom
 //            SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
             break;
 
-          case FIELDVIEW_BINARY:
-
-            /*--- Write a binary binary file ---*/
-
-            if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-//            SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-            DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-            break;
 
           case PARAVIEW:
 
@@ -11354,10 +11316,8 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
       strcat(cstr, buffer);
     }
 
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW)) SPRINTF (buffer, ".dat");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-             (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY))  SPRINTF (buffer, ".plt");
+    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
+    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
     else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW) || (config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".vtk");
     strcat(cstr, buffer);
 
@@ -11390,9 +11350,7 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
     char end[]= ",\"Time(min)\"\n";
 
     if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == FIELDVIEW_BINARY)) {
+        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY)) {
         FSIHist_file[0] << "TITLE = \"SU2 FSI Simulation\"" << endl;
         FSIHist_file[0] << "VARIABLES = ";
     }
@@ -12577,14 +12535,7 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
             break;
 
-          case FIELDVIEW:
-
-            /*--- We do not yet have a version of FieldView ASCII for new parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-
-            break;
+       
 
           case TECPLOT_BINARY:
 
@@ -12597,13 +12548,7 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
 //                solver_container[iZone][iInst][MESH_0], iZone, val_nZone, iInst, nInst, false);
             break;
 
-          case FIELDVIEW_BINARY:
-
-            /*--- FieldView binary files not yet available for parallel output. ---*/
-
-            if (rank == MASTER_NODE) cout << "FieldView ASCII volume files not available in serial with SU2_CFD." << endl;
-            if (rank == MASTER_NODE) cout << "  Run SU2_SOL to generate FieldView ASCII." << endl;
-            break;
+         
 
           case PARAVIEW:
 
@@ -20797,14 +20742,6 @@ void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry
               DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
               break;
 
-            case FIELDVIEW:
-
-              /*--- Write a FieldView ASCII file ---*/
-
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file volume solution file." << endl;
-//              SetFieldViewASCII(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
 
             case TECPLOT_BINARY:
 
@@ -20815,15 +20752,7 @@ void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry
               DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
               break;
 
-            case FIELDVIEW_BINARY:
-
-              /*--- Write a FieldView binary file ---*/
-
-              if (rank == MASTER_NODE) cout << "Writing FieldView binary file volume solution file." << endl;
-//              SetFieldViewBinary(config[iZone], geometry[iZone][MESH_0], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][MESH_0], false);
-              break;
-
+           
             case PARAVIEW:
 
               /*--- Write a Paraview ASCII file ---*/
@@ -20974,14 +20903,6 @@ void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***
               DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
               break;
 
-            case FIELDVIEW:
-
-              /*--- Write a FieldView ASCII file ---*/
-
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-//              SetFieldViewASCII(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
 
             case TECPLOT_BINARY:
 
@@ -20992,14 +20913,6 @@ void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***
 //              SetTecplotBinary_DomainSolution(config[iZone], geometry[iZone][iInst], iZone);
               break;
 
-            case FIELDVIEW_BINARY:
-
-              /*--- Write a binary binary file ---*/
-
-              if (rank == MASTER_NODE) cout << "Writing FieldView ASCII file (volume grid)." << endl;
-//              SetFieldViewBinary(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
-              DeallocateConnectivity(config[iZone], geometry[iZone][iInst], false);
-              break;
 
             case PARAVIEW:
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index bfb754dc6e9b..dc427504935b 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -236,27 +236,27 @@ int main(int argc, char *argv[]) {
     
     for (iZone = 0; iZone < nZone; iZone++){
       
-      /*--- Load the data --- */
+//      /*--- Load the data --- */
       
-      output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
+//      output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
       
-      if (config_container[iZone]->GetVisualize_Volume_Def()){
+//      if (config_container[iZone]->GetVisualize_Volume_Def()){
         
-        /*--- If requested, write the volume output for visualization purposes --- */
+//        /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
+//        output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
       
-      } 
+//      } 
       
-      if (config_container[iZone]->GetVisualize_Surface_Def()){
+//      if (config_container[iZone]->GetVisualize_Surface_Def()){
         
-        /*--- If requested, write the volume output for visualization purposes --- */
+//        /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
+//        output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
         
-      }
+//      }
       
-      output[iZone]->DeallocateData_Parallel();
+//      output[iZone]->DeallocateData_Parallel();
       
     }
   }
@@ -340,40 +340,40 @@ int main(int argc, char *argv[]) {
   
   for (iZone = 0; iZone < nZone; iZone++){
     
-    /*--- Load the data --- */
+//    /*--- Load the data --- */
     
-    output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
+//    output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
     
-    /*--- Write the in the native su2 format ---*/
+//    /*--- Write the in the native su2 format ---*/
     
-    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH, false);
+//    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH, false);
     
     
-    if (config_container[iZone]->GetVisualize_Volume_Def()){
+//    if (config_container[iZone]->GetVisualize_Volume_Def()){
       
-      /*--- Add a deformed identifier to the filename --- */
+//      /*--- Add a deformed identifier to the filename --- */
       
-      output[iZone]->SetVolume_Filename(output[iZone]->GetVolume_Filename() + string("_deformed"));    
+//      output[iZone]->SetVolume_Filename(output[iZone]->GetVolume_Filename() + string("_deformed"));    
       
-      /*--- If requested, write the volume output for visualization purposes --- */
+//      /*--- If requested, write the volume output for visualization purposes --- */
       
-      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
+//      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
     
-    } 
+//    } 
     
-    if (config_container[iZone]->GetVisualize_Surface_Def()){
+//    if (config_container[iZone]->GetVisualize_Surface_Def()){
       
-      /*--- Add a deformed identifier to the filename --- */
+//      /*--- Add a deformed identifier to the filename --- */
       
-      output[iZone]->SetSurface_Filename(output[iZone]->GetSurface_Filename() + string("_deformed"));
+//      output[iZone]->SetSurface_Filename(output[iZone]->GetSurface_Filename() + string("_deformed"));
       
-      /*--- If requested, write the volume output for visualization purposes --- */
+//      /*--- If requested, write the volume output for visualization purposes --- */
       
-      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
+//      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
       
-    }
+//    }
     
-    output[iZone]->DeallocateData_Parallel();
+//    output[iZone]->DeallocateData_Parallel();
     
   }
 
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 00cb0f55ecd8..9e349bc79d12 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -989,21 +989,21 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
     output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0]->GetnDim(), solver);
     output->PreprocessVolumeOutput(config[iZone]);
     
-    /*--- Load the data --- */
+//    /*--- Load the data --- */
     
-    output->Load_Data(geometry[iZone][INST_0], config[iZone], &solver);
+//    output->Load_Data(geometry[iZone][INST_0], config[iZone], &solver);
 
-    /*--- Set the surface filename ---*/
+//    /*--- Set the surface filename ---*/
     
-    output->SetSurface_Filename(config[iZone]->GetSurfSens_FileName());
+//    output->SetSurface_Filename(config[iZone]->GetSurfSens_FileName());
     
-    /*--- Write to file ---*/
+//    /*--- Write to file ---*/
     
-    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat(), false);
+//    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat(), false);
 
-    /*--- Deallocate ---*/
+//    /*--- Deallocate ---*/
     
-    output->DeallocateData_Parallel();
+//    output->DeallocateData_Parallel();
     
     /*--- Free memory ---*/
     
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 73fa393ea34a..96a83f088a95 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -418,7 +418,10 @@ def read_config(filename):
                 data_dict[this_param] = int(this_value)
                 break                
             
-            
+            if case("OUTPUT_FILES"):
+                data_dict[this_param] = this_value.strip("()").split(",")
+                break
+
             # unitary design variable definition
             if case("DEFINITION_DV"):
                 # remove white space
@@ -834,7 +837,16 @@ def write_config(filename,param_dict):
                         output_file.write(", ")
                 output_file.write(" )") 
                 break                
-            
+            if case("OUTPUT_FILES"):
+                n_lists = len(new_value)
+                output_file.write("(")
+                for i_value in range(n_lists):
+                    output_file.write(new_value[i_value])
+                    if i_value+1 < n_lists:
+                        output_file.write(", ")
+                output_file.write(")")
+                break
+
             # semicolon delimited lists of comma delimited lists
             if case("DV_PARAM") :
 
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 862b9d0d655f..43e97c96d9fd 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -1003,9 +1003,6 @@ def get_specialCases(config):
     if len(special_cases) > 1:
         error_str = 'Currently cannot support ' + ' and '.join(special_cases) + ' at once'
         raise Exception(error_str)   
-    
-    if (config['WRT_SOL_FREQ'] != 1) and ('WRT_UNSTEADY' in special_cases):
-        raise Exception('Must set WRT_SOL_FREQ= 1 for WRT_UNSTEADY= YES')
   
     # Special case for harmonic balance
     if 'TIME_MARCHING' in config and config['TIME_MARCHING'] == 'HARMONIC_BALANCE':
@@ -1169,7 +1166,7 @@ def restart2solution(config,state={}):
         restart = restart.split('.')[0]
         solution = solution.split('.')[0]
         
-        if config.get('WRT_BINARY_RESTART', 'YES') == 'NO':
+        if 'RESTART_ASCII' in config.get('OUTPUT_FILES', ['RESTART_BINARY']):
             restart += '.csv'
             solution += '.csv'
         else:
@@ -1195,7 +1192,7 @@ def restart2solution(config,state={}):
         restart = restart.split('.')[0]
         solution = solution.split('.')[0]
 
-        if config.get('WRT_BINARY_RESTART', 'YES') == 'NO':
+        if 'RESTART_ASCII' in config.get('OUTPUT_FILES', ['RESTART_BINARY']):
             restart += '.csv'
             solution += '.csv'
         else:
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 44a3508c378b..61e35cef5c8a 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -321,21 +321,21 @@ int main(int argc, char *argv[]) {
           
           for (iZone = 0; iZone < nZone; iZone++){
             
-            /*--- Load history data (volume output might require some values) --- */
+//            /*--- Load history data (volume output might require some values) --- */
             
-            output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+//            output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
             
-            /*--- Load the data --- */
+//            /*--- Load the data --- */
             
-            output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//            output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
             
-            /*--- If requested, write the volume output for visualization purposes --- */
+//            /*--- If requested, write the volume output for visualization purposes --- */
             
-            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
+//            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
     
-            /*--- Deallocate data --- */
+//            /*--- Deallocate data --- */
             
-            output[iZone]->DeallocateData_Parallel();
+//            output[iZone]->DeallocateData_Parallel();
           
           }
         }
@@ -359,21 +359,21 @@ int main(int argc, char *argv[]) {
       }
       for (iZone = 0; iZone < nZone; iZone++){
         
-        /*--- Load history data (volume output might require some values) --- */
+//        /*--- Load history data (volume output might require some values) --- */
         
-        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
+//        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
         
-        /*--- Load the data --- */
+//        /*--- Load the data --- */
         
-        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
       
-        /*--- If requested, write the volume output for visualization purposes --- */
+//        /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
+//        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
 
-        /*--- Deallocate data --- */
+//        /*--- Deallocate data --- */
         
-        output[iZone]->DeallocateData_Parallel();
+//        output[iZone]->DeallocateData_Parallel();
         
       }
     }
@@ -470,21 +470,21 @@ int main(int argc, char *argv[]) {
         if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
         for (iZone = 0; iZone < nZone; iZone++){
           
-          /*--- Load history data (volume output might require some values) --- */
+//          /*--- Load history data (volume output might require some values) --- */
           
-          output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+//          output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
           
-          /*--- Load the data --- */
+//          /*--- Load the data --- */
           
-          output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//          output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
         
-          /*--- If requested, write the volume output for visualization purposes --- */
+//          /*--- If requested, write the volume output for visualization purposes --- */
           
-          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
+//          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
   
-          /*--- Deallocate data --- */
+//          /*--- Deallocate data --- */
           
-          output[iZone]->DeallocateData_Parallel();
+//          output[iZone]->DeallocateData_Parallel();
           
         }
       }
@@ -635,21 +635,21 @@ int main(int argc, char *argv[]) {
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
                 
-                /*--- Load history data (volume output might require some values) --- */
+//                /*--- Load history data (volume output might require some values) --- */
                 
-                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+//                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
                 
-                /*--- Load the data --- */
+//                /*--- Load the data --- */
                 
-                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
               
-                /*--- If requested, write the volume output for visualization purposes --- */
+//                /*--- If requested, write the volume output for visualization purposes --- */
                 
-                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
+//                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
         
-                /*--- Deallocate data --- */
+//                /*--- Deallocate data --- */
                 
-                output[iZone]->DeallocateData_Parallel();
+//                output[iZone]->DeallocateData_Parallel();
                 
               }
         }
@@ -682,21 +682,21 @@ int main(int argc, char *argv[]) {
             cout << "Storing the volume solution for time instance " << iInst << "." << endl;
           }
 
-          /*--- Load history data (volume output might require some values) --- */
+//          /*--- Load history data (volume output might require some values) --- */
           
-          output[iZone]->SetHistory_Output(geometry_container[iZone][iInst], &solver_container[iZone][iInst], config_container[iZone], iInst, 0, 0);
+//          output[iZone]->SetHistory_Output(geometry_container[iZone][iInst], &solver_container[iZone][iInst], config_container[iZone], iInst, 0, 0);
             
-          /*--- Load the data --- */
+//          /*--- Load the data --- */
           
-          output[iZone]->Load_Data(geometry_container[iZone][iInst], config_container[iZone], &solver_container[iZone][iInst]);
+//          output[iZone]->Load_Data(geometry_container[iZone][iInst], config_container[iZone], &solver_container[iZone][iInst]);
           
-          /*--- If requested, write the volume output for visualization purposes --- */
+//          /*--- If requested, write the volume output for visualization purposes --- */
           
-          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat(), true);
+//          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat(), true);
           
-          /*--- Deallocate data --- */
+//          /*--- Deallocate data --- */
           
-          output[iZone]->DeallocateData_Parallel();
+//          output[iZone]->DeallocateData_Parallel();
           
           
         }
@@ -764,21 +764,21 @@ int main(int argc, char *argv[]) {
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
 
-                /*--- Load history data (volume output might require some values) --- */
+//                /*--- Load history data (volume output might require some values) --- */
                 
-                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
+//                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
                                 
-                /*--- Load the data --- */
+//                /*--- Load the data --- */
                 
-                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
               
-                /*--- If requested, write the volume output for visualization purposes --- */
+//                /*--- If requested, write the volume output for visualization purposes --- */
                 
-                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
+//                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
         
-                /*--- Deallocate data --- */
+//                /*--- Deallocate data --- */
                 
-                output[iZone]->DeallocateData_Parallel();
+//                output[iZone]->DeallocateData_Parallel();
                 
               }        
         }
@@ -806,21 +806,21 @@ int main(int argc, char *argv[]) {
       
       for (iZone = 0; iZone < nZone; iZone++){
       
-        /*--- Load history data (volume output might require some values) --- */
+//        /*--- Load history data (volume output might require some values) --- */
         
-        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
+//        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
         
-        /*--- Load the data --- */
+//        /*--- Load the data --- */
         
-        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+//        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
         
-        /*--- If requested, write the volume output for visualization purposes --- */
+//        /*--- If requested, write the volume output for visualization purposes --- */
         
-        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
+//        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
         
-        /*--- Deallocate data --- */
+//        /*--- Deallocate data --- */
         
-        output[iZone]->DeallocateData_Parallel();
+//        output[iZone]->DeallocateData_Parallel();
         
       }
     }

From 38add690f761adf9793844a9774bccde4a8c0306 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 11 Sep 2019 11:30:52 +0200
Subject: [PATCH 463/539] Added forces break down file for new output

---
 SU2_CFD/include/output/CFlowOutput.hpp |    9 +-
 SU2_CFD/include/output/COutput.hpp     |    8 +-
 SU2_CFD/src/output/CFlowOutput.cpp     | 1868 +++++++++++++++++++++++-
 3 files changed, 1875 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index 96f82ad2d07d..fbccd40276ec 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -98,7 +98,12 @@ class CFlowOutput : public COutput{
    * \brief Write information to meta data file
    * \param[in] output - Container holding the output instances per zone.   
    * \param[in] config - Definition of the particular problem per zone.
-   * \param[in] solver - The container holding all solution data.
    */
-  void WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
+  void WriteMetaData(CConfig *config, CGeometry *geometry);
+  
+  void WriteAdditionalFiles(CConfig *config, CGeometry *geometry, CSolver **solver_container) override;
+  
+  bool WriteVolume_Output(CConfig *config, unsigned long Iter) override;
+  
+  void WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSolver **solver_container);
 };
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 6d27aed07e5d..337487d0d6e0 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -749,13 +749,7 @@ class COutput {
    */
   inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
   
-  /*!
-   * \brief Write information to meta data file
-   * \param[in] output - Container holding the output instances per zone.   
-   * \param[in] config - Definition of the particular problem per zone.
-   * \param[in] solver - The container holding all solution data.
-   */
-  inline virtual void WriteMetaData(CConfig *config, CGeometry *geometry, CSolver** solver) {}
+  inline virtual void WriteAdditionalFiles(CConfig *config, CGeometry* geometry, CSolver** solver_container){}
 
 };
 
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 9d4921902e08..0c026cfa6499 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -922,7 +922,19 @@ void CFlowOutput::Set_CpInverseDesign(CSolver *solver, CGeometry *geometry, CCon
 
 }
 
-void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **solver){
+void CFlowOutput::WriteAdditionalFiles(CConfig *config, CGeometry *geometry, CSolver **solver_container){
+  
+  if (config->GetFixed_CL_Mode() || config->GetFixed_CM_Mode()){
+    WriteMetaData(config, geometry);
+  }
+  
+  if (config->GetWrt_ForcesBreakdown()){
+    WriteForcesBreakdown(config, geometry, solver_container);
+  }
+  
+}
+
+void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry){
     
   ofstream meta_file;
   
@@ -958,3 +970,1857 @@ void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry, CSolver **
   meta_file.close();
   
 }
+
+void CFlowOutput::WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSolver **solver_container){
+  
+  char cstr[200];
+  unsigned short iDim, iMarker_Monitoring;
+  ofstream Breakdown_file;
+  
+  bool compressible       = (config->GetKind_Regime() == COMPRESSIBLE);
+  bool incompressible     = (config->GetKind_Regime() == INCOMPRESSIBLE);
+  bool unsteady           = (config->GetTime_Marching() != NO);
+  bool viscous            = config->GetViscous();
+  bool dynamic_grid       = config->GetDynamic_Grid();
+  bool gravity            = config->GetGravityForce();
+  bool turbulent          = config->GetKind_Solver() == RANS;
+  bool fixed_cl           = config->GetFixed_CL_Mode();
+  unsigned short Kind_Solver = config->GetKind_Solver();
+  unsigned short Kind_Turb_Model = config->GetKind_Turb_Model();
+  unsigned short Ref_NonDim = config->GetRef_NonDim();
+
+  unsigned short nDim =  geometry->GetnDim();
+  
+  /*--- Output the mean flow solution using only the master node ---*/
+  
+  if ( rank == MASTER_NODE) {
+    
+    cout << endl << "Writing the forces breakdown file ("<< config->GetBreakdown_FileName() << ")." << endl;
+    
+    /*--- Initialize variables to store information from all domains (direct solution) ---*/
+    
+    su2double Total_CL = 0.0, Total_CD = 0.0, Total_CSF = 0.0,
+    Total_CMx = 0.0, Total_CMy = 0.0, Total_CMz = 0.0, Total_CEff = 0.0,
+    Total_CoPx = 0.0, Total_CoPy = 0.0, Total_CoPz = 0.0,
+    Total_CFx = 0.0, Total_CFy = 0.0, Total_CFz = 0.0, Inv_CL = 0.0,
+    Inv_CD = 0.0, Inv_CSF = 0.0, Inv_CMx = 0.0, Inv_CMy = 0.0,
+    Inv_CMz = 0.0, Inv_CEff = 0.0, Inv_CFx = 0.0, Inv_CFy = 0.0, Inv_CFz =
+    0.0,      Mnt_CL = 0.0,
+    Mnt_CD = 0.0, Mnt_CSF = 0.0, Mnt_CMx = 0.0, Mnt_CMy = 0.0,
+    Mnt_CMz = 0.0, Mnt_CEff = 0.0, Mnt_CFx = 0.0, Mnt_CFy = 0.0, Mnt_CFz =
+    0.0, Visc_CL = 0.0,
+    Visc_CD = 0.0, Visc_CSF = 0.0, Visc_CMx = 0.0, Visc_CMy = 0.0,
+    Visc_CMz = 0.0, Visc_CEff = 0.0, Visc_CFx = 0.0, Visc_CFy = 0.0, Visc_CFz =
+    0.0, *Surface_CL = NULL, *Surface_CD = NULL,
+    *Surface_CSF = NULL, *Surface_CEff = NULL, *Surface_CFx = NULL,
+    *Surface_CFy = NULL, *Surface_CFz = NULL,
+    *Surface_CMx = NULL, *Surface_CMy = NULL, *Surface_CMz = NULL,
+    *Surface_CL_Inv = NULL,
+    *Surface_CD_Inv = NULL, *Surface_CSF_Inv = NULL,
+    *Surface_CEff_Inv = NULL, *Surface_CFx_Inv = NULL, *Surface_CFy_Inv =
+    NULL, *Surface_CFz_Inv = NULL, *Surface_CMx_Inv = NULL,
+    *Surface_CMy_Inv = NULL, *Surface_CMz_Inv = NULL,
+    *Surface_CL_Visc = NULL,
+    *Surface_CD_Visc = NULL, *Surface_CSF_Visc = NULL,
+    *Surface_CEff_Visc = NULL, *Surface_CFx_Visc = NULL, *Surface_CFy_Visc =
+    NULL, *Surface_CFz_Visc = NULL, *Surface_CMx_Visc = NULL,
+    *Surface_CMy_Visc = NULL, *Surface_CMz_Visc = NULL,
+    *Surface_CL_Mnt = NULL,
+    *Surface_CD_Mnt = NULL, *Surface_CSF_Mnt = NULL,
+    *Surface_CEff_Mnt = NULL, *Surface_CFx_Mnt = NULL, *Surface_CFy_Mnt =
+    NULL, *Surface_CFz_Mnt = NULL, *Surface_CMx_Mnt = NULL,
+    *Surface_CMy_Mnt = NULL, *Surface_CMz_Mnt = NULL;
+    
+    /*--- WARNING: when compiling on Windows, ctime() is not available. Comment out
+     the two lines below that use the dt variable. ---*/
+    //time_t now = time(0);
+    //string dt = ctime(&now); dt[24] = '.';
+    
+    /*--- Allocate memory for the coefficients being monitored ---*/
+    
+    Surface_CL      = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CD      = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CSF = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CEff       = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFx        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFy        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFz        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMx        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMy        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMz        = new su2double[config->GetnMarker_Monitoring()];
+    
+    Surface_CL_Inv      = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CD_Inv      = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CSF_Inv = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CEff_Inv       = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFx_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFy_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFz_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMx_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMy_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMz_Inv        = new su2double[config->GetnMarker_Monitoring()];
+    
+    Surface_CL_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CD_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CSF_Visc =
+    new su2double[config->GetnMarker_Monitoring()];
+    Surface_CEff_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFx_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFy_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFz_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMx_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMy_Visc = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMz_Visc = new su2double[config->GetnMarker_Monitoring()];
+    
+    
+    Surface_CL_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CD_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CSF_Mnt =
+    new su2double[config->GetnMarker_Monitoring()];
+    Surface_CEff_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFx_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFy_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CFz_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMx_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMy_Mnt = new su2double[config->GetnMarker_Monitoring()];
+    Surface_CMz_Mnt = new su2double[config->GetnMarker_Monitoring()];
+
+    /*--- Flow solution coefficients ---*/
+    
+    Total_CL       = solver_container[FLOW_SOL]->GetTotal_CL();
+    Total_CD       = solver_container[FLOW_SOL]->GetTotal_CD();
+    Total_CSF      = solver_container[FLOW_SOL]->GetTotal_CSF();
+    Total_CEff        = solver_container[FLOW_SOL]->GetTotal_CEff();
+    Total_CMx         = solver_container[FLOW_SOL]->GetTotal_CMx();
+    Total_CMy         = solver_container[FLOW_SOL]->GetTotal_CMy();
+    Total_CMz         = solver_container[FLOW_SOL]->GetTotal_CMz();
+    Total_CFx         = solver_container[FLOW_SOL]->GetTotal_CFx();
+    Total_CFy         = solver_container[FLOW_SOL]->GetTotal_CFy();
+    Total_CFz         = solver_container[FLOW_SOL]->GetTotal_CFz();
+    
+    if (nDim == 2) {
+      Total_CoPx = solver_container[FLOW_SOL]->GetTotal_CoPx() / solver_container[FLOW_SOL]->GetTotal_CFy();
+      Total_CoPy = solver_container[FLOW_SOL]->GetTotal_CoPy() / solver_container[FLOW_SOL]->GetTotal_CFx();
+      Total_CoPz = 0.0;
+    }
+    if (nDim == 3) {
+      Total_CoPx = solver_container[FLOW_SOL]->GetTotal_CoPx() / solver_container[FLOW_SOL]->GetTotal_CFz();
+      Total_CoPy = 0.0;
+      Total_CoPz = solver_container[FLOW_SOL]->GetTotal_CoPz() / solver_container[FLOW_SOL]->GetTotal_CFx();
+    }
+    
+    if (config->GetSystemMeasurements() == US) { Total_CoPx *= 12.0; Total_CoPy *= 12.0; Total_CoPz *= 12.0; }
+    
+    /*--- Flow inviscid solution coefficients ---*/
+    
+    Inv_CL =
+    solver_container[FLOW_SOL]->GetAllBound_CL_Inv();
+    Inv_CD =
+    solver_container[FLOW_SOL]->GetAllBound_CD_Inv();
+    Inv_CSF =
+    solver_container[FLOW_SOL]->GetAllBound_CSF_Inv();
+    Inv_CEff =
+    solver_container[FLOW_SOL]->GetAllBound_CEff_Inv();
+    Inv_CMx =
+    solver_container[FLOW_SOL]->GetAllBound_CMx_Inv();
+    Inv_CMy =
+    solver_container[FLOW_SOL]->GetAllBound_CMy_Inv();
+    Inv_CMz =
+    solver_container[FLOW_SOL]->GetAllBound_CMz_Inv();
+    Inv_CFx =
+    solver_container[FLOW_SOL]->GetAllBound_CFx_Inv();
+    Inv_CFy =
+    solver_container[FLOW_SOL]->GetAllBound_CFy_Inv();
+    Inv_CFz =
+    solver_container[FLOW_SOL]->GetAllBound_CFz_Inv();
+    
+    /*--- Flow viscous solution coefficients ---*/
+    
+    Visc_CL =
+    solver_container[FLOW_SOL]->GetAllBound_CL_Visc();
+    Visc_CD =
+    solver_container[FLOW_SOL]->GetAllBound_CD_Visc();
+    Visc_CSF =
+    solver_container[FLOW_SOL]->GetAllBound_CSF_Visc();
+    Visc_CEff =
+    solver_container[FLOW_SOL]->GetAllBound_CEff_Visc();
+    Visc_CMx =
+    solver_container[FLOW_SOL]->GetAllBound_CMx_Visc();
+    Visc_CMy =
+    solver_container[FLOW_SOL]->GetAllBound_CMy_Visc();
+    Visc_CMz =
+    solver_container[FLOW_SOL]->GetAllBound_CMz_Visc();
+    Visc_CFx =
+    solver_container[FLOW_SOL]->GetAllBound_CFx_Visc();
+    Visc_CFy =
+    solver_container[FLOW_SOL]->GetAllBound_CFy_Visc();
+    Visc_CFz =
+    solver_container[FLOW_SOL]->GetAllBound_CFz_Visc();
+    
+    /*--- Flow momentum solution coefficients ---*/
+    
+    Mnt_CL =
+    solver_container[FLOW_SOL]->GetAllBound_CL_Mnt();
+    Mnt_CD =
+    solver_container[FLOW_SOL]->GetAllBound_CD_Mnt();
+    Mnt_CSF =
+    solver_container[FLOW_SOL]->GetAllBound_CSF_Mnt();
+    Mnt_CEff =
+    solver_container[FLOW_SOL]->GetAllBound_CEff_Mnt();
+    Mnt_CMx =
+    solver_container[FLOW_SOL]->GetAllBound_CMx_Mnt();
+    Mnt_CMy =
+    solver_container[FLOW_SOL]->GetAllBound_CMy_Mnt();
+    Mnt_CMz =
+    solver_container[FLOW_SOL]->GetAllBound_CMz_Mnt();
+    Mnt_CFx =
+    solver_container[FLOW_SOL]->GetAllBound_CFx_Mnt();
+    Mnt_CFy =
+    solver_container[FLOW_SOL]->GetAllBound_CFy_Mnt();
+    Mnt_CFz =
+    solver_container[FLOW_SOL]->GetAllBound_CFz_Mnt();
+    
+    
+    /*--- Look over the markers being monitored and get the desired values ---*/
+    
+    for (iMarker_Monitoring = 0;
+         iMarker_Monitoring < config->GetnMarker_Monitoring();
+         iMarker_Monitoring++) {
+      Surface_CL[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CL(
+                                                             iMarker_Monitoring);
+      Surface_CD[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CD(
+                                                             iMarker_Monitoring);
+      Surface_CSF[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CSF(
+                                                              iMarker_Monitoring);
+      Surface_CEff[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CEff(
+                                                               iMarker_Monitoring);
+      Surface_CMx[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMx(
+                                                              iMarker_Monitoring);
+      Surface_CMy[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMy(
+                                                              iMarker_Monitoring);
+      Surface_CMz[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMz(
+                                                              iMarker_Monitoring);
+      Surface_CFx[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFx(
+                                                              iMarker_Monitoring);
+      Surface_CFy[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFy(
+                                                              iMarker_Monitoring);
+      Surface_CFz[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFz(
+                                                              iMarker_Monitoring);
+      
+      Surface_CL_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CL_Inv(
+                                                                 iMarker_Monitoring);
+      Surface_CD_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CD_Inv(
+                                                                 iMarker_Monitoring);
+      Surface_CSF_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CSF_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CEff_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CEff_Inv(
+                                                                   iMarker_Monitoring);
+      Surface_CMx_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMx_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CMy_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMy_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CMz_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMz_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFx_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFx_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFy_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFy_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CFz_Inv[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFz_Inv(
+                                                                  iMarker_Monitoring);
+      Surface_CL_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CL_Visc(
+                                                                  iMarker_Monitoring);
+      Surface_CD_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CD_Visc(
+                                                                  iMarker_Monitoring);
+      Surface_CSF_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CSF_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CEff_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CEff_Visc(
+                                                                    iMarker_Monitoring);
+      Surface_CMx_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMx_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CMy_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMy_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CMz_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMz_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFx_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFx_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFy_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFy_Visc(
+                                                                   iMarker_Monitoring);
+      Surface_CFz_Visc[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFz_Visc(
+                                                                   iMarker_Monitoring);
+      
+      Surface_CL_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CL_Mnt(
+                                                                 iMarker_Monitoring);
+      Surface_CD_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CD_Mnt(
+                                                                 iMarker_Monitoring);
+      Surface_CSF_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CSF_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CEff_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CEff_Mnt(
+                                                                   iMarker_Monitoring);
+      Surface_CMx_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMx_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CMy_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMy_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CMz_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CMz_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFx_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFx_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFy_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFy_Mnt(
+                                                                  iMarker_Monitoring);
+      Surface_CFz_Mnt[iMarker_Monitoring] =
+      solver_container[FLOW_SOL]->GetSurface_CFz_Mnt(
+                                                                  iMarker_Monitoring);
+      
+    }
+    
+    
+    /*--- Write file name with extension ---*/
+    
+    string filename = config->GetBreakdown_FileName();
+    strcpy (cstr, filename.data());
+    
+    Breakdown_file.open(cstr, ios::out);
+    
+    Breakdown_file << "\n" <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file <<"|    ___ _   _ ___                                                      |" << "\n";
+    Breakdown_file <<"|   / __| | | |_  )   Release 6.1.0  \"Falcon\"                           |" << "\n";
+    Breakdown_file <<"|   \\__ \\ |_| |/ /                                                      |" << "\n";
+    Breakdown_file <<"|   |___/\\___//___|   Suite (Computational Fluid Dynamics Code)         |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    //Breakdown_file << "|   Local date and time: " << dt << "                      |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| The current SU2 release has been coordinated by the                   |" << "\n";
+    Breakdown_file << "| SU2 International Developers Society <www.su2devsociety.org>          |" << "\n";
+    Breakdown_file << "| with selected contributions from the open-source community            |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| The main research teams contributing to the current release are:      |" << "\n";
+    Breakdown_file << "| - Prof. Juan J. Alonso's group at Stanford University.                |" << "\n";
+    Breakdown_file << "| - Prof. Piero Colonna's group at Delft University of Technology.      |" << "\n";
+    Breakdown_file << "| - Prof. Nicolas R. Gauger's group at Kaiserslautern U. of Technology. |" << "\n";
+    Breakdown_file << "| - Prof. Alberto Guardone's group at Polytechnic University of Milan.  |" << "\n";
+    Breakdown_file << "| - Prof. Rafael Palacios' group at Imperial College London.            |" << "\n";
+    Breakdown_file << "| - Prof. Vincent Terrapon's group at the University of Liege.          |" << "\n";
+    Breakdown_file << "| - Prof. Edwin van der Weide's group at the University of Twente.      |" << "\n";
+    Breakdown_file << "| - Lab. of New Concepts in Aeronautics at Tech. Inst. of Aeronautics.  |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    Breakdown_file << "| Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,       |" << "\n";
+    Breakdown_file << "|                      Tim Albring, and the SU2 contributors.           |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| SU2 is free software; you can redistribute it and/or                  |" << "\n";
+    Breakdown_file << "| modify it under the terms of the GNU Lesser General Public            |" << "\n";
+    Breakdown_file << "| License as published by the Free Software Foundation; either          |" << "\n";
+    Breakdown_file << "| version 2.1 of the License, or (at your option) any later version.    |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| SU2 is distributed in the hope that it will be useful,                |" << "\n";
+    Breakdown_file << "| but WITHOUT ANY WARRANTY; without even the implied warranty of        |" << "\n";
+    Breakdown_file << "| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |" << "\n";
+    Breakdown_file << "| Lesser General Public License for more details.                       |" << "\n";
+    Breakdown_file << "|                                                                       |" << "\n";
+    Breakdown_file << "| You should have received a copy of the GNU Lesser General Public      |" << "\n";
+    Breakdown_file << "| License along with SU2. If not, see <http://www.gnu.org/licenses/>.   |" << "\n";
+    Breakdown_file <<"-------------------------------------------------------------------------" << "\n";
+    
+    Breakdown_file.precision(6);
+
+    Breakdown_file << "\n" << "\n" << "Problem definition:" << "\n" << "\n";
+    
+    switch (Kind_Solver) {
+      case EULER: case INC_EULER:
+        if (compressible) Breakdown_file << "Compressible Euler equations." << "\n";
+        if (incompressible) Breakdown_file << "Incompressible Euler equations." << "\n";
+        break;
+      case NAVIER_STOKES: case INC_NAVIER_STOKES:
+        if (compressible) Breakdown_file << "Compressible Laminar Navier-Stokes' equations." << "\n";
+        if (incompressible) Breakdown_file << "Incompressible Laminar Navier-Stokes' equations." << "\n";
+        break;
+      case RANS: case INC_RANS:
+        if (compressible) Breakdown_file << "Compressible RANS equations." << "\n";
+        if (incompressible) Breakdown_file << "Incompressible RANS equations." << "\n";
+        Breakdown_file << "Turbulence model: ";
+        switch (Kind_Turb_Model) {
+          case SA:        Breakdown_file << "Spalart Allmaras" << "\n"; break;
+          case SA_NEG:    Breakdown_file << "Negative Spalart Allmaras" << "\n"; break;
+          case SA_E:      Breakdown_file << "Edwards Spalart Allmaras" << "\n"; break;
+          case SA_COMP:   Breakdown_file << "Compressibility Correction Spalart Allmaras" << "\n"; break;
+          case SA_E_COMP: Breakdown_file << "Compressibility Correction Edwards Spalart Allmaras" << "\n"; break;
+          case SST:       Breakdown_file << "Menter's SST"     << "\n"; break;
+          case SST_SUST:  Breakdown_file << "Menter's SST with sustaining terms" << "\n"; break;
+        }
+        break;
+    }
+
+
+    /*--- Compressible version of console output ---*/
+
+    if (compressible) {
+
+
+    if (compressible) {
+      Breakdown_file << "Mach number: " << config->GetMach() <<"."<< "\n";
+      Breakdown_file << "Angle of attack (AoA): " << config->GetAoA() <<" deg, and angle of sideslip (AoS): " << config->GetAoS() <<" deg."<< "\n";
+      if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == INC_NAVIER_STOKES) ||
+          (Kind_Solver == RANS) || (Kind_Solver == INC_RANS))
+        Breakdown_file << "Reynolds number: " << config->GetReynolds() <<"."<< "\n";
+    }
+    
+    if (fixed_cl) {
+      Breakdown_file << "Simulation at a cte. CL: " << config->GetTarget_CL() << ".\n";
+      Breakdown_file << "Approx. Delta CL / Delta AoA: " << config->GetdCL_dAlpha() << " (1/deg).\n";
+      Breakdown_file << "Approx. Delta CD / Delta CL: " << config->GetdCD_dCL() << ".\n";
+      if (nDim == 3 ) {
+        Breakdown_file << "Approx. Delta CMx / Delta CL: " << config->GetdCMx_dCL() << ".\n";
+        Breakdown_file << "Approx. Delta CMy / Delta CL: " << config->GetdCMy_dCL() << ".\n";
+      }
+      Breakdown_file << "Approx. Delta CMz / Delta CL: " << config->GetdCMz_dCL() << ".\n";
+    }
+    
+    if (Ref_NonDim == DIMENSIONAL) { Breakdown_file << "Dimensional simulation." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_PRESS_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (P=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_VEL_EQ_MACH) { Breakdown_file << "Non-Dimensional simulation (V=Mach, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    else if (Ref_NonDim == FREESTREAM_VEL_EQ_ONE) { Breakdown_file << "Non-Dimensional simulation (V=1.0, Rho=1.0, T=1.0 at the farfield)." << "\n"; }
+    
+    if (config->GetSystemMeasurements() == SI) {
+      Breakdown_file << "The reference area is " << config->GetRefArea() << " m^2." << "\n";
+      Breakdown_file << "The reference length is " << config->GetRefLength() << " m." << "\n";
+    }
+    
+    if (config->GetSystemMeasurements() == US) {
+      Breakdown_file << "The reference area is " << config->GetRefArea()*12.0*12.0 << " in^2." << "\n";
+      Breakdown_file << "The reference length is " << config->GetRefLength()*12.0 << " in." << "\n";
+    }
+    Breakdown_file << "\n" << "\n" <<"Problem definition:" << "\n" << "\n";
+    if (compressible) {
+      if (viscous) {
+        Breakdown_file << "Viscous flow: Computing pressure using the ideal gas law" << "\n";
+        Breakdown_file << "based on the free-stream temperature and a density computed" << "\n";
+        Breakdown_file << "from the Reynolds number." << "\n";
+      } else {
+        Breakdown_file << "Inviscid flow: Computing density based on free-stream" << "\n";
+        Breakdown_file << "temperature and pressure using the ideal gas law." << "\n";
+      }
+    }
+    
+    if (dynamic_grid) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+    else Breakdown_file << "Force coefficients computed using free-stream values." << "\n";
+    
+    if (incompressible) {
+      Breakdown_file << "Viscous and Inviscid flow: rho_ref, and vel_ref" << "\n";
+      Breakdown_file << "are based on the free-stream values, p_ref = rho_ref*vel_ref^2." << "\n";
+      Breakdown_file << "The free-stream value of the pressure is 0." << "\n";
+      Breakdown_file << "Mach number: "<< config->GetMach() << ", computed using the Bulk modulus." << "\n";
+      Breakdown_file << "Angle of attack (deg): "<< config->GetAoA() << ", computed using the the free-stream velocity." << "\n";
+      Breakdown_file << "Side slip angle (deg): "<< config->GetAoS() << ", computed using the the free-stream velocity." << "\n";
+      if (viscous) Breakdown_file << "Reynolds number: " << config->GetReynolds() << ", computed using free-stream values."<< "\n";
+      Breakdown_file << "Only dimensional computation, the grid should be dimensional." << "\n";
+    }
+    
+    Breakdown_file <<"-- Input conditions:"<< "\n";
+    
+    if (compressible) {
+      switch (config->GetKind_FluidModel()) {
+          
+        case STANDARD_AIR:
+          Breakdown_file << "Fluid Model: STANDARD_AIR "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: 1.4000 "<< "\n";
+          break;
+          
+        case IDEAL_GAS:
+          Breakdown_file << "Fluid Model: IDEAL_GAS "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config->GetGamma() << "\n";
+          break;
+          
+        case VW_GAS:
+          Breakdown_file << "Fluid Model: Van der Waals "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config->GetGamma() << "\n";
+          Breakdown_file << "Critical Pressure:   " << config->GetPressure_Critical()  << " Pa." << "\n";
+          Breakdown_file << "Critical Temperature:  " << config->GetTemperature_Critical() << " K." << "\n";
+          Breakdown_file << "Critical Pressure (non-dim):   " << config->GetPressure_Critical() /config->GetPressure_Ref() << "\n";
+          Breakdown_file << "Critical Temperature (non-dim) :  " << config->GetTemperature_Critical() /config->GetTemperature_Ref() << "\n";
+          break;
+          
+        case PR_GAS:
+          Breakdown_file << "Fluid Model: Peng-Robinson "<< "\n";
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << "\n";
+          Breakdown_file << "Specific gas constant(non-dim): " << config->GetGas_ConstantND()<< "\n";
+          Breakdown_file << "Specific Heat Ratio: "<< config->GetGamma() << "\n";
+          Breakdown_file << "Critical Pressure:   " << config->GetPressure_Critical()  << " Pa." << "\n";
+          Breakdown_file << "Critical Temperature:  " << config->GetTemperature_Critical() << " K." << "\n";
+          Breakdown_file << "Critical Pressure (non-dim):   " << config->GetPressure_Critical() /config->GetPressure_Ref() << "\n";
+          Breakdown_file << "Critical Temperature (non-dim) :  " << config->GetTemperature_Critical() /config->GetTemperature_Ref() << "\n";
+          break;
+      }
+      
+      if (viscous) {
+        
+        switch (config->GetKind_ViscosityModel()) {
+            
+          case CONSTANT_VISCOSITY:
+            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
+            Breakdown_file << "Laminar Viscosity: " << config->GetMu_Constant();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< "\n";
+            break;
+            
+          case SUTHERLAND:
+            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
+            Breakdown_file << "Ref. Laminar Viscosity: " << config->GetMu_Ref();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Ref. Temperature: " << config->GetMu_Temperature_Ref();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Sutherland Constant: "<< config->GetMu_S();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< "\n";
+            Breakdown_file << "Ref. Temperature (non-dim): " << config->GetMu_Temperature_RefND()<< "\n";
+            Breakdown_file << "Sutherland constant (non-dim): "<< config->GetMu_SND()<< "\n";
+            break;
+            
+        }
+        switch (config->GetKind_ConductivityModel()) {
+            
+          case CONSTANT_PRANDTL:
+            Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
+            Breakdown_file << "Prandtl: " << config->GetPrandtl_Lam()<< "\n";
+            break;
+            
+          case CONSTANT_CONDUCTIVITY:
+            Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
+            Breakdown_file << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << "\n";
+            Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< "\n";
+            break;
+            
+        }
+        
+        if ((Kind_Solver == RANS) || (Kind_Solver == INC_RANS)) {
+          switch (config->GetKind_ConductivityModel_Turb()) {
+            case CONSTANT_PRANDTL_TURB:
+              Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
+              Breakdown_file << "Turbulent Prandtl: " << config->GetPrandtl_Turb()<< "\n";
+              break;
+            case NO_CONDUCTIVITY_TURB:
+              Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
+              Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
+              break;
+          }
+        }
+        
+      }
+    }
+    
+    if (incompressible) {
+      Breakdown_file << "Bulk modulus: " << config->GetBulk_Modulus();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+      Breakdown_file << "Epsilon^2 multiplier of Beta for incompressible preconditioner: " << config->GetBeta_Factor();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    }
+    
+    Breakdown_file << "Free-stream static pressure: " << config->GetPressure_FreeStream();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    Breakdown_file << "Free-stream total pressure: " << config->GetPressure_FreeStream() * pow( 1.0+config->GetMach()*config->GetMach()*0.5*(config->GetGamma()-1.0), config->GetGamma()/(config->GetGamma()-1.0) );
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Free-stream temperature: " << config->GetTemperature_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      
+      Breakdown_file << "Free-stream total temperature: " << config->GetTemperature_FreeStream() * (1.0 + config->GetMach() * config->GetMach() * 0.5 * (config->GetGamma() - 1.0));
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+    }
+    
+    Breakdown_file << "Free-stream density: " << config->GetDensity_FreeStream();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+    
+    if (nDim == 2) {
+      Breakdown_file << "Free-stream velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
+      Breakdown_file << config->GetVelocity_FreeStream()[1] << ")";
+    }
+    if (nDim == 3) {
+      Breakdown_file << "Free-stream velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
+      Breakdown_file << config->GetVelocity_FreeStream()[1] << ", " << config->GetVelocity_FreeStream()[2] << ")";
+    }
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
+    
+    Breakdown_file << "Magnitude: "  << config->GetModVel_FreeStream();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Free-stream total energy per unit mass: " << config->GetEnergy_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+    }
+    
+    if (viscous) {
+      Breakdown_file << "Free-stream viscosity: " << config->GetViscosity_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      if (turbulent) {
+        Breakdown_file << "Free-stream turb. kinetic energy per unit mass: " << config->GetTke_FreeStream();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+        Breakdown_file << "Free-stream specific dissipation: " << config->GetOmega_FreeStream();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
+      }
+    }
+    
+    if (unsteady) { Breakdown_file << "Total time: " << config->GetTotal_UnstTime() << " s. Time step: " << config->GetDelta_UnstTime() << " s." << "\n"; }
+    
+    /*--- Print out reference values. ---*/
+    
+    Breakdown_file <<"-- Reference values:"<< "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference specific gas constant: " << config->GetGas_Constant_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+    }
+    
+    Breakdown_file << "Reference pressure: " << config->GetPressure_Ref();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference temperature: " << config->GetTemperature_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+    }
+    
+    Breakdown_file << "Reference density: " << config->GetDensity_Ref();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+    
+    Breakdown_file << "Reference velocity: " << config->GetVelocity_Ref();
+    if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+    else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+    
+    if (compressible) {
+      Breakdown_file << "Reference energy per unit mass: " << config->GetEnergy_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+    }
+    
+    if (incompressible) {
+      Breakdown_file << "Reference length: " << config->GetLength_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
+    }
+    
+    if (viscous) {
+      Breakdown_file << "Reference viscosity: " << config->GetViscosity_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      if (compressible){
+        Breakdown_file << "Reference conductivity: " << config->GetConductivity_Ref();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " W/m^2.K." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf/ft.s.R." << "\n";
+      }
+    }
+    
+    
+    if (unsteady) Breakdown_file << "Reference time: " << config->GetTime_Ref() <<" s." << "\n";
+    
+    /*--- Print out resulting non-dim values here. ---*/
+    
+    Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
+    Breakdown_file << "Mach number (non-dim): " << config->GetMach() << "\n";
+    if (viscous) {
+      Breakdown_file << "Reynolds number (non-dim): " << config->GetReynolds() <<". Re length: " << config->GetLength_Reynolds();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft." << "\n";
+    }
+    if (gravity) {
+      Breakdown_file << "Froude number (non-dim): " << config->GetFroude() << "\n";
+      Breakdown_file << "Lenght of the baseline wave (non-dim): " << 2.0*PI_NUMBER*config->GetFroude()*config->GetFroude() << "\n";
+    }
+    
+    if (compressible) {
+      Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND() << "\n";
+      Breakdown_file << "Free-stream temperature (non-dim): " << config->GetTemperature_FreeStreamND() << "\n";
+    }
+    
+    Breakdown_file << "Free-stream pressure (non-dim): " << config->GetPressure_FreeStreamND() << "\n";
+    
+    Breakdown_file << "Free-stream density (non-dim): " << config->GetDensity_FreeStreamND() << "\n";
+    
+    if (nDim == 2) {
+      Breakdown_file << "Free-stream velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
+      Breakdown_file << config->GetVelocity_FreeStreamND()[1] << "). ";
+    } else {
+      Breakdown_file << "Free-stream velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
+      Breakdown_file << config->GetVelocity_FreeStreamND()[1] << ", " << config->GetVelocity_FreeStreamND()[2] << "). ";
+    }
+    Breakdown_file << "Magnitude: "   << config->GetModVel_FreeStreamND() << "\n";
+    
+    if (compressible)
+      Breakdown_file << "Free-stream total energy per unit mass (non-dim): " << config->GetEnergy_FreeStreamND() << "\n";
+    
+    if (viscous) {
+      Breakdown_file << "Free-stream viscosity (non-dim): " << config->GetViscosity_FreeStreamND() << "\n";
+      if (turbulent) {
+        Breakdown_file << "Free-stream turb. kinetic energy (non-dim): " << config->GetTke_FreeStreamND() << "\n";
+        Breakdown_file << "Free-stream specific dissipation (non-dim): " << config->GetOmega_FreeStreamND() << "\n";
+      }
+    }
+    
+    if (unsteady) {
+      Breakdown_file << "Total time (non-dim): " << config->GetTotal_UnstTimeND() << "\n";
+      Breakdown_file << "Time step (non-dim): " << config->GetDelta_UnstTimeND() << "\n";
+    }
+
+    } else {
+
+    /*--- Incompressible version of the console output ---*/
+
+      bool energy     = config->GetEnergy_Equation();
+      bool boussinesq = (config->GetKind_DensityModel() == BOUSSINESQ);
+
+      if (config->GetRef_Inc_NonDim() == DIMENSIONAL) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, temp_ref, p_ref" << "\n";
+        Breakdown_file << "are set to 1.0 in order to perform a dimensional calculation." << "\n";
+        if (dynamic_grid) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
+      }
+      else if (config->GetRef_Inc_NonDim() == INITIAL_VALUES) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
+        Breakdown_file << "are based on the initial values, p_ref = rho_ref*vel_ref^2." << "\n";
+        if (dynamic_grid) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using initial values." << "\n";
+      }
+      else if (config->GetRef_Inc_NonDim() == REFERENCE_VALUES) {
+        Breakdown_file << "Viscous and Inviscid flow: rho_ref, vel_ref, and temp_ref" << "\n";
+        Breakdown_file << "are user-provided reference values, p_ref = rho_ref*vel_ref^2." << "\n";
+        if (dynamic_grid) Breakdown_file << "Force coefficients computed using MACH_MOTION." << "\n";
+        else Breakdown_file << "Force coefficients computed using reference values." << "\n";
+      }
+      Breakdown_file << "The reference area for force coeffs. is " << config->GetRefArea() << " m^2." << "\n";
+      Breakdown_file << "The reference length for force coeffs. is " << config->GetRefLength() << " m." << "\n";
+
+      Breakdown_file << "The pressure is decomposed into thermodynamic and dynamic components." << "\n";
+      Breakdown_file << "The initial value of the dynamic pressure is 0." << "\n";
+
+      Breakdown_file << "Mach number: "<< config->GetMach();
+      if (config->GetKind_FluidModel() == CONSTANT_DENSITY) {
+        Breakdown_file << ", computed using the Bulk modulus." << "\n";
+      } else {
+        Breakdown_file << ", computed using fluid speed of sound." << "\n";
+      }
+
+      Breakdown_file << "For external flows, the initial state is imposed at the far-field." << "\n";
+      Breakdown_file << "Angle of attack (deg): "<< config->GetAoA() << ", computed using the initial velocity." << "\n";
+      Breakdown_file << "Side slip angle (deg): "<< config->GetAoS() << ", computed using the initial velocity." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Reynolds number per meter: " << config->GetReynolds() << ", computed using initial values."<< "\n";
+        Breakdown_file << "Reynolds number is a byproduct of inputs only (not used internally)." << "\n";
+      }
+      Breakdown_file << "SI units only. The grid should be dimensional (meters)." << "\n";
+
+      switch (config->GetKind_DensityModel()) {
+
+        case CONSTANT:
+          if (energy) Breakdown_file << "Energy equation is active and decoupled." << "\n";
+          else Breakdown_file << "No energy equation." << "\n";
+          break;
+
+        case BOUSSINESQ:
+          if (energy) Breakdown_file << "Energy equation is active and coupled through Boussinesq approx." << "\n";
+          break;
+
+        case VARIABLE:
+          if (energy) Breakdown_file << "Energy equation is active and coupled for variable density." << "\n";
+          break;
+
+      }
+
+      Breakdown_file <<"-- Input conditions:"<< "\n";
+
+      switch (config->GetKind_FluidModel()) {
+
+        case CONSTANT_DENSITY:
+          Breakdown_file << "Fluid Model: CONSTANT_DENSITY "<< "\n";
+          if (energy) {
+            Breakdown_file << "Specific heat at constant pressure (Cp): " << config->GetSpecific_Heat_Cp() << " N.m/kg.K." << "\n";
+          }
+          if (boussinesq) Breakdown_file << "Thermal expansion coefficient: " << config->GetThermal_Expansion_Coeff() << " K^-1." << "\n";
+          Breakdown_file << "Thermodynamic pressure not required." << "\n";
+          break;
+
+        case INC_IDEAL_GAS:
+          Breakdown_file << "Fluid Model: INC_IDEAL_GAS "<< endl;
+          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
+          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
+          Breakdown_file << "Specific heat at constant pressure (Cp): " << config->GetSpecific_Heat_Cp() << " N.m/kg.K." << endl;
+          Breakdown_file << "Molecular weight : "<< config->GetMolecular_Weight() << " g/mol" << endl;
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
+          Breakdown_file << "Thermodynamic pressure: " << config->GetPressure_Thermodynamic();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
+          break;
+          
+        case INC_IDEAL_GAS_POLY:
+          Breakdown_file << "Fluid Model: INC_IDEAL_GAS_POLY "<< endl;
+          Breakdown_file << "Variable density incompressible flow using ideal gas law." << endl;
+          Breakdown_file << "Density is a function of temperature (constant thermodynamic pressure)." << endl;
+          Breakdown_file << "Molecular weight: " << config->GetMolecular_Weight() << " g/mol." << endl;
+          Breakdown_file << "Specific gas constant: " << config->GetGas_Constant() << " N.m/kg.K." << endl;
+          Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND() << endl;
+          Breakdown_file << "Thermodynamic pressure: " << config->GetPressure_Thermodynamic();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << endl;
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << endl;
+          Breakdown_file << "Cp(T) polynomial coefficients: \n  (";
+          for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+            Breakdown_file << config->GetCp_PolyCoeff(iVar);
+            if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+          }
+          Breakdown_file << ")." << endl;
+          Breakdown_file << "Cp(T) polynomial coefficients (non-dim.): \n  (";
+          for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+            Breakdown_file << config->GetCp_PolyCoeffND(iVar);
+            if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+          }
+          Breakdown_file << ")." << endl;
+          break;
+
+      }
+      if (viscous) {
+        switch (config->GetKind_ViscosityModel()) {
+
+          case CONSTANT_VISCOSITY:
+            Breakdown_file << "Viscosity Model: CONSTANT_VISCOSITY  "<< "\n";
+            Breakdown_file << "Constant Laminar Viscosity: " << config->GetMu_Constant();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< "\n";
+            break;
+
+          case SUTHERLAND:
+            Breakdown_file << "Viscosity Model: SUTHERLAND "<< "\n";
+            Breakdown_file << "Ref. Laminar Viscosity: " << config->GetMu_Ref();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+            Breakdown_file << "Ref. Temperature: " << config->GetMu_Temperature_Ref();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Sutherland Constant: "<< config->GetMu_S();
+            if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+            else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+            Breakdown_file << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND()<< "\n";
+            Breakdown_file << "Ref. Temperature (non-dim): " << config->GetMu_Temperature_RefND()<< "\n";
+            Breakdown_file << "Sutherland constant (non-dim): "<< config->GetMu_SND()<< "\n";
+            break;
+            
+          case POLYNOMIAL_VISCOSITY:
+            Breakdown_file << "Viscosity Model: POLYNOMIAL_VISCOSITY  "<< endl;
+            Breakdown_file << "Mu(T) polynomial coefficients: \n  (";
+            for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+              Breakdown_file << config->GetMu_PolyCoeff(iVar);
+              if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+            }
+            Breakdown_file << ")." << endl;
+            Breakdown_file << "Mu(T) polynomial coefficients (non-dim.): \n  (";
+            for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+              Breakdown_file << config->GetMu_PolyCoeffND(iVar);
+              if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+            }
+            Breakdown_file << ")." << endl;
+            break;
+
+        }
+
+        if (energy) {
+          switch (config->GetKind_ConductivityModel()) {
+
+            case CONSTANT_PRANDTL:
+              Breakdown_file << "Conductivity Model: CONSTANT_PRANDTL  "<< "\n";
+              Breakdown_file << "Prandtl (Laminar): " << config->GetPrandtl_Lam()<< "\n";
+              break;
+
+            case CONSTANT_CONDUCTIVITY:
+              Breakdown_file << "Conductivity Model: CONSTANT_CONDUCTIVITY "<< "\n";
+              Breakdown_file << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << "\n";
+              Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< "\n";
+              break;
+
+            case POLYNOMIAL_CONDUCTIVITY:
+              Breakdown_file << "Viscosity Model: POLYNOMIAL_CONDUCTIVITY "<< endl;
+              Breakdown_file << "Kt(T) polynomial coefficients: \n  (";
+              for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+                Breakdown_file << config->GetKt_PolyCoeff(iVar);
+                if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+              }
+              Breakdown_file << ")." << endl;
+              Breakdown_file << "Kt(T) polynomial coefficients (non-dim.): \n  (";
+              for (unsigned short iVar = 0; iVar < config->GetnPolyCoeffs(); iVar++) {
+                Breakdown_file << config->GetKt_PolyCoeffND(iVar);
+                if (iVar < config->GetnPolyCoeffs()-1) Breakdown_file << ", ";
+              }
+              Breakdown_file << ")." << endl;
+              break;
+              
+          }
+          
+          if ((Kind_Solver == RANS) || (Kind_Solver == ADJ_RANS) || (Kind_Solver == DISC_ADJ_RANS)) {
+            switch (config->GetKind_ConductivityModel_Turb()) {
+              case CONSTANT_PRANDTL_TURB:
+                Breakdown_file << "Turbulent Conductivity Model: CONSTANT_PRANDTL_TURB  "<< "\n";
+                Breakdown_file << "Turbulent Prandtl: " << config->GetPrandtl_Turb()<< "\n";
+                break;
+              case NO_CONDUCTIVITY_TURB:
+                Breakdown_file << "Turbulent Conductivity Model: NO_CONDUCTIVITY_TURB "<< "\n";
+                Breakdown_file << "No turbulent component in effective thermal conductivity." << "\n";
+                break;
+            }
+          }
+          
+        }
+
+      }
+
+      if (config->GetKind_FluidModel() == CONSTANT_DENSITY) {
+        Breakdown_file << "Bulk modulus: " << config->GetBulk_Modulus();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+      }
+
+      Breakdown_file << "Initial dynamic pressure: " << config->GetPressure_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      Breakdown_file << "Initial total pressure: " << config->GetPressure_FreeStream() + 0.5*config->GetDensity_FreeStream()*config->GetModVel_FreeStream()*config->GetModVel_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      if (energy) {
+        Breakdown_file << "Initial temperature: " << config->GetTemperature_FreeStream();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      }
+
+      Breakdown_file << "Initial density: " << config->GetDensity_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+
+      if (nDim == 2) {
+        Breakdown_file << "Initial velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
+        Breakdown_file << config->GetVelocity_FreeStream()[1] << ")";
+      }
+      if (nDim == 3) {
+        Breakdown_file << "Initial velocity: (" << config->GetVelocity_FreeStream()[0] << ", ";
+        Breakdown_file << config->GetVelocity_FreeStream()[1] << ", " << config->GetVelocity_FreeStream()[2] << ")";
+      }
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s. ";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s. ";
+
+      Breakdown_file << "Magnitude: "  << config->GetModVel_FreeStream();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Initial laminar viscosity: " << config->GetViscosity_FreeStream();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+        if (turbulent) {
+          Breakdown_file << "Initial turb. kinetic energy per unit mass: " << config->GetTke_FreeStream();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " m^2/s^2." << "\n";
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft^2/s^2." << "\n";
+          Breakdown_file << "Initial specific dissipation: " << config->GetOmega_FreeStream();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " 1/s." << "\n";
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " 1/s." << "\n";
+        }
+      }
+
+      if (unsteady) { Breakdown_file << "Total time: " << config->GetTotal_UnstTime() << " s. Time step: " << config->GetDelta_UnstTime() << " s." << "\n"; }
+
+      /*--- Print out reference values. ---*/
+
+      Breakdown_file <<"-- Reference values:"<< "\n";
+
+      if (config->GetKind_FluidModel() != CONSTANT_DENSITY) {
+        Breakdown_file << "Reference specific gas constant: " << config->GetGas_Constant_Ref();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+      } else {
+        if (energy) {
+          Breakdown_file << "Reference specific heat: " << config->GetGas_Constant_Ref();
+          if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.m/kg.K." << "\n";
+          else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.ft/slug.R." << "\n";
+        }
+      }
+
+      Breakdown_file << "Reference pressure: " << config->GetPressure_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " Pa." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " psf." << "\n";
+
+      if (energy) {
+        Breakdown_file << "Reference temperature: " << config->GetTemperature_Ref();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " K." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " R." << "\n";
+      }
+
+      Breakdown_file << "Reference density: " << config->GetDensity_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " kg/m^3." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " slug/ft^3." << "\n";
+
+      Breakdown_file << "Reference velocity: " << config->GetVelocity_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m/s." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " ft/s." << "\n";
+
+      Breakdown_file << "Reference length: " << config->GetLength_Ref();
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n";
+      else if (config->GetSystemMeasurements() == US) Breakdown_file << " in." << "\n";
+
+      if (viscous) {
+        Breakdown_file << "Reference viscosity: " << config->GetViscosity_Ref();
+        if (config->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
+        else if (config->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
+      }
+
+      if (unsteady) Breakdown_file << "Reference time: " << config->GetTime_Ref() <<" s." << "\n";
+
+      /*--- Print out resulting non-dim values here. ---*/
+
+      Breakdown_file << "-- Resulting non-dimensional state:" << "\n";
+      Breakdown_file << "Mach number (non-dim): " << config->GetMach() << "\n";
+      if (viscous) {
+        Breakdown_file << "Reynolds number (per m): " << config->GetReynolds() << "\n";
+      }
+
+      if (config->GetKind_FluidModel() != CONSTANT_DENSITY) {
+        Breakdown_file << "Specific gas constant (non-dim): " << config->GetGas_ConstantND() << "\n";
+        Breakdown_file << "Initial thermodynamic pressure (non-dim): " << config->GetPressure_ThermodynamicND() << "\n";
+      } else {
+        if (energy) {
+          Breakdown_file << "Specific heat at constant pressure (non-dim): " << config->GetSpecific_Heat_CpND() << "\n";
+          if (boussinesq) Breakdown_file << "Thermal expansion coefficient (non-dim.): " << config->GetThermal_Expansion_CoeffND() << " K^-1." << "\n";
+        }
+      }
+
+      if (energy) Breakdown_file << "Initial temperature (non-dim): " << config->GetTemperature_FreeStreamND() << "\n";
+      Breakdown_file << "Initial pressure (non-dim): " << config->GetPressure_FreeStreamND() << "\n";
+      Breakdown_file << "Initial density (non-dim): " << config->GetDensity_FreeStreamND() << "\n";
+
+      if (nDim == 2) {
+        Breakdown_file << "Initial velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
+        Breakdown_file << config->GetVelocity_FreeStreamND()[1] << "). ";
+      } else {
+        Breakdown_file << "Initial velocity (non-dim): (" << config->GetVelocity_FreeStreamND()[0] << ", ";
+        Breakdown_file << config->GetVelocity_FreeStreamND()[1] << ", " << config->GetVelocity_FreeStreamND()[2] << "). ";
+      }
+      Breakdown_file << "Magnitude: "   << config->GetModVel_FreeStreamND() << "\n";
+      
+      if (viscous) {
+        Breakdown_file << "Initial viscosity (non-dim): " << config->GetViscosity_FreeStreamND() << "\n";
+        if (turbulent) {
+          Breakdown_file << "Initial turb. kinetic energy (non-dim): " << config->GetTke_FreeStreamND() << "\n";
+          Breakdown_file << "Initial specific dissipation (non-dim): " << config->GetOmega_FreeStreamND() << "\n";
+        }
+      }
+      
+      if (unsteady) {
+        Breakdown_file << "Total time (non-dim): " << config->GetTotal_UnstTimeND() << "\n";
+        Breakdown_file << "Time step (non-dim): " << config->GetDelta_UnstTimeND() << "\n";
+      }
+
+    }
+
+    /*--- Begin forces breakdown info. ---*/
+    
+    Breakdown_file << fixed;
+    Breakdown_file << "\n" << "\n" <<"Forces breakdown:" << "\n" << "\n";
+
+    if (nDim == 3) {
+      su2double m = solver_container[FLOW_SOL]->GetTotal_CFz()/solver_container[FLOW_SOL]->GetTotal_CFx();
+      su2double term = (Total_CoPz/m)-Total_CoPx;
+      
+      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z-"<< term << "." << "\n\n";
+      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Z+"<< fabs(term);
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
+      else Breakdown_file << " in." << "\n\n";
+    }
+    else {
+      su2double m = solver_container[FLOW_SOL]->GetTotal_CFy()/solver_container[FLOW_SOL]->GetTotal_CFx();
+      su2double term = (Total_CoPy/m)-Total_CoPx;
+      if (term > 0) Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y-"<< term << "." << "\n\n";
+      else Breakdown_file << "Center of Pressure: X="  << 1/m <<"Y+"<< fabs(term);
+      if (config->GetSystemMeasurements() == SI) Breakdown_file << " m." << "\n\n";
+      else Breakdown_file << " in." << "\n\n";
+    }
+
+    /*--- Reference area and force factors. ---*/
+
+    su2double RefDensity, RefArea, RefVel, Factor, Ref;
+    RefArea     = config->GetRefArea();
+    if (compressible) {
+      RefDensity  = solver_container[FLOW_SOL]->GetDensity_Inf();
+      RefVel = solver_container[FLOW_SOL]->GetModVelocity_Inf();
+    } else {
+      if ((config->GetRef_Inc_NonDim() == DIMENSIONAL) ||
+          (config->GetRef_Inc_NonDim() == INITIAL_VALUES)) {
+        RefDensity  = solver_container[FLOW_SOL]->GetDensity_Inf();
+        RefVel = 0.0;
+        for (iDim = 0; iDim < nDim; iDim++)
+          RefVel  += solver_container[FLOW_SOL]->GetVelocity_Inf(iDim)*solver_container[FLOW_SOL]->GetVelocity_Inf(iDim);
+        RefVel = sqrt(RefVel);
+      } else {
+        RefDensity = config->GetInc_Density_Ref();
+        RefVel    = config->GetInc_Velocity_Ref();
+      }
+    }
+    Factor = (0.5*RefDensity*RefArea*RefVel*RefVel);
+    Ref = config->GetDensity_Ref() * config->GetVelocity_Ref() * config->GetVelocity_Ref() * 1.0 * 1.0;
+
+    Breakdown_file << "NOTE: Multiply forces by the non-dimensional factor: " << Factor << ", and the reference factor: " << Ref  << "\n";
+    Breakdown_file << "to obtain the dimensional force."  << "\n" << "\n";
+
+    Breakdown_file << "Total CL:    ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CL;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CL;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CL;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CL * 100.0) / (Total_CL + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CL << "\n";
+    
+    Breakdown_file << "Total CD:    ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CD;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CD;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CD;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CD * 100.0) / (Total_CD + EPS)) << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CD << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CSF:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CSF;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CSF;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file <<  SU2_TYPE::Int((Visc_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CSF;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CSF * 100.0) / (Total_CSF + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CSF << "\n";
+    }
+    
+    Breakdown_file << "Total CL/CD: ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CEff;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CEff;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file <<  SU2_TYPE::Int((Visc_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CEff;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CEff * 100.0) / (Total_CEff + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CEff << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CMx:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CMx;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CMx;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CMx;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CMx * 100.0) / (Total_CMx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CMx << "\n";
+      
+      Breakdown_file << "Total CMy:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CMy;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CMy * 100.0) / (Total_CMy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CMy;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CMy * 100.0) / (Total_CMy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CMy;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CMy << "\n";
+    }
+    
+    Breakdown_file << "Total CMz:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CMz;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CMz;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CMz;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CMz * 100.0) / (Total_CMz + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CMz << "\n";
+    
+    Breakdown_file << "Total CFx:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CFx;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CFx;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CFx;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CFx * 100.0) / (Total_CFx + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CFx << "\n";
+    
+    Breakdown_file << "Total CFy:   ";
+    Breakdown_file.width(11);
+    Breakdown_file << Total_CFy;
+    Breakdown_file << " | Pressure (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Inv_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Inv_CFy;
+    Breakdown_file << " | Friction (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Visc_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Visc_CFy;
+    Breakdown_file << " | Momentum (";
+    Breakdown_file.width(5);
+    Breakdown_file << SU2_TYPE::Int((Mnt_CFy * 100.0) / (Total_CFy + EPS));
+    Breakdown_file << "%): ";
+    Breakdown_file.width(11);
+    Breakdown_file << Mnt_CFy << "\n";
+    
+    if (nDim == 3) {
+      Breakdown_file << "Total CFz:   ";
+      Breakdown_file.width(11);
+      Breakdown_file << Total_CFz;
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Inv_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Inv_CFz;
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Visc_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Visc_CFz;
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file << SU2_TYPE::Int((Mnt_CFz * 100.0) / (Total_CFz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Mnt_CFz << "\n";
+    }
+    
+    Breakdown_file << "\n" << "\n";
+    
+    for (iMarker_Monitoring = 0;
+         iMarker_Monitoring < config->GetnMarker_Monitoring();
+         iMarker_Monitoring++) {
+      
+      Breakdown_file << "Surface name: "
+      << config->GetMarker_Monitoring_TagBound(
+                                                          iMarker_Monitoring) << "\n" << "\n";
+      
+      Breakdown_file << "Total CL    (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL[iMarker_Monitoring] * 100.0)
+                       / (Total_CL + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CL_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CL[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CL_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CD    (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD[iMarker_Monitoring] * 100.0)
+                       / (Total_CD + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CD_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CD[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CD_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        Breakdown_file << "Total CSF   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF[iMarker_Monitoring] * 100.0)
+                         / (Total_CSF + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CSF[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CSF_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CSF_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CSF_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CSF[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CSF_Mnt[iMarker_Monitoring] << "\n";
+      }
+      
+      Breakdown_file << "Total CL/CD (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff[iMarker_Monitoring] * 100.0) / (Total_CEff + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CEff[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CEff_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CEff_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CEff_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CEff[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CEff_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        
+        Breakdown_file << "Total CMx   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx[iMarker_Monitoring] * 100.0) / (Total_CMx + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMx[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMx_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMx_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMx_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMx[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMx_Mnt[iMarker_Monitoring] << "\n";
+        
+        Breakdown_file << "Total CMy   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy[iMarker_Monitoring] * 100.0) / (Total_CMy + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMy[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CMy_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMy_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CMy_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CMy[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CMy_Mnt[iMarker_Monitoring] << "\n";
+      }
+      
+      Breakdown_file << "Total CMz   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CMz[iMarker_Monitoring] * 100.0) / (Total_CMz + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CMz[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CMz_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CMz_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CMz_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CMz[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CMz_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CFx   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CFx[iMarker_Monitoring] * 100.0) / (Total_CFx + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFx[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFx_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFx_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFx_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFx[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFx_Mnt[iMarker_Monitoring] << "\n";
+      
+      Breakdown_file << "Total CFy   (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int((Surface_CFy[iMarker_Monitoring] * 100.0) / (Total_CFy + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFy[iMarker_Monitoring];
+      Breakdown_file << " | Pressure (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Inv[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file << Surface_CFy_Inv[iMarker_Monitoring];
+      Breakdown_file << " | Friction (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Visc[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFy_Visc[iMarker_Monitoring];
+      Breakdown_file << " | Momentum (";
+      Breakdown_file.width(5);
+      Breakdown_file
+      << SU2_TYPE::Int(
+                       (Surface_CFy_Mnt[iMarker_Monitoring] * 100.0)
+                       / (Surface_CFy[iMarker_Monitoring] + EPS));
+      Breakdown_file << "%): ";
+      Breakdown_file.width(11);
+      Breakdown_file
+      << Surface_CFy_Mnt[iMarker_Monitoring] << "\n";
+      
+      if (nDim == 3) {
+        Breakdown_file << "Total CFz   (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz[iMarker_Monitoring] * 100.0) / (Total_CFz + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CFz[iMarker_Monitoring];
+        Breakdown_file << " | Pressure (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Inv[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file << Surface_CFz_Inv[iMarker_Monitoring];
+        Breakdown_file << " | Friction (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Visc[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CFz_Visc[iMarker_Monitoring];
+        Breakdown_file << " | Momentum (";
+        Breakdown_file.width(5);
+        Breakdown_file
+        << SU2_TYPE::Int(
+                         (Surface_CFz_Mnt[iMarker_Monitoring] * 100.0)
+                         / (Surface_CFz[iMarker_Monitoring] + EPS));
+        Breakdown_file << "%): ";
+        Breakdown_file.width(11);
+        Breakdown_file
+        << Surface_CFz_Mnt[iMarker_Monitoring] << "\n";
+        
+      }
+      
+      Breakdown_file << "\n";
+      
+      
+    }
+    
+    delete [] Surface_CL;
+    delete [] Surface_CD;
+    delete [] Surface_CSF;
+    delete [] Surface_CEff;
+    delete [] Surface_CFx;
+    delete [] Surface_CFy;
+    delete [] Surface_CFz;
+    delete [] Surface_CMx;
+    delete [] Surface_CMy;
+    delete [] Surface_CMz;
+    
+    delete [] Surface_CL_Inv;
+    delete [] Surface_CD_Inv;
+    delete [] Surface_CSF_Inv;
+    delete [] Surface_CEff_Inv;
+    delete [] Surface_CFx_Inv;
+    delete [] Surface_CFy_Inv;
+    delete [] Surface_CFz_Inv;
+    delete [] Surface_CMx_Inv;
+    delete [] Surface_CMy_Inv;
+    delete [] Surface_CMz_Inv;
+    
+    delete [] Surface_CL_Visc;
+    delete [] Surface_CD_Visc;
+    delete [] Surface_CSF_Visc;
+    delete [] Surface_CEff_Visc;
+    delete [] Surface_CFx_Visc;
+    delete [] Surface_CFy_Visc;
+    delete [] Surface_CFz_Visc;
+    delete [] Surface_CMx_Visc;
+    delete [] Surface_CMy_Visc;
+    delete [] Surface_CMz_Visc;
+
+    delete [] Surface_CL_Mnt;
+    delete [] Surface_CD_Mnt;
+    delete [] Surface_CSF_Mnt;
+    delete [] Surface_CEff_Mnt;
+    delete [] Surface_CFx_Mnt;
+    delete [] Surface_CFy_Mnt;
+    delete [] Surface_CFz_Mnt;
+    delete [] Surface_CMx_Mnt;
+    delete [] Surface_CMy_Mnt;
+    delete [] Surface_CMz_Mnt;
+
+    Breakdown_file.close();
+    
+  }
+  
+}
+
+
+bool CFlowOutput::WriteVolume_Output(CConfig *config, unsigned long Iter){
+  
+  if (config->GetTime_Domain()){
+    if (((config->GetTime_Marching() == DT_STEPPING_1ST) ||
+         (config->GetTime_Marching() == TIME_STEPPING)) &&
+        ((Iter == 0) || (Iter % config->GetVolume_Wrt_Freq() == 0))){
+      return true;
+    }
+    
+    if ((config->GetTime_Marching() == DT_STEPPING_2ND) &&
+        ((Iter == 0) || (Iter    % config->GetVolume_Wrt_Freq() == 0) ||
+         ((Iter-1) % config->GetVolume_Wrt_Freq() == 0) )){
+      return true;
+    }
+  } else {
+    return ((Iter > 0) && Iter % config->GetVolume_Wrt_Freq() == 0);
+  }
+  
+  return false;
+}

From 6fc1cbb14202fd002259f8e48595e45a43967361 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 12 Sep 2019 14:34:24 +0200
Subject: [PATCH 464/539] changed file output and adapted test cases

---
 Common/include/config_structure.hpp           |   15 +-
 Common/include/config_structure.inl           |    4 +-
 Common/include/option_structure.hpp           |   22 +-
 Common/src/config_structure.cpp               |   27 +-
 Common/src/geometry_structure.cpp             |   18 +-
 Common/src/grid_movement_structure.cpp        |  106 +-
 SU2_CFD/include/output/COutput.hpp            |   15 +-
 SU2_CFD/src/output/COutput.cpp                |  108 +-
 .../src/output/output_structure_legacy.cpp    | 2344 ++++++++---------
 SU2_DEF/src/SU2_DEF.cpp                       |   42 +-
 SU2_PY/SU2/io/tools.py                        |   12 +-
 SU2_PY/SU2/opt/project.py                     |    4 +-
 SU2_PY/SU2/run/adjoint.py                     |    2 +-
 SU2_PY/SU2/run/direct.py                      |    2 +-
 SU2_PY/SU2/run/merge.py                       |    2 -
 SU2_PY/SU2/run/projection.py                  |    2 +-
 SU2_PY/SU2/util/plot.py                       |    6 +-
 .../aeroelastic/aeroelastic_NACA64A010.cfg    |    2 +-
 .../cont_adj_euler/naca0012/inv_NACA0012.cfg  |    5 +-
 .../naca0012/inv_NACA0012_FD.cfg              |    4 +-
 .../naca0012/inv_NACA0012_discadj.cfg         |    4 +-
 .../cont_adj_euler/oneram6/inv_ONERAM6.cfg    |    4 +-
 .../cont_adj_euler/wedge/inv_wedge_ROE.cfg    |    4 +-
 .../wedge/inv_wedge_ROE_multiobj.cfg          |    4 +-
 .../cylinder/lam_cylinder.cfg                 |    2 +-
 .../naca0012_sub/lam_NACA0012.cfg             |    2 +-
 .../naca0012_trans/lam_NACA0012.cfg           |    2 +-
 .../cont_adj_rans/naca0012/turb_nasa.cfg      |    4 +-
 .../naca0012/turb_nasa_binary.cfg             |    4 +-
 .../cont_adj_rans/oneram6/turb_ONERAM6.cfg    |    2 +-
 .../cont_adj_rans/rae2822/turb_SA_RAE2822.cfg |    4 +-
 .../control_surface/inv_ONERAM6_moving.cfg    |    4 +-
 .../control_surface/inv_ONERAM6_setting.cfg   |    4 +-
 .../coupled_cht/incompressible/configFlow.cfg |    3 +-
 .../incompressible/configSolid.cfg            |    3 +-
 .../coupled_cht_incompressible.cfg            |    3 +-
 TestCases/ddes/flatplate/ddes_flatplate.cfg   |    4 +-
 .../deformation/brick_hex/def_brick_hex.cfg   |    4 +-
 .../brick_hex_rans/def_brick_hex_rans.cfg     |    4 +-
 .../brick_prism/def_brick_prism.cfg           |    4 +-
 .../brick_prism_rans/def_brick_prism_rans.cfg |    4 +-
 .../deformation/brick_pyra/def_brick_pyra.cfg |    4 +-
 .../deformation/brick_tets/def_brick_tets.cfg |    4 +-
 .../cylindrical_ffd/def_cylindrical.cfg       |    4 +-
 .../deformation/naca0012/def_NACA0012.cfg     |    4 +-
 .../naca0012/surface_file_NACA0012.cfg        |    4 +-
 .../deformation/naca4412/def_NACA4412.cfg     |    4 +-
 TestCases/deformation/rae2822/def_RAE2822.cfg |    6 +-
 .../spherical_ffd/def_spherical.cfg           |    4 +-
 .../spherical_ffd/def_spherical_bspline.cfg   |    4 +-
 .../disc_adj_euler/arina2k/Arina2KRS.cfg      |    4 +-
 .../cylinder3D/inv_cylinder3D.cfg             |    4 +-
 .../disc_adj_euler/oneram6/inv_ONERAM6.cfg    |    4 +-
 TestCases/disc_adj_fea/configAD_fem.cfg       |    2 +-
 TestCases/disc_adj_fsi/Airfoil_2d/config.cfg  |    2 +-
 TestCases/disc_adj_fsi/configAD_fsi.cfg       |    2 +-
 TestCases/disc_adj_heat/disc_adj_heat.cfg     |    3 +-
 .../naca0012/incomp_NACA0012_disc.cfg         |    4 +-
 .../cylinder/heated_cylinder.cfg              |    2 +-
 .../naca0012/turb_naca0012_sa.cfg             |    2 +-
 .../naca0012/turb_naca0012_sst.cfg            |    2 +-
 TestCases/disc_adj_rans/cylinder/cylinder.cfg |    4 +-
 .../cylinder_DT_1ST/cylinder.cfg              |    4 +-
 .../naca0012/turb_NACA0012_sa.cfg             |    4 +-
 .../naca0012/turb_NACA0012_sst.cfg            |    4 +-
 .../transonic_stator_2D/transonic_stator.cfg  |    2 +-
 TestCases/euler/CRM/inv_CRM_JST.cfg           |    4 +-
 TestCases/euler/biparabolic/BIPARABOLIC.cfg   |    4 +-
 TestCases/euler/bluntbody/blunt.cfg           |    4 +-
 TestCases/euler/channel/inv_channel.cfg       |    2 +-
 TestCases/euler/channel/inv_channel_RK.cfg    |    2 +-
 TestCases/euler/naca0012/inv_NACA0012.cfg     |    4 +-
 TestCases/euler/naca0012/inv_NACA0012_Roe.cfg |    4 +-
 TestCases/euler/oneram6/inv_ONERAM6.cfg       |    4 +-
 TestCases/euler/wedge/inv_wedge_HLLC.cfg      |    4 +-
 TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg   |    2 +-
 TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg  |    2 +-
 TestCases/fea_fsi/Airfoil_RBF/settings.cfg    |    2 +-
 .../fea_fsi/DynBeam_2d/configBeam_2d.cfg      |    2 +-
 TestCases/fea_fsi/MixElemsKnowles/config.cfg  |    2 +-
 TestCases/fea_fsi/SquareCyl_Beam/config.cfg   |    4 +-
 .../fea_fsi/StatBeam_3d/configBeam_3d.cfg     |    2 +-
 .../fea_fsi/WallChannel_2d/configFSI_2D.cfg   |    2 +-
 .../fea_fsi/WallChannel_2d/configFlow.cfg     |    2 +-
 TestCases/fea_fsi/dyn_fsi/configFEA.cfg       |    2 +-
 TestCases/fea_fsi/dyn_fsi/configFlow.cfg      |    2 +-
 TestCases/fea_fsi/stat_fsi/configFEA.cfg      |    2 +-
 TestCases/fea_fsi/stat_fsi/configFlow.cfg     |    2 +-
 TestCases/fea_topology/config.cfg             |    2 +-
 .../fea_topology/quick_start/settings.cfg     |    2 +-
 .../quick_start/settings_refnode.cfg          |    2 +-
 .../quick_start/settings_volfrac.cfg          |    2 +-
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg  |    4 +-
 .../naca0012/inv_NACA0012_ContAdj.cfg         |    4 +-
 TestCases/gust/inv_gust_NACA0012.cfg          |    2 +-
 TestCases/harmonic_balance/HB.cfg             |    4 +-
 .../hb_rans_preconditioning/davis.cfg         |    6 +-
 .../2D/Quad32X32_nPoly4/InviscidVortex.cfg    |    6 +-
 .../3D/nPoly2_Tets/InviscidVortex.cfg         |    6 +-
 .../3D/nPoly4_Tets/InviscidVortex.cfg         |    6 +-
 .../fem_NACA0012.cfg                          |    4 +-
 .../NACA0012_5thOrder/fem_NACA0012.cfg        |    4 +-
 .../NACA0012_5thOrder/fem_NACA0012_reg.cfg    |    4 +-
 .../Ringleb/Quad100X50_nPoly3/Ringleb.cfg     |    4 +-
 .../Quad100X50_nPoly3/Ringleb_WallBC.cfg      |    4 +-
 .../Ringleb/Quad100X50_nPoly4/Ringleb.cfg     |    4 +-
 .../Quad100X50_nPoly4/Ringleb_WallBC.cfg      |    4 +-
 .../Ringleb/Quad200X100_nPoly4/Ringleb.cfg    |    4 +-
 .../Quad200X100_nPoly4/Ringleb_WallBC.cfg     |    4 +-
 .../Quad50X50_HalfGeom_nPoly4/Ringleb.cfg     |    4 +-
 .../Ringleb_WallBC.cfg                        |    4 +-
 .../Ringleb.cfg                               |    4 +-
 .../Ringleb_WallBC.cfg                        |    4 +-
 .../Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg |    4 +-
 .../Ringleb_WallBC.cfg                        |    4 +-
 .../Sphere_4thOrder_Hexa/fem_Sphere.cfg       |    4 +-
 .../Sphere_4thOrder_Tet/fem_Sphere.cfg        |    4 +-
 .../nPoly1/fem_SubsonicChannel.cfg            |    4 +-
 .../nPoly1/fem_SubsonicChannel_Farfield.cfg   |    4 +-
 .../nPoly2/fem_SubsonicChannel.cfg            |    4 +-
 .../nPoly2/fem_SubsonicChannel_Farfield.cfg   |    4 +-
 .../nPoly4/fem_SubsonicChannel.cfg            |    4 +-
 .../nPoly4/fem_SubsonicChannel_Farfield.cfg   |    4 +-
 .../nPoly3/fem_Cylinder_reg.cfg               |    4 +-
 .../FlatPlate/nPoly4/lam_flatplate_reg.cfg    |    2 +-
 .../nPoly3_QuadDominant/fem_Sphere_reg.cfg    |    4 +-
 .../fem_Sphere_reg_ADER.cfg                   |    4 +-
 .../nPoly4/fem_unst_cylinder.cfg              |    4 +-
 .../nPoly4/fem_unst_cylinder_ADER.cfg         |    4 +-
 .../incomp_euler/naca0012/incomp_NACA0012.cfg |    4 +-
 TestCases/incomp_euler/nozzle/inv_nozzle.cfg  |    2 +-
 .../incomp_navierstokes/bend/lam_bend.cfg     |    4 +-
 .../buoyancy_cavity/lam_buoyancy_cavity.cfg   |    2 +-
 .../cylinder/incomp_cylinder.cfg              |    4 +-
 .../cylinder/poly_cylinder.cfg                |    2 +-
 .../incomp_rans/AhmedBody/turb_ahmed.cfg      |    4 +-
 TestCases/incomp_rans/naca0012/naca0012.cfg   |    4 +-
 .../naca0012/naca0012_SST_SUST.cfg            |    4 +-
 TestCases/mms/dg_navierstokes/lam_mms_dg.cfg  |    4 +-
 .../mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg  |    4 +-
 TestCases/mms/dg_ringleb/ringleb_dg.cfg       |    4 +-
 .../mms/fvm_incomp_euler/inv_mms_jst.cfg      |    2 +-
 .../fvm_incomp_navierstokes/lam_mms_fds.cfg   |    2 +-
 .../mms/fvm_navierstokes/lam_mms_roe.cfg      |    2 +-
 TestCases/moving_wall/cavity/lam_cavity.cfg   |    2 +-
 .../spinning_cylinder/spinning_cylinder.cfg   |    2 +-
 .../naca0012/inv_NACA0012_ffd.cfg             |    4 +-
 .../cylinder/cylinder_lowmach.cfg             |    2 +-
 .../navierstokes/cylinder/lam_cylinder.cfg    |    2 +-
 .../navierstokes/flatplate/lam_flatplate.cfg  |    2 +-
 .../navierstokes/naca0012/lam_NACA0012.cfg    |    2 +-
 .../poiseuille/lam_poiseuille.cfg             |    2 +-
 .../poiseuille/profile_poiseuille.cfg         |    2 +-
 TestCases/nicf/LS89/turb_SA_PR.cfg            |    4 +-
 TestCases/nicf/LS89/turb_SST_PR.cfg           |    2 +-
 TestCases/nicf/edge/edge_PPR.cfg              |    2 +-
 TestCases/nicf/edge/edge_VW.cfg               |    2 +-
 .../inv_wedge_ROE_2surf_1obj.cfg              |    6 +-
 .../inv_wedge_ROE_multiobj.cfg                |    7 +-
 .../inv_wedge_ROE_multiobj_1surf.cfg          |    7 +-
 .../inv_wedge_ROE_multiobj_combo.cfg          |    4 +-
 .../inv_NACA0012_multipoint.cfg               |    4 +-
 .../pitching_NACA64A010.cfg                   |    4 +-
 .../pitching_oneram6/pitching_ONERAM6.cfg     |    4 +-
 .../rotating_naca0012/rotating_NACA0012.cfg   |    2 +-
 .../steady_inverse_design/inv_NACA0012.cfg    |    4 +-
 .../steady_naca0012/inv_NACA0012_adv.cfg      |    8 +-
 .../steady_naca0012/inv_NACA0012_basic.cfg    |    4 +-
 .../steady_oneram6/inv_ONERAM6_adv.cfg        |    6 +-
 .../steady_oneram6/inv_ONERAM6_basic.cfg      |    4 +-
 .../pitching_naca64a010/turb_NACA64A010.cfg   |    4 +-
 .../pitching_oneram6/turb_ONERAM6.cfg         |    2 +-
 .../steady_oneram6/turb_ONERAM6.cfg           |    2 +-
 .../steady_rae2822/turb_SA_RAE2822.cfg        |    2 +-
 TestCases/polar/naca0012/inv_NACA0012.cfg     |    4 +-
 .../flow_load_sens/configAD_fem.cfg           |    2 +-
 .../mesh_disp_sens/configAD_flow.cfg          |    2 +-
 .../flatPlate_rigidMotion_Conf.cfg            |    4 +-
 .../unsteady_CHT_FlatPlate_Conf.cfg           |    4 +-
 .../rans/flatplate/turb_SA_flatplate.cfg      |    4 +-
 .../rans/flatplate/turb_SST_flatplate.cfg     |    4 +-
 TestCases/rans/naca0012/turb_NACA0012_sa.cfg  |    6 +-
 .../rans/naca0012/turb_NACA0012_sa_binary.cfg |    6 +-
 .../rans/naca0012/turb_NACA0012_sa_neg.cfg    |    6 +-
 TestCases/rans/naca0012/turb_NACA0012_sst.cfg |    6 +-
 .../turb_NACA0012_sst_multigrid_restart.cfg   |    6 +-
 .../rans/naca0012/turb_NACA0012_sst_sust.cfg  |    6 +-
 TestCases/rans/oneram6/turb_ONERAM6.cfg       |    4 +-
 TestCases/rans/propeller/propeller.cfg        |    6 +-
 TestCases/rans/rae2822/turb_SA_RAE2822.cfg    |    4 +-
 TestCases/rans/rae2822/turb_SST_RAE2822.cfg   |    4 +-
 .../rans/rae2822/turb_SST_SUST_RAE2822.cfg    |    4 +-
 TestCases/rans/s809/trans_s809.cfg            |    4 +-
 TestCases/rans/s809/turb_S809.cfg             |    4 +-
 TestCases/rans/vki_turbine/turb_vki.cfg       |    4 +-
 .../rans_uq/naca0012/turb_NACA0012_uq.cfg     |    4 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_1c.cfg  |    4 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_2c.cfg  |    4 +-
 .../rans_uq/naca0012/turb_NACA0012_uq_3c.cfg  |    4 +-
 .../naca0012/turb_NACA0012_uq_p1c1.cfg        |    4 +-
 .../naca0012/turb_NACA0012_uq_p1c2.cfg        |    4 +-
 .../caradonna_tung/rot_caradonna_tung.cfg     |    4 +-
 TestCases/rotating/naca0012/rot_NACA0012.cfg  |    2 +-
 .../sliding_interface/bars_SST_2D/bars.cfg    |    2 +-
 .../channel_2D/channel_2D_NN.cfg              |    2 +-
 .../channel_2D/channel_2D_WA.cfg              |    2 +-
 .../channel_3D/channel_3D_NN.cfg              |    2 +-
 .../channel_3D/channel_3D_WA.cfg              |    2 +-
 .../incompressible_steady/configCircle.cfg    |    2 +-
 .../incompressible_steady/configOut.cfg       |    2 +-
 .../incompressible_unsteady/configCircle.cfg  |    2 +-
 .../incompressible_unsteady/configOut.cfg     |    2 +-
 TestCases/sliding_interface/pipe/pipe_NN.cfg  |    2 +-
 TestCases/sliding_interface/pipe/pipe_WA.cfg  |    2 +-
 .../rotating_cylinders/rot_cylinders_NN.cfg   |    2 +-
 .../rotating_cylinders/rot_cylinders_WA.cfg   |    2 +-
 .../single_stage/single_stage_NN.cfg          |    2 +-
 .../single_stage/single_stage_WA.cfg          |    2 +-
 .../sup_vor_shed_NN.cfg                       |    2 +-
 .../sup_vor_shed_WA.cfg                       |    2 +-
 .../uniform_flow/uniform_NN.cfg               |    2 +-
 .../uniform_flow/uniform_WA.cfg               |    2 +-
 .../transitional_BC_model_ConfigFile.cfg      |    4 +-
 .../transitional_BC_model_ConfigFile.cfg      |    4 +-
 .../transitional_BC_model_ConfigFile.cfg      |    4 +-
 .../turbomachinery/APU_turbocharger/Jones.cfg |    2 +-
 .../APU_turbocharger/Jones_rst.cfg            |    2 +-
 .../axial_stage_2D/Axial_stage2D.cfg          |    2 +-
 .../centrifugal_blade/centrifugal_blade.cfg   |    2 +-
 .../centrifugal_stage/centrifugal_stage.cfg   |    2 +-
 .../transonic_stator_2D/transonic_stator.cfg  |    2 +-
 .../transonic_stator_rst.cfg                  |    2 +-
 .../config_incomp_turb_sa.cfg                 |    4 +-
 .../pitching_NACA64A010.cfg                   |    4 +-
 .../turb_NACA64A010.cfg                       |    4 +-
 .../plunging_naca0012/plunging_NACA0012.cfg   |    2 +-
 .../unsteady/square_cylinder/turb_square.cfg  |    6 +-
 237 files changed, 1717 insertions(+), 1765 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index aa59a62f8e6a..c24611b2d06f 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -703,7 +703,7 @@ class CConfig {
   unsigned short Analytical_Surface;	/*!< \brief Information about the analytical definition of the surface for grid adaptation. */
   unsigned short Geo_Description;	/*!< \brief Description of the geometry. */
   unsigned short Mesh_FileFormat;	/*!< \brief Mesh input format. */
-  unsigned short Output_FileFormat;	/*!< \brief Format of the output files. */
+  unsigned short Tab_FileFormat;	/*!< \brief Format of the output files. */
   unsigned short ActDisk_Jump;	/*!< \brief Format of the output files. */
   bool CFL_Adapt;      /*!< \brief Adaptive CFL number. */
   bool HB_Precondition;    /*< \brief Flag to turn on harmonic balance source term preconditioning */
@@ -746,8 +746,7 @@ class CConfig {
   New_SU2_FileName,       		/*!< \brief Output SU2 mesh file converted from CGNS format. */
   SurfSens_FileName,			/*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
   VolSens_FileName;			/*!< \brief Output file for the sensitivity in the volume (discrete adjoint). */
-  bool Low_MemoryOutput,      /*!< \brief Output less information for lower memory use */
-  Wrt_Output,                 /*!< \brief Write any output files */
+  bool Wrt_Output,                 /*!< \brief Write any output files */
   Wrt_Vol_Sol,                /*!< \brief Write a volume solution file */
   Wrt_Srf_Sol,                /*!< \brief Write a surface solution file */
   Wrt_Csv_Sol,                /*!< \brief Write a surface comma-separated values solution file */
@@ -3180,13 +3179,7 @@ class CConfig {
    * \return <code>TRUE</code> means that a volume solution file will be written.
    */
   bool GetWrt_Vol_Sol(void);
-  
-  /*!
-   * \brief Get information about writing a volume solution file.
-   * \return <code>TRUE</code> means that a volume solution file will be written.
-   */
-  bool GetLow_MemoryOutput(void);
-  
+
   /*!
    * \brief Get information about writing a surface solution file.
    * \return <code>TRUE</code> means that a surface solution file will be written.
@@ -5388,7 +5381,7 @@ class CConfig {
    * \brief Get the format of the output solution.
    * \return Format of the output solution.
    */
-  unsigned short GetOutput_FileFormat(void);
+  unsigned short GetTabular_FileFormat(void);
   
   /*!
    * \brief Get the format of the output solution.
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 36fffda58754..581d5e92936c 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -1465,7 +1465,7 @@ inline string CConfig::GetMesh_Out_FileName(void) { return Mesh_Out_FileName; }
 
 inline unsigned short CConfig::GetMesh_FileFormat(void) { return Mesh_FileFormat; }
 
-inline unsigned short CConfig::GetOutput_FileFormat(void) { return Output_FileFormat; }
+inline unsigned short CConfig::GetTabular_FileFormat(void) { return Tab_FileFormat; }
 
 inline unsigned short CConfig::GetActDisk_Jump(void) { return ActDisk_Jump; }
 
@@ -1641,8 +1641,6 @@ inline string CConfig::GetDV_Sens_Filename(void) { return DV_Sens_Filename; }
 
 inline string CConfig::GetDV_Unordered_Sens_Filename(void) { return DV_Unordered_Sens_Filename; }
 
-inline bool CConfig::GetLow_MemoryOutput(void) { return Low_MemoryOutput; }
-
 inline bool CConfig::GetWrt_Output(void) { return Wrt_Output; }
 
 inline bool CConfig::GetWrt_Vol_Sol(void) { return Wrt_Vol_Sol; }
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 4c43d92ce1a0..266cba111d00 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1522,13 +1522,13 @@ static const map<string, ENUM_ADAPT> Adapt_Map = CCreateMap<string, ENUM_ADAPT>
  */
 enum ENUM_INPUT {
   SU2       = 1,  /*!< \brief SU2 input format. */
-  CGNS      = 2,  /*!< \brief CGNS input format for the computational grid. */
+  CGNS_GRID = 2,  /*!< \brief CGNS input format for the computational grid. */
   RECTANGLE = 3,  /*!< \brief 2D rectangular mesh with N x M points of size Lx x Ly. */
   BOX       = 4   /*!< \brief 3D box mesh with N x M x L points of size Lx x Ly x Lz. */
 };
 static const map<string, ENUM_INPUT> Input_Map = CCreateMap<string, ENUM_INPUT>
 ("SU2", SU2)
-("CGNS", CGNS)
+("CGNS", CGNS_GRID)
 ("RECTANGLE", RECTANGLE)
 ("BOX", BOX);
 
@@ -1548,7 +1548,8 @@ enum ENUM_OUTPUT {
   SURFACE_PARAVIEW_BINARY = 10,   /*!< \brief Paraview binary format for the solution output. */
   MESH      = 11,      /*!< \brief SU2 mesh format. */
   RESTART_BINARY = 12,/*!< \brief SU2 binary restart format. */
-  RESTART_ASCII = 13  /*!< \brief SU2 ASCII restart format. */
+  RESTART_ASCII = 13,  /*!< \brief SU2 ASCII restart format. */
+  CGNS = 14
 };
 
 static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPUT>
@@ -1563,7 +1564,20 @@ static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPU
 ("SURFACE_PARAVIEW_ASCII", SURFACE_PARAVIEW)
 ("SURFACE_PARAVIEW", SURFACE_PARAVIEW_BINARY)
 ("RESTART_ASCII", RESTART_ASCII)
-("RESTART", RESTART_BINARY);
+("RESTART", RESTART_BINARY)
+("CGNS", CGNS);
+
+/*!
+ * \brief type of solution output file formats
+ */
+enum ENUM_TAB_OUTPUT {
+  TAB_CSV = 1,			         /*!< \brief Comma-separated values format for the solution output. */
+  TAB_TECPLOT = 2            /*!< \brief Tecplot format for the solution output. */
+};
+
+static const map<string, ENUM_TAB_OUTPUT> TabOutput_Map = CCreateMap<string, ENUM_TAB_OUTPUT>
+("CSV", TAB_CSV)
+("TECPLOT", TAB_TECPLOT);
 
 /*!
  * \brief type of volume sensitivity file formats (inout to SU2_DOT)
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index d3cfb597ed3d..309a7a29a9ed 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -295,7 +295,7 @@ unsigned short CConfig::GetnZone(string val_mesh_filename, unsigned short val_fo
       
     }
       
-    case CGNS: {
+    case CGNS_GRID: {
       
 #ifdef HAVE_CGNS
       
@@ -423,7 +423,7 @@ unsigned short CConfig::GetnDim(string val_mesh_filename, unsigned short val_for
       break;
     }
 
-    case CGNS: {
+    case CGNS_GRID: {
 
 #ifdef HAVE_CGNS
 
@@ -765,6 +765,7 @@ void CConfig::SetPointersNull(void) {
   ScreenOutput = NULL;
   HistoryOutput = NULL;
   VolumeOutput = NULL;
+  VolumeOutputFiles = NULL;
 
   /*--- Variable initialization ---*/
   
@@ -1686,7 +1687,7 @@ void CConfig::SetConfig_Options() {
   /*--- Options related to input/output files and formats ---*/
 
   /*!\brief OUTPUT_FORMAT \n DESCRIPTION: I/O format for output plots. \n OPTIONS: see \link Output_Map \endlink \n DEFAULT: TECPLOT \ingroup Config */
-  addEnumOption("OUTPUT_FORMAT", Output_FileFormat, Output_Map, TECPLOT);
+  addEnumOption("TABULAR_FORMAT", Tab_FileFormat, TabOutput_Map, TAB_CSV);
   /*!\brief ACTDISK_JUMP \n DESCRIPTION: The jump is given by the difference in values or a ratio */
   addEnumOption("ACTDISK_JUMP", ActDisk_Jump, Jump_Map, DIFFERENCE);
   /*!\brief MESH_FORMAT \n DESCRIPTION: Mesh input file format \n OPTIONS: see \link Input_Map \endlink \n DEFAULT: SU2 \ingroup Config*/
@@ -1759,9 +1760,6 @@ void CConfig::SetConfig_Options() {
   /*!\brief WRT_CON_FREQ_DUALTIME
    *  \n DESCRIPTION: Writing convergence history frequency for the dual time  \ingroup Config*/
   addUnsignedLongOption("WRT_CON_FREQ_DUALTIME",  Wrt_Con_Freq_DualTime, 10);
-  /*!\brief LOW_MEMORY_OUTPUT
-   *  \n DESCRIPTION: Output less information for lower memory use.  \ingroup Config*/
-  addBoolOption("LOW_MEMORY_OUTPUT", Low_MemoryOutput, false);
   /*!\brief WRT_OUTPUT
    *  \n DESCRIPTION: Write output files (disable all output by setting to NO)  \ingroup Config*/
   addBoolOption("WRT_OUTPUT", Wrt_Output, true);
@@ -2587,7 +2585,11 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
           if (!option_name.compare("STARTCONV_ITER")) newString.append("STARTCONV_ITER is now CONV_STARTITER.\n");
           if (!option_name.compare("CAUCHY_ELEMS")) newString.append("CAUCHY_ELEMS is now CONV_CAUCHY_ELEMS.\n");
           if (!option_name.compare("CAUCHY_EPS")) newString.append("CAUCHY_EPS is now CONV_CAUCHY_EPS.\n");
-          
+          if (!option_name.compare("OUTPUT_FORMAT")) newString.append("OUTPUT_FORMAT is now TABULAR_FORMAT.\n");
+          if (!option_name.compare("PHYSICAL_PROBLEM")) newString.append("PHYSICAL_PROBLEM is now SOLVER.\n");
+          if (!option_name.compare("REGIME_TYPE")) newString.append("REGIME_TYPE has been removed.\n "
+                                                                    "If you want use the incompressible solver, \n"
+                                                                    "use INC_EULER, INC_NAVIER_STOKES or INC_RANS as value of the SOLVER option.");
           errorString.append(newString);
           err_count++;
         continue;
@@ -3089,12 +3091,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     if (TimeMarching == TIME_STEPPING){
       InnerIter = 1;
     }
+   VolumeWrtFreq = 1;
   }
   
-  /*--- Low memory only for ASCII Tecplot ---*/
-
-  if (Output_FileFormat != TECPLOT) Low_MemoryOutput = NO;
-  
   /*--- The that Discard_InFiles is false, owerwise the gradient could be wrong ---*/
   
   if ((ContinuousAdjoint || DiscreteAdjoint) && Fixed_CL_Mode && !Eval_dOF_dCX)
@@ -6252,7 +6251,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
 
   if (val_software == SU2_CFD) {
 
-    if (Low_MemoryOutput) cout << "Writing output files with low memory RAM requirements."<< endl;
     cout << "Writing a solution file every " << Wrt_Sol_Freq <<" iterations."<< endl;
     cout << "Writing the convergence history every " << Wrt_Con_Freq <<" iterations."<< endl;
     if ((TimeMarching == DT_STEPPING_1ST) || (TimeMarching == DT_STEPPING_2ND)) {
@@ -6260,7 +6258,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
       cout << "Writing the dual time convergence history every " << Wrt_Con_Freq_DualTime <<" iterations."<< endl;
     }
 
-    switch (Output_FileFormat) {
+    switch (Tab_FileFormat) {
       case PARAVIEW: cout << "The output file format is Paraview ASCII legacy (.vtk)." << endl; break;
       case PARAVIEW_BINARY: cout << "The output file format is Paraview binary legacy (.vtk)." << endl; break;
       case TECPLOT: cout << "The output file format is Tecplot ASCII (.dat)." << endl; break;
@@ -6288,8 +6286,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
   }
 
   if (val_software == SU2_SOL) {
-    if (Low_MemoryOutput) cout << "Writing output files with low memory RAM requirements."<< endl;
-    switch (Output_FileFormat) {
+    switch (Tab_FileFormat) {
       case PARAVIEW: cout << "The output file format is Paraview ASCII legacy (.vtk)." << endl; break;
       case PARAVIEW_BINARY: cout << "The output file format is Paraview binary legacy (.vtk)." << endl; break;
       case TECPLOT: cout << "The output file format is Tecplot ASCII (.dat)." << endl; break;
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 7e4d74f08c2f..ae45f3cc69eb 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -3727,7 +3727,7 @@ CPhysicalGeometry::CPhysicalGeometry(CConfig *config, unsigned short val_iZone,
         Read_SU2_Format_Parallel_FEM(config, val_mesh_filename, val_iZone, val_nZone);
         break;
 
-      case CGNS:
+      case CGNS_GRID:
         Read_CGNS_Format_Parallel_FEM(config, val_mesh_filename, val_iZone, val_nZone);
         break;
 
@@ -3739,7 +3739,7 @@ CPhysicalGeometry::CPhysicalGeometry(CConfig *config, unsigned short val_iZone,
   else {
 
     switch (val_format) {
-      case SU2: case CGNS: case RECTANGLE: case BOX:
+      case SU2: case CGNS_GRID: case RECTANGLE: case BOX:
         Read_Mesh_FVM(config, val_mesh_filename, val_iZone, val_nZone);
         break;
       default:
@@ -7509,7 +7509,7 @@ void CPhysicalGeometry::Read_Mesh_FVM(CConfig        *config,
     case SU2:
       MeshFVM = new CSU2ASCIIMeshReaderFVM(config, val_iZone, val_nZone);
       break;
-    case CGNS:
+    case CGNS_GRID:
       MeshFVM = new CCGNSMeshReaderFVM(config, val_iZone, val_nZone);
       break;
     case RECTANGLE:
@@ -14828,7 +14828,7 @@ void CPhysicalGeometry::Compute_Wing(CConfig *config, bool original_surface,
     
     /*--- Write an output file---*/
 
-    if (config->GetOutput_FileFormat() == PARAVIEW) {
+    if (config->GetTabular_FileFormat() == TAB_CSV) {
       Wing_File.open("wing_description.csv", ios::out);
       if (config->GetSystemMeasurements() == US)
         Wing_File << "\"yCoord/SemiSpan\",\"Area (in^2)\",\"Max. Thickness (in)\",\"Chord (in)\",\"Leading Edge Radius (1/in)\",\"Max. Thickness/Chord\",\"Twist (deg)\",\"Curvature (1/in)\",\"Dihedral (deg)\",\"Leading Edge XLoc/SemiSpan\",\"Leading Edge ZLoc/SemiSpan\",\"Trailing Edge XLoc/SemiSpan\",\"Trailing Edge ZLoc/SemiSpan\"" << endl;
@@ -14920,7 +14920,7 @@ void CPhysicalGeometry::Compute_Wing(CConfig *config, bool original_surface,
 
     for (iPlane = 0; iPlane < nPlane; iPlane++) {
     	if (Xcoord_Airfoil[iPlane].size() > 1) {
-    		if (config->GetOutput_FileFormat() == PARAVIEW) {
+    		if (config->GetTabular_FileFormat() == TAB_CSV) {
     			Wing_File  << Ycoord_Airfoil[iPlane][0]/SemiSpan <<", "<< Area[iPlane] <<", "<< MaxThickness[iPlane] <<", "<< Chord[iPlane] <<", "<< LERadius[iPlane] <<", "<< ToC[iPlane]
     			           <<", "<< Twist[iPlane] <<", "<< Curvature[iPlane] <<", "<< Dihedral[iPlane]
     			           <<", "<< LeadingEdge[iPlane][0]/SemiSpan <<", "<< LeadingEdge[iPlane][2]/SemiSpan
@@ -15123,7 +15123,7 @@ void CPhysicalGeometry::Compute_Fuselage(CConfig *config, bool original_surface,
 
     /*--- Write an output file---*/
 
-    if (config->GetOutput_FileFormat() == PARAVIEW) {
+    if (config->GetTabular_FileFormat() == TAB_CSV) {
       Fuselage_File.open("fuselage_description.csv", ios::out);
       if (config->GetSystemMeasurements() == US)
         Fuselage_File << "\"x (in)\",\"Area (in^2)\",\"Length (in)\",\"Width (in)\",\"Waterline width (in)\",\"Height (in)\",\"Curvature (1/in)\",\"Generatrix Curve X (in)\",\"Generatrix Curve Y (in)\",\"Generatrix Curve Z (in)\",\"Axis Curve X (in)\",\"Axis Curve Y (in)\",\"Axis Curve Z (in)\"" << endl;
@@ -15206,7 +15206,7 @@ void CPhysicalGeometry::Compute_Fuselage(CConfig *config, bool original_surface,
 
     for (iPlane = 0; iPlane < nPlane; iPlane++) {
     	if (Xcoord_Airfoil[iPlane].size() > 1) {
-    		if (config->GetOutput_FileFormat() == PARAVIEW) {
+    		if (config->GetTabular_FileFormat() == TAB_CSV) {
     			Fuselage_File  << -Ycoord_Airfoil[iPlane][0] <<", "<< Area[iPlane] <<", "<< Length[iPlane] <<", "<< Width[iPlane] <<", "<< WaterLineWidth[iPlane] <<", "<< Height[iPlane] <<", "<< Curvature[iPlane]
     			           <<", "<< -LeadingEdge[iPlane][1] <<", "<< LeadingEdge[iPlane][0]  <<", "<< LeadingEdge[iPlane][2]
     			           <<", "<< -TrailingEdge[iPlane][1] <<", "<< TrailingEdge[iPlane][0]  <<", "<< TrailingEdge[iPlane][2]  << endl;
@@ -15434,7 +15434,7 @@ void CPhysicalGeometry::Compute_Nacelle(CConfig *config, bool original_surface,
     
     /*--- Write an output file---*/
     
-    if (config->GetOutput_FileFormat() == PARAVIEW) {
+    if (config->GetTabular_FileFormat() == CSV) {
       Nacelle_File.open("nacelle_description.csv", ios::out);
       if (config->GetSystemMeasurements() == US)
         Nacelle_File << "\"Theta (deg)\",\"Area (in^2)\",\"Max. Thickness (in)\",\"Chord (in)\",\"Leading Edge Radius (1/in)\",\"Max. Thickness/Chord\",\"Twist (deg)\",\"Leading Edge XLoc\",\"Leading Edge ZLoc\",\"Trailing Edge XLoc\",\"Trailing Edge ZLoc\"" << endl;
@@ -15496,7 +15496,7 @@ void CPhysicalGeometry::Compute_Nacelle(CConfig *config, bool original_surface,
       su2double theta_deg = atan2(Plane_Normal[iPlane][1], -Plane_Normal[iPlane][2])/PI_NUMBER*180 + 180;
       
       if (Xcoord_Airfoil[iPlane].size() > 1) {
-        if (config->GetOutput_FileFormat() == PARAVIEW) {
+        if (config->GetTabular_FileFormat() == TAB_CSV) {
           Nacelle_File  << theta_deg <<", "<< Area[iPlane] <<", "<< MaxThickness[iPlane] <<", "<< Chord[iPlane] <<", "<< LERadius[iPlane] <<", "<< ToC[iPlane]
           <<", "<< Twist[iPlane] <<", "<< LeadingEdge[iPlane][0] <<", "<< LeadingEdge[iPlane][2]
           <<", "<< TrailingEdge[iPlane][0] <<", "<< TrailingEdge[iPlane][2] << endl;
diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
index 827be22dbd45..80b14f02f22c 100644
--- a/Common/src/grid_movement_structure.cpp
+++ b/Common/src/grid_movement_structure.cpp
@@ -2712,23 +2712,28 @@ void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *conf
         /*--- Output original FFD FFDBox ---*/
         
         if (rank == MASTER_NODE) {
-          if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-              (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-            cout << "Writing a Paraview file of the FFD boxes." << endl;
-            FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, true);
-          }
-          else if (config->GetOutput_FileFormat() == TECPLOT ) {
-            cout << "Writing a Tecplot file of the FFD boxes." << endl;
-            FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, true);
-          }
-          else {
-            cout << "Writing a CGNS file of the FFD boxes." << endl;
-            FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, true);
+          for (unsigned short iFile = 0; iFile < config->GetnVolumeOutputFiles(); iFile++){
+            unsigned short *FileFormat = config->GetVolumeOutputFiles();
+            if (FileFormat[iFile] == PARAVIEW) {
+              cout << "Writing a Paraview file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, true);
+              }
+            } else if (FileFormat[iFile] == TECPLOT) {
+              cout << "Writing a Tecplot file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, true);
+              }
+            }
+            else if (FileFormat[iFile] == CGNS)  {
+              cout << "Writing a CGNS file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, true);
+              }
+            }
           }
-        }
-        
+        }  
       }
-      
     }
     
     else {
@@ -2790,23 +2795,27 @@ void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *conf
     
       /*--- Output original FFD FFDBox ---*/
       
-       if ((rank == MASTER_NODE) && (config->GetKind_SU2() != SU2_DOT)) {
-        if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-          cout << "Writing a Paraview file of the FFD boxes." << endl;
-          for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-            FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, true);
-          }
-        }
-        else if (config->GetOutput_FileFormat() == TECPLOT) {
-          cout << "Writing a Tecplot file of the FFD boxes." << endl;
-          for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-            FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, true);
+      if ((rank == MASTER_NODE) && (config->GetKind_SU2() != SU2_DOT)) {
+        
+        for (unsigned short iFile = 0; iFile < config->GetnVolumeOutputFiles(); iFile++){
+          unsigned short *FileFormat = config->GetVolumeOutputFiles();
+          
+          if (FileFormat[iFile] == PARAVIEW) {
+            cout << "Writing a Paraview file of the FFD boxes." << endl;
+            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+              FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, true);
+            }
+          } else if (FileFormat[iFile] == TECPLOT) {
+            cout << "Writing a Tecplot file of the FFD boxes." << endl;
+            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+              FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, true);
+            }
           }
-        }
-        else {
-          cout << "Writing a CGNS file of the FFD boxes." << endl;
-          for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-            FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, true);
+          else if (FileFormat[iFile] == CGNS)  {
+            cout << "Writing a CGNS file of the FFD boxes." << endl;
+            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+              FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, true);
+            }
           }
         }
       }
@@ -2966,26 +2975,29 @@ void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *conf
         /*--- Output the deformed FFD Boxes ---*/
         
         if ((rank == MASTER_NODE) && (config->GetKind_SU2() != SU2_DOT)) {
-          if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-            cout << "Writing a Paraview file of the FFD boxes." << endl;
-            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-              FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, false);
-            }
-          }
-          else if (config->GetOutput_FileFormat() == TECPLOT) {
-            cout << "Writing a Tecplot file of the FFD boxes." << endl;
-            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-              FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, false);
+          
+          for (unsigned short iFile = 0; iFile < config->GetnVolumeOutputFiles(); iFile++){
+            unsigned short *FileFormat = config->GetVolumeOutputFiles();
+            
+            if (FileFormat[iFile] == PARAVIEW) {
+              cout << "Writing a Paraview file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetParaview(geometry, iFFDBox, false);
+              }
+            } else if (FileFormat[iFile] == TECPLOT) {
+              cout << "Writing a Tecplot file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetTecplot(geometry, iFFDBox, false);
+              }
             }
-          }
-          else {
-            cout << "Writing a CGNS file of the FFD boxes." << endl;
-            for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
-              FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, false);
+            else if (FileFormat[iFile] == CGNS)  {
+              cout << "Writing a CGNS file of the FFD boxes." << endl;
+              for (iFFDBox = 0; iFFDBox < GetnFFDBox(); iFFDBox++) {
+                FFDBox[iFFDBox]->SetCGNS(geometry, iFFDBox, false);
+              }
             }
           }
         }
-        
       }
     }
     
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 337487d0d6e0..98e560c7ec0e 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -459,21 +459,20 @@ class COutput {
   void PrintVolumeFields();
   
   bool SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing = false);
- 
-protected:
   
-  /*----------------------------- Protected member functions ----------------------------*/  
-
   /*!
-   * \brief Allocates the appropriate file writer based on the chosen format.
+   * \brief Allocates the appropriate file writer based on the chosen format and writes sorted data to file.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[out] filewriter - The allocated filewriter.
    * \param[in] format - The output format.
+   * \param[in] fileName - The file name. If empty, the filenames are automatically determined.
    */
-  void SetFileWriter(CConfig *config, CGeometry *geomery, CFileWriter *&filewriter, unsigned short format);  
-  
+  void WriteToFile(CConfig *config, CGeometry *geomery, unsigned short format, string fileName = "");  
+ 
+protected:
   
+  /*----------------------------- Protected member functions ----------------------------*/  
+
   /*!
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index ae8e6aadf239..04cee64b823f 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -382,9 +382,12 @@ void COutput::DeallocateData_Parallel(){
 }
 
 
-void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&filewriter, unsigned short format){
+void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short format, string fileName){
+
+  CFileWriter *fileWriter = NULL;
   
-  string fileName;
+  unsigned short lastindex = fileName.find_last_of(".");
+  fileName = fileName.substr(0, lastindex);
   
   /*--- Write files depending on the format --- */
   
@@ -392,7 +395,8 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
     
     case SURFACE_CSV:
       
-      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       surfaceDataSorter->SortConnectivity(config, geometry, true);
       
@@ -402,37 +406,40 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing CSV file." << endl;     
       }
       
-      filewriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
       
       break;
       
     case RESTART_ASCII: case CSV:
-      
-      fileName = config->GetFilename(restartFilename, "", curTimeIter);
+     
+      if (fileName == "")
+        fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
         cout << "Writing SU2 CSV restart file." << endl;     
       }
       
-      filewriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
       
       break;
       
     case RESTART_BINARY:
       
-      fileName = config->GetFilename(restartFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
         cout << "Writing SU2 binary restart file." << endl;   
       }
       
-      filewriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      fileWriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
       
       break;
       
     case MESH:
       
-      fileName = volumeFilename;
+      if (fileName == "")
+        fileName = volumeFilename;
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -444,7 +451,7 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing SU2 mesh file." << endl;
       }
       
-      filewriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+      fileWriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
                                           config->GetiZone(), config->GetnZone());
       
       
@@ -452,7 +459,8 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
       
     case TECPLOT_BINARY:
       
-      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -464,14 +472,15 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Tecplot binary solution file." << endl;
       }
       
-      filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+      fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
                                                 curTimeIter, GetHistoryFieldValue("TIME_STEP"));
       
       break;
       
     case TECPLOT:
       
-      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -483,14 +492,15 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Tecplot ASCII solution file." << endl;
       }
       
-      filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
+      fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
                                           curTimeIter, GetHistoryFieldValue("TIME_STEP"));
       
       break;
       
     case PARAVIEW_BINARY:
       
-      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -501,13 +511,14 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Paraview binary solution file." << endl;
       }
       
-      filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
       
       break;
       
     case PARAVIEW:
       
-      fileName = config->GetFilename(volumeFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -518,13 +529,14 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Paraview ASCII volume solution file." << endl;      
       }
       
-      filewriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
+      fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
       
       break;
       
     case SURFACE_PARAVIEW:
       
-      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -536,13 +548,14 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Paraview ASCII surface file." << endl;      
       }
       
-      filewriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
       
       break;
       
     case SURFACE_PARAVIEW_BINARY:
       
-      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -554,13 +567,14 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Paraview Binary surface file." << endl;      
       }
       
-      filewriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
+      fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
       
       break;
       
     case SURFACE_TECPLOT:
       
-      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -572,14 +586,15 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Tecplot ASCII surface file." << endl;      
       }
       
-      filewriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
+      fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
                                           curTimeIter, GetHistoryFieldValue("TIME_STEP"));
       
       break;
       
     case SURFACE_TECPLOT_BINARY:
       
-      fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
+      if (fileName == "")
+        fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
       
@@ -591,15 +606,25 @@ void COutput::SetFileWriter(CConfig *config, CGeometry *geometry, CFileWriter *&
         cout << "Writing Tecplot ASCII surface file." << endl;      
       }
       
-      filewriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
+      fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
                                                 curTimeIter, GetHistoryFieldValue("TIME_STEP"));
       
       break;
       
     default:
-      filewriter = NULL;
+      fileWriter = NULL;
       break;
   } 
+  
+  /*--- Write data to file ---*/
+  
+  if (fileWriter != NULL){
+    
+    fileWriter->Write_Data();
+    
+    delete fileWriter;
+   
+  }
 }
 
 
@@ -614,23 +639,13 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
     
     unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
     unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
-    
-    CFileWriter* fileWriter = NULL;
-    
+        
     /*--- Loop through all requested output files ---*/
     
     for (unsigned short iFile = 0; iFile < nVolumeFiles; iFile++){
       
-      SetFileWriter(config, geometry, fileWriter, VolumeFiles[iFile]);
-      
-      if (fileWriter != NULL){
-        
-        fileWriter->Write_Data(); 
-        
-        delete fileWriter;
-        
-        fileWriter = NULL;
-      }
+      WriteToFile(config, geometry, VolumeFiles[iFile]);
+
     }
     
     /*--- Write any additonal files ----*/
@@ -750,8 +765,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 void COutput::SetHistoryFile_Header(CConfig *config) { 
 
   
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY)) {
+  if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
     histFile << "TITLE = \"SU2 Simulation\"" << endl;
     histFile << "VARIABLES = ";
   }
@@ -787,8 +801,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   /*--- Print the string to file and remove the last character (a separator) ---*/
   histFile << out.str().substr(0, out.str().size() - 1);
   histFile << endl;
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY) {
+  if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
     histFile << "ZONE T= \"Convergence history\"" << endl;
   }
   histFile.flush();
@@ -969,9 +982,8 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   /*--- Add the correct file extension depending on the file format ---*/
   
-  if ((config->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
-  else if (config->GetOutput_FileFormat() == PARAVIEW || config->GetOutput_FileFormat() == PARAVIEW_BINARY)  SPRINTF (buffer, ".csv");
+  if ((config->GetTabular_FileFormat() == TAB_TECPLOT)) SPRINTF (buffer, ".dat");
+  else if (config->GetTabular_FileFormat() == TAB_CSV)  SPRINTF (buffer, ".csv");
   strcat(char_histfile, buffer);
   
   /*--- Open the history file ---*/
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 716a90f7074d..148b8a35fe06 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -2378,110 +2378,109 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
   nVar_Consv = nVar_First + nVar_Second + nVar_Third;
   nVar_Total = nVar_Consv;
   
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
-    
-    /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
-    
-    if (dynamic_grid && !fem) {
-      iVar_GridVel = nVar_Total;
+  
+  /*--- Add the limiters ---*/
+  
+  if (config->GetWrt_Limiters()) nVar_Total += nVar_Consv;
+  
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) nVar_Total += nVar_Consv;
+  
+  /*--- Add the grid velocity to the restart file for the unsteady adjoint ---*/
+  
+  if (dynamic_grid && !fem) {
+    iVar_GridVel = nVar_Total;
+    if (geometry->GetnDim() == 2) nVar_Total += 2;
+    else if (geometry->GetnDim() == 3) nVar_Total += 3;
+  }
+  
+  /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
+  
+  if (Kind_Solver == EULER     || Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS ||
+      Kind_Solver == INC_EULER || Kind_Solver == INC_NAVIER_STOKES || Kind_Solver == INC_RANS ||
+      Kind_Solver == FEM_EULER || Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS ||
+      Kind_Solver == FEM_LES) {
+    iVar_PressCp = nVar_Total; nVar_Total += 3;
+    iVar_MachMean = nVar_Total; nVar_Total += 1;
+  }
+  
+  /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+  
+  if (Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS     ||
+      Kind_Solver == INC_NAVIER_STOKES     || Kind_Solver == INC_RANS     ||
+      Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
+    iVar_Lam = nVar_Total;
+    nVar_Total += 1;
+    iVar_ViscCoeffs = nVar_Total;
+    if (geometry->GetnDim() == 2) nVar_Total += 2;
+    else if (geometry->GetnDim() == 3) nVar_Total += 3;
+    iVar_HeatCoeffs = nVar_Total;
+    nVar_Total += 2;
+  }
+  
+  /*--- Add Eddy Viscosity to the restart file ---*/
+  
+  if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES || Kind_Solver == INC_RANS) {
+    iVar_Eddy = nVar_Total; nVar_Total += 1;
+  }
+  
+  /*--- Add Sharp edges to the restart file ---*/
+  
+  if (config->GetWrt_SharpEdges()) {
+    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+        ((Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) ||
+        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
+      iVar_Sharp = nVar_Total; nVar_Total += 1;
+    }
+  }
+  
+  
+  if (( Kind_Solver == ADJ_EULER              ) ||
+      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+      ( Kind_Solver == ADJ_RANS               )) {
+    iVar_Sens   = nVar_Total; nVar_Total += 2;
+  }
+  
+  if (Kind_Solver == FEM_ELASTICITY)  {
+    /*--- If the analysis is dynamic... ---*/
+    if (config->GetTime_Domain()) {
+      /*--- Velocities ---*/
+      iVar_FEA_Vel = nVar_Total;
       if (geometry->GetnDim() == 2) nVar_Total += 2;
       else if (geometry->GetnDim() == 3) nVar_Total += 3;
-    }
-    
-    /*--- Add Pressure, Temperature, Cp, Mach to the restart file ---*/
-
-    if (Kind_Solver == EULER     || Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS ||
-        Kind_Solver == INC_EULER || Kind_Solver == INC_NAVIER_STOKES || Kind_Solver == INC_RANS ||
-        Kind_Solver == FEM_EULER || Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS ||
-        Kind_Solver == FEM_LES) {
-      iVar_PressCp = nVar_Total; nVar_Total += 3;
-      iVar_MachMean = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-
-    if (Kind_Solver == NAVIER_STOKES     || Kind_Solver == RANS     ||
-        Kind_Solver == INC_NAVIER_STOKES     || Kind_Solver == INC_RANS     ||
-        Kind_Solver == FEM_NAVIER_STOKES || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES) {
-      iVar_Lam = nVar_Total;
-      nVar_Total += 1;
-      iVar_ViscCoeffs = nVar_Total;
+      /*--- Accelerations ---*/
+      iVar_FEA_Accel = nVar_Total;
       if (geometry->GetnDim() == 2) nVar_Total += 2;
       else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      iVar_HeatCoeffs = nVar_Total;
-      nVar_Total += 2;
-    }
-    
-    /*--- Add Eddy Viscosity to the restart file ---*/
-
-    if (Kind_Solver == RANS || Kind_Solver == FEM_RANS || Kind_Solver == FEM_LES || Kind_Solver == INC_RANS) {
-      iVar_Eddy = nVar_Total; nVar_Total += 1;
-    }
-    
-    /*--- Add Sharp edges to the restart file ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-          ((Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) ||
-        ((Kind_Solver == FEM_EULER) || (Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_RANS) || (Kind_Solver == FEM_LES)))  {
-        iVar_Sharp = nVar_Total; nVar_Total += 1;
-      }
-    }
-    
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      iVar_Sens   = nVar_Total; nVar_Total += 2;
-    }
-    
-    if (Kind_Solver == FEM_ELASTICITY)  {
-      /*--- If the analysis is dynamic... ---*/
-      if (config->GetTime_Domain()) {
-        /*--- Velocities ---*/
-        iVar_FEA_Vel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-        /*--- Accelerations ---*/
-        iVar_FEA_Accel = nVar_Total;
-        if (geometry->GetnDim() == 2) nVar_Total += 2;
-        else if (geometry->GetnDim() == 3) nVar_Total += 3;
-      }
-      iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
-      if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_EULER)         ||
-        (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_RANS) ||
-        (Kind_Solver == DISC_ADJ_INC_EULER)         ||
-        (Kind_Solver == DISC_ADJ_INC_NAVIER_STOKES) ||
-        (Kind_Solver == DISC_ADJ_INC_RANS)) {
-      iVar_Sens    = nVar_Total; nVar_Total += 1;
-      iVar_SensDim = nVar_Total; nVar_Total += nDim;
-    }
-    
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
     }
-
-    if (config->GetExtraOutput()) {
-      if (Kind_Solver == RANS || Kind_Solver == INC_RANS) {
-        iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
-      }
+    iVar_FEA_Stress  = nVar_Total; nVar_Total += 3;
+    if (geometry->GetnDim() == 3) {iVar_FEA_Stress_3D = nVar_Total; nVar_Total += 3;}
+    iVar_FEA_Extra = nVar_Total; nVar_Total += 1;
+  }
+  
+  if ((Kind_Solver == DISC_ADJ_EULER)         ||
+      (Kind_Solver == DISC_ADJ_NAVIER_STOKES) ||
+      (Kind_Solver == DISC_ADJ_RANS) ||
+      (Kind_Solver == DISC_ADJ_INC_EULER)         ||
+      (Kind_Solver == DISC_ADJ_INC_NAVIER_STOKES) ||
+      (Kind_Solver == DISC_ADJ_INC_RANS)) {
+    iVar_Sens    = nVar_Total; nVar_Total += 1;
+    iVar_SensDim = nVar_Total; nVar_Total += nDim;
+  }
+  
+  if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+    iVar_FEA_Extra = nVar_Total; nVar_Total += 2;
+  }
+  
+  if (config->GetExtraOutput()) {
+    if (Kind_Solver == RANS || Kind_Solver == INC_RANS) {
+      iVar_Extra  = nVar_Total; nVar_Extra  = solver[TURB_SOL]->GetnOutputVariables(); nVar_Total += nVar_Extra;
     }
-    
   }
   
+  
+  
   Local_Halo = new int[geometry->GetnPoint()];
   for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++)
     Local_Halo[iPoint] = !geometry->node[iPoint]->GetDomain();
@@ -2623,23 +2622,22 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
         
         Buffer_Send_Var[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar);
         
-        if (!config->GetLow_MemoryOutput()) {
-          
-          if (config->GetWrt_Limiters()) {
-            Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-          }
-          
-          if (config->GetWrt_Residuals()) {
-            if (!config->GetDiscrete_Adjoint()) {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            } else {
-              Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
-              solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
-            }
+        
+        if (config->GetWrt_Limiters()) {
+          Buffer_Send_Vol[jPoint] = solver[CurrentIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+        }
+        
+        if (config->GetWrt_Residuals()) {
+          if (!config->GetDiscrete_Adjoint()) {
+            Buffer_Send_Res[jPoint] = solver[CurrentIndex]->LinSysRes.GetBlock(iPoint, jVar);
+          } else {
+            Buffer_Send_Res[jPoint] = solver[CurrentIndex]->node[iPoint]->GetSolution(jVar) -
+                                      solver[CurrentIndex]->node[iPoint]->GetSolution_Old(jVar);
           }
-          
         }
         
+        
+        
         /*--- Only send/recv the volumes & global indices during the first loop ---*/
         
         if (iVar == 0) {
@@ -2658,26 +2656,25 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
 #else
     for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Var[iPoint] = Buffer_Send_Var[iPoint];
 #endif
-    if (!config->GetLow_MemoryOutput()) {
-      
-      if (config->GetWrt_Limiters()) {
+    
+    if (config->GetWrt_Limiters()) {
 #ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Vol, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Vol, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
 #else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Vol[iPoint] = Buffer_Send_Vol[iPoint];
 #endif
-      }
-      
-      if (config->GetWrt_Residuals()) {
+    }
+    
+    if (config->GetWrt_Residuals()) {
 #ifdef HAVE_MPI
-        SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
+      SU2_MPI::Gather(Buffer_Send_Res, nBuffer_Scalar, MPI_DOUBLE, Buffer_Recv_Res, nBuffer_Scalar, MPI_DOUBLE, MASTER_NODE, MPI_COMM_WORLD);
 #else
-        for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
+      for (iPoint = 0; iPoint < nBuffer_Scalar; iPoint++) Buffer_Recv_Res[iPoint] = Buffer_Send_Res[iPoint];
 #endif
-      }
-      
     }
     
+    
+    
     if (iVar == 0) {
 #ifdef HAVE_MPI
       SU2_MPI::Gather(Buffer_Send_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, Buffer_Recv_GlobalIndex, nBuffer_Scalar, MPI_UNSIGNED_LONG, MASTER_NODE, MPI_COMM_WORLD);
@@ -2699,21 +2696,20 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
           
           Data[iVar][iGlobal_Index] = Buffer_Recv_Var[jPoint];
           
-          if (!config->GetLow_MemoryOutput()) {
-            
-            if (config->GetWrt_Limiters()) {
-              Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
-            }
-            
-            if (config->GetWrt_Residuals()) {
-              unsigned short ExtraIndex;
-              ExtraIndex = nVar_Consv;
-              if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
-              Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
-            }
-            
+          
+          if (config->GetWrt_Limiters()) {
+            Data[iVar+nVar_Consv][iGlobal_Index] = Buffer_Recv_Vol[jPoint];
           }
           
+          if (config->GetWrt_Residuals()) {
+            unsigned short ExtraIndex;
+            ExtraIndex = nVar_Consv;
+            if (config->GetWrt_Limiters()) ExtraIndex = 2*nVar_Consv;
+            Data[iVar+ExtraIndex][iGlobal_Index] = Buffer_Recv_Res[jPoint];
+          }
+          
+          
+          
           jPoint++;
         }
         /*--- Adjust jPoint to index of next proc's data in the buffers. ---*/
@@ -2722,9 +2718,7 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
     }
     
   }
-  
-  if (!config->GetLow_MemoryOutput()) {
-    
+      
     /*--- Additional communication routine for the grid velocity. Note that
      we are reusing the same temporary buffers from above for efficiency.
      Also, in the future more routines like this could be used to write
@@ -3796,7 +3790,7 @@ void COutputLegacy::MergeSolution(CConfig *config, CGeometry *geometry, CSolver
       }
     }
     
-  }
+  
   
   /*--- Immediately release the temporary buffers. ---*/
   
@@ -4124,122 +4118,120 @@ void COutputLegacy::SetRestart(CConfig *config, CGeometry *geometry, CSolver **s
       restart_file << "\t\"Conservative_" << iVar+1<<"\"";
   }
   
-  if (!config->GetLow_MemoryOutput()) {
-    
-    if (config->GetWrt_Limiters()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Limiter_" << iVar+1<<"\"";
-      }
-    }
-    if (config->GetWrt_Residuals()) {
-      for (iVar = 0; iVar < nVar_Consv; iVar++) {
-        restart_file << "\t\"Residual_" << iVar+1<<"\"";
-      }
-    }
-    
-    /*--- Mesh velocities for dynamic mesh cases ---*/
-    
-    if (dynamic_grid && !fem) {
-      if (nDim == 2) {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
-      } else {
-        restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
-      }
+  if (config->GetWrt_Limiters()) {
+    for (iVar = 0; iVar < nVar_Consv; iVar++) {
+      restart_file << "\t\"Limiter_" << iVar+1<<"\"";
     }
-    
-    if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS) ||
-        (Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
-      } else
-        restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
+  }
+  if (config->GetWrt_Residuals()) {
+    for (iVar = 0; iVar < nVar_Consv; iVar++) {
+      restart_file << "\t\"Residual_" << iVar+1<<"\"";
     }
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS) ||
-        (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-        if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
-      } else {
-        if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
-        if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
-      }
+  }
+  
+  /*--- Mesh velocities for dynamic mesh cases ---*/
+  
+  if (dynamic_grid && !fem) {
+    if (nDim == 2) {
+      restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"";
+    } else {
+      restart_file << "\t\"Grid_Velx\"\t\"Grid_Vely\"\t\"Grid_Velz\"";
     }
-    
-    if (Kind_Solver == RANS || Kind_Solver == INC_RANS) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
-        restart_file << "\t\"Eddy_Viscosity\"";
-      } else
-        restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
+  }
+  
+  if ((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS) ||
+      (Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    if (config->GetTabular_FileFormat() == TAB_CSV) {
+      restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"Pressure_Coefficient\"\t\"Mach\"";
+    } else
+      restart_file << "\t\"Pressure\"\t\"Temperature\"\t\"C<sub>p</sub>\"\t\"Mach\"";
+  }
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS) ||
+      (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    if (config->GetTabular_FileFormat() == TAB_CSV) {
+      if (nDim == 2) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Heat_Flux\"\t\"Y_Plus\"";
+      if (nDim == 3) restart_file << "\t\"Laminar_Viscosity\"\t\"Skin_Friction_Coefficient_X\"\t\"Skin_Friction_Coefficient_Y\"\t\"Skin_Friction_Coefficient_Z\"\t\"Heat_Flux\"\t\"Y_Plus\"";
+    } else {
+      if (nDim == 2) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"h\"\t\"y<sup>+</sup>\"";
+      if (nDim == 3) restart_file << "\t\"<greek>m</greek>\"\t\"C<sub>f</sub>_x\"\t\"C<sub>f</sub>_y\"\t\"C<sub>f</sub>_z\"\t\"h\"\t\"y<sup>+</sup>\"";
     }
-    
-    if (config->GetWrt_SharpEdges()) {
-      if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
-          ((Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)))  {
-        restart_file << "\t\"Sharp_Edge_Dist\"";
-      }
+  }
+  
+  if (Kind_Solver == RANS || Kind_Solver == INC_RANS) {
+    if ((config->GetTabular_FileFormat() == TAB_CSV)) {
+      restart_file << "\t\"Eddy_Viscosity\"";
+    } else
+      restart_file << "\t\"<greek>m</greek><sub>t</sub>\"";
+  }
+  
+  if (config->GetWrt_SharpEdges()) {
+    if (((Kind_Solver == EULER) || (Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) ||
+        ((Kind_Solver == INC_EULER) || (Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)))  {
+      restart_file << "\t\"Sharp_Edge_Dist\"";
     }
-    
-    if ((Kind_Solver == ADJ_EULER              ) ||
-        (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        (Kind_Solver == ADJ_RANS               )   ) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
+  }
+  
+  if ((Kind_Solver == ADJ_EULER              ) ||
+      (Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+      (Kind_Solver == ADJ_RANS               )   ) {
+    restart_file << "\t\"Surface_Sensitivity\"\t\"Solution_Sensor\"";
+  }
+  if (( Kind_Solver == DISC_ADJ_EULER              ) ||
+      ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
+      ( Kind_Solver == DISC_ADJ_RANS               ) ||
+      ( Kind_Solver == DISC_ADJ_INC_EULER              ) ||
+      ( Kind_Solver == DISC_ADJ_INC_NAVIER_STOKES      ) ||
+      ( Kind_Solver == DISC_ADJ_INC_RANS               )) {
+    restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
+    if (geometry->GetnDim() == 3) {
+      restart_file << "\t\"Sensitivity_z\"";
     }
-    if (( Kind_Solver == DISC_ADJ_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_RANS               ) ||
-        ( Kind_Solver == DISC_ADJ_INC_EULER              ) ||
-        ( Kind_Solver == DISC_ADJ_INC_NAVIER_STOKES      ) ||
-        ( Kind_Solver == DISC_ADJ_INC_RANS               )) {
-      restart_file << "\t\"Surface_Sensitivity\"\t\"Sensitivity_x\"\t\"Sensitivity_y\"";
-      if (geometry->GetnDim() == 3) {
-        restart_file << "\t\"Sensitivity_z\"";
-      }
+  }
+  
+  if (Kind_Solver == FEM_ELASTICITY) {
+    if (!dynamic_fem) {
+      if (geometry->GetnDim() == 2)
+        restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
+      if (geometry->GetnDim() == 3)
+        restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
     }
-    
-    if (Kind_Solver == FEM_ELASTICITY) {
-      if (!dynamic_fem) {
-        if (geometry->GetnDim() == 2)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        if (geometry->GetnDim() == 3)
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
+    else if (dynamic_fem) {
+      if (geometry->GetnDim() == 2) {
+        restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
+        restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
       }
-      else if (dynamic_fem) {
-        if (geometry->GetnDim() == 2) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Acceleration_1\"\t\"Acceleration_2\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Von_Mises_Stress\"";
-        }
-        if (geometry->GetnDim() == 3) {
-          restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
-          restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
-        }
+      if (geometry->GetnDim() == 3) {
+        restart_file << "\t\"Velocity_1\"\t\"Velocity_2\"\t\"Velocity_3\"\t\"Acceleration_1\"\t\"Acceleration_2\"\t\"Acceleration_3\"";
+        restart_file << "\t\"Sxx\"\t\"Syy\"\t\"Sxy\"\t\"Szz\"\t\"Sxz\"\t\"Syz\"\t\"Von_Mises_Stress\"";
       }
     }
+  }
+  
+  if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
+    if (geometry->GetnDim() == 2)
+      restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
+    if (geometry->GetnDim() == 3)
+      restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
+  }
+  
+  
+  if (config->GetExtraOutput()) {
+    string *headings = NULL;
+    //if (Kind_Solver == RANS) {
+    headings = solver[TURB_SOL]->OutputHeadingNames;
+    //}
     
-    if ((Kind_Solver == DISC_ADJ_FEM) && (config->GetFSI_Simulation())){
-      if (geometry->GetnDim() == 2)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"";
-      if (geometry->GetnDim() == 3)
-        restart_file << "\t\"CrossTerm_1\"\t\"CrossTerm_2\"\t\"CrossTerm_3\"";
-    }
-
-    
-    if (config->GetExtraOutput()) {
-      string *headings = NULL;
-      //if (Kind_Solver == RANS) {
-      headings = solver[TURB_SOL]->OutputHeadingNames;
-      //}
-      
-      for (iVar = 0; iVar < nVar_Extra; iVar++) {
-        if (headings == NULL) {
-          restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
-        } else {
-          restart_file << "\t\""<< headings[iVar] <<"\"";
-        }
+    for (iVar = 0; iVar < nVar_Extra; iVar++) {
+      if (headings == NULL) {
+        restart_file << "\t\"ExtraOutput_" << iVar+1<<"\"";
+      } else {
+        restart_file << "\t\""<< headings[iVar] <<"\"";
       }
     }
   }
   
+  
   restart_file << "\n";
   
   /*--- Write the restart file ---*/
@@ -4408,9 +4400,9 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
     strcat(cstr, buffer);
   }
   
-  if ((config->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
-  else if ((config->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
-  else if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".csv");
+  if ((config->GetTabular_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
+  else if ((config->GetTabular_FileFormat() == TAB_TECPLOT))  SPRINTF (buffer, ".plt");
+  else if ((config->GetTabular_FileFormat() == TAB_CSV))  SPRINTF (buffer, ".csv");
   strcat(cstr, buffer);
   
   ConvHist_file->open(cstr, ios::out);
@@ -4517,8 +4509,8 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   char end[]= ",\"Linear_Solver_Iterations\",\"CFL_Number\",\"Time(min)\"\n";
   char endfea[]= ",\"Linear_Solver_Iterations\",\"Time(min)\"\n";
   
-  if ((config->GetOutput_FileFormat() == TECPLOT) ||
-      (config->GetOutput_FileFormat() == TECPLOT_BINARY)) {
+  if ((config->GetTabular_FileFormat() == TECPLOT) ||
+      (config->GetTabular_FileFormat() == TECPLOT_BINARY)) {
     ConvHist_file[0] << "TITLE = \"SU2 Simulation\"" << endl;
     ConvHist_file[0] << "VARIABLES = ";
   }
@@ -4595,8 +4587,8 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
 
   }
 
-  if (config->GetOutput_FileFormat() == TECPLOT ||
-      config->GetOutput_FileFormat() == TECPLOT_BINARY) {
+  if (config->GetTabular_FileFormat() == TECPLOT ||
+      config->GetTabular_FileFormat() == TECPLOT_BINARY) {
     ConvHist_file[0] << "ZONE T= \"Convergence history\"" << endl;
   }
   
@@ -8366,7 +8358,7 @@ void COutputLegacy::SetResult_Files(CSolver *****solver_container, CGeometry ***
     
     /*--- Get the file output format ---*/
     
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    unsigned short FileFormat = config[iZone]->GetTabular_FileFormat();
     
     /*--- Merge the node coordinates and connectivity, if necessary. This
      is only performed if a volume solution file is requested, and it
@@ -8546,7 +8538,7 @@ void COutputLegacy::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geom
 
       /*--- Get the file output format ---*/
 
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetTabular_FileFormat();
 
       /*--- Merge the node coordinates and connectivity if necessary. This
      is only performed if a volume solution file is requested, and it
@@ -8744,18 +8736,18 @@ void COutputLegacy::SetMesh_Files(CGeometry **geometry, CConfig **config, unsign
         
         if (rank == MASTER_NODE) cout <<"Writing volume mesh file." << endl;
 
-        /*--- Write a Tecplot ASCII file ---*/
+//        /*--- Write a Tecplot ASCII file ---*/
 
-//        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == PARAVIEW_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
-//          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
-        }
-//        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT_BINARY) {
-          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
-//          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
-        }
+////        if (config[iZone]->GetOutput_FileFormat() == PARAVIEW) SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+//        else if (config[iZone]->GetTabular_FileFormat() == PARAVIEW_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII paraview volume mesh file by default." << endl;
+////          SetParaview_MeshASCII(config[iZone], geometry[iZone], iZone,  val_nZone, false, new_file);
+//        }
+////        else if (config[iZone]->GetOutput_FileFormat() == TECPLOT) SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+//        else if (config[iZone]->GetTabular_FileFormat() == TECPLOT_BINARY) {
+//          if (rank == MASTER_NODE) cout <<"Writing ASCII tecplot volume mesh file by default." << endl;
+////          SetTecplotASCII_Mesh(config[iZone], geometry[iZone], iZone, false, new_file);
+//        }
         
       }
       
@@ -9204,7 +9196,7 @@ void COutputLegacy::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry,
           ofstream Load_File;
           if (iSection == 0) {
             
-            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+            if ((config->GetTabular_FileFormat() == TAB_CSV)) {
               Load_File.open("load_distribution.csv", ios::out);
               Load_File << "\"Percent Semispan\",\"Sectional C_L\",\"Spanload (c C_L / c_ref) \",\"Elliptic Spanload\"" << endl;
             }
@@ -9215,14 +9207,14 @@ void COutputLegacy::SpecialOutput_SpanLoad(CSolver *solver, CGeometry *geometry,
               Load_File << "ZONE T=\"Wing load distribution\"" << endl;
             }
           } else {
-            if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) Load_File.open("load_distribution.csv", ios::app);
+            if ((config->GetTabular_FileFormat() == TAB_CSV)) Load_File.open("load_distribution.csv", ios::app);
             else Load_File.open("load_distribution.dat", ios::app);
           }
           
           
           /*--- CL and spanload ---*/
           
-          if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY))
+          if ((config->GetTabular_FileFormat() == TAB_CSV))
             Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << ", " << CL_Inv  << ", " << Chord*CL_Inv / RefLength <<", " << Elliptic_Spanload   << endl;
           else
             Load_File << 100.0*Ycoord_Airfoil[0]/(0.5*B) << " " << CL_Inv  << " " << Chord*CL_Inv / RefLength <<" " << Elliptic_Spanload   << endl;
@@ -10219,14 +10211,14 @@ void COutputLegacy::SpecialOutput_Distortion(CSolver *solver, CGeometry *geometr
 
   if (output && (rank == MASTER_NODE)) {
 
-    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) strcpy (cstr, "surface_analysis.vtk");
+    if ((config->GetTabular_FileFormat() == TAB_CSV)) strcpy (cstr, "surface_analysis.vtk");
     else strcpy (cstr, "surface_analysis.dat");
     
     SurfFlow_file.precision(15);
 
     SurfFlow_file.open(cstr, ios::out);
     
-    if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+    if ((config->GetTabular_FileFormat() == TAB_CSV)) {
       SurfFlow_file << "# vtk DataFile Version 3.0" << endl;
       SurfFlow_file << "vtk output" << endl;
       SurfFlow_file << "ASCII" << endl;
@@ -11044,7 +11036,7 @@ void COutputLegacy::SpecialOutput_Distortion(CSolver *solver, CGeometry *geometr
       
       if (output) {
         
-        if ((config->GetOutput_FileFormat() == PARAVIEW) || (config->GetOutput_FileFormat() == PARAVIEW_BINARY)) {
+        if (config->GetTabular_FileFormat() == TAB_CSV) {
           
           SurfFlow_file << "\nDATASET UNSTRUCTURED_GRID" << endl;
           SurfFlow_file <<"POINTS " << nAngle*nStation << " float" << endl;
@@ -11316,9 +11308,8 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
       strcat(cstr, buffer);
     }
 
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT)) SPRINTF (buffer, ".dat");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY))  SPRINTF (buffer, ".plt");
-    else if ((config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW) || (config[ZONE_FLOW]->GetOutput_FileFormat() == PARAVIEW_BINARY))  SPRINTF (buffer, ".vtk");
+    if ((config[ZONE_FLOW]->GetTabular_FileFormat() == TAB_TECPLOT)) SPRINTF (buffer, ".dat");
+    else if ((config[ZONE_FLOW]->GetTabular_FileFormat() == TAB_CSV))  SPRINTF (buffer, ".vtk");
     strcat(cstr, buffer);
 
     FSIHist_file->open(cstr, ios::out);
@@ -11349,8 +11340,8 @@ void COutputLegacy::SpecialOutput_FSI(ofstream *FSIHist_file, CGeometry ****geom
 
     char end[]= ",\"Time(min)\"\n";
 
-    if ((config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT) ||
-        (config[ZONE_FLOW]->GetOutput_FileFormat() == TECPLOT_BINARY)) {
+    if ((config[ZONE_FLOW]->GetTabular_FileFormat() == TECPLOT) ||
+        (config[ZONE_FLOW]->GetTabular_FileFormat() == TECPLOT_BINARY)) {
         FSIHist_file[0] << "TITLE = \"SU2 FSI Simulation\"" << endl;
         FSIHist_file[0] << "VARIABLES = ";
     }
@@ -12325,7 +12316,7 @@ void COutputLegacy::SetResult_Files_Parallel(CSolver *****solver_container,
     
     /*--- Get the file output format ---*/
     
-    unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+    unsigned short FileFormat = config[iZone]->GetTabular_FileFormat();
     nInst = config[iZone]->GetnTimeInstances();
     
     for (iInst = 0; iInst < nInst; iInst++){
@@ -12745,209 +12736,203 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
   /*--- If requested, register the limiter and residuals for all of the
    equations in the current flow problem. ---*/
   
-  if (!config->GetLow_MemoryOutput()) {
+  /*--- Add the limiters ---*/
+  
+  if (config->GetWrt_Limiters()) {
+    nVar_Par += nVar_Consv_Par;
     
-    /*--- Add the limiters ---*/
+    Variable_Names.push_back("Limiter_Density");
+    Variable_Names.push_back("Limiter_Momentum_x");
+    Variable_Names.push_back("Limiter_Momentum_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Momentum_z");
+    Variable_Names.push_back("Limiter_Energy");
     
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Limiter_Density");
-      Variable_Names.push_back("Limiter_Momentum_x");
-      Variable_Names.push_back("Limiter_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Momentum_z");
-      Variable_Names.push_back("Limiter_Energy");
-      
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Limiter_TKE");
+        Variable_Names.push_back("Limiter_Omega");
+      } else {
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Limiter_Nu_Tilde");
       }
     }
+  }
+  
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) {
+    nVar_Par += nVar_Consv_Par;
     
-    /*--- Add the residuals ---*/
+    Variable_Names.push_back("Residual_Density");
+    Variable_Names.push_back("Residual_Momentum_x");
+    Variable_Names.push_back("Residual_Momentum_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Momentum_z");
+    Variable_Names.push_back("Residual_Energy");
     
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      
-      Variable_Names.push_back("Residual_Density");
-      Variable_Names.push_back("Residual_Momentum_x");
-      Variable_Names.push_back("Residual_Momentum_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Momentum_z");
-      Variable_Names.push_back("Residual_Energy");
-      
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Residual_TKE");
+        Variable_Names.push_back("Residual_Omega");
+      } else {
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Residual_Nu_Tilde");
       }
     }
+  }
+  
+  /*--- Add the grid velocity. ---*/
+  
+  if (dynamic_grid) {
+    if (geometry->GetnDim() == 2) nVar_Par += 2;
+    else if (geometry->GetnDim() == 3) nVar_Par += 3;
     
-    /*--- Add the grid velocity. ---*/
-    
-    if (dynamic_grid) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-      
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-    
-    
-    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
-    
-    nVar_Par += 1;
-    Variable_Names.push_back("Pressure");
-    
-    nVar_Par += 2;
-    Variable_Names.push_back("Temperature");
-    Variable_Names.push_back("Mach");
-    
-    nVar_Par += 1;
-    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-    
-    /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        nVar_Par += 1;
-        Variable_Names.push_back("Heat_Flux");
-      } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR){
-          Variable_Names.push_back("Buffet_Sensor");
-          nVar_Par += 1;
-        }
-        nVar_Par += 1;
-        Variable_Names.push_back("h");
-      }
-    }
-    
-    /*--- Add Eddy Viscosity. ---*/
-    
-    if (Kind_Solver == RANS) {
+    Variable_Names.push_back("Grid_Velocity_x");
+    Variable_Names.push_back("Grid_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+  }
+  
+  
+  /*--- Add Pressure, Temperature, Cp, Mach. ---*/
+  
+  nVar_Par += 1;
+  Variable_Names.push_back("Pressure");
+  
+  nVar_Par += 2;
+  Variable_Names.push_back("Temperature");
+  Variable_Names.push_back("Mach");
+  
+  nVar_Par += 1;
+  if ((config->GetTabular_FileFormat() == TAB_CSV)){
+    Variable_Names.push_back("Pressure_Coefficient");
+  } else {
+    Variable_Names.push_back("C<sub>p</sub>");
+  }
+  
+  /*--- Add Laminar Viscosity, Skin Friction, Heat Flux, & yPlus to the restart file ---*/
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
       nVar_Par += 2;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("Y_Plus");
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("y<sup>+</sup>");
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
+      Variable_Names.push_back("Skin_Friction_Coefficient_x");
+      Variable_Names.push_back("Skin_Friction_Coefficient_y");
+      if (geometry->GetnDim() == 3) {
+        nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
       }
-    }
-    
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
-    
-    if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
-    }
-    
-    /*--- Add the intermittency for the BC trans. model. ---*/
-    
-    if (transition) {
       nVar_Par += 1;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("gamma_BC");
-      } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
-      }
-    }
-    
-    if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
-      nVar_Par +=1;
-      Variable_Names.push_back("DES_LengthScale");
-      nVar_Par +=1;
-      Variable_Names.push_back("Wall_Distance");
-    }
-    
-    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      nVar_Par +=1;
-      Variable_Names.push_back("Roe_Dissipation");
-    }
-    
-    if (solver[FLOW_SOL]->VerificationSolution) {
-      if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-        nVar_Par += 2*nVar_Consv_Par;
-        Variable_Names.push_back("Verification_Density");
-        Variable_Names.push_back("Verification_Momentum_x");
-        Variable_Names.push_back("Verification_Momentum_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Momentum_z");
-        Variable_Names.push_back("Verification_Energy");
-        Variable_Names.push_back("Error_Density");
-        Variable_Names.push_back("Error_Momentum_x");
-        Variable_Names.push_back("Error_Momentum_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Momentum_z");
-        Variable_Names.push_back("Error_Energy");
-      }
-    }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
-    if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+      Variable_Names.push_back("Heat_Flux");
+    } else {
+      nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
       nVar_Par += 2;
-      Variable_Names.push_back("Vorticity_x");
-      Variable_Names.push_back("Vorticity_y");
+      Variable_Names.push_back("C<sub>f</sub>_x");
+      Variable_Names.push_back("C<sub>f</sub>_y");
       if (geometry->GetnDim() == 3) {
-        nVar_Par += 1; Variable_Names.push_back("Vorticity_z");
+        nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
       }
-      
-      if (geometry->GetnDim() == 3) {
-        nVar_Par +=1;
-        Variable_Names.push_back("Q_Criterion");
+      if (config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR){
+        Variable_Names.push_back("Buffet_Sensor");
+        nVar_Par += 1;
       }
+      nVar_Par += 1;
+      Variable_Names.push_back("h");
     }
-    
-    if (rotating_frame) {
-      nVar_Par += 2;
-      Variable_Names.push_back("Relative_Velocity_x");
-      Variable_Names.push_back("Relative_Velocity_y");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 1; Variable_Names.push_back("Relative_Velocity_z");
-      }
+  }
+  
+  /*--- Add Eddy Viscosity. ---*/
+  
+  if (Kind_Solver == RANS) {
+    nVar_Par += 2;
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      Variable_Names.push_back("Y_Plus");
+      Variable_Names.push_back("Eddy_Viscosity");
+    } else {
+      Variable_Names.push_back("y<sup>+</sup>");
+      Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
+    }
+  }
+  
+  /*--- Add the distance to the nearest sharp edge if requested. ---*/
+  
+  if (config->GetWrt_SharpEdges()) {
+    nVar_Par += 1;
+    Variable_Names.push_back("Sharp_Edge_Dist");
+  }
+  
+  /*--- Add the intermittency for the BC trans. model. ---*/
+  
+  if (transition) {
+    nVar_Par += 1;
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      Variable_Names.push_back("gamma_BC");
+    } else {
+      Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+    }
+  }
+  
+  if (config->GetKind_HybridRANSLES()!=NO_HYBRIDRANSLES){
+    nVar_Par +=1;
+    Variable_Names.push_back("DES_LengthScale");
+    nVar_Par +=1;
+    Variable_Names.push_back("Wall_Distance");
+  }
+  
+  if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+    nVar_Par +=1;
+    Variable_Names.push_back("Roe_Dissipation");
+  }
+  
+  if (solver[FLOW_SOL]->VerificationSolution) {
+    if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
+      nVar_Par += 2*nVar_Consv_Par;
+      Variable_Names.push_back("Verification_Density");
+      Variable_Names.push_back("Verification_Momentum_x");
+      Variable_Names.push_back("Verification_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Momentum_z");
+      Variable_Names.push_back("Verification_Energy");
+      Variable_Names.push_back("Error_Density");
+      Variable_Names.push_back("Error_Momentum_x");
+      Variable_Names.push_back("Error_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Momentum_z");
+      Variable_Names.push_back("Error_Energy");
+    }
+  }
+  
+  /*--- New variables get registered here before the end of the loop. ---*/
+  
+  if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
+    nVar_Par += 2;
+    Variable_Names.push_back("Vorticity_x");
+    Variable_Names.push_back("Vorticity_y");
+    if (geometry->GetnDim() == 3) {
+      nVar_Par += 1; Variable_Names.push_back("Vorticity_z");
     }
     
-    if (config->GetWrt_MeshQuality()) {
-      nVar_Par +=1;
-      Variable_Names.push_back("Orthogonality");
-      nVar_Par +=1;
-      Variable_Names.push_back("Aspect_Ratio");
+    if (geometry->GetnDim() == 3) {
       nVar_Par +=1;
-      Variable_Names.push_back("Volume_Ratio");
+      Variable_Names.push_back("Q_Criterion");
     }
-    
   }
   
+  if (rotating_frame) {
+    nVar_Par += 2;
+    Variable_Names.push_back("Relative_Velocity_x");
+    Variable_Names.push_back("Relative_Velocity_y");
+    if (geometry->GetnDim() == 3) {
+      nVar_Par += 1; Variable_Names.push_back("Relative_Velocity_z");
+    }
+  }
+  
+  if (config->GetWrt_MeshQuality()) {
+    nVar_Par +=1;
+    Variable_Names.push_back("Orthogonality");
+    nVar_Par +=1;
+    Variable_Names.push_back("Aspect_Ratio");
+    nVar_Par +=1;
+    Variable_Names.push_back("Volume_Ratio");
+  }
+  
+  
+  
   /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
   
   if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
@@ -13070,7 +13055,6 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
       }
       
       /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
         
         /*--- Limiters ---*/
         if (config->GetWrt_Limiters()) {
@@ -13103,9 +13087,8 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
             }
           }
         }
-      }
       
-      if (!config->GetLow_MemoryOutput()) {
+      
         
         /*--- Load buffers with the three grid velocity components. ---*/
         
@@ -13178,37 +13161,37 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
         
         if (solver[FLOW_SOL]->VerificationSolution) {
           if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-          
+            
             /*--- Get the physical time if necessary. ---*/
             su2double time = 0.0;
             if (config->GetTime_Marching()) time = config->GetPhysicalTime();
-          
+            
             /* Set the pointers to the coordinates and solution of this DOF. */
             const su2double *coor = geometry->node[iPoint]->GetCoord();
             su2double *solDOF     = solver[FLOW_SOL]->node[iPoint]->GetSolution();
             su2double mmsSol[5]   = {0.0,0.0,0.0,0.0,0.0};
             su2double error[5]    = {0.0,0.0,0.0,0.0,0.0};
-          
+            
             /* Get the verification solution. */
             solver[FLOW_SOL]->VerificationSolution->GetSolution(coor, time, mmsSol);
             for (jVar = 0; jVar < nVar_First; jVar++) {
               Local_Data[jPoint][iVar] = mmsSol[jVar];
               iVar++;
             }
-          
+            
             /* Get local error from the verification solution class. */
             solver[FLOW_SOL]->VerificationSolution->GetLocalError(coor, time, solDOF, error);
             for (jVar = 0; jVar < nVar_First; jVar++) {
               Local_Data[jPoint][iVar] = error[jVar];
               iVar++;
             }
-
+            
           }
         }
         
         /*--- New variables can be loaded to the Local_Data structure here,
          assuming they were registered above correctly. ---*/
-
+        
         if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
           Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[0]; iVar++;
           Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[1]; iVar++;
@@ -13264,16 +13247,16 @@ void COutputLegacy::LoadLocalData_Flow(CConfig *config, CGeometry *geometry, CSo
           Local_Data[jPoint][iVar] = geometry->Volume_Ratio[iPoint];  iVar++;
         }
         
-      }
-      
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-      
-      jPoint++;
-      
     }
+    
+    /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+    
+    jPoint++;
+    
   }
   
+  
   /*--- Free memory for auxiliary vectors. ---*/
   
   if ((Kind_Solver == NAVIER_STOKES) || (Kind_Solver == RANS)) {
@@ -13405,201 +13388,196 @@ void COutputLegacy::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry,
   /*--- If requested, register the limiter and residuals for all of the
    equations in the current flow problem. ---*/
 
-  if (!config->GetLow_MemoryOutput()) {
-
-    /*--- Add the limiters ---*/
-
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-
-      Variable_Names.push_back("Limiter_Pressure");
-      Variable_Names.push_back("Limiter_Velocity_x");
-      Variable_Names.push_back("Limiter_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Velocity_z");
-      if (energy || weakly_coupled_heat)
-        Variable_Names.push_back("Limiter_Temperature");
-
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Limiter_TKE");
-          Variable_Names.push_back("Limiter_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the residuals ---*/
-
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-
-      Variable_Names.push_back("Residual_Pressure");
-      Variable_Names.push_back("Residual_Velocity_x");
-      Variable_Names.push_back("Residual_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Velocity_z");
-      if (energy || weakly_coupled_heat)
-        Variable_Names.push_back("Residual_Temperature");
-
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Residual_TKE");
-          Variable_Names.push_back("Residual_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Nu_Tilde");
-        }
-      }
-    }
-
-    /*--- Add the grid velocity. ---*/
-
-    if (dynamic_grid) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
-    }
-
-    /*--- Add Cp. ---*/
-
-    nVar_Par += 1;
-    if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-        (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-
-    /*--- Add Laminar Viscosity, Skin Friction, and Heat Flux to the restart file ---*/
-
-    if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
-        nVar_Par += 2;
-        Variable_Names.push_back("Skin_Friction_Coefficient_x");
-        Variable_Names.push_back("Skin_Friction_Coefficient_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
-        }
-        if (energy || weakly_coupled_heat) {
-          nVar_Par += 1;
-          Variable_Names.push_back("Heat_Flux");
-        }
-      } else {
-        nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
-        nVar_Par += 2;
-        Variable_Names.push_back("C<sub>f</sub>_x");
-        Variable_Names.push_back("C<sub>f</sub>_y");
-        if (geometry->GetnDim() == 3) {
-          nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
-        }
-        if (energy || weakly_coupled_heat) {
-          nVar_Par += 1;
-          Variable_Names.push_back("h");
-        }
-      }
-    }
-
-    /*--- Add Y+ and Eddy Viscosity. ---*/
-
-    if (Kind_Solver == INC_RANS) {
-      nVar_Par += 2;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("Y_Plus");
-        Variable_Names.push_back("Eddy_Viscosity");
-      } else {
-        Variable_Names.push_back("y<sup>+</sup>");
-        Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
-      }
-    }
-
-    /*--- Add the distance to the nearest sharp edge if requested. ---*/
-
-    if (config->GetWrt_SharpEdges()) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Sharp_Edge_Dist");
-    }
-
-    /*--- Add the intermittency for the BC trans. model. ---*/
 
-    if (transition) {
-      nVar_Par += 1;
-      if ((config->GetOutput_FileFormat() == PARAVIEW) ||
-          (config->GetOutput_FileFormat() == PARAVIEW_BINARY)){
-        Variable_Names.push_back("gamma_BC");
+  /*--- Add the limiters ---*/
+  
+  if (config->GetWrt_Limiters()) {
+    nVar_Par += nVar_Consv_Par;
+    
+    Variable_Names.push_back("Limiter_Pressure");
+    Variable_Names.push_back("Limiter_Velocity_x");
+    Variable_Names.push_back("Limiter_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Velocity_z");
+    if (energy || weakly_coupled_heat)
+      Variable_Names.push_back("Limiter_Temperature");
+    
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Limiter_TKE");
+        Variable_Names.push_back("Limiter_Omega");
       } else {
-        Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Limiter_Nu_Tilde");
       }
     }
-
-    if (variable_density) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Density");
-    }
-    
-    if (wrt_cp) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Specific_Heat");
-    }
+  }
+  
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) {
+    nVar_Par += nVar_Consv_Par;
     
-    if (wrt_kt) {
-      nVar_Par += 1;
-      Variable_Names.push_back("Thermal_Conductivity");
-    }
+    Variable_Names.push_back("Residual_Pressure");
+    Variable_Names.push_back("Residual_Velocity_x");
+    Variable_Names.push_back("Residual_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Velocity_z");
+    if (energy || weakly_coupled_heat)
+      Variable_Names.push_back("Residual_Temperature");
     
-    if (solver[FLOW_SOL]->VerificationSolution) {
-      if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-        nVar_Par += 2*nVar_Consv_Par;
-        Variable_Names.push_back("Verification_Pressure");
-        Variable_Names.push_back("Verification_Velocity_x");
-        Variable_Names.push_back("Verification_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Velocity_z");
-        if (energy || weakly_coupled_heat) Variable_Names.push_back("Verification_Temperature");
-        Variable_Names.push_back("Error_Pressure");
-        Variable_Names.push_back("Error_Velocity_x");
-        Variable_Names.push_back("Error_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Velocity_z");
-        if (energy || weakly_coupled_heat) Variable_Names.push_back("Error_Temperature");
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Residual_TKE");
+        Variable_Names.push_back("Residual_Omega");
+      } else {
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Residual_Nu_Tilde");
       }
     }
+  }
+  
+  /*--- Add the grid velocity. ---*/
+  
+  if (dynamic_grid) {
+    if (geometry->GetnDim() == 2) nVar_Par += 2;
+    else if (geometry->GetnDim() == 3) nVar_Par += 3;
     
-    if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    Variable_Names.push_back("Grid_Velocity_x");
+    Variable_Names.push_back("Grid_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+  }
+  
+  /*--- Add Cp. ---*/
+  
+  nVar_Par += 1;
+  if ((config->GetTabular_FileFormat() == TAB_CSV)){
+    Variable_Names.push_back("Pressure_Coefficient");
+  } else {
+    Variable_Names.push_back("C<sub>p</sub>");
+  }
+  
+  /*--- Add Laminar Viscosity, Skin Friction, and Heat Flux to the restart file ---*/
+  
+  if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      nVar_Par += 1; Variable_Names.push_back("Laminar_Viscosity");
       nVar_Par += 2;
-      Variable_Names.push_back("Vorticity_x");
-      Variable_Names.push_back("Vorticity_y");
-      nVar_Par += 1; Variable_Names.push_back("Vorticity_z");
-      
+      Variable_Names.push_back("Skin_Friction_Coefficient_x");
+      Variable_Names.push_back("Skin_Friction_Coefficient_y");
+      if (geometry->GetnDim() == 3) {
+        nVar_Par += 1; Variable_Names.push_back("Skin_Friction_Coefficient_z");
+      }
+      if (energy || weakly_coupled_heat) {
+        nVar_Par += 1;
+        Variable_Names.push_back("Heat_Flux");
+      }
+    } else {
+      nVar_Par += 1; Variable_Names.push_back("<greek>m</greek>");
+      nVar_Par += 2;
+      Variable_Names.push_back("C<sub>f</sub>_x");
+      Variable_Names.push_back("C<sub>f</sub>_y");
       if (geometry->GetnDim() == 3) {
-        nVar_Par +=1;
-        Variable_Names.push_back("Q_Criterion");
+        nVar_Par += 1; Variable_Names.push_back("C<sub>f</sub>_z");
+      }
+      if (energy || weakly_coupled_heat) {
+        nVar_Par += 1;
+        Variable_Names.push_back("h");
       }
     }
-    
-    if (config->GetWrt_MeshQuality()) {
-      nVar_Par +=1;
-      Variable_Names.push_back("Orthogonality");
-      nVar_Par +=1;
-      Variable_Names.push_back("Aspect_Ratio");
-      nVar_Par +=1;
-      Variable_Names.push_back("Volume_Ratio");
+  }
+  
+  /*--- Add Y+ and Eddy Viscosity. ---*/
+  
+  if (Kind_Solver == INC_RANS) {
+    nVar_Par += 2;
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      Variable_Names.push_back("Y_Plus");
+      Variable_Names.push_back("Eddy_Viscosity");
+    } else {
+      Variable_Names.push_back("y<sup>+</sup>");
+      Variable_Names.push_back("<greek>m</greek><sub>t</sub>");
     }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-
   }
-
-  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
-
-  if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-    Aux_Frict_x = new su2double[geometry->GetnPoint()];
-    Aux_Frict_y = new su2double[geometry->GetnPoint()];
-    Aux_Frict_z = new su2double[geometry->GetnPoint()];
+  
+  /*--- Add the distance to the nearest sharp edge if requested. ---*/
+  
+  if (config->GetWrt_SharpEdges()) {
+    nVar_Par += 1;
+    Variable_Names.push_back("Sharp_Edge_Dist");
+  }
+  
+  /*--- Add the intermittency for the BC trans. model. ---*/
+  
+  if (transition) {
+    nVar_Par += 1;
+    if ((config->GetTabular_FileFormat() == TAB_CSV)){
+      Variable_Names.push_back("gamma_BC");
+    } else {
+      Variable_Names.push_back("<greek>g</greek><sub>BC</sub>");
+    }
+  }
+  
+  if (variable_density) {
+    nVar_Par += 1;
+    Variable_Names.push_back("Density");
+  }
+  
+  if (wrt_cp) {
+    nVar_Par += 1;
+    Variable_Names.push_back("Specific_Heat");
+  }
+  
+  if (wrt_kt) {
+    nVar_Par += 1;
+    Variable_Names.push_back("Thermal_Conductivity");
+  }
+  
+  if (solver[FLOW_SOL]->VerificationSolution) {
+    if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
+      nVar_Par += 2*nVar_Consv_Par;
+      Variable_Names.push_back("Verification_Pressure");
+      Variable_Names.push_back("Verification_Velocity_x");
+      Variable_Names.push_back("Verification_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Velocity_z");
+      if (energy || weakly_coupled_heat) Variable_Names.push_back("Verification_Temperature");
+      Variable_Names.push_back("Error_Pressure");
+      Variable_Names.push_back("Error_Velocity_x");
+      Variable_Names.push_back("Error_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Velocity_z");
+      if (energy || weakly_coupled_heat) Variable_Names.push_back("Error_Temperature");
+    }
+  }
+  
+  if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    nVar_Par += 2;
+    Variable_Names.push_back("Vorticity_x");
+    Variable_Names.push_back("Vorticity_y");
+    nVar_Par += 1; Variable_Names.push_back("Vorticity_z");
+    
+    if (geometry->GetnDim() == 3) {
+      nVar_Par +=1;
+      Variable_Names.push_back("Q_Criterion");
+    }
+  }
+  
+  if (config->GetWrt_MeshQuality()) {
+    nVar_Par +=1;
+    Variable_Names.push_back("Orthogonality");
+    nVar_Par +=1;
+    Variable_Names.push_back("Aspect_Ratio");
+    nVar_Par +=1;
+    Variable_Names.push_back("Volume_Ratio");
+  }
+  
+  /*--- New variables get registered here before the end of the loop. ---*/
+  
+  
+
+  /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
+
+  if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
+    Aux_Frict_x = new su2double[geometry->GetnPoint()];
+    Aux_Frict_y = new su2double[geometry->GetnPoint()];
+    Aux_Frict_z = new su2double[geometry->GetnPoint()];
     Aux_Heat    = new su2double[geometry->GetnPoint()];
     Aux_yPlus   = new su2double[geometry->GetnPoint()];
 
@@ -13718,197 +13696,195 @@ void COutputLegacy::LoadLocalData_IncFlow(CConfig *config, CGeometry *geometry,
       }
 
       /*--- If limiters and/or residuals are requested. ---*/
-      if (!config->GetLow_MemoryOutput()) {
-
-        /*--- Limiters ---*/
-        if (config->GetWrt_Limiters()) {
-          /*--- Mean Flow Limiters ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-            iVar++;
-          }
-          /*--- RANS Limiters ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
-              iVar++;
-            }
-          }
+      
+      /*--- Limiters ---*/
+      if (config->GetWrt_Limiters()) {
+        /*--- Mean Flow Limiters ---*/
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
+          iVar++;
         }
-
-        /*--- Residuals ---*/
-        if (config->GetWrt_Residuals()) {
-          /*--- Mean Flow Residuals ---*/
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+        /*--- RANS Limiters ---*/
+        if (SecondIndex != NONE) {
+          for (jVar = 0; jVar < nVar_Second; jVar++) {
+            Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter_Primitive(jVar);
             iVar++;
           }
-          /*--- RANS Residuals ---*/
-          if (SecondIndex != NONE) {
-            for (jVar = 0; jVar < nVar_Second; jVar++) {
-              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              iVar++;
-            }
-          }
         }
       }
-
-      if (!config->GetLow_MemoryOutput()) {
-
-        /*--- Load buffers with the three grid velocity components. ---*/
-
-        if (dynamic_grid) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
-            iVar++;
-          }
+      
+      /*--- Residuals ---*/
+      if (config->GetWrt_Residuals()) {
+        /*--- Mean Flow Residuals ---*/
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+          iVar++;
         }
-
-        /*--- Load data for Cp and Mach variables. ---*/
-
-        Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
-
-        if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-
-          /*--- Load data for the laminar viscosity. ---*/
-
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
-
-          /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
-
-          Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
+        /*--- RANS Residuals ---*/
+        if (SecondIndex != NONE) {
+          for (jVar = 0; jVar < nVar_Second; jVar++) {
+            Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
             iVar++;
           }
-          
-          if (energy || weakly_coupled_heat) {
-            Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
-          }
-
         }
-
-        /*--- Load data for the Eddy viscosity for RANS. ---*/
-
-        if (Kind_Solver == INC_RANS) {
-          Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
-        }
-
-        /*--- Load data for the distance to the nearest sharp edge. ---*/
-
-        if (config->GetWrt_SharpEdges()) {
-          Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
-        }
-
-        /*--- Load data for the intermittency of the BC trans. model. ---*/
-
-        if (transition) {
-          Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
+      }
+      
+      
+      
+      /*--- Load buffers with the three grid velocity components. ---*/
+      
+      if (dynamic_grid) {
+        Grid_Vel = geometry->node[iPoint]->GetGridVel();
+        Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
+        Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
+        if (geometry->GetnDim() == 3) {
+          Local_Data[jPoint][iVar] = Grid_Vel[2];
+          iVar++;
         }
-
-        /*--- Load density if we are solving a variable density problem. ---*/
+      }
+      
+      /*--- Load data for Cp and Mach variables. ---*/
+      
+      Local_Data[jPoint][iVar] = (solver[FLOW_SOL]->node[iPoint]->GetPressure() - RefPressure)*factor*RefArea; iVar++;
+      
+      if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
         
-        if (variable_density) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDensity(); iVar++;
-        }
+        /*--- Load data for the laminar viscosity. ---*/
         
-        /*--- Load Cp and conductivity if they are temperature-dependent. ---*/
-        if (wrt_cp) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCp(); iVar++;
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetLaminarViscosity(); iVar++;
+        
+        /*--- Load data for the skin friction, heat flux, and y-plus. ---*/
+        
+        Local_Data[jPoint][iVar] = Aux_Frict_x[iPoint]; iVar++;
+        Local_Data[jPoint][iVar] = Aux_Frict_y[iPoint]; iVar++;
+        if (geometry->GetnDim() == 3) {
+          Local_Data[jPoint][iVar] = Aux_Frict_z[iPoint];
+          iVar++;
         }
         
-        if (wrt_kt) {
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetThermalConductivity(); iVar++;
+        if (energy || weakly_coupled_heat) {
+          Local_Data[jPoint][iVar] = Aux_Heat[iPoint]; iVar++;
         }
         
-        if (solver[FLOW_SOL]->VerificationSolution) {
-          if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-          
-            /*--- Get the physical time if necessary. ---*/
-            su2double time = 0.0;
-            if (config->GetTime_Marching()) time = config->GetPhysicalTime();
+      }
+      
+      /*--- Load data for the Eddy viscosity for RANS. ---*/
+      
+      if (Kind_Solver == INC_RANS) {
+        Local_Data[jPoint][iVar] = Aux_yPlus[iPoint]; iVar++;
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetEddyViscosity(); iVar++;
+      }
+      
+      /*--- Load data for the distance to the nearest sharp edge. ---*/
+      
+      if (config->GetWrt_SharpEdges()) {
+        Local_Data[jPoint][iVar] = geometry->node[iPoint]->GetSharpEdge_Distance(); iVar++;
+      }
+      
+      /*--- Load data for the intermittency of the BC trans. model. ---*/
+      
+      if (transition) {
+        Local_Data[jPoint][iVar] = solver[TURB_SOL]->node[iPoint]->GetGammaBC(); iVar++;
+      }
+      
+      /*--- Load density if we are solving a variable density problem. ---*/
+      
+      if (variable_density) {
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetDensity(); iVar++;
+      }
+      
+      /*--- Load Cp and conductivity if they are temperature-dependent. ---*/
+      if (wrt_cp) {
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetSpecificHeatCp(); iVar++;
+      }
+      
+      if (wrt_kt) {
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetThermalConductivity(); iVar++;
+      }
+      
+      if (solver[FLOW_SOL]->VerificationSolution) {
+        if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
           
-            /* Set the pointers to the coordinates and solution of this DOF. */
-            const su2double *coor = geometry->node[iPoint]->GetCoord();
-            su2double *solDOF     = solver[FLOW_SOL]->node[iPoint]->GetSolution();
-            su2double mmsSol[5]   = {0.0,0.0,0.0,0.0,0.0};
-            su2double error[5]    = {0.0,0.0,0.0,0.0,0.0};
+          /*--- Get the physical time if necessary. ---*/
+          su2double time = 0.0;
+          if (config->GetTime_Marching()) time = config->GetPhysicalTime();
           
-            /* Get the verification solution. */
-            solver[FLOW_SOL]->VerificationSolution->GetSolution(coor, time, mmsSol);
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = mmsSol[jVar];
-              iVar++;
-            }
+          /* Set the pointers to the coordinates and solution of this DOF. */
+          const su2double *coor = geometry->node[iPoint]->GetCoord();
+          su2double *solDOF     = solver[FLOW_SOL]->node[iPoint]->GetSolution();
+          su2double mmsSol[5]   = {0.0,0.0,0.0,0.0,0.0};
+          su2double error[5]    = {0.0,0.0,0.0,0.0,0.0};
           
-            /* Get local error from the verification solution class. */
-            solver[FLOW_SOL]->VerificationSolution->GetLocalError(coor, time, solDOF, error);
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = error[jVar];
-              iVar++;
-            }
-
+          /* Get the verification solution. */
+          solver[FLOW_SOL]->VerificationSolution->GetSolution(coor, time, mmsSol);
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = mmsSol[jVar];
+            iVar++;
           }
-        }
-        
-        if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
-          
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[0]; iVar++;
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[1]; iVar++;
-          Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[2]; iVar++;
           
-          if (nDim == 3){
-            for (iDim = 0; iDim < nDim; iDim++) {
-              for (unsigned short jDim = 0; jDim < nDim; jDim++) {
-                Grad_Vel[iDim][jDim] = solver[FLOW_SOL]->node[iPoint]->GetGradient_Primitive(iDim+1, jDim);
-              }
-            }
-            
-            /*--- Q Criterion Eq 1.2 of---*/
-            /*--- HALLER, G. (2005). An objective definition of a vortex. Journal of Fluid Mechanics, 525, 1-26. doi:10.1017/S0022112004002526 ---*/
-            
-            su2double s11 = Grad_Vel[0][0];
-            su2double s12 = 0.5 * (Grad_Vel[0][1] + Grad_Vel[1][0]);
-            su2double s13 = 0.5 * (Grad_Vel[0][2] + Grad_Vel[2][0]);
-            su2double s22 = Grad_Vel[1][1];
-            su2double s23 = 0.5 * (Grad_Vel[1][2] + Grad_Vel[2][1]);
-            su2double s33 = Grad_Vel[2][2];
-            su2double omega12 = 0.5 * (Grad_Vel[0][1] - Grad_Vel[1][0]);
-            su2double omega13 = 0.5 * (Grad_Vel[0][2] - Grad_Vel[2][0]);
-            su2double omega23 = 0.5 * (Grad_Vel[1][2] - Grad_Vel[2][1]);
-            
-            Q = 2. * pow( omega12, 2.) + 2. * pow( omega13, 2.) + 2. * pow( omega23, 2.) - \
-            pow( s11, 2.) - pow( s22, 2.) - pow( s33, 2.0) - 2. * pow( s12, 2.) - 2. * pow( s13, 2.) - 2. * pow( s23, 2.0);
-            
-            Local_Data[jPoint][iVar] = Q; iVar++;
+          /* Get local error from the verification solution class. */
+          solver[FLOW_SOL]->VerificationSolution->GetLocalError(coor, time, solDOF, error);
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = error[jVar];
+            iVar++;
           }
+          
         }
+      }
+      
+      if ((Kind_Solver == INC_NAVIER_STOKES) || (Kind_Solver == INC_RANS)) {
         
-        /*--- Output the mesh quality metrics. ---*/
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[0]; iVar++;
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[1]; iVar++;
+        Local_Data[jPoint][iVar] = solver[FLOW_SOL]->node[iPoint]->GetVorticity()[2]; iVar++;
         
-        if (config->GetWrt_MeshQuality()) {
-          Local_Data[jPoint][iVar] = geometry->Orthogonality[iPoint]; iVar++;
-          Local_Data[jPoint][iVar] = geometry->Aspect_Ratio[iPoint];  iVar++;
-          Local_Data[jPoint][iVar] = geometry->Volume_Ratio[iPoint];  iVar++;
+        if (nDim == 3){
+          for (iDim = 0; iDim < nDim; iDim++) {
+            for (unsigned short jDim = 0; jDim < nDim; jDim++) {
+              Grad_Vel[iDim][jDim] = solver[FLOW_SOL]->node[iPoint]->GetGradient_Primitive(iDim+1, jDim);
+            }
+          }
+          
+          /*--- Q Criterion Eq 1.2 of---*/
+          /*--- HALLER, G. (2005). An objective definition of a vortex. Journal of Fluid Mechanics, 525, 1-26. doi:10.1017/S0022112004002526 ---*/
+          
+          su2double s11 = Grad_Vel[0][0];
+          su2double s12 = 0.5 * (Grad_Vel[0][1] + Grad_Vel[1][0]);
+          su2double s13 = 0.5 * (Grad_Vel[0][2] + Grad_Vel[2][0]);
+          su2double s22 = Grad_Vel[1][1];
+          su2double s23 = 0.5 * (Grad_Vel[1][2] + Grad_Vel[2][1]);
+          su2double s33 = Grad_Vel[2][2];
+          su2double omega12 = 0.5 * (Grad_Vel[0][1] - Grad_Vel[1][0]);
+          su2double omega13 = 0.5 * (Grad_Vel[0][2] - Grad_Vel[2][0]);
+          su2double omega23 = 0.5 * (Grad_Vel[1][2] - Grad_Vel[2][1]);
+          
+          Q = 2. * pow( omega12, 2.) + 2. * pow( omega13, 2.) + 2. * pow( omega23, 2.) - \
+              pow( s11, 2.) - pow( s22, 2.) - pow( s33, 2.0) - 2. * pow( s12, 2.) - 2. * pow( s13, 2.) - 2. * pow( s23, 2.0);
+          
+          Local_Data[jPoint][iVar] = Q; iVar++;
         }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
       }
-
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-
-      jPoint++;
-
+      
+      /*--- Output the mesh quality metrics. ---*/
+      
+      if (config->GetWrt_MeshQuality()) {
+        Local_Data[jPoint][iVar] = geometry->Orthogonality[iPoint]; iVar++;
+        Local_Data[jPoint][iVar] = geometry->Aspect_Ratio[iPoint];  iVar++;
+        Local_Data[jPoint][iVar] = geometry->Volume_Ratio[iPoint];  iVar++;
+      }
+      
+      /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+      
     }
+    
+    /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+    
+    jPoint++;
+    
   }
+  
 
   /*--- Free memory for auxiliary vectors. ---*/
   
@@ -14034,98 +14010,96 @@ void COutputLegacy::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry,
   /*--- If requested, register the limiter and residuals for all of the
    equations in the current flow problem. ---*/
   
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the limiters ---*/
-    
-    if (config->GetWrt_Limiters()) {
-      nVar_Par += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Limiter_Adjoint_Pressure");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_x");
-        Variable_Names.push_back("Limiter_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Adjoint_Velocity_z");
-        Variable_Names.push_back("Limiter_Adjoint_Temperature");
-      } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_x");
-        Variable_Names.push_back("Limiter_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Limiter_Adjoint_Momentum_z");
-        Variable_Names.push_back("Limiter_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Limiter_Adjoint_TKE");
-          Variable_Names.push_back("Limiter_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Limiter_Adjoint_Nu_Tilde");
-        }
-      }
+  /*--- Add the limiters ---*/
+  
+  if (config->GetWrt_Limiters()) {
+    nVar_Par += nVar_Consv_Par;
+    if (incompressible) {
+      Variable_Names.push_back("Limiter_Adjoint_Pressure");
+      Variable_Names.push_back("Limiter_Adjoint_Velocity_x");
+      Variable_Names.push_back("Limiter_Adjoint_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Limiter_Adjoint_Velocity_z");
+      Variable_Names.push_back("Limiter_Adjoint_Temperature");
+    } else {
+      Variable_Names.push_back("Limiter_Adjoint_Density");
+      Variable_Names.push_back("Limiter_Adjoint_Momentum_x");
+      Variable_Names.push_back("Limiter_Adjoint_Momentum_y");
+      if (geometry->GetnDim() == 3)
+        Variable_Names.push_back("Limiter_Adjoint_Momentum_z");
+      Variable_Names.push_back("Limiter_Adjoint_Energy");
     }
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      if (incompressible) {
-        Variable_Names.push_back("Residual_Adjoint_Pressure");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_x");
-        Variable_Names.push_back("Residual_Adjoint_Velocity_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Adjoint_Velocity_z");
-        Variable_Names.push_back("Residual_Adjoint_Temperature");
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Limiter_Adjoint_TKE");
+        Variable_Names.push_back("Limiter_Adjoint_Omega");
       } else {
-        Variable_Names.push_back("Residual_Adjoint_Density");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_x");
-        Variable_Names.push_back("Residual_Adjoint_Momentum_y");
-        if (geometry->GetnDim() == 3)
-          Variable_Names.push_back("Residual_Adjoint_Momentum_z");
-        Variable_Names.push_back("Residual_Adjoint_Energy");
-      }
-      if (SecondIndex != NONE) {
-        if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
-          Variable_Names.push_back("Residual_Adjoint_TKE");
-          Variable_Names.push_back("Residual_Adjoint_Omega");
-        } else {
-          /*--- S-A variants ---*/
-          Variable_Names.push_back("Residual_Adjoint_Nu_Tilde");
-        }
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Limiter_Adjoint_Nu_Tilde");
       }
     }
-    
-    /*--- Add the grid velocity. ---*/
-    
-    if (dynamic_grid) {
-      if (geometry->GetnDim() == 2) nVar_Par += 2;
-      else if (geometry->GetnDim() == 3) nVar_Par += 3;
-      Variable_Names.push_back("Grid_Velocity_x");
-      Variable_Names.push_back("Grid_Velocity_y");
-      if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+  }
+  
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) {
+    nVar_Par += nVar_Consv_Par;
+    if (incompressible) {
+      Variable_Names.push_back("Residual_Adjoint_Pressure");
+      Variable_Names.push_back("Residual_Adjoint_Velocity_x");
+      Variable_Names.push_back("Residual_Adjoint_Velocity_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Residual_Adjoint_Velocity_z");
+      Variable_Names.push_back("Residual_Adjoint_Temperature");
+    } else {
+      Variable_Names.push_back("Residual_Adjoint_Density");
+      Variable_Names.push_back("Residual_Adjoint_Momentum_x");
+      Variable_Names.push_back("Residual_Adjoint_Momentum_y");
+      if (geometry->GetnDim() == 3)
+        Variable_Names.push_back("Residual_Adjoint_Momentum_z");
+      Variable_Names.push_back("Residual_Adjoint_Energy");
     }
-    
-    /*--- All adjoint solvers write the surface sensitivity. ---*/
-    
-    nVar_Par += 1; Variable_Names.push_back("Surface_Sensitivity");
-    
-    /*--- For the continouus adjoint, we write either convective scheme's
-     dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
-    
-    if (( Kind_Solver == ADJ_EULER              ) ||
-        ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-        ( Kind_Solver == ADJ_RANS               )) {
-      nVar_Par += 1;
-      if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-        Variable_Names.push_back("Dissipation_Sensor");
+    if (SecondIndex != NONE) {
+      if ((config->GetKind_Turb_Model() == SST) || (config->GetKind_Turb_Model() == SST_SUST)) {
+        Variable_Names.push_back("Residual_Adjoint_TKE");
+        Variable_Names.push_back("Residual_Adjoint_Omega");
       } else {
-        Variable_Names.push_back("Limiter_Adjoint_Density");
+        /*--- S-A variants ---*/
+        Variable_Names.push_back("Residual_Adjoint_Nu_Tilde");
       }
     }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
   }
   
+  /*--- Add the grid velocity. ---*/
+  
+  if (dynamic_grid) {
+    if (geometry->GetnDim() == 2) nVar_Par += 2;
+    else if (geometry->GetnDim() == 3) nVar_Par += 3;
+    Variable_Names.push_back("Grid_Velocity_x");
+    Variable_Names.push_back("Grid_Velocity_y");
+    if (geometry->GetnDim() == 3) Variable_Names.push_back("Grid_Velocity_z");
+  }
+  
+  /*--- All adjoint solvers write the surface sensitivity. ---*/
+  
+  nVar_Par += 1; Variable_Names.push_back("Surface_Sensitivity");
+  
+  /*--- For the continouus adjoint, we write either convective scheme's
+     dissipation sensor (centered) or limiter (uwpind) for adj. density. ---*/
+  
+  if (( Kind_Solver == ADJ_EULER              ) ||
+      ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+      ( Kind_Solver == ADJ_RANS               )) {
+    nVar_Par += 1;
+    if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
+      Variable_Names.push_back("Dissipation_Sensor");
+    } else {
+      Variable_Names.push_back("Limiter_Adjoint_Density");
+    }
+  }
+  
+  /*--- New variables get registered here before the end of the loop. ---*/
+  
+  
+  
   /*--- Auxiliary vectors for variables defined on surfaces only. ---*/
   
   Aux_Sens = new su2double[geometry->GetnPoint()];
@@ -14252,84 +14226,82 @@ void COutputLegacy::LoadLocalData_AdjFlow(CConfig *config, CGeometry *geometry,
         }
       }
       
-      if (!config->GetLow_MemoryOutput()) {
-
-          if (config->GetWrt_Limiters()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter(jVar);
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter(jVar);
-                iVar++;
-              }
-            }
+      if (config->GetWrt_Limiters()) {
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetLimiter(jVar);
+          iVar++;
+        }
+        if (SecondIndex != NONE) {
+          for (jVar = 0; jVar < nVar_Second; jVar++) {
+            Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetLimiter(jVar);
+            iVar++;
           }
-
-          if (config->GetWrt_Residuals()) {
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              if (!config->GetDiscrete_Adjoint()) {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-              } else {
-                Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar) -
-                solver[FirstIndex]->node[iPoint]->GetSolution_Old(jVar);
-              }
-              iVar++;
-            }
-            if (SecondIndex != NONE) {
-              for (jVar = 0; jVar < nVar_Second; jVar++) {
-                if (!config->GetDiscrete_Adjoint()) {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
-                } else {
-                  Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar) -
-                                             solver[SecondIndex]->node[iPoint]->GetSolution_Old(jVar);
-                }
-                iVar++;
-              }
-            }
+        }
+      }
+      
+      if (config->GetWrt_Residuals()) {
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          if (!config->GetDiscrete_Adjoint()) {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+          } else {
+            Local_Data[jPoint][iVar] = solver[FirstIndex]->node[iPoint]->GetSolution(jVar) -
+                                       solver[FirstIndex]->node[iPoint]->GetSolution_Old(jVar);
           }
-        
-        /*--- Load buffers with the three grid velocity components. ---*/
-        
-        if (dynamic_grid) {
-          Grid_Vel = geometry->node[iPoint]->GetGridVel();
-          Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Grid_Vel[2];
+          iVar++;
+        }
+        if (SecondIndex != NONE) {
+          for (jVar = 0; jVar < nVar_Second; jVar++) {
+            if (!config->GetDiscrete_Adjoint()) {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->LinSysRes.GetBlock(iPoint, jVar);
+            } else {
+              Local_Data[jPoint][iVar] = solver[SecondIndex]->node[iPoint]->GetSolution(jVar) -
+                                         solver[SecondIndex]->node[iPoint]->GetSolution_Old(jVar);
+            }
             iVar++;
           }
         }
-        
-        /*--- Load data for the surface sensitivity. ---*/
-        
-        Local_Data[iPoint][iVar] = Aux_Sens[iPoint]; iVar++;
-        
-        /*--- Load data for the convective scheme sensor. ---*/
-        
-        if (( Kind_Solver == ADJ_EULER              ) ||
-            ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
-            ( Kind_Solver == ADJ_RANS               )) {
-          if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint); iVar++;
-          } else {
-            Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0); iVar++;
-          }
+      }
+      
+      /*--- Load buffers with the three grid velocity components. ---*/
+      
+      if (dynamic_grid) {
+        Grid_Vel = geometry->node[iPoint]->GetGridVel();
+        Local_Data[jPoint][iVar] = Grid_Vel[0]; iVar++;
+        Local_Data[jPoint][iVar] = Grid_Vel[1]; iVar++;
+        if (geometry->GetnDim() == 3) {
+          Local_Data[jPoint][iVar] = Grid_Vel[2];
+          iVar++;
+        }
+      }
+      
+      /*--- Load data for the surface sensitivity. ---*/
+      
+      Local_Data[iPoint][iVar] = Aux_Sens[iPoint]; iVar++;
+      
+      /*--- Load data for the convective scheme sensor. ---*/
+      
+      if (( Kind_Solver == ADJ_EULER              ) ||
+          ( Kind_Solver == ADJ_NAVIER_STOKES      ) ||
+          ( Kind_Solver == ADJ_RANS               )) {
+        if (config->GetKind_ConvNumScheme() == SPACE_CENTERED) {
+          Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetSensor(iPoint); iVar++;
+        } else {
+          Local_Data[jPoint][iVar] = solver[ADJFLOW_SOL]->node[iPoint]->GetLimiter(0); iVar++;
         }
-        
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-        
       }
-
-      /*--- Increment the point counter, as there may have been halos we
-       skipped over during the data loading. ---*/
-
-      jPoint++;
+      
+      /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+      
     }
+    
+    /*--- Increment the point counter, as there may have been halos we
+       skipped over during the data loading. ---*/
+    
+    jPoint++;
   }
   
+  
   /*--- Free memory for auxiliary vectors. ---*/
   
   delete [] Aux_Sens;
@@ -14399,66 +14371,65 @@ void COutputLegacy::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometr
   /*--- If requested, register the limiter and residuals for all of the
    equations in the current flow problem. ---*/
   
-  if (!config->GetLow_MemoryOutput()) {
     
-    /*--- Add the residuals ---*/
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) {
+    nVar_Par += nVar_Consv_Par;
+    Variable_Names.push_back("Residual_Displacement_x");
+    Variable_Names.push_back("Residual_Displacement_y");
+    if (geometry->GetnDim() == 3)
+      Variable_Names.push_back("Residual_Displacement_z");
+  }
+  
+  /*--- If the analysis is dynamic... ---*/
+  if (config->GetTime_Domain()) {
     
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      Variable_Names.push_back("Residual_Displacement_x");
-      Variable_Names.push_back("Residual_Displacement_y");
-      if (geometry->GetnDim() == 3)
-        Variable_Names.push_back("Residual_Displacement_z");
+    /*--- Velocities ---*/
+    nVar_Par += 2;
+    Variable_Names.push_back("Velocity_x");
+    Variable_Names.push_back("Velocity_y");
+    if (geometry->GetnDim() == 3) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Velocity_z");
     }
     
-    /*--- If the analysis is dynamic... ---*/
-    if (config->GetTime_Domain()) {
-      
-      /*--- Velocities ---*/
-      nVar_Par += 2;
-      Variable_Names.push_back("Velocity_x");
-      Variable_Names.push_back("Velocity_y");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
-        Variable_Names.push_back("Velocity_z");
-      }
-      
-      /*--- Accelerations ---*/
-      nVar_Par += 2;
-      Variable_Names.push_back("Acceleration_x");
-      Variable_Names.push_back("Acceleration_y");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 1;
-        Variable_Names.push_back("Acceleration_z");
-      }
+    /*--- Accelerations ---*/
+    nVar_Par += 2;
+    Variable_Names.push_back("Acceleration_x");
+    Variable_Names.push_back("Acceleration_y");
+    if (geometry->GetnDim() == 3) {
+      nVar_Par += 1;
+      Variable_Names.push_back("Acceleration_z");
     }
+  }
+  
+  if (!(config->GetDiscrete_Adjoint())) {
     
-    if (!(config->GetDiscrete_Adjoint())) {
-
-      /*--- Add the stresses. ---*/
+    /*--- Add the stresses. ---*/
     
+    nVar_Par += 3;
+    Variable_Names.push_back("Sxx");
+    Variable_Names.push_back("Syy");
+    Variable_Names.push_back("Sxy");
+    if (geometry->GetnDim() == 3) {
       nVar_Par += 3;
-      Variable_Names.push_back("Sxx");
-      Variable_Names.push_back("Syy");
-      Variable_Names.push_back("Sxy");
-      if (geometry->GetnDim() == 3) {
-        nVar_Par += 3;
-        Variable_Names.push_back("Szz");
-        Variable_Names.push_back("Sxz");
-        Variable_Names.push_back("Syz");
-      }
-
-      /*--- Add the Von Mises Stress. ---*/
-    
-      nVar_Par += 1;
-      Variable_Names.push_back("Von_Mises_Stress");
-    
+      Variable_Names.push_back("Szz");
+      Variable_Names.push_back("Sxz");
+      Variable_Names.push_back("Syz");
     }
     
-    /*--- New variables get registered here before the end of the loop. ---*/
+    /*--- Add the Von Mises Stress. ---*/
+    
+    nVar_Par += 1;
+    Variable_Names.push_back("Von_Mises_Stress");
     
   }
   
+  /*--- New variables get registered here before the end of the loop. ---*/
+  
+  
+  
   /*--- Allocate the local data structure now that we know how many
    variables are in the output. ---*/
   
@@ -14533,75 +14504,73 @@ void COutputLegacy::LoadLocalData_Elasticity(CConfig *config, CGeometry *geometr
         iVar++;
       }
       
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
+      if (config->GetWrt_Residuals()) {
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+          iVar++;
         }
       }
       
-      if (!config->GetLow_MemoryOutput()) {
+      
+      
+      /*--- Load the velocities and accelerations (dynamic calculations). ---*/
+      
+      if (config->GetTime_Domain()) {
         
-        /*--- Load the velocities and accelerations (dynamic calculations). ---*/
+        /*--- Velocities ---*/
         
-        if (config->GetTime_Domain()) {
-          
-          /*--- Velocities ---*/
-          
-          Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
-          Local_Data[jPoint][iVar] = Node_Vel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Vel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Vel[2];
-            iVar++;
-          }
-          
-          /*--- Accelerations ---*/
-          
-          Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
-          Local_Data[jPoint][iVar] = Node_Accel[0]; iVar++;
-          Local_Data[jPoint][iVar] = Node_Accel[1]; iVar++;
-          if (geometry->GetnDim() == 3) {
-            Local_Data[jPoint][iVar] = Node_Accel[2];
-            iVar++;
-          }
+        Node_Vel = solver[FEA_SOL]->node[iPoint]->GetSolution_Vel();
+        Local_Data[jPoint][iVar] = Node_Vel[0]; iVar++;
+        Local_Data[jPoint][iVar] = Node_Vel[1]; iVar++;
+        if (geometry->GetnDim() == 3) {
+          Local_Data[jPoint][iVar] = Node_Vel[2];
+          iVar++;
         }
         
-        if (!(config->GetDiscrete_Adjoint())) {
-
-          /*--- Add the stresses. ---*/
+        /*--- Accelerations ---*/
         
-          Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
+        Node_Accel = solver[FEA_SOL]->node[iPoint]->GetSolution_Accel();
+        Local_Data[jPoint][iVar] = Node_Accel[0]; iVar++;
+        Local_Data[jPoint][iVar] = Node_Accel[1]; iVar++;
+        if (geometry->GetnDim() == 3) {
+          Local_Data[jPoint][iVar] = Node_Accel[2];
+          iVar++;
+        }
+      }
+      
+      if (!(config->GetDiscrete_Adjoint())) {
         
-          /*--- Sigma xx ---*/
-          Local_Data[jPoint][iVar] = Stress[0]; iVar++;
-          /*--- Sigma yy ---*/
-          Local_Data[jPoint][iVar] = Stress[1]; iVar++;
-          /*--- Sigma xy ---*/
-          Local_Data[jPoint][iVar] = Stress[2]; iVar++;
+        /*--- Add the stresses. ---*/
         
-          if (geometry->GetnDim() == 3) {
-            /*--- Sigma zz ---*/
-            Local_Data[jPoint][iVar] = Stress[3]; iVar++;
-            /*--- Sigma xz ---*/
-            Local_Data[jPoint][iVar] = Stress[4]; iVar++;
-            /*--- Sigma yz ---*/
-            Local_Data[jPoint][iVar] = Stress[5]; iVar++;
-          }
+        Stress = solver[FEA_SOL]->node[iPoint]->GetStress_FEM();
         
-          /*--- Add the Von Mises Stress. ---*/
+        /*--- Sigma xx ---*/
+        Local_Data[jPoint][iVar] = Stress[0]; iVar++;
+        /*--- Sigma yy ---*/
+        Local_Data[jPoint][iVar] = Stress[1]; iVar++;
+        /*--- Sigma xy ---*/
+        Local_Data[jPoint][iVar] = Stress[2]; iVar++;
         
-          Local_Data[iPoint][iVar] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress(); iVar++;
+        if (geometry->GetnDim() == 3) {
+          /*--- Sigma zz ---*/
+          Local_Data[jPoint][iVar] = Stress[3]; iVar++;
+          /*--- Sigma xz ---*/
+          Local_Data[jPoint][iVar] = Stress[4]; iVar++;
+          /*--- Sigma yz ---*/
+          Local_Data[jPoint][iVar] = Stress[5]; iVar++;
+        }
+        
+        /*--- Add the Von Mises Stress. ---*/
         
+        Local_Data[iPoint][iVar] = solver[FEA_SOL]->node[iPoint]->GetVonMises_Stress(); iVar++;
         
-          /*--- New variables can be loaded to the Local_Data structure here,
+        
+        /*--- New variables can be loaded to the Local_Data structure here,
            assuming they were registered above correctly. ---*/
-
-        }
-
+        
       }
+      
+      
 
       /*--- Increment the point counter, as there may have been halos we
        skipped over during the data loading. ---*/
@@ -14671,23 +14640,22 @@ void COutputLegacy::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSo
   /*--- If requested, register the residuals for all of the
    equations in the current problem. ---*/
   
-  if (!config->GetLow_MemoryOutput()) {
-    
-    /*--- Add the residuals ---*/
-    
-    if (config->GetWrt_Residuals()) {
-      nVar_Par += nVar_Consv_Par;
-      for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
-        varname << "Residual_" << iVar+1;
-        Variable_Names.push_back(varname.str());
-        varname.str("");
-      }
+  
+  /*--- Add the residuals ---*/
+  
+  if (config->GetWrt_Residuals()) {
+    nVar_Par += nVar_Consv_Par;
+    for (iVar = 0; iVar < nVar_Consv_Par; iVar++) {
+      varname << "Residual_" << iVar+1;
+      Variable_Names.push_back(varname.str());
+      varname.str("");
     }
-    
-    /*--- New variables get registered here before the end of the loop. ---*/
-    
   }
   
+  /*--- New variables get registered here before the end of the loop. ---*/
+  
+  
+  
   /*--- Allocate the local data structure now that we know how many
    variables are in the output. ---*/
   
@@ -14762,15 +14730,14 @@ void COutputLegacy::LoadLocalData_Base(CConfig *config, CGeometry *geometry, CSo
         iVar++;
       }
       
-      if (!config->GetLow_MemoryOutput()) {
-        if (config->GetWrt_Residuals()) {
-          for (jVar = 0; jVar < nVar_First; jVar++) {
-            Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
-            iVar++;
-          }
+      if (config->GetWrt_Residuals()) {
+        for (jVar = 0; jVar < nVar_First; jVar++) {
+          Local_Data[jPoint][iVar] = solver[FirstIndex]->LinSysRes.GetBlock(iPoint, jVar);
+          iVar++;
         }
       }
       
+      
       /*--- New variables can be loaded to the Local_Data structure here,
        assuming they were registered above correctly. ---*/
       
@@ -20687,7 +20654,7 @@ void COutputLegacy::SetResult_Files_FEM(CSolver ****solver_container, CGeometry
 
       /*--- Get the file output format ---*/
 
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetTabular_FileFormat();
 
       /*--- Merge the node coordinates and connectivity, if necessary. This
        is only performed if a volume solution file is requested, and it
@@ -20866,7 +20833,7 @@ void COutputLegacy::SetBaselineResult_Files_FEM(CSolver ***solver, CGeometry ***
 
       /*--- Get the file output format ---*/
 
-      unsigned short FileFormat = config[iZone]->GetOutput_FileFormat();
+      unsigned short FileFormat = config[iZone]->GetTabular_FileFormat();
 
       /*--- Merge the node coordinates and connectivity if necessary. This
        is only performed if a volume solution file is requested, and it
@@ -21062,49 +21029,48 @@ void COutputLegacy::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSol
 
   /*--- Eventually, turbulence model from second container goes here. ---*/
 
-  if (!config->GetLow_MemoryOutput()) {
-
-    /*--- Add Pressure, Temperature, Cp, Mach. ---*/
-
+  
+  /*--- Add Pressure, Temperature, Cp, Mach. ---*/
+  
+  nVar_Par += 1;
+  Variable_Names.push_back("Pressure");
+  
+  nVar_Par += 3;
+  Variable_Names.push_back("Temperature");
+  if (config->GetTabular_FileFormat() == TAB_CSV){
+    Variable_Names.push_back("Pressure_Coefficient");
+  } else {
+    Variable_Names.push_back("C<sub>p</sub>");
+  }
+  Variable_Names.push_back("Mach");
+  
+  if ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_LES)){
     nVar_Par += 1;
-    Variable_Names.push_back("Pressure");
-
-    nVar_Par += 3;
-    Variable_Names.push_back("Temperature");
-    if (config->GetOutput_FileFormat() == PARAVIEW){
-      Variable_Names.push_back("Pressure_Coefficient");
-    } else {
-      Variable_Names.push_back("C<sub>p</sub>");
-    }
-    Variable_Names.push_back("Mach");
-
-    if ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_LES)){
-      nVar_Par += 1;
-      Variable_Names.push_back("Laminar_Viscosity");
-    }
-    if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
-      nVar_Par += 1;
-      Variable_Names.push_back("Eddy_Viscosity");
-    }
-
-    if (solver[FLOW_SOL]->VerificationSolution) {
-      if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-        nVar_Par += 2*nVar_Consv_Par;
-        Variable_Names.push_back("Verification_Density");
-        Variable_Names.push_back("Verification_Momentum_x");
-        Variable_Names.push_back("Verification_Momentum_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Momentum_z");
-        Variable_Names.push_back("Verification_Energy");
-        Variable_Names.push_back("Error_Density");
-        Variable_Names.push_back("Error_Momentum_x");
-        Variable_Names.push_back("Error_Momentum_y");
-        if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Momentum_z");
-        Variable_Names.push_back("Error_Energy");
-      }
+    Variable_Names.push_back("Laminar_Viscosity");
+  }
+  if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
+    nVar_Par += 1;
+    Variable_Names.push_back("Eddy_Viscosity");
+  }
+  
+  if (solver[FLOW_SOL]->VerificationSolution) {
+    if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
+      nVar_Par += 2*nVar_Consv_Par;
+      Variable_Names.push_back("Verification_Density");
+      Variable_Names.push_back("Verification_Momentum_x");
+      Variable_Names.push_back("Verification_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Verification_Momentum_z");
+      Variable_Names.push_back("Verification_Energy");
+      Variable_Names.push_back("Error_Density");
+      Variable_Names.push_back("Error_Momentum_x");
+      Variable_Names.push_back("Error_Momentum_y");
+      if (geometry->GetnDim() == 3) Variable_Names.push_back("Error_Momentum_z");
+      Variable_Names.push_back("Error_Energy");
     }
-
-    /*--- New variables get registered here before the end of the loop. ---*/
   }
+  
+    /*--- New variables get registered here before the end of the loop. ---*/
+  
 
   /*--- Create an object of the class CMeshFEM_DG and retrieve the necessary
    geometrical information for the FEM DG solver. ---*/
@@ -21149,95 +21115,93 @@ void COutputLegacy::LoadLocalData_FEM(CConfig *config, CGeometry *geometry, CSol
 
     const unsigned long offset = nVar_First*volElem[l].offsetDOFsSolLocal;
     su2double *solDOFs         = solver[FirstIndex]->GetVecSolDOFs() + offset;
-
+    
     for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
-
+      
       /*--- Restart the column index with each new point. ---*/
-
+      
       iVar = 0;
-
+      
       /*--- Get the conservative variables for this particular DOF. ---*/
-
+      
       const su2double *U = solDOFs + j*nVar_First;
-
+      
       /*--- Load the coordinate values of the solution DOFs. ---*/
-
+      
       const su2double *coor = volElem[l].coorSolDOFs.data() + j*nDim;
       for(unsigned short k=0; k<nDim; ++k) {
         Local_Data[jPoint][iVar] = coor[k];
         iVar++;
       }
-
+      
       /* Load the conservative variables. */
-
+      
       for(jVar=0; jVar < nVar_First; ++jVar) {
         Local_Data[jPoint][iVar] = U[jVar];
         iVar++;
       }
-
-      if (!config->GetLow_MemoryOutput()) {
-
-        /*--- Prepare the primitive states. ---*/
-
-        const su2double DensityInv = 1.0/U[0];
-        su2double vel[3], Velocity2 = 0.0;
-        for(iDim=0; iDim<nDim; ++iDim) {
-          vel[iDim] = U[iDim+1]*DensityInv;
-          Velocity2 += vel[iDim]*vel[iDim];
-        }
-        su2double StaticEnergy = U[nDim+1]*DensityInv - 0.5*Velocity2;
-        DGFluidModel->SetTDState_rhoe(U[0], StaticEnergy);
-
-        /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
-
-        Local_Data[jPoint][iVar] = DGFluidModel->GetPressure(); iVar++;
-        Local_Data[jPoint][iVar] = DGFluidModel->GetTemperature(); iVar++;
-        Local_Data[jPoint][iVar] = DGFluidModel->GetCp(); iVar++;
-        Local_Data[jPoint][iVar] = sqrt(Velocity2)/DGFluidModel->GetSoundSpeed(); iVar++;
-
-        if ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_LES)){
-          Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
-        }
-        if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
-          // todo: Export Eddy instead of Laminar viscosity
-          Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
-        }
-
-        if (solver[FLOW_SOL]->VerificationSolution) {
-          if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
-
-            /*--- Get the physical time if necessary. ---*/
-            su2double time = 0.0;
-            if (config->GetTime_Marching()) time = config->GetPhysicalTime();
-
-            /* Get the verification solution. */
-            su2double mmsSol[5];
-            solver[FLOW_SOL]->VerificationSolution->GetSolution(coor, time, mmsSol);
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = mmsSol[jVar];
-              iVar++;
-            }
-
-            /* Get local error from the verification solution class. */
-            su2double error[5];
-            solver[FLOW_SOL]->VerificationSolution->GetLocalError(coor, time, U, error);
-            for (jVar = 0; jVar < nVar_First; jVar++) {
-              Local_Data[jPoint][iVar] = error[jVar];
-              iVar++;
-            }
+      
+      /*--- Prepare the primitive states. ---*/
+      
+      const su2double DensityInv = 1.0/U[0];
+      su2double vel[3], Velocity2 = 0.0;
+      for(iDim=0; iDim<nDim; ++iDim) {
+        vel[iDim] = U[iDim+1]*DensityInv;
+        Velocity2 += vel[iDim]*vel[iDim];
+      }
+      su2double StaticEnergy = U[nDim+1]*DensityInv - 0.5*Velocity2;
+      DGFluidModel->SetTDState_rhoe(U[0], StaticEnergy);
+      
+      /*--- Load data for the pressure, temperature, Cp, and Mach variables. ---*/
+      
+      Local_Data[jPoint][iVar] = DGFluidModel->GetPressure(); iVar++;
+      Local_Data[jPoint][iVar] = DGFluidModel->GetTemperature(); iVar++;
+      Local_Data[jPoint][iVar] = DGFluidModel->GetCp(); iVar++;
+      Local_Data[jPoint][iVar] = sqrt(Velocity2)/DGFluidModel->GetSoundSpeed(); iVar++;
+      
+      if ((Kind_Solver == FEM_NAVIER_STOKES) || (Kind_Solver == FEM_LES)){
+        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
+      }
+      if ((Kind_Solver == FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
+        // todo: Export Eddy instead of Laminar viscosity
+        Local_Data[jPoint][iVar] = DGFluidModel->GetLaminarViscosity(); iVar++;
+      }
+      
+      if (solver[FLOW_SOL]->VerificationSolution) {
+        if (solver[FLOW_SOL]->VerificationSolution->ExactSolutionKnown()) {
+          
+          /*--- Get the physical time if necessary. ---*/
+          su2double time = 0.0;
+          if (config->GetTime_Marching()) time = config->GetPhysicalTime();
+          
+          /* Get the verification solution. */
+          su2double mmsSol[5];
+          solver[FLOW_SOL]->VerificationSolution->GetSolution(coor, time, mmsSol);
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = mmsSol[jVar];
+            iVar++;
+          }
+          
+          /* Get local error from the verification solution class. */
+          su2double error[5];
+          solver[FLOW_SOL]->VerificationSolution->GetLocalError(coor, time, U, error);
+          for (jVar = 0; jVar < nVar_First; jVar++) {
+            Local_Data[jPoint][iVar] = error[jVar];
+            iVar++;
           }
         }
-
-        /*--- New variables can be loaded to the Local_Data structure here,
-         assuming they were registered above correctly. ---*/
-
       }
-
-      /*--- Increment the point counter. ---*/
-
-      jPoint++;
+      
+      /*--- New variables can be loaded to the Local_Data structure here,
+         assuming they were registered above correctly. ---*/
+      
     }
+    
+    /*--- Increment the point counter. ---*/
+    
+    jPoint++;
   }
+  
 
 }
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index dc427504935b..4a642b6b7a25 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -340,40 +340,26 @@ int main(int argc, char *argv[]) {
   
   for (iZone = 0; iZone < nZone; iZone++){
     
-//    /*--- Load the data --- */
+    /*--- Load the data --- */
     
-//    output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
+    output[iZone]->Load_Data(geometry_container[iZone], config_container[iZone], NULL);
     
-//    /*--- Write the in the native su2 format ---*/
+    output[iZone]->WriteToFile(config_container[iZone], geometry_container[iZone], MESH, config->GetMesh_Out_FileName());
     
-//    output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], SU2_MESH, false);
+    /*--- Set the file names for the visualization files ---*/
     
+    output[iZone]->SetVolume_Filename("volume_deformed");
+    output[iZone]->SetSurface_Filename("surface_deformed");
     
-//    if (config_container[iZone]->GetVisualize_Volume_Def()){
-      
-//      /*--- Add a deformed identifier to the filename --- */
-      
-//      output[iZone]->SetVolume_Filename(output[iZone]->GetVolume_Filename() + string("_deformed"));    
-      
-//      /*--- If requested, write the volume output for visualization purposes --- */
-      
-//      output[iZone]->SetVolume_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
-    
-//    } 
-    
-//    if (config_container[iZone]->GetVisualize_Surface_Def()){
-      
-//      /*--- Add a deformed identifier to the filename --- */
-      
-//      output[iZone]->SetSurface_Filename(output[iZone]->GetSurface_Filename() + string("_deformed"));
-      
-//      /*--- If requested, write the volume output for visualization purposes --- */
-      
-//      output[iZone]->SetSurface_Output(geometry_container[iZone], config_container[iZone], config->GetOutput_FileFormat(), false);
-      
-//    }
+    if (config_container[iZone]->GetVisualize_Volume_Def()){
+      for (unsigned short iFile = 0; iFile < config_container[iZone]->GetnVolumeOutputFiles(); iFile++){
+        unsigned short* FileFormat = config_container[iZone]->GetVolumeOutputFiles();
+        if (FileFormat[iFile] != RESTART_ASCII && FileFormat[iFile] != RESTART_BINARY)
+          output[iZone]->WriteToFile(config_container[iZone], geometry_container[iZone], FileFormat[iFile]);
+      }
+    } 
     
-//    output[iZone]->DeallocateData_Parallel();
+    output[iZone]->DeallocateData_Parallel();
     
   }
 
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 43e97c96d9fd..7fa89b00c64b 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -779,9 +779,9 @@ def get_gradFileFormat(grad_type,plot_format,kindID,special_cases=[]):
     write_format = []
     
     # handle plot formating
-    if (plot_format == 'TECPLOT') or (plot_format == 'TECPLOT_BINARY'): 
+    if (plot_format == 'TAB_TECPLOT'): 
         header.append('VARIABLES=')
-    elif (plot_format == 'PARAVIEW') or (plot_format == 'PARAVIEW_BINARY'):
+    elif (plot_format == 'TAB_CSV'):
         pass
     else: raise Exception('output plot format not recognized')
     
@@ -905,9 +905,9 @@ def get_optFileFormat(plot_format,special_cases=None, nZones = 1):
     write_format  = []
     
     # handle plot formating
-    if (plot_format == 'TECPLOT') or (plot_format == 'TECPLOT_BINARY'): 
+    if (plot_format == 'TAB_TECPLOT'): 
         header_format = header_format + 'VARIABLES='
-    elif (plot_format == 'PARAVIEW') or (plot_format == 'PARAVIEW_BINARY'):
+    elif (plot_format == 'TAB_CSV'):
         pass
     else: raise Exception('output plot format not recognized')
 
@@ -963,11 +963,11 @@ def get_extension(output_format):
     if (output_format == "PARAVIEW")        : return ".csv"
     if (output_format == "PARAVIEW_BINARY") : return ".csv"
     if (output_format == "TECPLOT")         : return ".dat"
-    if (output_format == "TECPLOT_BINARY")  : return ".plt"
+    if (output_format == "TECPLOT_BINARY")  : return ".szplt"
     if (output_format == "SOLUTION")        : return ".dat"  
     if (output_format == "RESTART")         : return ".dat"  
     if (output_format == "CONFIG")          : return ".cfg"  
-
+    if (output_format == "CSV")         : return ".csv"
     # otherwise
     raise Exception("Output Format Unknown")
 
diff --git a/SU2_PY/SU2/opt/project.py b/SU2_PY/SU2/opt/project.py
index c59a87707b7f..54d829b112a8 100644
--- a/SU2_PY/SU2/opt/project.py
+++ b/SU2_PY/SU2/opt/project.py
@@ -479,7 +479,7 @@ def deep_compile(self):
     def plot_results(self):
         """ writes a tecplot file for plotting design results
         """
-        output_format = self.config.OUTPUT_FORMAT
+        output_format = self.config.TABULAR_FORMAT
         functions     = self.results.FUNCTIONS
         history       = self.results.HISTORY
         
@@ -488,7 +488,7 @@ def plot_results(self):
         results_plot.update(functions)
         results_plot.update(history.get('DIRECT',{}))
         
-        if (output_format == 'PARAVIEW') or (output_format == 'PARAVIEW_BINARY'):
+        if (output_format == 'TAB_CSV'):
           su2util.write_plot('history_project.csv',output_format,results_plot)
         else:
           su2util.write_plot('history_project.dat',output_format,results_plot)
diff --git a/SU2_PY/SU2/run/adjoint.py b/SU2_PY/SU2/run/adjoint.py
index 8071d61d1b6a..606094cda949 100644
--- a/SU2_PY/SU2/run/adjoint.py
+++ b/SU2_PY/SU2/run/adjoint.py
@@ -93,7 +93,7 @@ def adjoint( config ):
     su2merge(konfig)
     
     # filenames
-    plot_format      = konfig['OUTPUT_FORMAT']
+    plot_format      = konfig.get('TABULAR_FORMAT', 'CSV')
     plot_extension   = su2io.get_extension(plot_format)
     history_filename = konfig['CONV_FILENAME'] + plot_extension
     special_cases    = su2io.get_specialCases(konfig)
diff --git a/SU2_PY/SU2/run/direct.py b/SU2_PY/SU2/run/direct.py
index eb4ae7e74898..fa54184dbb85 100644
--- a/SU2_PY/SU2/run/direct.py
+++ b/SU2_PY/SU2/run/direct.py
@@ -96,7 +96,7 @@ def direct ( config ):
     su2merge(konfig)
     
     # filenames
-    plot_format      = konfig['OUTPUT_FORMAT']
+    plot_format      = konfig.get('TABULAR_FORMAT', 'CSV')
     plot_extension   = su2io.get_extension(plot_format)
     history_filename = konfig['CONV_FILENAME'] + plot_extension
     special_cases    = su2io.get_specialCases(konfig)
diff --git a/SU2_PY/SU2/run/merge.py b/SU2_PY/SU2/run/merge.py
index 5e5c7bd7b0ea..980785ad8bc1 100644
--- a/SU2_PY/SU2/run/merge.py
+++ b/SU2_PY/SU2/run/merge.py
@@ -84,8 +84,6 @@ def merge( config ):
     # # MERGING # #
     if 'FLUID_STRUCTURE_INTERACTION' in multizone_cases:
         merge_multizone(konfig)
-    elif konfig['OUTPUT_FORMAT'] == 'PARAVIEW_BINARY':
-        pass
     else:
         if 'WRT_UNSTEADY' in special_cases:
             merge_unsteady(konfig)
diff --git a/SU2_PY/SU2/run/projection.py b/SU2_PY/SU2/run/projection.py
index 54b027ffaefc..5474caee13b1 100644
--- a/SU2_PY/SU2/run/projection.py
+++ b/SU2_PY/SU2/run/projection.py
@@ -94,7 +94,7 @@ def projection( config, state={}, step = 1e-3 ):
     # filenames
     objective      = konfig['OBJECTIVE_FUNCTION']
     grad_filename  = konfig['GRAD_OBJFUNC_FILENAME']
-    output_format  = konfig['OUTPUT_FORMAT']
+    output_format  = konfig.get('TABULAR_FORMAT', 'CSV')
     plot_extension = su2io.get_extension(output_format)
     adj_suffix     = su2io.get_adjointSuffix(objective)
     grad_plotname  = os.path.splitext(grad_filename)[0] + '_' + adj_suffix + plot_extension    
diff --git a/SU2_PY/SU2/util/plot.py b/SU2_PY/SU2/util/plot.py
index b194e0fbc134..81a2ae074448 100644
--- a/SU2_PY/SU2/util/plot.py
+++ b/SU2_PY/SU2/util/plot.py
@@ -56,7 +56,7 @@ def write_plot(filename,plot_format,data_plot,keys_plot=None):
     keys_space = [default_spacing] * len(keys_plot)
     
     header = ''
-    if (plot_format == 'TECPLOT') or (plot_format == 'TECPLOT_BINARY'):
+    if (plot_format == 'TAB_TECPLOT'):
         header = 'VARIABLES='
         indent_spacing += 10
     indent_spacing = ' '*indent_spacing
@@ -95,8 +95,8 @@ def write_plot(filename,plot_format,data_plot,keys_plot=None):
     return
     
 def tecplot(filename,data_plot,keys_plot=[]):
-    write_plot(filename,'TECPLOT',data_plot,keys_plot)
+    write_plot(filename,'TAB_CSV',data_plot,keys_plot)
 
 def paraview(filename,data_plot,keys_plot=[]):
-    write_plot(filename,'PARAVIEW',data_plot,keys_plot)
+    write_plot(filename,'TAB_CSV',data_plot,keys_plot)
         
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 680b0300a928..e9f712e48f4c 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -293,7 +293,7 @@ SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index a358e85fe1ff..e98b906d3002 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -283,8 +283,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -320,6 +320,7 @@ WRT_CON_FREQ= 1
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) 
 HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF, SENSITIVITY)
 VOLUME_OUTPUT= (COORDINATES, SOLUTION, PRESSURE, TEMPERATURE, SENSITIVITY)
+OUTPUT_FILES=(RESTART_ASCII, PARAVIEW, SURFACE_CSV)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 2687d428c5d4..e1c5119a7224 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -277,8 +277,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 075916e15ca8..21bfd61a7955 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -233,8 +233,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index 9903805f24b3..14201277d6f6 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -240,8 +240,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 37dcc5747496..1f6679ce4903 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -232,8 +232,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 146c7b26a822..ead87acfc8f0 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -245,8 +245,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 0b7412449232..870aa1229830 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -251,7 +251,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 1ff105bb82a4..7bec8d962316 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -236,7 +236,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index d6fe7f1a721a..fe1c94bcd089 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -247,7 +247,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index fd64a852135a..a1af10cda139 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -15,7 +15,7 @@
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
 %
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -308,7 +308,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 3a3f6acce98c..48f5ff5736fd 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -15,7 +15,7 @@
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
 %
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -308,7 +308,7 @@ SOLUTION_FILENAME= bin_solution_flow.dat
 SOLUTION_ADJ_FILENAME= bin_solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index c751d0d06f80..84a0ee1047bf 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -304,7 +304,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index c235f642dbeb..52c68999aff7 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -13,7 +13,7 @@
 %
 % Physical governing equations (EULER, NAVIER_STOKES, NS_PLASMA)
 %                               
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -222,7 +222,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 71fa828b1d7e..77d88ffa9f5f 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -223,8 +223,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 391789a8eab7..fbfc8d23b466 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -223,8 +223,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/coupled_cht/incompressible/configFlow.cfg b/TestCases/coupled_cht/incompressible/configFlow.cfg
index ff756a265bd3..220c3e4fca19 100644
--- a/TestCases/coupled_cht/incompressible/configFlow.cfg
+++ b/TestCases/coupled_cht/incompressible/configFlow.cfg
@@ -117,7 +117,7 @@ CONV_CAUCHY_EPS= 1E-10
 MESH_FILENAME= coupled_cht_cylinder2d.su2
 MESH_FORMAT= SU2
 SOLUTION_FILENAME= solution_flow.dat
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
 RESTART_FILENAME= solution_flow.dat
@@ -125,5 +125,4 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 WRT_LIMITERS= NO
 WRT_SHARPEDGES= NO
-LOW_MEMORY_OUTPUT= NO
 READ_BINARY_RESTART= YES
diff --git a/TestCases/coupled_cht/incompressible/configSolid.cfg b/TestCases/coupled_cht/incompressible/configSolid.cfg
index 47326fe557c3..0b016cb65e34 100644
--- a/TestCases/coupled_cht/incompressible/configSolid.cfg
+++ b/TestCases/coupled_cht/incompressible/configSolid.cfg
@@ -79,7 +79,7 @@ TIME_DISCRE_HEAT= EULER_IMPLICIT
 MESH_FILENAME= coupled_cht_cylinder2d.su2
 MESH_FORMAT= SU2
 SOLUTION_FILENAME= solution_flow.dat
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
 RESTART_FILENAME= solution_flow.dat
@@ -91,5 +91,4 @@ WRT_CON_FREQ_DUALTIME= 100
 WRT_RESIDUALS= YES
 WRT_LIMITERS= NO
 WRT_SHARPEDGES= NO
-LOW_MEMORY_OUTPUT= NO
 READ_BINARY_RESTART= YES
diff --git a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
index edb31330fca0..e525f42d3e60 100644
--- a/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
+++ b/TestCases/coupled_cht/incompressible/coupled_cht_incompressible.cfg
@@ -176,7 +176,7 @@ SOLUTION_FILENAME= solution_flow.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 
 CONV_FILENAME= history
 
@@ -212,6 +212,5 @@ WRT_LIMITERS= NO
 
 WRT_SHARPEDGES= NO
 
-LOW_MEMORY_OUTPUT= NO
 
 READ_BINARY_RESTART= YES
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 3e6e9e8e0250..71e5b10aecdb 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % If Navier-Stokes, kind of turbulent model (NONE, SA)
 KIND_TURB_MODEL= SA
@@ -205,7 +205,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, SLT)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index e4fc5479aabc..1cd16c709eac 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index c831528416f8..0cc30e68c799 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 5268acfefcbc..c04f192a7003 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 526a3184d376..44297c537826 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 48c8e215e53b..0af1d0345704 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 50c3f781ffaa..cefb3cce3b76 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -231,8 +231,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 003d699f815d..73fbdbef8e07 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -274,7 +274,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -327,5 +327,3 @@ WRT_LIMITERS= NO
 % Output the sharp edges detector
 WRT_SHARPEDGES= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 413e74b5a811..3e10f59c3950 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -275,8 +275,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 85ee052de1be..d261d1738fcb 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -286,8 +286,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 0bfa93739b56..8ed5cad953cd 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -254,7 +254,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 9496ec0c6dce..839a3891e9ae 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                        
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -229,7 +229,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -260,7 +260,7 @@ WRT_SOL_FREQ= 250
 %
 % Writing convergence history frequency
 WRT_CON_FREQ= 1
-
+OUTPUT_FILES=(PARAVIEW_ASCII)
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
 % Kind of deformation (TRANSLATION, ROTATION, SCALE,
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 9205eeadbb2f..77486a539af0 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -277,7 +277,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -330,5 +330,3 @@ WRT_LIMITERS= NO
 % Output the sharp edges detector
 WRT_SHARPEDGES= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index 785c6d55def4..b0e187fd2f4e 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -284,7 +284,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -337,5 +337,3 @@ WRT_LIMITERS= NO
 % Output the sharp edges detector
 WRT_SHARPEDGES= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index dc8cc3eded59..a3fda84557ca 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -508,7 +508,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
@@ -564,8 +564,6 @@ WRT_SHARPEDGES= NO
 % Output the solution at each surface in the history file
 WRT_SURFACE= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % Write binary restart files (YES, NO)
 WRT_BINARY_RESTART= YES
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index 6672906a9925..05a1a67ecb19 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -289,7 +289,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
@@ -345,8 +345,6 @@ WRT_SHARPEDGES= NO
 % Output the solution at each surface in the history file
 WRT_SURFACE= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % Write binary restart files (YES, NO)
 WRT_BINARY_RESTART= YES
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 0e110c5979c9..ceb4ecb2e057 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -215,8 +215,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index 30afc86f9508..d634a24859f2 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -59,7 +59,7 @@ WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
index 4800c5e4916b..110917c6ae2b 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/config.cfg
@@ -138,7 +138,7 @@ RESTART_STRUCTURE_FILENAME= solution_solid.dat
 RESTART_ADJ_FILENAME= adjoint_fluid.dat
 RESTART_ADJ_STRUCTURE_FILENAME= adjoint_solid.dat
 %
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 VOLUME_FILENAME= fluid
 VOLUME_ADJ_FILENAME= adjoint_fluid
 SURFACE_FILENAME= surface_fluid
diff --git a/TestCases/disc_adj_fsi/configAD_fsi.cfg b/TestCases/disc_adj_fsi/configAD_fsi.cfg
index eb8a3eee5cfa..331d66c83ce7 100644
--- a/TestCases/disc_adj_fsi/configAD_fsi.cfg
+++ b/TestCases/disc_adj_fsi/configAD_fsi.cfg
@@ -116,7 +116,7 @@ RESTART_ADJ_STRUCTURE_FILENAME= restart_flow_adj.dat
 WRT_SRF_SOL = NO
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index dc3a2cff8c56..cd7b0275ef93 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -203,7 +203,7 @@ SOLUTION_FILENAME= solution_flow.dat
 
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 
 CONV_FILENAME= history
 
@@ -239,7 +239,6 @@ WRT_LIMITERS= NO
 
 WRT_SHARPEDGES= NO
 
-LOW_MEMORY_OUTPUT= NO
 
 %WRT_BINARY_RESTART= NO
 
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 573b50f74603..8d92d54f76d2 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -200,8 +200,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 21f4dc1e92cc..2a3746d8f612 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -273,7 +273,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 3b90bfd2b1b8..ad239e1d6175 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -256,7 +256,7 @@ SOLUTION_FILENAME= solution_flow_sa.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index dc8fa5b80be8..f14540ff0ecf 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -256,7 +256,7 @@ SOLUTION_FILENAME= solution_flow_sst.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index 2627f0c81e84..cbee6ad74b58 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -233,8 +233,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index f4946d103d84..8678569c38bb 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -241,8 +241,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 646de298894f..9e2dd38933ca 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -33,8 +33,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -222,7 +220,7 @@ SOLUTION_FILENAME= solution_flow_sa.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index f6c5da2a3618..03101ebeda39 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -33,8 +33,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -221,7 +219,7 @@ SOLUTION_FILENAME= solution_flow_sst.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index c79ba4855bb0..13abd08a28d7 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -399,7 +399,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index 0232f414a4b2..e27291abf5d6 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -215,8 +215,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 67bf81bcb022..355eb1dba364 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -250,8 +250,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 0479b48887c9..96fc417eb15a 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -174,8 +174,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index f3aac7860714..53b98793ab57 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -195,7 +195,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index ef8d12ca2754..7f3b45c0243e 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -191,7 +191,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index 4241ff2ba82a..7a8a744e5830 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -267,8 +267,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index 8e773d8047bc..3b7998244199 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -180,8 +180,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 81209ffb0215..32bc233fe75a 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -242,8 +242,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 5ec1df9c2c41..b22062fd6583 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -189,8 +189,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 80912f58b8e9..44ea9d2eaac6 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -75,7 +75,7 @@ SOLUTION_FILENAME= solution_solid.dat
 WRT_SOL_FREQ= 999999
 RESTART_FILENAME= restart_solid.dat
 %
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 VOLUME_FILENAME= solid
 %
 WRT_CON_FREQ= 10
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index dfafe4effbeb..e255e2118c55 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -113,7 +113,7 @@ SOLUTION_FILENAME= solution_fluid.dat
 WRT_SOL_FREQ= 999999
 RESTART_FILENAME= restart_fluid.dat
 %
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 VOLUME_FILENAME= fluid
 SURFACE_FILENAME= surface_fluid
 %
diff --git a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
index ab7841c580f9..6a8b9e76ec6b 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/settings.cfg
@@ -161,7 +161,7 @@ WRT_SOL_FREQ= 999999
 RESTART_FILENAME= restart_fluid.dat
 RESTART_STRUCTURE_FILENAME= restart_solid.dat
 %
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 VOLUME_FILENAME= fluid
 SURFACE_FILENAME= surface_fluid
 VOLUME_STRUCTURE_FILENAME= solid
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index deb1b7b5126f..3363bc37d7cf 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -37,7 +37,7 @@ LINEAR_SOLVER_PREC= LU_SGS
 LINEAR_SOLVER_ERROR= 1E-8
 LINEAR_SOLVER_ITER= 1000
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_SRF_SOL = NO
 VOLUME_FILENAME= beam
 RESTART_FILENAME= restart_beam.dat
diff --git a/TestCases/fea_fsi/MixElemsKnowles/config.cfg b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
index c7fb34f98458..a239c9d29f1b 100644
--- a/TestCases/fea_fsi/MixElemsKnowles/config.cfg
+++ b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
@@ -47,7 +47,7 @@ INNER_ITER= 1
 % In/Out
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_structure.dat
 
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 33663b2d553d..32437c0286d9 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -222,8 +222,8 @@ MARKER_MONITORING= ( UpperBeam, RightBeam, LowerBeam)
 % --------------------------- INPUT / OUTPUT ----------------------------------%
 % -----------------------------------------------------------------------------%
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file flow (w/o extension) variables
 VOLUME_FILENAME= results_flow
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index 27a49f810d82..f023727db05f 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -25,7 +25,7 @@ LINEAR_SOLVER_PREC= LU_SGS
 LINEAR_SOLVER_ERROR= 1E-8
 LINEAR_SOLVER_ITER= 500
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_SRF_SOL = NO
 CONV_FILENAME= history_beam
 VOLUME_FILENAME= beam
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
index ffde91afec89..5376d9ccc17b 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI_2D.cfg
@@ -93,7 +93,7 @@ DEFORM_LINEAR_SOLVER_PREC= LU_SGS
 DEFORM_LINEAR_ITER= 500
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_CON_FREQ= 100
 WRT_CON_FREQ_DUALTIME= 100
 WRT_SOL_FREQ= 100
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index a75e0f90647d..c6411fefe49a 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -72,7 +72,7 @@ DEFORM_LINEAR_ITER= 500
 DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
 WRT_SOL_FREQ= 1
diff --git a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
index 4f1d815291ea..07bcd69468ea 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
@@ -45,7 +45,7 @@ MARKER_FLUID_LOAD= ( wallDownS, wallUpperS, 0.0, wallUpwS, 0.0)
 MESH_FILENAME= meshFEA.su2
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 
 WRT_CON_FREQ= 100
 WRT_CON_FREQ_DUALTIME= 100
diff --git a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
index 602c279a92e9..5043085f3380 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
@@ -70,7 +70,7 @@ DEFORM_LINEAR_SOLVER_ITER = 5000
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_CON_FREQ= 100
 WRT_CON_FREQ_DUALTIME= 100
 WRT_SOL_FREQ= 100
diff --git a/TestCases/fea_fsi/stat_fsi/configFEA.cfg b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
index 0e1c2ad2f049..fee60e5af14d 100755
--- a/TestCases/fea_fsi/stat_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
@@ -88,6 +88,6 @@ MARKER_FLUID_LOAD = (wallS)
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index 9121ea940c77..48e87e03f5c5 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -136,6 +136,6 @@ CONV_CAUCHY_EPS= 1E-5
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/fea_topology/config.cfg b/TestCases/fea_topology/config.cfg
index 3c70e217c1ae..7b7f410d056d 100644
--- a/TestCases/fea_topology/config.cfg
+++ b/TestCases/fea_topology/config.cfg
@@ -93,7 +93,7 @@ DISCADJ_LIN_PREC= ILU
 % In/Out
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 WRT_SOL_FREQ= 9999
 WRT_CON_FREQ= 1
 SOLUTION_ADJ_FILENAME= solution_adj.dat
diff --git a/TestCases/fea_topology/quick_start/settings.cfg b/TestCases/fea_topology/quick_start/settings.cfg
index 1d3bb8e8e499..b50e9def37a9 100644
--- a/TestCases/fea_topology/quick_start/settings.cfg
+++ b/TestCases/fea_topology/quick_start/settings.cfg
@@ -47,7 +47,7 @@ LINEAR_SOLVER_ITER= 1000
 % In/Out
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 VOLUME_STRUCTURE_FILENAME= direct
 VOLUME_ADJ_STRUCTURE_FILENAME= adjoint
diff --git a/TestCases/fea_topology/quick_start/settings_refnode.cfg b/TestCases/fea_topology/quick_start/settings_refnode.cfg
index 5e7643add94f..bad3c9751396 100644
--- a/TestCases/fea_topology/quick_start/settings_refnode.cfg
+++ b/TestCases/fea_topology/quick_start/settings_refnode.cfg
@@ -49,7 +49,7 @@ DISCADJ_LIN_PREC= ILU
 % In/Out
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 VOLUME_STRUCTURE_FILENAME= direct
 VOLUME_ADJ_STRUCTURE_FILENAME= adjoint
diff --git a/TestCases/fea_topology/quick_start/settings_volfrac.cfg b/TestCases/fea_topology/quick_start/settings_volfrac.cfg
index a36ebeb2f6fe..b6177a662b50 100644
--- a/TestCases/fea_topology/quick_start/settings_volfrac.cfg
+++ b/TestCases/fea_topology/quick_start/settings_volfrac.cfg
@@ -46,7 +46,7 @@ DISCADJ_LIN_PREC= ILU
 % In/Out
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 VOLUME_STRUCTURE_FILENAME= direct
 VOLUME_ADJ_STRUCTURE_FILENAME= adjoint
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 002c2199a43c..37580bd2358f 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -280,8 +280,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 76460b290b16..eed68dd71c3b 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -285,8 +285,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index 9a16e73e3e1f..50a6a1f34933 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -249,7 +249,7 @@ SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 5dc5c30c7fc6..69d14cdc22ef 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -288,8 +288,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 52e1562cd8b5..e2bb5479cdbd 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION,FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -228,8 +228,8 @@ MESH_OUT_FILENAME= mesh_out.su2
 % Restart flow input file
 SOLUTION_FILENAME= restart_flow.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 722cc461c6e7..b56e2dbc5d5d 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -155,9 +155,9 @@ SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
-%OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
+%TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index e3abd582d9f9..7e135cd553cc 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -154,9 +154,9 @@ SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
-%OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
+%TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 8b7dc1be4773..ca2505d08176 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -154,9 +154,9 @@ SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
-%OUTPUT_FORMAT= PARAVIEW
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
+%TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index 49d3365c10e9..11271e71d4b1 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -149,8 +149,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index 243f2b4281c2..5f851a8a38c9 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -156,8 +156,8 @@ SOLUTION_FILENAME= solution_flow.dat_FullyConverged
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 6b5629ded8fc..9749842c6ecb 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -160,8 +160,8 @@ SOLUTION_FILENAME= solution_flow_naca0012.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index bdd0c93b8d58..3da9645c1387 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index f1a3151329f3..a7e8b4fe01f0 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index 322352fad437..855979cb5516 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index ed2aa9fda190..d839246cbc36 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index bbd86aa874cb..38ec92d1671b 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index 200708817126..a0bbae44e929 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 9b48ee6b109f..471c101e3e53 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 1f42077fb0e4..7366214878a7 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index e4d8118168da..9bf0517eee8a 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index aa102ffe4cdb..abd0968dc1ab 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 0042917b2d09..9afcb47a579f 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 3cf9492cb363..dd3fc378315d 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -146,8 +146,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index a3191cf83959..7a4b80ee8040 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -149,8 +149,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index 2c4ea64df852..ba18af864761 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -153,8 +153,8 @@ SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index 096c79aedcb0..a11a3dee05d5 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -159,8 +159,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index d86799090892..262c73f661b3 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -152,8 +152,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index d149d4abd0de..73a6d673507b 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -159,8 +159,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index 81c9096f5897..c9d6b0980fef 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -152,8 +152,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 12cf6b1f9667..51dc50d8194f 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -159,8 +159,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index fc83556b93ee..d8fa1691154f 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -152,8 +152,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index 49a77dcb0bf7..aa39f761f85b 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -153,8 +153,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 0a4869a1c0b0..3592e124de09 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -163,7 +163,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 50f5547a9cdf..1c71ce6e99b0 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -154,8 +154,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index a1904bb67b90..6a2b0a32da36 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -177,8 +177,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 56622cb4c21d..33e73e50c120 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -170,8 +170,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index 9185aa26d4d7..c09ea945ff2a 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -184,8 +184,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index 74574f92c6c8..2f536d21b528 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -176,8 +176,8 @@ MESH_FORMAT= SU2
 % Restart flow input file
 SOLUTION_FILENAME= solution_flow.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index dadef3edaf87..e11c88be9756 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -194,7 +194,7 @@ SOLUTION_FILENAME= solution_flow.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
diff --git a/TestCases/incomp_navierstokes/bend/lam_bend.cfg b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
index f349754549ce..3b7206b08a79 100755
--- a/TestCases/incomp_navierstokes/bend/lam_bend.cfg
+++ b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
@@ -223,8 +223,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 089eea6c593e..7003f39cf3ee 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -235,7 +235,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 47d990be935e..0ae6cd276a85 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -171,8 +171,8 @@ MESH_FORMAT= SU2
 % Restart flow input file
 SOLUTION_FILENAME= solution_flow.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 4887d546553c..17b16456b5e0 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -260,7 +260,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 428449d02ea0..9d61976d2b07 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -311,8 +311,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 379a0a5a79e8..d92999b969e8 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -219,7 +219,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
index 9e9f69828f7d..90c94d7edd3d 100644
--- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST_SUST
@@ -216,7 +216,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index b23045eb1caf..50212e85eb9f 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -147,8 +147,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index 5fb16472af1a..c310caa6aeb6 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -165,8 +165,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index 2e11cdb248d0..de820fac4f29 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -164,8 +164,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index 6e06b1bf5c68..5beb1aff6534 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -193,7 +193,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index af5894057d11..96012707b413 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -215,7 +215,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index 1bbb1898f3b7..788772eb8238 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -232,7 +232,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index fb6b170bc5a3..e802c60b9c41 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -202,7 +202,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 45ff51afbd50..98f66ba40237 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -219,7 +219,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 2062d67a928f..9441c2c6cb0a 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -292,8 +292,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT 
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV 
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 81d99a234f73..7385fa9b9d73 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -194,7 +194,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index bfc756699bea..51c3909dd8fa 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -189,7 +189,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index b0c3961e566e..f76540334c22 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -206,7 +206,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index e1bedd0e0e14..7dcb0ff6e1c7 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -181,7 +181,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 934cff3f38e2..c09d8828c46d 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -232,7 +232,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index f669464ebd7e..14150daad8b7 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -264,7 +264,7 @@ SOLUTION_FILENAME= solution_flow_profile.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 6dec21367c22..54d4278fc6a4 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                         
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -290,7 +290,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 6e6230dd2c6c..d0551ce250fc 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -289,7 +289,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 00ad3be6c5c7..82abf05b0582 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -210,7 +210,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 0d3e30ed4116..7d695f3b0f00 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -210,7 +210,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index b5233e12a308..ef13c33b0cf1 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -242,8 +242,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -280,6 +280,8 @@ WRT_BINARY_RESTART = NO
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
+%
+OUTPUT_FILES= (RESTART_ASCII, PARAVIEW, SURFACE_CSV)
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 62398a411deb..9b3ee0209d0c 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -243,8 +243,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -281,6 +281,9 @@ WRT_BINARY_RESTART = NO
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
+%
+% Output files
+OUTPUT_FILES = (RESTART_ASCII, PARAVIEW, SURFACE_CSV)
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 1528f3c99a30..1515dec83ae3 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -243,8 +243,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -281,6 +281,9 @@ WRT_BINARY_RESTART = NO
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
+%
+% Output files 
+OUTPUT_FILES= (RESTART_ASCII, PARAVIEW, SURFACE_CSV)
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 228af4e75968..c2f05873f3ab 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -245,8 +245,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 78e02e95bea6..f1ab985e9403 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -248,8 +248,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index ba52e4bcc5db..d84ffff29aa1 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -304,8 +304,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index dc318e491acd..39b739403fa5 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -283,8 +283,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index 2218a5b7a9c0..86286b734805 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -274,7 +274,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index f29c607e84f6..f68661bf3596 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -263,8 +263,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index 8805b191a44e..ca414bdc5c99 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -275,8 +275,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -319,7 +319,9 @@ WRT_HALO= NO
 %
 % History output
 HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF)
-
+%
+OUTPUT_FILES= (RESTART_ASCII, PARAVIEW, SURFACE_CSV)
+%
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 485203b4ed00..7c75b2c12449 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -257,8 +257,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index 6be78def0d66..9a2d746347a2 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -241,8 +241,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
@@ -279,6 +279,8 @@ WRT_CON_FREQ= 1
 %
 % Writing convergence history frequency (dual time, only written to screen)
 WRT_CON_FREQ_DUALTIME= 10
+%
+OUTPUT_FILES=(RESTART, PARAVIEW, SURFACE_CSV)
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 127631c0638f..7bd0856dd6fd 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -241,8 +241,8 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 % Mesh input file format (SU2)
 MESH_FORMAT= SU2
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history
 CONV_FILENAME= history
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index a53a8b26b980..8119dd5f7ea3 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -320,8 +320,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= restart_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index 7b7b54440100..137c4d7f1fc8 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -344,7 +344,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index c61b2a23352e..a260161ac5cb 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -291,7 +291,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 91314593ad64..4c069c4a8731 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -236,7 +236,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 8a865ca1a0f3..dbc9b284e0d3 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -281,8 +281,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
index ebd60ffac48d..89ed78b53637 100644
--- a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
+++ b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
@@ -56,7 +56,7 @@ WRT_SRF_SOL = NO
 WRT_CSV_SOL = NO
 
 MESH_FORMAT= SU2
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 
 WRT_CON_FREQ= 1
 WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
index d0e6d6d7cb8b..650670e6e949 100644
--- a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
+++ b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
@@ -138,7 +138,7 @@ MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 RESTART_FILENAME= restart_flow.dat
 
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 
 VOLUME_FILENAME= flow
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index e5936b361d5f..1346723055cf 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -491,7 +491,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
@@ -547,8 +547,6 @@ WRT_SHARPEDGES= NO
 % Output the solution at each surface in the history file
 WRT_SURFACE= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % Write binary restart files (YES, NO)
 WRT_BINARY_RESTART= YES
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index a2f05619689e..45b800e93de8 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -472,7 +472,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
@@ -528,8 +528,6 @@ WRT_SHARPEDGES= NO
 % Output the solution at each surface in the history file
 WRT_SURFACE= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % Write binary restart files (YES, NO)
 WRT_BINARY_RESTART= YES
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index 20eb8dec3492..131cadf8fcdb 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % If Navier-Stokes, kind of turbulent model (NONE, SA)
 KIND_TURB_MODEL= SA
@@ -215,7 +215,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, SLT)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index 35084bb29bc3..ac40112d2b7c 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % If Navier-Stokes, kind of turbulent model (NONE, SA)
 KIND_TURB_MODEL= SST
@@ -212,7 +212,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, SLT)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 653c0479699b..9c53745856f6 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -32,8 +32,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
@@ -224,7 +222,7 @@ SOLUTION_FILENAME= solution_flow_sa.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index f0508334e1ea..e570551f7bee 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -38,8 +38,6 @@ WRT_BINARY_RESTART= YES
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
@@ -230,7 +228,7 @@ SOLUTION_FILENAME= solution_flow_sa_bin.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index 42fd45901b65..b9b854ed6d82 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA_NEG
@@ -26,8 +26,6 @@ MATH_PROBLEM= DIRECT
 % Restart solution (NO, YES)
 RESTART_SOL= YES
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= YES
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -215,7 +213,7 @@ SOLUTION_FILENAME= solution_flow_sa.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index da7cfc65d8d4..bfa4a67aa2ce 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -32,8 +32,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
@@ -223,7 +221,7 @@ SOLUTION_FILENAME= solution_flow_sst.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index a792cde0bfff..940012cafe22 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -16,7 +16,7 @@
 %                               TNE2_EULER, TNE2_NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulence model (NONE, SA, SST)
 KIND_TURB_MODEL= SST
@@ -360,8 +360,8 @@ SOLUTION_FILENAME= solution_flow_sst_restart.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT_BINARY
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
index 25451282f622..11c5fc777071 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST_SUST
@@ -32,8 +32,6 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
@@ -226,7 +224,7 @@ SOLUTION_FILENAME= solution_flow_sst_sust.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index f0806f8ac2b9..19f10d1f9956 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)          
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulence model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -252,7 +252,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 1fec6b66c210..aecb8e74d91c 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -12,7 +12,7 @@
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Physical governing equations (EULER, NAVIER_STOKES)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulence model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -237,7 +237,7 @@ SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
 %                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -290,8 +290,6 @@ WRT_LIMITERS= NO
 % Output the sharp edges detector
 WRT_SHARPEDGES= NO
 %
-% Minimize the required output memory
-LOW_MEMORY_OUTPUT= NO
 %
 %
 % Screen output fields
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index 7dc561950e4c..09d1592e9a1d 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                        
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 3c59222e152c..c1dae33a56cb 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                          
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -207,7 +207,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
index 462dd79284e9..36b56d24464d 100644
--- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                          
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST, SST_SUST)
 KIND_TURB_MODEL= SST_SUST
@@ -203,7 +203,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index 2d0108c8a18e..f5a023105cdd 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -201,7 +201,7 @@ SOLUTION_LIN_FILENAME= trans_solution_lin.dat
 SOLUTION_ADJ_FILENAME= trans_solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= trans_history
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index 0fda0ff4a5b9..13424e120b0e 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                   
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -212,7 +212,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index bd95d5c56b83..38a3446b6394 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                         
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -219,7 +219,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index aeca27a5c30a..8f67d947faa0 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -211,7 +211,7 @@ SOLUTION_FILENAME= solution_flow_sst.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index d0fe7f843eed..ba81b55bff5c 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 8bcd6c8a7d25..4d2b24044495 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 8ea4bf039d0f..3dfaa50c4f85 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 6a72fa304ae3..5917a5c53e12 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index 986e89f228ff..18528ed6562b 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 4a2b4bbf8333..82db97c1cff0 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -199,8 +199,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 24aa20c56cbb..3850a936fb9c 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -296,7 +296,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index b31b10e1237b..7a1a9cbdf7d9 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -302,7 +302,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 893fb7ee810a..0c11516ed457 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -216,7 +216,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 55d8bcc3ece4..16930aa9718e 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -214,7 +214,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 6f90610183b1..bde13568ebb9 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -216,7 +216,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index e877a9a9cda0..85f5d747e11d 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -214,7 +214,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 9eefa3a63913..694d12ac692a 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -118,7 +118,7 @@ MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history_converge
 
 RESTART_FILENAME= restart_flow.dat
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index 07703b2d4e56..88fecf2fb3eb 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -124,7 +124,7 @@ MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 
 RESTART_FILENAME= restart_flow.dat
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 7de5b0bf46ba..1a46e22fda5e 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -122,7 +122,7 @@ MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 
 RESTART_FILENAME= restart_flow.dat
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 414affbc7cbe..b3873938ef93 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -132,7 +132,7 @@ MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 
 RESTART_FILENAME= restart_flow.dat
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 9227f34e85d3..f4e5a9dc1a3b 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -221,7 +221,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index c5dbeb9bf9b9..276de07977c5 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -220,7 +220,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index a343c93c4fd7..0c2a4dda36a8 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -219,7 +219,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 7b3ff744574b..9911c580bb90 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -221,7 +221,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index d7a4e705497b..14a23937bf7d 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -265,7 +265,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index d711614dfa62..e231aa261af1 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -264,7 +264,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index b81c0a85693a..296594694862 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -222,7 +222,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 3e83eaa4afe4..8ee81a64d3c7 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -222,7 +222,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW	
+TABULAR_FORMAT= CSV	
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 86f486fca86c..b32195abce41 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -219,7 +219,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index e13c3e17225e..961758c2d7ab 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -219,7 +219,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= PARAVIEW
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index dff57bc088c2..a867d88d90b1 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -211,7 +211,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index d8902a0d38bd..3f09057081f9 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -247,7 +247,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index eacd45f54cb0..ea56609ab479 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -15,7 +15,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, LINEAR_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
@@ -230,7 +230,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index 132b2158f59a..1362b58f30f2 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -315,7 +315,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 1bab17bab76c..f16bd867d18b 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -320,7 +320,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index c484069a4a13..a868f32f19e6 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -309,7 +309,7 @@ SOLUTION_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 936989eedc9a..74d9c8dfc22f 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -346,7 +346,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index fffa23c0caca..757be80790e9 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -354,7 +354,7 @@ MESH_OUT_FILENAME= su2mesh_per.su2
 SOLUTION_FILENAME= restart_flow.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 44a8f4802181..73a7326e7bbd 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -317,7 +317,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index 184c432e1054..329a81058e2e 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -322,7 +322,7 @@ SOLUTION_FILENAME= solution_flow_sst.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
index ea4e0c9dd6df..94a6971466cb 100644
--- a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
+++ b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
@@ -1,6 +1,6 @@
 % ------------------------- PHYSICAL PROBLEM ----------------------------------%
 %
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 KIND_TURB_MODEL= SA
 MATH_PROBLEM= DIRECT
 RESTART_SOL= NO
@@ -104,7 +104,7 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 CONV_FILENAME= history
 RESTART_FILENAME= solution_flow.dat
 RESTART_ADJ_FILENAME= solution_adj.dat
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index 378fae5efcaa..494b08ffb7a6 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -296,8 +296,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index a7c270059ab6..99b0378ae5a3 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -320,8 +320,8 @@ SOLUTION_FILENAME= restart_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= restart_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index e5ae0f83f84c..55af6c78a076 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -220,7 +220,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT, STL)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 9ba9b9aa95d4..32ccd237de0a 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % If Navier-Stokes, kind of turbulent model (NONE, SA)
 KIND_TURB_MODEL= SST
@@ -234,8 +234,8 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= TECPLOT
+% Output tabular format (CSV, TECPLOT)
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history

From f30a8bff48613c92ebadf46b2a193751418b7f52 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 12 Sep 2019 14:35:11 +0200
Subject: [PATCH 465/539] Added some new error messages and fixed some bugs

---
 Common/include/config_structure.hpp          |  6 ++
 Common/include/config_structure.inl          |  2 +
 Common/src/config_structure.cpp              | 44 +++++++++------
 SU2_CFD/include/drivers/CMultizoneDriver.hpp |  4 +-
 SU2_CFD/include/output/CFlowOutput.hpp       |  3 +-
 SU2_CFD/src/drivers/CMultizoneDriver.cpp     | 59 ++++++++++++++++++--
 SU2_CFD/src/solver_structure.cpp             | 18 +++---
 7 files changed, 105 insertions(+), 31 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index c24611b2d06f..7d73c03bb627 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -9210,6 +9210,12 @@ class CConfig {
    */
   unsigned short GetPastixFillLvl(void);
 
+  /*!
+   * \brief Check if an option is present in the config file
+   * \param[in] - Name of the option
+   * \return <TRUE> if option was set in the config file
+   */
+  bool OptionIsSet(string option);
 };
 
 #include "config_structure.inl"
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index 581d5e92936c..c7ec3eba0dae 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2069,3 +2069,5 @@ inline unsigned long CConfig::GetVolume_Wrt_Freq() {return VolumeWrtFreq;}
 inline unsigned short* CConfig::GetVolumeOutputFiles() {return VolumeOutputFiles;}
 
 inline unsigned short CConfig::GetnVolumeOutputFiles() {return nVolumeOutputFiles;}
+
+inline bool CConfig::OptionIsSet(string option){ return all_options.find(option) == all_options.end();}
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 309a7a29a9ed..3b808a10cba5 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -2562,20 +2562,6 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
           newString.append(": invalid option name");
           newString.append(". Check current SU2 options in config_template.cfg.");
           newString.append("\n");
-          if (!option_name.compare("AD_COEFF_FLOW")) newString.append("AD_COEFF_FLOW= (1st, 2nd, 4th) is now JST_SENSOR_COEFF= (2nd, 4th).\n");
-          if (!option_name.compare("AD_COEFF_ADJFLOW")) newString.append("AD_COEFF_ADJFLOW= (1st, 2nd, 4th) is now ADJ_JST_SENSOR_COEFF= (2nd, 4th).\n");
-          if (!option_name.compare("SPATIAL_ORDER_FLOW")) newString.append("SPATIAL_ORDER_FLOW is now the boolean MUSCL_FLOW and the appropriate SLOPE_LIMITER_FLOW.\n");
-          if (!option_name.compare("SPATIAL_ORDER_ADJFLOW")) newString.append("SPATIAL_ORDER_ADJFLOW is now the boolean MUSCL_ADJFLOW and the appropriate SLOPE_LIMITER_ADJFLOW.\n");
-          if (!option_name.compare("SPATIAL_ORDER_TURB")) newString.append("SPATIAL_ORDER_TURB is now the boolean MUSCL_TURB and the appropriate SLOPE_LIMITER_TURB.\n");
-          if (!option_name.compare("SPATIAL_ORDER_ADJTURB")) newString.append("SPATIAL_ORDER_ADJTURB is now the boolean MUSCL_ADJTURB and the appropriate SLOPE_LIMITER_ADJTURB.\n");
-          if (!option_name.compare("LIMITER_COEFF")) newString.append("LIMITER_COEFF is now VENKAT_LIMITER_COEFF.\n");
-          if (!option_name.compare("SHARP_EDGES_COEFF")) newString.append("SHARP_EDGES_COEFF is now ADJ_SHARP_LIMITER_COEFF.\n");
-          if (!option_name.compare("DEFORM_TOL_FACTOR")) newString.append("DEFORM_TOL_FACTOR is no longer used.\n Set DEFORM_LINEAR_SOLVER_ERROR to define the minimum residual for grid deformation.\n");
-          if (!option_name.compare("MOTION_FILENAME")) newString.append("MOTION_FILENAME is now DV_FILENAME.\n");
-          if (!option_name.compare("BETA_DELTA")) newString.append("BETA_DELTA is now UQ_DELTA_B.\n");
-          if (!option_name.compare("COMPONENTALITY")) newString.append("COMPONENTALITY is now UQ_COMPONENT.\n");
-          if (!option_name.compare("PERMUTE")) newString.append("PERMUTE is now UQ_PERMUTE.\n");
-          if (!option_name.compare("URLX")) newString.append("URLX is now UQ_URLX.\n");
           if (!option_name.compare("EXT_ITER")) newString.append("Option EXT_ITER is deprecated as of v7.0. Please use TIME_ITER, OUTER_ITER or ITER \n"
                                                                  "to specify the number of time iterations, outer multizone iterations or iterations, respectively.");
           if (!option_name.compare("UNST_TIMESTEP")) newString.append("UNST_TIMESTEP is now TIME_STEP.\n");
@@ -2891,6 +2877,28 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   if (nZone > 1){
     Multizone_Problem = YES;
   }
+  
+  /*--- Set the default output files ---*/
+  if (nVolumeOutputFiles == 0){
+    nVolumeOutputFiles = 3;
+    VolumeOutputFiles = new unsigned short[nVolumeOutputFiles];
+    VolumeOutputFiles[0] = RESTART_BINARY;
+    VolumeOutputFiles[1] = PARAVIEW_BINARY;
+    VolumeOutputFiles[2] = SURFACE_PARAVIEW_BINARY;
+  }
+  
+  if (Kind_Solver == NAVIER_STOKES && Kind_Turb_Model != NONE){
+    SU2_MPI::Error("KIND_TURB_MODEL must be NONE if SOLVER= NAVIER_STOKES", CURRENT_FUNCTION);
+  }
+  if (Kind_Solver == INC_NAVIER_STOKES && Kind_Turb_Model != NONE){
+    SU2_MPI::Error("KIND_TURB_MODEL must be NONE if SOLVER= INC_NAVIER_STOKES", CURRENT_FUNCTION);
+  }
+  if (Kind_Solver == RANS && Kind_Turb_Model == NONE){
+    SU2_MPI::Error("A turbulence model must be specified with KIND_TURB_MODEL if SOLVER= RANS", CURRENT_FUNCTION);
+  }
+  if (Kind_Solver == INC_RANS && Kind_Turb_Model == NONE){
+    SU2_MPI::Error("A turbulence model must be specified with KIND_TURB_MODEL if SOLVER= INC_RANS", CURRENT_FUNCTION);
+  }
 
 #ifndef HAVE_TECIO
   if (Output_FileFormat == TECPLOT_BINARY) {
@@ -3302,6 +3310,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   if (Time_Domain){
     Delta_UnstTime = Time_Step;
     Delta_DynTime  = Time_Step;
+    /*--- Set the default write frequency to 1 if unsteady ---*/
+    if (!OptionIsSet("OUTPUT_WRT_FREQ")){
+      VolumeWrtFreq = 1;
+    }
   }
   
   if (!Multizone_Problem){
@@ -3310,14 +3322,14 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     if (!Time_Domain){
       /*--- If not running multizone or unsteady, INNER_ITER and ITER are interchangeable,
        * but precedence will be given to INNER_ITER if both options are present. ---*/
-      if (all_options.find("INNER_ITER") != all_options.end()){
+      if (!OptionIsSet("INNER_ITER")){
         nInnerIter = nIter;
       }
     }
   }
   
   
-  if ((Multizone_Problem || Time_Domain) && all_options.find("ITER") == all_options.end()){
+  if ((Multizone_Problem || Time_Domain) && OptionIsSet("ITER")){
     SU2_MPI::Error("ITER must not be used when running multizone and/or unsteady problems.\n"
                    "Use TIME_ITER, OUTER_ITER or INNER_ITER to specify number of time iterations,\n"
                    "outer iterations or inner iterations, respectively.", CURRENT_FUNCTION);
diff --git a/SU2_CFD/include/drivers/CMultizoneDriver.hpp b/SU2_CFD/include/drivers/CMultizoneDriver.hpp
index 950a50b16ece..5be1d0e9601f 100644
--- a/SU2_CFD/include/drivers/CMultizoneDriver.hpp
+++ b/SU2_CFD/include/drivers/CMultizoneDriver.hpp
@@ -138,5 +138,7 @@ class CMultizoneDriver : public CDriver {
    * \return Boolean that determines whether the mesh needs to be updated for this particular transfer
    */
   bool Transfer_Data(unsigned short donorZone, unsigned short targetZone);
+  
+  bool Monitor(unsigned long TimeIter);
 
-};
\ No newline at end of file
+};
diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index fbccd40276ec..792f4de345b3 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -51,7 +51,8 @@ class CFlowOutput : public COutput{
    * \brief Destructor of the class.
    */
   ~CFlowOutput(void) override;
-  
+
+protected:
   /*!
    * \brief Add flow surface output fields
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index ed3d2ea95423..f0df45300c43 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -185,7 +185,7 @@ void CMultizoneDriver::StartSolver() {
 
     /*--- Monitor the computations after each iteration. ---*/
 
-    Monitor(TimeIter);
+    StopCalc = Monitor(TimeIter);
 
     /*--- Output the solution in files. ---*/
 
@@ -320,9 +320,6 @@ void CMultizoneDriver::Run_GaussSeidel() {
 
     }
 
-    /*--- This is temporary. Each zone has to be monitored independently. Right now, fixes CHT output. ---*/
-    Monitor(iOuter_Iter);
-
     Convergence = OuterConvergence(iOuter_Iter);
 
     if (Convergence) break;
@@ -629,3 +626,57 @@ bool CMultizoneDriver::Transfer_Data(unsigned short donorZone, unsigned short ta
 
   return UpdateMesh;
 }
+
+bool CMultizoneDriver::Monitor(unsigned long TimeIter){
+  
+  unsigned long nOuterIter, OuterIter, nTimeIter;
+  su2double MaxTime, CurTime;
+  bool TimeDomain, InnerConvergence, FinalTimeReached, MaxIterationsReached;
+  
+  OuterIter  = driver_config->GetOuterIter();
+  nOuterIter = driver_config->GetnOuter_Iter();
+  nTimeIter  = driver_config->GetnTime_Iter();
+  MaxTime    = driver_config->GetMax_Time();
+  CurTime    = driver_output->GetHistoryFieldValue("CUR_TIME");
+  
+  TimeDomain = driver_config->GetTime_Domain();
+  
+  
+  /*--- Check whether the inner solver has converged --- */
+
+  if (TimeDomain == NO){
+    
+    InnerConvergence     = driver_output->GetConvergence();    
+    MaxIterationsReached = OuterIter+1 >= nOuterIter;
+        
+    if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
+      cout << endl << "----------------------------- Solver Exit -------------------------------";
+      if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
+      else cout << endl << "Maximum number of iterations reached (OUTER_ITER = " << nOuterIter << " )." << endl;
+      cout << "-------------------------------------------------------------------------" << endl;
+    }
+    
+    StopCalc = MaxIterationsReached || InnerConvergence;
+  }
+
+
+  if (TimeDomain == YES) {
+    
+    /*--- Check whether the outer time integration has reached the final time ---*/
+  
+    FinalTimeReached     = CurTime >= MaxTime;
+    MaxIterationsReached = TimeIter+1 >= nTimeIter;    
+    
+    if ((FinalTimeReached || MaxIterationsReached) && (rank == MASTER_NODE)){
+      cout << endl << "----------------------------- Solver Exit -------------------------------";
+      if (FinalTimeReached) cout << endl << "Maximum time reached (MAX_TIME = " << MaxTime << "s)." << endl;
+      else cout << endl << "Maximum number of time iterations reached (TIME_ITER = " << nTimeIter << ")." << endl;
+      cout << "-------------------------------------------------------------------------" << endl;      
+    }
+    
+    StopCalc = FinalTimeReached || MaxIterationsReached;
+  }
+
+  return StopCalc;
+  
+}
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index 5aede76a123c..a2cf23a45625 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -5477,13 +5477,14 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     filename = config->GetSolution_FileName();
   }
 
-  /*--- Multizone problems require the number of the zone to be appended. ---*/
-  
-  filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
 
   /*--- Read only the number of variables in the restart file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
+    
+    /*--- Multizone problems require the number of the zone to be appended. ---*/
+    
+    filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
 
     char fname[100];
     strcpy(fname, filename.c_str());
@@ -5616,6 +5617,10 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     
 #endif
   } else {
+    
+    /*--- Multizone problems require the number of the zone to be appended. ---*/
+    
+    filename = config->GetFilename(filename, ".csv", config->GetTimeIter());
 
     /*--- First, check that this is not a binary restart file. ---*/
 
@@ -5710,12 +5715,7 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
 
     getline (restart_file, text_line);
 
-    stringstream ss(text_line);
-    fields.clear();
-    while (ss >> Tag) {
-      fields.push_back(Tag);
-      if (ss.peek() == ',') ss.ignore();
-    }
+    fields = PrintingToolbox::split(text_line, ',');
 
     /*--- Close the file (the solution date is read later). ---*/
     

From 825fb0de72e4c74351136d765a0c9d5ac32dfbb6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 12 Sep 2019 14:44:15 +0200
Subject: [PATCH 466/539] Further fixes

---
 QuickStart/inv_NACA0012.cfg                    | 5 +++--
 TestCases/fea_fsi/WallChannel_2d/configFSI.cfg | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index 6aabc38b8952..25ef1b974c9e 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -271,7 +271,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (TECPLOT, PARAVIEW, TECPLOT_BINARY)
-OUTPUT_FORMAT= TECPLOT
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
@@ -336,5 +336,6 @@ OPT_OBJECTIVE= DRAG * 0.001
 % ex= (Objective = Value ) * Scale, use '>','<','='
 OPT_CONSTRAINT= ( LIFT > 0.328188 ) * 0.001; ( MOMENT_Z > 0.034068 ) * 0.001; ( AIRFOIL_THICKNESS > 0.11 ) * 0.001
 %
+
 % Optimization design variables, separated by semicolons
-DEFINITION_DV= ( 1, 1.0 | airfoil | 0, 0.05 ); ( 1, 1.0 | airfoil | 0, 0.10 ); ( 1, 1.0 | airfoil | 0, 0.15 ); ( 1, 1.0 | airfoil | 0, 0.20 ); ( 1, 1.0 | airfoil | 0, 0.25 ); ( 1, 1.0 | airfoil | 0, 0.30 ); ( 1, 1.0 | airfoil | 0, 0.35 ); ( 1, 1.0 | airfoil | 0, 0.40 ); ( 1, 1.0 | airfoil | 0, 0.45 ); ( 1, 1.0 | airfoil | 0, 0.50 ); ( 1, 1.0 | airfoil | 0, 0.55 ); ( 1, 1.0 | airfoil | 0, 0.60 ); ( 1, 1.0 | airfoil | 0, 0.65 ); ( 1, 1.0 | airfoil | 0, 0.70 ); ( 1, 1.0 | airfoil | 0, 0.75 ); ( 1, 1.0 | airfoil | 0, 0.80 ); ( 1, 1.0 | airfoil | 0, 0.85 ); ( 1, 1.0 | airfoil | 0, 0.90 ); ( 1, 1.0 | airfoil | 0, 0.95 ); ( 1, 1.0 | airfoil | 1, 0.05 ); ( 1, 1.0 | airfoil | 1, 0.10 ); ( 1, 1.0 | airfoil | 1, 0.15 ); ( 1, 1.0 | airfoil | 1, 0.20 ); ( 1, 1.0 | airfoil | 1, 0.25 ); ( 1, 1.0 | airfoil | 1, 0.30 ); ( 1, 1.0 | airfoil | 1, 0.35 ); ( 1, 1.0 | airfoil | 1, 0.40 ); ( 1, 1.0 | airfoil | 1, 0.45 ); ( 1, 1.0 | airfoil | 1, 0.50 ); ( 1, 1.0 | airfoil | 1, 0.55 ); ( 1, 1.0 | airfoil | 1, 0.60 ); ( 1, 1.0 | airfoil | 1, 0.65 ); ( 1, 1.0 | airfoil | 1, 0.70 ); ( 1, 1.0 | airfoil | 1, 0.75 ); ( 1, 1.0 | airfoil | 1, 0.80 ); ( 1, 1.0 | airfoil | 1, 0.85 ); ( 1, 1.0 | airfoil | 1, 0.90 ); ( 1, 1.0 | airfoil | 1, 0.95 )
+DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.05 ); ( 30, 1.0 | airfoil | 0, 0.10 ); ( 30, 1.0 | airfoil | 0, 0.15 ); ( 30, 1.0 | airfoil | 0, 0.20 ); ( 30, 1.0 | airfoil | 0, 0.25 ); ( 30, 1.0 | airfoil | 0, 0.30 ); ( 30, 1.0 | airfoil | 0, 0.35 ); ( 30, 1.0 | airfoil | 0, 0.40 ); ( 30, 1.0 | airfoil | 0, 0.45 ); ( 30, 1.0 | airfoil | 0, 0.50 ); ( 30, 1.0 | airfoil | 0, 0.55 ); ( 30, 1.0 | airfoil | 0, 0.60 ); ( 30, 1.0 | airfoil | 0, 0.65 ); ( 30, 1.0 | airfoil | 0, 0.70 ); ( 30, 1.0 | airfoil | 0, 0.75 ); ( 30, 1.0 | airfoil | 0, 0.80 ); ( 30, 1.0 | airfoil | 0, 0.85 ); ( 30, 1.0 | airfoil | 0, 0.90 ); ( 30, 1.0 | airfoil | 0, 0.95 ); ( 30, 1.0 | airfoil | 1, 0.05 ); ( 30, 1.0 | airfoil | 1, 0.10 ); ( 30, 1.0 | airfoil | 1, 0.15 ); ( 30, 1.0 | airfoil | 1, 0.20 ); ( 30, 1.0 | airfoil | 1, 0.25 ); ( 30, 1.0 | airfoil | 1, 0.30 ); ( 30, 1.0 | airfoil | 1, 0.35 ); ( 30, 1.0 | airfoil | 1, 0.40 ); ( 30, 1.0 | airfoil | 1, 0.45 ); ( 30, 1.0 | airfoil | 1, 0.50 ); ( 30, 1.0 | airfoil | 1, 0.55 ); ( 30, 1.0 | airfoil | 1, 0.60 ); ( 30, 1.0 | airfoil | 1, 0.65 ); ( 30, 1.0 | airfoil | 1, 0.70 ); ( 30, 1.0 | airfoil | 1, 0.75 ); ( 30, 1.0 | airfoil | 1, 0.80 ); ( 30, 1.0 | airfoil | 1, 0.85 ); ( 30, 1.0 | airfoil | 1, 0.90 ); ( 30, 1.0 | airfoil | 1, 0.95 )
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
index 4c0d720d8e98..1063a65d96db 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFSI.cfg
@@ -12,16 +12,14 @@ CONFIG_LIST = (configFlow.cfg, configFEA.cfg)
 MARKER_ZONE_INTERFACE = (wallUpwF, wallUpwS, wallUpperF, wallUpperS, wallDownF, wallDownS)
 
 MESH_FILENAME= meshFSI_2D.su2
-
 TIME_DOMAIN = YES
 TIME_ITER = 5
 TIME_STEP = 0.005
 
 RESTART_SOL= YES
 RESTART_ITER = 2 
-
+OUTPUT_FILES=(RESTART_ASCII, PARAVIEW)
 OUTER_ITER = 5
-
 % Only required by the python scripts
 MATH_PROBLEM = DIRECT
-WRT_SOL_FREQ = 100
+

From 8fd800c3c388ac46ffa3289f8c5ad3579c596162 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 13 Sep 2019 17:07:51 +0200
Subject: [PATCH 467/539] Added time averaged output

---
 Common/src/config_structure.cpp        |  6 +-
 SU2_CFD/include/output/COutput.hpp     | 23 ++++++-
 SU2_CFD/src/output/CFlowCompOutput.cpp | 91 ++++++++++++++++++++++++--
 SU2_CFD/src/output/CFlowIncOutput.cpp  |  6 +-
 SU2_CFD/src/output/CFlowOutput.cpp     |  3 +-
 SU2_CFD/src/output/COutput.cpp         | 90 ++++++++++++++++++++++++-
 SU2_SOL/src/SU2_SOL.cpp                | 10 +--
 7 files changed, 211 insertions(+), 18 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 3b808a10cba5..cb731b1f68d0 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3099,7 +3099,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     if (TimeMarching == TIME_STEPPING){
       InnerIter = 1;
     }
-   VolumeWrtFreq = 1;
+   if (!OptionIsSet("OUTPUT_WRT_FREQ"))
+     VolumeWrtFreq = 1;
+   if (Restart == NO){
+     Restart_Iter = 0;
+   }
   }
   
   /*--- The that Discard_InFiles is false, owerwise the gradient could be wrong ---*/
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 98e560c7ec0e..1508de5c3bbf 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -84,6 +84,7 @@ class COutput {
   unsigned short fieldWidth;      /*!< \brief Width of each column for the screen output (hardcoded for now) */
   bool noWriting;                 /*!< \brief Boolean indicating whether a screen/history output should be written */
   unsigned long curTimeIter,      /*!< \brief Current value of the time iteration index */
+  curAbsTimeIter,      /*!< \brief Current value of the time iteration index */  
   curOuterIter,                   /*!< \brief Current value of the outer iteration index */
   curInnerIter;                   /*!< \brief Current value of the inner iteration index */
   
@@ -208,13 +209,16 @@ class COutput {
   unsigned short                                curFieldIndex;
   /*! \brief Boolean to store whether the field index cache should be build. */    
   bool                                          buildFieldIndexCache;
-  
+  /*! \brief Vector to cache the positions of the field in the data array */
+  std::vector<short>                            fieldGetIndexCache;
+  /*! \brief Current value of the cache index */  
+  unsigned short                                curGetFieldIndex;
 
   /*! \brief Requested volume field names in the config file. */    
   std::vector<string> requestedVolumeFields;
   /*! \brief Number of requested volume field names in the config file. */      
   unsigned short nRequestedVolumeFields;
-  
+    
   /*----------------------------- Convergence monitoring ----------------------------*/     
 
   su2double cauchyValue,         /*!< \brief Summed value of the convergence indicator. */
@@ -569,6 +573,14 @@ class COutput {
     volumeOutput_List.push_back(name);
   }
   
+  
+  /*!
+   * \brief Set the value of a volume output field
+   * \param[in] name - Name of the field.
+   * \param[in] value - The new value of this field.
+   */
+  su2double GetVolumeOutputValue(string name, unsigned long iPoint);
+  
   /*!
    * \brief Set the value of a volume output field
    * \param[in] name - Name of the field.
@@ -576,6 +588,13 @@ class COutput {
    */
   void SetVolumeOutputValue(string name, unsigned long iPoint, su2double value);
 
+  /*!
+   * \brief Set the value of a volume output field
+   * \param[in] name - Name of the field.
+   * \param[in] value - The new value of this field.
+   */
+  void SetAvgVolumeOutputValue(string name, unsigned long iPoint, su2double value);
+  
   /*!
    * \brief CheckHistoryOutput
    */
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index fe386f5fec3d..853f06cc6475 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -391,9 +391,44 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
     if (nDim == 3){
       AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION", "x-component of the vorticity vector");
       AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION", "y-component of the vorticity vector");
+      AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");      
     }
     AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION", "z-component of the vorticity vector");
-    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");  
+  }
+  
+  if (config->GetTime_Domain()){
+    AddVolumeOutput("MEAN_DENSITY", "MeanDensity", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("MEAN_VELOCITY-X", "MeanVelocity_x", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("MEAN_VELOCITY-Y", "MeanVelocity_y", "TAVG_SOLUTION", "Time-averaged value of the density");
+    if (nDim == 3)
+      AddVolumeOutput("MEAN_VELOCITY-Z", "MeanVelocity_z", "TAVG_SOLUTION", "Time-averaged value of the density");
+    if (nDim == 3){
+      AddVolumeOutput("MEAN_ENERGY", "MeanEnergy", "TAVG_SOLUTION", "Time-averaged value of the density");
+    }
+    else {
+      AddVolumeOutput("MEAN_ENERGY", "MeanEnergy", "TAVG_SOLUTION", "Time-averaged value of the density");    
+    }
+    AddVolumeOutput("MEAN_PRESSURE", "MeanPressure", "TAVG_SOLUTION", "Time-averaged value of the density");
+    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+      AddVolumeOutput("MEAN_ROE_DISSIPATION", "MeanRoe_Dissipation", "TAVG_SOLUTION", "Time-averaged value of the density");
+    }  
+    
+    AddVolumeOutput("RMS_U",   "RMSVelocity_x", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("RMS_V",   "RMSVelocity_y", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("RMS_UV",  "RMSUV",         "TAVG_SOLUTION", "Time-averaged value of the density");    
+    AddVolumeOutput("RMS_P",   "RMSPressure",   "TAVG_SOLUTION", "Time-average value pf pressure");
+    AddVolumeOutput("UUPRIME", "UUPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("VVPRIME", "VVPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("UVPRIME", "UVPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+    AddVolumeOutput("PPRIME",  "PPrimeMean",   "TAVG_SOLUTION", "Time-averaged value of the density");
+    if (nDim == 3){
+      AddVolumeOutput("RMS_W",   "RMSVelocity_z", "TAVG_SOLUTION", "Time-averaged value of the density");
+      AddVolumeOutput("RMS_UW", "RMSUW", "TAVG_SOLUTION", "Time-averaged value of the density");
+      AddVolumeOutput("RMS_VW", "RMSVW", "TAVG_SOLUTION", "Time-averaged value of the density");
+      AddVolumeOutput("WWPRIME", "WWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+      AddVolumeOutput("UWPRIME", "UWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+      AddVolumeOutput("VWPRIME", "VWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
+    }
   }
 }
 
@@ -517,12 +552,60 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     if (nDim == 3){
       SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity()[0]);
-      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);      
+      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);
+      SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));            
     } 
     SetVolumeOutputValue("VORTICITY_Z", iPoint, Node_Flow->GetVorticity()[2]);      
-    SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));      
   }
   
+  if (config->GetTime_Domain()){
+    SetAvgVolumeOutputValue("MEAN_DENSITY", iPoint, Node_Flow->GetSolution(0));
+    SetAvgVolumeOutputValue("MEAN_VELOCITY-X", iPoint, Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0));
+    SetAvgVolumeOutputValue("MEAN_VELOCITY-Y", iPoint, Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0));
+    if (nDim == 3)
+      SetAvgVolumeOutputValue("MEAN_VELOCITY-Z", iPoint, Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0));
+    if (nDim == 3){
+      SetAvgVolumeOutputValue("MEAN_ENERGY", iPoint, Node_Flow->GetSolution(4));
+    } else {
+      SetAvgVolumeOutputValue("MEAN_ENERGY", iPoint, Node_Flow->GetSolution(3));    
+    }
+    SetAvgVolumeOutputValue("MEAN_PRESSURE", iPoint, Node_Flow->GetPressure());
+    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
+      SetAvgVolumeOutputValue("MEAN_ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
+    }  
+    
+    SetAvgVolumeOutputValue("RMS_U", iPoint, pow(Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0),2));
+    SetAvgVolumeOutputValue("RMS_V", iPoint, pow(Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0),2));
+    SetAvgVolumeOutputValue("RMS_UV", iPoint, (Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0)));
+    SetAvgVolumeOutputValue("RMS_P", iPoint, pow(Node_Flow->GetPressure(),2));
+    if (nDim == 3){
+      SetAvgVolumeOutputValue("RMS_W", iPoint, pow(Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0),2));
+      SetAvgVolumeOutputValue("RMS_VW", iPoint, (Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0)));
+      SetAvgVolumeOutputValue("RMS_UW", iPoint, (Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0)));
+    }
+    
+    const su2double umean  = GetVolumeOutputValue("MEAN_VELOCITY-X", iPoint);
+    const su2double uumean = GetVolumeOutputValue("RMS_U", iPoint);    
+    const su2double vmean  = GetVolumeOutputValue("MEAN_VELOCITY-Y", iPoint);
+    const su2double vvmean = GetVolumeOutputValue("RMS_V", iPoint);    
+    const su2double uvmean = GetVolumeOutputValue("RMS_UV", iPoint);
+    const su2double pmean  = GetVolumeOutputValue("MEAN_PRESSURE", iPoint);
+    const su2double ppmean = GetVolumeOutputValue("RMS_P", iPoint);
+    
+    SetVolumeOutputValue("UUPRIME", iPoint, -(umean*umean - uumean));
+    SetVolumeOutputValue("VVPRIME", iPoint, -(vmean*vmean - vvmean));
+    SetVolumeOutputValue("UVPRIME", iPoint, -(umean*vmean - uvmean));
+    SetVolumeOutputValue("PPRIME",  iPoint, -(pmean*pmean - ppmean));
+    if (nDim == 3){
+      const su2double wmean  = GetVolumeOutputValue("MEAN_VELOCITY-Z", iPoint);
+      const su2double wwmean = GetVolumeOutputValue("RMS_W", iPoint);
+      const su2double uwmean = GetVolumeOutputValue("RMS_UW", iPoint);
+      const su2double vwmean = GetVolumeOutputValue("RMS_VW", iPoint);
+      SetVolumeOutputValue("WWPRIME", iPoint, -(wmean*wmean - wwmean));
+      SetVolumeOutputValue("UWPRIME", iPoint, -(umean*wmean - uwmean));
+      SetVolumeOutputValue("VWPRIME",  iPoint, -(vmean*wmean - vwmean));
+    } 
+  }
 }
 
 void CFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
@@ -682,7 +765,7 @@ bool CFlowCompOutput::SetInit_Residuals(CConfig *config){
 
 bool CFlowCompOutput::SetUpdate_Averages(CConfig *config){
   
-  return (config->GetTime_Marching() != STEADY && curInnerIter == 0);
+  return (config->GetTime_Marching() != STEADY && (curInnerIter == config->GetnInner_Iter() - 1 || convergence));
       
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 5172fe54b047..c456d9ed64fd 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -447,9 +447,9 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     if (nDim == 3){
       AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION", "x-component of the vorticity vector");
       AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION", "y-component of the vorticity vector");
+      AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");      
     }
     AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION", "z-component of the vorticity vector");
-    AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");  
   }
 }
 
@@ -582,10 +582,10 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
     if (nDim == 3){
       SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity()[0]);
-      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);      
+      SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);     
+      SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));            
     } 
     SetVolumeOutputValue("VORTICITY_Z", iPoint, Node_Flow->GetVorticity()[2]);      
-    SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(config, geometry, Node_Flow));      
   }
 }
 
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 0c026cfa6499..582b1253a4fc 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -2815,7 +2815,8 @@ bool CFlowOutput::WriteVolume_Output(CConfig *config, unsigned long Iter){
     
     if ((config->GetTime_Marching() == DT_STEPPING_2ND) &&
         ((Iter == 0) || (Iter    % config->GetVolume_Wrt_Freq() == 0) ||
-         ((Iter-1) % config->GetVolume_Wrt_Freq() == 0) )){
+         ((Iter+1) % config->GetVolume_Wrt_Freq() == 0) || 
+         ((Iter+2 == config->GetnTime_Iter())))){
       return true;
     }
   } else {
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 04cee64b823f..b6fcb3d082be 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -152,6 +152,7 @@ void COutput::SetHistory_Output(CGeometry *geometry,
                                   unsigned long InnerIter) {
 
   curTimeIter  = TimeIter;
+  curAbsTimeIter = TimeIter - config->GetRestart_Iter();
   curOuterIter = OuterIter;
   curInnerIter = InnerIter;
   
@@ -205,6 +206,7 @@ void COutput::SetHistory_Output(CGeometry *geometry,
 void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter){
   
   curTimeIter  = TimeIter;
+  curAbsTimeIter = TimeIter - driver_config->GetRestart_Iter();  
   curOuterIter = OuterIter;
   
   bool write_header, write_screen, write_history;
@@ -709,7 +711,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
       
       /*--- Check the convergence ---*/
       
-      if ((monitor <= config->GetMinLogResidual())) { convergence = true;  }
+      if (Iteration != 0 && (monitor <= config->GetMinLogResidual())) { convergence = true;  }
       else { convergence = false; }
       
     }
@@ -1198,6 +1200,8 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   /*--- Reset the offset cache and index --- */
   curFieldIndex = 0;
   fieldIndexCache.clear();
+  curGetFieldIndex = 0;
+  fieldGetIndexCache.clear();
   
   if (femOutput){
     
@@ -1240,7 +1244,9 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     /*--- Reset the offset cache and index --- */
     curFieldIndex = 0;
-    fieldIndexCache.clear(); 
+    fieldIndexCache.clear();
+    curGetFieldIndex = 0;
+    fieldGetIndexCache.clear();
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
       for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
@@ -1290,6 +1296,86 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
   
 }
 
+su2double COutput::GetVolumeOutputValue(string name, unsigned long iPoint){
+  
+  if (buildFieldIndexCache){ 
+    
+    /*--- Build up the offset cache to speed up subsequent 
+     * calls of this routine since the order of calls is 
+     * the same for every value of iPoint --- */
+    
+    if (volumeOutput_Map.count(name) > 0){
+      const short Offset = volumeOutput_Map[name].offset;
+      fieldGetIndexCache.push_back(Offset);        
+      if (Offset != -1){
+        return volumeDataSorter->GetUnsorted_Data(iPoint, Offset);
+      }
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+    }
+  } else {
+    
+    /*--- Use the offset cache for the access ---*/
+    
+    const short Offset = fieldGetIndexCache[curGetFieldIndex++];
+  
+    if (curGetFieldIndex == fieldGetIndexCache.size()){
+      curGetFieldIndex = 0;
+    }
+    if (Offset != -1){
+      return volumeDataSorter->GetUnsorted_Data(iPoint, Offset);
+    } 
+  }
+  
+  return 0.0;
+}
+
+void COutput::SetAvgVolumeOutputValue(string name, unsigned long iPoint, su2double value){
+  
+  const su2double scaling = 1.0 / su2double(curAbsTimeIter + 1);
+  
+  if (buildFieldIndexCache){ 
+    
+    /*--- Build up the offset cache to speed up subsequent 
+     * calls of this routine since the order of calls is 
+     * the same for every value of iPoint --- */
+    
+    if (volumeOutput_Map.count(name) > 0){
+      const short Offset = volumeOutput_Map[name].offset;
+      fieldIndexCache.push_back(Offset);        
+      if (Offset != -1){
+        
+        const su2double old_value = volumeDataSorter->GetUnsorted_Data(iPoint, Offset);
+        const su2double new_value = value * scaling + old_value *( 1.0 - scaling);
+        
+        volumeDataSorter->SetUnsorted_Data(iPoint, Offset, new_value);
+      }
+    } else {
+      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);    
+    }
+  } else {
+    
+    /*--- Use the offset cache for the access ---*/
+    
+    const short Offset = fieldIndexCache[curFieldIndex++];
+    if (Offset != -1){
+      
+      const su2double old_value = volumeDataSorter->GetUnsorted_Data(iPoint, Offset);
+      const su2double new_value = value * scaling + old_value *( 1.0 - scaling);
+      
+      volumeDataSorter->SetUnsorted_Data(iPoint, Offset, new_value);
+    }   
+    if (curFieldIndex == fieldIndexCache.size()){
+      curFieldIndex = 0;
+    }
+  }
+  
+}
+
+
+
+
+
 void COutput::Postprocess_HistoryData(CConfig *config){
    
   map<string, su2double> Average;
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 61e35cef5c8a..0e927984ef12 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -599,13 +599,13 @@ int main(int argc, char *argv[]) {
           StopCalc = true;
 
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
-            ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
+            ((TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0) && (TimeIter != 0) &&
              !((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
                (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND))) ||
             (StopCalc) ||
             (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
               (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND)) &&
-             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0)))) {
 
 
 
@@ -618,7 +618,7 @@ int main(int argc, char *argv[]) {
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated[iZone] == false &&
                     (TimeIter == 0 || (config_container[ZONE_0]->GetRestart() && ((long)TimeIter ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
-                                                                                  TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                                                                  TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0 ||
                                                                                   TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter())))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);
@@ -736,7 +736,7 @@ int main(int argc, char *argv[]) {
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
             (StopCalc) ||
             ((config_container[ZONE_0]->GetTime_Domain()) &&
-             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0)))) {
 
               /*--- Set the current iteration number in the config class. ---*/
               config_container[ZONE_0]->SetTimeIter(TimeIter);
@@ -747,7 +747,7 @@ int main(int argc, char *argv[]) {
                 /*--- Either instantiate the solution class or load a restart file. ---*/
                 if (SolutionInstantiated == false &&
                     (TimeIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(TimeIter) ==  SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
-                                       TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                       TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq()  == 0 ||
                                        TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()))) {
                   solver_container[iZone][INST_0] = new CBaselineSolver(geometry_container[iZone][INST_0], config_container[iZone]);
                   output[iZone] = new CBaselineOutput(config_container[iZone], geometry_container[iZone][INST_0]->GetnDim(), solver_container[iZone][INST_0]);

From a55de6acaec8efbb7bd07ab5780cb55b162ec925 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 13 Sep 2019 17:09:38 +0200
Subject: [PATCH 468/539] changed dataSorters to be persistent

---
 .../output/filewriter/CParallelDataSorter.hpp | 15 +++-
 SU2_CFD/src/output/COutput.cpp                | 84 ++++++++++---------
 .../src/output/filewriter/CFEMDataSorter.cpp  | 25 +-----
 .../src/output/filewriter/CFVMDataSorter.cpp  | 36 ++++----
 .../output/filewriter/CParallelDataSorter.cpp | 25 ++++--
 .../filewriter/CSU2BinaryFileWriter.cpp       | 40 +--------
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  8 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      | 56 ++++++-------
 8 files changed, 127 insertions(+), 162 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 29b8cc3bf6d6..fcbcc1fc2e25 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -82,7 +82,6 @@ class CParallelDataSorter{
   CLinearPartitioner* linearPartitioner;  //!< Linear partitioner based on the global number of points.
   
   unsigned short GlobalField_Counter;  //!< Number of output fields
-  su2double** Parallel_Data;           //!< Array holding the output data after sorting
   
   bool connectivity_sorted;            //!< Boolean to store information on whether the connectivity is sorted
   
@@ -90,6 +89,8 @@ class CParallelDataSorter{
   int *nPoint_Recv;                    //!< Number of points this processor receives from other processors
   unsigned long *Index;                //!< Index each point has in the send buffer
   su2double *connSend;                 //!< Send buffer holding the data that will be send to other processors
+  su2double *sortedDataBuffer;                 //!< Send buffer holding the data that will be send to other processors
+  
   unsigned long *idSend;               //!< Send buffer holding global indices that will be send to other processors
   int nSends,                          //!< Number of sends
   nRecvs;                              //!< Number of receives
@@ -189,7 +190,13 @@ class CParallelDataSorter{
    * \input iPoint - the point ID.
    * \return the value of the data field at a point.
    */
-  su2double GetData(unsigned short iField, unsigned long iPoint) {return Parallel_Data[iField][iPoint];}
+  su2double GetData(unsigned short iField, unsigned long iPoint) {return sortedDataBuffer[iPoint*GlobalField_Counter + iField];}
+  
+  /*!
+   * \brief Get the pointer to the sorted linear partitioned data.
+   * \return Pointer to the sorted data.
+   */
+  su2double *GetData() {return sortedDataBuffer;}
   
   /*!
    * \brief Get the global index of a point.
@@ -229,4 +236,8 @@ class CParallelDataSorter{
   void SetUnsorted_Data(unsigned long iPoint, unsigned short iField, su2double data){
     connSend[Index[iPoint] + iField] = data;
   }
+  
+  su2double GetUnsorted_Data(unsigned long iPoint, unsigned short iField){
+    return connSend[Index[iPoint] + iField];
+  }
 };
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index b6fcb3d082be..b4455e0db958 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -131,6 +131,9 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
   curOuterIter = 0;
   curTimeIter  = 0;
   
+  volumeDataSorter = nullptr;
+  surfaceDataSorter = nullptr;
+  
 }
 
 COutput::~COutput(void) {
@@ -140,6 +143,17 @@ COutput::~COutput(void) {
 
   delete [] cauchySerie;
   
+    if (volumeDataSorter != nullptr)
+      delete volumeDataSorter;
+    
+    volumeDataSorter = nullptr;
+    
+    if (surfaceDataSorter != nullptr)
+      delete surfaceDataSorter;
+    
+    surfaceDataSorter = nullptr;
+  
+  
 }
 
 
@@ -336,34 +350,29 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   /*---- Construct a data sorter object to partition and distribute
    *  the local data into linear chunks across the processors ---*/
   
+  
   if (femOutput){
-
-    volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
     
-    surfaceDataSorter = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, 
+    if (volumeDataSorter == nullptr)
+      volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
+    
+    if (surfaceDataSorter == nullptr)
+      surfaceDataSorter = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, 
                                                   dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
-
-  }  else {
     
-    volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
+  }  else {
+   
+    if (volumeDataSorter == nullptr)    
+      volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
     
-    surfaceDataSorter = new CSurfaceFVMDataSorter(config, geometry, nVolumeFields,
+    if (surfaceDataSorter == nullptr)
+      surfaceDataSorter = new CSurfaceFVMDataSorter(config, geometry, nVolumeFields,
                                                   dynamic_cast<CFVMDataSorter*>(volumeDataSorter));  
     
-  }  
+  }
 
-  /*--- Collect that data defined in the subclasses from the different processors ---*/
-  
-  if (rank == MASTER_NODE)
-    cout << endl << "Loading solution output data locally on each rank." << endl;
-  
   CollectVolumeData(config, geometry, solver_container);
-  
-  /*--- Sort the data, needed for volume and surface output ---*/
-  
-  if (rank == MASTER_NODE) 
-    cout << "Sorting output data across all ranks." << endl;
-  
+
   volumeDataSorter->SortOutputData();
   
 }
@@ -371,15 +380,15 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
 
 void COutput::DeallocateData_Parallel(){
   
-  if (volumeDataSorter != NULL)
-    delete volumeDataSorter;
+//  if (volumeDataSorter != NULL)
+//    delete volumeDataSorter;
   
-  volumeDataSorter = NULL;
+//  volumeDataSorter = NULL;
   
-  if (surfaceDataSorter != NULL)
-    delete surfaceDataSorter;
+//  if (surfaceDataSorter != NULL)
+//    delete surfaceDataSorter;
   
-  surfaceDataSorter = NULL;
+//  surfaceDataSorter = NULL;
   
 }
 
@@ -399,9 +408,8 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       if (fileName == "")
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
-      
-      surfaceDataSorter->SortConnectivity(config, geometry, true);
-      
+       
+      surfaceDataSorter->SortConnectivity(config, geometry);
       surfaceDataSorter->SortOutputData();
       
       if (rank == MASTER_NODE) {
@@ -542,7 +550,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Load and sort the output data and connectivity. ---*/
       
-      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortConnectivity(config, geometry);      
       surfaceDataSorter->SortOutputData();
       
       /*--- Write paraview binary ---*/
@@ -561,7 +569,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Load and sort the output data and connectivity. ---*/
       
-      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortConnectivity(config, geometry);            
       surfaceDataSorter->SortOutputData();
       
       /*--- Write paraview binary ---*/
@@ -580,7 +588,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Load and sort the output data and connectivity. ---*/
       
-      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortConnectivity(config, geometry);      
       surfaceDataSorter->SortOutputData();
       
       /*--- Write paraview binary ---*/
@@ -600,7 +608,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Load and sort the output data and connectivity. ---*/
       
-      surfaceDataSorter->SortConnectivity(config, geometry, true);
+      surfaceDataSorter->SortConnectivity(config, geometry);      
       surfaceDataSorter->SortOutputData();
       
       /*--- Write paraview binary ---*/
@@ -633,12 +641,12 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
 
 bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing){
   
+  /*--- Load the volume data from the solver and sort it ---*/
+  
+  Load_Data(geometry, config, solver_container);
+  
   if (WriteVolume_Output(config, Iter) || force_writing){
-   
-    /*--- Load the volume data from the solver and sort it ---*/
-    
-    Load_Data(geometry, config, solver_container);
-    
+
     unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
     unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
         
@@ -1260,7 +1268,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
           
         }
       }   
-    } 
+    }
   }
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 19606976b397..6e639d62d4bb 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -74,11 +74,6 @@ void CFEMDataSorter::SortOutputData() {
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
 
-  su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
-  for (int ii = 0; ii < VARS_PER_POINT*nPoint_Recv[size]; ii++)
-    connRecv[ii] = 0;
-
   unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
   for (int ii = 0; ii < nPoint_Recv[size]; ii++)
     idRecv[ii] = 0;
@@ -98,7 +93,7 @@ void CFEMDataSorter::SortOutputData() {
       int count  = VARS_PER_POINT*kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+      SU2_MPI::Irecv(&(sortedDataBuffer[ll]), count, MPI_DOUBLE, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage]));
       iMessage++;
     }
@@ -159,7 +154,7 @@ void CFEMDataSorter::SortOutputData() {
   int ll = VARS_PER_POINT*nPoint_Send[rank];
   int kk = VARS_PER_POINT*nPoint_Send[rank+1];
 
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) sortedDataBuffer[mm] = connSend[nn];
 
   mm = nPoint_Recv[rank];
   ll = nPoint_Send[rank];
@@ -181,21 +176,6 @@ void CFEMDataSorter::SortOutputData() {
   delete [] send_req;
   delete [] recv_req;
 #endif
-  
-  delete [] connSend;
-  connSend = NULL;
-
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. First, allocate the
-   appropriate amount of memory for this section. ---*/
-
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]]();
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
-      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
-    }
-  }
 
   /*--- Store the total number of local points my rank has for
    the current section after completing the communications. ---*/
@@ -213,7 +193,6 @@ void CFEMDataSorter::SortOutputData() {
 
   /*--- Free temporary memory from communications ---*/
 
-  delete [] connRecv;
   delete [] idRecv;
   
 }
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index c50192720d4c..2e31aaedbc34 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -41,7 +41,6 @@ CFVMDataSorter::~CFVMDataSorter(){
   
   delete [] Local_Halo;
   
-  if (connSend != NULL)    delete [] connSend;
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
@@ -91,9 +90,7 @@ void CFVMDataSorter::SortOutputData() {
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
    directly copy our own data later. ---*/
-  
-  su2double *connRecv = NULL;
-  connRecv = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
+
   
   unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
   
@@ -112,7 +109,7 @@ void CFVMDataSorter::SortOutputData() {
       int count  = VARS_PER_POINT*kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(connRecv[ll]), count, MPI_DOUBLE, source, tag,
+      SU2_MPI::Irecv(&(sortedDataBuffer[ll]), count, MPI_DOUBLE, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage]));
       iMessage++;
     }
@@ -173,7 +170,7 @@ void CFVMDataSorter::SortOutputData() {
   int ll = VARS_PER_POINT*nPoint_Send[rank];
   int kk = VARS_PER_POINT*nPoint_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) connRecv[mm] = connSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) sortedDataBuffer[mm] = connSend[nn];
   
   mm = nPoint_Recv[rank];
   ll = nPoint_Send[rank];
@@ -196,21 +193,19 @@ void CFVMDataSorter::SortOutputData() {
   delete [] recv_req;
 #endif
   
-  delete [] connSend;
-  connSend = NULL;
-  
-  /*--- Store the connectivity for this rank in the proper data
-   structure before post-processing below. First, allocate the
-   appropriate amount of memory for this section. ---*/
+  su2double *tmpBuffer = new su2double[nPoint_Recv[size]];
   
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nPoint_Recv[size]]();
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++) {
-      Parallel_Data[jj][idRecv[ii]] = connRecv[ii*VARS_PER_POINT+jj];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++){
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      tmpBuffer[idRecv[ii]] = sortedDataBuffer[ii*VARS_PER_POINT+jj];
+    }
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      sortedDataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
     }
   }
   
+  delete [] tmpBuffer;
+  
   /*--- Store the total number of local points my rank has for
    the current section after completing the communications. ---*/
   
@@ -227,7 +222,6 @@ void CFVMDataSorter::SortOutputData() {
   
   /*--- Free temporary memory from communications ---*/
   
-  delete [] connRecv;
   delete [] idRecv;
 }
 
@@ -622,26 +616,32 @@ void CFVMDataSorter::SortVolumetricConnectivity(CConfig *config,
   switch (Elem_Type) {
     case TRIANGLE:
       nParallel_Tria = nElem_Total;
+      if (Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;
       if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
       break;
     case QUADRILATERAL:
       nParallel_Quad = nElem_Total;
+      if (Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;      
       if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
       break;
     case TETRAHEDRON:
       nParallel_Tetr = nElem_Total;
+      if (Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;            
       if (nParallel_Tetr > 0) Conn_Tetr_Par = Conn_Elem;
       break;
     case HEXAHEDRON:
       nParallel_Hexa = nElem_Total;
+      if (Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;                  
       if (nParallel_Hexa > 0) Conn_Hexa_Par = Conn_Elem;
       break;
     case PRISM:
       nParallel_Pris = nElem_Total;
+      if (Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;                  
       if (nParallel_Pris > 0) Conn_Pris_Par = Conn_Elem;
       break;
     case PYRAMID:
       nParallel_Pyra = nElem_Total;
+      if (Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;                  
       if (nParallel_Pyra > 0) Conn_Pyra_Par = Conn_Elem;
       break;
     default:
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index 51aaf5ac2495..ee0b2a8b2e75 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -22,13 +22,12 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   Conn_Tetr_Par = NULL;
   Conn_Tria_Par = NULL;
   Conn_Pyra_Par = NULL;
-  
-  Parallel_Data = NULL;
-  
+    
   nPoint_Send  = NULL;
   nPoint_Recv  = NULL;
   Index        = NULL;
   connSend     = NULL;
+  sortedDataBuffer     = NULL;  
   idSend       = NULL;
   nSends = 0;
   nRecvs = 0;
@@ -58,14 +57,18 @@ CParallelDataSorter::~CParallelDataSorter(){
   if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
   if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
   
+  if (sortedDataBuffer != NULL) delete [] sortedDataBuffer;
+  if (connSend != NULL) delete [] connSend;
+  
+  
   /*--- Deallocate memory for solution data ---*/
   
-  if (Parallel_Data != NULL){
-    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-      if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
-    }
-    delete [] Parallel_Data;  
-  }
+//  if (Parallel_Data != NULL){
+//    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
+//      if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
+//    }
+//    delete [] Parallel_Data;  
+//  }
 }
 
 
@@ -158,6 +161,10 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
   
   connSend = NULL;
   connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]]();
+  
+  sortedDataBuffer = NULL;
+  sortedDataBuffer = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
+  
   /*--- Allocate arrays for sending the global ID. ---*/
   
   idSend = new unsigned long[nPoint_Send[size]]();
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 245d48385043..3a8c7cc5d45c 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -38,42 +38,6 @@ void CSU2BinaryFileWriter::Write_Data(){
   int var_buf_size = 5;
   int var_buf[5] = {535532, GlobalField_Counter, (int)dataSorter->GetnPointsGlobal(), 0, 0};
 
-  /*--- Prepare the 1D data buffer on this rank. ---*/
-
-  passivedouble *buf = new passivedouble[nParallel_Poin*GlobalField_Counter];
-
-  /*--- For now, create a temp 1D buffer to load up the data for writing.
-   This will be replaced with a derived data type most likely. ---*/
-
-  for (iPoint = 0; iPoint < nParallel_Poin; iPoint++)
-    for (iVar = 0; iVar < GlobalField_Counter; iVar++)
-      buf[iPoint*GlobalField_Counter+iVar] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,iPoint));
-
-//  /*--- Prepare metadata. ---*/
-
-//  int Restart_ExtIter;
-//  if (dual_time)
-//    Restart_ExtIter= (int)config->GetExtIter() + 1;
-//  else
-//    Restart_ExtIter = (int)config->GetExtIter() + (int)config->GetExtIter_OffSet() + 1;
-
-//  passivedouble Restart_Metadata[8] = {
-//    SU2_TYPE::GetValue(config->GetAoA() - config->GetAoA_Offset()),
-//    SU2_TYPE::GetValue(config->GetAoS() - config->GetAoS_Offset()),
-//    SU2_TYPE::GetValue(config->GetInitial_BCThrust()),
-//    SU2_TYPE::GetValue(config->GetdCD_dCL()),
-//    SU2_TYPE::GetValue(config->GetdCMx_dCL()),
-//    SU2_TYPE::GetValue(config->GetdCMy_dCL()),
-//    SU2_TYPE::GetValue(config->GetdCMz_dCL()),
-//    0.0
-//  };
-
-//  if (( config->GetKind_Solver() == DISC_ADJ_EULER ||
-//        config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-//        config->GetKind_Solver() == DISC_ADJ_RANS ) && adjoint) {
-//    Restart_Metadata[4] = SU2_TYPE::GetValue(solver[ADJFLOW_SOL]->GetTotal_Sens_AoA() * PI_NUMBER / 180.0);
-//  }
-
   /*--- Set a timer for the binary file writing. ---*/
   
 #ifndef HAVE_MPI
@@ -204,7 +168,7 @@ void CSU2BinaryFileWriter::Write_Data(){
 
   /*--- Collective call for all ranks to write to their view simultaneously. ---*/
 
-  MPI_File_write_all(fhw, buf, GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
+  MPI_File_write_all(fhw, dataSorter->GetData(), GlobalField_Counter*nParallel_Poin, MPI_DOUBLE, &status);
   file_size += (su2double)GlobalField_Counter*nParallel_Poin*sizeof(passivedouble);
 
   /*--- Free the derived datatype. ---*/
@@ -270,6 +234,6 @@ void CSU2BinaryFileWriter::Write_Data(){
   
   /*--- Free temporary data buffer for writing the binary file. ---*/
 
-  delete [] buf;
+//  delete [] buf;
 
 }
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 257c67c40e5b..a93b031c2159 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -192,18 +192,14 @@ void CSurfaceFEMDataSorter::SortOutputData() {
 
   /* Allocate the memory for Parallel_Surf_Data. */
   nParallel_Poin = globalSurfaceDOFIDs.size();
-
-  Parallel_Data = new su2double*[VARS_PER_POINT];
-  for(int jj=0; jj<VARS_PER_POINT; jj++)
-    Parallel_Data[jj] = new su2double[nParallel_Poin]();
-
+  
   /* Determine the local index of the global surface DOFs and
      copy the data into Parallel_Surf_Data. */
   for(unsigned long i=0; i<nParallel_Poin; ++i) {
     const unsigned long ii = globalSurfaceDOFIDs[i] - linearPartitioner->GetCumulativeSizeBeforeRank(rank);
 
     for(int jj=0; jj<VARS_PER_POINT; jj++)
-      Parallel_Data[jj][i] = volume_sorter->GetData(jj,ii);
+      sortedDataBuffer[i*VARS_PER_POINT+jj] = volume_sorter->GetData(jj,ii);
   }
 
   /*--- Reduce the total number of surf points we have. This will be
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index dc988a1afc80..9b7a80f9c900 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -24,10 +24,6 @@ CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){
 
 void CSurfaceFVMDataSorter::SortOutputData() {
   
-  if (!connectivity_sorted){
-    SU2_MPI::Error("Connectivity must be sorted before sorting output data", CURRENT_FUNCTION);
-  }
-  
   unsigned long iProcessor;
   unsigned long iPoint, iElem;
   unsigned long Global_Index;
@@ -372,6 +368,8 @@ void CSurfaceFVMDataSorter::SortOutputData() {
   /*--- First, add up the number of surface points I have on my rank. ---*/
   
   nParallel_Poin = 0;
+  Renumber2Global.clear();  
+  
   for (iPoint = 0; iPoint < volume_sorter->GetnPoints(); iPoint++) {
     if (surfPoint[iPoint] != -1) {
       
@@ -413,18 +411,18 @@ void CSurfaceFVMDataSorter::SortOutputData() {
    we can allocate the new data structure to hold these points alone. Here,
    we also copy the data for those points from our volume data structure. ---*/
   
-  Parallel_Data = new su2double*[VARS_PER_POINT];
+  if (sortedDataBuffer == nullptr){
+    sortedDataBuffer = new su2double[nParallel_Poin*VARS_PER_POINT];
+  }
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
-    Parallel_Data[jj] = new su2double[nParallel_Poin]();
     count = 0;
     for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
       if (surfPoint[ii] !=-1) {
-        Parallel_Data[jj][count] = volume_sorter->GetData(jj,ii);
+        sortedDataBuffer[count*VARS_PER_POINT + jj] = volume_sorter->GetData(jj,ii);
         count++;
       }
     }
   }
-  
   /*--- Reduce the total number of surf points we have. This will be
    needed for writing the surface solution files later. ---*/
   
@@ -1070,31 +1068,30 @@ void CSurfaceFVMDataSorter::SortOutputData() {
 
 void CSurfaceFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
   
-  if (!connectivity_sorted){
-    /*--- Sort connectivity for each type of element (excluding halos). Note
+  /*--- Sort connectivity for each type of element (excluding halos). Note
    In these routines, we sort the connectivity into a linear partitioning
    across all processors based on the global index of the grid nodes. ---*/
-    
-    /*--- Sort volumetric grid connectivity. ---*/
-    
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting surface grid connectivity." << endl;
-    
-    SortSurfaceConnectivity(config, geometry, LINE         );
-    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
-    
-    
-    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
+  
+  /*--- Sort volumetric grid connectivity. ---*/
+  
+  
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting surface grid connectivity." << endl;
+  
+  SortSurfaceConnectivity(config, geometry, LINE         );
+  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+  
+  
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
-    nGlobal_Elem_Par   = nTotal_Surf_Elem;
+  nGlobal_Elem_Par   = nTotal_Surf_Elem;
 #else
-    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
-    
-    connectivity_sorted = true;
-  }
+  
+  connectivity_sorted = true;
+  
 }
 
 void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type) {
@@ -1451,14 +1448,17 @@ void CSurfaceFVMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
   switch (Elem_Type) {
     case LINE:
       nParallel_Line = nElem_Total;
+      if (Conn_Line_Par != NULL) delete [] Conn_Line_Par;
       if (nParallel_Line > 0) Conn_Line_Par = Conn_Elem;
       break;
     case TRIANGLE:
       nParallel_Tria = nElem_Total;
+      if (Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;      
       if (nParallel_Tria > 0) Conn_Tria_Par = Conn_Elem;
       break;
     case QUADRILATERAL:
       nParallel_Quad = nElem_Total;
+      if (Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;      
       if (nParallel_Quad > 0) Conn_Quad_Par = Conn_Elem;
       break;
     default:

From 31f5b17f321b345a1b64e28869d89ee7e4cdf853 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 13 Sep 2019 17:10:04 +0200
Subject: [PATCH 469/539] Updated q criterion computation

---
 SU2_CFD/src/output/CFlowCompOutput.cpp | 27 +++++++++++++-------------
 SU2_CFD/src/output/CFlowIncOutput.cpp  | 27 +++++++++++++-------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 853f06cc6475..c662b90dffd6 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -729,28 +729,27 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
 
 su2double CFlowCompOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
-  unsigned short iDim, jDim;
+  unsigned short iDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
-  su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
-  su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  
   for (iDim = 0; iDim < nDim; iDim++) {
     for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
       Grad_Vel[iDim][jDim] = node_flow->GetGradient_Primitive(iDim+1, jDim);
-      Strain[iDim][jDim]   = 0.5*(Grad_Vel[iDim][jDim] + Grad_Vel[jDim][iDim]);
-      Omega[iDim][jDim]    = 0.5*(Grad_Vel[iDim][jDim] - Grad_Vel[jDim][iDim]);
     }
   }
   
-  su2double OmegaMag = 0.0, StrainMag = 0.0;
-  for (iDim = 0; iDim < nDim; iDim++) {
-    for (jDim = 0 ; jDim < nDim; jDim++) {
-      StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
-      OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
-    }
-  }
-  StrainMag = sqrt(StrainMag); OmegaMag = sqrt(OmegaMag);
+  su2double s11 = Grad_Vel[0][0];
+  su2double s12 = 0.5 * (Grad_Vel[0][1] + Grad_Vel[1][0]);
+  su2double s13 = 0.5 * (Grad_Vel[0][2] + Grad_Vel[2][0]);
+  su2double s22 = Grad_Vel[1][1];
+  su2double s23 = 0.5 * (Grad_Vel[1][2] + Grad_Vel[2][1]);
+  su2double s33 = Grad_Vel[2][2];
+  su2double omega12 = 0.5 * (Grad_Vel[0][1] - Grad_Vel[1][0]);
+  su2double omega13 = 0.5 * (Grad_Vel[0][2] - Grad_Vel[2][0]);
+  su2double omega23 = 0.5 * (Grad_Vel[1][2] - Grad_Vel[2][1]);
   
-  su2double Q = 0.5*(OmegaMag - StrainMag);
+  su2double Q = 2. * pow( omega12, 2.) + 2. * pow( omega13, 2.) + 2. * pow( omega23, 2.) - \
+      pow( s11, 2.) - pow( s22, 2.) - pow( s33, 2.0) - 2. * pow( s12, 2.) - 2. * pow( s13, 2.) - 2. * pow( s23, 2.0);
   
   return Q;
 }
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index c456d9ed64fd..c5188f5d9987 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -604,28 +604,27 @@ void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
 
 su2double CFlowIncOutput::GetQ_Criterion(CConfig *config, CGeometry *geometry, CVariable* node_flow){
   
-  unsigned short iDim, jDim;
+  unsigned short iDim;
   su2double Grad_Vel[3][3] = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
-  su2double Omega[3][3]    = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
-  su2double Strain[3][3]   = {{0.0, 0.0, 0.0},{0.0, 0.0, 0.0},{0.0, 0.0, 0.0}};
+  
   for (iDim = 0; iDim < nDim; iDim++) {
     for (unsigned short jDim = 0 ; jDim < nDim; jDim++) {
       Grad_Vel[iDim][jDim] = node_flow->GetGradient_Primitive(iDim+1, jDim);
-      Strain[iDim][jDim]   = 0.5*(Grad_Vel[iDim][jDim] + Grad_Vel[jDim][iDim]);
-      Omega[iDim][jDim]    = 0.5*(Grad_Vel[iDim][jDim] - Grad_Vel[jDim][iDim]);
     }
   }
   
-  su2double OmegaMag = 0.0, StrainMag = 0.0;
-  for (iDim = 0; iDim < nDim; iDim++) {
-    for (jDim = 0 ; jDim < nDim; jDim++) {
-      StrainMag += Strain[iDim][jDim]*Strain[iDim][jDim];
-      OmegaMag  += Omega[iDim][jDim]*Omega[iDim][jDim];
-    }
-  }
-  StrainMag = sqrt(StrainMag); OmegaMag = sqrt(OmegaMag);
+  su2double s11 = Grad_Vel[0][0];
+  su2double s12 = 0.5 * (Grad_Vel[0][1] + Grad_Vel[1][0]);
+  su2double s13 = 0.5 * (Grad_Vel[0][2] + Grad_Vel[2][0]);
+  su2double s22 = Grad_Vel[1][1];
+  su2double s23 = 0.5 * (Grad_Vel[1][2] + Grad_Vel[2][1]);
+  su2double s33 = Grad_Vel[2][2];
+  su2double omega12 = 0.5 * (Grad_Vel[0][1] - Grad_Vel[1][0]);
+  su2double omega13 = 0.5 * (Grad_Vel[0][2] - Grad_Vel[2][0]);
+  su2double omega23 = 0.5 * (Grad_Vel[1][2] - Grad_Vel[2][1]);
   
-  su2double Q = 0.5*(OmegaMag - StrainMag);
+  su2double Q = 2. * pow( omega12, 2.) + 2. * pow( omega13, 2.) + 2. * pow( omega23, 2.) - \
+      pow( s11, 2.) - pow( s22, 2.) - pow( s33, 2.0) - 2. * pow( s12, 2.) - 2. * pow( s13, 2.) - 2. * pow( s23, 2.0);
   
   return Q;
 }

From 759ffb9d59781907120464acb36d181c735b0de1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 13 Sep 2019 17:14:22 +0200
Subject: [PATCH 470/539] Fixed FEM data sorters

---
 .../src/output/filewriter/CFEMDataSorter.cpp  | 19 +++++++++
 .../filewriter/CSurfaceFEMDataSorter.cpp      | 41 +++++++++++--------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 6e639d62d4bb..0c5f64ec4981 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -176,6 +176,19 @@ void CFEMDataSorter::SortOutputData() {
   delete [] send_req;
   delete [] recv_req;
 #endif
+  
+  su2double *tmpBuffer = new su2double[nPoint_Recv[size]];
+  
+  for (int jj = 0; jj < VARS_PER_POINT; jj++){
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      tmpBuffer[idRecv[ii]] = sortedDataBuffer[ii*VARS_PER_POINT+jj];
+    }
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      sortedDataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
+    }
+  }
+  
+  delete [] tmpBuffer;
 
   /*--- Store the total number of local points my rank has for
    the current section after completing the communications. ---*/
@@ -332,26 +345,32 @@ void CFEMDataSorter::SortVolumetricConnectivity(CConfig *config, CGeometry *geom
   switch (Elem_Type) {
     case TRIANGLE:
       nParallel_Tria = nSubElem_Local;
+      if (Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;      
       Conn_Tria_Par = Conn_SubElem;
       break;
     case QUADRILATERAL:
       nParallel_Quad = nSubElem_Local;
+      if (Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;            
       Conn_Quad_Par = Conn_SubElem;
       break;
     case TETRAHEDRON:
       nParallel_Tetr = nSubElem_Local;
+      if (Conn_Tetr_Par != NULL) delete [] Conn_Tetr_Par;                  
       Conn_Tetr_Par = Conn_SubElem;
       break;
     case HEXAHEDRON:
       nParallel_Hexa = nSubElem_Local;
+      if (Conn_Hexa_Par != NULL) delete [] Conn_Hexa_Par;                        
       Conn_Hexa_Par = Conn_SubElem;
       break;
     case PRISM:
       nParallel_Pris = nSubElem_Local;
+      if (Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;                        
       Conn_Pris_Par = Conn_SubElem;
       break;
     case PYRAMID:
       nParallel_Pyra = nSubElem_Local;
+      if (Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;                        
       Conn_Pyra_Par = Conn_SubElem;
       break;
     default:
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index a93b031c2159..168c2dfe1d9a 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -193,6 +193,10 @@ void CSurfaceFEMDataSorter::SortOutputData() {
   /* Allocate the memory for Parallel_Surf_Data. */
   nParallel_Poin = globalSurfaceDOFIDs.size();
   
+  if (sortedDataBuffer == nullptr){
+    sortedDataBuffer = new su2double[nParallel_Poin*VARS_PER_POINT];
+  }
+  
   /* Determine the local index of the global surface DOFs and
      copy the data into Parallel_Surf_Data. */
   for(unsigned long i=0; i<nParallel_Poin; ++i) {
@@ -302,27 +306,25 @@ void CSurfaceFEMDataSorter::SortOutputData() {
 }
 
 void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
-
-  if (!connectivity_sorted){
-    
-    if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-      cout <<"Sorting surface grid connectivity." << endl;
-    
-    
-    SortSurfaceConnectivity(config, geometry, LINE         );
-    SortSurfaceConnectivity(config, geometry, TRIANGLE     );
-    SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
-    
-    
-    unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
+  
+  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
+    cout <<"Sorting surface grid connectivity." << endl;
+  
+  
+  SortSurfaceConnectivity(config, geometry, LINE         );
+  SortSurfaceConnectivity(config, geometry, TRIANGLE     );
+  SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
+  
+  
+  unsigned long nTotal_Surf_Elem = nParallel_Line + nParallel_Tria + nParallel_Quad;
 #ifndef HAVE_MPI
-    nGlobal_Elem_Par   = nTotal_Surf_Elem;
+  nGlobal_Elem_Par   = nTotal_Surf_Elem;
 #else
-    SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+  SU2_MPI::Allreduce(&nTotal_Surf_Elem, &nGlobal_Elem_Par, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
 #endif
-    
-    connectivity_sorted = true;
-  }
+  
+  connectivity_sorted = true;
+  
 }
 
 
@@ -424,14 +426,17 @@ void CSurfaceFEMDataSorter::SortSurfaceConnectivity(CConfig *config, CGeometry *
     switch (Elem_Type) {
       case LINE:
         nParallel_Line = nSubElem_Local;
+        if (Conn_Line_Par != NULL) delete [] Conn_Line_Par;
         Conn_Line_Par = Conn_SubElem;
         break;
       case TRIANGLE:
         nParallel_Tria = nSubElem_Local;
+        if (Conn_Tria_Par != NULL) delete [] Conn_Tria_Par;        
         Conn_Tria_Par = Conn_SubElem;
         break;
       case QUADRILATERAL:
         nParallel_Quad = nSubElem_Local;
+        if (Conn_Quad_Par != NULL) delete [] Conn_Quad_Par;       
         Conn_Quad_Par = Conn_SubElem;
         break;
       default:

From afe01c06550b52328afb9e431282714501c01511 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 13 Sep 2019 18:13:48 +0200
Subject: [PATCH 471/539] Small fix

---
 SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp       | 1 -
 SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 0c5f64ec4981..216a37a3bce6 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -49,7 +49,6 @@ CFEMDataSorter::CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned sh
 
 CFEMDataSorter::~CFEMDataSorter(){
 
-  if (connSend != NULL)    delete [] connSend;
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 3a8c7cc5d45c..1f6a202212ea 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -74,7 +74,7 @@ void CSU2BinaryFileWriter::Write_Data(){
 
   /*--- Call to write the entire restart file data in binary in one shot. ---*/
 
-  fwrite(buf, nParallel_Poin*GlobalField_Counter, sizeof(passivedouble), fhw);
+  fwrite(dataSorter->GetData(), nParallel_Poin*GlobalField_Counter, sizeof(passivedouble), fhw);
   file_size += (su2double)nParallel_Poin*GlobalField_Counter*sizeof(passivedouble);
 
   /*--- Write the external iteration. ---*/

From 326397869870e7d44b1c8d80c81ae146907dda96 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 18 Sep 2019 12:27:16 +0200
Subject: [PATCH 472/539] Fixed reading of sensitivity

---
 Common/src/geometry_structure.cpp | 90 +++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 27 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index ae45f3cc69eb..e0c84f705f1a 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -13547,21 +13547,6 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   if (rank == MASTER_NODE)
     cout << "Reading in sensitivity at iteration " << nTimeIter-1 << "."<< endl;
   
-  unsigned short skipVar = nDim, skipMult = 1;
-
-  if (flow) {
-    skipVar += skipMult*(nDim+2);
-    if (sst && !frozen_visc) { skipVar += skipMult*2;}
-    if (sa && !frozen_visc)  { skipVar += skipMult*1;}
-    if (grid_movement)       { skipVar += nDim;}
-  }
-  else if (Kind_Solver == DISC_ADJ_HEAT) {
-    skipVar += 1;
-  }
-  else {
-    cout << "WARNING: Reading in sensitivities not defined for specified solver!" << endl;
-  }
-
   /*--- Read all lines in the restart file ---*/
   long iPoint_Local; unsigned long iPoint_Global = 0; string text_line;
   
@@ -13846,6 +13831,28 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     delete [] displace;
     
 #endif
+    
+    std::vector<string>::iterator itx = std::find(config->fields.begin(), config->fields.end(), "\"Sensitivity_x\"");
+    std::vector<string>::iterator ity = std::find(config->fields.begin(), config->fields.end(), "\"Sensitivity_y\"");
+    std::vector<string>::iterator itz = std::find(config->fields.begin(), config->fields.end(), "\"Sensitivity_z\"");
+    
+    if (itx == config->fields.end()){
+      SU2_MPI::Error("Sensitivity x not found in file.", CURRENT_FUNCTION);      
+    }
+    if (ity == config->fields.end()){
+      SU2_MPI::Error("Sensitivity y not found in file.", CURRENT_FUNCTION);      
+    }
+    if (nDim == 3){
+      if (itz == config->fields.end()){
+        SU2_MPI::Error("Sensitivity z not found in file.", CURRENT_FUNCTION);      
+      }
+    }
+    
+    int sens_x_idx = std::distance(config->fields.begin(), itx);    
+    int sens_y_idx = std::distance(config->fields.begin(), ity);    
+    int sens_z_idx = 0;
+    if (nDim == 3)
+      sens_z_idx = std::distance(config->fields.begin(), itz);    
 
     /*--- Load the data from the binary restart. ---*/
 
@@ -13862,9 +13869,15 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
         /*--- We need to store this point's data, so jump to the correct
          offset in the buffer of data from the restart file and load it. ---*/
 
-        index = counter*nFields + skipVar;
-        for (iDim = 0; iDim < nDim; iDim++) Sensitivity[iPoint_Local*nDim+iDim] = Restart_Data[index+iDim];
-
+        index = counter*nFields + sens_x_idx - 1;
+        Sensitivity[iPoint_Local*nDim+0] = Restart_Data[index]; 
+        index = counter*nFields + sens_y_idx - 1;
+        Sensitivity[iPoint_Local*nDim+1] = Restart_Data[index]; 
+        
+        if (nDim == 3){
+          index = counter*nFields + sens_z_idx - 1;
+          Sensitivity[iPoint_Local*nDim+2] = Restart_Data[index]; 
+        }
         /*--- Increment the overall counter for how many points have been loaded. ---*/
         counter++;
       }
@@ -13967,11 +13980,36 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
 
   getline (restart_file, text_line);
   
+  vector<string> fields = PrintingToolbox::split(text_line, ',');
+  
+  std::vector<string>::iterator itx = std::find(fields.begin(), fields.end(), "\"Sensitivity_x\"");
+  std::vector<string>::iterator ity = std::find(fields.begin(), fields.end(), "\"Sensitivity_y\"");
+  std::vector<string>::iterator itz = std::find(fields.begin(), fields.end(), "\"Sensitivity_z\"");
+  
+  if (itx == fields.end()){
+    SU2_MPI::Error("Sensitivity x not found in file.", CURRENT_FUNCTION);      
+  }
+  if (ity ==fields.end()){
+    SU2_MPI::Error("Sensitivity y not found in file.", CURRENT_FUNCTION);      
+  }
+  if (nDim == 3){
+    if (itz == fields.end()){
+      SU2_MPI::Error("Sensitivity z not found in file.", CURRENT_FUNCTION);      
+    }
+  }
+  
+  int sens_x_idx = std::distance(fields.begin(), itx);    
+  int sens_y_idx = std::distance(fields.begin(), ity);    
+  int sens_z_idx = 0;
+  if (nDim == 3)
+    sens_z_idx = std::distance(fields.begin(), itz);    
+  
+  
   for (iPoint_Global = 0; iPoint_Global < GetGlobal_nPointDomain(); iPoint_Global++ ) {
 
     getline (restart_file, text_line);
-
-  	istringstream point_line(text_line);
+    
+    vector<string> point_line = PrintingToolbox::split(text_line, ',');
 
     /*--- Retrieve local index. If this node from the restart file lives
      on the current processor, we will load and instantiate the vars. ---*/
@@ -13979,13 +14017,11 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     iPoint_Local = GetGlobal_to_Local_Point(iPoint_Global);
 
     if (iPoint_Local > -1) {
-
-      point_line >> index;
-      for (iDim = 0; iDim < skipVar; iDim++) { point_line >> dull_val;}
-      for (iDim = 0; iDim < nDim; iDim++) {
-        point_line >> Sens;
-        Sensitivity[iPoint_Local*nDim+iDim] = Sens;
-      }
+      Sensitivity[iPoint_Local*nDim+0] = PrintingToolbox::stod(point_line[sens_x_idx]);
+      Sensitivity[iPoint_Local*nDim+1] = PrintingToolbox::stod(point_line[sens_y_idx]);
+      if (nDim == 3)
+        Sensitivity[iPoint_Local*nDim+2] = PrintingToolbox::stod(point_line[sens_z_idx]);
+      
     }
 
   }

From b69c0b599a676375ef8ca37d924880c552fefec8 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 18 Sep 2019 12:28:16 +0200
Subject: [PATCH 473/539] Fixed data sorter if using AD type

---
 .../output/filewriter/CFEMDataSorter.hpp      |   9 +-
 .../output/filewriter/CFVMDataSorter.hpp      |   7 -
 .../output/filewriter/CParallelDataSorter.hpp |   9 +-
 .../src/output/filewriter/CFEMDataSorter.cpp  | 153 +--------------
 .../src/output/filewriter/CFVMDataSorter.cpp  | 150 +--------------
 .../output/filewriter/CParallelDataSorter.cpp | 174 +++++++++++++++++-
 .../filewriter/CParaviewBinaryFileWriter.cpp  |   6 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |   7 +-
 .../filewriter/CSurfaceFVMDataSorter.cpp      |   7 +-
 .../filewriter/CTecplotBinaryFileWriter.cpp   |   8 +-
 10 files changed, 193 insertions(+), 337 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
index 3a9fa6a73ea6..94a8505345ce 100644
--- a/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp
@@ -55,14 +55,7 @@ class CFEMDataSorter final: public CParallelDataSorter{
    * \brief Destructor
    */
   ~CFEMDataSorter() override;
-  
-  /*!
-   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData() override;
-  
+
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
index b65172005468..712764f8b74e 100644
--- a/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp
@@ -61,13 +61,6 @@ class CFVMDataSorter final: public CParallelDataSorter{
    */
   ~CFVMDataSorter() override;
   
-  /*!
-   * \brief Sort the output data for each grid node into a linear partitioning across all processors.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   */
-  void SortOutputData() override;
-  
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures used for output file writing.
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index fcbcc1fc2e25..8cbb9013425b 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -89,8 +89,7 @@ class CParallelDataSorter{
   int *nPoint_Recv;                    //!< Number of points this processor receives from other processors
   unsigned long *Index;                //!< Index each point has in the send buffer
   su2double *connSend;                 //!< Send buffer holding the data that will be send to other processors
-  su2double *sortedDataBuffer;                 //!< Send buffer holding the data that will be send to other processors
-  
+  passivedouble *dataBuffer;
   unsigned long *idSend;               //!< Send buffer holding global indices that will be send to other processors
   int nSends,                          //!< Number of sends
   nRecvs;                              //!< Number of receives
@@ -120,7 +119,7 @@ class CParallelDataSorter{
   /*!
    * \brief Sort the output data for each grid node into a linear partitioning across all processors.
    */
-  virtual void SortOutputData(){}
+  virtual void SortOutputData();
 
   /*!
    * \brief Sort the connectivities (volume and surface) into data structures.
@@ -190,13 +189,13 @@ class CParallelDataSorter{
    * \input iPoint - the point ID.
    * \return the value of the data field at a point.
    */
-  su2double GetData(unsigned short iField, unsigned long iPoint) {return sortedDataBuffer[iPoint*GlobalField_Counter + iField];}
+  passivedouble GetData(unsigned short iField, unsigned long iPoint) {return dataBuffer[iPoint*GlobalField_Counter + iField];}
   
   /*!
    * \brief Get the pointer to the sorted linear partitioned data.
    * \return Pointer to the sorted data.
    */
-  su2double *GetData() {return sortedDataBuffer;}
+  passivedouble *GetData() {return dataBuffer;}
   
   /*!
    * \brief Get the global index of a point.
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 216a37a3bce6..a04fde055cb7 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -52,162 +52,11 @@ CFEMDataSorter::~CFEMDataSorter(){
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
+  if (dataBuffer != NULL) delete [] reinterpret_cast<su2double*>(dataBuffer);
   
 }
 
 
-void CFEMDataSorter::SortOutputData() {
-
-  /* For convenience, set the total number of variables stored at each DOF. */
-
-  int VARS_PER_POINT = GlobalField_Counter;
-
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
-  for (int ii = 0; ii < nPoint_Recv[size]; ii++)
-    idRecv[ii] = 0;
-
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the global IDs. ---*/
-
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = VARS_PER_POINT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(sortedDataBuffer[ll]), count, MPI_DOUBLE, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = VARS_PER_POINT*nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = VARS_PER_POINT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-
-  /*--- Repeat the process to communicate the global IDs. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-
-  int mm = VARS_PER_POINT*nPoint_Recv[rank];
-  int ll = VARS_PER_POINT*nPoint_Send[rank];
-  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
-
-  for (int nn=ll; nn<kk; nn++, mm++) sortedDataBuffer[mm] = connSend[nn];
-
-  mm = nPoint_Recv[rank];
-  ll = nPoint_Send[rank];
-  kk = nPoint_Send[rank+1];
-
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  su2double *tmpBuffer = new su2double[nPoint_Recv[size]];
-  
-  for (int jj = 0; jj < VARS_PER_POINT; jj++){
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      tmpBuffer[idRecv[ii]] = sortedDataBuffer[ii*VARS_PER_POINT+jj];
-    }
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      sortedDataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
-    }
-  }
-  
-  delete [] tmpBuffer;
-
-  /*--- Store the total number of local points my rank has for
-   the current section after completing the communications. ---*/
-
-  nParallel_Poin = nPoint_Recv[size];
-
-  /*--- Reduce the total number of points we will write in the output files. ---*/
-
-#ifndef HAVE_MPI
-  nGlobal_Poin_Par = nParallel_Poin;
-#else
-  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-
-  /*--- Free temporary memory from communications ---*/
-
-  delete [] idRecv;
-  
-}
 
 
 void CFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 2e31aaedbc34..cd4d78a4a7ba 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -44,6 +44,8 @@ CFVMDataSorter::~CFVMDataSorter(){
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
+  if (dataBuffer != NULL) delete [] reinterpret_cast<su2double*>(dataBuffer);
+  
 }
 
 void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
@@ -76,154 +78,6 @@ void CFVMDataSorter::SetHaloPoints(CGeometry *geometry, CConfig *config){
 }
 
 
-void CFVMDataSorter::SortOutputData() {
-  
-  int VARS_PER_POINT = GlobalField_Counter;
-  
-#ifdef HAVE_MPI
-  SU2_MPI::Request *send_req, *recv_req;
-  SU2_MPI::Status status;
-  int ind;
-#endif
-  
-  /*--- Allocate the memory that we need for receiving the conn
-   values and then cue up the non-blocking receives. Note that
-   we do not include our own rank in the communications. We will
-   directly copy our own data later. ---*/
-
-  
-  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
-  
-#ifdef HAVE_MPI
-  /*--- We need double the number of messages to send both the conn.
-   and the global IDs. ---*/
-  
-  send_req = new SU2_MPI::Request[2*nSends];
-  recv_req = new SU2_MPI::Request[2*nRecvs];
-  
-  unsigned long iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = VARS_PER_POINT*kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(sortedDataBuffer[ll]), count, MPI_DOUBLE, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the connectivity. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = VARS_PER_POINT*nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = VARS_PER_POINT*kk;
-      int dest = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Repeat the process to communicate the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
-      int ll     = nPoint_Recv[ii];
-      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
-      int count  = kk;
-      int source = ii;
-      int tag    = ii + 1;
-      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
-                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
-      iMessage++;
-    }
-  }
-  
-  /*--- Launch the non-blocking sends of the global IDs. ---*/
-  
-  iMessage = 0;
-  for (int ii=0; ii<size; ii++) {
-    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
-      int ll = nPoint_Send[ii];
-      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
-      int count  = kk;
-      int dest   = ii;
-      int tag    = rank + 1;
-      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
-                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
-      iMessage++;
-    }
-  }
-#endif
-  
-  /*--- Copy my own rank's data into the recv buffer directly. ---*/
-  
-  int mm = VARS_PER_POINT*nPoint_Recv[rank];
-  int ll = VARS_PER_POINT*nPoint_Send[rank];
-  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) sortedDataBuffer[mm] = connSend[nn];
-  
-  mm = nPoint_Recv[rank];
-  ll = nPoint_Send[rank];
-  kk = nPoint_Send[rank+1];
-  
-  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
-  
-  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
-  
-#ifdef HAVE_MPI
-  int number = 2*nSends;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, send_req, &ind, &status);
-  
-  number = 2*nRecvs;
-  for (int ii = 0; ii < number; ii++)
-    SU2_MPI::Waitany(number, recv_req, &ind, &status);
-  
-  delete [] send_req;
-  delete [] recv_req;
-#endif
-  
-  su2double *tmpBuffer = new su2double[nPoint_Recv[size]];
-  
-  for (int jj = 0; jj < VARS_PER_POINT; jj++){
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      tmpBuffer[idRecv[ii]] = sortedDataBuffer[ii*VARS_PER_POINT+jj];
-    }
-    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      sortedDataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
-    }
-  }
-  
-  delete [] tmpBuffer;
-  
-  /*--- Store the total number of local points my rank has for
-   the current section after completing the communications. ---*/
-  
-  nParallel_Poin = nPoint_Recv[size];
-  
-  /*--- Reduce the total number of points we will write in the output files. ---*/
-
-#ifndef HAVE_MPI
-  nGlobal_Poin_Par = nParallel_Poin;
-#else
-  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
-                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
-#endif
-  
-  /*--- Free temporary memory from communications ---*/
-  
-  delete [] idRecv;
-}
 
 
 void CFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index ee0b2a8b2e75..3430fdced69f 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -27,7 +27,7 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   nPoint_Recv  = NULL;
   Index        = NULL;
   connSend     = NULL;
-  sortedDataBuffer     = NULL;  
+  dataBuffer   = NULL;
   idSend       = NULL;
   nSends = 0;
   nRecvs = 0;
@@ -57,7 +57,6 @@ CParallelDataSorter::~CParallelDataSorter(){
   if (nParallel_Pris > 0 && Conn_Pris_Par != NULL) delete [] Conn_Pris_Par;
   if (nParallel_Pyra > 0 && Conn_Pyra_Par != NULL) delete [] Conn_Pyra_Par;
   
-  if (sortedDataBuffer != NULL) delete [] sortedDataBuffer;
   if (connSend != NULL) delete [] connSend;
   
   
@@ -105,6 +104,170 @@ unsigned long CParallelDataSorter::GetnElem(GEO_TYPE type){
   return 0;
 }
 
+void CParallelDataSorter::SortOutputData() {
+  
+  int VARS_PER_POINT = GlobalField_Counter;
+  
+#ifdef HAVE_MPI
+  SU2_MPI::Request *send_req, *recv_req;
+  SU2_MPI::Status status;
+  int ind;
+#endif
+  
+  /*--- Use the data buffer to temporarily hold data (using AD datatype) after receiving it ---*/
+  
+  su2double *tempRecvBuffer = reinterpret_cast<su2double*>(dataBuffer);
+  
+  /*--- Allocate the memory that we need for receiving the conn
+   values and then cue up the non-blocking receives. Note that
+   we do not include our own rank in the communications. We will
+   directly copy our own data later. ---*/
+
+  
+  unsigned long *idRecv = new unsigned long[nPoint_Recv[size]]();
+  
+#ifdef HAVE_MPI
+  /*--- We need double the number of messages to send both the conn.
+   and the global IDs. ---*/
+  
+  send_req = new SU2_MPI::Request[2*nSends];
+  recv_req = new SU2_MPI::Request[2*nRecvs];
+  
+  unsigned long iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = VARS_PER_POINT*nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = VARS_PER_POINT*kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(tempRecvBuffer[ll]), count, MPI_DOUBLE, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the connectivity. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = VARS_PER_POINT*nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = VARS_PER_POINT*kk;
+      int dest = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(connSend[ll]), count, MPI_DOUBLE, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Repeat the process to communicate the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Recv[ii+1] > nPoint_Recv[ii])) {
+      int ll     = nPoint_Recv[ii];
+      int kk     = nPoint_Recv[ii+1] - nPoint_Recv[ii];
+      int count  = kk;
+      int source = ii;
+      int tag    = ii + 1;
+      SU2_MPI::Irecv(&(idRecv[ll]), count, MPI_UNSIGNED_LONG, source, tag,
+                     MPI_COMM_WORLD, &(recv_req[iMessage+nRecvs]));
+      iMessage++;
+    }
+  }
+  
+  /*--- Launch the non-blocking sends of the global IDs. ---*/
+  
+  iMessage = 0;
+  for (int ii=0; ii<size; ii++) {
+    if ((ii != rank) && (nPoint_Send[ii+1] > nPoint_Send[ii])) {
+      int ll = nPoint_Send[ii];
+      int kk = nPoint_Send[ii+1] - nPoint_Send[ii];
+      int count  = kk;
+      int dest   = ii;
+      int tag    = rank + 1;
+      SU2_MPI::Isend(&(idSend[ll]), count, MPI_UNSIGNED_LONG, dest, tag,
+                     MPI_COMM_WORLD, &(send_req[iMessage+nSends]));
+      iMessage++;
+    }
+  }
+#endif
+  
+  /*--- Copy my own rank's data into the recv buffer directly. ---*/
+  
+  int mm = VARS_PER_POINT*nPoint_Recv[rank];
+  int ll = VARS_PER_POINT*nPoint_Send[rank];
+  int kk = VARS_PER_POINT*nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) tempRecvBuffer[mm] = connSend[nn];
+  
+  mm = nPoint_Recv[rank];
+  ll = nPoint_Send[rank];
+  kk = nPoint_Send[rank+1];
+  
+  for (int nn=ll; nn<kk; nn++, mm++) idRecv[mm] = idSend[nn];
+  
+  /*--- Wait for the non-blocking sends and recvs to complete. ---*/
+  
+#ifdef HAVE_MPI
+  int number = 2*nSends;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, send_req, &ind, &status);
+  
+  number = 2*nRecvs;
+  for (int ii = 0; ii < number; ii++)
+    SU2_MPI::Waitany(number, recv_req, &ind, &status);
+  
+  delete [] send_req;
+  delete [] recv_req;
+#endif
+  
+  /*--- Note, dataBuffer and tempRecvBuffer point to the same address.
+   * This is the reason why we have to do the following copy/reordering in two steps. ---*/
+  
+  /*--- Step 1: Extract the underlying double value --- */
+  
+  if (sizeof(passivedouble) != sizeof(su2double)){
+    for (int jj = 0; jj < VARS_PER_POINT*nPoint_Recv[size]; jj++){
+      dataBuffer[jj] = SU2_TYPE::GetValue(tempRecvBuffer[jj]);
+    } 
+  }
+  
+  /*--- Step 2: Reorder the data in the buffer --- */
+  
+  passivedouble *tmpBuffer = new passivedouble[nPoint_Recv[size]];
+  for (int jj = 0; jj < VARS_PER_POINT; jj++){
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      tmpBuffer[idRecv[ii]] = dataBuffer[ii*VARS_PER_POINT+jj];
+    }
+    for (int ii = 0; ii < nPoint_Recv[size]; ii++){
+      dataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
+    }
+  }
+  
+  delete [] tmpBuffer;
+  
+  /*--- Store the total number of local points my rank has for
+   the current section after completing the communications. ---*/
+  
+  nParallel_Poin = nPoint_Recv[size];
+  
+  /*--- Reduce the total number of points we will write in the output files. ---*/
+
+#ifndef HAVE_MPI
+  nGlobal_Poin_Par = nParallel_Poin;
+#else
+  SU2_MPI::Allreduce(&nParallel_Poin, &nGlobal_Poin_Par, 1,
+                     MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD);
+#endif
+  
+  /*--- Free temporary memory from communications ---*/
+  
+  delete [] idRecv;
+}
 
 void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalID){
   
@@ -162,8 +325,11 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
   connSend = NULL;
   connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]]();
   
-  sortedDataBuffer = NULL;
-  sortedDataBuffer = new su2double[VARS_PER_POINT*nPoint_Recv[size]]();
+  
+  /*--- Allocate the data buffer to hold the sorted data.
+   * It should be big enough to also temporarily hold the data received using the AD type ---*/
+  
+  dataBuffer = reinterpret_cast<passivedouble*>(new su2double[VARS_PER_POINT*nPoint_Recv[size]]());
   
   /*--- Allocate arrays for sending the global ID. ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index b414e04b6ba3..643ef69a61a5 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -535,7 +535,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
       if (nDim == 2 && iDim == 2) {
         coord_buf[iPoint*NCOORDS + iDim] = 0.0;
       } else {
-        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(iDim, iPoint));
+        float val = (float)dataSorter->GetData(iDim, iPoint);
         coord_buf[iPoint*NCOORDS + iDim] = val;
       }
     }
@@ -928,7 +928,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
           if (nDim == 2 && iDim == 2) {
             vec_buf[iPoint*NCOORDS + iDim] = 0.0;
           } else {
-            val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter+iDim,iPoint));
+            val = (float)dataSorter->GetData(VarCounter+iDim,iPoint);
             vec_buf[iPoint*NCOORDS + iDim] = val;
           }
         }
@@ -1003,7 +1003,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
        This will be replaced with a derived data type most likely. ---*/
       
       for (iPoint = 0; iPoint < myPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter,iPoint));
+        float val = (float)dataSorter->GetData(VarCounter,iPoint);
         scalar_buf[iPoint] = val;
       }
       if (!BigEndian) SwapBytes((char *)scalar_buf, sizeof(float), myPoint);
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 168c2dfe1d9a..0a77929c9e17 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -43,6 +43,7 @@ CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometr
 CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){
 
   if (linearPartitioner != NULL) delete linearPartitioner;
+  if (dataBuffer != NULL) delete [] dataBuffer;
   
 }
 
@@ -193,8 +194,8 @@ void CSurfaceFEMDataSorter::SortOutputData() {
   /* Allocate the memory for Parallel_Surf_Data. */
   nParallel_Poin = globalSurfaceDOFIDs.size();
   
-  if (sortedDataBuffer == nullptr){
-    sortedDataBuffer = new su2double[nParallel_Poin*VARS_PER_POINT];
+  if (dataBuffer == nullptr){
+    dataBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
   }
   
   /* Determine the local index of the global surface DOFs and
@@ -203,7 +204,7 @@ void CSurfaceFEMDataSorter::SortOutputData() {
     const unsigned long ii = globalSurfaceDOFIDs[i] - linearPartitioner->GetCumulativeSizeBeforeRank(rank);
 
     for(int jj=0; jj<VARS_PER_POINT; jj++)
-      sortedDataBuffer[i*VARS_PER_POINT+jj] = volume_sorter->GetData(jj,ii);
+      dataBuffer[i*VARS_PER_POINT+jj] = volume_sorter->GetData(jj,ii);
   }
 
   /*--- Reduce the total number of surf points we have. This will be
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 9b7a80f9c900..12898b12e65b 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -19,6 +19,7 @@ CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, CGeometry *geometr
 CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){
   
   if (linearPartitioner != NULL) delete linearPartitioner;
+  if (dataBuffer != NULL) delete [] dataBuffer;
   
 }
 
@@ -411,14 +412,14 @@ void CSurfaceFVMDataSorter::SortOutputData() {
    we can allocate the new data structure to hold these points alone. Here,
    we also copy the data for those points from our volume data structure. ---*/
   
-  if (sortedDataBuffer == nullptr){
-    sortedDataBuffer = new su2double[nParallel_Poin*VARS_PER_POINT];
+  if (dataBuffer == nullptr){
+    dataBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
   }
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
     count = 0;
     for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
       if (surfPoint[ii] !=-1) {
-        sortedDataBuffer[count*VARS_PER_POINT + jj] = volume_sorter->GetData(jj,ii);
+        dataBuffer[count*VARS_PER_POINT + jj] = volume_sorter->GetData(jj,ii);
         count++;
       }
     }
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index df220f0bf430..11a9f5b4f48f 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -250,7 +250,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
       for(iVar = 0; iVar < fieldnames.size(); ++iVar)
         for(int iNode = 0; iNode < num_nodes_to_send[iRank]; ++iNode) {
           unsigned long node_offset = nodes_to_send[nodes_to_send_displacements[iRank] + iNode] - dataSorter->GetNodeBegin(rank) - 1;
-          data_to_send[index++] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,node_offset));
+          data_to_send[index++] =dataSorter->GetData(iVar,node_offset);
         }
     }
     SU2_MPI::Alltoallv(&data_to_send[0],  &num_values_to_send[0],    &values_to_send_displacements[0],    MPI_DOUBLE,
@@ -269,7 +269,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
     std::vector<passivedouble> values_to_write(dataSorter->GetnPoints());
     for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
       for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
-        values_to_write[i] = SU2_TYPE::GetValue(dataSorter->GetData(iVar, i));
+        values_to_write[i] = dataSorter->GetData(iVar, i);
       err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, rank + 1, dataSorter->GetnPoints(), &values_to_write[0]);
       if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
       for (int iRank = 0; err == 0 && iRank < size; ++iRank) {
@@ -296,7 +296,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
             for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
               values_to_write.resize(rank_num_points);
               for(unsigned long i = 0; i < (unsigned long)rank_num_points; ++i)
-                values_to_write[i] = SU2_TYPE::GetValue(dataSorter->GetData(iVar,i));
+                values_to_write[i] = dataSorter->GetData(iVar,i);
               err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &values_to_write[0]); 
               if (err) cout << rank << ": Error outputting Tecplot variable values." << endl;
             }
@@ -322,7 +322,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
       var_data.reserve(var_data_size);
       for (iVar = 0; err == 0 && iVar < fieldnames.size() ; iVar++)
           for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
-            var_data.push_back(SU2_TYPE::GetValue(dataSorter->GetData(iVar,i)));
+            var_data.push_back(dataSorter->GetData(iVar,i));
       
       if (var_data.size() > 0)
         SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);

From 098a56a96251e7027afd019d265b2175b0cbc601 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 18 Sep 2019 12:28:37 +0200
Subject: [PATCH 474/539] Enabled output for SU2_DOT again

---
 SU2_DOT/src/SU2_DOT.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 9e349bc79d12..8131c5c8fcd7 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -989,21 +989,29 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
     output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0]->GetnDim(), solver);
     output->PreprocessVolumeOutput(config[iZone]);
     
-//    /*--- Load the data --- */
+    /*--- Load the data --- */
     
-//    output->Load_Data(geometry[iZone][INST_0], config[iZone], &solver);
+    output->Load_Data(geometry[iZone][INST_0], config[iZone], &solver);
 
-//    /*--- Set the surface filename ---*/
+    /*--- Set the surface filename ---*/
     
-//    output->SetSurface_Filename(config[iZone]->GetSurfSens_FileName());
+    output->SetSurface_Filename(config[iZone]->GetSurfSens_FileName());
     
-//    /*--- Write to file ---*/
+    /*--- Set the surface filename ---*/
     
-//    output->SetSurface_Output(geometry[iZone][INST_0], config[iZone], config[iZone]->GetOutput_FileFormat(), false);
-
-//    /*--- Deallocate ---*/
+    output->SetVolume_Filename(config[iZone]->GetVolSens_FileName());
+    
+    /*--- Write to file ---*/
+    
+    for (unsigned short iFile = 0; iFile < config[iZone]->GetnVolumeOutputFiles(); iFile++){
+      unsigned short* FileFormat = config[iZone]->GetVolumeOutputFiles();
+      if (FileFormat[iFile] != RESTART_ASCII && FileFormat[iFile] != RESTART_BINARY)
+        output->WriteToFile(config[iZone], geometry[iZone][INST_0], FileFormat[iFile]);
+    }
+    
+    /*--- Deallocate ---*/
     
-//    output->DeallocateData_Parallel();
+    output->DeallocateData_Parallel();
     
     /*--- Free memory ---*/
     

From ed398995612a78cbfd282ca1eb947eac010edebd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 18 Sep 2019 13:42:36 +0200
Subject: [PATCH 475/539] Some fixes for filewriters

---
 SU2_CFD/src/iteration_structure.cpp                       | 6 +++---
 .../src/output/filewriter/CParaviewBinaryFileWriter.cpp   | 8 ++++----
 .../src/output/filewriter/CTecplotBinaryFileWriter.cpp    | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index d14cf2ed3fd7..a45c9c2a7def 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -456,9 +456,9 @@ void CIteration::Output(COutput *output,
     unsigned short val_iInst)      {
 
   
-  output->SetResult_Files(geometry[ZONE_0][INST_0][MESH_0],
-                          config[ZONE_0],
-                          solver[ZONE_0][INST_0][MESH_0], InnerIter);
+  output->SetResult_Files(geometry[val_iZone][INST_0][MESH_0],
+                          config[val_iZone],
+                          solver[val_iZone][INST_0][MESH_0], InnerIter);
   
 
 }
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 643ef69a61a5..56173d3d587c 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -61,7 +61,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
   
   if (!fhw) {
     SU2_MPI::Error(string("Unable to open VTK binary legacy file ") +
-                   filename, CURRENT_FUNCTION);
+                   fileName, CURRENT_FUNCTION);
   }
   
   /*--- File header written in ASCII. ---*/
@@ -98,7 +98,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
       if (nDim == 2 && iDim == 2) {
         coord_buf[iPoint*NCOORDS + iDim] = 0.0;
       } else {
-        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(iDim,iPoint));
+        float val = (float)dataSorter->GetData(iDim,iPoint);
         coord_buf[iPoint*NCOORDS + iDim] = val;
       }
     }
@@ -371,7 +371,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
           if (nDim == 2 && iDim == 2) {
             vec_buf[iPoint*NCOORDS + iDim] = 0.0;
           } else {
-            val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter+iDim,iPoint));
+            val = (float)dataSorter->GetData(VarCounter+iDim,iPoint);
             vec_buf[iPoint*NCOORDS + iDim] = val;
           }
         }
@@ -402,7 +402,7 @@ void CParaviewBinaryFileWriter::Write_Data(){
        This will be replaced with a derived data type most likely. ---*/
       
       for (iPoint = 0; iPoint < GlobalPoint; iPoint++) {
-        float val = (float)SU2_TYPE::GetValue(dataSorter->GetData(VarCounter,iPoint));
+        float val = (float)dataSorter->GetData(VarCounter,iPoint);
         scalar_buf[iPoint] = val;
       }
       if (!BigEndian)
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 11a9f5b4f48f..0e4fc8ea3b5d 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -303,7 +303,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
           }
           else { /* Receive data from other rank. */
             var_data.resize(max((int64_t)1, (int64_t)fieldnames.size() * rank_num_points));
-            SU2_MPI::Recv(&var_data[0], fieldnames.size() * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+            CBaseMPIWrapper::Recv(&var_data[0], fieldnames.size() * rank_num_points, MPI_DOUBLE, iRank, iRank, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
             for (iVar = 0; err == 0 && iVar < fieldnames.size(); iVar++) {
               err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, rank_num_points, &var_data[iVar * rank_num_points]);
               if (err) cout << rank << ": Error outputting Tecplot surface variable values." << endl;
@@ -325,7 +325,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
             var_data.push_back(dataSorter->GetData(iVar,i));
       
       if (var_data.size() > 0)
-        SU2_MPI::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
+        CBaseMPIWrapper::Send(&var_data[0], static_cast<int>(var_data.size()), MPI_DOUBLE, MASTER_NODE, rank, MPI_COMM_WORLD);
     }
   }
 
@@ -340,7 +340,7 @@ void CTecplotBinaryFileWriter::Write_Data(){
 
   for (iVar = 0; err == 0 && iVar <  fieldnames.size(); iVar++) {
     for(unsigned long i = 0; i < dataSorter->GetnPoints(); ++i)
-      var_data.push_back(SU2_TYPE::GetValue(dataSorter->GetData(iVar,i)));
+      var_data.push_back(dataSorter->GetData(iVar,i));
     err = tecZoneVarWriteDoubleValues(file_handle, zone, iVar + 1, 0, dataSorter->GetnPoints(), &var_data[iVar * dataSorter->GetnPoints()]);
     if (err) cout << rank << ": Error outputting Tecplot variable value." << endl;
   }

From 1cc1304f0c48b70eeb882922e5f00ad36a733288 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 12:23:48 +0200
Subject: [PATCH 476/539] Added formatting of history file

---
 Common/include/config_structure.hpp           |  4 +-
 Common/include/toolboxes/printing_toolbox.hpp | 22 ++++-
 Common/src/config_structure.cpp               | 10 +--
 Common/src/toolboxes/printing_toolbox.cpp     | 21 ++++-
 SU2_CFD/include/output/COutput.hpp            |  1 +
 SU2_CFD/src/output/CDriverOutput.cpp          |  7 ++
 SU2_CFD/src/output/COutput.cpp                | 88 +++++++++----------
 .../src/output/output_structure_legacy.cpp    |  5 +-
 8 files changed, 95 insertions(+), 63 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 7d73c03bb627..52398dccb7e9 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5432,7 +5432,7 @@ class CConfig {
    * \brief Append the zone index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
    */
-  string GetMultizone_HistoryFileName(string val_filename, int val_iZone);
+  string GetMultizone_HistoryFileName(string val_filename, int val_iZone, string ext);
   
   /*!
    * \brief Append the instance index to the restart or the solution files.
@@ -5506,7 +5506,7 @@ class CConfig {
    * \param[in] val_iter - Unsteady iteration number or time instance.
    * \return Name of the file with the iteration number for an unsteady solution file.
    */
-  string GetUnsteady_FileName(string val_filename, int val_iter, string ext);
+  string GetUnsteady_FileName(string val_filename, unsigned long val_iter, string ext);
   
   /*!
    * \brief Append the input filename string with the appropriate objective function extension.
diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index a44656c65f23..2833ff2ec42e 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -69,6 +69,12 @@ class CTablePrinter{
    */
   void SetSeparator(const std::string & separator);
   
+  /*!
+   * \brief Set the separator between columns (inner decoration)
+   * \param[in] separator - The separation character.
+   */
+  void SetInnerSeparator(const std::string & inner_separator);
+  
   /*!
    * \brief Set the alignment of the table entries (CENTER only works for the header at the moment).
    * \param[in] align_ - The alignment (CENTER, LEFT, RIGHT).
@@ -105,13 +111,18 @@ class CTablePrinter{
    */
   void PrintFooter();
   
+  /*!
+   * \brief Set the floating point precision.
+   */
+  void SetPrecision(int precision);
+  
   template<typename T> CTablePrinter& operator<<(T input){
 
     int indent = 0;
 
     /* --- Set the left separator --- */
     if (j_ == 0)
-      *out_stream_ << "|";
+      *out_stream_ << separator_;
 
     /* --- Determine and set the current alignment in the stream --- */
     if(align_ == LEFT)
@@ -121,16 +132,16 @@ class CTablePrinter{
 
     /*--- Print the current column value to the stream --- */
     *out_stream_ << std::setw(column_widths_.at(j_) - indent)
-                 << input;
+                 << std::setprecision(precision_) << input;
 
     /*--- Reset the column counter and if it is the last column, 
      * add also a line break ---*/
     if (j_ == GetNumColumns()-1){
-      *out_stream_ << std::setw(indent+2) << "|\n";
+      *out_stream_ << std::setw(indent+1+(int)separator_.size()) << separator_ + "\n";
       i_ = i_ + 1;
       j_ = 0;
     } else {
-      *out_stream_ << std::setw(indent+1) << separator_;
+      *out_stream_ << std::setw(indent+(int)inner_separator_.size()) << inner_separator_;
       j_ = j_ + 1;
     }
 
@@ -148,7 +159,10 @@ class CTablePrinter{
   std::vector<std::string> column_headers_; /*< \brief Vector of column header names. */
   std::vector<int> column_widths_;          /*< \brief Vector of column widths. */
   std::string separator_;                   /*< \brief Column separator char. */
+  std::string inner_separator_;             /*< \brief Inner column separator char. */
 
+  int precision_;                           /*< \brief Floating point precision */  
+  
   int i_; /*< \brief Index of the current row. */
   int j_; /*< \brief Index of the current column. */
 
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index cb731b1f68d0..feece4f03ed3 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7489,7 +7489,7 @@ string CConfig::GetFilename(string filename, string ext, unsigned long Iter){
   return filename;
 }
 
-string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string ext) {
+string CConfig::GetUnsteady_FileName(string val_filename, unsigned long val_iter, string ext) {
 
   string UnstExt="", UnstFilename = val_filename;
   char buffer[50];
@@ -7534,17 +7534,17 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, string
     return multizone_filename;
 }
 
-string CConfig::GetMultizone_HistoryFileName(string val_filename, int val_iZone) {
+string CConfig::GetMultizone_HistoryFileName(string val_filename, int val_iZone, string ext) {
 
     string multizone_filename = val_filename;
     char buffer[50];
-
+    unsigned short lastindex = multizone_filename.find_last_of(".");
+    multizone_filename = multizone_filename.substr(0, lastindex);
     if (GetnZone() > 1 ) {
-        unsigned short lastindex = multizone_filename.find_last_of(".");
-        multizone_filename = multizone_filename.substr(0, lastindex);
         SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
         multizone_filename.append(string(buffer));
     }
+    multizone_filename += ext;
     return multizone_filename;
 }
 
diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
index eb5775f0e37d..c51e0f9018d0 100644
--- a/Common/src/toolboxes/printing_toolbox.cpp
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -12,6 +12,8 @@ PrintingToolbox::CTablePrinter::CTablePrinter(std::ostream * output, const std::
   print_header_bottom_line_ = true;
   print_header_top_line_    = true;
   align_ = RIGHT;
+  inner_separator_ = separator;
+  precision_ = 6;
 }
 
 PrintingToolbox::CTablePrinter::~CTablePrinter(){
@@ -30,6 +32,10 @@ void PrintingToolbox::CTablePrinter::SetSeparator(const std::string &separator){
   separator_ = separator;
 }
 
+void PrintingToolbox::CTablePrinter::SetInnerSeparator(const std::string &inner_separator){
+  inner_separator_ = inner_separator;
+}
+
 void PrintingToolbox::CTablePrinter::SetPrintHeaderBottomLine(bool print){
   print_header_bottom_line_ = print;
 }
@@ -42,6 +48,10 @@ void PrintingToolbox::CTablePrinter::SetAlign(int align){
   align_ = align;
 }
 
+void PrintingToolbox::CTablePrinter::SetPrecision(int precision){
+  precision_ = precision;
+}
+
 void PrintingToolbox::CTablePrinter::AddColumn(const std::string & header_name, int column_width){
   if (column_width < 4){
     throw std::invalid_argument("Column size has to be >= 4");
@@ -67,7 +77,7 @@ void PrintingToolbox::CTablePrinter::PrintHeader(){
   
   
   if (print_header_top_line_) PrintHorizontalLine();
-  *out_stream_ << "|";
+  *out_stream_ << separator_;
   int indent = 0;
   for (int i=0; i<GetNumColumns(); ++i){
     
@@ -88,12 +98,15 @@ void PrintingToolbox::CTablePrinter::PrintHeader(){
 
     *out_stream_ << std::setw(column_widths_.at(i) - indent) << column_headers_.at(i).substr(0, column_widths_.at(i));
     if (i != GetNumColumns()-1){
-      *out_stream_ << std::setw(1+indent) << separator_;
+      *out_stream_ << std::setw(indent+(int)inner_separator_.size()) << inner_separator_;
     }
   }
 
-  *out_stream_ << std::setw(2+indent) << "|\n";
-  if (print_header_bottom_line_) PrintHorizontalLine();
+  *out_stream_ << std::setw((int)separator_.size()+indent) << separator_;
+  if (print_header_bottom_line_){
+    *out_stream_ << "\n";
+    PrintHorizontalLine();
+  }
 }
 
 void PrintingToolbox::CTablePrinter::PrintFooter(){
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 1508de5c3bbf..a8e9c13bc42f 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -158,6 +158,7 @@ class COutput {
 
   PrintingToolbox::CTablePrinter* convergenceTable;     //!< Convergence  output table structure
   PrintingToolbox::CTablePrinter* multiZoneHeaderTable; //!< Multizone header output structure
+  PrintingToolbox::CTablePrinter* historyFileTable;     //!< Table structure for writing to history file
   std::string multiZoneHeaderString;                    //!< Multizone header string
   
   //! Structure to store the value of the running averages
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index 0b9fad1fa903..de3b92b217c5 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -77,6 +77,13 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
   multiZoneHeaderString = "Multizone Summary";
   
   historyFilename = "multizone_history";
+  
+  /*--- Add the correct file extension depending on the file format ---*/
+  
+  string hist_ext = ".csv";
+  if (driver_config->GetTabular_FileFormat() == TAB_TECPLOT) hist_ext = ".dat";
+  
+  historyFilename += hist_ext;
 
   /*--- Set the default convergence field --- */
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index b4455e0db958..6cf5d30a37a5 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -75,12 +75,21 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
  
   historyFilename = config->GetConv_FileName();
   
+  /*--- Add the correct file extension depending on the file format ---*/
+  
+  string hist_ext = ".csv";
+  if (config->GetTabular_FileFormat() == TAB_TECPLOT) hist_ext = ".dat";
+       
   /*--- Append the zone ID ---*/
- 
- if(config->GetnZone() > 1){
-   historyFilename = config->GetMultizone_HistoryFileName(historyFilename, config->GetiZone());
- }
- 
+  
+  historyFilename = config->GetMultizone_HistoryFileName(historyFilename, config->GetiZone(), hist_ext);
+
+  /*--- Append the restart iteration ---*/
+  
+  if (config->GetTime_Domain() && config->GetRestart()) {
+    historyFilename = config->GetUnsteady_FileName(historyFilename, config->GetRestart_Iter(), hist_ext);
+  }
+  
   historySep = ","; 
   
   /*--- Initialize residual ---*/
@@ -777,20 +786,24 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   
   if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
     histFile << "TITLE = \"SU2 Simulation\"" << endl;
-    histFile << "VARIABLES = ";
+    histFile << "VARIABLES = \\";
+    histFile << endl;
   }
   
   stringstream out;
   string RequestedField;
-  std::vector<bool> found_field(nRequestedHistoryFields, false);
-    
+  std::vector<bool> found_field(nRequestedHistoryFields, false);  
+  int width = 20;
+  
   for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
     HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
       RequestedField = requestedHistoryFields[iReqField];   
       if (RequestedField == Field.outputGroup || (RequestedField == historyOutput_List[iField_Output])){
-        found_field[iReqField] = true;        
-        out << "\"" << Field.fieldName << "\"" << historySep;
+        found_field[iReqField] = true;   
+        if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
+        else{ width = std::max((int)Field.fieldName.size()+2, 20);}
+        historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);
       }
     }  
   }
@@ -801,21 +814,21 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
         RequestedField = requestedHistoryFields[iReqField];   
         if (RequestedField == Field.outputGroup || (RequestedField == historyOutputPerSurface_List[iField_Output])){
-          found_field[iReqField] = true;          
-          out << "\"" << Field.fieldName << "\"" << historySep;        
+          found_field[iReqField] = true;    
+          if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
+          else{ width = std::max((int)Field.fieldName.size()+2, 20);}
+          historyFileTable->AddColumn("\"" + Field.fieldName + "\"", 20);          
         }
       }
     }
   }
-  
-  /*--- Print the string to file and remove the last character (a separator) ---*/
-  histFile << out.str().substr(0, out.str().size() - 1);
+ 
+  historyFileTable->PrintHeader();
   histFile << endl;
   if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
     histFile << "ZONE T= \"Convergence history\"" << endl;
   }
   histFile.flush();
-  
 }
 
 
@@ -824,13 +837,12 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
   stringstream out;
   string RequestedField;
   
-  
   for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
     HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
       RequestedField = requestedHistoryFields[iReqField];   
       if (RequestedField == Field.outputGroup){
-        out << std::setprecision(10) << Field.value << historySep << " ";
+        (*historyFileTable) << Field.value; 
       }
     }
   }
@@ -841,16 +853,14 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
         RequestedField = requestedHistoryFields[iReqField];   
         if (RequestedField == Field.outputGroup){
-          out << std::setprecision(10) << Field.value << historySep << " ";
+          (*historyFileTable) << Field.value;  
         }
       }
     }
   }
   
   /*--- Print the string to file and remove the last two characters (a separator and a space) ---*/
-  
-  histFile << out.str().substr(0, out.str().size()-2);
-  histFile << endl;
+
   histFile.flush();
 }
 
@@ -971,35 +981,19 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
 }
 
 void COutput::PrepareHistoryFile(CConfig *config){
-
-  char buffer[50];
-  
-  string history_filename;
-  
-  strcpy (char_histfile, historyFilename.data());
   
-   /*--- Append the restart iteration: if dynamic problem and restart ---*/
-  
-  if (config->GetTime_Domain() && config->GetRestart()) {
-    long iIter = config->GetRestart_Iter();
-    if (SU2_TYPE::Int(iIter) < 10) SPRINTF (buffer, "_0000%d", SU2_TYPE::Int(iIter));
-    if ((SU2_TYPE::Int(iIter) >= 10) && (SU2_TYPE::Int(iIter) < 100)) SPRINTF (buffer, "_000%d", SU2_TYPE::Int(iIter));
-    if ((SU2_TYPE::Int(iIter) >= 100) && (SU2_TYPE::Int(iIter) < 1000)) SPRINTF (buffer, "_00%d", SU2_TYPE::Int(iIter));
-    if ((SU2_TYPE::Int(iIter) >= 1000) && (SU2_TYPE::Int(iIter) < 10000)) SPRINTF (buffer, "_0%d", SU2_TYPE::Int(iIter));
-    if (SU2_TYPE::Int(iIter) >= 10000) SPRINTF (buffer, "_%d", SU2_TYPE::Int(iIter));
-    strcat(char_histfile, buffer);
-  }
-  
-  /*--- Add the correct file extension depending on the file format ---*/
+  /*--- Open the history file ---*/
   
-  if ((config->GetTabular_FileFormat() == TAB_TECPLOT)) SPRINTF (buffer, ".dat");
-  else if (config->GetTabular_FileFormat() == TAB_CSV)  SPRINTF (buffer, ".csv");
-  strcat(char_histfile, buffer);
+  histFile.open(historyFilename.c_str(), ios::out);
   
-  /*--- Open the history file ---*/
+  /*--- Create and format the history file table ---*/
   
-  histFile.open(char_histfile, ios::out);
-  histFile.precision(15);
+  historyFileTable = new PrintingToolbox::CTablePrinter(&histFile, "");
+  historyFileTable->SetInnerSeparator(historySep);
+  historyFileTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+  historyFileTable->SetPrintHeaderTopLine(false);
+  historyFileTable->SetPrintHeaderBottomLine(false);
+  historyFileTable->SetPrecision(14);
   
   /*--- Add the header to the history file. ---*/
   
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 148b8a35fe06..47379fade86b 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -4382,8 +4382,11 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
   
   /*--- Write file name with extension ---*/
   string filename = config->GetConv_FileName();
+  string hist_ext = ".csv";
+  if (config->GetTabular_FileFormat() == TAB_TECPLOT) hist_ext = ".dat";
+  
   if(config->GetnZone() > 1){
-    filename = config->GetMultizone_HistoryFileName(filename, val_iZone);
+    filename = config->GetMultizone_HistoryFileName(filename, val_iZone, hist_ext);
   }
   if(config->GetnTimeInstances() > 1){
     filename = config->GetMultiInstance_HistoryFileName(filename, val_iInst);

From c0643d247ca4c3dad692932ac4ee3471c354939a Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 12:24:33 +0200
Subject: [PATCH 477/539] Added trimming of strings when reading output fields

---
 Common/include/toolboxes/printing_toolbox.hpp | 19 +++++++++++++++++++
 Common/src/geometry_structure.cpp             | 17 +++++++++--------
 SU2_CFD/src/solver_structure.cpp              | 10 +++++++++-
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 2833ff2ec42e..e06faa855261 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -228,4 +228,23 @@ inline std::string to_string(const su2double number){
   
 }
 
+const static char* ws = " \t\n\r\f\v";
+
+// trim from end of string (right)
+inline std::string& rtrim(std::string& s, const char* t = ws){
+    s.erase(s.find_last_not_of(t) + 1);
+    return s;
+}
+
+// trim from beginning of string (left)
+inline std::string& ltrim(std::string& s, const char* t = ws){
+    s.erase(0, s.find_first_not_of(t));
+    return s;
+}
+
+// trim from both ends of string (right then left)
+inline std::string& trim(std::string& s, const char* t = ws){
+    return ltrim(rtrim(s, t), t);
+}
+
 }
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index e0c84f705f1a..63976a826962 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -13451,14 +13451,7 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     string::size_type position;
     
     Surface_file.open(cstr, ios::in);
-    
-    /*--- Read extra inofmration ---*/
-    
-//    getline(Surface_file, text_line);
-//    text_line.erase (0,9);
-//    su2double AoASens = atof(text_line.c_str());
-//    config->SetAoA_Sens(AoASens);
-    
+
     /*--- File header ---*/
     
     getline(Surface_file, text_line);
@@ -13468,6 +13461,10 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     char delimiter = ',';
     split_line = PrintingToolbox::split(text_line, delimiter);
     
+    for (int iField = 0; iField < split_line.size(); iField++){
+      PrintingToolbox::trim(split_line[iField]);
+    }
+    
     std::vector<string>::iterator it = std::find(split_line.begin(), split_line.end(), "\"Surface_Sensitivity\"");
     
     if (it == split_line.end()){
@@ -13982,6 +13979,10 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   
   vector<string> fields = PrintingToolbox::split(text_line, ',');
   
+  for (int iField = 0; iField < fields.size(); iField++){
+    PrintingToolbox::trim(fields[iField]);
+  }
+  
   std::vector<string>::iterator itx = std::find(fields.begin(), fields.end(), "\"Sensitivity_x\"");
   std::vector<string>::iterator ity = std::find(fields.begin(), fields.end(), "\"Sensitivity_y\"");
   std::vector<string>::iterator itz = std::find(fields.begin(), fields.end(), "\"Sensitivity_z\"");
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index a2cf23a45625..ee4edc86ab2a 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -4251,6 +4251,10 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   
   char delimiter = ',';
   fields = PrintingToolbox::split(text_line, delimiter);
+  
+  for (int iField = 0; iField < fields.size(); iField++){
+    PrintingToolbox::trim(fields[iField]);
+  }
 
   /*--- Set the number of variables, one per field in the
    restart file (without including the PointID) ---*/
@@ -5716,7 +5720,11 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
     getline (restart_file, text_line);
 
     fields = PrintingToolbox::split(text_line, ',');
-
+    
+    for (int iField = 0; iField < fields.size(); iField++){
+      PrintingToolbox::trim(fields[iField]);
+    }
+    
     /*--- Close the file (the solution date is read later). ---*/
     
     restart_file.close();

From 155ff2588bcbcf9f47177a507c83f182e2c8b04c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 12:25:26 +0200
Subject: [PATCH 478/539] Changed default history wrt freq if unsteady

---
 Common/src/config_structure.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index feece4f03ed3..5b6383b8e978 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -3099,11 +3099,17 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     if (TimeMarching == TIME_STEPPING){
       InnerIter = 1;
     }
-   if (!OptionIsSet("OUTPUT_WRT_FREQ"))
-     VolumeWrtFreq = 1;
-   if (Restart == NO){
-     Restart_Iter = 0;
-   }
+    if (!OptionIsSet("OUTPUT_WRT_FREQ"))
+      VolumeWrtFreq = 1;
+    if (Restart == NO){
+      Restart_Iter = 0;
+    }
+    if (!OptionIsSet("HISTORY_WRT_FREQ_INNER")){
+      HistoryWrtFreq[2] = 0;
+    }
+    if (!OptionIsSet("HISTORY_WRT_FREQ_OUTER")){
+      HistoryWrtFreq[1] = 0;
+    }
   }
   
   /*--- The that Discard_InFiles is false, owerwise the gradient could be wrong ---*/

From ac894c52ceca20cf36ba005350aad00ca93c4d0f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 15:14:59 +0200
Subject: [PATCH 479/539] New file outptu summary

---
 SU2_CFD/include/output/COutput.hpp            | 10 +--
 .../filewriter/CParaviewBinaryFileWriter.hpp  |  5 ++
 .../output/filewriter/CParaviewFileWriter.hpp |  5 ++
 .../filewriter/CSU2BinaryFileWriter.hpp       |  5 ++
 .../output/filewriter/CSU2FileWriter.hpp      |  5 ++
 .../output/filewriter/CSU2MeshFileWriter.hpp  |  6 ++
 .../filewriter/CTecplotBinaryFileWriter.hpp   |  5 ++
 .../output/filewriter/CTecplotFileWriter.hpp  |  5 ++
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     |  3 +-
 SU2_CFD/src/output/COutput.cpp                | 79 +++++++++++--------
 .../src/output/filewriter/CFEMDataSorter.cpp  |  3 -
 .../src/output/filewriter/CFVMDataSorter.cpp  |  5 --
 .../filewriter/CParaviewBinaryFileWriter.cpp  |  3 +-
 .../output/filewriter/CParaviewFileWriter.cpp |  3 +-
 .../filewriter/CSU2BinaryFileWriter.cpp       |  4 +-
 .../src/output/filewriter/CSU2FileWriter.cpp  |  5 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  5 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  4 -
 .../filewriter/CSurfaceFVMDataSorter.cpp      |  6 +-
 .../filewriter/CTecplotBinaryFileWriter.cpp   |  4 +-
 .../output/filewriter/CTecplotFileWriter.cpp  |  4 +-
 SU2_DEF/src/SU2_DEF.cpp                       |  4 +-
 SU2_DOT/src/SU2_DOT.cpp                       |  4 -
 23 files changed, 104 insertions(+), 78 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index a8e9c13bc42f..3d7186404a64 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -159,7 +159,9 @@ class COutput {
   PrintingToolbox::CTablePrinter* convergenceTable;     //!< Convergence  output table structure
   PrintingToolbox::CTablePrinter* multiZoneHeaderTable; //!< Multizone header output structure
   PrintingToolbox::CTablePrinter* historyFileTable;     //!< Table structure for writing to history file
+  PrintingToolbox::CTablePrinter* fileWritingTable;     //!< File writing header
   std::string multiZoneHeaderString;                    //!< Multizone header string
+  bool headerNeeded;                                    //!< Boolean that stores whether a screen header is needed
   
   //! Structure to store the value of the running averages
   map<string, Signal_Processing::RunningAverage> runningAverages; 
@@ -281,12 +283,7 @@ class COutput {
    * \param[in] time_dep - Indicates whether time dependent files should be written.   
    */
   void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
-  
-  /*!
-   * \brief Deallocate temporary memory needed for merging and writing output data in parallel.
-   */
-  void DeallocateData_Parallel();
-    
+
   /*!
    * \brief Preprocess the history output by setting the history fields and opening the history file.
    * \param[in] config - Definition of the particular problem.
@@ -618,7 +615,6 @@ class COutput {
   /*!
    * \brief Postprocess_HistoryData
    * \param[in] config - Definition of the particular problem.
-   * \param[in] dualtime - TODO: REMOVE PARAMETER
    */
   void Postprocess_HistoryData(CConfig *config);
 
diff --git a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
index 8c575862302f..aa59bcfde468 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp
@@ -43,6 +43,11 @@ class CParaviewBinaryFileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
index 9976523b1562..f3a0f5f74748 100644
--- a/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp
@@ -42,6 +42,11 @@ class CParaviewFileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
index e3503af7a362..2e7bebc5e33b 100644
--- a/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2BinaryFileWriter.hpp
@@ -43,6 +43,11 @@ class CSU2BinaryFileWriter final: public CFileWriter{
 
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
index 3bb4847ac97c..4d10ff86d21c 100644
--- a/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp
@@ -42,6 +42,11 @@ class CSU2FileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
index 9c0a49c675da..b03efbc41be5 100644
--- a/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp
@@ -44,6 +44,12 @@ class CSU2MeshFileWriter final: public CFileWriter{
   nZone;                //!< Number of zones
 
 public:
+  
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
index af114de87908..8c0a93ecc5ef 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotBinaryFileWriter.hpp
@@ -48,6 +48,11 @@ class CTecplotBinaryFileWriter final: public CFileWriter{
   
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
index a225fcb5bbd9..8884eab01502 100644
--- a/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
+++ b/SU2_CFD/include/output/filewriter/CTecplotFileWriter.hpp
@@ -45,6 +45,11 @@ class CTecplotFileWriter final: public CFileWriter{
 
 public:
   
+  /*!
+   * \brief File extension
+   */
+  const static string fileExt;
+  
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
    * \param[in] fields - A list of field names
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 4f95a97ffde6..df99dede79c0 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -64,7 +64,8 @@ void CSinglezoneDriver::StartSolver() {
   if (rank == MASTER_NODE){
     cout << endl <<"Simulation Run using the Single-zone Driver" << endl;
     if (driver_config->GetTime_Domain())
-      cout << "The simulation will run for " << driver_config->GetnTime_Iter() << " time steps." << endl;
+      cout << "The simulation will run for " 
+           << driver_config->GetnTime_Iter() - config_container[ZONE_0]->GetRestart_Iter() << " time steps." << endl;
   }
 
   /*--- Set the initial time iteration to the restart iteration. ---*/
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 6cf5d30a37a5..3175756047f7 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -64,6 +64,7 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
   
   convergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
   multiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  fileWritingTable = new PrintingToolbox::CTablePrinter(&std::cout);
   
   /*--- Set default filenames ---*/
   
@@ -143,6 +144,8 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
   volumeDataSorter = nullptr;
   surfaceDataSorter = nullptr;
   
+  headerNeeded = false;
+  
 }
 
 COutput::~COutput(void) {
@@ -386,22 +389,6 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
   
 }
 
-
-void COutput::DeallocateData_Parallel(){
-  
-//  if (volumeDataSorter != NULL)
-//    delete volumeDataSorter;
-  
-//  volumeDataSorter = NULL;
-  
-//  if (surfaceDataSorter != NULL)
-//    delete surfaceDataSorter;
-  
-//  surfaceDataSorter = NULL;
-  
-}
-
-
 void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short format, string fileName){
 
   CFileWriter *fileWriter = NULL;
@@ -422,7 +409,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       surfaceDataSorter->SortOutputData();
       
       if (rank == MASTER_NODE) {
-        cout << "Writing CSV file." << endl;     
+        (*fileWritingTable) << "Writing CSV file" << fileName + CSU2FileWriter::fileExt;     
       }
       
       fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -435,7 +422,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
-        cout << "Writing SU2 CSV restart file." << endl;     
+          (*fileWritingTable) << "Writing SU2 CSV restart file" << fileName + CSU2FileWriter::fileExt;     
       }
       
       fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -448,7 +435,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
-        cout << "Writing SU2 binary restart file." << endl;   
+          (*fileWritingTable) << "Writing SU2 binary restart file" << fileName + CSU2BinaryFileWriter::fileExt;   
       }
       
       fileWriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -467,7 +454,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Set the mesh ASCII format ---*/
       
       if (rank == MASTER_NODE) {
-        cout << "Writing SU2 mesh file." << endl;
+          (*fileWritingTable) << "Writing SU2 mesh file" << fileName + CSU2MeshFileWriter::fileExt;
       }
       
       fileWriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -488,7 +475,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Write tecplot binary ---*/
       
       if (rank == MASTER_NODE) {
-        cout << "Writing Tecplot binary solution file." << endl;
+          (*fileWritingTable) << "Writing Tecplot binary solution file" << fileName + CTecplotBinaryFileWriter::fileExt;
       }
       
       fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -508,7 +495,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Write tecplot binary ---*/
       
       if (rank == MASTER_NODE) {
-        cout << "Writing Tecplot ASCII solution file." << endl;
+          (*fileWritingTable) << "Writing Tecplot ASCII solution file" << fileName + CTecplotFileWriter::fileExt;
       }
       
       fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -527,7 +514,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Paraview binary solution file." << endl;
+          (*fileWritingTable) << "Writing Paraview binary solution file" << fileName + CParaviewBinaryFileWriter::fileExt;
       }
       
       fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -545,7 +532,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Paraview ASCII volume solution file." << endl;      
+          (*fileWritingTable) << "Writing Paraview ASCII volume solution file" << fileName + CParaviewFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -564,7 +551,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Paraview ASCII surface file." << endl;      
+          (*fileWritingTable) << "Writing Paraview ASCII surface file" << fileName + CParaviewFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -583,7 +570,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Paraview Binary surface file." << endl;      
+          (*fileWritingTable) << "Writing Paraview Binary surface file" << fileName + CParaviewBinaryFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -602,7 +589,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Tecplot ASCII surface file." << endl;      
+          (*fileWritingTable) << "Writing Tecplot ASCII surface file" << fileName + CTecplotFileWriter::fileExt;      
       }
       
       fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
@@ -622,7 +609,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-        cout << "Writing Tecplot ASCII surface file." << endl;      
+          (*fileWritingTable) << "Writing Tecplot Binary surface file" << fileName + CTecplotBinaryFileWriter::fileExt;      
       }
       
       fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
@@ -655,7 +642,12 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
   Load_Data(geometry, config, solver_container);
   
   if (WriteVolume_Output(config, Iter) || force_writing){
-
+    
+    if (rank == MASTER_NODE){
+      fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);    
+      fileWritingTable->PrintHeader();
+      fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);    
+    }
     unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
     unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
         
@@ -667,14 +659,15 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
 
     }
     
+    if (rank == MASTER_NODE){
+      fileWritingTable->PrintFooter();
+      headerNeeded = true;
+    }
+    
     /*--- Write any additonal files ----*/
     
     WriteAdditionalFiles(config, geometry, solver_container);
     
-    /*--- Free the data sorters ---*/
-    
-    DeallocateData_Parallel();
-    
     return true;
   }
   
@@ -910,6 +903,8 @@ void COutput::SetScreen_Output(CConfig *config) {
 
 void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
+    int total_width = 80;
+  
     noWriting = !wrt;
 
     /*--- Set the common output fields ---*/
@@ -934,16 +929,23 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
       
       PrepareHistoryFile(config);
       
+      total_width = nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1);
+      
       /*--- Set the multizone screen header ---*/
       
       if (config->GetMultizone_Problem()){
-        multiZoneHeaderTable->AddColumn(multiZoneHeaderString, nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1));      
+        multiZoneHeaderTable->AddColumn(multiZoneHeaderString, total_width);      
         multiZoneHeaderTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
         multiZoneHeaderTable->SetPrintHeaderBottomLine(false);
       }
-      
+
     }
     
+    fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
+    fileWritingTable->AddColumn("Filename", total_width/2); 
+    
+    fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+    
 }
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
@@ -1482,6 +1484,13 @@ bool COutput::WriteScreen_Header(CConfig *config) {
   unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
   unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);
   
+  /*--- Always print header if it is forced ---*/
+  
+  if (headerNeeded){
+    headerNeeded = false;
+    return true;
+  }
+  
   /*--- Header is always disabled for multizone problems unless explicitely requested --- */
   
   if (config->GetMultizone_Problem() && !config->GetWrt_ZoneConv()){
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index a04fde055cb7..4d2a39d7f92a 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -66,9 +66,6 @@ void CFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool
    across all processors based on the global index of the grid nodes. ---*/
   
   /*--- Sort volumetric grid connectivity. ---*/
-
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting volumetric grid connectivity." << endl;
   
   SortVolumetricConnectivity(config, geometry, TRIANGLE     );
   SortVolumetricConnectivity(config, geometry, QUADRILATERAL);
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index cd4d78a4a7ba..1de4e0a0e248 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -86,11 +86,6 @@ void CFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool
    In these routines, we sort the connectivity into a linear partitioning
    across all processors based on the global index of the grid nodes. ---*/
   
-  /*--- Sort volumetric grid connectivity. ---*/
-
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting volumetric grid connectivity." << endl;
-  
   SortVolumetricConnectivity(config, geometry, TRIANGLE,      val_sort);
   SortVolumetricConnectivity(config, geometry, QUADRILATERAL, val_sort);
   SortVolumetricConnectivity(config, geometry, TETRAHEDRON,   val_sort);
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 56173d3d587c..1faa5c3baf29 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -1,9 +1,10 @@
 #include "../../../include/output/filewriter/CParaviewBinaryFileWriter.hpp"
 
+const string CParaviewBinaryFileWriter::fileExt = ".vtk";
 
 CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim, string fileName, 
                                                      CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, ".vtk", nDim){}
+  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
 
 
 CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index cd329901fb26..5cd0a0e372ec 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -1,9 +1,10 @@
 #include "../../../include/output/filewriter/CParaviewFileWriter.hpp"
 
+const string CParaviewFileWriter::fileExt = ".vtk";
 
 CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim, 
                                          string fileName, CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, ".vtk", nDim){}
+  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
 
 
 CParaviewFileWriter::~CParaviewFileWriter(){}
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 1f6a202212ea..552943844ba9 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -1,8 +1,10 @@
 #include "../../../include/output/filewriter/CSU2BinaryFileWriter.hpp"
 
+const string CSU2BinaryFileWriter::fileExt = ".dat";
+
 CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim, 
                                            string fileName, CParallelDataSorter *dataSorter)  : 
-  CFileWriter(fields, fileName, dataSorter, ".dat", nDim){}
+  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
 
 
 CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 34b40f78d867..4841cdf36d68 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -1,11 +1,10 @@
 #include "../../../include/output/filewriter/CSU2FileWriter.hpp"
 
-
-
+const string CSU2FileWriter::fileExt = ".csv";
 
 CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim, 
                                string fileName, CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, ".csv", nDim){}
+  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
 
 
 CSU2FileWriter::~CSU2FileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 2218081d2e7a..8eaee58e93cc 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -1,13 +1,12 @@
 #include "../../../include/output/filewriter/CSU2MeshFileWriter.hpp"
 #include "../../../../Common/include/toolboxes/printing_toolbox.hpp"
 
-
-
+const string CSU2MeshFileWriter::fileExt = ".su2";
 
 CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim,  
                                        string fileName, CParallelDataSorter *dataSorter,
                                        unsigned short iZone, unsigned short nZone) : 
-  iZone(iZone), nZone(nZone), CFileWriter(fields, fileName, dataSorter, ".su2", nDim){}
+  iZone(iZone), nZone(nZone), CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
 
 
 CSU2MeshFileWriter::~CSU2MeshFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 0a77929c9e17..4632f1664f31 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -308,10 +308,6 @@ void CSurfaceFEMDataSorter::SortOutputData() {
 
 void CSurfaceFEMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort) {
   
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting surface grid connectivity." << endl;
-  
-  
   SortSurfaceConnectivity(config, geometry, LINE         );
   SortSurfaceConnectivity(config, geometry, TRIANGLE     );
   SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 12898b12e65b..660cb607d950 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -1074,11 +1074,7 @@ void CSurfaceFVMDataSorter::SortConnectivity(CConfig *config, CGeometry *geometr
    across all processors based on the global index of the grid nodes. ---*/
   
   /*--- Sort volumetric grid connectivity. ---*/
-  
-  
-  if ((rank == MASTER_NODE) && (size != SINGLE_NODE))
-    cout <<"Sorting surface grid connectivity." << endl;
-  
+
   SortSurfaceConnectivity(config, geometry, LINE         );
   SortSurfaceConnectivity(config, geometry, TRIANGLE     );
   SortSurfaceConnectivity(config, geometry, QUADRILATERAL);   
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 0e4fc8ea3b5d..5bed635a5e22 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -4,10 +4,12 @@
 #endif
 #include <set>
 
+const string CTecplotBinaryFileWriter::fileExt = ".szplt";
+
 CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim,
                                                    string fileName, CParallelDataSorter *dataSorter,
                                                    unsigned long time_iter, su2double timestep) : 
-  CFileWriter(fields, fileName, dataSorter, ".szplt", nDim), time_iter(time_iter), timestep(timestep){}
+  CFileWriter(fields, fileName, dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){}
 
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 22068e1d9056..4c1e4487a28f 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -1,9 +1,11 @@
 #include "../../../include/output/filewriter/CTecplotFileWriter.hpp"
 
+const string CTecplotFileWriter::fileExt = ".dat";
+
 CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, 
                                        string fileName, CParallelDataSorter *dataSorter,
                                        unsigned long time_iter, su2double timestep) : 
-   CFileWriter(fields, fileName, dataSorter, ".dat", nDim), time_iter(time_iter), timestep(timestep){}
+   CFileWriter(fields, fileName, dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotFileWriter::~CTecplotFileWriter(){}
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 4a642b6b7a25..372c28490a48 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -358,9 +358,7 @@ int main(int argc, char *argv[]) {
           output[iZone]->WriteToFile(config_container[iZone], geometry_container[iZone], FileFormat[iFile]);
       }
     } 
-    
-    output[iZone]->DeallocateData_Parallel();
-    
+       
   }
 
   
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 8131c5c8fcd7..8ae967f540c6 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -1009,10 +1009,6 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
         output->WriteToFile(config[iZone], geometry[iZone][INST_0], FileFormat[iFile]);
     }
     
-    /*--- Deallocate ---*/
-    
-    output->DeallocateData_Parallel();
-    
     /*--- Free memory ---*/
     
     delete output;

From 12e780c61b9c24c1b813efdaf910565fa6e22dfa Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 15:15:25 +0200
Subject: [PATCH 480/539] Some small fixes

---
 SU2_CFD/src/output/COutput.cpp | 65 +++++++++++++++++++---------------
 SU2_DEF/src/SU2_DEF.cpp        |  8 +++++
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 3175756047f7..674c5f9d1396 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1398,16 +1398,18 @@ void COutput::Postprocess_HistoryData(CConfig *config){
       Count[currentField.outputGroup]++;
            
     }
-    if (currentField.fieldType == TYPE_COEFFICIENT){
-      if(SetUpdate_Averages(config)){
-        SetHistoryOutputValue("TAVG_" + historyOutput_List[iField],
-                              runningAverages[historyOutput_List[iField]].Update(currentField.value));
-      }
-      if (config->GetDirectDiff() != NO_DERIVATIVE){
-        SetHistoryOutputValue("D_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(currentField.value));      
-        SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], 
-                              SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
-        
+    if (config->GetTime_Domain()){
+      if (currentField.fieldType == TYPE_COEFFICIENT){
+        if(SetUpdate_Averages(config)){
+          SetHistoryOutputValue("TAVG_" + historyOutput_List[iField],
+                                runningAverages[historyOutput_List[iField]].Update(currentField.value));
+        }
+        if (config->GetDirectDiff() != NO_DERIVATIVE){
+          SetHistoryOutputValue("D_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(currentField.value));      
+          SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], 
+                                SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
+          
+        }
       }
     }
   }
@@ -1439,29 +1441,36 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
                      "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
   }  
   
-  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
-    if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]",
-                       currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", 
-                       TYPE_AUTO_COEFFICIENT);
+  if (config->GetTime_Domain()){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      if (currentField.fieldType == TYPE_COEFFICIENT){
+        AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]",
+                         currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", 
+                         TYPE_AUTO_COEFFICIENT);
+      }
     }
   }
-  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
-    if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]",
-                       currentField.screenFormat, "D_"      + currentField.outputGroup, 
-                       "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+  
+  if (config->GetDirectDiff()){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      if (currentField.fieldType == TYPE_COEFFICIENT){
+        AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]",
+                         currentField.screenFormat, "D_"      + currentField.outputGroup, 
+                         "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+      }
     }
   }
   
-  for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
-    if (currentField.fieldType == TYPE_COEFFICIENT){
-      AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]",
-                       currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, 
-                       "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+  if (config->GetTime_Domain() && config->GetDirectDiff()){
+    for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
+      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      if (currentField.fieldType == TYPE_COEFFICIENT){
+        AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]",
+                         currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, 
+                         "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+      }
     }
   }
   
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 372c28490a48..91a484c380fe 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -418,6 +418,14 @@ int main(int argc, char *argv[]) {
     }
     delete [] config_container;
   }
+  if (output != NULL) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (output[iZone] != NULL) {
+        delete output[iZone];
+      }
+    }
+    delete [] output;
+  }
   if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
   
   if (output != NULL) delete output;

From be3469305e0aeedbfef317fab2269b4d6fdc97f3 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 15:16:01 +0200
Subject: [PATCH 481/539] Adapted SU2_SOL for new output file writing

---
 SU2_SOL/include/SU2_SOL.hpp |   3 +
 SU2_SOL/src/SU2_SOL.cpp     | 178 +++++++++++++-----------------------
 2 files changed, 66 insertions(+), 115 deletions(-)

diff --git a/SU2_SOL/include/SU2_SOL.hpp b/SU2_SOL/include/SU2_SOL.hpp
index bea7e3e44625..4905c3aa65a3 100644
--- a/SU2_SOL/include/SU2_SOL.hpp
+++ b/SU2_SOL/include/SU2_SOL.hpp
@@ -47,4 +47,7 @@
 #include "../../Common/include/geometry_structure.hpp"
 #include "../../Common/include/config_structure.hpp"
 
+
+void WriteFiles(CConfig *config, CGeometry* geometry, CSolver** solver_container, COutput* output, unsigned long TimeIter);
+
 using namespace std;
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 0e927984ef12..47ae4020dc5b 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -321,22 +321,8 @@ int main(int argc, char *argv[]) {
           
           for (iZone = 0; iZone < nZone; iZone++){
             
-//            /*--- Load history data (volume output might require some values) --- */
+            WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], TimeIter);
             
-//            output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
-            
-//            /*--- Load the data --- */
-            
-//            output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
-            
-//            /*--- If requested, write the volume output for visualization purposes --- */
-            
-//            output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
-    
-//            /*--- Deallocate data --- */
-            
-//            output[iZone]->DeallocateData_Parallel();
-          
           }
         }
 
@@ -359,21 +345,7 @@ int main(int argc, char *argv[]) {
       }
       for (iZone = 0; iZone < nZone; iZone++){
         
-//        /*--- Load history data (volume output might require some values) --- */
-        
-//        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
-        
-//        /*--- Load the data --- */
-        
-//        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
-      
-//        /*--- If requested, write the volume output for visualization purposes --- */
-        
-//        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
-
-//        /*--- Deallocate data --- */
-        
-//        output[iZone]->DeallocateData_Parallel();
+        WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], 0);      
         
       }
     }
@@ -470,21 +442,7 @@ int main(int argc, char *argv[]) {
         if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
         for (iZone = 0; iZone < nZone; iZone++){
           
-//          /*--- Load history data (volume output might require some values) --- */
-          
-//          output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
-          
-//          /*--- Load the data --- */
-          
-//          output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
-        
-//          /*--- If requested, write the volume output for visualization purposes --- */
-          
-//          output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
-  
-//          /*--- Deallocate data --- */
-          
-//          output[iZone]->DeallocateData_Parallel();
+          WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], TimeIter);
           
         }
       }
@@ -541,6 +499,9 @@ int main(int argc, char *argv[]) {
                                                                                   TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter())))) {
 
                   solver_container[iZone][INST_0] = new CBaselineSolver_FEM(geometry_container[iZone][INST_0], config_container[iZone]);
+                  output[iZone] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
+                  output[iZone]->PreprocessVolumeOutput(config_container[ZONE_0]);
+                  output[iZone]->PreprocessHistoryOutput(config_container[ZONE_0], false);
                   SolutionInstantiated[iZone] = true;
                 }
                 solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone],
@@ -549,8 +510,13 @@ int main(int argc, char *argv[]) {
 
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
-//              output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, iExtIter, nZone);
-            }
+              
+              for (iZone = 0; iZone < nZone; iZone++){
+                
+                WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], TimeIter);
+                
+              }
+        }
         
         TimeIter++;
         if (StopCalc) break;
@@ -564,12 +530,19 @@ int main(int argc, char *argv[]) {
       /*--- Definition of the solution class ---*/
 
       solver_container[iZone][INST_0] = new CBaselineSolver_FEM(geometry_container[iZone][INST_0], config_container[iZone]);
+      output[iZone] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
+      output[iZone]->PreprocessVolumeOutput(config_container[ZONE_0]);
+      output[iZone]->PreprocessHistoryOutput(config_container[ZONE_0], false);
       solver_container[iZone][INST_0]->LoadRestart(&geometry_container[iZone][INST_0], &solver_container[iZone], config_container[iZone], 0, true);
     }
-
-//    output->SetBaselineResult_Files_FEM(solver_container, geometry_container, config_container, 0, nZone);
+    
+    for (iZone = 0; iZone < nZone; iZone++){
+      
+      WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], 0);
+      
+    }   
     }
-
+    
   }
   else {
 
@@ -630,28 +603,17 @@ int main(int argc, char *argv[]) {
                   config_container[iZone]->SetiInst(INST_0);
                   solver_container[iZone][INST_0]->LoadRestart(geometry_container[iZone], &solver_container[iZone], config_container[iZone], TimeIter, true);
               }
-
+              
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
+              
               for (iZone = 0; iZone < nZone; iZone++){
                 
-//                /*--- Load history data (volume output might require some values) --- */
-                
-//                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
-                
-//                /*--- Load the data --- */
+                WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], TimeIter);
                 
-//                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
+              } 
+              
               
-//                /*--- If requested, write the volume output for visualization purposes --- */
-                
-//                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
-        
-//                /*--- Deallocate data --- */
-                
-//                output[iZone]->DeallocateData_Parallel();
-                
-              }
         }
 
         TimeIter++;
@@ -682,21 +644,11 @@ int main(int argc, char *argv[]) {
             cout << "Storing the volume solution for time instance " << iInst << "." << endl;
           }
 
-//          /*--- Load history data (volume output might require some values) --- */
-          
-//          output[iZone]->SetHistory_Output(geometry_container[iZone][iInst], &solver_container[iZone][iInst], config_container[iZone], iInst, 0, 0);
+          for (iZone = 0; iZone < nZone; iZone++){
             
-//          /*--- Load the data --- */
-          
-//          output[iZone]->Load_Data(geometry_container[iZone][iInst], config_container[iZone], &solver_container[iZone][iInst]);
-          
-//          /*--- If requested, write the volume output for visualization purposes --- */
-          
-//          output[iZone]->SetVolume_Output(geometry_container[iZone][iInst], config_container[iZone], config->GetOutput_FileFormat(), true);
-          
-//          /*--- Deallocate data --- */
-          
-//          output[iZone]->DeallocateData_Parallel();
+            WriteFiles(config_container[iZone], geometry_container[iZone][iInst], &solver_container[iZone][iInst], output[iZone], iInst);
+            
+          } 
           
           
         }
@@ -763,22 +715,8 @@ int main(int argc, char *argv[]) {
               if (rank == MASTER_NODE)
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
-
-//                /*--- Load history data (volume output might require some values) --- */
-                
-//                output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], TimeIter, 0, 0);
-                                
-//                /*--- Load the data --- */
-                
-//                output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
-              
-//                /*--- If requested, write the volume output for visualization purposes --- */
-                
-//                output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), true);
-        
-//                /*--- Deallocate data --- */
                 
-//                output[iZone]->DeallocateData_Parallel();
+                WriteFiles(config_container[iZone], geometry_container[iZone][iInst], &solver_container[iZone][iInst], output[iZone], TimeIter);
                 
               }        
         }
@@ -803,26 +741,11 @@ int main(int argc, char *argv[]) {
         output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
         
       }
-      
       for (iZone = 0; iZone < nZone; iZone++){
-      
-//        /*--- Load history data (volume output might require some values) --- */
         
-//        output[iZone]->SetHistory_Output(geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], config_container[iZone], 0, 0, 0);
+        WriteFiles(config_container[iZone], geometry_container[iZone][iInst], &solver_container[iZone][iInst], output[iZone], 0);
         
-//        /*--- Load the data --- */
-        
-//        output[iZone]->Load_Data(geometry_container[iZone][INST_0], config_container[iZone], &solver_container[iZone][INST_0]);
-        
-//        /*--- If requested, write the volume output for visualization purposes --- */
-        
-//        output[iZone]->SetVolume_Output(geometry_container[iZone][INST_0], config_container[iZone], config->GetOutput_FileFormat(), false);
-        
-//        /*--- Deallocate data --- */
-        
-//        output[iZone]->DeallocateData_Parallel();
-        
-      }
+      }  
     }
     
   }
@@ -841,7 +764,7 @@ int main(int argc, char *argv[]) {
         }
       }
       if (geometry_container[iZone] != NULL)
-        delete geometry_container[iZone];
+        delete [] geometry_container[iZone];
     }
     delete [] geometry_container;
   }
@@ -855,7 +778,7 @@ int main(int argc, char *argv[]) {
         }
       }
       if (solver_container[iZone] != NULL)
-        delete solver_container[iZone];
+        delete [] solver_container[iZone];
     }
     delete [] solver_container;
   }
@@ -871,7 +794,14 @@ int main(int argc, char *argv[]) {
   }
   if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
   
-  if (output != NULL) delete output;
+  if (output != NULL) {
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (output[iZone] != NULL) {
+        delete output[iZone];
+      }
+    }
+    delete [] output;
+  }
   if (rank == MASTER_NODE) cout << "Deleted COutput class." << endl;
   
   /*--- Synchronization point after a single solver iteration. Compute the
@@ -904,3 +834,21 @@ int main(int argc, char *argv[]) {
   
   return EXIT_SUCCESS;
 }
+
+void WriteFiles(CConfig *config, CGeometry* geometry, CSolver** solver_container, COutput *output, unsigned long TimeIter){
+  
+  /*--- Load history data (volume output might require some values) --- */
+  
+  output->SetHistory_Output(geometry, solver_container, config, TimeIter, 0, 0);
+  
+  /*--- Load the data --- */
+  
+  output->Load_Data(geometry, config, solver_container);
+  
+  for (unsigned short iFile = 0; iFile < config->GetnVolumeOutputFiles(); iFile++){
+    unsigned short* FileFormat = config->GetVolumeOutputFiles();
+    if (FileFormat[iFile] != RESTART_ASCII && FileFormat[iFile] != RESTART_BINARY)
+      output->WriteToFile(config, geometry, FileFormat[iFile]);
+  }
+  
+}

From 8bdc88cbd91dd172b6eaa39cdf115378852ff6b6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 15:31:29 +0200
Subject: [PATCH 482/539] Fixing some test cases

---
 Common/src/config_structure.cpp                            | 7 +++++--
 SU2_CFD/src/solver_direct_elasticity.cpp                   | 4 ++--
 .../disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg     | 2 +-
 .../disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg    | 2 +-
 TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg      | 2 +-
 TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg     | 2 +-
 .../flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg   | 2 +-
 .../flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 5b6383b8e978..b9d118c7e2db 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7531,12 +7531,15 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, string
     string multizone_filename = val_filename;
     char buffer[50];
     
+    unsigned short lastindex = multizone_filename.find_last_of(".");
+    multizone_filename = multizone_filename.substr(0, lastindex);
+    
     if (GetnZone() > 1 ) {
-        unsigned short lastindex = multizone_filename.find_last_of(".");
-        multizone_filename = multizone_filename.substr(0, lastindex);
         SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
         multizone_filename.append(string(buffer)+ext);
     }
+    
+    multizone_filename += ext;    
     return multizone_filename;
 }
 
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 6f2e9228bf6d..6eccb28d2913 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -858,8 +858,8 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
   filename = config->GetRefGeom_FEMFileName();
 
   /*--- If multizone, append zone name ---*/
-  if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, ".csv");
+  
+  filename = config->GetMultizone_FileName(filename, iZone, ".csv");
 
   reference_file.open(filename.data(), ios::in);
 
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index ad239e1d6175..a19c72f0176c 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index f14540ff0ecf..544c6bfab281 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= INC_NAVIER_STOKES
+SOLVER= INC_RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 9e2dd38933ca..d05aeb17308c 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -16,7 +16,7 @@
 %                               TNE2_EULER, TNE2_NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SA
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 03101ebeda39..0ec948c08c28 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -16,7 +16,7 @@
 %                               TNE2_EULER, TNE2_NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)                             
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulent model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index 1346723055cf..0d6b815b4e12 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulence model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 45b800e93de8..c31d0d9144b1 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -14,7 +14,7 @@
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
 %                               POISSON_EQUATION)
-SOLVER= NAVIER_STOKES
+SOLVER= RANS
 %
 % Specify turbulence model (NONE, SA, SA_NEG, SST)
 KIND_TURB_MODEL= SST

From cf90aa3d1180c99c29c68634c295d1be7704c0bf Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 16:13:12 +0200
Subject: [PATCH 483/539] Couple of fixes

---
 Common/src/toolboxes/printing_toolbox.cpp |  2 +-
 SU2_CFD/src/output/COutput.cpp            | 44 +++++++++++++----------
 SU2_PY/SU2/eval/gradients.py              |  4 +--
 SU2_SOL/src/SU2_SOL.cpp                   |  4 +--
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
index c51e0f9018d0..f77ad9436038 100644
--- a/Common/src/toolboxes/printing_toolbox.cpp
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -103,8 +103,8 @@ void PrintingToolbox::CTablePrinter::PrintHeader(){
   }
 
   *out_stream_ << std::setw((int)separator_.size()+indent) << separator_;
+  *out_stream_ << "\n";
   if (print_header_bottom_line_){
-    *out_stream_ << "\n";
     PrintHorizontalLine();
   }
 }
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 674c5f9d1396..eb6f929fb5fd 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -409,7 +409,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       surfaceDataSorter->SortOutputData();
       
       if (rank == MASTER_NODE) {
-        (*fileWritingTable) << "Writing CSV file" << fileName + CSU2FileWriter::fileExt;     
+        (*fileWritingTable) << "CSV file" << fileName + CSU2FileWriter::fileExt;     
       }
       
       fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -422,7 +422,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing SU2 CSV restart file" << fileName + CSU2FileWriter::fileExt;     
+          (*fileWritingTable) << "SU2 ASCII restart" << fileName + CSU2FileWriter::fileExt;     
       }
       
       fileWriter = new CSU2FileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -435,7 +435,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing SU2 binary restart file" << fileName + CSU2BinaryFileWriter::fileExt;   
+          (*fileWritingTable) << "SU2 restart" << fileName + CSU2BinaryFileWriter::fileExt;   
       }
       
       fileWriter = new CSU2BinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -454,7 +454,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Set the mesh ASCII format ---*/
       
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing SU2 mesh file" << fileName + CSU2MeshFileWriter::fileExt;
+          (*fileWritingTable) << "SU2 mesh" << fileName + CSU2MeshFileWriter::fileExt;
       }
       
       fileWriter = new CSU2MeshFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -475,7 +475,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Write tecplot binary ---*/
       
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Tecplot binary solution file" << fileName + CTecplotBinaryFileWriter::fileExt;
+          (*fileWritingTable) << "Tecplot" << fileName + CTecplotBinaryFileWriter::fileExt;
       }
       
       fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -495,7 +495,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       /*--- Write tecplot binary ---*/
       
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Tecplot ASCII solution file" << fileName + CTecplotFileWriter::fileExt;
+          (*fileWritingTable) << "Tecplot ASCII" << fileName + CTecplotFileWriter::fileExt;
       }
       
       fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter,
@@ -514,7 +514,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Paraview binary solution file" << fileName + CParaviewBinaryFileWriter::fileExt;
+          (*fileWritingTable) << "Paraview" << fileName + CParaviewBinaryFileWriter::fileExt;
       }
       
       fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -532,7 +532,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Paraview ASCII volume solution file" << fileName + CParaviewFileWriter::fileExt;      
+          (*fileWritingTable) << "Paraview ASCII" << fileName + CParaviewFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, volumeDataSorter);
@@ -551,7 +551,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Paraview ASCII surface file" << fileName + CParaviewFileWriter::fileExt;      
+          (*fileWritingTable) << "Paraview ASCII surface" << fileName + CParaviewFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -570,7 +570,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Paraview Binary surface file" << fileName + CParaviewBinaryFileWriter::fileExt;      
+          (*fileWritingTable) << "Paraview surface" << fileName + CParaviewBinaryFileWriter::fileExt;      
       }
       
       fileWriter = new CParaviewBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter);
@@ -589,7 +589,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Tecplot ASCII surface file" << fileName + CTecplotFileWriter::fileExt;      
+          (*fileWritingTable) << "Tecplot ASCII surface" << fileName + CTecplotFileWriter::fileExt;      
       }
       
       fileWriter = new CTecplotFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
@@ -609,7 +609,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
       /*--- Write paraview binary ---*/
       if (rank == MASTER_NODE) {
-          (*fileWritingTable) << "Writing Tecplot Binary surface file" << fileName + CTecplotBinaryFileWriter::fileExt;      
+          (*fileWritingTable) << "Tecplot surface" << fileName + CTecplotBinaryFileWriter::fileExt;      
       }
       
       fileWriter = new CTecplotBinaryFileWriter(volumeFieldNames, nDim, fileName, surfaceDataSorter,
@@ -817,7 +817,6 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
   }
  
   historyFileTable->PrintHeader();
-  histFile << endl;
   if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
     histFile << "ZONE T= \"Convergence history\"" << endl;
   }
@@ -903,7 +902,7 @@ void COutput::SetScreen_Output(CConfig *config) {
 
 void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
   
-    int total_width = 80;
+    int total_width = 72;
   
     noWriting = !wrt;
 
@@ -919,6 +918,10 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
     
     Postprocess_HistoryFields(config);
     
+    fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
+    fileWritingTable->AddColumn("Filename", total_width/2);  
+    fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+    
     if (rank == MASTER_NODE && !noWriting){
       
       /*--- Check for consistency and remove fields that are requested but not available --- */
@@ -941,21 +944,24 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
 
     }
     
-    fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
-    fileWritingTable->AddColumn("Filename", total_width/2); 
-    
-    fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+
     
 }
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
   
+  int total_width = 72;
+  
   noWriting = !wrt;
 
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
+  fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
+  fileWritingTable->AddColumn("Filename", total_width/2);  
+  fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
+  
   if (rank == MASTER_NODE && !noWriting){
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
@@ -970,6 +976,8 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
     
     PrepareHistoryFile(config[ZONE_0]);
     
+    total_width = nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1);    
+    
     /*--- Set the multizone screen header ---*/
 
     if (config[ZONE_0]->GetMultizone_Problem()){
diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py
index 390a3382c67e..1e4f6992e2c8 100644
--- a/SU2_PY/SU2/eval/gradients.py
+++ b/SU2_PY/SU2/eval/gradients.py
@@ -646,7 +646,7 @@ def findiff( config, state=None ):
 
     grad_filename  = config['GRAD_OBJFUNC_FILENAME']
     grad_filename  = os.path.splitext( grad_filename )[0]
-    output_format  = config['OUTPUT_FORMAT']
+    output_format  = config['TABULAR_FORMAT']
     plot_extension = su2io.get_extension(output_format)    
     grad_filename  = grad_filename + '_findiff' + plot_extension
 
@@ -933,7 +933,7 @@ def directdiff( config, state=None ):
 
     grad_filename  = config['GRAD_OBJFUNC_FILENAME']
     grad_filename  = os.path.splitext( grad_filename )[0]
-    output_format  = config['OUTPUT_FORMAT']
+    output_format  = config['TABULAR_FORMAT']
     plot_extension = su2io.get_extension(output_format)
     grad_filename  = grad_filename + '_directdiff' + plot_extension
 
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 47ae4020dc5b..55b59b232299 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -716,7 +716,7 @@ int main(int argc, char *argv[]) {
                 cout << "Writing the volume solution for time step " << TimeIter << "." << endl;
               for (iZone = 0; iZone < nZone; iZone++){
                 
-                WriteFiles(config_container[iZone], geometry_container[iZone][iInst], &solver_container[iZone][iInst], output[iZone], TimeIter);
+                WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], TimeIter);
                 
               }        
         }
@@ -743,7 +743,7 @@ int main(int argc, char *argv[]) {
       }
       for (iZone = 0; iZone < nZone; iZone++){
         
-        WriteFiles(config_container[iZone], geometry_container[iZone][iInst], &solver_container[iZone][iInst], output[iZone], 0);
+        WriteFiles(config_container[iZone], geometry_container[iZone][INST_0], &solver_container[iZone][INST_0], output[iZone], 0);
         
       }  
     }

From e5cad8904d0d4f32406d7e45eec0b7609a0fab60 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 19 Sep 2019 17:49:46 +0200
Subject: [PATCH 484/539] Small fix

---
 Common/src/config_structure.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index b9d118c7e2db..752e64fc5806 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7536,7 +7536,7 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, string
     
     if (GetnZone() > 1 ) {
         SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
-        multizone_filename.append(string(buffer)+ext);
+        multizone_filename.append(string(buffer));
     }
     
     multizone_filename += ext;    

From a9148e1d9beb49d6b0921ebb7d62b9422e8b52d5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 20 Sep 2019 12:34:11 +0200
Subject: [PATCH 485/539] Added a conversion script for restart files

---
 SU2_PY/convert_to_csv.py | 63 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100755 SU2_PY/convert_to_csv.py

diff --git a/SU2_PY/convert_to_csv.py b/SU2_PY/convert_to_csv.py
new file mode 100755
index 000000000000..5783528aa591
--- /dev/null
+++ b/SU2_PY/convert_to_csv.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+## \file convert_to_csv.py
+#  \brief This script converts SU2 ASCII restart files generated with a version prior v7 to the CSV format
+#  \author T. Albring
+#  \version 6.2.0 "Falcon"
+#
+# SU2 Lead Developers: Dr. Francisco Palacios (Francisco.D.Palacios@boeing.com).
+#                      Dr. Thomas D. Economon (economon@stanford.edu).
+#
+# SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
+#                 Prof. Piero Colonna's group at Delft University of Technology.
+#                 Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+#                 Prof. Alberto Guardone's group at Polytechnic University of Milan.
+#                 Prof. Rafael Palacios' group at Imperial College London.
+#                 Prof. Edwin van der Weide's group at the University of Twente.
+#                 Prof. Vincent Terrapon's group at the University of Liege.
+#
+# Copyright (C) 2012-2016 SU2, the open-source CFD code.
+#
+# SU2 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, or (at your option) any later version.
+#
+# SU2 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+
+from optparse import OptionParser
+import os
+
+parser = OptionParser(usage = "%prog -i INPUT_FILE",
+        description = 'This script converts SU2 ASCII restart files generated with a version prior v7 to the CSV format')
+parser.add_option("-i", "--inputfile", dest="infile",
+                  help="ASCII restart file (*.dat)", metavar="INPUT_FILE")
+(options, args)=parser.parse_args()
+
+
+infile = open(options.infile, "r")
+out_name = options.infile.split('.')[0] + ".csv"
+if (os.path.isfile(out_name)):
+    print('File ' + out_name + ' already exists.')
+    exit(1)
+outfile = open(out_name, "w")
+
+while 1:
+    line = infile.readline()
+    if not line:
+        break
+
+    line = line.split() 
+    for i, val in enumerate(line):
+        outfile.write(val.strip())
+        if i != len(line)-1:
+            outfile.write(', ')
+    outfile.write('\n')
+
+print('Converted ' + options.infile + ' to ' + out_name)

From 6e42ccfe07270115b7fd0322f56719abc4956941 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 20 Sep 2019 13:55:01 +0200
Subject: [PATCH 486/539] Some small refactoring

---
 SU2_CFD/src/output/COutput.cpp | 66 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index eb6f929fb5fd..151d3baa2b99 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -776,24 +776,18 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
 void COutput::SetHistoryFile_Header(CConfig *config) { 
 
-  
-  if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
-    histFile << "TITLE = \"SU2 Simulation\"" << endl;
-    histFile << "VARIABLES = \\";
-    histFile << endl;
-  }
-  
+  unsigned short iField_Output = 0, 
+      iReqField = 0,
+      iMarker = 0;
   stringstream out;
   string RequestedField;
-  std::vector<bool> found_field(nRequestedHistoryFields, false);  
   int width = 20;
   
-  for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
-    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+  for (iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
+    const HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
+    for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
       RequestedField = requestedHistoryFields[iReqField];   
       if (RequestedField == Field.outputGroup || (RequestedField == historyOutput_List[iField_Output])){
-        found_field[iReqField] = true;   
         if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
         else{ width = std::max((int)Field.fieldName.size()+2, 20);}
         historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);
@@ -801,13 +795,12 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
     }  
   }
   
-  for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){  
-      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+  for (iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
+    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){  
+      const HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
+      for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
         RequestedField = requestedHistoryFields[iReqField];   
         if (RequestedField == Field.outputGroup || (RequestedField == historyOutputPerSurface_List[iField_Output])){
-          found_field[iReqField] = true;    
           if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
           else{ width = std::max((int)Field.fieldName.size()+2, 20);}
           historyFileTable->AddColumn("\"" + Field.fieldName + "\"", 20);          
@@ -815,23 +808,26 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       }
     }
   }
- 
-  historyFileTable->PrintHeader();
+  
   if (config->GetTabular_FileFormat() == TAB_TECPLOT) {
-    histFile << "ZONE T= \"Convergence history\"" << endl;
+    histFile << "VARIABLES = \\" << endl;
   }
+  historyFileTable->PrintHeader();
   histFile.flush();
 }
 
 
 void COutput::SetHistoryFile_Output(CConfig *config) { 
   
+  unsigned short iField_Output = 0, 
+      iReqField = 0,
+      iMarker = 0;
   stringstream out;
   string RequestedField;
   
-  for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
-    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+  for (iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
+    const HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
+    for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
       RequestedField = requestedHistoryFields[iReqField];   
       if (RequestedField == Field.outputGroup){
         (*historyFileTable) << Field.value; 
@@ -839,10 +835,10 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
     }
   }
   
-  for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+  for (iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
+    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
+      const HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
+      for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
         RequestedField = requestedHistoryFields[iReqField];   
         if (RequestedField == Field.outputGroup){
           (*historyFileTable) << Field.value;  
@@ -901,9 +897,7 @@ void COutput::SetScreen_Output(CConfig *config) {
 }
 
 void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
-  
-    int total_width = 72;
-  
+   
     noWriting = !wrt;
 
     /*--- Set the common output fields ---*/
@@ -918,6 +912,9 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
     
     Postprocess_HistoryFields(config);
     
+    /*--- We use a fixed size of the file output summary table ---*/
+    
+    int total_width = 72;    
     fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
     fileWritingTable->AddColumn("Filename", total_width/2);  
     fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
@@ -949,19 +946,20 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
 }
 
 void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
-  
-  int total_width = 72;
-  
+    
   noWriting = !wrt;
 
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
+  /*--- We use a fixed size of the file output summary table ---*/
+  
+  int total_width = 72;    
   fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
   fileWritingTable->AddColumn("Filename", total_width/2);  
   fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
-  
+
   if (rank == MASTER_NODE && !noWriting){
     
     /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/

From a928db0abd7d4e89e8a4eca744c9efd0dd6d15f6 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 20 Sep 2019 13:56:28 +0200
Subject: [PATCH 487/539] Added new error message for restart files and other
 fixes

---
 SU2_CFD/src/solver_structure.cpp                    | 13 +++++++++++--
 SU2_DEF/src/SU2_DEF.cpp                             |  6 +++++-
 SU2_DOT/src/SU2_DOT.cpp                             |  1 +
 SU2_PY/SU2/io/tools.py                              |  6 +++---
 TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg  |  2 +-
 .../cont_adj_euler/naca0012/inv_NACA0012_FD.cfg     |  2 +-
 .../multiple_ffd/naca0012/inv_NACA0012_ffd.cfg      |  4 ++--
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index ee4edc86ab2a..f267a0c3e196 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -4154,6 +4154,9 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   fields.clear();
 
   Restart_Vars = new int[5];
+  
+  string error_string = "Note: ASCII restart files must be in CSV format since v7.0.\n"
+                        "Check https://su2code.github.io/docs/Guide-to-v7 for more information.";
 
   /*--- First, check that this is not a binary restart file. ---*/
 
@@ -4209,7 +4212,8 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   /*--- Error check opening the file. ---*/
 
   if (ierr) {
-    SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
+    SU2_MPI::Error(string("SU2 ASCII restart file ") + string(fname) + string(" not found.\n") + error_string, 
+                   CURRENT_FUNCTION);
   }
 
   /*--- Have the master attempt to read the magic number. ---*/
@@ -4242,7 +4246,8 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   /*--- In case there is no restart file ---*/
 
   if (restart_file.fail()) {
-    SU2_MPI::Error(string("SU2 ASCII solution file  ") + string(fname) + string(" not found."), CURRENT_FUNCTION);
+    SU2_MPI::Error(string("SU2 ASCII restart file ") + string(fname) + string(" not found.\n") + error_string, 
+                   CURRENT_FUNCTION);
   }
 
   /*--- Identify the number of fields (and names) in the restart file ---*/
@@ -4252,6 +4257,10 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   char delimiter = ',';
   fields = PrintingToolbox::split(text_line, delimiter);
   
+  if (fields.size() <= 1) {
+    SU2_MPI::Error(string("Restart file does not seem to be a CSV file.\n") + error_string, CURRENT_FUNCTION);
+  }
+  
   for (int iField = 0; iField < fields.size(); iField++){
     PrintingToolbox::trim(fields[iField]);
   }
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 91a484c380fe..80040c839b82 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -222,7 +222,11 @@ int main(int argc, char *argv[]) {
     
     /*--- Preprocess the volume output ---*/
     
-    output[iZone]->PreprocessVolumeOutput(config_container[iZone]);    
+    output[iZone]->PreprocessVolumeOutput(config_container[iZone]);
+    
+    /*--- Preprocess history --- */
+    
+    output[iZone]->PreprocessHistoryOutput(config_container[iZone], false);
     
 
   }
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 8ae967f540c6..1ff7368865e7 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -988,6 +988,7 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
     
     output = new CBaselineOutput(config[iZone], geometry[iZone][INST_0]->GetnDim(), solver);
     output->PreprocessVolumeOutput(config[iZone]);
+    output->PreprocessHistoryOutput(config[iZone], false);
     
     /*--- Load the data --- */
     
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 7fa89b00c64b..e37c6e662248 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -91,9 +91,9 @@ def read_plot( filename ):
         title = line.split('=')[1] .strip() # not used right now
         line = plot_file.readline()
 
-    # process header
-    if '=' in line:
-        line = line.split("=")[1].strip()
+    if line.startswith('VARIABLES'):
+        line = plot_file.readline()
+
     line = line.split(",")
     Variables = [ x.strip('" ') for x in line ]
     n_Vars = len(Variables)
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index e98b906d3002..44966bfc57b2 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -284,7 +284,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index e1c5119a7224..c51e9c6d0cde 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -278,7 +278,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 9441c2c6cb0a..2a5adcd4cc9f 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -28,7 +28,7 @@ WRT_BINARY_RESTART= NO
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 
-
+OUTPUT_FILES=(RESTART_ASCII)
 % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
@@ -293,7 +293,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV 
+TABULAR_FORMAT= TECPLOT 
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history

From eb73e34551da87a92eb72b9881f0d04b4dc1847b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 20 Sep 2019 15:28:24 +0200
Subject: [PATCH 488/539] Fixed warnings

---
 Common/include/config_structure.hpp      |  2 +-
 Common/src/config_structure.cpp          |  2 +-
 Common/src/geometry_structure.cpp        | 37 +++++++-----------------
 SU2_CFD/src/solver_direct_elasticity.cpp |  3 --
 SU2_CFD/src/solver_direct_mean.cpp       |  2 +-
 SU2_CFD/src/solver_structure.cpp         | 16 ++++------
 SU2_DEF/src/SU2_DEF.cpp                  |  1 -
 7 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 52398dccb7e9..430455a1ac1c 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5506,7 +5506,7 @@ class CConfig {
    * \param[in] val_iter - Unsteady iteration number or time instance.
    * \return Name of the file with the iteration number for an unsteady solution file.
    */
-  string GetUnsteady_FileName(string val_filename, unsigned long val_iter, string ext);
+  string GetUnsteady_FileName(string val_filename, long val_iter, string ext);
   
   /*!
    * \brief Append the input filename string with the appropriate objective function extension.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 752e64fc5806..ddab42fbd025 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7495,7 +7495,7 @@ string CConfig::GetFilename(string filename, string ext, unsigned long Iter){
   return filename;
 }
 
-string CConfig::GetUnsteady_FileName(string val_filename, unsigned long val_iter, string ext) {
+string CConfig::GetUnsteady_FileName(string val_filename, long val_iter, string ext) {
 
   string UnstExt="", UnstFilename = val_filename;
   char buffer[50];
diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 63976a826962..30f8e5e61010 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -13461,7 +13461,7 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
     char delimiter = ',';
     split_line = PrintingToolbox::split(text_line, delimiter);
     
-    for (int iField = 0; iField < split_line.size(); iField++){
+    for (unsigned short iField = 0; iField < split_line.size(); iField++){
       PrintingToolbox::trim(split_line[iField]);
     }
     
@@ -13471,7 +13471,7 @@ void CPhysicalGeometry::SetBoundSensitivity(CConfig *config) {
       SU2_MPI::Error("Surface sensitivity not found in file.", CURRENT_FUNCTION);
     }
     
-    int sens_index = std::distance(split_line.begin(), it);
+    unsigned short sens_index = std::distance(split_line.begin(), it);
     
     while (getline(Surface_file, text_line)) {
       for (icommas = 0; icommas < 50; icommas++) {
@@ -13511,23 +13511,8 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   
   ifstream restart_file;
   string filename = config->GetSolution_AdjFileName();
-  bool sst = (config->GetKind_Turb_Model() == SST)  || (config->GetKind_Turb_Model() == SST_SUST);
-  bool sa  = (config->GetKind_Turb_Model() == SA)   || (config->GetKind_Turb_Model() == SA_NEG)  ||
-             (config->GetKind_Turb_Model() == SA_E) || (config->GetKind_Turb_Model() == SA_COMP) ||
-             (config->GetKind_Turb_Model() == SA_E_COMP);
-  bool grid_movement = config->GetGrid_Movement();
-  bool frozen_visc = config->GetFrozen_Visc_Disc();
-  unsigned short Kind_Solver = config->GetKind_Solver();
-  bool flow = ((Kind_Solver == DISC_ADJ_EULER)          ||
-               (Kind_Solver == DISC_ADJ_RANS)           ||
-               (Kind_Solver == DISC_ADJ_NAVIER_STOKES)  ||
-               (Kind_Solver == DISC_ADJ_INC_EULER)          ||
-               (Kind_Solver == DISC_ADJ_INC_RANS)           ||
-               (Kind_Solver == DISC_ADJ_INC_NAVIER_STOKES)  ||
-               (Kind_Solver == ADJ_EULER)               ||
-               (Kind_Solver == ADJ_NAVIER_STOKES)       ||
-               (Kind_Solver == ADJ_RANS));
-  su2double Sens, dull_val, AoASens;
+
+  su2double AoASens;
   unsigned short nTimeIter, iDim;
   unsigned long iPoint, index;
   string::size_type position;
@@ -13845,9 +13830,9 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
       }
     }
     
-    int sens_x_idx = std::distance(config->fields.begin(), itx);    
-    int sens_y_idx = std::distance(config->fields.begin(), ity);    
-    int sens_z_idx = 0;
+    unsigned short sens_x_idx = std::distance(config->fields.begin(), itx);    
+    unsigned short sens_y_idx = std::distance(config->fields.begin(), ity);    
+    unsigned short sens_z_idx = 0;
     if (nDim == 3)
       sens_z_idx = std::distance(config->fields.begin(), itz);    
 
@@ -13979,7 +13964,7 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   
   vector<string> fields = PrintingToolbox::split(text_line, ',');
   
-  for (int iField = 0; iField < fields.size(); iField++){
+  for (unsigned short iField = 0; iField < fields.size(); iField++){
     PrintingToolbox::trim(fields[iField]);
   }
   
@@ -13999,9 +13984,9 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     }
   }
   
-  int sens_x_idx = std::distance(fields.begin(), itx);    
-  int sens_y_idx = std::distance(fields.begin(), ity);    
-  int sens_z_idx = 0;
+  unsigned short sens_x_idx = std::distance(fields.begin(), itx);    
+  unsigned short sens_y_idx = std::distance(fields.begin(), ity);    
+  unsigned short sens_z_idx = 0;
   if (nDim == 3)
     sens_z_idx = std::distance(fields.begin(), itz);    
   
diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 6eccb28d2913..46f21e211669 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -841,15 +841,12 @@ void CFEASolver::Set_Prestretch(CGeometry *geometry, CConfig *config) {
 void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
 
   unsigned long iPoint;
-  unsigned long index;
 
   unsigned short iVar;
   unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry->GetnZone();
   unsigned short file_format = config->GetRefGeom_FileFormat();
 
   string filename;
-  su2double dull_val;
   ifstream reference_file;
 
 
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 17019edf5da2..5851fa2ae3ea 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -14158,7 +14158,7 @@ CNSSolver::CNSSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh)
   ifstream restart_file;
   unsigned short nZone = geometry->GetnZone();
   bool restart    = (config->GetRestart() || config->GetRestart_Flow());
-  int Unst_RestartIter;
+  int Unst_RestartIter = 0;
   bool dual_time = ((config->GetTime_Marching() == DT_STEPPING_1ST) ||
                     (config->GetTime_Marching() == DT_STEPPING_2ND));
   bool time_stepping = config->GetTime_Marching() == TIME_STEPPING;
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index f267a0c3e196..bf2e4d75847e 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -3972,8 +3972,6 @@ void CSolver::Restart_OldGeometry(CGeometry *geometry, CConfig *config) {
 
   /*--- This function is intended for dual time simulations ---*/
 
-  unsigned long index;
-
   int Unst_RestartIter;
   ifstream restart_file_n;
 
@@ -4149,7 +4147,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
   ifstream restart_file;
   string text_line, Tag;
   unsigned short iVar;
-  long index, iPoint_Local = 0; unsigned long iPoint_Global = 0;
+  long iPoint_Local = 0; unsigned long iPoint_Global = 0;
   int counter = 0;
   fields.clear();
 
@@ -4261,7 +4259,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
     SU2_MPI::Error(string("Restart file does not seem to be a CSV file.\n") + error_string, CURRENT_FUNCTION);
   }
   
-  for (int iField = 0; iField < fields.size(); iField++){
+  for (unsigned short iField = 0; iField < fields.size(); iField++){
     PrintingToolbox::trim(fields[iField]);
   }
 
@@ -4288,11 +4286,7 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, CConfig *config, strin
     iPoint_Local = geometry->GetGlobal_to_Local_Point(iPoint_Global);
 
     if (iPoint_Local > -1) {
-
-      /*--- The PointID is not stored --*/
-
-      index = PrintingToolbox::stoi(point_line[0]);
-
+      
       /*--- Store the solution (starting with node coordinates) --*/
 
       for (iVar = 0; iVar < Restart_Vars[1]; iVar++)
@@ -5420,7 +5414,7 @@ CBaselineSolver::CBaselineSolver(CGeometry *geometry, CConfig *config) {
   /*--- Routines to access the number of variables and string names. ---*/
 
   SetOutputVariables(geometry, config);
-
+  
   /*--- Initialize a zero solution and instantiate the CVariable class. ---*/
 
   Solution = new su2double[nVar];
@@ -5730,7 +5724,7 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
 
     fields = PrintingToolbox::split(text_line, ',');
     
-    for (int iField = 0; iField < fields.size(); iField++){
+    for (unsigned short iField = 0; iField < fields.size(); iField++){
       PrintingToolbox::trim(fields[iField]);
     }
     
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index 80040c839b82..bf44cd55af49 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -432,7 +432,6 @@ int main(int argc, char *argv[]) {
   }
   if (rank == MASTER_NODE) cout << "Deleted CConfig container." << endl;
   
-  if (output != NULL) delete output;
   if (rank == MASTER_NODE) cout << "Deleted COutput class." << endl;
 
   /*--- Synchronization point after a single solver iteration. Compute the

From 497fee29f6f0681001af3395a91e150532bc7e10 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 20 Sep 2019 15:28:54 +0200
Subject: [PATCH 489/539] Fixed python scripts

---
 SU2_PY/SU2/io/tools.py                                    | 8 ++++----
 SU2_PY/SU2/util/plot.py                                   | 2 +-
 .../cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg      | 2 +-
 TestCases/polar/naca0012/inv_NACA0012.cfg                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index e37c6e662248..65894d652f9f 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -779,9 +779,9 @@ def get_gradFileFormat(grad_type,plot_format,kindID,special_cases=[]):
     write_format = []
     
     # handle plot formating
-    if (plot_format == 'TAB_TECPLOT'): 
+    if (plot_format == 'TECPLOT'): 
         header.append('VARIABLES=')
-    elif (plot_format == 'TAB_CSV'):
+    elif (plot_format == 'CSV'):
         pass
     else: raise Exception('output plot format not recognized')
     
@@ -905,9 +905,9 @@ def get_optFileFormat(plot_format,special_cases=None, nZones = 1):
     write_format  = []
     
     # handle plot formating
-    if (plot_format == 'TAB_TECPLOT'): 
+    if (plot_format == 'TECPLOT'): 
         header_format = header_format + 'VARIABLES='
-    elif (plot_format == 'TAB_CSV'):
+    elif (plot_format == 'CSV'):
         pass
     else: raise Exception('output plot format not recognized')
 
diff --git a/SU2_PY/SU2/util/plot.py b/SU2_PY/SU2/util/plot.py
index 81a2ae074448..81ddacf0e551 100644
--- a/SU2_PY/SU2/util/plot.py
+++ b/SU2_PY/SU2/util/plot.py
@@ -56,7 +56,7 @@ def write_plot(filename,plot_format,data_plot,keys_plot=None):
     keys_space = [default_spacing] * len(keys_plot)
     
     header = ''
-    if (plot_format == 'TAB_TECPLOT'):
+    if (plot_format == 'TECPLOT'):
         header = 'VARIABLES='
         indent_spacing += 10
     indent_spacing = ' '*indent_spacing
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 21bfd61a7955..f2b5de57303d 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -234,7 +234,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index dbc9b284e0d3..a50d8cdf0e8e 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -282,7 +282,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history

From 3466d44694cb609f37f6be448a8417393d91b029 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 23 Sep 2019 10:41:45 +0200
Subject: [PATCH 490/539] Fix output format in SU2_GEO

---
 SU2_GEO/src/SU2_GEO.cpp | 43 +++++++++++++++++++++++++----------------
 SU2_PY/SU2/io/tools.py  |  4 ++--
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/SU2_GEO/src/SU2_GEO.cpp b/SU2_GEO/src/SU2_GEO.cpp
index 78e00c57482f..dd17d182d957 100644
--- a/SU2_GEO/src/SU2_GEO.cpp
+++ b/SU2_GEO/src/SU2_GEO.cpp
@@ -153,6 +153,8 @@ int main(int argc, char *argv[]) {
     
   }
   
+  bool tabTecplot = config_container[ZONE_0]->GetTabular_FileFormat() == TAB_TECPLOT;
+  
   /*--- Set up a timer for performance benchmarking (preprocessing time is included) ---*/
   
 #ifdef HAVE_MPI
@@ -507,18 +509,21 @@ int main(int argc, char *argv[]) {
     }
     
     /*--- Write the objective function in a external file ---*/
-    
-    cstr = new char [config_container[ZONE_0]->GetObjFunc_Value_FileName().size()+1];
-    strcpy (cstr, config_container[ZONE_0]->GetObjFunc_Value_FileName().c_str());
-    ObjFunc_file.open(cstr, ios::out);
-    ObjFunc_file << "TITLE = \"SU2_GEO Evaluation\"" << endl;
+    string filename = config_container[ZONE_0]->GetObjFunc_Value_FileName();
+    unsigned short lastindex = filename.find_last_of(".");
+    filename = filename.substr(0, lastindex);
+    if (tabTecplot) filename += ".dat";
+    else filename += ".csv";
+    ObjFunc_file.open(filename.c_str(), ios::out);
+    if (tabTecplot) ObjFunc_file << "TITLE = \"SU2_GEO Evaluation\"" << endl;
     
     if (geometry_container[ZONE_0]->GetnDim() == 2) {
-      ObjFunc_file << "VARIABLES = \"AIRFOIL_AREA\",\"AIRFOIL_THICKNESS\",\"AIRFOIL_CHORD\",\"AIRFOIL_LE_RADIUS\",\"AIRFOIL_TOC\",\"AIRFOIL_ALPHA\"";
+      if (tabTecplot) ObjFunc_file << "VARIABLES =//" << endl;
+      ObjFunc_file << "\"AIRFOIL_AREA\",\"AIRFOIL_THICKNESS\",\"AIRFOIL_CHORD\",\"AIRFOIL_LE_RADIUS\",\"AIRFOIL_TOC\",\"AIRFOIL_ALPHA\"";
     }
     else if (geometry_container[ZONE_0]->GetnDim() == 3) {
       
-      ObjFunc_file << "VARIABLES = ";
+      if (tabTecplot) ObjFunc_file << "VARIABLES = //" << endl;
       
       if (config_container[ZONE_0]->GetGeo_Description() == FUSELAGE) {
        	ObjFunc_file << "\"FUSELAGE_VOLUME\",\"FUSELAGE_WETTED_AREA\",\"FUSELAGE_MIN_WIDTH\",\"FUSELAGE_MAX_WIDTH\",\"FUSELAGE_MIN_WATERLINE_WIDTH\",\"FUSELAGE_MAX_WATERLINE_WIDTH\",\"FUSELAGE_MIN_HEIGHT\",\"FUSELAGE_MAX_HEIGHT\",\"FUSELAGE_MAX_CURVATURE\",";
@@ -558,7 +563,7 @@ int main(int argc, char *argv[]) {
       
     }
     
-    ObjFunc_file << "\nZONE T= \"Geometrical variables (value)\"" << endl;
+    if (tabTecplot) ObjFunc_file << "\nZONE T= \"Geometrical variables (value)\"" << endl;
     
     if (config_container[ZONE_0]->GetGeo_Description() == FUSELAGE) {
       if (geometry_container[ZONE_0]->GetnDim() == 3) {
@@ -609,9 +614,12 @@ int main(int argc, char *argv[]) {
     
     /*--- Write the gradient in a external file ---*/
     if (rank == MASTER_NODE) {
-      cstr = new char [config_container[ZONE_0]->GetObjFunc_Grad_FileName().size()+1];
-      strcpy (cstr, config_container[ZONE_0]->GetObjFunc_Grad_FileName().c_str());
-      Gradient_file.open(cstr, ios::out);
+      string filename = config_container[ZONE_0]->GetObjFunc_Grad_FileName();
+      unsigned short lastindex = filename.find_last_of(".");
+      filename = filename.substr(0, lastindex);
+      if (tabTecplot) filename += ".dat";
+      else filename += ".csv";
+      Gradient_file.open(filename.c_str(), ios::out);
     }
     
     for (iDV = 0; iDV < config_container[ZONE_0]->GetnDV(); iDV++) {
@@ -1133,15 +1141,16 @@ int main(int argc, char *argv[]) {
         
         
         if (iDV == 0) {
-          Gradient_file << "TITLE = \"SU2_GEO Gradient\"" << endl;
+          if (tabTecplot) Gradient_file << "TITLE = \"SU2_GEO Gradient\"" << endl;
+          if (tabTecplot) Gradient_file << "VARIABLES = //" << endl;
           
           if (geometry_container[ZONE_0]->GetnDim() == 2) {
-            Gradient_file << "VARIABLES = \"DESIGN_VARIABLE\",\"AIRFOIL_AREA\",\"AIRFOIL_THICKNESS\",\"AIRFOIL_CHORD\",\"AIRFOIL_LE_RADIUS\",\"AIRFOIL_TOC\",\"AIRFOIL_ALPHA\"";
+            Gradient_file << "\"DESIGN_VARIABLE\",\"AIRFOIL_AREA\",\"AIRFOIL_THICKNESS\",\"AIRFOIL_CHORD\",\"AIRFOIL_LE_RADIUS\",\"AIRFOIL_TOC\",\"AIRFOIL_ALPHA\"";
           }
           else if (geometry_container[ZONE_0]->GetnDim() == 3) {
             
             if (config_container[ZONE_0]->GetGeo_Description() == FUSELAGE) {
-              Gradient_file << "VARIABLES = \"DESIGN_VARIABLE\",";
+              Gradient_file << "\"DESIGN_VARIABLE\",";
               Gradient_file << "\"FUSELAGE_VOLUME\",\"FUSELAGE_WETTED_AREA\",\"FUSELAGE_MIN_WIDTH\",\"FUSELAGE_MAX_WIDTH\",\"FUSELAGE_MIN_WATERLINE_WIDTH\",\"FUSELAGE_MAX_WATERLINE_WIDTH\",\"FUSELAGE_MIN_HEIGHT\",\"FUSELAGE_MAX_HEIGHT\",\"FUSELAGE_MAX_CURVATURE\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_AREA\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_LENGTH\",";
@@ -1153,7 +1162,7 @@ int main(int argc, char *argv[]) {
               }
             }
             else if (config_container[ZONE_0]->GetGeo_Description() == NACELLE) {
-              Gradient_file << "VARIABLES = \"DESIGN_VARIABLE\",";
+              Gradient_file << "\"DESIGN_VARIABLE\",";
               Gradient_file << "\"NACELLE_VOLUME\",\"NACELLE_MIN_THICKNESS\",\"NACELLE_MAX_THICKNESS\",\"NACELLE_MIN_CHORD\",\"NACELLE_MAX_CHORD\",\"NACELLE_MIN_LE_RADIUS\",\"NACELLE_MAX_LE_RADIUS\",\"NACELLE_MIN_TOC\",\"NACELLE_MAX_TOC\",\"NACELLE_OBJFUN_MIN_TOC\",\"NACELLE_MAX_TWIST\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_AREA\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_THICKNESS\",";
@@ -1166,7 +1175,7 @@ int main(int argc, char *argv[]) {
               }
             }
             else {
-              Gradient_file << "VARIABLES = \"DESIGN_VARIABLE\",";
+              Gradient_file << "\"DESIGN_VARIABLE\",";
               Gradient_file << "\"WING_VOLUME\",\"WING_MIN_THICKNESS\",\"WING_MAX_THICKNESS\",\"WING_MIN_CHORD\",\"WING_MAX_CHORD\",\"WING_MIN_LE_RADIUS\",\"WING_MAX_LE_RADIUS\",\"WING_MIN_TOC\",\"WING_MAX_TOC\",\"WING_OBJFUN_MIN_TOC\",\"WING_MAX_TWIST\",\"WING_MAX_CURVATURE\",\"WING_MAX_DIHEDRAL\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_AREA\",";
               for (iPlane = 0; iPlane < nPlane; iPlane++) Gradient_file << "\"STATION"<< (iPlane+1) << "_THICKNESS\",";
@@ -1181,7 +1190,7 @@ int main(int argc, char *argv[]) {
             
           }
           
-          Gradient_file << "\nZONE T= \"Geometrical variables (gradient)\"" << endl;
+          if (tabTecplot) Gradient_file << "\nZONE T= \"Geometrical variables (gradient)\"" << endl;
           
         }
         
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 65894d652f9f..052611e11223 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -92,10 +92,10 @@ def read_plot( filename ):
         line = plot_file.readline()
 
     if line.startswith('VARIABLES'):
-        line = plot_file.readline()
+          line = plot_file.readline()
 
     line = line.split(",")
-    Variables = [ x.strip('" ') for x in line ]
+    Variables = [ x.strip().strip('"') for x in line ]
     n_Vars = len(Variables)
     
     # initialize plot data dictionary

From 990af68b03018b0632ae98c91ed9668147e0d017 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 23 Sep 2019 14:50:24 +0200
Subject: [PATCH 491/539] Fix for csv restart files in python scripts

---
 SU2_PY/SU2/eval/gradients.py |  7 +++++++
 SU2_PY/SU2/io/state.py       | 13 +++++++++++++
 SU2_PY/SU2/opt/project.py    |  2 +-
 SU2_PY/SU2/run/geometry.py   | 11 +++++++++--
 SU2_PY/SU2/util/plot.py      |  4 ++--
 SU2_PY/continuous_adjoint.py |  6 ++++++
 6 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py
index 1e4f6992e2c8..32839585e1e0 100644
--- a/SU2_PY/SU2/eval/gradients.py
+++ b/SU2_PY/SU2/eval/gradients.py
@@ -265,6 +265,13 @@ def adjoint( func_name, config, state=None ):
     # files: target heat flux coefficient
     if 'INV_DESIGN_HEATFLUX' in special_cases:
         pull.append(files['TARGET_HEATFLUX'])
+    
+    if not 'OUTPUT_FILES' in config:
+        config['OUTPUT_FILES'] = ['RESTART']
+
+    if not 'SURFACE_CSV' in config['OUTPUT_FILES']:
+      config['OUTPUT_FILES'].append('SURFACE_CSV')
+    
 
     # output redirection
     with redirect_folder( ADJ_NAME, pull, link ) as push:
diff --git a/SU2_PY/SU2/io/state.py b/SU2_PY/SU2/io/state.py
index 0262bdd095b7..3cffb5b293c3 100644
--- a/SU2_PY/SU2/io/state.py
+++ b/SU2_PY/SU2/io/state.py
@@ -229,8 +229,21 @@ def find_files(self,config):
         files = self.FILES
         
         mesh_name     = config.MESH_FILENAME
+        if config.get('READ_BINARY_RESTART', 'YES') == 'NO':
+            if not 'RESTART_ASCII' in config.get('OUTPUT_FILES',['RESTART']):
+                print ('RESTART_ASCII must be in OUTPUT_FILES if READ_BINARY_RESTART is set to NO')
+                sys.exit()
+  
         direct_name   = config.SOLUTION_FILENAME
         adjoint_name  = config.SOLUTION_ADJ_FILENAME
+        
+        if 'RESTART_ASCII' in config.get('OUTPUT_FILES', ['RESTART']):
+            direct_name = direct_name.split('.')[0] + '.csv'
+            adjoint_name = adjoint_name.split('.')[0] + '.csv'
+        else:
+            direct_name = direct_name.split('.')[0] + '.dat'
+            adjoint_name = adjoint_name.split('.')[0] + '.dat'
+
         targetea_name = 'TargetEA.dat'
         targetcp_name = 'TargetCp.dat'
         targetheatflux_name = 'TargetHeatFlux.dat'
diff --git a/SU2_PY/SU2/opt/project.py b/SU2_PY/SU2/opt/project.py
index 54d829b112a8..7cb073f54ea9 100644
--- a/SU2_PY/SU2/opt/project.py
+++ b/SU2_PY/SU2/opt/project.py
@@ -488,7 +488,7 @@ def plot_results(self):
         results_plot.update(functions)
         results_plot.update(history.get('DIRECT',{}))
         
-        if (output_format == 'TAB_CSV'):
+        if (output_format == 'CSV'):
           su2util.write_plot('history_project.csv',output_format,results_plot)
         else:
           su2util.write_plot('history_project.dat',output_format,results_plot)
diff --git a/SU2_PY/SU2/run/geometry.py b/SU2_PY/SU2/run/geometry.py
index cb00f40f1653..550d6963f51a 100644
--- a/SU2_PY/SU2/run/geometry.py
+++ b/SU2_PY/SU2/run/geometry.py
@@ -79,11 +79,18 @@ def geometry ( config , step = 1e-3 ):
     
     # unpack
     function_name = konfig['GEO_PARAM']
-
+    tabular_format = konfig.get('TABULAR_FORMAT', 'CSV')
     func_filename  = konfig['VALUE_OBJFUNC_FILENAME']
-
     grad_filename  = konfig['GRAD_OBJFUNC_FILENAME']
 
+    if tabular_format == 'CSV':
+        func_filename = func_filename.split('.')[0] + '.csv'
+        grad_filename = grad_filename.split('.')[0] + '.csv'
+    else:
+        func_filename = func_filename.split('.')[0] + '.dat'
+        grad_filename = grad_filename.split('.')[0] + '.dat'
+
+
     # choose dv values 
     Definition_DV = konfig['DEFINITION_DV']
     n_DV          = len(Definition_DV['KIND'])
diff --git a/SU2_PY/SU2/util/plot.py b/SU2_PY/SU2/util/plot.py
index 81ddacf0e551..a97d8061962d 100644
--- a/SU2_PY/SU2/util/plot.py
+++ b/SU2_PY/SU2/util/plot.py
@@ -95,8 +95,8 @@ def write_plot(filename,plot_format,data_plot,keys_plot=None):
     return
     
 def tecplot(filename,data_plot,keys_plot=[]):
-    write_plot(filename,'TAB_CSV',data_plot,keys_plot)
+    write_plot(filename,'TECPLOT',data_plot,keys_plot)
 
 def paraview(filename,data_plot,keys_plot=[]):
-    write_plot(filename,'TAB_CSV',data_plot,keys_plot)
+    write_plot(filename,'CSV',data_plot,keys_plot)
         
diff --git a/SU2_PY/continuous_adjoint.py b/SU2_PY/continuous_adjoint.py
index ef0a0af1b0eb..898d90a76a77 100755
--- a/SU2_PY/continuous_adjoint.py
+++ b/SU2_PY/continuous_adjoint.py
@@ -95,6 +95,12 @@ def continuous_adjoint( filename           ,
     # Force CSV output in order to compute gradients
     config.WRT_CSV_SOL = 'YES'
     
+    if not 'OUTPUT_FILES' in config:
+        config['OUTPUT_FILES'] = ['RESTART']
+
+    if not 'SURFACE_CSV' in config['OUTPUT_FILES']:
+        config['OUTPUT_FILES'].append('SURFACE_CSV')
+    
     # check for existing files
     if not compute:
         config.RESTART_SOL = 'YES'

From b2f4e768f881434724ded3d1af007071e3fec573 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 23 Sep 2019 15:01:26 +0200
Subject: [PATCH 492/539] Small after-merge fix

---
 SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp | 2 +-
 SU2_CFD/src/iteration_structure.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
index 9758d8e6138d..dd2e72eaa086 100644
--- a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -205,7 +205,7 @@ void CDiscAdjSinglezoneDriver::Postprocess() {
     case DISC_ADJ_FEM :
 
       /*--- Apply the boundary condition to clamped nodes ---*/
-      iteration->Postprocess(output,integration_container,geometry_container,solver_container,numerics_container,
+      iteration->Postprocess(output_container[ZONE_0],integration_container,geometry_container,solver_container,numerics_container,
                              config_container,surface_movement,grid_movement,FFDBox,ZONE_0,INST_0);
 
       RecordingState = NONE;
diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp
index c92ad68df425..691f21dfc6f7 100644
--- a/SU2_CFD/src/iteration_structure.cpp
+++ b/SU2_CFD/src/iteration_structure.cpp
@@ -2182,7 +2182,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput *output,
     /*--- Compute & set Grid Velocity via finite differences of the Coordinates. ---*/
     if (grid_IsMoving)
       for (iMesh=0; iMesh<=config[val_iZone]->GetnMGLevels();iMesh++)
-        geometry[val_iZone][val_iInst][iMesh]->SetGridVelocity(config[val_iZone], ExtIter);
+        geometry[val_iZone][val_iInst][iMesh]->SetGridVelocity(config[val_iZone], TimeIter);
 
   }//if unsteady
 

From 94b032aa5691d5d394f4650294a54d5ea2afdfd2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 23 Sep 2019 17:10:49 +0200
Subject: [PATCH 493/539] Fix output writing at time step 0 [ci skip]

---
 SU2_CFD/src/output/COutput.cpp                |  5 ++-
 .../inv_NACA0012_pitching.cfg                 | 40 +++++++------------
 .../inv_wedge_ROE_multiobj.cfg                |  2 +-
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 1275c5d309e0..495035eac7c7 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1617,7 +1617,10 @@ bool COutput::WriteHistoryFile_Output(CConfig *config) {
 }
 
 bool COutput::WriteVolume_Output(CConfig *config, unsigned long Iter){
-  return ((Iter > 0) && (Iter % config->GetVolume_Wrt_Freq() == 0));
+  if (config->GetTime_Domain()) return ((Iter % config->GetVolume_Wrt_Freq() == 0));
+  else {
+     return ((Iter > 0) && (Iter % config->GetVolume_Wrt_Freq() == 0));
+  }
 }
 
 void COutput::SetCommonHistoryFields(CConfig *config){
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index fd053af31a3e..5ee1a2562c7f 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -21,22 +21,22 @@ ITER= 350
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,
 %                      DUAL_TIME_STEPPING-2ND_ORDER)
 TIME_DOMAIN= YES
-UNSTEADY_SIMULATION= DUAL_TIME_STEPPING-2ND_ORDER
+TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
 %
 % Time Step for dual time stepping simulations (s)
-UNST_TIMESTEP= 0.0023555025613149587
+TIME_STEP= 0.0023555025613149587
 % 24 steps per period: 0.0024536485013697488
 % 25 steps per period: 0.0023555025613149587
 %
 % Total Physical Time for dual time stepping simulations (s)
 % 150 steps
-UNST_TIME= 0.354
+MAX_TIME= 0.354
 %
 % Iteration number to begin unsteady restarts
-UNST_RESTART_ITER= 151
+RESTART_ITER= 10
 %
 % Starting direct iteration for unsteady adjoint
-UNST_ADJOINT_ITER= 151
+UNST_ADJOINT_ITER= 10
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %
@@ -270,30 +270,18 @@ DEFORM_LINEAR_SOLVER_ERROR = 0.000000001
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-% Residual reduction (order of magnitude with respect to the initial value)
-RESIDUAL_REDUCTION= 16
 %
 % Min value of the residual (log10 of the residual)
-RESIDUAL_MINVAL= -20
+CONV_RESIDUAL_MINVAL= -20
 %
 % Start Cauchy criteria at iteration number
-STARTCONV_ITER= 10
+CONV_STARTITER= 10
 %
 % Number of elements to apply the criteria
-CAUCHY_ELEMS= 100
+CONV_CAUCHY_ELEMS= 100
 %
 % Epsilon to control the series convergence
-CAUCHY_EPS= 1E-6
-%
-% Direct function to apply the convergence criteria (LIFT, DRAG, NEARFIELD_PRESS)
-CAUCHY_FUNC_FLOW= DRAG
-%
-% Adjoint function to apply the convergence criteria (SENS_GEOMETRY, SENS_MACH)
-CAUCHY_FUNC_ADJFLOW= SENS_GEOMETRY
+CONV_CAUCHY_EPS= 1E-6
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
@@ -307,25 +295,25 @@ MESH_FORMAT= SU2
 MESH_OUT_FILENAME= mesh_out.su2
 %
 % Restart flow input file
-SOLUTION_FLOW_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow.dat
 %
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output file format (PARAVIEW, TECPLOT)
-OUTPUT_FORMAT= PARAVIEW_BINARY
+TABULAR_FORMAT= CSV
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
 %
 % Output file restart flow
-RESTART_FLOW_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow.dat
 %
 % Output file restart adjoint
 RESTART_ADJ_FILENAME= restart_adj.dat
 %
 % Output file flow (w/o extension) variables
-VOLUME_FLOW_FILENAME= flow
+VOLUME_FILENAME= flow
 %
 % Output file adjoint (w/o extension) variables
 VOLUME_ADJ_FILENAME= adjoint
@@ -334,7 +322,7 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 %
 % Output file surface flow coefficient (w/o extension)
-SURFACE_FLOW_FILENAME= surface_flow
+SURFACE_FILENAME= surface_flow
 %
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 9b3ee0209d0c..0e64eae3a2d6 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -244,7 +244,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history

From baf718699ee0c1a136cdfb57f808553179d7aa14 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 23 Sep 2019 18:50:34 +0200
Subject: [PATCH 494/539] More fixes

---
 SU2_CFD/src/output/COutput.cpp                                  | 2 +-
 .../disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 495035eac7c7..7136ea61cc0c 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1001,7 +1001,7 @@ void COutput::PrepareHistoryFile(CConfig *config){
   historyFileTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
   historyFileTable->SetPrintHeaderTopLine(false);
   historyFileTable->SetPrintHeaderBottomLine(false);
-  historyFileTable->SetPrecision(14);
+  historyFileTable->SetPrecision(15);
   
   /*--- Add the header to the history file. ---*/
   
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index 5ee1a2562c7f..7369c8fc9a89 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -36,7 +36,7 @@ MAX_TIME= 0.354
 RESTART_ITER= 10
 %
 % Starting direct iteration for unsteady adjoint
-UNST_ADJOINT_ITER= 10
+UNST_ADJOINT_ITER= 151
 
 % ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
 %

From 545842a692e9f2b28df8c3df63528eb2336148d7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 10:06:19 +0200
Subject: [PATCH 495/539] Fixing include path

---
 SU2_CFD/src/solver_direct_elasticity.cpp | 2 +-
 SU2_CFD/src/solver_structure.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp
index 46f21e211669..ad51b191021c 100644
--- a/SU2_CFD/src/solver_direct_elasticity.cpp
+++ b/SU2_CFD/src/solver_direct_elasticity.cpp
@@ -39,7 +39,7 @@
 #include "../include/variables/CFEAFSIBoundVariable.hpp"
 #include "../include/variables/CFEABoundVariable.hpp"
 #include "../include/variables/CFEAVariable.hpp"
-#include "../include/toolboxes/printing_toolbox.hpp"
+#include "../../Common/include/toolboxes/printing_toolbox.hpp"
 #include <algorithm>
 
 CFEASolver::CFEASolver(bool mesh_deform_mode) : CSolver(mesh_deform_mode) {
diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp
index bf2e4d75847e..1ecc24e93b58 100644
--- a/SU2_CFD/src/solver_structure.cpp
+++ b/SU2_CFD/src/solver_structure.cpp
@@ -49,7 +49,7 @@
 #include "../../Common/include/toolboxes/MMS/CRinglebSolution.hpp"
 #include "../../Common/include/toolboxes/MMS/CTGVSolution.hpp"
 #include "../../Common/include/toolboxes/MMS/CUserDefinedSolution.hpp"
-#include "../include/toolboxes/printing_toolbox.hpp"
+#include "../../Common/include/toolboxes/printing_toolbox.hpp"
 
 
 CSolver::CSolver(bool mesh_deform_mode) : System(mesh_deform_mode) {

From cf0cb5b1b0bb057d4d5f36a9ae942427eaa6f7a0 Mon Sep 17 00:00:00 2001
From: Ruben Sanchez <ruben.sanchez@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 10:20:19 +0200
Subject: [PATCH 496/539] Fix incompressible output.

---
 SU2_CFD/src/output/CFlowIncOutput.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index c5188f5d9987..a4fe84caa151 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -369,7 +369,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("PRESSURE_COEFF", "Pressure_Coefficient", "PRIMITIVE", "Pressure coefficient");
   AddVolumeOutput("DENSITY",        "Density",              "PRIMITIVE", "Density");
   
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+  if (config->GetKind_Solver() == INC_RANS || config->GetKind_Solver() == INC_NAVIER_STOKES){
     AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
     
     AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE", "x-component of the skin friction vector");
@@ -382,7 +382,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     
   }
   
-  if (config->GetKind_Solver() == RANS) {
+  if (config->GetKind_Solver() == INC_RANS) {
     AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
   }
   
@@ -443,7 +443,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("ROE_DISSIPATION", "Roe_Dissipation", "ROE_DISSIPATION", "Value of the Roe dissipation");
   }
   
-  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+  if(config->GetKind_Solver() == INC_RANS || config->GetKind_Solver() == INC_NAVIER_STOKES){
     if (nDim == 3){
       AddVolumeOutput("VORTICITY_X", "Vorticity_x", "VORTEX_IDENTIFICATION", "x-component of the vorticity vector");
       AddVolumeOutput("VORTICITY_Y", "Vorticity_y", "VORTEX_IDENTIFICATION", "y-component of the vorticity vector");
@@ -512,11 +512,11 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   SetVolumeOutputValue("PRESSURE_COEFF", iPoint, (Node_Flow->GetPressure() - config->GetPressure_FreeStreamND())*factor);
   SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetDensity());
   
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+  if (config->GetKind_Solver() == INC_RANS || config->GetKind_Solver() == INC_NAVIER_STOKES){
     SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity());
   }
   
-  if (config->GetKind_Solver() == RANS) {
+  if (config->GetKind_Solver() == INC_RANS) {
     SetVolumeOutputValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity());
   }
   
@@ -579,7 +579,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
   }  
   
-  if(config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+  if(config->GetKind_Solver() == INC_RANS || config->GetKind_Solver() == INC_NAVIER_STOKES){
     if (nDim == 3){
       SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity()[0]);
       SetVolumeOutputValue("VORTICITY_Y", iPoint, Node_Flow->GetVorticity()[1]);     
@@ -591,7 +591,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
 
 void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
   
-  if ((config->GetKind_Solver() == NAVIER_STOKES) || (config->GetKind_Solver()  == RANS)) {  
+  if ((config->GetKind_Solver() == INC_NAVIER_STOKES) || (config->GetKind_Solver()  == INC_RANS)) {
     SetVolumeOutputValue("SKIN_FRICTION-X", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 0));
     SetVolumeOutputValue("SKIN_FRICTION-Y", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 1));
     if (nDim == 3)

From 93fbf692496bc2f6e25a5836377777b67631bfdd Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 10:28:39 +0200
Subject: [PATCH 497/539] Fixing tabular output for test cases

---
 TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg          | 2 +-
 TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 1f6679ce4903..d7bd032720ee 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -233,7 +233,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index ead87acfc8f0..3c5b89ef98dd 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -246,7 +246,7 @@ SOLUTION_FILENAME= solution_flow.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
 % Output tabular format (CSV, TECPLOT)
-TABULAR_FORMAT= CSV
+TABULAR_FORMAT= TECPLOT
 %
 % Output file convergence history (w/o extension) 
 CONV_FILENAME= history

From 8841b35eed3226bacf5369a97cd58cf73afd800e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 11:44:03 +0200
Subject: [PATCH 498/539] Small fixes

---
 Common/src/toolboxes/printing_toolbox.cpp              |  1 +
 SU2_CFD/src/output/COutput.cpp                         | 10 +++++-----
 TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg  |  2 +-
 .../naca0012_pitching/inv_NACA0012_pitching.cfg        |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Common/src/toolboxes/printing_toolbox.cpp b/Common/src/toolboxes/printing_toolbox.cpp
index f77ad9436038..69527d734359 100644
--- a/Common/src/toolboxes/printing_toolbox.cpp
+++ b/Common/src/toolboxes/printing_toolbox.cpp
@@ -50,6 +50,7 @@ void PrintingToolbox::CTablePrinter::SetAlign(int align){
 
 void PrintingToolbox::CTablePrinter::SetPrecision(int precision){
   precision_ = precision;
+  out_stream_->precision(precision_);
 }
 
 void PrintingToolbox::CTablePrinter::AddColumn(const std::string & header_name, int column_width){
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 7136ea61cc0c..11904ee300b4 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -789,7 +789,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       RequestedField = requestedHistoryFields[iReqField];   
       if (RequestedField == Field.outputGroup || (RequestedField == historyOutput_List[iField_Output])){
         if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
-        else{ width = std::max((int)Field.fieldName.size()+2, 20);}
+        else{ width = std::max((int)Field.fieldName.size()+2, 18);}
         historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);
       }
     }  
@@ -802,8 +802,8 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
         RequestedField = requestedHistoryFields[iReqField];   
         if (RequestedField == Field.outputGroup || (RequestedField == historyOutputPerSurface_List[iField_Output])){
           if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
-          else{ width = std::max((int)Field.fieldName.size()+2, 20);}
-          historyFileTable->AddColumn("\"" + Field.fieldName + "\"", 20);          
+          else{ width = std::max((int)Field.fieldName.size()+2, 18);}
+          historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);          
         }
       }
     }
@@ -1001,8 +1001,8 @@ void COutput::PrepareHistoryFile(CConfig *config){
   historyFileTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
   historyFileTable->SetPrintHeaderTopLine(false);
   historyFileTable->SetPrintHeaderBottomLine(false);
-  historyFileTable->SetPrecision(15);
-  
+  historyFileTable->SetPrecision(10);
+
   /*--- Add the header to the history file. ---*/
   
   SetHistoryFile_Header(config);    
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index c51e9c6d0cde..991ffada8965 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -312,7 +312,7 @@ WRT_CON_FREQ= 1
 %
 % History output
 HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, D_AERO_COEFF)
-
+OUTPUT_FILES=(RESTART_ASCII, PARAVIEW)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index 7369c8fc9a89..4d14c229430d 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -12,7 +12,7 @@ MATH_PROBLEM= DISCRETE_ADJOINT
 RESTART_SOL= NO
 SINGLEZONE_DRIVER= YES
 TIME_ITER= 151
-ITER= 350
+INNER_ITER= 350
 
 %EXT_ITER= 151
 %UNST_INT_ITER= 110

From 7cbff5a51394ce5bdb7b9bb33d3a4be8c7a9a9d2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 12:21:19 +0200
Subject: [PATCH 499/539] Added error message if DV_PARAM is incorrectly
 specified

---
 Common/include/option_structure.hpp | 87 ++++++++++++++++-------------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 266cba111d00..6d1356c6ba6d 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -2881,45 +2881,47 @@ class COptionDVParam : public COptionBase {
 
     this->FFDTag = new string[this->nDV];
 
-    unsigned short nParamDV = 0;
-    stringstream ss;
-    unsigned int i = 0;
+   vector<unsigned short> nParamDV(nDV, 0);
+   unsigned short totalnParamDV = 0;
+   stringstream ss;
+   unsigned int i = 0;
+    
     for (unsigned short iDV = 0; iDV < this->nDV; iDV++) {
       switch (this->design_variable[iDV]) {
-        case NO_DEFORMATION:       nParamDV = 0; break;
-        case FFD_SETTING:          nParamDV = 0; break;
-        case FFD_CONTROL_POINT_2D: nParamDV = 5; break;
-        case FFD_CAMBER_2D:        nParamDV = 2; break;
-        case FFD_THICKNESS_2D:     nParamDV = 2; break;
-        case FFD_TWIST_2D:         nParamDV = 3; break;
-        case HICKS_HENNE:          nParamDV = 2; break;
-        case SURFACE_BUMP:         nParamDV = 3; break;
-        case CST:                  nParamDV = 3; break;
-        case ANGLE_OF_ATTACK:      nParamDV = 1; break;
-        case SCALE:                nParamDV = 0; break;
-        case TRANSLATION:          nParamDV = 3; break;
-        case ROTATION:             nParamDV = 6; break;
-        case NACA_4DIGITS:         nParamDV = 3; break;
-        case PARABOLIC:            nParamDV = 2; break;
-        case AIRFOIL:              nParamDV = 2; break;
-        case FFD_CONTROL_POINT:    nParamDV = 7; break;
-        case FFD_NACELLE:          nParamDV = 6; break;
-        case FFD_GULL:             nParamDV = 2; break;
-        case FFD_TWIST:            nParamDV = 8; break;
-        case FFD_ROTATION:         nParamDV = 7; break;
-        case FFD_CONTROL_SURFACE:  nParamDV = 7; break;
-        case FFD_CAMBER:           nParamDV = 3; break;
-        case FFD_THICKNESS:        nParamDV = 3; break;
-        case FFD_ANGLE_OF_ATTACK:  nParamDV = 2; break;
-        case SURFACE_FILE:         nParamDV = 0; break;
-        case DV_EFIELD:            nParamDV = 2; break;
-        case DV_YOUNG:             nParamDV = 0; break;
-        case DV_POISSON:           nParamDV = 0; break;
-        case DV_RHO:               nParamDV = 0; break;
-        case DV_RHO_DL:            nParamDV = 0; break;
-        case SCALE_GRID:           nParamDV = 0; break;
-        case TRANSLATE_GRID:       nParamDV = 3; break;
-        case ROTATE_GRID:          nParamDV = 6; break;
+        case NO_DEFORMATION:       nParamDV[iDV] = 0; break;
+        case FFD_SETTING:          nParamDV[iDV] = 0; break;
+        case FFD_CONTROL_POINT_2D: nParamDV[iDV] = 5; break;
+        case FFD_CAMBER_2D:        nParamDV[iDV] = 2; break;
+        case FFD_THICKNESS_2D:     nParamDV[iDV] = 2; break;
+        case FFD_TWIST_2D:         nParamDV[iDV] = 3; break;
+        case HICKS_HENNE:          nParamDV[iDV] = 2; break;
+        case SURFACE_BUMP:         nParamDV[iDV] = 3; break;
+        case CST:                  nParamDV[iDV] = 3; break;
+        case ANGLE_OF_ATTACK:      nParamDV[iDV] = 1; break;
+        case SCALE:                nParamDV[iDV] = 0; break;
+        case TRANSLATION:          nParamDV[iDV] = 3; break;
+        case ROTATION:             nParamDV[iDV] = 6; break;
+        case NACA_4DIGITS:         nParamDV[iDV] = 3; break;
+        case PARABOLIC:            nParamDV[iDV] = 2; break;
+        case AIRFOIL:              nParamDV[iDV] = 2; break;
+        case FFD_CONTROL_POINT:    nParamDV[iDV] = 7; break;
+        case FFD_NACELLE:          nParamDV[iDV] = 6; break;
+        case FFD_GULL:             nParamDV[iDV] = 2; break;
+        case FFD_TWIST:            nParamDV[iDV] = 8; break;
+        case FFD_ROTATION:         nParamDV[iDV] = 7; break;
+        case FFD_CONTROL_SURFACE:  nParamDV[iDV] = 7; break;
+        case FFD_CAMBER:           nParamDV[iDV] = 3; break;
+        case FFD_THICKNESS:        nParamDV[iDV] = 3; break;
+        case FFD_ANGLE_OF_ATTACK:  nParamDV[iDV] = 2; break;
+        case SURFACE_FILE:         nParamDV[iDV] = 0; break;
+        case DV_EFIELD:            nParamDV[iDV] = 2; break;
+        case DV_YOUNG:             nParamDV[iDV] = 0; break;
+        case DV_POISSON:           nParamDV[iDV] = 0; break;
+        case DV_RHO:               nParamDV[iDV] = 0; break;
+        case DV_RHO_DL:            nParamDV[iDV] = 0; break;
+        case SCALE_GRID:           nParamDV[iDV] = 0; break;
+        case TRANSLATE_GRID:       nParamDV[iDV] = 3; break;
+        case ROTATE_GRID:          nParamDV[iDV] = 6; break;
         default : {
           string newstring;
           newstring.append(this->name);
@@ -2927,8 +2929,15 @@ class COptionDVParam : public COptionBase {
           return newstring;
         }
       }
-
-      for (unsigned short iParamDV = 0; iParamDV < nParamDV; iParamDV++) {
+      totalnParamDV += nParamDV[iDV];
+    }
+    
+    if (totalnParamDV != option_value.size()){
+      SU2_MPI::Error("Wrong number of arguments for DV_PARAM!", CURRENT_FUNCTION);
+    }
+    
+    for (unsigned short iDV = 0; iDV < this->nDV; iDV++) { 
+      for (unsigned short iParamDV = 0; iParamDV < nParamDV[iDV]; iParamDV++) {
 
         ss << option_value[i] << " ";
 

From 2d7caaa0bd8d9f9715054d987b65da5ff6161bcc Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 16:14:41 +0200
Subject: [PATCH 500/539] Fixed memory leak and uninitialized values

---
 Common/include/option_structure.hpp    | 2 +-
 SU2_CFD/src/output/COutput.cpp         | 1 +
 SU2_CFD/src/solver_direct_mean.cpp     | 2 +-
 SU2_CFD/src/solver_direct_mean_fem.cpp | 2 +-
 SU2_CFD/src/solver_direct_mean_inc.cpp | 2 +-
 SU2_PY/compute_polar.py                | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index 6d1356c6ba6d..4edc8f8e88a1 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -2932,7 +2932,7 @@ class COptionDVParam : public COptionBase {
       totalnParamDV += nParamDV[iDV];
     }
     
-    if (totalnParamDV != option_value.size()){
+    if (totalnParamDV > option_value.size()){
       SU2_MPI::Error("Wrong number of arguments for DV_PARAM!", CURRENT_FUNCTION);
     }
     
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 11904ee300b4..0b1e3231e3a0 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -152,6 +152,7 @@ COutput::~COutput(void) {
   
   delete convergenceTable;
   delete multiZoneHeaderTable;
+  delete fileWritingTable;
 
   delete [] cauchySerie;
   
diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp
index 77269cdfb2b3..e63d210ae446 100644
--- a/SU2_CFD/src/solver_direct_mean.cpp
+++ b/SU2_CFD/src/solver_direct_mean.cpp
@@ -2752,7 +2752,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetMax_Time()/config->GetTime_Ref();
       Unit.str("");
       NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
diff --git a/SU2_CFD/src/solver_direct_mean_fem.cpp b/SU2_CFD/src/solver_direct_mean_fem.cpp
index eebbbc3006a4..2c06eee59ea2 100644
--- a/SU2_CFD/src/solver_direct_mean_fem.cpp
+++ b/SU2_CFD/src/solver_direct_mean_fem.cpp
@@ -1298,7 +1298,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetMax_Time()/config->GetTime_Ref();
       Unit.str("");
       NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
diff --git a/SU2_CFD/src/solver_direct_mean_inc.cpp b/SU2_CFD/src/solver_direct_mean_inc.cpp
index afe118bdd5bf..1f9b2c1d06e0 100644
--- a/SU2_CFD/src/solver_direct_mean_inc.cpp
+++ b/SU2_CFD/src/solver_direct_mean_inc.cpp
@@ -1387,7 +1387,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
     if (unsteady){
       NonDimTableOut << "-- Unsteady conditions" << endl;      
       NonDimTable.PrintHeader();
-      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetTotal_UnstTimeND();
+      NonDimTable << "Total Time" << config->GetMax_Time() << config->GetTime_Ref() << "s" << config->GetMax_Time()/config->GetTime_Ref();
       Unit.str("");
       NonDimTable << "Time Step" << config->GetTime_Step() << config->GetTime_Ref() << "s" << config->GetDelta_UnstTimeND();
       Unit.str("");
diff --git a/SU2_PY/compute_polar.py b/SU2_PY/compute_polar.py
index 8a62c7b9966d..994967b6896b 100755
--- a/SU2_PY/compute_polar.py
+++ b/SU2_PY/compute_polar.py
@@ -399,7 +399,7 @@ def main():
                     command = 'cp '+caseName+'/'+config.SOLUTION_FILENAME+' .'
                     if options.verbose:
                         print(command)
-                    shutil.copy2(caseName+'/'+config.SOLUTION_FLOW_FILENAME, os.getcwd())
+                    shutil.copy2(caseName+'/'+config.SOLUTION_FILENAME, os.getcwd())
                     konfig.RESTART_SOL = 'YES'
                 else:
                     konfig.RESTART_SOL = 'NO'

From 341209f79c9e8c1a2a01722cdb911b078f9b2511 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 16:15:30 +0200
Subject: [PATCH 501/539] Disabled data collection when running steady
 computation

---
 SU2_CFD/src/output/COutput.cpp | 37 +++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 0b1e3231e3a0..daf473f6e8a7 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -638,11 +638,42 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
 
 bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing){
   
-  /*--- Load the volume data from the solver and sort it ---*/
+  /*--- Check if the data sorters are allocated, if not, allocate them. --- */ 
   
-  Load_Data(geometry, config, solver_container);
+  if (femOutput){
+    
+    if (volumeDataSorter == nullptr)
+      volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
+    
+    if (surfaceDataSorter == nullptr)
+      surfaceDataSorter = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, 
+                                                  dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
+    
+  }  else {
+   
+    if (volumeDataSorter == nullptr)    
+      volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
+    
+    if (surfaceDataSorter == nullptr)
+      surfaceDataSorter = new CSurfaceFVMDataSorter(config, geometry, nVolumeFields,
+                                                  dynamic_cast<CFVMDataSorter*>(volumeDataSorter));  
+    
+  }
+  
+  bool writeFiles = WriteVolume_Output(config, Iter) || force_writing;
+  
+  /*--- Collect the volume data from the solvers.
+   *  If time-domain is enabled, we also load the data although we don't output it,
+   *  since we might want to do time-averaging. ---*/
   
-  if (WriteVolume_Output(config, Iter) || force_writing){
+  if (writeFiles || config->GetTime_Domain())
+    CollectVolumeData(config, geometry, solver_container);
+  
+  if (writeFiles){
+    
+    /*--- Partition and sort the data --- */
+    
+    volumeDataSorter->SortOutputData();    
     
     if (rank == MASTER_NODE){
       fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);    

From 24683500d19ad861422f3aff682bd162dc468c35 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 24 Sep 2019 18:54:43 +0200
Subject: [PATCH 502/539] Output fix for pitching adj case

---
 SU2_PY/SU2/eval/gradients.py                                    | 2 +-
 .../disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py
index d4ff870a3e0c..62a5b0da3e8c 100644
--- a/SU2_PY/SU2/eval/gradients.py
+++ b/SU2_PY/SU2/eval/gradients.py
@@ -1015,7 +1015,7 @@ def directdiff( config, state=None ):
 
     grad_filename  = config['GRAD_OBJFUNC_FILENAME']
     grad_filename  = os.path.splitext( grad_filename )[0]
-    output_format  = config['TABULAR_FORMAT']
+    output_format  = config.get('TABULAR_FORMAT', 'CSV')
     plot_extension = su2io.get_extension(output_format)
     grad_filename  = grad_filename + '_directdiff' + plot_extension
 
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index 4d14c229430d..23f56b1b2f51 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -16,6 +16,7 @@ INNER_ITER= 350
 
 %EXT_ITER= 151
 %UNST_INT_ITER= 110
+SCREEN_OUTPUT=(TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
 % ------------------------- UNSTEADY SIMULATION -------------------------------%
 %
 % Unsteady simulation (NO, TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER,

From 381ad92163961b6bbc6ec755d75ddcf31302794d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:05:38 +0200
Subject: [PATCH 503/539] Addressed review comments in COutput

---
 SU2_CFD/include/output/COutput.hpp          |  13 +-
 SU2_CFD/src/output/CAdjElasticityOutput.cpp |  32 ++--
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp   |   8 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp    |   8 +-
 SU2_CFD/src/output/CAdjHeatOutput.cpp       |   8 +-
 SU2_CFD/src/output/CBaselineOutput.cpp      |   5 +-
 SU2_CFD/src/output/CDriverOutput.cpp        |   5 +-
 SU2_CFD/src/output/CElasticityOutput.cpp    |   9 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp   |  10 +-
 SU2_CFD/src/output/CFlowCompOutput.cpp      |  10 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp       |   9 +-
 SU2_CFD/src/output/CHeatOutput.cpp          |   8 +-
 SU2_CFD/src/output/CMeshOutput.cpp          |   5 +-
 SU2_CFD/src/output/COutput.cpp              | 153 +++++++++++---------
 14 files changed, 113 insertions(+), 170 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 3d7186404a64..6606c4a2b804 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -132,10 +132,10 @@ class COutput {
     /*! \brief Default constructor. */
     HistoryOutputField() {}         
     /*! \brief Constructor to initialize all members. */
-    HistoryOutputField(string fieldname, unsigned short screenformat, string historyoutputgroup, 
-                       unsigned short fieldtype, string description):
-      fieldName(fieldname), value(0.0), screenFormat(screenformat),
-      outputGroup(historyoutputgroup), fieldType(fieldtype), description(description){}
+    HistoryOutputField(string fieldName_, unsigned short screenFormat_, string OutputGroup_, 
+                       unsigned short fieldType_, string description_):
+      fieldName(std::move(fieldName_)), value(0.0), screenFormat(screenFormat_),
+      outputGroup(std::move(OutputGroup_)), fieldType(fieldType_), description(std::move(description_)){}
   };
 
   /*! \brief Associative map to access data stored in the history output fields by a string identifier. */
@@ -197,8 +197,9 @@ class COutput {
     /*! \brief Default constructor. */
     VolumeOutputField () {}
     /*! \brief Constructor to initialize all members. */    
-    VolumeOutputField(string fieldname, int offset, string volumeoutputgroup, string description):
-      fieldName(fieldname), offset(offset), outputGroup(volumeoutputgroup), description(description){}
+    VolumeOutputField(string fieldName_, int offset_, string volumeOutputGroup_, string description_):
+      fieldName(std::move(fieldName_)), offset(std::move(offset_)), 
+      outputGroup(std::move(volumeOutputGroup_)), description(std::move(description_)){}
   };
   
   /*! \brief Associative map to access data stored in the volume output fields by a string identifier. */  
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index bfd120828a15..b09983ddea08 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -52,25 +52,26 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim)
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RESIDUALS");
-    requestedHistoryFields.push_back("SENSITIVITY");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RESIDUALS");
+    requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
   if (nRequestedScreenFields == 0){
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("ADJOINT_DISP_X");
-    requestedScreenFields.push_back("ADJOINT_DISP_Y");
-    requestedScreenFields.push_back("SENS_E");
-    requestedScreenFields.push_back("SENS_NU");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("ADJOINT_DISP_X");
+    requestedScreenFields.emplace_back("ADJOINT_DISP_Y");
+    requestedScreenFields.emplace_back("SENS_E");
+    requestedScreenFields.emplace_back("SENS_NU");
     nRequestedScreenFields = requestedScreenFields.size();
   }
 
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("SENSITIVITY");    
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
 
@@ -100,14 +101,7 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim)
   
 }
 
-CAdjElasticityOutput::~CAdjElasticityOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-
-}
+CAdjElasticityOutput::~CAdjElasticityOutput(void) {}
 
 void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 1a899a799b8d..189809fa599c 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -99,13 +99,7 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
   
 }
 
-CAdjFlowCompOutput::~CAdjFlowCompOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-}
+CAdjFlowCompOutput::~CAdjFlowCompOutput(void) {}
 
 void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 4464fa36ddba..9e50291bee88 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -103,13 +103,7 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COu
 
 }
 
-CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-}
+CAdjFlowIncOutput::~CAdjFlowIncOutput(void) {}
 
 void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index cff8b56969ad..223ac482d9ff 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -92,13 +92,7 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c
 
 }
 
-CAdjHeatOutput::~CAdjHeatOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-}
+CAdjHeatOutput::~CAdjHeatOutput(void) {}
 
 void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
   
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index bad6abb58ba9..298f4586c599 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -75,10 +75,7 @@ CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver*
   
 }
 
-CBaselineOutput::~CBaselineOutput(void) {
-
-
-}
+CBaselineOutput::~CBaselineOutput(void) {}
 
 void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
 
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index de3b92b217c5..f11ede85cf5a 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -91,10 +91,7 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
 
 }
 
-CDriverOutput::~CDriverOutput() {
-
-
-}
+CDriverOutput::~CDriverOutput() {}
 
 
 void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config) {
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 99e251444b78..cb8d7fbe46a6 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -106,14 +106,7 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
 }
 
-CElasticityOutput::~CElasticityOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-
-  }
-
-}
+CElasticityOutput::~CElasticityOutput(void) {}
 
 void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver)  {
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 397b5a391af0..e711b3597ac9 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -93,15 +93,7 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
 
 }
 
-CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-
-  }
-
-
-}
+CFlowCompFEMOutput::~CFlowCompFEMOutput(void) {}
 
 
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index c662b90dffd6..d8d65041f281 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -94,15 +94,7 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
   
 }
 
-CFlowCompOutput::~CFlowCompOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-
-  }
-
-
-}
+CFlowCompOutput::~CFlowCompOutput(void) {}
 
 
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index a4fe84caa151..1f3f48e19ffb 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -95,14 +95,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
 
 }
 
-CFlowIncOutput::~CFlowIncOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-
-}
+CFlowIncOutput::~CFlowIncOutput(void) {}
 
 
 void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index ecfee615e53d..d7042f75a813 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -85,13 +85,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config,
 
 }
 
-CHeatOutput::~CHeatOutput(void) {
-
-  if (rank == MASTER_NODE){
-    histFile.close();
-  }
-
-}
+CHeatOutput::~CHeatOutput(void) {}
 
 void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
   
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index b0d6c880a516..43af96939389 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -55,10 +55,7 @@ CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config,
   
 }
 
-CMeshOutput::~CMeshOutput(void) {
-
-
-}
+CMeshOutput::~CMeshOutput(void) {}
 
 void CMeshOutput::SetVolumeOutputFields(CConfig *config){
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index daf473f6e8a7..c0251e7125bc 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -153,18 +153,19 @@ COutput::~COutput(void) {
   delete convergenceTable;
   delete multiZoneHeaderTable;
   delete fileWritingTable;
+  delete historyFileTable;
 
   delete [] cauchySerie;
   
-    if (volumeDataSorter != nullptr)
-      delete volumeDataSorter;
-    
-    volumeDataSorter = nullptr;
-    
-    if (surfaceDataSorter != nullptr)
-      delete surfaceDataSorter;
-    
-    surfaceDataSorter = nullptr;
+  if (volumeDataSorter != nullptr)
+    delete volumeDataSorter;
+  
+  volumeDataSorter = nullptr;
+  
+  if (surfaceDataSorter != nullptr)
+    delete surfaceDataSorter;
+  
+  surfaceDataSorter = nullptr;
   
   
 }
@@ -403,7 +404,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
     
     case SURFACE_CSV:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
        
       surfaceDataSorter->SortConnectivity(config, geometry);
@@ -419,7 +420,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case RESTART_ASCII: case CSV:
      
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
@@ -432,7 +433,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case RESTART_BINARY:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(restartFilename, "", curTimeIter);
       
       if (rank == MASTER_NODE) {
@@ -445,7 +446,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case MESH:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = volumeFilename;
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -466,7 +467,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case TECPLOT_BINARY:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -486,7 +487,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case TECPLOT:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -506,7 +507,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case PARAVIEW_BINARY:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -524,7 +525,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case PARAVIEW:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(volumeFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -542,7 +543,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case SURFACE_PARAVIEW:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -561,7 +562,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case SURFACE_PARAVIEW_BINARY:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -580,7 +581,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case SURFACE_TECPLOT:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -600,7 +601,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       
     case SURFACE_TECPLOT_BINARY:
       
-      if (fileName == "")
+      if (fileName.empty())
         fileName = config->GetFilename(surfaceFilename, "", curTimeIter);
       
       /*--- Load and sort the output data and connectivity. ---*/
@@ -812,30 +813,31 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       iReqField = 0,
       iMarker = 0;
   stringstream out;
-  string RequestedField;
   int width = 20;
   
   for (iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
-    const HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
+    const string &fieldIdentifier = historyOutput_List[iField_Output];
+    const HistoryOutputField &field = historyOutput_Map[fieldIdentifier];
     for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = requestedHistoryFields[iReqField];   
-      if (RequestedField == Field.outputGroup || (RequestedField == historyOutput_List[iField_Output])){
-        if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
-        else{ width = std::max((int)Field.fieldName.size()+2, 18);}
-        historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);
+      const string & requestedField = requestedHistoryFields[iReqField];   
+      if (requestedField == field.outputGroup || (requestedField == fieldIdentifier)){
+        if (field.screenFormat == FORMAT_INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
+        else{ width = std::max((int)field.fieldName.size()+2, 18);}
+        historyFileTable->AddColumn("\"" + field.fieldName + "\"", width);
       }
     }  
   }
   
   for (iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){  
-      const HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
+    const string &fieldIdentifier = historyOutputPerSurface_List[iField_Output];    
+    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[fieldIdentifier].size(); iMarker++){    
+      const HistoryOutputField &field = historyOutputPerSurface_Map[fieldIdentifier][iMarker];
       for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = requestedHistoryFields[iReqField];   
-        if (RequestedField == Field.outputGroup || (RequestedField == historyOutputPerSurface_List[iField_Output])){
-          if (Field.screenFormat == FORMAT_INTEGER) width = std::max((int)Field.fieldName.size()+2, 10);  
-          else{ width = std::max((int)Field.fieldName.size()+2, 18);}
-          historyFileTable->AddColumn("\"" + Field.fieldName + "\"", width);          
+        const string &requestedField = requestedHistoryFields[iReqField];   
+        if (requestedField == field.outputGroup || (requestedField == fieldIdentifier)){
+          if (field.screenFormat == FORMAT_INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
+          else{ width = std::max((int)field.fieldName.size()+2, 18);}
+          historyFileTable->AddColumn("\"" + field.fieldName + "\"", width);          
         }
       }
     }
@@ -855,25 +857,26 @@ void COutput::SetHistoryFile_Output(CConfig *config) {
       iReqField = 0,
       iMarker = 0;
   stringstream out;
-  string RequestedField;
   
   for (iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
-    const HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
+    const string &fieldIdentifier = historyOutput_List[iField_Output];    
+    const HistoryOutputField &field = historyOutput_Map[fieldIdentifier];
     for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = requestedHistoryFields[iReqField];   
-      if (RequestedField == Field.outputGroup){
-        (*historyFileTable) << Field.value; 
+      const string &RequestedField = requestedHistoryFields[iReqField];   
+      if (RequestedField == field.outputGroup){
+        (*historyFileTable) << field.value; 
       }
     }
   }
   
   for (iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      const HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
+    const string &fieldIdentifier = historyOutputPerSurface_List[iField_Output];        
+    for (iMarker = 0; iMarker < historyOutputPerSurface_Map[fieldIdentifier].size(); iMarker++){
+      const HistoryOutputField &field = historyOutputPerSurface_Map[fieldIdentifier][iMarker];
       for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = requestedHistoryFields[iReqField];   
-        if (RequestedField == Field.outputGroup){
-          (*historyFileTable) << Field.value;  
+        const string &RequestedField = requestedHistoryFields[iReqField];   
+        if (RequestedField == field.outputGroup){
+          (*historyFileTable) << field.value;  
         }
       }
     }
@@ -1262,7 +1265,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
 
       for(unsigned short j=0; j<volElem[l].nDOFsSol; ++j) {
         
-        buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
+        buildFieldIndexCache = fieldIndexCache.empty();
         
         LoadVolumeDataFEM(config, geometry, solver, l, jPoint, j);
         
@@ -1278,7 +1281,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
       /*--- Check for halos & write only if requested ---*/
       /*--- Load the volume data into the Local_Data() array. --- */
       
-      buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
+      buildFieldIndexCache = fieldIndexCache.empty();
 
       LoadVolumeData(config, geometry, solver, iPoint);
 
@@ -1296,7 +1299,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
   
         if(geometry->node[iPoint]->GetDomain()){
           
-          buildFieldIndexCache = !fieldIndexCache.size() ? true : false;
+          buildFieldIndexCache = fieldIndexCache.empty();
    
           LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
           
@@ -1420,42 +1423,46 @@ void COutput::SetAvgVolumeOutputValue(string name, unsigned long iPoint, su2doub
 
 void COutput::Postprocess_HistoryData(CConfig *config){
    
-  map<string, su2double> Average;
+  map<string, pair<su2double, int> > Average;
   map<string, int> Count;
   
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    const string &fieldIdentifier = historyOutput_List[iField];
+    const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
     if (currentField.fieldType == TYPE_RESIDUAL){
-      if ( SetInit_Residuals(config) || (currentField.value > initialResiduals[historyOutput_List[iField]]) ) {
-        initialResiduals[historyOutput_List[iField]] = currentField.value;
+      if ( SetInit_Residuals(config) || (currentField.value > initialResiduals[fieldIdentifier]) ) {
+        initialResiduals[fieldIdentifier] = currentField.value;
       }
-      SetHistoryOutputValue("REL_" + historyOutput_List[iField], 
-                            currentField.value - initialResiduals[historyOutput_List[iField]]);
+      SetHistoryOutputValue("REL_" + fieldIdentifier, 
+                            currentField.value - initialResiduals[fieldIdentifier]);
       
-      Average[currentField.outputGroup] += currentField.value;
-      Count[currentField.outputGroup]++;
+      Average[currentField.outputGroup].first += currentField.value;
+      Average[currentField.outputGroup].second++;
            
     }
     if (currentField.fieldType == TYPE_COEFFICIENT){
       if(SetUpdate_Averages(config)){
         if (config->GetTime_Domain()){
-          SetHistoryOutputValue("TAVG_" + historyOutput_List[iField],
-                                runningAverages[historyOutput_List[iField]].Update(currentField.value));
+          SetHistoryOutputValue("TAVG_" + fieldIdentifier,
+                                runningAverages[fieldIdentifier].Update(currentField.value));
           if (config->GetDirectDiff() != NO_DERIVATIVE) {      
-            SetHistoryOutputValue("D_TAVG_" + historyOutput_List[iField], 
-                                  SU2_TYPE::GetDerivative(runningAverages[historyOutput_List[iField]].Get()));
+            SetHistoryOutputValue("D_TAVG_" + fieldIdentifier, 
+                                  SU2_TYPE::GetDerivative(runningAverages[fieldIdentifier].Get()));
           }
         }
       }
       if (config->GetDirectDiff() != NO_DERIVATIVE){
-        SetHistoryOutputValue("D_" + historyOutput_List[iField], SU2_TYPE::GetDerivative(currentField.value));          
+        SetHistoryOutputValue("D_" + fieldIdentifier, SU2_TYPE::GetDerivative(currentField.value));          
       }
     }
   }
   
-  map<string, su2double>::iterator it = Average.begin();
+  map<string, pair<su2double, int> >::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
-    SetHistoryOutputValue("AVG_" + it->first, it->second/Count[it->first]);
+    const su2double& value = it->second.first;
+    const int& count = it->second.second;
+    const su2double average = value/count;
+    SetHistoryOutputValue("AVG_" + it->first, average);
   }
   
 }
@@ -1466,9 +1473,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   map<string, string> AverageGroupName =  CCreateMap<string, string>("BGS_RES", "bgs")("RMS_RES","rms")("MAX_RES", "max");
   
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-    HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+    const string &fieldIdentifier = historyOutput_List[iField];    
+    const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
     if (currentField.fieldType == TYPE_RESIDUAL){
-      AddHistoryOutput("REL_" + historyOutput_List[iField], "rel" + currentField.fieldName, currentField.screenFormat,
+      AddHistoryOutput("REL_" + fieldIdentifier, "rel" + currentField.fieldName, currentField.screenFormat,
                        "REL_" + currentField.outputGroup,  "Relative residual.", TYPE_AUTO_RESIDUAL);
       Average[currentField.outputGroup] = true;
     }
@@ -1482,9 +1490,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
   if (config->GetTime_Domain()){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      const string &fieldIdentifier = historyOutput_List[iField];    
+      const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
       if (currentField.fieldType == TYPE_COEFFICIENT){
-        AddHistoryOutput("TAVG_"   + historyOutput_List[iField], "tavg["  + currentField.fieldName + "]",
+        AddHistoryOutput("TAVG_"   + fieldIdentifier, "tavg["  + currentField.fieldName + "]",
                          currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", 
                          TYPE_AUTO_COEFFICIENT);
       }
@@ -1493,9 +1502,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
   if (config->GetDirectDiff()){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      const string &fieldIdentifier = historyOutput_List[iField];    
+      const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
       if (currentField.fieldType == TYPE_COEFFICIENT){
-        AddHistoryOutput("D_"      + historyOutput_List[iField], "d["     + currentField.fieldName + "]",
+        AddHistoryOutput("D_"      + fieldIdentifier, "d["     + currentField.fieldName + "]",
                          currentField.screenFormat, "D_"      + currentField.outputGroup, 
                          "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
       }
@@ -1504,9 +1514,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
   if (config->GetTime_Domain() && config->GetDirectDiff()){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
-      HistoryOutputField &currentField = historyOutput_Map[historyOutput_List[iField]];
+      const string &fieldIdentifier = historyOutput_List[iField];    
+      const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
       if (currentField.fieldType == TYPE_COEFFICIENT){
-        AddHistoryOutput("D_TAVG_" + historyOutput_List[iField], "dtavg[" + currentField.fieldName + "]",
+        AddHistoryOutput("D_TAVG_" + fieldIdentifier, "dtavg[" + currentField.fieldName + "]",
                          currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, 
                          "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
       }

From 6c7fc01baafcb3874aff086f30e0ff22d1ff7399 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:10:06 +0200
Subject: [PATCH 504/539] Buffer allocation in data sorter and used std::move
 in filewriter constructors

---
 .../output/filewriter/CParallelDataSorter.hpp |  9 ++--
 .../src/output/filewriter/CCSVFileWriter.cpp  |  2 +-
 .../src/output/filewriter/CFEMDataSorter.cpp  |  1 -
 .../src/output/filewriter/CFVMDataSorter.cpp  |  1 -
 .../output/filewriter/CParallelDataSorter.cpp | 46 +++++++++----------
 .../output/filewriter/CParallelFileWriter.cpp |  4 +-
 .../filewriter/CParaviewBinaryFileWriter.cpp  | 14 +++---
 .../output/filewriter/CParaviewFileWriter.cpp |  2 +-
 .../filewriter/CSU2BinaryFileWriter.cpp       | 12 +----
 .../src/output/filewriter/CSU2FileWriter.cpp  |  2 +-
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  2 +-
 .../filewriter/CSurfaceFEMDataSorter.cpp      |  8 ++--
 .../filewriter/CSurfaceFVMDataSorter.cpp      |  8 ++--
 .../filewriter/CTecplotBinaryFileWriter.cpp   |  2 +-
 .../output/filewriter/CTecplotFileWriter.cpp  |  2 +-
 15 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
index 8cbb9013425b..6d870afca6d0 100644
--- a/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
+++ b/SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp
@@ -89,7 +89,10 @@ class CParallelDataSorter{
   int *nPoint_Recv;                    //!< Number of points this processor receives from other processors
   unsigned long *Index;                //!< Index each point has in the send buffer
   su2double *connSend;                 //!< Send buffer holding the data that will be send to other processors
-  passivedouble *dataBuffer;
+  passivedouble *passiveDoubleBuffer;  //!< Buffer holding the sorted, partitioned data as passivedouble types 
+  su2double     *doubleBuffer;         //!< Buffer holding the sorted, partitioned data as su2double types 
+  /// Pointer used to allocate the memory used for ::passiveDoubleBuffer and ::doubleBuffer.
+  char *dataBuffer;                    
   unsigned long *idSend;               //!< Send buffer holding global indices that will be send to other processors
   int nSends,                          //!< Number of sends
   nRecvs;                              //!< Number of receives
@@ -189,13 +192,13 @@ class CParallelDataSorter{
    * \input iPoint - the point ID.
    * \return the value of the data field at a point.
    */
-  passivedouble GetData(unsigned short iField, unsigned long iPoint) {return dataBuffer[iPoint*GlobalField_Counter + iField];}
+  passivedouble GetData(unsigned short iField, unsigned long iPoint) {return passiveDoubleBuffer[iPoint*GlobalField_Counter + iField];}
   
   /*!
    * \brief Get the pointer to the sorted linear partitioned data.
    * \return Pointer to the sorted data.
    */
-  passivedouble *GetData() {return dataBuffer;}
+  const passivedouble *GetData() {return passiveDoubleBuffer;}
   
   /*!
    * \brief Get the global index of a point.
diff --git a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
index df294213cbb5..0ca04a32bde9 100644
--- a/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CCSVFileWriter.cpp
@@ -3,7 +3,7 @@
 
 CCSVFileWriter::CCSVFileWriter(vector<string> fields, unsigned short nDim, 
                                string fileName, CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, ".csv", nDim){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, std::move(".csv"), nDim){}
 
 
 CCSVFileWriter::~CCSVFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
index 4d2a39d7f92a..2dd7a2bd1170 100644
--- a/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFEMDataSorter.cpp
@@ -52,7 +52,6 @@ CFEMDataSorter::~CFEMDataSorter(){
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
-  if (dataBuffer != NULL) delete [] reinterpret_cast<su2double*>(dataBuffer);
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
index 1de4e0a0e248..28de69fb4577 100644
--- a/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CFVMDataSorter.cpp
@@ -44,7 +44,6 @@ CFVMDataSorter::~CFVMDataSorter(){
   if (Index != NULL)       delete [] Index;
   if (idSend != NULL)      delete [] idSend;
   if (linearPartitioner != NULL) delete linearPartitioner;
-  if (dataBuffer != NULL) delete [] reinterpret_cast<su2double*>(dataBuffer);
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index 3430fdced69f..f1f300ea05ce 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -1,4 +1,5 @@
 #include "../../../include/output/filewriter/CParallelDataSorter.hpp"
+#include <cassert>
 
 CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields){
   
@@ -28,6 +29,8 @@ CParallelDataSorter::CParallelDataSorter(CConfig *config, unsigned short nFields
   Index        = NULL;
   connSend     = NULL;
   dataBuffer   = NULL;
+  passiveDoubleBuffer = NULL;
+  doubleBuffer = NULL;
   idSend       = NULL;
   nSends = 0;
   nRecvs = 0;
@@ -59,15 +62,7 @@ CParallelDataSorter::~CParallelDataSorter(){
   
   if (connSend != NULL) delete [] connSend;
   
-  
-  /*--- Deallocate memory for solution data ---*/
-  
-//  if (Parallel_Data != NULL){
-//    for (unsigned short iVar = 0; iVar < GlobalField_Counter; iVar++) {
-//      if (Parallel_Data[iVar] != NULL) delete [] Parallel_Data[iVar];
-//    }
-//    delete [] Parallel_Data;  
-//  }
+  if (dataBuffer != NULL) delete [] dataBuffer;
 }
 
 
@@ -113,11 +108,7 @@ void CParallelDataSorter::SortOutputData() {
   SU2_MPI::Status status;
   int ind;
 #endif
-  
-  /*--- Use the data buffer to temporarily hold data (using AD datatype) after receiving it ---*/
-  
-  su2double *tempRecvBuffer = reinterpret_cast<su2double*>(dataBuffer);
-  
+
   /*--- Allocate the memory that we need for receiving the conn
    values and then cue up the non-blocking receives. Note that
    we do not include our own rank in the communications. We will
@@ -141,7 +132,7 @@ void CParallelDataSorter::SortOutputData() {
       int count  = VARS_PER_POINT*kk;
       int source = ii;
       int tag    = ii + 1;
-      SU2_MPI::Irecv(&(tempRecvBuffer[ll]), count, MPI_DOUBLE, source, tag,
+      SU2_MPI::Irecv(&(doubleBuffer[ll]), count, MPI_DOUBLE, source, tag,
                      MPI_COMM_WORLD, &(recv_req[iMessage]));
       iMessage++;
     }
@@ -202,7 +193,7 @@ void CParallelDataSorter::SortOutputData() {
   int ll = VARS_PER_POINT*nPoint_Send[rank];
   int kk = VARS_PER_POINT*nPoint_Send[rank+1];
   
-  for (int nn=ll; nn<kk; nn++, mm++) tempRecvBuffer[mm] = connSend[nn];
+  for (int nn=ll; nn<kk; nn++, mm++) doubleBuffer[mm] = connSend[nn];
   
   mm = nPoint_Recv[rank];
   ll = nPoint_Send[rank];
@@ -225,14 +216,18 @@ void CParallelDataSorter::SortOutputData() {
   delete [] recv_req;
 #endif
   
-  /*--- Note, dataBuffer and tempRecvBuffer point to the same address.
+  /*--- Note, passiveDoubleBuffer and doubleBuffer point to the same address.
    * This is the reason why we have to do the following copy/reordering in two steps. ---*/
   
   /*--- Step 1: Extract the underlying double value --- */
   
-  if (sizeof(passivedouble) != sizeof(su2double)){
+  if (!std::is_same<su2double, passivedouble>::value){
     for (int jj = 0; jj < VARS_PER_POINT*nPoint_Recv[size]; jj++){
-      dataBuffer[jj] = SU2_TYPE::GetValue(tempRecvBuffer[jj]);
+      const passivedouble tmpVal = SU2_TYPE::GetValue(doubleBuffer[jj]);
+      passiveDoubleBuffer[jj] = tmpVal;  
+      /*--- For some AD datatypes a call of the destructor is
+       *  necessary to properly delete the AD type ---*/
+      doubleBuffer[jj].~su2double();
     } 
   }
   
@@ -241,10 +236,10 @@ void CParallelDataSorter::SortOutputData() {
   passivedouble *tmpBuffer = new passivedouble[nPoint_Recv[size]];
   for (int jj = 0; jj < VARS_PER_POINT; jj++){
     for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      tmpBuffer[idRecv[ii]] = dataBuffer[ii*VARS_PER_POINT+jj];
+      tmpBuffer[idRecv[ii]] = passiveDoubleBuffer[ii*VARS_PER_POINT+jj];
     }
     for (int ii = 0; ii < nPoint_Recv[size]; ii++){
-      dataBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
+      passiveDoubleBuffer[ii*VARS_PER_POINT+jj] = tmpBuffer[ii];
     }
   }
   
@@ -325,11 +320,14 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
   connSend = NULL;
   connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]]();
   
+  /*--- Allocate the data buffer to hold the sorted data. ---*/
+  assert(sizeof(su2double) >= sizeof (double));
+  dataBuffer = new char[VARS_PER_POINT*nPoint_Recv[size]*sizeof(su2double)];
   
-  /*--- Allocate the data buffer to hold the sorted data.
-   * It should be big enough to also temporarily hold the data received using the AD type ---*/
+  /*--- doubleBuffer and passiveDouble buffer use the same memory allocated above using the dataBuffer. ---*/
   
-  dataBuffer = reinterpret_cast<passivedouble*>(new su2double[VARS_PER_POINT*nPoint_Recv[size]]());
+  doubleBuffer = reinterpret_cast<su2double*>(dataBuffer);
+  passiveDoubleBuffer = reinterpret_cast<passivedouble*>(dataBuffer);
   
   /*--- Allocate arrays for sending the global ID. ---*/
   
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
index 90d5f853d1d4..d69ea81082e1 100644
--- a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -3,10 +3,10 @@
 
 CFileWriter::CFileWriter(vector<string> fields, string fileName,
                          CParallelDataSorter *dataSorter, string file_ext, unsigned short nDim): 
-  fieldnames(fields),
+  fieldnames(std::move(fields)),
   nDim(nDim),
   file_ext(file_ext),
-  fileName(fileName),
+  fileName(std::move(fileName)),
   dataSorter(dataSorter){
   
   rank = SU2_MPI::GetRank();
diff --git a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
index 1faa5c3baf29..c16340a75e87 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewBinaryFileWriter.cpp
@@ -4,7 +4,7 @@ const string CParaviewBinaryFileWriter::fileExt = ".vtk";
 
 CParaviewBinaryFileWriter::CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim, string fileName, 
                                                      CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim){}
 
 
 CParaviewBinaryFileWriter::~CParaviewBinaryFileWriter(){
@@ -30,12 +30,14 @@ void CParaviewBinaryFileWriter::Write_Data(){
 
   strcpy(fname, fileName.c_str());
   
-  /*--- Check for big endian. We have to swap bytes otherwise. ---*/
+  /* Check for big endian. We have to swap bytes otherwise. 
+   * Since size of character is 1 byte when the character pointer
+   *  is de-referenced it will contain only first byte of integer. ---*/
   
-  bool BigEndian;
-  union {int i; char c[4];} val;
-  val.i = 0x76543210;
-  if (val.c[0] == 0x10) BigEndian = false;
+  bool BigEndian = false;  
+  unsigned int i = 1;  
+  char *c = (char*)&i;
+  if (*c) BigEndian = false;
   else BigEndian = true;
   
   file_size = 0.0;
diff --git a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
index 5cd0a0e372ec..84782c8b9714 100644
--- a/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParaviewFileWriter.cpp
@@ -4,7 +4,7 @@ const string CParaviewFileWriter::fileExt = ".vtk";
 
 CParaviewFileWriter::CParaviewFileWriter(vector<string> fields, unsigned short nDim, 
                                          string fileName, CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim){}
 
 
 CParaviewFileWriter::~CParaviewFileWriter(){}
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 552943844ba9..18dca558764f 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -4,7 +4,7 @@ const string CSU2BinaryFileWriter::fileExt = ".dat";
 
 CSU2BinaryFileWriter::CSU2BinaryFileWriter(vector<string> fields, unsigned short nDim, 
                                            string fileName, CParallelDataSorter *dataSorter)  : 
-  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim){}
 
 
 CSU2BinaryFileWriter::~CSU2BinaryFileWriter(){
@@ -79,16 +79,6 @@ void CSU2BinaryFileWriter::Write_Data(){
   fwrite(dataSorter->GetData(), nParallel_Poin*GlobalField_Counter, sizeof(passivedouble), fhw);
   file_size += (su2double)nParallel_Poin*GlobalField_Counter*sizeof(passivedouble);
 
-  /*--- Write the external iteration. ---*/
-
-//  fwrite(&Restart_ExtIter, 1, sizeof(int), fhw);
-//  file_size += (su2double)sizeof(int);
-
-  /*--- Write the metadata. ---*/
-
-//  fwrite(Restart_Metadata, 8, sizeof(passivedouble), fhw);
-//  file_size += (su2double)8*sizeof(passivedouble);
-
   /*--- Close the file. ---*/
 
   fclose(fhw);
diff --git a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
index 4841cdf36d68..f05f3c50ee73 100644
--- a/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp
@@ -4,7 +4,7 @@ const string CSU2FileWriter::fileExt = ".csv";
 
 CSU2FileWriter::CSU2FileWriter(vector<string> fields, unsigned short nDim, 
                                string fileName, CParallelDataSorter *dataSorter) : 
-  CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim){}
 
 
 CSU2FileWriter::~CSU2FileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index 8eaee58e93cc..af2b61cc893c 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -6,7 +6,7 @@ const string CSU2MeshFileWriter::fileExt = ".su2";
 CSU2MeshFileWriter::CSU2MeshFileWriter(vector<string> fields, unsigned short nDim,  
                                        string fileName, CParallelDataSorter *dataSorter,
                                        unsigned short iZone, unsigned short nZone) : 
-  iZone(iZone), nZone(nZone), CFileWriter(fields, fileName, dataSorter, fileExt, nDim){}
+   CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim), iZone(iZone), nZone(nZone) {}
 
 
 CSU2MeshFileWriter::~CSU2MeshFileWriter(){
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
index 4632f1664f31..8b1a7eebecff 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFEMDataSorter.cpp
@@ -43,7 +43,7 @@ CSurfaceFEMDataSorter::CSurfaceFEMDataSorter(CConfig *config, CGeometry *geometr
 CSurfaceFEMDataSorter::~CSurfaceFEMDataSorter(){
 
   if (linearPartitioner != NULL) delete linearPartitioner;
-  if (dataBuffer != NULL) delete [] dataBuffer;
+  delete [] passiveDoubleBuffer;
   
 }
 
@@ -194,8 +194,8 @@ void CSurfaceFEMDataSorter::SortOutputData() {
   /* Allocate the memory for Parallel_Surf_Data. */
   nParallel_Poin = globalSurfaceDOFIDs.size();
   
-  if (dataBuffer == nullptr){
-    dataBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
+  if (passiveDoubleBuffer == nullptr){
+    passiveDoubleBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
   }
   
   /* Determine the local index of the global surface DOFs and
@@ -204,7 +204,7 @@ void CSurfaceFEMDataSorter::SortOutputData() {
     const unsigned long ii = globalSurfaceDOFIDs[i] - linearPartitioner->GetCumulativeSizeBeforeRank(rank);
 
     for(int jj=0; jj<VARS_PER_POINT; jj++)
-      dataBuffer[i*VARS_PER_POINT+jj] = volume_sorter->GetData(jj,ii);
+      passiveDoubleBuffer[i*VARS_PER_POINT+jj] = volume_sorter->GetData(jj,ii);
   }
 
   /*--- Reduce the total number of surf points we have. This will be
diff --git a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
index 660cb607d950..b0e225fb321f 100644
--- a/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSurfaceFVMDataSorter.cpp
@@ -19,7 +19,7 @@ CSurfaceFVMDataSorter::CSurfaceFVMDataSorter(CConfig *config, CGeometry *geometr
 CSurfaceFVMDataSorter::~CSurfaceFVMDataSorter(){
   
   if (linearPartitioner != NULL) delete linearPartitioner;
-  if (dataBuffer != NULL) delete [] dataBuffer;
+  delete [] passiveDoubleBuffer;
   
 }
 
@@ -412,14 +412,14 @@ void CSurfaceFVMDataSorter::SortOutputData() {
    we can allocate the new data structure to hold these points alone. Here,
    we also copy the data for those points from our volume data structure. ---*/
   
-  if (dataBuffer == nullptr){
-    dataBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
+  if (passiveDoubleBuffer == nullptr){
+    passiveDoubleBuffer = new passivedouble[nParallel_Poin*VARS_PER_POINT];
   }
   for (int jj = 0; jj < VARS_PER_POINT; jj++) {
     count = 0;
     for (int ii = 0; ii < (int)volume_sorter->GetnPoints(); ii++) {
       if (surfPoint[ii] !=-1) {
-        dataBuffer[count*VARS_PER_POINT + jj] = volume_sorter->GetData(jj,ii);
+        passiveDoubleBuffer[count*VARS_PER_POINT + jj] = volume_sorter->GetData(jj,ii);
         count++;
       }
     }
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 5bed635a5e22..621b202a12c3 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -9,7 +9,7 @@ const string CTecplotBinaryFileWriter::fileExt = ".szplt";
 CTecplotBinaryFileWriter::CTecplotBinaryFileWriter(vector<string> fields, unsigned short nDim,
                                                    string fileName, CParallelDataSorter *dataSorter,
                                                    unsigned long time_iter, su2double timestep) : 
-  CFileWriter(fields, fileName, dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotBinaryFileWriter::~CTecplotBinaryFileWriter(){}
 
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 4c1e4487a28f..6e27041588c2 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -5,7 +5,7 @@ const string CTecplotFileWriter::fileExt = ".dat";
 CTecplotFileWriter::CTecplotFileWriter(vector<string> fields, unsigned short nDim, 
                                        string fileName, CParallelDataSorter *dataSorter,
                                        unsigned long time_iter, su2double timestep) : 
-   CFileWriter(fields, fileName, dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
+  CFileWriter(std::move(fields), std::move(fileName), dataSorter, fileExt, nDim), time_iter(time_iter), timestep(timestep){}
 
 CTecplotFileWriter::~CTecplotFileWriter(){}
 

From 955e75410eb0ea4558214d303f717af45b3c3415 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:29:05 +0200
Subject: [PATCH 505/539] Deleted new_out_regression.py

---
 TestCases/new_output_regression.py | 1504 ----------------------------
 1 file changed, 1504 deletions(-)
 delete mode 100644 TestCases/new_output_regression.py

diff --git a/TestCases/new_output_regression.py b/TestCases/new_output_regression.py
deleted file mode 100644
index af555faf334c..000000000000
--- a/TestCases/new_output_regression.py
+++ /dev/null
@@ -1,1504 +0,0 @@
-#!/usr/bin/env python
-
-## \file serial_regression.py
-#  \brief Python script for automated regression testing of SU2 examples
-#  \author A. Aranake, A. Campos, T. Economon, T. Lukaczyk, S. Padron
-#  \version 6.1.0 "Falcon"
-#
-# The current SU2 release has been coordinated by the
-# SU2 International Developers Society <www.su2devsociety.org>
-# with selected contributions from the open-source community.
-#
-# The main research teams contributing to the current release are:
-#  - Prof. Juan J. Alonso's group at Stanford University.
-#  - Prof. Piero Colonna's group at Delft University of Technology.
-#  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
-#  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
-#  - Prof. Rafael Palacios' group at Imperial College London.
-#  - Prof. Vincent Terrapon's group at the University of Liege.
-#  - Prof. Edwin van der Weide's group at the University of Twente.
-#  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
-#
-# Copyright 2012-2018, Francisco D. Palacios, Thomas D. Economon,
-#                      Tim Albring, and the SU2 contributors.
-#
-# SU2 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, or (at your option) any later version.
-#
-# SU2 is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with SU2. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import print_function, division, absolute_import
-import sys
-from TestCase import TestCase
-
-def main():
-    '''This program runs SU2 and ensures that the output matches specified values. 
-       This will be used to do checks when code is pushed to github 
-       to make sure nothing is broken. '''
-
-    test_list = []
-
-    #########################
-    ## Compressible Euler ###
-    #########################
-
-    # Channel
-    channel           = TestCase('channel')
-    channel.cfg_dir   = "euler/channel"
-    channel.cfg_file  = "inv_channel_RK.cfg"
-    channel.test_iter = 10
-    channel.test_vals = [-2.454049, 3.065639, -0.200679, 0.036298] #last 4 columns
-    channel.su2_exec  = "SU2_CFD"
-    channel.timeout   = 1600
-    channel.new_output = True
-    channel.tol       = 0.00001
-    test_list.append(channel)
-
-    # NACA0012 
-    naca0012           = TestCase('naca0012')
-    naca0012.cfg_dir   = "euler/naca0012"
-    naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
-    naca0012.test_iter = 20
-    naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
-    naca0012.su2_exec  = "SU2_CFD"
-    naca0012.timeout   = 1600
-    naca0012.new_output= True
-    naca0012.tol       = 0.00001
-    test_list.append(naca0012)
-
-    # Supersonic wedge 
-    wedge           = TestCase('wedge')
-    wedge.cfg_dir   = "euler/wedge"
-    wedge.cfg_file  = "inv_wedge_HLLC.cfg"
-    wedge.test_iter = 20
-    wedge.test_vals = [-0.804690, 4.936631, -0.251188, 0.044255] #last 4 columns
-    wedge.su2_exec  = "SU2_CFD"
-    wedge.timeout   = 1600
-    wedge.new_output= True
-    wedge.tol       = 0.00001
-    test_list.append(wedge)
-
-    # ONERA M6 Wing
-    oneram6           = TestCase('oneram6')
-    oneram6.cfg_dir   = "euler/oneram6"
-    oneram6.cfg_file  = "inv_ONERAM6.cfg"
-    oneram6.test_iter = 10
-    oneram6.test_vals = [-10.384532, -9.835738, 0.282580, 0.012694] #last 4 columns
-    oneram6.su2_exec  = "SU2_CFD"
-    oneram6.timeout   = 9600
-    oneram6.new_output = True
-    oneram6.tol       = 0.00001
-    test_list.append(oneram6)
-    
-    # Fixed CL NACA0012
-    fixedCL_naca0012           = TestCase('fixedcl_naca0012')
-    fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-    fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    fixedCL_naca0012.test_iter = 100
-    fixedCL_naca0012.test_vals = [-2.582897, 2.820443, 0.295158, 0.019324] #last 4 columns
-    fixedCL_naca0012.su2_exec  = "SU2_CFD"
-    fixedCL_naca0012.new_output = True
-    fixedCL_naca0012.timeout   = 1600
-    fixedCL_naca0012.tol       = 0.00001
-    test_list.append(fixedCL_naca0012)
-    
-    # Polar sweep of the inviscid NACA0012
-    polar_naca0012           = TestCase('polar_naca0012')
-    polar_naca0012.cfg_dir   = "polar/naca0012"
-    polar_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    polar_naca0012.polar     = True
-    polar_naca0012.new_output= True
-    polar_naca0012.test_iter = 10
-    polar_naca0012.test_vals = [-1.319488, 4.112397, 0.011954, 0.009584] #last 4 columns
-    polar_naca0012.su2_exec  = "compute_polar.py -n 1 -i 11"
-    polar_naca0012.timeout   = 1600
-    polar_naca0012.tol       = 0.00001
-    test_list.append(polar_naca0012)
-
-    # HYPERSONIC FLOW PAST BLUNT BODY
-    bluntbody           = TestCase('bluntbody')
-    bluntbody.cfg_dir   = "euler/bluntbody"
-    bluntbody.cfg_file  = "blunt.cfg"
-    bluntbody.new_output = True
-    bluntbody.test_iter = 20
-    bluntbody.test_vals = [0.626808, 7.014695, -0.000000, 1.648024] #last 4 columns
-    bluntbody.su2_exec  = "SU2_CFD"
-    bluntbody.timeout   = 1600
-    bluntbody.tol       = 0.00001
-    test_list.append(bluntbody)
-
-    ##########################
-    ###  Compressible N-S  ###
-    ##########################
-
-    # Laminar flat plate
-    flatplate           = TestCase('flatplate')
-    flatplate.cfg_dir   = "navierstokes/flatplate"
-    flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 20
-    flatplate.test_vals = [-4.680777, 0.781234, -0.135957, 0.022977] #last 4 columns
-    flatplate.su2_exec  = "SU2_CFD"
-    flatplate.new_output = True
-    flatplate.timeout   = 1600
-    flatplate.tol       = 0.00001
-    test_list.append(flatplate)
-
-    # Laminar cylinder (steady)
-    cylinder           = TestCase('cylinder')
-    cylinder.cfg_dir   = "navierstokes/cylinder"
-    cylinder.cfg_file  = "lam_cylinder.cfg"
-    cylinder.test_iter = 25
-    cylinder.test_vals = [-6.765432, -1.297428, 0.019508, 0.310040] #last 4 columns
-    cylinder.su2_exec  = "SU2_CFD"
-    cylinder.new_output = True
-    cylinder.timeout   = 1600
-    cylinder.tol       = 0.00001
-    test_list.append(cylinder)
-
-    # Laminar cylinder (low Mach correction)
-    cylinder_lowmach           = TestCase('cylinder_lowmach')
-    cylinder_lowmach.cfg_dir   = "navierstokes/cylinder"
-    cylinder_lowmach.cfg_file  = "cylinder_lowmach.cfg"
-    cylinder_lowmach.test_iter = 25
-    cylinder_lowmach.test_vals = [-6.850123, -1.388088, -0.056090, 108.140177] #last 4 columns
-    cylinder_lowmach.su2_exec  = "SU2_CFD"
-    cylinder_lowmach.new_output = True
-    cylinder_lowmach.timeout   = 1600
-    cylinder_lowmach.tol       = 0.00001
-    test_list.append(cylinder_lowmach)
-
-    # 2D Poiseuille flow (body force driven with periodic inlet / outlet)
-    poiseuille           = TestCase('poiseuille')
-    poiseuille.cfg_dir   = "navierstokes/poiseuille"
-    poiseuille.cfg_file  = "lam_poiseuille.cfg"
-    poiseuille.test_iter = 10
-    poiseuille.test_vals = [-12.272146, -3.335311, 0.000001, 2.351005] #last 4 columns
-    poiseuille.su2_exec  = "SU2_CFD"
-    poiseuille.new_output = True
-    poiseuille.timeout   = 1600
-    poiseuille.tol       = 0.00001
-    test_list.append(poiseuille)
-
-    # 2D Poiseuille flow (inlet profile file)
-    poiseuille_profile           = TestCase('poiseuille_profile')
-    poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
-    poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
-    poiseuille_profile.test_iter = 10
-    poiseuille_profile.test_vals = [-12.494724, -7.712336, -0.000000, 2.085796] #last 4 columns
-    poiseuille_profile.su2_exec  = "SU2_CFD"
-    poiseuille_profile.new_output = True
-    poiseuille_profile.timeout   = 1600
-    poiseuille_profile.tol       = 0.00001
-    test_list.append(poiseuille_profile)
-    
-    ##########################
-    ### Compressible RANS  ###
-    ##########################
-
-    # RAE2822 SA
-    rae2822_sa           = TestCase('rae2822_sa')
-    rae2822_sa.cfg_dir   = "rans/rae2822"
-    rae2822_sa.cfg_file  = "turb_SA_RAE2822.cfg"
-    rae2822_sa.test_iter = 20
-    rae2822_sa.test_vals = [-2.000469, -5.228296, 0.820188, 0.052004] #last 4 columns
-    rae2822_sa.su2_exec  = "SU2_CFD"
-    rae2822_sa.timeout   = 1600
-    rae2822_sa.new_output = True
-    rae2822_sa.tol       = 0.00001
-    test_list.append(rae2822_sa)
-    
-    # RAE2822 SST
-    rae2822_sst           = TestCase('rae2822_sst')
-    rae2822_sst.cfg_dir   = "rans/rae2822"
-    rae2822_sst.cfg_file  = "turb_SST_RAE2822.cfg"
-    rae2822_sst.test_iter = 20
-    rae2822_sst.test_vals = [-0.510826, 4.909714, 0.825023, 0.052675] #last 4 columns
-    rae2822_sst.su2_exec  = "SU2_CFD"
-    rae2822_sst.new_output = True
-    rae2822_sst.timeout   = 1600
-    rae2822_sst.tol       = 0.00001
-    test_list.append(rae2822_sst)
-
-    # Flat plate
-    turb_flatplate           = TestCase('turb_flatplate')
-    turb_flatplate.cfg_dir   = "rans/flatplate"
-    turb_flatplate.cfg_file  = "turb_SA_flatplate.cfg"
-    turb_flatplate.test_iter = 20
-    turb_flatplate.test_vals = [-4.157169, -6.737133, -0.176253, 0.057446] #last 4 columns
-    turb_flatplate.su2_exec  = "SU2_CFD"
-    turb_flatplate.new_output  = True
-    turb_flatplate.timeout   = 1600
-    turb_flatplate.tol       = 0.00001
-    test_list.append(turb_flatplate)
-
-    # ONERA M6 Wing
-    turb_oneram6           = TestCase('turb_oneram6')
-    turb_oneram6.cfg_dir   = "rans/oneram6"
-    turb_oneram6.cfg_file  = "turb_ONERAM6.cfg"
-    turb_oneram6.test_iter = 10
-    turb_oneram6.test_vals = [-2.327431, -6.564331, 0.230257, 0.155839]#last 4 columns
-    turb_oneram6.su2_exec  = "SU2_CFD"
-    turb_oneram6.new_output = True
-    turb_oneram6.timeout   = 3200
-    turb_oneram6.tol       = 0.00001
-    test_list.append(turb_oneram6)
-
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242)
-    turb_naca0012_sa           = TestCase('turb_naca0012_sa')
-    turb_naca0012_sa.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa.cfg_file  = "turb_NACA0012_sa.cfg"
-    turb_naca0012_sa.test_iter = 10
-    turb_naca0012_sa.test_vals = [-11.981166, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa.new_output = True
-    turb_naca0012_sa.timeout   = 3200
-    turb_naca0012_sa.tol       = 0.00001
-    test_list.append(turb_naca0012_sa)
-   
-    # NACA0012 (SA, FUN3D results for finest grid: CL=1.0983, CD=0.01242) with binary restart
-    turb_naca0012_sa_bin           = TestCase('turb_naca0012_sa_bin')
-    turb_naca0012_sa_bin.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sa_bin.cfg_file  = "turb_NACA0012_sa_binary.cfg"
-    turb_naca0012_sa_bin.test_iter = 10
-    turb_naca0012_sa_bin.test_vals = [-11.981289, -9.145363, 1.070528, 0.019417] #last 4 columns
-    turb_naca0012_sa_bin.su2_exec  = "SU2_CFD"
-    turb_naca0012_sa_bin.new_output  = True
-    turb_naca0012_sa_bin.timeout   = 3200
-    turb_naca0012_sa_bin.tol       = 0.00001
-    test_list.append(turb_naca0012_sa_bin)
- 
-    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
-    turb_naca0012_sst           = TestCase('turb_naca0012_sst')
-    turb_naca0012_sst.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
-    turb_naca0012_sst.test_iter = 10
-    turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
-    turb_naca0012_sst.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst.new_output  = True
-    turb_naca0012_sst.timeout   = 3200
-    turb_naca0012_sst.tol       = 0.00001
-    test_list.append(turb_naca0012_sst)
-
-    # PROPELLER 
-    propeller           = TestCase('propeller')
-    propeller.cfg_dir   = "rans/propeller"
-    propeller.cfg_file  = "propeller.cfg"
-    propeller.test_iter = 10
-    propeller.test_vals = [-3.378876, -8.396837, 0.000047, 0.055591] #last 4 columns
-    propeller.su2_exec  = "SU2_CFD"
-    propeller.new_output = True
-    propeller.timeout   = 3200
-    propeller.tol       = 0.00001
-    test_list.append(propeller)
-    #################################
-    ## Compressible RANS Restart  ###
-    #################################
-
-    # NACA0012 SST Multigrid restart
-    turb_naca0012_sst_restart_mg           = TestCase('turb_naca0012_sst_restart_mg')
-    turb_naca0012_sst_restart_mg.cfg_dir   = "rans/naca0012"
-    turb_naca0012_sst_restart_mg.cfg_file  = "turb_NACA0012_sst_multigrid_restart.cfg"
-    turb_naca0012_sst_restart_mg.test_iter = 50
-    turb_naca0012_sst_restart_mg.ntest_vals = 5
-    turb_naca0012_sst_restart_mg.test_vals = [-6.459444, -4.595710, 1.201844, -0.007146, 0.080517] #last 5 columns
-    turb_naca0012_sst_restart_mg.su2_exec  = "SU2_CFD"
-    turb_naca0012_sst_restart_mg.new_output  = True
-    turb_naca0012_sst_restart_mg.timeout   = 3200
-    turb_naca0012_sst_restart_mg.tol       = 0.000001
-    test_list.append(turb_naca0012_sst_restart_mg)
-    
-    #############################
-    ### Incompressible Euler  ###
-    #############################
-
-    # NACA0012 Hydrofoil
-    inc_euler_naca0012           = TestCase('inc_euler_naca0012')
-    inc_euler_naca0012.cfg_dir   = "incomp_euler/naca0012"
-    inc_euler_naca0012.cfg_file  = "incomp_NACA0012.cfg"
-    inc_euler_naca0012.test_iter = 20
-    inc_euler_naca0012.test_vals = [-4.880274, -3.797906, 0.501143, 0.007051] #last 4 columns
-    inc_euler_naca0012.su2_exec  = "SU2_CFD"
-    inc_euler_naca0012.new_output = True
-    inc_euler_naca0012.timeout   = 1600
-    inc_euler_naca0012.tol       = 0.00001
-    test_list.append(inc_euler_naca0012)
-
-    # C-D nozzle with pressure inlet and mass flow outlet
-    inc_nozzle           = TestCase('inc_nozzle')
-    inc_nozzle.cfg_dir   = "incomp_euler/nozzle"
-    inc_nozzle.cfg_file  = "inv_nozzle.cfg"
-    inc_nozzle.test_iter = 20
-    inc_nozzle.test_vals = [-5.799445, -4.785945, -0.000443, 0.124533] #last 4 columns
-    inc_nozzle.su2_exec  = "SU2_CFD"
-    inc_nozzle.new_output = True
-    inc_nozzle.timeout   = 1600
-    inc_nozzle.tol       = 0.00001
-    test_list.append(inc_nozzle)
-
-    #############################
-    ### Incompressible N-S    ###
-    #############################
-
-    # Laminar cylinder
-    inc_lam_cylinder          = TestCase('inc_lam_cylinder')
-    inc_lam_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_lam_cylinder.cfg_file  = "incomp_cylinder.cfg"
-    inc_lam_cylinder.test_iter = 10
-    inc_lam_cylinder.test_vals = [-4.004277, -3.227956, 0.003852, 7.626578] #last 4 columns
-    inc_lam_cylinder.new_output  = True
-    inc_lam_cylinder.su2_exec  = "SU2_CFD"
-    inc_lam_cylinder.timeout   = 1600
-    inc_lam_cylinder.tol       = 0.00001
-    test_list.append(inc_lam_cylinder)
-
-    # Buoyancy-driven cavity
-    inc_buoyancy          = TestCase('inc_buoyancy')
-    inc_buoyancy.cfg_dir   = "incomp_navierstokes/buoyancy_cavity"
-    inc_buoyancy.cfg_file  = "lam_buoyancy_cavity.cfg"
-    inc_buoyancy.test_iter = 20
-    inc_buoyancy.test_vals = [-4.436657, 0.507847, 0.000000, 0.000000] #last 4 columns
-    inc_buoyancy.new_output  = True
-    inc_buoyancy.su2_exec  = "SU2_CFD"
-    inc_buoyancy.timeout   = 1600
-    inc_buoyancy.tol       = 0.00001
-    test_list.append(inc_buoyancy)
-
-    # Laminar heated cylinder with polynomial fluid model
-    inc_poly_cylinder          = TestCase('inc_poly_cylinder')
-    inc_poly_cylinder.cfg_dir   = "incomp_navierstokes/cylinder"
-    inc_poly_cylinder.cfg_file  = "poly_cylinder.cfg"
-    inc_poly_cylinder.test_iter = 20
-    inc_poly_cylinder.test_vals = [-8.108218, -2.158606, 0.019142, 1.902461] #last 4 columns
-    inc_poly_cylinder.new_output  = True
-    inc_poly_cylinder.su2_exec  = "SU2_CFD"
-    inc_poly_cylinder.timeout   = 1600
-    inc_poly_cylinder.tol       = 0.00001
-    test_list.append(inc_poly_cylinder)
-
-    ############################
-    ### Incompressible RANS  ###
-    ############################
-
-    # NACA0012
-    inc_turb_naca0012           = TestCase('inc_turb_naca0012')
-    inc_turb_naca0012.cfg_dir   = "incomp_rans/naca0012"
-    inc_turb_naca0012.cfg_file  = "naca0012.cfg"
-    inc_turb_naca0012.test_iter = 20
-    inc_turb_naca0012.test_vals = [-4.788495, -11.040511, 0.000023, 0.309503] #last 4 columns
-    inc_turb_naca0012.new_output  = True
-    inc_turb_naca0012.su2_exec  = "SU2_CFD"
-    inc_turb_naca0012.timeout   = 1600
-    inc_turb_naca0012.tol       = 0.00001
-    test_list.append(inc_turb_naca0012)
-    
-    ####################
-    ### DG-FEM Euler ###
-    ####################
-    
-    # NACA0012
-    fem_euler_naca0012           = TestCase('fem_euler_naca0012')
-    fem_euler_naca0012.cfg_dir   = "hom_euler/NACA0012_5thOrder"
-    fem_euler_naca0012.cfg_file  = "fem_NACA0012_reg.cfg"
-    fem_euler_naca0012.test_iter = 10
-    fem_euler_naca0012.test_vals = [-6.519946,-5.976944,0.255551,0.000028] #last 4 columns
-    fem_euler_naca0012.su2_exec  = "SU2_CFD"
-    fem_euler_naca0012.new_output = True
-    fem_euler_naca0012.timeout   = 1600
-    fem_euler_naca0012.tol       = 0.00001
-    test_list.append(fem_euler_naca0012)
-    
-    ############################
-    ### DG-FEM Navier-Stokes ###
-    ############################
-    
-    # Flat plate
-    fem_ns_flatplate           = TestCase('fem_ns_flatplate')
-    fem_ns_flatplate.cfg_dir   = "hom_navierstokes/FlatPlate/nPoly4"
-    fem_ns_flatplate.cfg_file  = "lam_flatplate_reg.cfg"
-    fem_ns_flatplate.test_iter = 25
-    fem_ns_flatplate.test_vals = [1.383727,3.175247,0.058387,0.257951] #last 4 columns
-    fem_ns_flatplate.su2_exec  = "SU2_CFD"
-    fem_ns_flatplate.new_output = True
-    fem_ns_flatplate.timeout   = 1600
-    fem_ns_flatplate.tol       = 0.00001
-    test_list.append(fem_ns_flatplate)
-    
-    # Steady cylinder
-    fem_ns_cylinder           = TestCase('fem_ns_cylinder')
-    fem_ns_cylinder.cfg_dir   = "hom_navierstokes/CylinderViscous/nPoly3"
-    fem_ns_cylinder.cfg_file  = "fem_Cylinder_reg.cfg"
-    fem_ns_cylinder.test_iter = 10
-    fem_ns_cylinder.test_vals = [0.454960,0.979123,-0.000028,79.984799] #last 4 columns
-    fem_ns_cylinder.su2_exec  = "SU2_CFD"
-    fem_ns_cylinder.new_output  = True
-    fem_ns_cylinder.timeout   = 1600
-    fem_ns_cylinder.tol       = 0.00001
-    test_list.append(fem_ns_cylinder)
-
-    # Steady sphere
-    fem_ns_sphere           = TestCase('fem_ns_sphere')
-    fem_ns_sphere.cfg_dir   = "hom_navierstokes/SphereViscous/nPoly3_QuadDominant"
-    fem_ns_sphere.cfg_file  = "fem_Sphere_reg.cfg"
-    fem_ns_sphere.test_iter = 10
-    fem_ns_sphere.test_vals = [-0.288121,0.240324,0.000258,21.797363] #last 4 columns
-    fem_ns_sphere.su2_exec  = "SU2_CFD"
-    fem_ns_sphere.new_output = True
-    fem_ns_sphere.timeout   = 1600
-    fem_ns_sphere.tol       = 0.00001
-    test_list.append(fem_ns_sphere)
-
-    # Unsteady sphere ADER
-    fem_ns_sphere_ader           = TestCase('fem_ns_sphere_ader')
-    fem_ns_sphere_ader.cfg_dir   = "hom_navierstokes/SphereViscous/nPoly3_QuadDominant"
-    fem_ns_sphere_ader.cfg_file  = "fem_Sphere_reg_ADER.cfg"
-    fem_ns_sphere_ader.test_iter = 10
-    fem_ns_sphere_ader.test_vals = [-35.000000,-35.000000,0.000047,31.110911] #last 4 columns
-    fem_ns_sphere_ader.su2_exec  = "SU2_CFD"
-    fem_ns_sphere_ader.new_output = True
-    fem_ns_sphere_ader.unsteady   = True
-    fem_ns_sphere_ader.timeout   = 1600
-    fem_ns_sphere_ader.tol       = 0.00001
-    test_list.append(fem_ns_sphere_ader)
-
-    # Unsteady cylinder
-    fem_ns_unsteady_cylinder           = TestCase('fem_ns_unsteady_cylinder')
-    fem_ns_unsteady_cylinder.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
-    fem_ns_unsteady_cylinder.cfg_file  = "fem_unst_cylinder.cfg"
-    fem_ns_unsteady_cylinder.test_iter = 11
-    fem_ns_unsteady_cylinder.test_vals = [-3.558582,-3.014464,-0.038927,1.383983] #last 4 columns
-    fem_ns_unsteady_cylinder.su2_exec  = "SU2_CFD"
-    fem_ns_unsteady_cylinder.new_output = True
-    fem_ns_unsteady_cylinder.unsteady   = True
-    fem_ns_unsteady_cylinder.timeout   = 1600
-    fem_ns_unsteady_cylinder.tol       = 0.00001
-    test_list.append(fem_ns_unsteady_cylinder)
-
-    # Unsteady cylinder ADER
-    fem_ns_unsteady_cylinder_ader           = TestCase('fem_ns_unsteady_cylinder_ader')
-    fem_ns_unsteady_cylinder_ader.cfg_dir   = "hom_navierstokes/UnsteadyCylinder/nPoly4"
-    fem_ns_unsteady_cylinder_ader.cfg_file  = "fem_unst_cylinder_ADER.cfg"
-    fem_ns_unsteady_cylinder_ader.test_iter = 11
-    fem_ns_unsteady_cylinder_ader.test_vals = [-35.000000,-35.000000,-0.041003,1.391339] #last 4 columns
-    fem_ns_unsteady_cylinder_ader.su2_exec  = "SU2_CFD"
-    fem_ns_unsteady_cylinder_ader.new_output = True
-    fem_ns_unsteady_cylinder_ader.unsteady   = True
-    fem_ns_unsteady_cylinder_ader.timeout   = 1600
-    fem_ns_unsteady_cylinder_ader.tol       = 0.00001
-    test_list.append(fem_ns_unsteady_cylinder_ader)
-
-    #########################
-    ###    Transition     ###
-    #########################
-
-    # Schubauer-Klebanoff Natural Transition
-    schubauer_klebanoff_transition              = TestCase('Schubauer_Klebanoff')
-    schubauer_klebanoff_transition.cfg_dir      = "transition/Schubauer_Klebanoff"
-    schubauer_klebanoff_transition.cfg_file     = "transitional_BC_model_ConfigFile.cfg"
-    schubauer_klebanoff_transition.test_iter    = 10
-    schubauer_klebanoff_transition.new_output   = True
-    schubauer_klebanoff_transition.test_vals    = [-8.029756, -14.278066, 0.000053, 0.007986] #last 4 columns
-    schubauer_klebanoff_transition.su2_exec     = "SU2_CFD"
-    schubauer_klebanoff_transition.timeout      = 1600
-    schubauer_klebanoff_transition.tol          = 0.00001
-    test_list.append(schubauer_klebanoff_transition)
-
-    #####################################
-    ### Cont. adj. compressible Euler ###
-    #####################################
-
-    # Inviscid NACA0012
-    contadj_naca0012           = TestCase('contadj_naca0012')
-    contadj_naca0012.cfg_dir   = "cont_adj_euler/naca0012"
-    contadj_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    contadj_naca0012.test_iter = 5
-    contadj_naca0012.test_vals = [-9.787554, -15.192510, 0.300920, 0.019552] #last 4 columns
-    contadj_naca0012.su2_exec  = "SU2_CFD"
-    contadj_naca0012.new_output = True
-    contadj_naca0012.timeout   = 1600
-    contadj_naca0012.tol       = 0.001
-    test_list.append(contadj_naca0012)
-
-    # Inviscid ONERA M6
-    contadj_oneram6           = TestCase('contadj_oneram6')
-    contadj_oneram6.cfg_dir   = "cont_adj_euler/oneram6"
-    contadj_oneram6.cfg_file  = "inv_ONERAM6.cfg"
-    contadj_oneram6.test_iter = 10
-    contadj_oneram6.test_vals = [-12.133160, -12.706697, 0.685900, 0.007594] #last 4 columns
-    contadj_oneram6.su2_exec  = "SU2_CFD"
-    contadj_oneram6.new_output = True
-    contadj_oneram6.timeout   = 1600
-    contadj_oneram6.tol       = 0.00001
-    test_list.append(contadj_oneram6)
-
-    # Inviscid WEDGE: tests averaged outflow total pressure adjoint
-    contadj_wedge             = TestCase('contadj_wedge')
-    contadj_wedge.cfg_dir   = "cont_adj_euler/wedge"
-    contadj_wedge.cfg_file  = "inv_wedge_ROE.cfg"
-    contadj_wedge.test_iter = 10
-    contadj_wedge.test_vals = [2.856008, -2.767216, 1.0029e+06, 1.3024e-13] #last 4 columns
-    contadj_wedge.su2_exec  = "SU2_CFD"
-    contadj_wedge.new_output = True
-    contadj_wedge.timeout   = 1600
-    contadj_wedge.tol       = 0.00001
-    test_list.append(contadj_wedge)
-    
-    # Inviscid fixed CL NACA0012
-    contadj_fixedCL_naca0012           = TestCase('contadj_fixedcl_naca0012')
-    contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
-    contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
-    contadj_fixedCL_naca0012.test_iter = 100
-    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
-    contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
-    contadj_fixedCL_naca0012.new_output= True
-    contadj_fixedCL_naca0012.timeout   = 1600
-    contadj_fixedCL_naca0012.tol       = 0.00001
-    test_list.append(contadj_fixedCL_naca0012)
-
-    ###################################
-    ### Cont. adj. compressible N-S ###
-    ###################################
-
-    # Adjoint laminar cylinder
-    contadj_ns_cylinder           = TestCase('contadj_ns_cylinder')
-    contadj_ns_cylinder.cfg_dir   = "cont_adj_navierstokes/cylinder"
-    contadj_ns_cylinder.cfg_file  = "lam_cylinder.cfg"
-    contadj_ns_cylinder.test_iter = 20
-    contadj_ns_cylinder.test_vals = [ -3.665848, -9.132055, 2.056700, -0.000000] #last 4 columns
-    contadj_ns_cylinder.su2_exec  = "SU2_CFD"
-    contadj_ns_cylinder.new_output = True
-    contadj_ns_cylinder.timeout   = 1600
-    contadj_ns_cylinder.tol       = 0.00001
-    test_list.append(contadj_ns_cylinder)
-
-    # Adjoint laminar naca0012 subsonic
-    contadj_ns_naca0012_sub           = TestCase('contadj_ns_naca0012_sub')
-    contadj_ns_naca0012_sub.cfg_dir   = "cont_adj_navierstokes/naca0012_sub"
-    contadj_ns_naca0012_sub.cfg_file  = "lam_NACA0012.cfg"
-    contadj_ns_naca0012_sub.test_iter = 20
-    contadj_ns_naca0012_sub.test_vals = [-2.743268, -8.215193, 0.518810, 0.001210] #last 4 columns
-    contadj_ns_naca0012_sub.su2_exec  = "SU2_CFD"
-    contadj_ns_naca0012_sub.new_output =True
-    contadj_ns_naca0012_sub.timeout   = 1600
-    contadj_ns_naca0012_sub.tol       = 0.00001
-    test_list.append(contadj_ns_naca0012_sub)
-    
-    # Adjoint laminar naca0012 transonic
-    contadj_ns_naca0012_trans           = TestCase('contadj_ns_naca0012_trans')
-    contadj_ns_naca0012_trans.cfg_dir   = "cont_adj_navierstokes/naca0012_trans"
-    contadj_ns_naca0012_trans.cfg_file  = "lam_NACA0012.cfg"
-    contadj_ns_naca0012_trans.test_iter = 20
-    contadj_ns_naca0012_trans.test_vals = [-1.039664, -6.575019, 1.772300, 0.012495] #last 4 columns
-    contadj_ns_naca0012_trans.su2_exec  = "SU2_CFD"
-    contadj_ns_naca0012_trans.new_output = True
-    contadj_ns_naca0012_trans.timeout   = 1600
-    contadj_ns_naca0012_trans.tol       = 0.00001
-    test_list.append(contadj_ns_naca0012_trans)
-
-    #######################################################
-    ### Cont. adj. compressible RANS (frozen viscosity) ###
-    #######################################################
-
-    # Adjoint turbulent NACA0012
-    contadj_rans_naca0012           = TestCase('contadj_rans_naca0012')
-    contadj_rans_naca0012.cfg_dir   = "cont_adj_rans/naca0012"
-    contadj_rans_naca0012.cfg_file  = "turb_nasa.cfg"
-    contadj_rans_naca0012.test_iter = 20
-    contadj_rans_naca0012.test_vals = [ -0.794162, -5.761722, 19.214000, -0.000000] #last 4 columns
-    contadj_rans_naca0012.su2_exec  = "SU2_CFD"
-    contadj_rans_naca0012.new_output = True
-    contadj_rans_naca0012.timeout   = 1600
-    contadj_rans_naca0012.tol       = 0.00001
-    test_list.append(contadj_rans_naca0012)
-   
-    # Adjoint turbulent NACA0012 with binary restarts
-    contadj_rans_naca0012_bin           = TestCase('contadj_rans_naca0012_bin')
-    contadj_rans_naca0012_bin.cfg_dir   = "cont_adj_rans/naca0012"
-    contadj_rans_naca0012_bin.cfg_file  = "turb_nasa_binary.cfg"
-    contadj_rans_naca0012_bin.test_iter = 18
-    contadj_rans_naca0012_bin.test_vals = [-0.794169, -5.761671, 19.214000, -0.000000] #last 4 columns
-    contadj_rans_naca0012_bin.su2_exec  = "SU2_CFD"
-    contadj_rans_naca0012_bin.new_output = True
-    contadj_rans_naca0012_bin.timeout   = 1600
-    contadj_rans_naca0012_bin.tol       = 0.00001
-    test_list.append(contadj_rans_naca0012_bin)
- 
-    # Adjoint turbulent RAE2822
-    contadj_rans_rae2822           = TestCase('contadj_rans_rae2822')
-    contadj_rans_rae2822.cfg_dir   = "cont_adj_rans/rae2822"
-    contadj_rans_rae2822.cfg_file  = "turb_SA_RAE2822.cfg"
-    contadj_rans_rae2822.test_iter = 20
-    contadj_rans_rae2822.test_vals = [-5.369688, -10.872209, -0.212470, 0.005448] #last 4 columns
-    contadj_rans_rae2822.su2_exec  = "SU2_CFD"
-    contadj_rans_rae2822.new_output = True
-    contadj_rans_rae2822.timeout   = 1600
-    contadj_rans_rae2822.tol       = 0.00001
-    test_list.append(contadj_rans_rae2822)
-
-    #############################
-    ### Compressibele RANS UQ ###
-    #############################
-
-    # NACA0012 1c
-    turb_naca0012_1c           = TestCase('turb_naca0012_1c')
-    turb_naca0012_1c.cfg_dir   = "rans_uq/naca0012"
-    turb_naca0012_1c.cfg_file  = "turb_NACA0012_uq_1c.cfg"
-    turb_naca0012_1c.test_iter = 10
-    turb_naca0012_1c.test_vals = [-4.946255, 1.262038, 5.575706, 2.057785] #last 4 columns
-    turb_naca0012_1c.su2_exec  = "SU2_CFD"
-    turb_naca0012_1c.new_output = True
-    turb_naca0012_1c.timeout   = 1600
-    turb_naca0012_1c.tol       = 0.00001
-    test_list.append(turb_naca0012_1c)
-
-    # NACA0012 2c
-    turb_naca0012_2c           = TestCase('turb_naca0012_2c')
-    turb_naca0012_2c.cfg_dir   = "rans_uq/naca0012"
-    turb_naca0012_2c.cfg_file  = "turb_NACA0012_uq_2c.cfg"
-    turb_naca0012_2c.test_iter = 10
-    turb_naca0012_2c.test_vals = [-5.343094, 1.137839, 5.337548, 1.919739] #last 4 columns
-    turb_naca0012_2c.su2_exec  = "SU2_CFD"
-    turb_naca0012_2c.new_output = True
-    turb_naca0012_2c.timeout   = 1600
-    turb_naca0012_2c.tol       = 0.00001
-    test_list.append(turb_naca0012_2c)
-
-    # NACA0012 3c
-    turb_naca0012_3c           = TestCase('turb_naca0012_3c')
-    turb_naca0012_3c.cfg_dir   = "rans_uq/naca0012"
-    turb_naca0012_3c.cfg_file  = "turb_NACA0012_uq_3c.cfg"
-    turb_naca0012_3c.test_iter = 10
-    turb_naca0012_3c.test_vals = [-5.421229, 1.099570, 5.184366, 1.835606] #last 4 columns
-    turb_naca0012_3c.su2_exec  = "SU2_CFD"
-    turb_naca0012_3c.new_output = True
-    turb_naca0012_3c.timeout   = 1600
-    turb_naca0012_3c.tol       = 0.00001
-    test_list.append(turb_naca0012_3c)
-
-    # NACA0012 p1c1
-    turb_naca0012_p1c1           = TestCase('turb_naca0012_p1c1')
-    turb_naca0012_p1c1.cfg_dir   = "rans_uq/naca0012"
-    turb_naca0012_p1c1.cfg_file  = "turb_NACA0012_uq_p1c1.cfg"
-    turb_naca0012_p1c1.test_iter = 10
-    turb_naca0012_p1c1.test_vals = [-5.022106, 1.280795, 5.960837, 2.302647] #last 4 columns
-    turb_naca0012_p1c1.su2_exec  = "SU2_CFD"
-    turb_naca0012_p1c1.new_output = True
-    turb_naca0012_p1c1.timeout   = 1600
-    turb_naca0012_p1c1.tol       = 0.00001
-    test_list.append(turb_naca0012_p1c1)
-
-    # NACA0012 p1c2
-    turb_naca0012_p1c2           = TestCase('turb_naca0012_p1c2')
-    turb_naca0012_p1c2.cfg_dir   = "rans_uq/naca0012"
-    turb_naca0012_p1c2.cfg_file  = "turb_NACA0012_uq_p1c2.cfg"
-    turb_naca0012_p1c2.test_iter = 10
-    turb_naca0012_p1c2.test_vals = [-5.357006, 1.154966, 5.635942, 2.088563] #last 4 columns
-    turb_naca0012_p1c2.su2_exec  = "SU2_CFD"
-    turb_naca0012_p1c2.new_output = True
-    turb_naca0012_p1c2.timeout   = 1600
-    turb_naca0012_p1c2.tol       = 0.00001
-    test_list.append(turb_naca0012_p1c2)
-
-    ######################################
-    ### Harmonic Balance               ###
-    ######################################
-    
-    # Description of the regression test
-    harmonic_balance           = TestCase('harmonic_balance')
-    harmonic_balance.cfg_dir   = "harmonic_balance"
-    harmonic_balance.cfg_file  = "HB.cfg"
-    harmonic_balance.test_iter = 25
-    harmonic_balance.test_vals = [-1.569573, 3.941896, 0.008780, 0.079775] #last 4 columns
-    harmonic_balance.su2_exec  = "SU2_CFD"
-    harmonic_balance.timeout   = 1600
-    harmonic_balance.tol       = 0.00001
-    test_list.append(harmonic_balance)
-
-    # Turbulent pitching NACA 64a010 airfoil
-    hb_rans_preconditioning           = TestCase('hb_rans_preconditioning')
-    hb_rans_preconditioning.cfg_dir   = "harmonic_balance/hb_rans_preconditioning"
-    hb_rans_preconditioning.cfg_file  = "davis.cfg"
-    hb_rans_preconditioning.test_iter = 25
-    hb_rans_preconditioning.test_vals = [-1.900982, -5.880438, 0.007758, 0.125934] #last 4 columns
-    hb_rans_preconditioning.su2_exec  = "SU2_CFD"
-    hb_rans_preconditioning.timeout   = 1600
-    hb_rans_preconditioning.tol       = 0.00001
-    test_list.append(hb_rans_preconditioning)
-
-   ######################################
-   ### Moving Wall                    ###
-   ######################################
-   
-    # Lid-driven cavity
-    cavity           = TestCase('cavity')
-    cavity.cfg_dir   = "moving_wall/cavity"
-    cavity.cfg_file  = "lam_cavity.cfg"
-    cavity.test_iter = 25
-    cavity.test_vals = [-5.627934, -0.164470, 0.051972, 2.547034] #last 4 columns
-    cavity.su2_exec  = "SU2_CFD"
-    cavity.new_output = True
-    cavity.timeout   = 1600
-    cavity.tol       = 0.00001
-    test_list.append(cavity)
-
-    # Spinning cylinder
-    spinning_cylinder           = TestCase('spinning_cylinder')
-    spinning_cylinder.cfg_dir   = "moving_wall/spinning_cylinder"
-    spinning_cylinder.cfg_file  = "spinning_cylinder.cfg"
-    spinning_cylinder.test_iter = 25
-    spinning_cylinder.test_vals = [-7.719673, -2.279643, 1.721389, 1.710467] #last 4 columns
-    spinning_cylinder.su2_exec  = "SU2_CFD"
-    spinning_cylinder.new_output = True
-    spinning_cylinder.timeout   = 1600
-    spinning_cylinder.tol       = 0.00001
-    test_list.append(spinning_cylinder)
-
-    ######################################
-    ### Unsteady                       ###
-    ######################################
-
-    # Square cylinder
-    square_cylinder           = TestCase('square_cylinder')
-    square_cylinder.cfg_dir   = "unsteady/square_cylinder"
-    square_cylinder.cfg_file  = "turb_square.cfg"
-    square_cylinder.test_iter = 3
-    square_cylinder.test_vals = [-1.166421, 0.076804, 1.398548, 2.197047] #last 4 columns
-    square_cylinder.su2_exec  = "SU2_CFD"
-    square_cylinder.timeout   = 1600
-    square_cylinder.tol       = 0.00001
-    square_cylinder.unsteady  = True
-    square_cylinder.new_output = True
-    test_list.append(square_cylinder)
-
-    # Gust
-    sine_gust           = TestCase('sine_gust')
-    sine_gust.cfg_dir   = "gust"
-    sine_gust.cfg_file  = "inv_gust_NACA0012.cfg"
-    sine_gust.test_iter = 5
-    sine_gust.test_vals = [-1.977531, 3.481790, -0.006222, -0.001342] #last 4 columns
-    sine_gust.su2_exec  = "SU2_CFD"
-    sine_gust.timeout   = 1600
-    sine_gust.tol       = 0.00001
-    sine_gust.unsteady  = True
-    sine_gust.new_output = True
-    test_list.append(sine_gust)
-
-    # Aeroelastic
-    aeroelastic         = TestCase('aeroelastic')
-    aeroelastic.cfg_dir   = "aeroelastic"
-    aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
-    aeroelastic.test_iter = 2
-    aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
-    aeroelastic.su2_exec  = "SU2_CFD"
-    aeroelastic.timeout   = 1600
-    aeroelastic.tol       = 0.000001
-    aeroelastic.unsteady  = True
-    aeroelastic.new_output = True
-    test_list.append(aeroelastic) 
-
-    # Delayed Detached Eddy Simulation
-    ddes_flatplate        = TestCase('ddes_flatplate')
-    ddes_flatplate.cfg_dir   = "ddes/flatplate"
-    ddes_flatplate.cfg_file  = "ddes_flatplate.cfg"
-    ddes_flatplate.test_iter = 10
-    ddes_flatplate.test_vals = [-2.714758, -5.883004, -0.215005, 0.023783] #last 4 columns
-    ddes_flatplate.su2_exec  = "SU2_CFD"
-    ddes_flatplate.timeout   = 1600
-    ddes_flatplate.tol       = 0.00001
-    ddes_flatplate.unsteady  = True
-    ddes_flatplate.new_output = True
-    test_list.append(ddes_flatplate)    
-
-    ######################################
-    ### NICFD                          ###
-    ######################################
-
-    # ls89_sa
-    ls89_sa           = TestCase('ls89_sa')
-    ls89_sa.cfg_dir   = "nicf/LS89"
-    ls89_sa.cfg_file  = "turb_SA_PR.cfg"
-    ls89_sa.test_iter = 20
-    ls89_sa.test_vals = [-5.050658, -13.393664, 0.174911, 0.430700] #last 4 columns
-    ls89_sa.su2_exec  = "SU2_CFD"
-    ls89_sa.new_output= True
-    ls89_sa.timeout   = 1600
-    ls89_sa.tol       = 0.00001
-    test_list.append(ls89_sa)
-
-    # Rarefaction shock wave edge_VW
-    edge_VW           = TestCase('edge_VW')
-    edge_VW.cfg_dir   = "nicf/edge"
-    edge_VW.cfg_file  = "edge_VW.cfg"
-    edge_VW.test_iter = 20
-    edge_VW.test_vals = [-0.720910, 5.481122, -0.000853, 0.000000] #last 4 columns
-    edge_VW.su2_exec  = "SU2_CFD"
-    edge_VW.new_output = True
-    edge_VW.timeout   = 1600
-    edge_VW.tol       = 0.00001
-    test_list.append(edge_VW)
-
-    # Rarefaction shock wave edge_PPR               
-    edge_PPR           = TestCase('edge_PPR')
-    edge_PPR.cfg_dir   = "nicf/edge"
-    edge_PPR.cfg_file  = "edge_PPR.cfg"
-    edge_PPR.test_iter = 20
-    edge_PPR.test_vals = [-1.688033, 4.505202, 0.000916, 0.000000] #last 4 columns
-    edge_PPR.su2_exec  = "SU2_CFD"
-    edge_PPR.new_output = True
-    edge_PPR.timeout   = 1600
-    edge_PPR.tol       = 0.00001
-    test_list.append(edge_PPR)
-    
-    
-    ######################################
-    ### turbomachinery                 ###
-    ######################################
-    
-    # Jones APU Turbocharger
-    Jones_tc           = TestCase('jones_turbocharger')
-    Jones_tc.cfg_dir   = "turbomachinery/APU_turbocharger"
-    Jones_tc.cfg_file  = "Jones.cfg"
-    Jones_tc.test_iter = 5
-    Jones_tc.test_vals = [-5.304569, 0.419188, 80.085850, 1.034777] #last 4 columns
-    Jones_tc.su2_exec  = "SU2_CFD"
-    Jones_tc.timeout   = 1600
-    Jones_tc.tol       = 0.00001
-    test_list.append(Jones_tc)
-
-    # Jones APU Turbocharger restart
-    Jones_tc_rst           = TestCase('jones_turbocharger_restart')
-    Jones_tc_rst.cfg_dir   = "turbomachinery/APU_turbocharger"
-    Jones_tc_rst.cfg_file  = "Jones_rst.cfg"
-    Jones_tc_rst.test_iter = 5
-    Jones_tc_rst.test_vals = [-4.423322, -1.618510, 82.250600, 2.791319] #last 4 columns
-    Jones_tc_rst.su2_exec  = "SU2_CFD"
-    Jones_tc_rst.timeout   = 1600
-    Jones_tc_rst.tol       = 0.00001
-    test_list.append(Jones_tc_rst)
-
-    # 2D axial stage
-    axial_stage2D           = TestCase('axial_stage2D')
-    axial_stage2D.cfg_dir   = "turbomachinery/axial_stage_2D"
-    axial_stage2D.cfg_file  = "Axial_stage2D.cfg"
-    axial_stage2D.test_iter = 20
-    axial_stage2D.test_vals = [-1.837052, 5.787185, 73.679900, 0.888919] #last 4 columns
-    axial_stage2D.su2_exec  = "SU2_CFD"
-    axial_stage2D.timeout   = 1600
-    axial_stage2D.tol       = 0.00001
-    test_list.append(axial_stage2D)
-    
-    # 2D transonic stator
-    transonic_stator           = TestCase('transonic_stator')
-    transonic_stator.cfg_dir   = "turbomachinery/transonic_stator_2D"
-    transonic_stator.cfg_file  = "transonic_stator.cfg"
-    transonic_stator.test_iter = 20
-    transonic_stator.test_vals = [-1.114556, 6.120416, 67.101480, 0.070037] #last 4 columns
-    transonic_stator.su2_exec  = "SU2_CFD"
-    transonic_stator.timeout   = 1600
-    transonic_stator.tol       = 0.00001
-    test_list.append(transonic_stator)
-    
-    # 2D transonic stator restart
-    transonic_stator_rst           = TestCase('transonic_stator_restart')
-    transonic_stator_rst.cfg_dir   = "turbomachinery/transonic_stator_2D"
-    transonic_stator_rst.cfg_file  = "transonic_stator_rst.cfg"
-    transonic_stator_rst.test_iter = 20
-    transonic_stator_rst.test_vals = [-0.486965, 4.460638, 6.455770, 0.004009] #last 4 columns
-    transonic_stator_rst.su2_exec  = "SU2_CFD"
-    transonic_stator_rst.timeout   = 1600
-    transonic_stator_rst.tol       = 0.00001
-    test_list.append(transonic_stator_rst)
-
-
-    ######################################
-    ### Sliding Mesh                   ###
-    ######################################
-
-    # Uniform flow
-    uniform_flow         = TestCase('uniform_flow')
-    uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
-    uniform_flow.cfg_file  = "uniform_NN.cfg"
-    uniform_flow.test_iter = 10
-    uniform_flow.test_vals = [10.000000, 0.000000, 0.432864, -5.596207] #last 4 columns
-    uniform_flow.su2_exec  = "SU2_CFD"
-    uniform_flow.timeout   = 1600
-    uniform_flow.tol       = 0.000001
-    uniform_flow.unsteady  = True
-    uniform_flow.multizone = True
-    test_list.append(uniform_flow) 
-
-   # Channel_2D
-    channel_2D           = TestCase('channel_2D')
-    channel_2D.cfg_dir   = "sliding_interface/channel_2D"
-    channel_2D.cfg_file  = "channel_2D_WA.cfg"
-    channel_2D.test_iter = 4
-    channel_2D.test_vals = [0.000000, 1.497633, 1.199455, 0.904683] #last 4 columns
-    channel_2D.su2_exec  = "SU2_CFD"
-    channel_2D.timeout   = 100
-    channel_2D.tol       = 0.00001
-    channel_2D.unsteady  = True
-    channel_2D.multizone = True
-    test_list.append(channel_2D)
-
-    # Channel_3D
-    channel_3D           = TestCase('channel_3D')
-    channel_3D.cfg_dir   = "sliding_interface/channel_3D"
-    channel_3D.cfg_file  = "channel_3D_WA.cfg"
-    channel_3D.test_iter = 1
-    channel_3D.test_vals = [1.000000, 0.000000, 1.834878, 1.892644, 1.606895] #last 4 columns
-    channel_3D.su2_exec  = "SU2_CFD"
-    channel_3D.timeout   = 1600
-    channel_3D.tol       = 0.00001
-    channel_3D.unsteady  = True
-    channel_3D.multizone = True
-    test_list.append(channel_3D)
-
-    # Pipe
-    pipe           = TestCase('pipe')
-    pipe.cfg_dir   = "sliding_interface/pipe"
-    pipe.cfg_file  = "pipe_NN.cfg"
-    pipe.test_iter = 2
-    pipe.test_vals = [ -0.341198, -0.045916, 0.800374, 0.699486] #last 4 columns
-    pipe.su2_exec  = "SU2_CFD"
-    pipe.timeout   = 1600
-    pipe.tol       = 0.00001
-    pipe.unsteady  = True
-    pipe.multizone = True
-    test_list.append(pipe)
-    
-    # Rotating cylinders
-    rotating_cylinders           = TestCase('rotating_cylinders')
-    rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
-    rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
-    rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [0.000000,2.018268, 1.942868, 1.696582] #last 4 columns
-    rotating_cylinders.su2_exec  = "SU2_CFD"
-    rotating_cylinders.timeout   = 1600
-    rotating_cylinders.tol       = 0.00001
-    rotating_cylinders.unsteady  = True
-    rotating_cylinders.multizone = True
-    test_list.append(rotating_cylinders)
-    
-    # Supersonic vortex shedding
-    supersonic_vortex_shedding           = TestCase('supersonic_vortex_shedding')
-    supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
-    supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
-    supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 2.162202, 2.304635] #last 4 columns
-    supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
-    supersonic_vortex_shedding.timeout   = 1600
-    supersonic_vortex_shedding.tol       = 0.00001
-    supersonic_vortex_shedding.unsteady  = True
-    supersonic_vortex_shedding.multizone = True
-    test_list.append(supersonic_vortex_shedding)
-    
-    # Bars_SST_2D
-    bars_SST_2D           = TestCase('bars_SST_2D')
-    bars_SST_2D.cfg_dir   = "sliding_interface/bars_SST_2D"
-    bars_SST_2D.cfg_file  = "bars.cfg"
-    bars_SST_2D.test_iter = 13
-    bars_SST_2D.test_vals = [-0.941341, -0.270420, -1.840081,-1.159466] #last 4 columns
-    bars_SST_2D.su2_exec  = "SU2_CFD"
-    bars_SST_2D.timeout   = 1600
-    bars_SST_2D.tol       = 0.00001
-    bars_SST_2D.multizone = True
-    test_list.append(bars_SST_2D)
-    
-    # Sliding mesh with incompressible flows (steady)
-    slinc_steady           = TestCase('slinc_steady')
-    slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
-    slinc_steady.cfg_file  = "config.cfg"
-    slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [19.000000, -1.766116,  -2.206522] #last 3 columns
-    slinc_steady.su2_exec  = "SU2_CFD"
-    slinc_steady.timeout   = 100
-    slinc_steady.tol       = 0.00001
-    slinc_steady.multizone = True
-    test_list.append(slinc_steady)
-    
-    # Sliding mesh with incompressible flows (unsteady)
-    # slinc_unsteady           = TestCase('slinc_unsteady')
-    # slinc_unsteady.cfg_dir   = "sliding_interface/incompressible_unsteady"
-    # slinc_unsteady.cfg_file  = "config.cfg"
-    # slinc_unsteady.test_iter = 19
-    # slinc_unsteady.test_vals = [-3.515218,1.930028,0.000000,0.000000] #last 4 columns
-    # slinc_unsteady.su2_exec  = "SU2_CFD"
-    # slinc_unsteady.timeout   = 100
-    # slinc_unsteady.tol       = 0.00001
-    # slinc_unsteady.unsteady  = True
-    # test_list.append(slinc_unsteady)
-
-    ##########################
-    ### FEA - FSI          ###
-    ##########################
-
-    # Static beam, 3d
-    statbeam3d           = TestCase('statbeam3d')
-    statbeam3d.cfg_dir   = "fea_fsi/StatBeam_3d"
-    statbeam3d.cfg_file  = "configBeam_3d.cfg"
-    statbeam3d.new_output= True
-    statbeam3d.test_iter = 0
-    statbeam3d.test_vals = [-8.498274, -8.230638, -8.123824, 6.4095e+04] #last 4 columns
-    statbeam3d.su2_exec  = "SU2_CFD"
-    statbeam3d.timeout   = 1600
-    statbeam3d.tol       = 0.00001
-    test_list.append(statbeam3d)
-
-    # # Dynamic beam, 2d
-    dynbeam2d           = TestCase('dynbeam2d')
-    dynbeam2d.cfg_dir   = "fea_fsi/DynBeam_2d"
-    dynbeam2d.cfg_file  = "configBeam_2d.cfg"
-    dynbeam2d.unsteady  = True
-    dynbeam2d.new_output= True  
-    dynbeam2d.test_iter = 6 
-    dynbeam2d.test_vals = [0.000000, 0.000000, 0.000000, 66299.000000] #last 4 columns
-    dynbeam2d.su2_exec  = "SU2_CFD"
-    dynbeam2d.timeout   = 1600
-    dynbeam2d.tol       = 0.00001
-    test_list.append(dynbeam2d)
-
-    # # FSI, 2d
-    fsi2d           = TestCase('fsi2d')
-    fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
-    fsi2d.cfg_file  = "configFSI.cfg"
-    fsi2d.test_iter = 4
-    fsi2d.test_vals = [4.000000, 0.000000, -3.578187, -5.758338] #last 4 columns
-    fsi2d.su2_exec  = "SU2_CFD"
-    fsi2d.timeout   = 1600
-    fsi2d.multizone = True
-    fsi2d.unsteady  = True
-    fsi2d.tol       = 0.00001
-    test_list.append(fsi2d)    
-
-    # # FSI, 2D airfoil with RBF interpolation
-    # airfoilRBF           = TestCase('airfoil_fsi_rbf')
-    # airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
-    # airfoilRBF.cfg_file  = "config.cfg"
-    # airfoilRBF.test_iter = 50
-    # airfoilRBF.test_vals = [-8.000964, -2.600088, 0.276433, 0.000824] #last 4 columns
-    # airfoilRBF.su2_exec  = "SU2_CFD"
-    # airfoilRBF.timeout   = 1600
-    # airfoilRBF.tol       = 0.00001
-    # test_list.append(airfoilRBF)
-   
-    # ##########################
-    # ### Zonal multiphysics ###
-    # ##########################
-
-    # CHT incompressible
-    cht_incompressible           = TestCase('cht_incompressible')
-    cht_incompressible.cfg_dir   = "coupled_cht/incompressible"
-    cht_incompressible.cfg_file  = "config.cfg"
-    cht_incompressible.test_iter = 10
-    cht_incompressible.test_vals = [ 10, -1.552349, -6.795633, -3.342894] #last 4 columns
-    cht_incompressible.su2_exec  = "SU2_CFD"
-    cht_incompressible.timeout   = 1600
-    cht_incompressible.multizone = True
-    cht_incompressible.tol       = 0.00001
-    test_list.append(cht_incompressible)
-
-    ######################################
-    ### RUN TESTS                      ###
-    ######################################  
-
-    pass_list = [ test.run_test() for test in test_list ]
-
-    
-    ######################################
-    ### RUN SU2_GEO TESTS              ###
-    ######################################
-    
-    # NACA0012
-    naca0012_geo           = TestCase('naca0012_geo')
-    naca0012_geo.cfg_dir   = "optimization_euler/steady_naca0012"
-    naca0012_geo.cfg_file  = "inv_NACA0012_adv.cfg"
-    naca0012_geo.test_vals = [0.99975, 62.0455, 0.120041, 0.00208202] #chord, LE radius, ToC, Alpha
-    naca0012_geo.su2_exec  = "SU2_GEO"
-    naca0012_geo.timeout   = 1600
-    naca0012_geo.tol       = 0.00001
-    pass_list.append(naca0012_geo.run_geo())
-    test_list.append(naca0012_geo)
-
-    ######################################
-    ### RUN SU2_DEF TESTS              ###
-    ######################################
-    
-    # Inviscid NACA0012 (triangles)
-    naca0012_def            = TestCase('naca0012_def')
-    naca0012_def.cfg_dir   = "deformation/naca0012"
-    naca0012_def.cfg_file  = "def_NACA0012.cfg"
-    naca0012_def.test_iter = 10
-    naca0012_def.test_vals = [0.00344658] #residual
-    naca0012_def.su2_exec  = "SU2_DEF"
-    naca0012_def.timeout   = 1600
-    naca0012_def.tol       = 1e-08
-    
-    pass_list.append(naca0012_def.run_def())
-    test_list.append(naca0012_def)
-    
-    # Inviscid NACA0012 based on SURFACE_FILE input (surface_bump.dat)
-    naca0012_def_file            = TestCase('naca0012_def_file')
-    naca0012_def_file.cfg_dir   = "deformation/naca0012"
-    naca0012_def_file.cfg_file  = "surface_file_NACA0012.cfg"
-    naca0012_def_file.test_iter = 10
-    naca0012_def_file.test_vals = [0.00344658] #residual
-    naca0012_def_file.su2_exec  = "mpirun -n 2 SU2_DEF"
-    naca0012_def_file.timeout   = 1600
-    naca0012_def_file.tol       = 1e-8
-    
-    pass_list.append(naca0012_def_file.run_def())
-    test_list.append(naca0012_def_file)
-    
-    # RAE2822 (mixed tris + quads)
-    rae2822_def            = TestCase('rae2822_def')
-    rae2822_def.cfg_dir   = "deformation/rae2822"
-    rae2822_def.cfg_file  = "def_RAE2822.cfg"
-    rae2822_def.test_iter = 10
-    rae2822_def.test_vals = [7.94218e-09] #residual
-    rae2822_def.su2_exec  = "SU2_DEF"
-    rae2822_def.timeout   = 1600
-    rae2822_def.tol       = 1e-13
-    
-    pass_list.append(rae2822_def.run_def())
-    test_list.append(rae2822_def)
-    
-    # Turb NACA4412 (quads, wall distance)
-    naca4412_def            = TestCase('naca4412_def')
-    naca4412_def.cfg_dir   = "deformation/naca4412"
-    naca4412_def.cfg_file  = "def_NACA4412.cfg"
-    naca4412_def.test_iter = 10
-    naca4412_def.test_vals = [8.855370e-13] #residual
-    naca4412_def.su2_exec  = "SU2_DEF"
-    naca4412_def.timeout   = 1600
-    naca4412_def.tol       = 1e-12
-    
-    pass_list.append(naca4412_def.run_def())
-    test_list.append(naca4412_def)
-
-    # Brick of tets (inverse volume)
-    brick_tets_def            = TestCase('brick_tets_def')
-    brick_tets_def.cfg_dir   = "deformation/brick_tets"
-    brick_tets_def.cfg_file  = "def_brick_tets.cfg"
-    brick_tets_def.test_iter = 10
-    brick_tets_def.test_vals = [8.973010e-04] #residual
-    brick_tets_def.su2_exec  = "SU2_DEF"
-    brick_tets_def.timeout   = 1600
-    brick_tets_def.tol       = 1e-09
-    
-    pass_list.append(brick_tets_def.run_def())
-    test_list.append(brick_tets_def)
-
-    # Brick of isotropic hexas (inverse volume)
-    brick_hex_def           = TestCase('brick_hex_def')
-    brick_hex_def.cfg_dir   = "deformation/brick_hex"
-    brick_hex_def.cfg_file  = "def_brick_hex.cfg"
-    brick_hex_def.test_iter = 10
-    brick_hex_def.test_vals = [2.082100e-04] #residual
-    brick_hex_def.su2_exec  = "SU2_DEF"
-    brick_hex_def.timeout   = 1600
-    brick_hex_def.tol       = 1e-09
-    
-    pass_list.append(brick_hex_def.run_def())
-    test_list.append(brick_hex_def)
-
-    # Brick with a pyramid layer (inverse volume)
-    brick_pyra_def           = TestCase('brick_pyra_def')
-    brick_pyra_def.cfg_dir   = "deformation/brick_pyra"
-    brick_pyra_def.cfg_file  = "def_brick_pyra.cfg"
-    brick_pyra_def.test_iter = 10
-    brick_pyra_def.test_vals = [0.00183115] #residual
-    brick_pyra_def.su2_exec  = "SU2_DEF"
-    brick_pyra_def.timeout   = 1600
-    brick_pyra_def.tol       = 1e-08
-    
-    pass_list.append(brick_pyra_def.run_def())
-    test_list.append(brick_pyra_def)
-
-    # Brick of isotropic prisms (inverse volume)
-    brick_prism_def           = TestCase('brick_prism_def')
-    brick_prism_def.cfg_dir   = "deformation/brick_prism"
-    brick_prism_def.cfg_file  = "def_brick_prism.cfg"
-    brick_prism_def.test_iter = 10
-    brick_prism_def.test_vals = [5.684440e-03] #residual
-    brick_prism_def.su2_exec  = "SU2_DEF"
-    brick_prism_def.timeout   = 1600
-    brick_prism_def.tol       = 1e-08
-    
-    pass_list.append(brick_prism_def.run_def())
-    test_list.append(brick_prism_def)
-    
-    # Brick of prisms with high aspect ratio cells near the wall (wall distance)
-    brick_prism_rans_def           = TestCase('brick_prism_rans_def')
-    brick_prism_rans_def.cfg_dir   = "deformation/brick_prism_rans"
-    brick_prism_rans_def.cfg_file  = "def_brick_prism_rans.cfg"
-    brick_prism_rans_def.test_iter = 10
-    brick_prism_rans_def.test_vals = [2.762780e-07] #residual
-    brick_prism_rans_def.su2_exec  = "SU2_DEF"
-    brick_prism_rans_def.timeout   = 1600
-    brick_prism_rans_def.tol       = 1e-12
-    
-    pass_list.append(brick_prism_rans_def.run_def())
-    test_list.append(brick_prism_rans_def)
-    
-    # Brick of hexas with high aspect ratio cells near the wall (inverse volume)
-    brick_hex_rans_def           = TestCase('brick_hex_rans_def')
-    brick_hex_rans_def.cfg_dir   = "deformation/brick_hex_rans"
-    brick_hex_rans_def.cfg_file  = "def_brick_hex_rans.cfg"
-    brick_hex_rans_def.test_iter = 10
-    brick_hex_rans_def.test_vals = [2.260750e-07] #residual
-    brick_hex_rans_def.su2_exec  = "SU2_DEF"
-    brick_hex_rans_def.timeout   = 1600
-    brick_hex_rans_def.tol       = 1e-12
-    
-    pass_list.append(brick_hex_rans_def.run_def())
-    test_list.append(brick_hex_rans_def)
-
-    # Cylindrical FFD test
-    cylinder_ffd_def           = TestCase('cylinder_ffd_def')
-    cylinder_ffd_def.cfg_dir   = "deformation/cylindrical_ffd"
-    cylinder_ffd_def.cfg_file  = "def_cylindrical.cfg"
-    cylinder_ffd_def.test_iter = 10
-    cylinder_ffd_def.test_vals = [0.000470133] #residual
-    cylinder_ffd_def.su2_exec  = "SU2_DEF"
-    cylinder_ffd_def.timeout   = 1600
-    cylinder_ffd_def.tol       = 1e-09
-
-    pass_list.append(cylinder_ffd_def.run_def())
-    test_list.append(cylinder_ffd_def)
-
-    # Spherical FFD test
-    sphere_ffd_def           = TestCase('sphere_ffd_def')
-    sphere_ffd_def.cfg_dir   = "deformation/spherical_ffd"
-    sphere_ffd_def.cfg_file  = "def_spherical.cfg"
-    sphere_ffd_def.test_iter = 10
-    sphere_ffd_def.test_vals = [0.00356699] #residual
-    sphere_ffd_def.su2_exec  = "SU2_DEF"
-    sphere_ffd_def.timeout   = 1600
-    sphere_ffd_def.tol       = 1e-08
-
-    pass_list.append(sphere_ffd_def.run_def())
-    test_list.append(sphere_ffd_def)
-    
-    # Spherical FFD test using BSplines
-    sphere_ffd_def_bspline           = TestCase('sphere_ffd_def_bspline')
-    sphere_ffd_def_bspline.cfg_dir   = "deformation/spherical_ffd"
-    sphere_ffd_def_bspline.cfg_file  = "def_spherical_bspline.cfg"
-    sphere_ffd_def_bspline.test_iter = 10
-    sphere_ffd_def_bspline.test_vals = [0.00206808] #residual
-    sphere_ffd_def_bspline.su2_exec  = "SU2_DEF"
-    sphere_ffd_def_bspline.timeout   = 1600
-    sphere_ffd_def_bspline.tol       = 1e-08
-
-    pass_list.append(sphere_ffd_def_bspline.run_def())
-    test_list.append(sphere_ffd_def_bspline)
-   
-    ######################################
-    ### RUN PYTHON TESTS               ###
-    ###################################### 
-    
-    # test continuous_adjoint.py
-    contadj_euler_py = TestCase('contadj_euler_py')
-    contadj_euler_py.cfg_dir = "cont_adj_euler/naca0012"
-    contadj_euler_py.cfg_file  = "inv_NACA0012.cfg"
-    contadj_euler_py.test_iter = 10
-    contadj_euler_py.su2_exec  = "continuous_adjoint.py"
-    contadj_euler_py.timeout   = 1600
-    contadj_euler_py.reference_file = "of_grad_cd.dat.ref"
-    contadj_euler_py.test_file = "of_grad_cd.dat"
-    contadj_euler_py.new_output = True
-    pass_list.append(contadj_euler_py.run_filediff())
-    test_list.append(contadj_euler_py)
-
-    # test shape_optimization.py
-    shape_opt_euler_py           = TestCase('shape_opt_euler_py')
-    shape_opt_euler_py.cfg_dir   = "optimization_euler/steady_naca0012"
-    shape_opt_euler_py.cfg_file  = "inv_NACA0012_adv.cfg"
-    shape_opt_euler_py.test_iter = 1
-    shape_opt_euler_py.test_vals = [1, 1, 2.134974E-05, 3.829535E-03] #last 4 columns
-    shape_opt_euler_py.su2_exec  = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
-    shape_opt_euler_py.timeout   = 1600
-    shape_opt_euler_py.new_output = True
-    shape_opt_euler_py.tol       = 0.00001
-    pass_list.append(shape_opt_euler_py.run_opt())
-    test_list.append(shape_opt_euler_py)
-
-    # Multiple functionals with the continuous adjoint
-    contadj_multi_py            = TestCase('contadj_multi_py')
-    contadj_multi_py.cfg_dir    = "cont_adj_euler/wedge"
-    contadj_multi_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
-    contadj_multi_py.test_iter  = 10
-    contadj_multi_py.su2_exec   = "continuous_adjoint.py"
-    contadj_multi_py.timeout    = 1600
-    contadj_multi_py.new_output = True
-    contadj_multi_py.reference_file = "of_grad_combo.dat.ref"
-    contadj_multi_py.test_file  = "of_grad_combo.dat"
-    pass_list.append(contadj_multi_py.run_filediff())
-    test_list.append(contadj_multi_py)
-    
-    # Optimization with multiple objectives, with gradients evaluated individually
-    # the difference in gradient value relative to combined case 
-    # is due to lack of solution file for the adjoint and small number of iterations
-    opt_multiobj_py            = TestCase('opt_multiobj_py')
-    opt_multiobj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_multiobj_py.cfg_file   = "inv_wedge_ROE_multiobj.cfg"
-    opt_multiobj_py.test_iter  = 1
-    opt_multiobj_py.test_vals = [1, 1, 1.084701E+02, 3.799222E+00] #last 4 columns
-    opt_multiobj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
-    opt_multiobj_py.timeout    = 1600
-    opt_multiobj_py.tol       = 0.00001
-    pass_list.append(opt_multiobj_py.run_opt())
-    test_list.append(opt_multiobj_py)
-
-    # test optimization, with multiple objectives and gradient evaluated as 'combo' 
-    opt_multiobjcombo_py            = TestCase('opt_multiobjcombo_py')
-    opt_multiobjcombo_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_multiobjcombo_py.cfg_file   = "inv_wedge_ROE_multiobj_combo.cfg"
-    opt_multiobjcombo_py.test_iter  = 1
-    opt_multiobjcombo_py.test_vals = [1, 1, 1.084701E+02, 3.789322E+00] #last 4 columns
-    opt_multiobjcombo_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT -f"
-    opt_multiobjcombo_py.timeout    = 1600
-    opt_multiobjcombo_py.tol       = 0.00001
-    pass_list.append(opt_multiobjcombo_py.run_opt())
-    test_list.append(opt_multiobjcombo_py)
-
-    # test optimization, with multiple objectives evaluated on a single surface
-    opt_multiobj1surf_py            = TestCase('opt_multiobj1surf_py')
-    opt_multiobj1surf_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_multiobj1surf_py.cfg_file   = "inv_wedge_ROE_multiobj_1surf.cfg"
-    opt_multiobj1surf_py.test_iter  = 1
-    opt_multiobj1surf_py.test_vals = [1, 1, 3.083034E+01, 3.789380E+00] #last 4 columns
-    opt_multiobj1surf_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT  -f"
-    opt_multiobj1surf_py.timeout    = 1600
-    opt_multiobj1surf_py.tol       = 0.00001
-    pass_list.append(opt_multiobj1surf_py.run_opt())
-    test_list.append(opt_multiobj1surf_py)
-
-    # test optimization, with a single objective evaluated on multiple surfaces
-    opt_2surf1obj_py            = TestCase('opt_2surf1obj_py')
-    opt_2surf1obj_py.cfg_dir    = "optimization_euler/multiobjective_wedge"
-    opt_2surf1obj_py.cfg_file   = "inv_wedge_ROE_2surf_1obj.cfg"
-    opt_2surf1obj_py.test_iter  = 1    
-    opt_2surf1obj_py.test_vals = [1.000000, 1.000000, 2.005657, 0.000341] #last 4 columns
-    opt_2surf1obj_py.su2_exec   = "shape_optimization.py -g CONTINUOUS_ADJOINT  -f"
-    opt_2surf1obj_py.timeout    = 1600
-    opt_2surf1obj_py.tol       = 0.00001
-    pass_list.append(opt_2surf1obj_py.run_opt())
-    test_list.append(opt_2surf1obj_py)
-
-    ##########################
-    ###   Python wrapper   ###
-    ##########################
-    
-    # NACA0012 
-    pywrapper_naca0012           = TestCase('pywrapper_naca0012')
-    pywrapper_naca0012.cfg_dir   = "euler/naca0012"
-    pywrapper_naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
-    pywrapper_naca0012.test_iter = 20
-    pywrapper_naca0012.test_vals = [-4.047448, -3.538057, 0.338691, 0.023131] #last 4 columns
-    pywrapper_naca0012.su2_exec  = "SU2_CFD.py -f"
-    pywrapper_naca0012.timeout   = 1600
-    pywrapper_naca0012.tol       = 0.00001
-    test_list.append(pywrapper_naca0012)
-    pass_list.append(pywrapper_naca0012.run_test())
-
-    # NACA0012 (SST, FUN3D results for finest grid: CL=1.0840, CD=0.01253)
-    pywrapper_turb_naca0012_sst           = TestCase('pywrapper_turb_naca0012_sst')
-    pywrapper_turb_naca0012_sst.cfg_dir   = "rans/naca0012"
-    pywrapper_turb_naca0012_sst.cfg_file  = "turb_NACA0012_sst.cfg"
-    pywrapper_turb_naca0012_sst.test_iter = 10
-    pywrapper_turb_naca0012_sst.test_vals = [-12.445710, -6.918658, 1.059622, 0.019138] #last 4 columns
-    pywrapper_turb_naca0012_sst.su2_exec  = "SU2_CFD.py -f"
-    pywrapper_turb_naca0012_sst.timeout   = 3200
-    pywrapper_turb_naca0012_sst.tol       = 0.00001
-    test_list.append(pywrapper_turb_naca0012_sst)
-    pass_list.append(pywrapper_turb_naca0012_sst.run_test())
-
-    # Square cylinder
-    pywrapper_square_cylinder           = TestCase('pywrapper_square_cylinder')
-    pywrapper_square_cylinder.cfg_dir   = "unsteady/square_cylinder"
-    pywrapper_square_cylinder.cfg_file  = "turb_square.cfg"
-    pywrapper_square_cylinder.test_iter = 3
-    pywrapper_square_cylinder.test_vals = [-1.166421, 0.076804, 1.398548, 2.197047] #last 4 columns
-    pywrapper_square_cylinder.su2_exec  = "SU2_CFD.py -f"
-    pywrapper_square_cylinder.timeout   = 1600
-    pywrapper_square_cylinder.tol       = 0.00001
-    pywrapper_square_cylinder.unsteady  = True
-    test_list.append(pywrapper_square_cylinder)
-    pass_list.append(pywrapper_square_cylinder.run_test())
-
-    # Aeroelastic
-    pywrapper_aeroelastic         = TestCase('pywrapper_aeroelastic')
-    pywrapper_aeroelastic.cfg_dir   = "aeroelastic"
-    pywrapper_aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
-    pywrapper_aeroelastic.test_iter = 2
-    pywrapper_aeroelastic.test_vals = [0.077106, 0.036449, -1.684916e-03, -1.131735e-04] #last 4 columns
-    pywrapper_aeroelastic.su2_exec  = "SU2_CFD.py -f"
-    pywrapper_aeroelastic.timeout   = 1600
-    pywrapper_aeroelastic.tol       = 0.000001
-    pywrapper_aeroelastic.unsteady  = True
-    test_list.append(pywrapper_aeroelastic)
-    pass_list.append(pywrapper_aeroelastic.run_test())
-
-    # FSI, 2d
-    pywrapper_fsi2d           = TestCase('pywrapper_fsi2d')
-    pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
-    pywrapper_fsi2d.cfg_file  = "configFSI_2D.cfg"
-    pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [2.000000, 0.500000, -7.780236, -1.142100] #last 4 columns
-    pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
-    pywrapper_fsi2d.timeout   = 1600
-    pywrapper_fsi2d.tol       = 0.00001
-    test_list.append(pywrapper_fsi2d)
-    pass_list.append(pywrapper_fsi2d.run_test())
-
-    # Unsteady CHT
-    pywrapper_unsteadyCHT               = TestCase('pywrapper_unsteadyCHT')
-    pywrapper_unsteadyCHT.cfg_dir       = "py_wrapper/flatPlate_unsteady_CHT"
-    pywrapper_unsteadyCHT.cfg_file      = "unsteady_CHT_FlatPlate_Conf.cfg"
-    pywrapper_unsteadyCHT.test_iter     = 5
-    pywrapper_unsteadyCHT.test_vals     = [-1.598116, 2.263309, 0.001077, 0.145818] #last 4 columns
-    pywrapper_unsteadyCHT.su2_exec      = "python launch_unsteady_CHT_FlatPlate.py -f"
-    pywrapper_unsteadyCHT.timeout       = 1600
-    pywrapper_unsteadyCHT.tol           = 0.00001
-    pywrapper_unsteadyCHT.unsteady      = True
-    test_list.append(pywrapper_unsteadyCHT)
-    pass_list.append(pywrapper_unsteadyCHT.run_test())
-
-    # Rigid motion
-    pywrapper_rigidMotion               = TestCase('pywrapper_rigidMotion')
-    pywrapper_rigidMotion.cfg_dir       = "py_wrapper/flatPlate_rigidMotion"
-    pywrapper_rigidMotion.cfg_file      = "flatPlate_rigidMotion_Conf.cfg"
-    pywrapper_rigidMotion.test_iter     = 5
-    pywrapper_rigidMotion.test_vals     = [-1.598116, 2.259671, -0.040621, 0.144134] #last 4 columns
-    pywrapper_rigidMotion.su2_exec      = "python launch_flatPlate_rigidMotion.py -f"
-    pywrapper_rigidMotion.timeout       = 1600
-    pywrapper_rigidMotion.tol           = 0.00001
-    pywrapper_rigidMotion.unsteady      = True
-    test_list.append(pywrapper_rigidMotion)
-    pass_list.append(pywrapper_rigidMotion.run_test())
-
-    # Tests summary
-    print('==================================================================')
-    print('Summary of the serial tests')
-    print('python version:', sys.version)
-    for i, test in enumerate(test_list):
-        if (pass_list[i]):
-            print('  passed - %s'%test.tag)
-        else:
-            print('* FAILED - %s'%test.tag)
-    
-    if all(pass_list):
-        sys.exit(0)
-    else:
-        sys.exit(1)
-    # done
-
-if __name__ == '__main__':
-    main()

From d2a69c1bf2abe3350110813ed0965cc8584395f2 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:53:10 +0200
Subject: [PATCH 506/539] Regression test val change for adj pitching NACA0012

The old TestCases.py script did not properly change TIME_ITER.
So the seeding (which is the number of time iterations) was wrong.
Also reduced the number of inner iterations. Made sure that results
are exactly the same as develop.
---
 .../naca0012_pitching/inv_NACA0012_pitching.cfg               | 4 ++--
 TestCases/parallel_regression_AD.py                           | 2 +-
 TestCases/serial_regression_AD.py                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index 23f56b1b2f51..871cca2b876b 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -11,8 +11,8 @@ MATH_PROBLEM= DISCRETE_ADJOINT
 % Restart solution (NO, YES)
 RESTART_SOL= NO
 SINGLEZONE_DRIVER= YES
-TIME_ITER= 151
-INNER_ITER= 350
+TIME_ITER= 5
+INNER_ITER= 50
 
 %EXT_ITER= 151
 %UNST_INT_ITER= 110
diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
index 8229cb58a469..413b099e0985 100644
--- a/TestCases/parallel_regression_AD.py
+++ b/TestCases/parallel_regression_AD.py
@@ -208,7 +208,7 @@ def main():
     discadj_pitchingNACA0012.cfg_dir   = "disc_adj_euler/naca0012_pitching"
     discadj_pitchingNACA0012.cfg_file  = "inv_NACA0012_pitching.cfg"
     discadj_pitchingNACA0012.test_iter = 4
-    discadj_pitchingNACA0012.test_vals = [-2.638190, -3.106640, -7.0756e-04, 1.6333e-06] #last 4 columns
+    discadj_pitchingNACA0012.test_vals = [ -1.158032, -1.626499, -2.1372e-02, 4.9309e-05] #last 4 columns
     discadj_pitchingNACA0012.su2_exec  = "parallel_computation.py -f"
     discadj_pitchingNACA0012.timeout   = 1600
     discadj_pitchingNACA0012.tol       = 0.00001
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 813402afb173..6643b0ac760e 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -208,7 +208,7 @@ def main():
     discadj_pitchingNACA0012.cfg_dir   = "disc_adj_euler/naca0012_pitching"
     discadj_pitchingNACA0012.cfg_file  = "inv_NACA0012_pitching.cfg"
     discadj_pitchingNACA0012.test_iter = 4
-    discadj_pitchingNACA0012.test_vals = [-2.641237, -3.110423, -7.0498e-04, 1.2996e-06] #last 4 columns
+    discadj_pitchingNACA0012.test_vals = [-1.161102, -1.630297, -2.1294e-02, 3.9226e-05] #last 4 columns
     discadj_pitchingNACA0012.su2_exec  = "SU2_CFD_AD"
     discadj_pitchingNACA0012.timeout   = 1600
     discadj_pitchingNACA0012.tol       = 0.00001

From 13c3b03f88bd13808724ddafb156686c4bee6c26 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:55:57 +0200
Subject: [PATCH 507/539] Moved allocation of historyFileTable to constructor

---
 SU2_CFD/src/output/COutput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index c0251e7125bc..77ad7b0e2b83 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -65,6 +65,7 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
   convergenceTable = new PrintingToolbox::CTablePrinter(&std::cout);
   multiZoneHeaderTable = new PrintingToolbox::CTablePrinter(&std::cout);
   fileWritingTable = new PrintingToolbox::CTablePrinter(&std::cout);
+  historyFileTable = new PrintingToolbox::CTablePrinter(&histFile, "");  
   
   /*--- Set default filenames ---*/
   
@@ -1031,7 +1032,6 @@ void COutput::PrepareHistoryFile(CConfig *config){
   
   /*--- Create and format the history file table ---*/
   
-  historyFileTable = new PrintingToolbox::CTablePrinter(&histFile, "");
   historyFileTable->SetInnerSeparator(historySep);
   historyFileTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
   historyFileTable->SetPrintHeaderTopLine(false);

From e09b6e0a899a650ff14aee4a5763280168e26404 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 13:58:59 +0200
Subject: [PATCH 508/539] Moved time averaged fields to separate routines

---
 SU2_CFD/include/output/CFlowOutput.hpp | 30 +++++++++
 SU2_CFD/include/output/COutput.hpp     |  8 ++-
 SU2_CFD/src/output/CFlowCompOutput.cpp | 87 +++-----------------------
 SU2_CFD/src/output/CFlowOutput.cpp     | 68 ++++++++++++++++++++
 4 files changed, 114 insertions(+), 79 deletions(-)

diff --git a/SU2_CFD/include/output/CFlowOutput.hpp b/SU2_CFD/include/output/CFlowOutput.hpp
index 792f4de345b3..f5d0e3aa1f5b 100644
--- a/SU2_CFD/include/output/CFlowOutput.hpp
+++ b/SU2_CFD/include/output/CFlowOutput.hpp
@@ -38,6 +38,7 @@
 #pragma once
 
 #include "COutput.hpp"
+#include "../variables/CVariable.hpp"
 
 class CFlowOutput : public COutput{
 public:
@@ -102,9 +103,38 @@ class CFlowOutput : public COutput{
    */
   void WriteMetaData(CConfig *config, CGeometry *geometry);
   
+  /*!
+   * \brief Write any additional files defined for the current solver.
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
   void WriteAdditionalFiles(CConfig *config, CGeometry *geometry, CSolver **solver_container) override;
   
+  /*!
+   * \brief Determines if the the volume output should be written.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] Iter - Current iteration index.
+   */
   bool WriteVolume_Output(CConfig *config, unsigned long Iter) override;
   
+  /*!
+   * \brief Write the forces breakdown file
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
   void WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSolver **solver_container);
+  
+  /*!
+   * \brief Set the time averaged output fields.
+   */
+  void SetTimeAveragedFields();
+  
+  /*!
+   * \brief Load the time averaged output fields.
+   * \param iPoint
+   * \param node_flow
+   */
+  void LoadTimeAveragedData(unsigned long iPoint, CVariable *node_flow);
 };
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 6606c4a2b804..25fc42fb1fae 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -679,7 +679,7 @@ class COutput {
   virtual bool WriteScreen_Output(CConfig *config);
 
   /*!
-   * \brief Determines if the screen header should be written.
+   * \brief Determines if the the volume output should be written.
    * \param[in] config - Definition of the particular problem.
    * \param[in] Iter - Current iteration index.
    */
@@ -765,6 +765,12 @@ class COutput {
    */
   inline virtual void SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {}
   
+  /*!
+   * \brief Write any additional files defined for the current solver.
+   * \param[in] config - Definition of the particular problem per zone.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - The container holding all solution data.
+   */
   inline virtual void WriteAdditionalFiles(CConfig *config, CGeometry* geometry, CSolver** solver_container){}
 
 };
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index d8d65041f281..95481be04a52 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -389,38 +389,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   }
   
   if (config->GetTime_Domain()){
-    AddVolumeOutput("MEAN_DENSITY", "MeanDensity", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("MEAN_VELOCITY-X", "MeanVelocity_x", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("MEAN_VELOCITY-Y", "MeanVelocity_y", "TAVG_SOLUTION", "Time-averaged value of the density");
-    if (nDim == 3)
-      AddVolumeOutput("MEAN_VELOCITY-Z", "MeanVelocity_z", "TAVG_SOLUTION", "Time-averaged value of the density");
-    if (nDim == 3){
-      AddVolumeOutput("MEAN_ENERGY", "MeanEnergy", "TAVG_SOLUTION", "Time-averaged value of the density");
-    }
-    else {
-      AddVolumeOutput("MEAN_ENERGY", "MeanEnergy", "TAVG_SOLUTION", "Time-averaged value of the density");    
-    }
-    AddVolumeOutput("MEAN_PRESSURE", "MeanPressure", "TAVG_SOLUTION", "Time-averaged value of the density");
-    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      AddVolumeOutput("MEAN_ROE_DISSIPATION", "MeanRoe_Dissipation", "TAVG_SOLUTION", "Time-averaged value of the density");
-    }  
-    
-    AddVolumeOutput("RMS_U",   "RMSVelocity_x", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("RMS_V",   "RMSVelocity_y", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("RMS_UV",  "RMSUV",         "TAVG_SOLUTION", "Time-averaged value of the density");    
-    AddVolumeOutput("RMS_P",   "RMSPressure",   "TAVG_SOLUTION", "Time-average value pf pressure");
-    AddVolumeOutput("UUPRIME", "UUPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("VVPRIME", "VVPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("UVPRIME", "UVPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-    AddVolumeOutput("PPRIME",  "PPrimeMean",   "TAVG_SOLUTION", "Time-averaged value of the density");
-    if (nDim == 3){
-      AddVolumeOutput("RMS_W",   "RMSVelocity_z", "TAVG_SOLUTION", "Time-averaged value of the density");
-      AddVolumeOutput("RMS_UW", "RMSUW", "TAVG_SOLUTION", "Time-averaged value of the density");
-      AddVolumeOutput("RMS_VW", "RMSVW", "TAVG_SOLUTION", "Time-averaged value of the density");
-      AddVolumeOutput("WWPRIME", "WWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-      AddVolumeOutput("UWPRIME", "UWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-      AddVolumeOutput("VWPRIME", "VWPrimeMean", "TAVG_SOLUTION", "Time-averaged value of the density");
-    }
+    SetTimeAveragedFields();
   }
 }
 
@@ -464,6 +433,13 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
     break;
   }
   
+  if (config->GetGrid_Movement()){
+    SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel()[0]);
+    SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel()[1]);
+    if (nDim == 3)
+      SetVolumeOutputValue("GRID_VELOCITY-Z", iPoint, Node_Geo->GetGridVel()[2]);
+  }
+  
   SetVolumeOutputValue("PRESSURE", iPoint, Node_Flow->GetPressure());
   SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetTemperature());
   SetVolumeOutputValue("MACH", iPoint, sqrt(Node_Flow->GetVelocity2())/Node_Flow->GetSoundSpeed());
@@ -551,52 +527,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   }
   
   if (config->GetTime_Domain()){
-    SetAvgVolumeOutputValue("MEAN_DENSITY", iPoint, Node_Flow->GetSolution(0));
-    SetAvgVolumeOutputValue("MEAN_VELOCITY-X", iPoint, Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0));
-    SetAvgVolumeOutputValue("MEAN_VELOCITY-Y", iPoint, Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0));
-    if (nDim == 3)
-      SetAvgVolumeOutputValue("MEAN_VELOCITY-Z", iPoint, Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0));
-    if (nDim == 3){
-      SetAvgVolumeOutputValue("MEAN_ENERGY", iPoint, Node_Flow->GetSolution(4));
-    } else {
-      SetAvgVolumeOutputValue("MEAN_ENERGY", iPoint, Node_Flow->GetSolution(3));    
-    }
-    SetAvgVolumeOutputValue("MEAN_PRESSURE", iPoint, Node_Flow->GetPressure());
-    if (config->GetKind_RoeLowDiss() != NO_ROELOWDISS){
-      SetAvgVolumeOutputValue("MEAN_ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation());
-    }  
-    
-    SetAvgVolumeOutputValue("RMS_U", iPoint, pow(Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0),2));
-    SetAvgVolumeOutputValue("RMS_V", iPoint, pow(Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0),2));
-    SetAvgVolumeOutputValue("RMS_UV", iPoint, (Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0)));
-    SetAvgVolumeOutputValue("RMS_P", iPoint, pow(Node_Flow->GetPressure(),2));
-    if (nDim == 3){
-      SetAvgVolumeOutputValue("RMS_W", iPoint, pow(Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0),2));
-      SetAvgVolumeOutputValue("RMS_VW", iPoint, (Node_Flow->GetSolution(2)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0)));
-      SetAvgVolumeOutputValue("RMS_UW", iPoint, (Node_Flow->GetSolution(1)/Node_Flow->GetSolution(0)) * (Node_Flow->GetSolution(3)/Node_Flow->GetSolution(0)));
-    }
-    
-    const su2double umean  = GetVolumeOutputValue("MEAN_VELOCITY-X", iPoint);
-    const su2double uumean = GetVolumeOutputValue("RMS_U", iPoint);    
-    const su2double vmean  = GetVolumeOutputValue("MEAN_VELOCITY-Y", iPoint);
-    const su2double vvmean = GetVolumeOutputValue("RMS_V", iPoint);    
-    const su2double uvmean = GetVolumeOutputValue("RMS_UV", iPoint);
-    const su2double pmean  = GetVolumeOutputValue("MEAN_PRESSURE", iPoint);
-    const su2double ppmean = GetVolumeOutputValue("RMS_P", iPoint);
-    
-    SetVolumeOutputValue("UUPRIME", iPoint, -(umean*umean - uumean));
-    SetVolumeOutputValue("VVPRIME", iPoint, -(vmean*vmean - vvmean));
-    SetVolumeOutputValue("UVPRIME", iPoint, -(umean*vmean - uvmean));
-    SetVolumeOutputValue("PPRIME",  iPoint, -(pmean*pmean - ppmean));
-    if (nDim == 3){
-      const su2double wmean  = GetVolumeOutputValue("MEAN_VELOCITY-Z", iPoint);
-      const su2double wwmean = GetVolumeOutputValue("RMS_W", iPoint);
-      const su2double uwmean = GetVolumeOutputValue("RMS_UW", iPoint);
-      const su2double vwmean = GetVolumeOutputValue("RMS_VW", iPoint);
-      SetVolumeOutputValue("WWPRIME", iPoint, -(wmean*wmean - wwmean));
-      SetVolumeOutputValue("UWPRIME", iPoint, -(umean*wmean - uwmean));
-      SetVolumeOutputValue("VWPRIME",  iPoint, -(vmean*wmean - vwmean));
-    } 
+    LoadTimeAveragedData(iPoint, Node_Flow);
   }
 }
 
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 582b1253a4fc..694c3c66460c 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -2825,3 +2825,71 @@ bool CFlowOutput::WriteVolume_Output(CConfig *config, unsigned long Iter){
   
   return false;
 }
+
+void CFlowOutput::SetTimeAveragedFields(){
+  AddVolumeOutput("MEAN_DENSITY", "MeanDensity", "TIME_AVERAGE", "Mean density");
+  AddVolumeOutput("MEAN_VELOCITY-X", "MeanVelocity_x", "TIME_AVERAGE", "Mean velocity x-component");
+  AddVolumeOutput("MEAN_VELOCITY-Y", "MeanVelocity_y", "TIME_AVERAGE", "Mean velocity y-component");
+  if (nDim == 3)
+    AddVolumeOutput("MEAN_VELOCITY-Z", "MeanVelocity_z", "TIME_AVERAGE", "Mean velocity z-component");
+
+  AddVolumeOutput("MEAN_PRESSURE", "MeanPressure", "TIME_AVERAGE", "Mean pressure");
+  AddVolumeOutput("RMS_U",   "RMS[u]", "TIME_AVERAGE", "RMS u");
+  AddVolumeOutput("RMS_V",   "RMS[v]", "TIME_AVERAGE", "RMS v");
+  AddVolumeOutput("RMS_UV",  "RMS[uv]", "TIME_AVERAGE", "RMS uv");    
+  AddVolumeOutput("RMS_P",   "RMS[Pressure]",   "TIME_AVERAGE", "RMS Pressure");
+  AddVolumeOutput("UUPRIME", "u'u'", "TIME_AVERAGE", "Mean Reynolds-stress component u'u'");
+  AddVolumeOutput("VVPRIME", "v'v'", "TIME_AVERAGE", "Mean Reynolds-stress component v'v'");
+  AddVolumeOutput("UVPRIME", "u'v'", "TIME_AVERAGE", "Mean Reynolds-stress component u'v'");
+  AddVolumeOutput("PPRIME",  "p'p'",   "TIME_AVERAGE", "Mean pressure fluctuation p'p'");
+  if (nDim == 3){
+    AddVolumeOutput("RMS_W",   "RMS[w]", "TIME_AVERAGE", "RMS u");
+    AddVolumeOutput("RMS_UW", "RMS[uw]", "TIME_AVERAGE", "RMS uw");
+    AddVolumeOutput("RMS_VW", "RMS[vw]", "TIME_AVERAGE", "RMS vw");
+    AddVolumeOutput("WWPRIME", "w'w'", "TIME_AVERAGE", "Mean Reynolds-stress component w'w'");
+    AddVolumeOutput("UWPRIME", "w'u'", "TIME_AVERAGE", "Mean Reynolds-stress component w'u'");
+    AddVolumeOutput("VWPRIME", "w'v'", "TIME_AVERAGE", "Mean Reynolds-stress component w'v'");
+  }
+}
+
+void CFlowOutput::LoadTimeAveragedData(unsigned long iPoint, CVariable *Node_Flow){
+  SetAvgVolumeOutputValue("MEAN_DENSITY", iPoint, Node_Flow->GetDensity());
+  SetAvgVolumeOutputValue("MEAN_VELOCITY-X", iPoint, Node_Flow->GetVelocity(0));
+  SetAvgVolumeOutputValue("MEAN_VELOCITY-Y", iPoint, Node_Flow->GetVelocity(1));
+  if (nDim == 3)
+    SetAvgVolumeOutputValue("MEAN_VELOCITY-Z", iPoint, Node_Flow->GetVelocity(2));
+ 
+  SetAvgVolumeOutputValue("MEAN_PRESSURE", iPoint, Node_Flow->GetPressure());
+
+  SetAvgVolumeOutputValue("RMS_U", iPoint, pow(Node_Flow->GetVelocity(0),2));
+  SetAvgVolumeOutputValue("RMS_V", iPoint, pow(Node_Flow->GetVelocity(1),2));
+  SetAvgVolumeOutputValue("RMS_UV", iPoint, Node_Flow->GetVelocity(0) * Node_Flow->GetVelocity(1));
+  SetAvgVolumeOutputValue("RMS_P", iPoint, pow(Node_Flow->GetPressure(),2));
+  if (nDim == 3){
+    SetAvgVolumeOutputValue("RMS_W", iPoint, pow(Node_Flow->GetVelocity(2),2));
+    SetAvgVolumeOutputValue("RMS_VW", iPoint, Node_Flow->GetVelocity(2) * Node_Flow->GetVelocity(1));
+    SetAvgVolumeOutputValue("RMS_UW", iPoint,  Node_Flow->GetVelocity(2) * Node_Flow->GetVelocity(0));
+  }
+  
+  const su2double umean  = GetVolumeOutputValue("MEAN_VELOCITY-X", iPoint);
+  const su2double uumean = GetVolumeOutputValue("RMS_U", iPoint);    
+  const su2double vmean  = GetVolumeOutputValue("MEAN_VELOCITY-Y", iPoint);
+  const su2double vvmean = GetVolumeOutputValue("RMS_V", iPoint);    
+  const su2double uvmean = GetVolumeOutputValue("RMS_UV", iPoint);
+  const su2double pmean  = GetVolumeOutputValue("MEAN_PRESSURE", iPoint);
+  const su2double ppmean = GetVolumeOutputValue("RMS_P", iPoint);
+  
+  SetVolumeOutputValue("UUPRIME", iPoint, -(umean*umean - uumean));
+  SetVolumeOutputValue("VVPRIME", iPoint, -(vmean*vmean - vvmean));
+  SetVolumeOutputValue("UVPRIME", iPoint, -(umean*vmean - uvmean));
+  SetVolumeOutputValue("PPRIME",  iPoint, -(pmean*pmean - ppmean));
+  if (nDim == 3){
+    const su2double wmean  = GetVolumeOutputValue("MEAN_VELOCITY-Z", iPoint);
+    const su2double wwmean = GetVolumeOutputValue("RMS_W", iPoint);
+    const su2double uwmean = GetVolumeOutputValue("RMS_UW", iPoint);
+    const su2double vwmean = GetVolumeOutputValue("RMS_VW", iPoint);
+    SetVolumeOutputValue("WWPRIME", iPoint, -(wmean*wmean - wwmean));
+    SetVolumeOutputValue("UWPRIME", iPoint, -(umean*wmean - uwmean));
+    SetVolumeOutputValue("VWPRIME",  iPoint, -(vmean*wmean - vwmean));
+  } 
+}

From 82e281042d4a85da676abcf73d3134315ad0898f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 16:32:21 +0200
Subject: [PATCH 509/539] Fixed performance computation

---
 SU2_CFD/src/drivers/CMultizoneDriver.cpp      | 17 +++++++++++---
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     | 23 +++++++++++++++----
 .../filewriter/CSU2BinaryFileWriter.cpp       | 10 --------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index f0df45300c43..e1f40db9d990 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -471,6 +471,18 @@ void CMultizoneDriver::Update() {
 
 void CMultizoneDriver::Output(unsigned long TimeIter) {
   
+  /*--- Time the output for performance benchmarking. ---*/
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTimeCompute += StopTime-StartTime;
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
   
   bool wrote_files = false;
   
@@ -481,8 +493,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
   }
   
   if (wrote_files){
-
-    /*--- Store output time and restart the timer for the compute phase. ---*/
+    
 #ifndef HAVE_MPI
     StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
@@ -496,7 +507,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
 #else
     StartTime = MPI_Wtime();
 #endif
-
+    config_container[ZONE_0]->Set_StartTime(StartTime);
   }
 
 }
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 288f4bc99381..8c3fa1fd8859 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -189,13 +189,25 @@ void CSinglezoneDriver::Update() {
 
 void CSinglezoneDriver::Output(unsigned long TimeIter) {
 
-  
+  /*--- Time the output for performance benchmarking. ---*/
+#ifndef HAVE_MPI
+  StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StopTime = MPI_Wtime();
+#endif
+  UsedTimeCompute += StopTime-StartTime;
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+    
   bool wrote_files = output_container[ZONE_0]->SetResult_Files(geometry_container[ZONE_0][INST_0][MESH_0],
                                                                config_container[ZONE_0],
                                                                solver_container[ZONE_0][INST_0][MESH_0], TimeIter, StopCalc);
   
   if (wrote_files){
-    /*--- Store output time and restart the timer for the compute phase. ---*/
+    
 #ifndef HAVE_MPI
     StopTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
@@ -204,9 +216,6 @@ void CSinglezoneDriver::Output(unsigned long TimeIter) {
     UsedTimeOutput += StopTime-StartTime;
     OutputCount++;
     BandwidthSum = config_container[ZONE_0]->GetRestart_Bandwidth_Agg();
-    
-    
-    
 #ifndef HAVE_MPI
     StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
 #else
@@ -291,6 +300,10 @@ bool CSinglezoneDriver::Monitor(unsigned long TimeIter){
   /*--- Reset the inner convergence --- */
   
   output_container[ZONE_0]->SetConvergence(false);
+  
+  /*--- Increase the total iteration count --- */
+  
+  IterCount += config_container[ZONE_0]->GetInnerIter()+1;
 
   return StopCalc;
 }
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 18dca558764f..f1371cf45aef 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -217,15 +217,5 @@ void CSU2BinaryFileWriter::Write_Data(){
   /*--- Compute and store the bandwidth ---*/
   
   Bandwidth = file_size/(1.0e6)/UsedTime;
-//  config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+Bandwidth);
-  
-//  if ((rank == MASTER_NODE) && (wrt_perf)) {
-//    cout << "Wrote " << file_size/1.0e6 << " MB to disk in ";
-//    cout << UsedTime << " s. (" << Bandwidth << " MB/s)." << endl;
-//  }
-  
-  /*--- Free temporary data buffer for writing the binary file. ---*/
-
-//  delete [] buf;
 
 }

From 7cf3d3a907405e7445bf98ab9605423321658c8d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 25 Sep 2019 16:32:53 +0200
Subject: [PATCH 510/539] Disabled file writing summary if no files are written

---
 SU2_CFD/src/output/COutput.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 77ad7b0e2b83..eb579c04b8c6 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -676,15 +676,16 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
     /*--- Partition and sort the data --- */
     
     volumeDataSorter->SortOutputData();    
+   
+    unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
+    unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
     
-    if (rank == MASTER_NODE){
+    if (rank == MASTER_NODE && nVolumeFiles != 0){
       fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);    
       fileWritingTable->PrintHeader();
       fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);    
     }
-    unsigned short nVolumeFiles = config->GetnVolumeOutputFiles();
-    unsigned short *VolumeFiles = config->GetVolumeOutputFiles();
-        
+    
     /*--- Loop through all requested output files ---*/
     
     for (unsigned short iFile = 0; iFile < nVolumeFiles; iFile++){
@@ -693,7 +694,7 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
 
     }
     
-    if (rank == MASTER_NODE){
+    if (rank == MASTER_NODE && nVolumeFiles != 0){
       fileWritingTable->PrintFooter();
       headerNeeded = true;
     }

From 438cf55c08c3ba33f4f08fc99c375dbbcecc5249 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 09:41:30 +0200
Subject: [PATCH 511/539] Removed FSI driver

---
 SU2_CFD/include/drivers/CDriver.hpp | 106 ------
 SU2_CFD/src/SU2_CFD.cpp             |   4 -
 SU2_CFD/src/drivers/CDriver.cpp     | 491 ----------------------------
 3 files changed, 601 deletions(-)

diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index ba62d338cf38..51d2de3a1566 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -1102,112 +1102,6 @@ class CHBDriver : public CFluidDriver {
   void ResetConvergence();
 };
 
-
-/*!
- * \class CFSIDriver
- * \brief Class for driving a BGS iteration for a fluid-structure interaction problem in multiple zones.
- * \author R. Sanchez.
- */
-class CFSIDriver : public CDriver {
-
-  su2double *init_res_flow,     /*!< \brief Stores the initial residual for the flow. */
-            *init_res_struct,   /*!< \brief Stores the initial residual for the structure. */
-            *residual_flow,     /*!< \brief Stores the current residual for the flow. */
-            *residual_struct,   /*!< \brief Stores the current residual for the structure. */
-            *residual_flow_rel,
-            *residual_struct_rel;
-
-  su2double flow_criteria,
-            flow_criteria_rel,
-            structure_criteria,
-            structure_criteria_rel;
-
-public:
-
-  /*!
-   * \brief Constructor of the class.
-   * \param[in] confFile - Configuration file name.
-   * \param[in] val_nZone - Total number of zones.
-   * \param[in] MPICommunicator - MPI communicator for SU2.
-   */
-  CFSIDriver(char* confFile,
-             unsigned short val_nZone,
-             SU2_Comm MPICommunicator);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CFSIDriver(void);
-
-  /*!
-   * \brief Run a Block Gauss-Seidel iteration of the FSI problem.
-   */
-  void Run();
-
-  /*!
-   * \brief Predict the structural displacements to pass them into the fluid solver on a BGS implementation.
-   * \param[in] donorZone - zone in which the displacements will be predicted.
-   * \param[in] targetZone - zone which receives the predicted displacements.
-   */
-  void Predict_Displacements(unsigned short donorZone, unsigned short targetZone);
-
-  /*!
-   * \brief Predict the fluid tractions to pass them into the structural solver on a BGS implementation.
-   * \param[in] donorZone - zone in which the tractions will be predicted.
-   * \param[in] targetZone - zone which receives the predicted traction.
-   */
-  void Predict_Tractions(unsigned short donorZone, unsigned short targetZone);
-
-  /*!
-   * \brief Transfer the displacements computed on the structural solver into the fluid solver.
-   * \param[in] donorZone - zone in which the displacements will be transferred.
-   * \param[in] targetZone - zone which receives the tractions transferred.
-   */
-  void Transfer_Displacements(unsigned short donorZone, unsigned short targetZone);
-
-  /*!
-   * \brief Transfer the tractions computed on the fluid solver into the structural solver.
-   * \param[in] donorZone - zone from which the tractions will be transferred.
-   * \param[in] targetZone - zone which receives the tractions transferred.
-   */
-  void Transfer_Tractions(unsigned short donorZone, unsigned short targetZone);
-
-  /*!
-   * \brief Apply a relaxation method into the computed displacements.
-   * \param[in] donorZone - origin of the information.
-   * \param[in] targetZone - destination of the information.
-   * \param[in] iOuterIter - Fluid-Structure Interaction subiteration.
-   */
-  void Relaxation_Displacements(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter);
-
-  /*!
-   * \brief Apply a relaxation method into the computed tractions.
-   * \param[in] donorZone - origin of the information.
-   * \param[in] targetZone - destination of the information.
-   * \param[in] iOuterIter - Fluid-Structure Interaction subiteration.
-   */
-  void Relaxation_Tractions(unsigned short donorZone, unsigned short targetZone, unsigned long iOuterIter);
-
-  /*!
-   * \brief Check the convergence of BGS subiteration process
-   * \param[in] ZONE_FLOW - zone of the fluid solver.
-   * \param[in] ZONE_STRUCT - zone of the structural solver.
-   * \param[in] kind_recording - kind of recording (flow, structure, mesh, cross terms)
-   */
-  bool BGSConvergence(unsigned long IntIter, unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT);
-
-  /*!
-   * \brief Enforce the coupling condition at the end of the time step
-   */
-  void Update(void);
-
-  /*!
-   * \brief Overload, does nothing but avoids dynamic mesh updates in FSI problems before the iteration
-   */
-  void DynamicMeshUpdate(unsigned long TimeIter);
-
-};
-
 /*!
  * \class CDiscAdjFSIDriver
  * \brief Overload: Class for driving a discrete adjoint FSI iteration.
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 90ab794b600c..7f94c3c0125f 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -150,10 +150,6 @@ int main(int argc, char *argv[]) {
           SU2_MPI::Error("WARNING: There is no discrete adjoint implementation for dynamic FSI. ", CURRENT_FUNCTION);
         }
       }
-      /*--- If the problem is a direct FSI problem ---*/
-      else{
-        driver = new CFSIDriver(config_file_name, nZone, MPICommunicator);
-      }
       
     } else {
       
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 6b8e7d66b49f..f44405af326b 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -5012,497 +5012,6 @@ void CHBDriver::ComputeHB_Operator() {
 
 }
 
-CFSIDriver::CFSIDriver(char* confFile,
-                       unsigned short val_nZone,
-                       SU2_Comm MPICommunicator) : CDriver(confFile,
-                                                           val_nZone,
-                                                           MPICommunicator,
-                                                           false) {
-  unsigned short iVar;
-  unsigned short nVar_Flow = 0, nVar_Struct = 0;
-
-//  unsigned short iZone;
-//  for (iZone = 0; iZone < nZone; iZone++){
-//    switch (config_container[iZone]->GetKind_Solver()) {
-//       case RANS: case EULER: case NAVIER_STOKES:
-//      case INC_RANS: case INC_EULER: case INC_NAVIER_STOKES:   
-//         nVar_Flow = solver_container[iZone][INST_0][MESH_0][FLOW_SOL]->GetnVar();
-//         flow_criteria = config_container[iZone]->GetMinLogResidual_BGS_F();
-//         flow_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_F();
-//         break;
-//       case FEM_ELASTICITY:
-//         nVar_Struct = solver_container[iZone][INST_0][MESH_0][FEA_SOL]->GetnVar();
-//         structure_criteria    = config_container[iZone]->GetMinLogResidual_BGS_S();
-//         structure_criteria_rel = config_container[iZone]->GetOrderMagResidual_BGS_S();
-//         break;
-//    }
-//  }
-
-  init_res_flow   = new su2double[nVar_Flow];
-  init_res_struct = new su2double[nVar_Struct];
-
-  residual_flow   = new su2double[nVar_Flow];
-  residual_struct = new su2double[nVar_Struct];
-
-  residual_flow_rel   = new su2double[nVar_Flow];
-  residual_struct_rel = new su2double[nVar_Struct];
-
-  for (iVar = 0; iVar < nVar_Flow; iVar++){
-    init_res_flow[iVar] = 0.0;
-    residual_flow[iVar] = 0.0;
-    residual_flow_rel[iVar] = 0.0;
-  }
-  for (iVar = 0; iVar < nVar_Struct; iVar++){
-    init_res_struct[iVar] = 0.0;
-    residual_struct[iVar] = 0.0;
-    residual_struct_rel[iVar] = 0.0;
-  }
-
-}
-
-CFSIDriver::~CFSIDriver(void) {
-
-  delete [] init_res_flow;
-  delete [] init_res_struct;
-  delete [] residual_flow;
-  delete [] residual_struct;
-  delete [] residual_flow_rel;
-  delete [] residual_struct_rel;
-
-}
-
-void CFSIDriver::Run() {
-
-  /*--- As of now, we are coding it for just 2 zones. ---*/
-  /*--- This will become more general, but we need to modify the configuration for that ---*/
-  unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
-  unsigned short iZone;
-
-  /*--- Boolean to determine if we are running a static or dynamic case ---*/
-  bool stat_fsi = (!config_container[ZONE_STRUCT]->GetTime_Domain());
-  bool dyn_fsi = (((config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_1ST) || (config_container[ZONE_FLOW]->GetTime_Marching() == DT_STEPPING_2ND))
-                   && (config_container[ZONE_STRUCT]->GetTime_Domain()));
-
-  unsigned long IntIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetInnerIter(IntIter);
-  unsigned long OuterIter = 0; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
-  unsigned long nOuterIter = config_container[ZONE_FLOW]->GetnIterFSI();
-  unsigned long nIntIter;
-
-  bool Convergence = false;
-
-  bool StopCalc_Flow = false;
-
-  /*--- Be careful with whether or not we load the coords and grid velocity
-   from the restart files... this needs to be standardized for the different
-   solvers, in particular with FSI. ---*/
-
-  /*-----------------------------------------------------------------*/
-  /*---------------- Predict structural displacements ---------------*/
-  /*-----------------------------------------------------------------*/
-
-  Predict_Displacements(ZONE_STRUCT, ZONE_FLOW);
-
-  while (OuterIter < nOuterIter) {
-
-    /*-----------------------------------------------------------------*/
-    /*------------------- Transfer Displacements ----------------------*/
-    /*-----------------------------------------------------------------*/
-  if(interface_container[ZONE_STRUCT][ZONE_FLOW] != NULL)
-      Transfer_Displacements(ZONE_STRUCT, ZONE_FLOW);
-
-    /*-----------------------------------------------------------------*/
-    /*--------------------- Mesh deformation --------------------------*/
-    /*-----------------------------------------------------------------*/
-
-  iteration_container[ZONE_FLOW][INST_0]->SetGrid_Movement(geometry_container[ZONE_FLOW][INST_0], 
-                                                           surface_movement[ZONE_FLOW], grid_movement[ZONE_FLOW][INST_0],
-                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, TimeIter );
-
-    /*-----------------------------------------------------------------*/
-    /*-------------------- Fluid subiteration -------------------------*/
-    /*-----------------------------------------------------------------*/
-
-  iteration_container[ZONE_FLOW][INST_0]->Preprocess(output_container[ZONE_FLOW], integration_container, geometry_container,
-      solver_container, numerics_container, config_container,
-      surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
-
-  if ( stat_fsi ) {
-
-    /*--- For steady-state flow simulations, we need to loop over ExtIter for the number of time steps ---*/
-    /*--- However, ExtIter is the number of FSI iterations, so nIntIter is used in this case ---*/
-
-    nIntIter = config_container[ZONE_FLOW]->GetUnst_nIntIter();
-
-    for (IntIter = 0; IntIter < nIntIter; IntIter++){
-
-      iteration_container[ZONE_FLOW][INST_0]->Iterate(output_container[ZONE_FLOW], integration_container, geometry_container,
-          solver_container, numerics_container, config_container,
-          surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
-
-      /*--- Write the convergence history for the fluid (only screen output) ---*/
-//      if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-//        output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst],geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_FLOW, INST_0);
-
-      /*--- If the convergence criteria is met for the flow, break the loop ---*/
-      StopCalc_Flow = integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence();
-      if (StopCalc_Flow) break;
-
-    }
-
-  }
-  else if ( dyn_fsi ) {
-
-    /*--- For unsteady flow simulations, we need to loop over nIntIter for the number of time steps ---*/
-
-    nIntIter = config_container[ZONE_FLOW]->GetUnst_nIntIter();
-
-    for (IntIter = 0; IntIter < nIntIter; IntIter++){
-
-      iteration_container[ZONE_FLOW][INST_0]->Iterate(output_container[ZONE_FLOW], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
-
-      /*--- If convergence was reached in every zone --*/
-
-      if (integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->GetConvergence() == 1) break;
-    }
-
-    /*--- Write the convergence history for the fluid (only screen output) ---*/
-//    if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-//      output_container[iZone]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, true, 0.0, ZONE_FLOW, INST_0);
-
-  } else {
-
-    SU2_MPI::Error( "The definition of Fluid and Structural solvers is inconsistent for FSI applications ", CURRENT_FUNCTION);
-    
-  }
-
-  /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
-
-  integration_container[ZONE_FLOW][INST_0][FLOW_SOL]->SetConvergence(false);
-
-  /*-----------------------------------------------------------------*/
-  /*------------------- Set FEA loads from fluid --------------------*/
-  /*-----------------------------------------------------------------*/
-  if(interface_container[ZONE_FLOW][ZONE_STRUCT] != NULL)
-      Transfer_Tractions(ZONE_FLOW, ZONE_STRUCT);
-
-    /*-----------------------------------------------------------------*/
-    /*------------------ Structural subiteration ----------------------*/
-    /*-----------------------------------------------------------------*/
-
-  iteration_container[ZONE_STRUCT][INST_0]->Iterate(output_container[ZONE_STRUCT], integration_container, geometry_container,
-                                  solver_container, numerics_container, config_container,
-                                  surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
-
-    /*--- Write the convergence history for the structure (only screen output) ---*/
-//   if ((!config_container[iZone]->GetMultizone_Problem() && !config_container[iZone]->GetSinglezone_Driver()))
-//     output_container[ZONE_STRUCT]->GetLegacyOutput()->SetConvHistory_Body(&ConvHist_file[iZone][iInst], geometry_container, solver_container, config_container, integration_container, false, 0.0, ZONE_STRUCT, INST_0);
-
-    /*--- Set the fluid convergence to false (to make sure FSI subiterations converge) ---*/
-
-    integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->SetConvergence(false);
-
-    /*-----------------------------------------------------------------*/
-    /*----------------- Displacements relaxation ----------------------*/
-    /*-----------------------------------------------------------------*/
-
-    Relaxation_Displacements(ZONE_STRUCT, ZONE_FLOW, OuterIter);
-
-    /*-----------------------------------------------------------------*/
-    /*-------------------- Check convergence --------------------------*/
-    /*-----------------------------------------------------------------*/
-
-    Convergence = BGSConvergence(OuterIter, ZONE_FLOW, ZONE_STRUCT);
-
-    /*-----------------------------------------------------------------*/
-    /*-------------------- Output FSI history -------------------------*/
-    /*-----------------------------------------------------------------*/
-
-//    output[ZONE_0]->SpecialOutput_FSI(&FSIHist_file, geometry_container, solver_container,
-//                              config_container, integration_container, 0,
-//                              ZONE_FLOW, ZONE_STRUCT, false);
-
-    if (Convergence) break;
-
-    /*-----------------------------------------------------------------*/
-    /*--------------------- Update OuterIter ---------------------------*/
-    /*-----------------------------------------------------------------*/
-
-    OuterIter++; for (iZone = 0; iZone < nZone; iZone++) config_container[iZone]->SetOuterIter(OuterIter);
-
-  }
-
-}
-
-void CFSIDriver::Predict_Displacements(unsigned short donorZone, unsigned short targetZone) {
-
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->PredictStruct_Displacement(geometry_container[donorZone][INST_0], config_container[donorZone],
-      solver_container[donorZone][INST_0]);
-
-  /*--- For parallel simulations we need to communicate the predicted solution before updating the fluid mesh ---*/
-  
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->InitiateComms(geometry_container[donorZone][INST_0][MESH_0], config_container[donorZone], SOLUTION_PRED);
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->CompleteComms(geometry_container[donorZone][INST_0][MESH_0], config_container[donorZone], SOLUTION_PRED);
-
-}
-
-void CFSIDriver::Predict_Tractions(unsigned short donorZone, unsigned short targetZone) {
-
-}
-
-void CFSIDriver::Transfer_Displacements(unsigned short donorZone, unsigned short targetZone) {
-
-  interface_container[donorZone][targetZone]->BroadcastData(solver_container[donorZone][INST_0][MESH_0][FEA_SOL],solver_container[targetZone][INST_0][MESH_0][FLOW_SOL],
-                                                                     geometry_container[donorZone][INST_0][MESH_0],geometry_container[targetZone][INST_0][MESH_0],
-                                                                     config_container[donorZone], config_container[targetZone]);
-
-}
-
-void CFSIDriver::Transfer_Tractions(unsigned short donorZone, unsigned short targetZone) {
-
-
-  interface_container[donorZone][targetZone]->BroadcastData(solver_container[donorZone][INST_0][MESH_0][FLOW_SOL],solver_container[targetZone][INST_0][MESH_0][FEA_SOL],
-                                                                     geometry_container[donorZone][INST_0][MESH_0],geometry_container[targetZone][INST_0][MESH_0],
-                                                                     config_container[donorZone], config_container[targetZone]);
-
-}
-
-void CFSIDriver::Relaxation_Displacements(unsigned short donorZone, unsigned short targetZone, unsigned long OuterIter) {
-
-  /*-------------------- Aitken's relaxation ------------------------*/
-
-  /*------------------- Compute the coefficient ---------------------*/
-
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->ComputeAitken_Coefficient(geometry_container[donorZone][INST_0], config_container[donorZone],
-      solver_container[donorZone][INST_0], OuterIter);
-
-  /*----------------- Set the relaxation parameter ------------------*/
-
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->SetAitken_Relaxation(geometry_container[donorZone][INST_0], config_container[donorZone],
-      solver_container[donorZone][INST_0]);
-
-  /*----------------- Communicate the predicted solution and the old one ------------------*/
-  
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->InitiateComms(geometry_container[donorZone][INST_0][MESH_0], config_container[donorZone], SOLUTION_PRED_OLD);
-  solver_container[donorZone][INST_0][MESH_0][FEA_SOL]->CompleteComms(geometry_container[donorZone][INST_0][MESH_0], config_container[donorZone], SOLUTION_PRED_OLD);
-
-
-}
-
-void CFSIDriver::Relaxation_Tractions(unsigned short donorZone, unsigned short targetZone, unsigned long OuterIter) {
-
-}
-
-bool CFSIDriver::BGSConvergence(unsigned long IntIter, unsigned short ZONE_FLOW, unsigned short ZONE_STRUCT) {
-
-
-  int rank = MASTER_NODE;
-#ifdef HAVE_MPI
-  int size;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &size);
-#endif
-
-  unsigned short iMarker;
-  unsigned short nVar_Flow = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetnVar(),
-                 nVar_Struct = solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetnVar();
-  unsigned short iRes;
-
-//  bool flow_converged_absolute = false,
-//        flow_converged_relative = false,
-//        struct_converged_absolute = false,
-//        struct_converged_relative = false;
-
-  bool Convergence = false;
-
-  /*--- Apply BC's to the structural adjoint - otherwise, clamped nodes have too values that make no sense... ---*/
-  for (iMarker = 0; iMarker < config_container[ZONE_STRUCT]->GetnMarker_All(); iMarker++){
-  switch (config_container[ZONE_STRUCT]->GetMarker_All_KindBC(iMarker)) {
-    case CLAMPED_BOUNDARY:
-    solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->BC_Clamped_Post(geometry_container[ZONE_STRUCT][INST_0][MESH_0],
-        numerics_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL][FEA_TERM],config_container[ZONE_STRUCT], iMarker);
-    break;
-  }
-  }
-
-  /*--- Compute the residual for the flow and structural zones ---*/
-
-  /*--- Flow ---*/
-
-  solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->ComputeResidual_Multizone(geometry_container[ZONE_FLOW][INST_0][MESH_0],
-                                                                        config_container[ZONE_FLOW]);
-
-  /*--- Structure ---*/
-
-  solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->ComputeResidual_Multizone(geometry_container[ZONE_STRUCT][INST_0][MESH_0],
-                                                                         config_container[ZONE_STRUCT]);
-
-
-  /*--- Retrieve residuals ---*/
-
-  /*--- Flow residuals ---*/
-
-  for (iRes = 0; iRes < nVar_Flow; iRes++){
-    residual_flow[iRes] = log10(solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetRes_BGS(iRes));
-    if (IntIter == 0) init_res_flow[iRes] = residual_flow[iRes];
-    residual_flow_rel[iRes] = fabs(residual_flow[iRes] - init_res_flow[iRes]);
-  }
-
-  /*--- Structure residuals ---*/
-
-  for (iRes = 0; iRes < nVar_Struct; iRes++){
-    residual_struct[iRes] = log10(solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->GetRes_BGS(iRes));
-    if (IntIter == 0) init_res_struct[iRes] = residual_struct[iRes];
-    residual_struct_rel[iRes] = fabs(residual_struct[iRes] - init_res_struct[iRes]);
-  }
-
-  /*--- Check convergence ---*/
-//  flow_converged_absolute = ((residual_flow[0] < flow_criteria) && (residual_flow[nVar_Flow-1] < flow_criteria));
-//  flow_converged_relative = ((residual_flow_rel[0] > flow_criteria_rel) && (residual_flow_rel[nVar_Flow-1] > flow_criteria_rel));
-//
-//  struct_converged_absolute = ((residual_struct[0] < structure_criteria) && (residual_struct[nVar_Flow-1] < structure_criteria));
-//  struct_converged_relative = ((residual_struct_rel[0] > structure_criteria_rel) && (residual_struct_rel[nVar_Flow-1] > structure_criteria_rel));
-
-//  Convergence = ((flow_converged_absolute && struct_converged_absolute) ||
-//                 (flow_converged_absolute && struct_converged_relative) ||
-//                 (flow_converged_relative && struct_converged_relative) ||
-//                 (flow_converged_relative && struct_converged_absolute));
-
-  if (rank == MASTER_NODE){
-
-    cout << endl << "-------------------------------------------------------------------------" << endl;
-    cout << endl;
-    cout << "Convergence summary for BGS iteration ";
-    cout << IntIter << endl;
-    cout << endl;
-    /*--- TODO: This is a workaround until the TestCases.py script incorporates new classes for nested loops. ---*/
-    cout << "Iter[ID]" << "    BGSRes[Rho]" << "   BGSRes[RhoE]" << "     BGSRes[Ux]" << "     BGSRes[Uy]" << endl;
-    cout.precision(6); cout.setf(ios::fixed, ios::floatfield);
-    cout.width(8); cout << IntIter*1000;
-    cout.width(15); cout << residual_flow[0];
-    cout.width(15); cout << residual_flow[nVar_Flow-1];
-    cout.width(15); cout << residual_struct[0];
-    cout.width(15); cout << residual_struct[1];
-    cout << endl;
-
-  }
-
-//  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->Convergence_Monitoring_FSI(geometry_container[ZONE_STRUCT][INST_0][MESH_0], config_container[ZONE_STRUCT], solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]);
-
-  Convergence = integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->GetConvergence_FSI();
-
-
-  /*--- Flow ---*/
-
-  solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->UpdateSolution_BGS(geometry_container[ZONE_FLOW][INST_0][MESH_0],
-                                                                       config_container[ZONE_FLOW]);
-
-  /*--- Structure ---*/
-
-  solver_container[ZONE_STRUCT][INST_0][MESH_0][FEA_SOL]->UpdateSolution_BGS(geometry_container[ZONE_STRUCT][INST_0][MESH_0],
-                                                                       config_container[ZONE_STRUCT]);
-
-  if (rank == MASTER_NODE) cout.setf(ios::scientific, ios::floatfield);
-
-  return Convergence;
-
-}
-
-void CFSIDriver::Update() {
-
-  /*--- As of now, we are coding it for just 2 zones. ---*/
-  /*--- This will become more general, but we need to modify the configuration for that ---*/
-  unsigned short ZONE_FLOW = 0, ZONE_STRUCT = 1;
-
-  TimeIter = config_container[ZONE_FLOW]->GetTimeIter();
-
-  /*-----------------------------------------------------------------*/
-  /*--------------------- Enforce continuity ------------------------*/
-  /*-----------------------------------------------------------------*/
-
-  /*--- Enforces that the geometry of the flow corresponds to the converged, relaxed solution ---*/
-
-  /*-------------------- Transfer the displacements --------------------*/
-
-  Transfer_Displacements(ZONE_STRUCT, ZONE_FLOW);
-
-  /*-------------------- Set the grid movement -------------------------*/
-
-  
-  iteration_container[ZONE_FLOW][INST_0]->SetGrid_Movement(geometry_container[ZONE_FLOW][INST_0], 
-                                                           surface_movement[ZONE_FLOW], grid_movement[ZONE_FLOW][INST_0],
-                                                           solver_container[ZONE_FLOW][INST_0], config_container[ZONE_FLOW], 0, TimeIter );
-
-  /*--- TODO: Temporary output of objective function for Flow OFs. Needs to be integrated into the refurbished output ---*/
-
-
-  if (rank == MASTER_NODE){
-
-  /*--- Choose the filename of the objective function ---*/
-
-    ofstream myfile_res;
-    bool of_output = false;
-    su2double objective_function = 0.0;
-
-    switch (config_container[ZONE_FLOW]->GetKind_ObjFunc()) {
-      case DRAG_COEFFICIENT:
-        myfile_res.open("of_drag.opt");
-        objective_function = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CD();
-        of_output = true;
-        break;
-      case LIFT_COEFFICIENT:
-        myfile_res.open("of_lift.opt");
-        objective_function = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CL();
-        of_output = true;
-      break;
-      case EFFICIENCY:
-        myfile_res.open("of_efficiency.opt");
-        objective_function = solver_container[ZONE_FLOW][INST_0][MESH_0][FLOW_SOL]->GetTotal_CEff();
-        of_output = true;
-        break;
-      default:
-        of_output = false;
-        break;
-    }
-
-    if (of_output){
-
-        myfile_res.precision(15);
-        myfile_res << scientific << objective_function << endl;
-        myfile_res.close();
-
-    }
-
-  }
-
-  /*-----------------------------------------------------------------*/
-  /*-------------------- Update fluid solver ------------------------*/
-  /*-----------------------------------------------------------------*/
-
-  iteration_container[ZONE_FLOW][INST_0]->Update(output_container[ZONE_FLOW], integration_container, geometry_container,
-                       solver_container, numerics_container, config_container,
-                       surface_movement, grid_movement, FFDBox, ZONE_FLOW, INST_0);
-
-  /*-----------------------------------------------------------------*/
-  /*----------------- Update structural solver ----------------------*/
-  /*-----------------------------------------------------------------*/
-
-  iteration_container[ZONE_STRUCT][INST_0]->Update(output_container[ZONE_STRUCT], integration_container, geometry_container,
-                         solver_container, numerics_container, config_container,
-                         surface_movement, grid_movement, FFDBox, ZONE_STRUCT, INST_0);
-
-
-  /*-----------------------------------------------------------------*/
-  /*--------------- Update convergence parameter --------------------*/
-  /*-----------------------------------------------------------------*/
-  integration_container[ZONE_STRUCT][INST_0][FEA_SOL]->SetConvergence_FSI(false);
-
-
-}
-
-void CFSIDriver::DynamicMeshUpdate(unsigned long ExtIter){
-
-}
-
 CDiscAdjFSIDriver::CDiscAdjFSIDriver(char* confFile,
                                      unsigned short val_nZone,
                                      SU2_Comm MPICommunicator) : CDriver(confFile,

From f9f56c767f26880121264ac4ed158cba3c2b6730 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 09:42:17 +0200
Subject: [PATCH 512/539] Smaller fixes and making code more readable

---
 SU2_CFD/include/output/COutput.hpp        |  2 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp | 26 +++++-----
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp  | 26 +++++-----
 SU2_CFD/src/output/CAdjHeatOutput.cpp     | 20 ++++----
 SU2_CFD/src/output/CDriverOutput.cpp      | 31 +++++++-----
 SU2_CFD/src/output/CElasticityOutput.cpp  | 30 +++++------
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp | 24 ++++-----
 SU2_CFD/src/output/CFlowCompOutput.cpp    | 24 ++++-----
 SU2_CFD/src/output/CFlowIncOutput.cpp     | 20 ++++----
 SU2_CFD/src/output/CHeatOutput.cpp        | 14 ++---
 SU2_CFD/src/output/CMeshOutput.cpp        |  2 +-
 SU2_CFD/src/output/COutput.cpp            | 62 +++++++++++++----------
 12 files changed, 146 insertions(+), 135 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 25fc42fb1fae..1d1a84de87a4 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -631,7 +631,7 @@ class COutput {
    * \param[in] iFreq - Frequency of output printing.
    */
   inline bool PrintOutput(unsigned long iIter, unsigned long iFreq) {
-    if (iFreq == 0.0){
+    if (iFreq == 0){
       return false;
     }
     
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 189809fa599c..8a650cd25f34 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -49,27 +49,27 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
-    requestedHistoryFields.push_back("SENSITIVITY");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
+    requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("RMS_ADJ_DENSITY");
-    requestedScreenFields.push_back("RMS_ADJ_MOMENTUM-X");
-    requestedScreenFields.push_back("SENS_GEO");
-    requestedScreenFields.push_back("SENS_AOA");
+    if (config->GetTime_Domain()) requestedScreenFields.emplace_back("TIME_ITER");    
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("RMS_ADJ_DENSITY");
+    requestedScreenFields.emplace_back("RMS_ADJ_MOMENTUM-X");
+    requestedScreenFields.emplace_back("SENS_GEO");
+    requestedScreenFields.emplace_back("SENS_AOA");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");    
-    requestedVolumeFields.push_back("SENSITIVITY");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");    
+    requestedVolumeFields.emplace_back("SENSITIVITY");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 9e50291bee88..bac0cb9697ae 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -53,27 +53,27 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COu
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
-    requestedHistoryFields.push_back("SENSITIVITY");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
+    requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");    
-    requestedScreenFields.push_back("RMS_ADJ_PRESSURE");
-    requestedScreenFields.push_back("RMS_ADJ_VELOCITY-X");
-    requestedScreenFields.push_back("SENS_GEO");
-    requestedScreenFields.push_back("SENS_AOA");
+    if (config->GetTime_Domain()) requestedScreenFields.emplace_back("TIME_ITER");    
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");    
+    requestedScreenFields.emplace_back("RMS_ADJ_PRESSURE");
+    requestedScreenFields.emplace_back("RMS_ADJ_VELOCITY-X");
+    requestedScreenFields.emplace_back("SENS_GEO");
+    requestedScreenFields.emplace_back("SENS_AOA");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");    
-    requestedVolumeFields.push_back("SENSITIVITY");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");    
+    requestedVolumeFields.emplace_back("SENSITIVITY");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 223ac482d9ff..62714a6d4bdd 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -45,24 +45,24 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
-    requestedHistoryFields.push_back("SENSITIVITY");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
+    requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");    
-    requestedScreenFields.push_back("RMS_ADJ_TEMPERATURE");
-    requestedScreenFields.push_back("SENS_GEO");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");    
+    requestedScreenFields.emplace_back("RMS_ADJ_TEMPERATURE");
+    requestedScreenFields.emplace_back("SENS_GEO");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
-    requestedVolumeFields.push_back("SENSITIVITY");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("SENSITIVITY");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index f11ede85cf5a..d95e2c51740d 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -57,19 +57,19 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
   }
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
+    requestedHistoryFields.emplace_back("ITER");
     for (iZone = 0; iZone < nZone; iZone++){
-      requestedHistoryFields.push_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");      
-      requestedHistoryFields.push_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
+      requestedHistoryFields.emplace_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");      
+      requestedHistoryFields.emplace_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
     }
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (config[ZONE_0]->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");    
-    requestedScreenFields.push_back("OUTER_ITER");
+    if (config[ZONE_0]->GetTime_Domain()) requestedScreenFields.emplace_back("TIME_ITER");    
+    requestedScreenFields.emplace_back("OUTER_ITER");
     for (iZone = 0; iZone < nZone; iZone++){
-      requestedScreenFields.push_back("AVG_" + bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]"); 
+      requestedScreenFields.emplace_back("AVG_" + bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]"); 
     }
     nRequestedScreenFields = requestedScreenFields.size();
   }
@@ -164,13 +164,18 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
 
 bool CDriverOutput::WriteScreen_Header(CConfig *config) {
 
-  bool write_header = true;
-
-  /*--- If the outer iteration is zero ---*/
-  write_header = (write_header && (curOuterIter == 0)) || write_zone;
-
-  return write_header;
-
+  /*--- Print header if the outer iteration is zero or zonal convergence is printed ---*/
+  
+  return curOuterIter == 0 || write_zone;
+  
+  /*--- Always print header if it is forced ---*/
+  
+  if (headerNeeded){
+    headerNeeded = false;
+    return true;
+  }  
+  
+  return false;
 }
 
 bool CDriverOutput::WriteScreen_Output(CConfig *config) {
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index cb8d7fbe46a6..99c718e046c1 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -52,35 +52,35 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
   /*--- Default fields for screen output ---*/
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   /*--- Default fields for screen output ---*/
   if (nRequestedScreenFields == 0){
-    if (dynamic) requestedScreenFields.push_back("TIME_ITER");
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
+    if (dynamic) requestedScreenFields.emplace_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
     if(linear_analysis){
-      requestedScreenFields.push_back("RMS_DISP_X");
-      requestedScreenFields.push_back("RMS_DISP_Y");
-      requestedScreenFields.push_back("RMS_DISP_Z");
+      requestedScreenFields.emplace_back("RMS_DISP_X");
+      requestedScreenFields.emplace_back("RMS_DISP_Y");
+      requestedScreenFields.emplace_back("RMS_DISP_Z");
     }
     if(nonlinear_analysis){
-      requestedScreenFields.push_back("RMS_UTOL");
-      requestedScreenFields.push_back("RMS_RTOL");
-      requestedScreenFields.push_back("RMS_ETOL");
+      requestedScreenFields.emplace_back("RMS_UTOL");
+      requestedScreenFields.emplace_back("RMS_RTOL");
+      requestedScreenFields.emplace_back("RMS_ETOL");
     }
-    requestedScreenFields.push_back("VMS");
+    requestedScreenFields.emplace_back("VMS");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   
   /*--- Default fields for volume output ---*/
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
-    requestedVolumeFields.push_back("STRESS");    
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("STRESS");    
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index e711b3597ac9..f616a7543c4e 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -49,24 +49,24 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("RMS_DENSITY");
-    requestedScreenFields.push_back("RMS_MOMENTUM-X");
-    requestedScreenFields.push_back("RMS_MOMENTUM-Y");
-    requestedScreenFields.push_back("RMS_ENERGY");
+    if (config->GetTime_Domain()) requestedScreenFields.emplace_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("RMS_DENSITY");
+    requestedScreenFields.emplace_back("RMS_MOMENTUM-X");
+    requestedScreenFields.emplace_back("RMS_MOMENTUM-Y");
+    requestedScreenFields.emplace_back("RMS_ENERGY");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
-    requestedVolumeFields.push_back("PRIMITIVE");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("PRIMITIVE");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 95481be04a52..c3b54258456a 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -49,24 +49,24 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    if (config->GetTime_Domain()) requestedScreenFields.push_back("TIME_ITER");
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("RMS_DENSITY");
-    requestedScreenFields.push_back("RMS_MOMENTUM-X");
-    requestedScreenFields.push_back("RMS_MOMENTUM-Y");
-    requestedScreenFields.push_back("RMS_ENERGY");
+    if (config->GetTime_Domain()) requestedScreenFields.emplace_back("TIME_ITER");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("RMS_DENSITY");
+    requestedScreenFields.emplace_back("RMS_MOMENTUM-X");
+    requestedScreenFields.emplace_back("RMS_MOMENTUM-Y");
+    requestedScreenFields.emplace_back("RMS_ENERGY");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
-    requestedVolumeFields.push_back("PRIMITIVE");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("PRIMITIVE");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 1f3f48e19ffb..d03f03afc7f1 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -51,24 +51,24 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   
   if (nRequestedScreenFields == 0){
-    if (multiZone) requestedScreenFields.push_back("OUTER_ITER");
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("RMS_PRESSURE");
-    requestedScreenFields.push_back("RMS_VELOCITY-X");
-    requestedScreenFields.push_back("RMS_VELOCITY-Y");
+    if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("RMS_PRESSURE");
+    requestedScreenFields.emplace_back("RMS_VELOCITY-X");
+    requestedScreenFields.emplace_back("RMS_VELOCITY-Y");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
-    requestedVolumeFields.push_back("PRIMITIVE");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
+    requestedVolumeFields.emplace_back("PRIMITIVE");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index d7042f75a813..78ba2ad828de 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -46,19 +46,19 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config,
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.push_back("ITER");
-    requestedHistoryFields.push_back("RMS_RES");
+    requestedHistoryFields.emplace_back("ITER");
+    requestedHistoryFields.emplace_back("RMS_RES");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
-    requestedScreenFields.push_back("OUTER_ITER");    
-    requestedScreenFields.push_back("INNER_ITER");
-    requestedScreenFields.push_back("RMS_TEMPERATURE");
+    requestedScreenFields.emplace_back("OUTER_ITER");    
+    requestedScreenFields.emplace_back("INNER_ITER");
+    requestedScreenFields.emplace_back("RMS_TEMPERATURE");
     nRequestedScreenFields = requestedScreenFields.size();
   }
   if (nRequestedVolumeFields == 0){
-    requestedVolumeFields.push_back("COORDINATES");
-    requestedVolumeFields.push_back("SOLUTION");
+    requestedVolumeFields.emplace_back("COORDINATES");
+    requestedVolumeFields.emplace_back("SOLUTION");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
   
diff --git a/SU2_CFD/src/output/CMeshOutput.cpp b/SU2_CFD/src/output/CMeshOutput.cpp
index 43af96939389..4d160a244148 100644
--- a/SU2_CFD/src/output/CMeshOutput.cpp
+++ b/SU2_CFD/src/output/CMeshOutput.cpp
@@ -42,7 +42,7 @@ CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config,
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
   
-  requestedVolumeFields.push_back("COORDINATES");
+  requestedVolumeFields.emplace_back("COORDINATES");
   nRequestedVolumeFields = requestedVolumeFields.size();
     
   /*--- Set the volume filename --- */
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index eb579c04b8c6..ca348f9152f0 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1050,19 +1050,19 @@ void COutput::CheckHistoryOutput(){
   
   /*--- Set screen convergence output header and remove unavailable fields ---*/
   
-  string RequestedField;
+  string requestedField;
   vector<string> FieldsToRemove;
   vector<bool> FoundField(nRequestedHistoryFields, false);
   
   for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-    RequestedField = requestedScreenFields[iReqField];  
-    if (historyOutput_Map.count(RequestedField) > 0){ 
-      convergenceTable->AddColumn(historyOutput_Map[RequestedField].fieldName, fieldWidth);
+    requestedField = requestedScreenFields[iReqField];  
+    if (historyOutput_Map.count(requestedField) > 0){ 
+      convergenceTable->AddColumn(historyOutput_Map[requestedField].fieldName, fieldWidth);
     }
-    else if (historyOutputPerSurface_Map.count(RequestedField) > 0){
-      convergenceTable->AddColumn(historyOutputPerSurface_Map[RequestedField][0].fieldName, fieldWidth);
+    else if (historyOutputPerSurface_Map.count(requestedField) > 0){
+      convergenceTable->AddColumn(historyOutputPerSurface_Map[requestedField][0].fieldName, fieldWidth);
     }else {
-      FieldsToRemove.push_back(RequestedField);
+      FieldsToRemove.push_back(requestedField);
     }
   }
   
@@ -1080,7 +1080,8 @@ void COutput::CheckHistoryOutput(){
         cout << endl;
       }
     }
-    requestedScreenFields.erase(std::find(requestedScreenFields.begin(), requestedScreenFields.end(), FieldsToRemove[iReqField]));
+    requestedScreenFields.erase(std::find(requestedScreenFields.begin(),
+                                          requestedScreenFields.end(), FieldsToRemove[iReqField]));
   }
   
   nRequestedScreenFields = requestedScreenFields.size();
@@ -1088,7 +1089,7 @@ void COutput::CheckHistoryOutput(){
   if (rank == MASTER_NODE){
     cout <<"Screen output fields: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedScreenFields; iReqField++){
-      RequestedField = requestedScreenFields[iReqField];            
+      requestedField = requestedScreenFields[iReqField];            
       cout << requestedScreenFields[iReqField];
       if (iReqField != nRequestedScreenFields - 1) cout << ", ";
     }
@@ -1101,21 +1102,23 @@ void COutput::CheckHistoryOutput(){
   FoundField = vector<bool>(nRequestedHistoryFields, false);
   
   for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
-    HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField_Output]];
+    const string &fieldReference = historyOutput_List[iField_Output];
+    const HistoryOutputField &field = historyOutput_Map[fieldReference];
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = requestedHistoryFields[iReqField];   
-      if (RequestedField == Field.outputGroup){
+      requestedField = requestedHistoryFields[iReqField];   
+      if (requestedField == field.outputGroup){
         FoundField[iReqField] = true;
       }
     }
   }
   
   for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]].size(); iMarker++){
-      HistoryOutputField &Field = historyOutputPerSurface_Map[historyOutputPerSurface_List[iField_Output]][iMarker];
+    const string &fieldReference = historyOutputPerSurface_List[iField_Output];    
+    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[fieldReference].size(); iMarker++){
+      const HistoryOutputField &Field = historyOutputPerSurface_Map[fieldReference][iMarker];
       for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        RequestedField = requestedHistoryFields[iReqField];   
-        if (RequestedField == Field.outputGroup){
+        requestedField = requestedHistoryFields[iReqField];   
+        if (requestedField == Field.outputGroup){
           FoundField[iReqField] = true;
         }
       }
@@ -1142,7 +1145,8 @@ void COutput::CheckHistoryOutput(){
         cout << endl;
       }
     }
-    requestedHistoryFields.erase(std::find(requestedHistoryFields.begin(), requestedHistoryFields.end(), FieldsToRemove[iReqField]));
+    requestedHistoryFields.erase(std::find(requestedHistoryFields.begin(),
+                                           requestedHistoryFields.end(), FieldsToRemove[iReqField]));
   }
   
   nRequestedHistoryFields = requestedHistoryFields.size();
@@ -1150,7 +1154,7 @@ void COutput::CheckHistoryOutput(){
   if (rank == MASTER_NODE){
     cout <<"History output groups: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      RequestedField = requestedHistoryFields[iReqField];            
+      requestedField = requestedHistoryFields[iReqField];            
       cout << requestedHistoryFields[iReqField];
       if (iReqField != nRequestedHistoryFields - 1) cout << ", ";
     }
@@ -1184,7 +1188,8 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
 
   for (unsigned short iField_Output = 0; iField_Output < volumeOutput_List.size(); iField_Output++){
     
-    VolumeOutputField &Field = volumeOutput_Map[volumeOutput_List[iField_Output]];
+    const string &fieldReference = volumeOutput_List[iField_Output];
+    VolumeOutputField &Field = volumeOutput_Map[fieldReference];
     
     /*--- Loop through all fields specified in the config ---*/
     
@@ -1192,7 +1197,7 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
       
       RequestedField = requestedVolumeFields[iReqField];  
             
-      if (((RequestedField == Field.outputGroup) || (RequestedField == volumeOutput_List[iField_Output])) && (Field.offset == -1)){
+      if (((RequestedField == Field.outputGroup) || (RequestedField == fieldReference)) && (Field.offset == -1)){
         Field.offset = nVolumeFields;
         volumeFieldNames.push_back(Field.fieldName);
         nVolumeFields++;
@@ -1223,7 +1228,8 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
         cout << endl;
       }
     }
-    requestedVolumeFields.erase(std::find(requestedVolumeFields.begin(), requestedVolumeFields.end(), FieldsToRemove[iReqField]));
+    requestedVolumeFields.erase(std::find(requestedVolumeFields.begin(), 
+                                          requestedVolumeFields.end(), FieldsToRemove[iReqField]));
   }
   
   if (rank == MASTER_NODE){
@@ -1544,18 +1550,18 @@ bool COutput::WriteScreen_Header(CConfig *config) {
   unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
   unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);
   
-  /*--- Always print header if it is forced ---*/
-  
-  if (headerNeeded){
-    headerNeeded = false;
-    return true;
-  }
-  
   /*--- Header is always disabled for multizone problems unless explicitely requested --- */
   
   if (config->GetMultizone_Problem() && !config->GetWrt_ZoneConv()){
     return false;
   }
+  
+  /*--- Always print header if it is forced ---*/
+  
+  if (headerNeeded){
+    headerNeeded = false;
+    return true;
+  }  
 
   /* --- Always print header in the first iteration --- */
   

From ba1d11c091e7de51e6ee209d97c4f3a12edb696c Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 10:24:07 +0200
Subject: [PATCH 513/539] Cleanup and adding missing comments

---
 SU2_CFD/include/output/COutput.hpp            | 57 ++++++++---------
 SU2_CFD/src/output/COutput.cpp                | 61 +++++++++----------
 .../filewriter/CSU2BinaryFileWriter.cpp       | 23 -------
 .../output/filewriter/CSU2MeshFileWriter.cpp  | 36 ++++-------
 .../filewriter/CTecplotBinaryFileWriter.cpp   | 10 ---
 .../output/filewriter/CTecplotFileWriter.cpp  | 16 -----
 6 files changed, 67 insertions(+), 136 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 1d1a84de87a4..32460c67af24 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -60,8 +60,7 @@ using namespace std;
 
 /*! 
  * \class COutput
- * \brief Class for writing the flow, adjoint and linearized solver 
- *        solution (including the history solution, and parallel stuff).
+ * \brief Class for writing the convergence history and to write solution data to file.
  * \author T.Albring
  */
 class COutput {
@@ -256,10 +255,7 @@ class COutput {
   void PreprocessVolumeOutput(CConfig *config);   
   
   /*!
-   * \brief Load the data from the solvers into the local data array and sort it for the linear partitioning.
-   * 
-   * After calling this method the data is distributed to all processors based on a linear partition 
-   * and is ready to be written in parallel to file using the SetVolume_Output or SetSurface_Output routines.
+   * \brief Load the data from the solvers into the data sorters and sort it for the linear partitioning.
    * 
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -267,24 +263,6 @@ class COutput {
    */
   void Load_Data(CGeometry *geometry, CConfig *config, CSolver **solver_container);
   
-  /*!
-   * \brief Write the linear partitioned volume data in parallel to file. ::Load_Data() has to be called before!
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] format - The data format of the output files.
-   * \param[in] time_dep - Indicates whether time dependent files should be written.
-   */
-  void SetVolume_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
-  
-  /*!
-   * \brief Write the linear partitioned surface data in parallel to file. ::Load_Data() has to be called before!
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] format - The data format of the output files.
-   * \param[in] time_dep - Indicates whether time dependent files should be written.   
-   */
-  void SetSurface_Output(CGeometry *geometry, CConfig *config, unsigned short format, bool time_dep);
-
   /*!
    * \brief Preprocess the history output by setting the history fields and opening the history file.
    * \param[in] config - Definition of the particular problem.
@@ -312,13 +290,11 @@ class COutput {
   void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                          unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter);  
   
-  
   /*!
-   * \brief Collects history data from the solvers and monitors the convergence.
-   * Does not write to screen or file.
-   * \param geometry
-   * \param solver_container
-   * \param config
+   * \brief Collects history data from the solvers and monitors the convergence. Does not write to screen or file.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
    */
   void SetHistory_Output(CGeometry *geometry, CSolver **solver_container, CConfig *config);  
   
@@ -461,7 +437,17 @@ class COutput {
    */
   void PrintVolumeFields();
   
-  bool SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing = false);
+  /*!
+   * \brief Loop through all requested output files and write the volume output data.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] iter - The current time, outer or inner iteration index.
+   * \param[in] force_writing - If <TRUE>, writing of output files is forced without checking the output frequency.
+   * \return <TRUE> if output files have been written to disk.
+   */
+  bool SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container,
+                       unsigned long iter, bool force_writing = false);
   
   /*!
    * \brief Allocates the appropriate file writer based on the chosen format and writes sorted data to file.
@@ -611,7 +597,7 @@ class COutput {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] solver_container - The container holding all solution data.
    */
-  void CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver);
+  void LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver** solver);
       
   /*!
    * \brief Postprocess_HistoryData
@@ -650,6 +636,13 @@ class COutput {
    */
   void LoadCommonHistoryData(CConfig *config);
   
+  /*!
+   * \brief Allocates the data sorters if necessary.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   */
+  void AllocateDataSorters(CConfig *config, CGeometry *geometry);
+  
   /*--------------------------------- Virtual functions ---------------------------------------- */
 public:
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index ca348f9152f0..1331882f4f88 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -360,12 +360,11 @@ void COutput::SetCFL_Number(CSolver ****solver_container, CConfig *config) {
   
 }
 
-void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_container){
+void COutput::AllocateDataSorters(CConfig *config, CGeometry *geometry){
   
   /*---- Construct a data sorter object to partition and distribute
    *  the local data into linear chunks across the processors ---*/
   
-  
   if (femOutput){
     
     if (volumeDataSorter == nullptr)
@@ -385,9 +384,21 @@ void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_c
                                                   dynamic_cast<CFVMDataSorter*>(volumeDataSorter));  
     
   }
+  
+}
 
-  CollectVolumeData(config, geometry, solver_container);
+void COutput::Load_Data(CGeometry *geometry, CConfig *config, CSolver** solver_container){
+  
+  /*--- Check if the data sorters are allocated, if not, allocate them. --- */ 
+  
+  AllocateDataSorters(config, geometry);
+  
+  /*--- Loop over all points and store the requested volume output data into the data sorter objects ---*/
+  
+  LoadDataIntoSorter(config, geometry, solver_container);
 
+  /*--- Partition and sort the volume output data -- */
+  
   volumeDataSorter->SortOutputData();
   
 }
@@ -638,38 +649,21 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
 
 
 
-bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, unsigned long Iter, bool force_writing){
+bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container, 
+                              unsigned long iter, bool force_writing){
   
-  /*--- Check if the data sorters are allocated, if not, allocate them. --- */ 
-  
-  if (femOutput){
-    
-    if (volumeDataSorter == nullptr)
-      volumeDataSorter = new CFEMDataSorter(config, geometry, nVolumeFields);
-    
-    if (surfaceDataSorter == nullptr)
-      surfaceDataSorter = new CSurfaceFEMDataSorter(config, geometry, nVolumeFields, 
-                                                  dynamic_cast<CFEMDataSorter*>(volumeDataSorter));
-    
-  }  else {
-   
-    if (volumeDataSorter == nullptr)    
-      volumeDataSorter = new CFVMDataSorter(config, geometry, nVolumeFields);
-    
-    if (surfaceDataSorter == nullptr)
-      surfaceDataSorter = new CSurfaceFVMDataSorter(config, geometry, nVolumeFields,
-                                                  dynamic_cast<CFVMDataSorter*>(volumeDataSorter));  
-    
-  }
+  bool writeFiles = WriteVolume_Output(config, iter) || force_writing;
   
-  bool writeFiles = WriteVolume_Output(config, Iter) || force_writing;
+  /*--- Check if the data sorters are allocated, if not, allocate them. --- */ 
   
+  AllocateDataSorters(config, geometry);
+
   /*--- Collect the volume data from the solvers.
    *  If time-domain is enabled, we also load the data although we don't output it,
    *  since we might want to do time-averaging. ---*/
   
   if (writeFiles || config->GetTime_Domain())
-    CollectVolumeData(config, geometry, solver_container);
+    LoadDataIntoSorter(config, geometry, solver_container);
   
   if (writeFiles){
     
@@ -686,7 +680,8 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
       fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);    
     }
     
-    /*--- Loop through all requested output files ---*/
+    /*--- Loop through all requested output files and write 
+     * the partitioned and sorted data stored in the data sorters. ---*/
     
     for (unsigned short iFile = 0; iFile < nVolumeFiles; iFile++){
       
@@ -699,7 +694,7 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
       headerNeeded = true;
     }
     
-    /*--- Write any additonal files ----*/
+    /*--- Write any additonal files defined in the child class ----*/
     
     WriteAdditionalFiles(config, geometry, solver_container);
     
@@ -1243,7 +1238,7 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
   }
 }
 
-void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver** solver){
+void COutput::LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver** solver){
   
   unsigned short iMarker = 0;
   unsigned long iPoint = 0, jPoint = 0;
@@ -1285,8 +1280,7 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     for (iPoint = 0; iPoint < geometry->GetnPointDomain(); iPoint++) {
       
-      /*--- Check for halos & write only if requested ---*/
-      /*--- Load the volume data into the Local_Data() array. --- */
+      /*--- Load the volume data into the data sorter. --- */
       
       buildFieldIndexCache = fieldIndexCache.empty();
 
@@ -1302,7 +1296,10 @@ void COutput::CollectVolumeData(CConfig* config, CGeometry* geometry, CSolver**
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
       for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
+        
         iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+        
+        /*--- Load the surface data into the data sorter. --- */
   
         if(geometry->node[iPoint]->GetDomain()){
           
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index f1371cf45aef..64f8e736a63e 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -17,9 +17,6 @@ void CSU2BinaryFileWriter::Write_Data(){
 
   unsigned short iVar;
   unsigned long iPoint;
-//  bool dual_time = ((config->GetUnsteady_Simulation() == DT_STEPPING_1ST) ||
-//                    (config->GetUnsteady_Simulation() == DT_STEPPING_2ND));
-//  bool wrt_perf  = config->GetWrt_Performance();
   
   unsigned short GlobalField_Counter = fieldnames.size();
   unsigned long nParallel_Poin = dataSorter->GetnPoints();
@@ -171,26 +168,6 @@ void CSU2BinaryFileWriter::Write_Data(){
 
   MPI_File_set_view(fhw, 0, MPI_BYTE, MPI_BYTE, (char*)"native", MPI_INFO_NULL);
 
-  /*--- Finally, the master rank writes the metadata. ---*/
-
-  if (rank == MASTER_NODE) {
-
-    /*--- External iteration. ---*/
-
-//    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-//            GlobalField_Counter*dataSorter->GetnPointsGlobal()*sizeof(passivedouble));
-//    MPI_File_write_at(fhw, disp, &Restart_ExtIter, 1, MPI_INT, MPI_STATUS_IGNORE);
-//    file_size += (su2double)sizeof(int);
-
-    /*--- Additional doubles for AoA, AoS, etc. ---*/
-
-//    disp = (var_buf_size*sizeof(int) + GlobalField_Counter*CGNS_STRING_SIZE*sizeof(char) +
-//            GlobalField_Counter*dataSorter->GetnPointsGlobal()*sizeof(passivedouble) + 1*sizeof(int));
-//    MPI_File_write_at(fhw, disp, Restart_Metadata, 8, MPI_DOUBLE, MPI_STATUS_IGNORE);
-//    file_size += (su2double)8*sizeof(passivedouble);
-
-  }
-
   /*--- All ranks close the file after writing. ---*/
 
   MPI_File_close(&fhw);
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index af2b61cc893c..b68d439284e2 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -43,14 +43,6 @@ void CSU2MeshFileWriter::Write_Data(){
     
     output_file << "NDIME= " << nDim << endl;
     
-//    /*--- Write the angle of attack offset. ---*/
-    
-//    output_file << "AOA_OFFSET= " << config->GetAoA_Offset() << endl;
-    
-//    /*--- Write the angle of attack offset. ---*/
-    
-//    output_file << "AOS_OFFSET= " << config->GetAoS_Offset() << endl;
-    
     output_file << "NELEM= " << dataSorter->GetnElem() << endl;
     
     output_file.close();
@@ -151,21 +143,19 @@ void CSU2MeshFileWriter::Write_Data(){
         /*--- Only write original domain points, i.e., exclude any periodic
          or halo nodes, even if they are output in the viz. files. ---*/
         
-//        if (Global_Index < geometry->GetGlobal_nPointDomain()) {
-          
-          /*--- Loop over the variables and write the values to file ---*/
-          
-          for (iDim = 0; iDim < nDim; iDim++) {
-            output_file << scientific << dataSorter->GetData(iDim, iPoint) << "\t";
-          }
-          
-          /*--- Write global index. (note outer loop over procs) ---*/
-          
-          output_file << Global_Index << "\t";
-          myPoint++;
-          
-          output_file << "\n";
-//        }
+        /*--- Loop over the variables and write the values to file ---*/
+        
+        for (iDim = 0; iDim < nDim; iDim++) {
+          output_file << scientific << dataSorter->GetData(iDim, iPoint) << "\t";
+        }
+        
+        /*--- Write global index. (note outer loop over procs) ---*/
+        
+        output_file << Global_Index << "\t";
+        myPoint++;
+        
+        output_file << "\n";
+        
       }
     }
     /*--- Flush the file and wait for all processors to arrive. ---*/
diff --git a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
index 621b202a12c3..4ae02eb1119d 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotBinaryFileWriter.cpp
@@ -105,16 +105,6 @@ void CTecplotBinaryFileWriter::Write_Data(){
 
   bool is_unsteady = false;
   passivedouble solution_time = 0.0;
-//  if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-//    is_unsteady = true;
-//    solution_time = SU2_TYPE::GetValue(config->GetDelta_UnstTime()*config->GetExtIter());
-//  } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-//    is_unsteady = true;
-//    /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-//    passivedouble period = SU2_TYPE::GetValue(config->GetHarmonicBalance_Period());
-//    passivedouble deltaT = period/SU2_TYPE::GetValue(config->GetnTimeInstances());
-//    solution_time = deltaT*val_iZone;
-//  }
 
   if (timestep > 0.0){
     is_unsteady = true;
diff --git a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
index 6e27041588c2..bb7c37e73915 100644
--- a/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CTecplotFileWriter.cpp
@@ -83,22 +83,6 @@ void CTecplotFileWriter::Write_Data(){
       Tecplot_File << "STRANDID="<<SU2_TYPE::Int(time_iter+1)<<", SOLUTIONTIME="<< time_iter*timestep <<", ";      
     }
     
-//    if (config->GetUnsteady_Simulation() && config->GetWrt_Unsteady()) {
-//      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(iExtIter+1)<<", SOLUTIONTIME="<<config->GetDelta_UnstTime()*iExtIter<<", ";
-//    } else if (config->GetUnsteady_Simulation() == HARMONIC_BALANCE) {
-//      /*--- Compute period of oscillation & compute time interval using nTimeInstances ---*/
-//      su2double period = config->GetHarmonicBalance_Period();
-//      su2double deltaT = period/(su2double)(config->GetnTimeInstances());
-//      Tecplot_File << "STRANDID="<<SU2_TYPE::Int(val_iZone+1)<<", SOLUTIONTIME="<<deltaT*val_iZone<<", ";
-//    }
-//    if (nDim == 2) {
-//      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FELINESEG"<< endl;
-//      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-//    } else {
-//      if (surf_sol) Tecplot_File << "NODES= "<< nGlobal_Surf_Poin <<", ELEMENTS= "<< nSurf_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEQUADRILATERAL"<< endl;
-//      else Tecplot_File << "NODES= "<< nGlobal_Poin_Par <<", ELEMENTS= "<< nGlobal_Elem_Par <<", DATAPACKING=POINT, ZONETYPE=FEBRICK"<< endl;
-//    }
-    
     Tecplot_File << "NODES= "<< dataSorter->GetnPointsGlobal() <<", ELEMENTS= "<< dataSorter->GetnElem();
     
     if (nDim == 3){

From f08dde0d9796afb7096d1c1853d29015cd0a737d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 11:14:25 +0200
Subject: [PATCH 514/539] SOLUTION and COORDINATES are now always requested for
 volume output.

---
 SU2_CFD/src/output/COutput.cpp                | 37 +++++++++++++++----
 .../output/filewriter/CParallelFileWriter.cpp |  2 +
 SU2_DOT/src/SU2_DOT.cpp                       |  4 +-
 SU2_SOL/src/SU2_SOL.cpp                       | 10 ++++-
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 1331882f4f88..6986bd313118 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -635,13 +635,20 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, unsigned short f
       fileWriter = NULL;
       break;
   } 
-  
-  /*--- Write data to file ---*/
-  
+    
   if (fileWriter != NULL){
     
+    /*--- Write data to file ---*/
+    
     fileWriter->Write_Data();
     
+    /*--- Compute and store the bandwidth ---*/
+    
+    if (format == RESTART_BINARY){
+      su2double BandWidth = fileWriter->Get_Bandwidth();
+      config->SetRestart_Bandwidth_Agg(config->GetRestart_Bandwidth_Agg()+BandWidth);
+    }
+    
     delete fileWriter;
    
   }
@@ -1165,6 +1172,22 @@ void COutput::CheckHistoryOutput(){
 
 void COutput::PreprocessVolumeOutput(CConfig *config){
 
+  /*---Coordinates and solution groups must be always in the output.
+   * If they are not requested, add them here. ---*/
+  
+  vector<string>::iterator itCoord = std::find(requestedVolumeFields.begin(),
+                                          requestedVolumeFields.end(), "COORDINATES");
+  if (itCoord == requestedVolumeFields.end()){
+    requestedVolumeFields.emplace_back("COORDINATES");
+    nRequestedVolumeFields++;
+  }
+  vector<string>::iterator itSol = std::find(requestedVolumeFields.begin(),
+                                          requestedVolumeFields.end(), "SOLUTION");
+  if (itSol == requestedVolumeFields.end()){
+    requestedVolumeFields.emplace_back("SOLUTION");
+    nRequestedVolumeFields++;    
+  }
+  
   /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
   
   SetVolumeOutputFields(config);
@@ -1744,7 +1767,7 @@ void COutput::PrintHistoryFields(){
       }
     }
     
-    cout << "Available output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
+    cout << "Available screen/history output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
     
     HistoryFieldTable.AddColumn("Name", NameSize);
     HistoryFieldTable.AddColumn("Group Name", GroupSize);
@@ -1782,7 +1805,7 @@ void COutput::PrintHistoryFields(){
     
     cout << "Type legend: Default (D), Residual (R), Coefficient (C)" << endl;
     
-    cout << "Generated output fields (only first field of every group is shown):" << endl;
+    cout << "Generated screen/history fields (only first field of every group is shown):" << endl;
     
     PrintingToolbox::CTablePrinter ModifierTable(&std::cout);
     
@@ -1849,8 +1872,8 @@ void COutput::PrintVolumeFields(){
       }
     }
     
-    cout << "Available output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
-    
+    cout << "Available volume output fields for the current configuration in " << multiZoneHeaderString << ":" << endl;
+    cout << "Note: COORDINATES and SOLUTION groups are always in the volume output." << endl;
     VolumeFieldTable.AddColumn("Name", NameSize);
     VolumeFieldTable.AddColumn("Group Name", GroupSize);
     VolumeFieldTable.AddColumn("Description", DescrSize);
diff --git a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
index d69ea81082e1..296af1426644 100644
--- a/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp
@@ -14,6 +14,8 @@ CFileWriter::CFileWriter(vector<string> fields, string fileName,
   
   this->fileName += file_ext;
   
+  file_size = 0.0;
+  
 }
 
 
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
index 1ff7368865e7..0bfca1658ddf 100644
--- a/SU2_DOT/src/SU2_DOT.cpp
+++ b/SU2_DOT/src/SU2_DOT.cpp
@@ -1006,7 +1006,9 @@ void SetSensitivity_Files(CGeometry ***geometry, CConfig **config, unsigned shor
     
     for (unsigned short iFile = 0; iFile < config[iZone]->GetnVolumeOutputFiles(); iFile++){
       unsigned short* FileFormat = config[iZone]->GetVolumeOutputFiles();
-      if (FileFormat[iFile] != RESTART_ASCII && FileFormat[iFile] != RESTART_BINARY)
+      if (FileFormat[iFile] != RESTART_ASCII &&
+          FileFormat[iFile] != RESTART_BINARY &&
+          FileFormat[iFile] != CSV)
         output->WriteToFile(config[iZone], geometry[iZone][INST_0], FileFormat[iFile]);
     }
     
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 55b59b232299..5ceeb85940cf 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -845,9 +845,17 @@ void WriteFiles(CConfig *config, CGeometry* geometry, CSolver** solver_container
   
   output->Load_Data(geometry, config, solver_container);
   
+  /*--- Set the filenames ---*/
+  
+  output->SetVolume_Filename(config->GetVolume_FileName());
+  
+  output->SetSurface_Filename(config->GetSurfCoeff_FileName());
+  
   for (unsigned short iFile = 0; iFile < config->GetnVolumeOutputFiles(); iFile++){
     unsigned short* FileFormat = config->GetVolumeOutputFiles();
-    if (FileFormat[iFile] != RESTART_ASCII && FileFormat[iFile] != RESTART_BINARY)
+    if (FileFormat[iFile] != RESTART_ASCII &&
+        FileFormat[iFile] != RESTART_BINARY &&
+        FileFormat[iFile] != CSV)
       output->WriteToFile(config, geometry, FileFormat[iFile]);
   }
   

From e3c9c09d87e16db4f75b3a28775e101f057dc2f0 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 13:32:08 +0200
Subject: [PATCH 515/539] Fixing SU2_SOL and baseline output

---
 SU2_CFD/include/output/CBaselineOutput.hpp |  1 +
 SU2_CFD/src/output/CBaselineOutput.cpp     | 43 ++++++++++++----------
 SU2_CFD/src/output/COutput.cpp             |  8 ++--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/SU2_CFD/include/output/CBaselineOutput.hpp b/SU2_CFD/include/output/CBaselineOutput.hpp
index a68ff1a0335d..4bbc6fc8b8f6 100644
--- a/SU2_CFD/include/output/CBaselineOutput.hpp
+++ b/SU2_CFD/include/output/CBaselineOutput.hpp
@@ -46,6 +46,7 @@
  */
 class CBaselineOutput : public COutput {
 
+  std::vector<string> fields;
 public:
 
   /*!
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 298f4586c599..5b41f0cc64c9 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -43,24 +43,27 @@
 
 CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver* solver) : COutput(config, nDim, false) {
   
-  unsigned short iField = 0;
-
   /*--- Set the requested volume fields to all fields in the solver ---*/
   
-  requestedVolumeFields = solver->GetSolutionFields();
+  requestedVolumeFields.emplace_back("COORDINATES");
+  requestedVolumeFields.emplace_back("SOLUTION");
   
-  /*--- remove the point ID from the fields --- */
+  nRequestedVolumeFields = requestedVolumeFields.size();
   
-  requestedVolumeFields.erase(requestedVolumeFields.begin());
+  /*--- Get the fields from the solver ---*/
+  
+  fields = solver->GetSolutionFields();
+   
+  /*--- Remove point ID ---*/
+  
+  fields.erase(fields.begin());
   
-  nRequestedVolumeFields = requestedVolumeFields.size();
-    
   /*--- Remove first and last character of the strings (the quotation marks) ---*/
   
-  for (iField = 0; iField < nRequestedVolumeFields; iField++){
-    requestedVolumeFields[iField] = requestedVolumeFields[iField].substr(1, requestedVolumeFields[iField].size() - 2);
+  for (unsigned short iField = 0; iField < fields.size(); iField++){
+    fields[iField] = fields[iField].substr(1, fields[iField].size() - 2);
   }
-     
+  
   /*--- Set the volume filename --- */
   
   volumeFilename = "baseline";
@@ -83,25 +86,25 @@ void CBaselineOutput::SetVolumeOutputFields(CConfig *config){
     
   /*--- The first three fields should be the coordinates, if not, something is wrong ---*/
   
-  if (requestedVolumeFields[0] != "x" || requestedVolumeFields[1] != "y"){
+  if (fields[0] != "x" || fields[1] != "y"){
     SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
   }
   if (nDim == 3){
-    if (requestedVolumeFields[2] != "z"){
+    if (fields[2] != "z"){
       SU2_MPI::Error("No coordinates found in the restart file!!", CURRENT_FUNCTION);
     }
   }
   
   // Grid coordinates
-  AddVolumeOutput(requestedVolumeFields[0], requestedVolumeFields[0], "COORDINATES", "x-component of the coordinate vector");
-  AddVolumeOutput(requestedVolumeFields[1], requestedVolumeFields[1], "COORDINATES", "y-component of the coordinate vector");
+  AddVolumeOutput(fields[0], fields[0], "COORDINATES", "x-component of the coordinate vector");
+  AddVolumeOutput(fields[1], fields[1], "COORDINATES", "y-component of the coordinate vector");
   if (nDim == 3)
-    AddVolumeOutput(requestedVolumeFields[2], requestedVolumeFields[2], "COORDINATES", "z-component of the coordinate vector");
+    AddVolumeOutput(fields[2], fields[2], "COORDINATES", "z-component of the coordinate vector");
 
   // Add all the remaining fields
   
-  for (iField = nDim; iField < nRequestedVolumeFields; iField++){
-    AddVolumeOutput(requestedVolumeFields[iField], requestedVolumeFields[iField], "SOLUTION","");
+  for (iField = nDim; iField < fields.size(); iField++){
+    AddVolumeOutput(fields[iField], fields[iField], "SOLUTION","");
   }
   
 }
@@ -110,7 +113,7 @@ void CBaselineOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   
   unsigned short iField = 0;
   
-  if (nRequestedVolumeFields != solver[0]->GetnVar()){
+  if ( fields.size() != solver[0]->GetnVar()){
     SU2_MPI::Error("Number of requested fields and number of variables do not match.", CURRENT_FUNCTION);
   }
   
@@ -118,8 +121,8 @@ void CBaselineOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
   
   CVariable* Node_Sol  = solver[0]->node[iPoint];
    
-  for (iField = 0; iField < nRequestedVolumeFields; iField++){
-    SetVolumeOutputValue(requestedVolumeFields[iField], iPoint, Node_Sol->GetSolution(iField));
+  for (iField = 0; iField < fields.size(); iField++){
+    SetVolumeOutputValue(fields[iField], iPoint, Node_Sol->GetSolution(iField));
   }
   
 }
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 6986bd313118..9ae335f4b49f 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1172,6 +1172,10 @@ void COutput::CheckHistoryOutput(){
 
 void COutput::PreprocessVolumeOutput(CConfig *config){
 
+  /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
+  
+  SetVolumeOutputFields(config);
+  
   /*---Coordinates and solution groups must be always in the output.
    * If they are not requested, add them here. ---*/
   
@@ -1187,10 +1191,6 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
     requestedVolumeFields.emplace_back("SOLUTION");
     nRequestedVolumeFields++;    
   }
-  
-  /*--- Set the volume output fields using a virtual function call to the child implementation ---*/  
-  
-  SetVolumeOutputFields(config);
    
   nVolumeFields = 0;
   

From 58f0117f4a3f87717cdd358f85db662f350b7164 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 14:14:45 +0200
Subject: [PATCH 516/539] Changed lin sol residual to be relative

---
 Common/src/linear_algebra/CSysSolve.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/src/linear_algebra/CSysSolve.cpp b/Common/src/linear_algebra/CSysSolve.cpp
index 8f1c97f221b1..e99f62a46cdf 100644
--- a/Common/src/linear_algebra/CSysSolve.cpp
+++ b/Common/src/linear_algebra/CSysSolve.cpp
@@ -490,7 +490,7 @@ unsigned long CSysSolve<ScalarType>::FGMRES_LinSolver(const CSysVector<ScalarTyp
 
   }
 
-  (*residual) = beta;
+  (*residual) = beta/norm0;
   return (unsigned long) i;
 
 }
@@ -647,7 +647,7 @@ unsigned long CSysSolve<ScalarType>::BCGSTAB_LinSolver(const CSysVector<ScalarTy
 
   }
 
-  (*residual) = norm_r;
+  (*residual) = norm_r/norm0;
   return (unsigned long) i;
 }
 

From 26acd79bf3956e994584ae3bcd9fc3e523e80da7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 14:17:30 +0200
Subject: [PATCH 517/539] Changed enum to enum class

---
 SU2_CFD/include/output/CAdjFlowIncOutput.hpp |   2 +-
 SU2_CFD/include/output/CAdjFlowOutput.hpp    |   2 +-
 SU2_CFD/include/output/CFlowIncOutput.hpp    |   2 +-
 SU2_CFD/include/output/COutput.hpp           |  40 ++++----
 SU2_CFD/src/output/CAdjElasticityOutput.cpp  |  10 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp    |  58 +++++------
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp     |  59 ++++++-----
 SU2_CFD/src/output/CAdjHeatOutput.cpp        |   8 +-
 SU2_CFD/src/output/CDriverOutput.cpp         |   4 +-
 SU2_CFD/src/output/CElasticityOutput.cpp     |  28 +++---
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp    |  24 ++---
 SU2_CFD/src/output/CFlowCompOutput.cpp       |  92 ++++++++---------
 SU2_CFD/src/output/CFlowIncOutput.cpp        |  70 ++++++-------
 SU2_CFD/src/output/CFlowOutput.cpp           | 100 +++++++++----------
 SU2_CFD/src/output/CHeatOutput.cpp           |  16 +--
 SU2_CFD/src/output/COutput.cpp               |  94 ++++++++---------
 16 files changed, 308 insertions(+), 301 deletions(-)

diff --git a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
index 290c0208fb16..0189b2bb01fa 100644
--- a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
@@ -49,7 +49,7 @@ class CAdjFlowIncOutput final: public COutput {
   
   bool cont_adj; /*!< \brief Boolean indicating whether we run a cont. adjoint problem */ 
 
-  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
+  unsigned short turb_model; /*!< \brief The kind of turbulence model*/ 
   bool heat,                 /*!< \brief Boolean indicating whether have a heat problem*/ 
   weakly_coupled_heat; /*!< \brief Boolean indicating whether have a weakly coupled heat equation*/ 
   
diff --git a/SU2_CFD/include/output/CAdjFlowOutput.hpp b/SU2_CFD/include/output/CAdjFlowOutput.hpp
index 5dc5e12fefff..bb1a552a8625 100644
--- a/SU2_CFD/include/output/CAdjFlowOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowOutput.hpp
@@ -48,7 +48,7 @@ class CAdjFlowCompOutput final: public COutput {
 private:
   
   bool cont_adj; /*!< \brief Boolean indicating whether we run a cont. adjoint problem */ 
-  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
+  unsigned short turb_model; /*!< \brief The kind of turbulence model*/ 
   
 public:
 
diff --git a/SU2_CFD/include/output/CFlowIncOutput.hpp b/SU2_CFD/include/output/CFlowIncOutput.hpp
index efb4c8cf0819..7efeb9467777 100644
--- a/SU2_CFD/include/output/CFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CFlowIncOutput.hpp
@@ -49,7 +49,7 @@ class CVariable;
 class CFlowIncOutput final: public CFlowOutput {
 private:
 
-  unsigned short turb_model; /*!< \brief Boolean indicating whether have a turbulence model*/ 
+  unsigned short turb_model; /*!< \brief The kind of turbulence model*/ 
   bool heat,                 /*!< \brief Boolean indicating whether have a heat problem*/ 
   weakly_coupled_heat; /*!< \brief Boolean indicating whether have a weakly coupled heat equation*/ 
 
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 32460c67af24..31db8cd846d7 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -95,19 +95,19 @@ class COutput {
    ofstream histFile;
   
   /** \brief Enum to identify the screen output format. */
-  enum ScreenOutputFormat {           
-    FORMAT_INTEGER,         /*!< \brief Integer format. Example: 34 */
-    FORMAT_FIXED,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
-    FORMAT_SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
+  enum class ScreenOutputFormat {           
+    INTEGER,         /*!< \brief Integer format. Example: 34 */
+    FIXED,           /*!< \brief Format with fixed precision for floating point values. Example: 344.54  */
+    SCIENTIFIC       /*!< \brief Scientific format for floating point values. Example: 3.4454E02 */  
   };
   
   /** \brief Enum to identify the screen/history field type. */  
-  enum HistoryFieldType {           
-    TYPE_RESIDUAL,         /*!< \brief A user-defined residual field type*/
-    TYPE_AUTO_RESIDUAL,    /*!< \brief An automatically generated residual field type */
-    TYPE_COEFFICIENT,      /*!< \brief User defined coefficient field type  */
-    TYPE_AUTO_COEFFICIENT, /*!< \brief Automatically generated coefficient field type  */
-    TYPE_DEFAULT           /*!< \brief Default field type */  
+  enum class HistoryFieldType {           
+    RESIDUAL,         /*!< \brief A user-defined residual field type*/
+    AUTO_RESIDUAL,    /*!< \brief An automatically generated residual field type */
+    COEFFICIENT,      /*!< \brief User defined coefficient field type  */
+    AUTO_COEFFICIENT, /*!< \brief Automatically generated coefficient field type  */
+    DEFAULT           /*!< \brief Default field type */  
   };
   
   /** \brief Structure to store information for a history output field.
@@ -121,18 +121,18 @@ class COutput {
     /*! \brief The value of the field. */
     su2double           value = 0.0;
     /*! \brief The format that is used to print this value to screen. */
-    unsigned short      screenFormat = FORMAT_FIXED; 
+    ScreenOutputFormat  screenFormat = ScreenOutputFormat::FIXED; 
     /*! \brief The group this field belongs to. */
     string              outputGroup  ="";  
     /*! \brief The field type*/
-    unsigned short      fieldType = TYPE_DEFAULT;
+    HistoryFieldType     fieldType = HistoryFieldType::DEFAULT;
     /*! \brief String containing the description of the field */
     string              description = "";
     /*! \brief Default constructor. */
     HistoryOutputField() {}         
     /*! \brief Constructor to initialize all members. */
-    HistoryOutputField(string fieldName_, unsigned short screenFormat_, string OutputGroup_, 
-                       unsigned short fieldType_, string description_):
+    HistoryOutputField(string fieldName_, ScreenOutputFormat screenFormat_, string OutputGroup_, 
+                       HistoryFieldType fieldType_, string description_):
       fieldName(std::move(fieldName_)), value(0.0), screenFormat(screenFormat_),
       outputGroup(std::move(OutputGroup_)), fieldType(fieldType_), description(std::move(description_)){}
   };
@@ -188,7 +188,7 @@ class COutput {
     /*! \brief The name of the field, i.e. the name that is printed in the file header.*/
     string fieldName;
     /*! \brief This value identifies the position of the values of this field at each node in the ::Local_Data array. */
-    int    offset; 
+    short  offset; 
     /*! \brief The group this field belongs to. */
     string outputGroup;
     /*! \brief String containing the description of the field */
@@ -209,7 +209,7 @@ class COutput {
   /*! \brief Vector to cache the positions of the field in the data array */
   std::vector<short>                            fieldIndexCache;
   /*! \brief Current value of the cache index */  
-  unsigned short                                curFieldIndex;
+  unsigned short                                cachePosition;
   /*! \brief Boolean to store whether the field index cache should be build. */    
   bool                                          buildFieldIndexCache;
   /*! \brief Vector to cache the positions of the field in the data array */
@@ -496,7 +496,9 @@ class COutput {
    * \param[in] description - A description of the field.
    * \param[in] field_type - The type of the field (::HistoryFieldType).
    */
-  inline void AddHistoryOutput(string name, string field_name, unsigned short format, string groupname, string description, unsigned short field_type = TYPE_DEFAULT ){
+  inline void AddHistoryOutput(string name, string field_name, ScreenOutputFormat format,
+                               string groupname, string description, 
+                               HistoryFieldType field_type = HistoryFieldType::DEFAULT ){
     historyOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type, description);
     historyOutput_List.push_back(name);
   }
@@ -523,7 +525,9 @@ class COutput {
    * \param[in] marker_names - A list of markers. For every marker in this list a new field is created with "field_name + _marker_names[i]".
    * \param[in] field_type - The type of the field (::HistoryFieldType).
    */
-  inline void AddHistoryOutputPerSurface(string name, string field_name, unsigned short format, string groupname, vector<string> marker_names, unsigned short field_type = TYPE_DEFAULT){
+  inline void AddHistoryOutputPerSurface(string name, string field_name, ScreenOutputFormat format, 
+                                         string groupname, vector<string> marker_names, 
+                                         HistoryFieldType field_type = HistoryFieldType::DEFAULT){
     if (marker_names.size() != 0){
       historyOutputPerSurface_List.push_back(name);
       for (unsigned short i = 0; i < marker_names.size(); i++){
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index b09983ddea08..485c4491a317 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -106,13 +106,13 @@ CAdjElasticityOutput::~CAdjElasticityOutput(void) {}
 void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
   // Residuals
-  AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", FORMAT_FIXED,   "RESIDUALS", "");
-  AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", FORMAT_FIXED,   "RESIDUALS", "");
-  AddHistoryOutput("ADJOINT_DISP_Z", "Res[Uz_adj]", FORMAT_FIXED,   "RESIDUALS", "");
+  AddHistoryOutput("ADJOINT_DISP_X", "Res[Ux_adj]", ScreenOutputFormat::FIXED,   "RESIDUALS", "");
+  AddHistoryOutput("ADJOINT_DISP_Y", "Res[Uy_adj]", ScreenOutputFormat::FIXED,   "RESIDUALS", "");
+  AddHistoryOutput("ADJOINT_DISP_Z", "Res[Uz_adj]", ScreenOutputFormat::FIXED,   "RESIDUALS", "");
   
   //Sensitivities
-  AddHistoryOutput("SENS_E", "Sens[E]",  FORMAT_FIXED, "SENSITIVITY", "");
-  AddHistoryOutput("SENS_NU","Sens[Nu]", FORMAT_FIXED, "SENSITIVITY", "");
+  AddHistoryOutput("SENS_E", "Sens[E]",  ScreenOutputFormat::FIXED, "SENSITIVITY", "");
+  AddHistoryOutput("SENS_NU","Sens[Nu]", ScreenOutputFormat::FIXED, "SENSITIVITY", "");
 
   
 }
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 8a650cd25f34..0358f31f29e0 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -105,26 +105,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint density.
-  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint density.", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_DENSITY",    "rms[A_Rho]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint density.", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum x-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-X", "rms[A_RhoU]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum y-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Y", "rms[A_RhoV]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint momentum z-component.
-  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum z-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_MOMENTUM-Z", "rms[A_RhoW]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint momentum z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint energy.
-  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint energy.", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_ENERGY",     "rms[A_E]",    ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint energy.", HistoryFieldType::RESIDUAL); 
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL);
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", " Root-mean square residual of the adjoint dissipation.", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", ScreenOutputFormat::FIXED, "RMS_RES", " Root-mean square residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL);   
       break;
     default: break;
     }
@@ -133,26 +133,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint density.
-  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint density.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_DENSITY",    "max[A_Rho]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint momentum x-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum x-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-X", "max[A_RhoU]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint momentum x-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum y-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum y-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Y", "max[A_RhoV]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint momentum y-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint momentum z-component
-  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint momentum z-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_MOMENTUM-Z", "max[A_RhoW]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint momentum z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint energy.
-  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint energy.", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_ENERGY",     "max[A_E]",    ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint energy.", HistoryFieldType::RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL);
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL); 
       break;
     default: break;
     }
@@ -162,26 +162,26 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   ///  /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The Block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: BGS residual of the adjoint density.
-  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint density.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_DENSITY",    "bgs[A_Rho]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: BGS residual of the adjoint momentum x-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum x-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-X", "bgs[A_RhoU]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint momentum x-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the adjoint momentum y-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum y-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Y", "bgs[A_RhoV]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint momentum y-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the adjoint momentum z-component
-  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint momentum z-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_MOMENTUM-Z", "bgs[A_RhoW]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint momentum z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the adjoint energy.
-  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint energy.", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_ENERGY",     "bgs[A_E]",    ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint energy.", HistoryFieldType::RESIDUAL); 
   if (!config->GetFrozen_Visc_Disc()){  
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGS residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bgs[A_nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: BGS residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", TYPE_RESIDUAL);
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL);
       /// DESCRIPTION: BGS residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", TYPE_RESIDUAL); 
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL); 
       break;
     default: break;
     }
@@ -191,15 +191,15 @@ void CAdjFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).
-  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_AOA",   "Sens_AoA",   ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the Mach number (only of compressible solver).
-  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the Mach number (only of compressible solver).", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_MACH",  "Sens_Mach",  ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the Mach number (only of compressible solver).", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field temperature.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field temperature.", HistoryFieldType::COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index bac0cb9697ae..3c61bef15c8d 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -109,26 +109,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Pressure.", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_PRESSURE",    "rms[A_P]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Pressure.", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity x-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-X", "rms[A_U]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity y-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Y", "rms[A_V]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
-  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity z-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", FORMAT_FIXED, "RMS_RES", " Root-mean square residual of the adjoint temperature.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", ScreenOutputFormat::FIXED, "RMS_RES", " Root-mean square residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
-      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("RMS_ADJ_NU_TILDE", "rms[A_nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Root-mean square residual of the adjoint kinetic energy.
-      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", TYPE_RESIDUAL); 
+      AddHistoryOutput("RMS_ADJ_TKE", "rms[A_k]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL); 
       /// DESCRIPTION: Root-mean square residual of the adjoint dissipation.
-      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint dissipation.", TYPE_RESIDUAL);   
+      AddHistoryOutput("RMS_ADJ_DISSIPATION",    "rms[A_w]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL);   
       break;
     default: break;
     }
@@ -137,26 +137,26 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Pressure.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_PRESSURE",    "max[A_Rho]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint Pressure.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the adjoint Velocity x-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity x-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-X", "max[A_RhoU]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity x-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity y-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity y-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Y", "max[A_RhoV]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity y-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the adjoint Velocity z-component
-  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity z-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the temperature.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature.", HistoryFieldType::RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
-      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("MAX_ADJ_NU_TILDE", "max[A_nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: Maximum residual of the adjoint kinetic energy.
-      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", TYPE_RESIDUAL);   
+      AddHistoryOutput("MAX_ADJ_TKE", "max[A_k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL);   
       /// DESCRIPTION: Maximum residual of the adjoint dissipation.
-      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", TYPE_RESIDUAL); 
+      AddHistoryOutput("MAX_ADJ_DISSIPATION",    "max[A_w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL); 
       break;
     default: break;
     }
@@ -165,44 +165,43 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: BGS residual of the adjoint Pressure.
-  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Pressure.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_PRESSURE",    "bgs[A_Rho]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint Pressure.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: BGS residual of the adjoint Velocity x-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity x-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-X", "bsg[A_RhoU]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint Velocity x-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the adjoint Velocity y-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity y-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Y", "bgs[A_RhoV]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint Velocity y-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the adjoint Velocity z-component
-  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint Velocity z-component", TYPE_RESIDUAL); 
+  AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint Velocity z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the temperature.
-  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
   if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGS residual of the adjoint nu tilde.
-      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", TYPE_RESIDUAL);      
+      AddHistoryOutput("BGS_ADJ_NU_TILDE", "bsg[A_nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint nu tilde.", HistoryFieldType::RESIDUAL);      
       break;  
     case SST:
       /// DESCRIPTION: BGS residual of the adjoint kinetic energy.
-      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", TYPE_RESIDUAL);   
+      AddHistoryOutput("BGS_ADJ_TKE", "bgs[A_k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint kinetic energy.", HistoryFieldType::RESIDUAL);   
       /// DESCRIPTION: BGS residual of the adjoint dissipation.
-      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", TYPE_RESIDUAL); 
+      AddHistoryOutput("BGS_ADJ_DISSIPATION",    "bgs[A_w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint dissipation.", HistoryFieldType::RESIDUAL); 
       break;
     default: break;
     }
   }
   /// END_GROUP
   
-  
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field pressure.
-  AddHistoryOutput("SENS_PRESS", "Sens_Press", FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS", "Sens_Press", ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the far-field pressure.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the far-field temperature.
-  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  FORMAT_SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the far-field temperature.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_TEMP",  "Sens_Temp",  ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the far-field temperature.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the inlet velocity.
-  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", FORMAT_SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the inlet velocity.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_VEL_IN", "Sens_Vin", ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", " Sensitivity of the objective function with respect to the inlet velocity.", HistoryFieldType::COEFFICIENT); 
   /// DESCRIPTION: Sensitivity of the objective function with respect to the outlet pressure.
-  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  FORMAT_SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the outlet pressure.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_PRESS_OUT",  "Sens_Pout",  ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sensitivity of the objective function with respect to the outlet pressure.", HistoryFieldType::COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index 62714a6d4bdd..c71f239adcba 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -98,20 +98,20 @@ void CAdjHeatOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the conservative variables. 
   /// DESCRIPTION: Root-mean square residual of the adjoint Pressure.
-  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the adjoint temperature.", TYPE_RESIDUAL); 
+  AddHistoryOutput("RMS_ADJ_TEMPERATURE",    "rms[A_T]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint temperature.", HistoryFieldType::RESIDUAL); 
   /// END_GROUP
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of the adjoint temperature.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
 
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the conservative variables. 
   /// DESCRIPTION: Maximum residual of the adjoint Pressure.
-  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  FORMAT_FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ADJ_TEMPERATURE",    "max[A_T]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
   
   /// BEGIN_GROUP: SENSITIVITY, DESCRIPTION: Sensitivities of different geometrical or boundary values.   
   /// DESCRIPTION: Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.
-  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   FORMAT_SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", TYPE_COEFFICIENT); 
+  AddHistoryOutput("SENS_GEO",   "Sens_Geo",   ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", HistoryFieldType::COEFFICIENT); 
   /// END_GROUP
   
 }
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CDriverOutput.cpp
index d95e2c51740d..554fe534a5fa 100644
--- a/SU2_CFD/src/output/CDriverOutput.cpp
+++ b/SU2_CFD/src/output/CDriverOutput.cpp
@@ -133,9 +133,9 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
   string name, header, group;
 
   if (config[ZONE_0]->GetTime_Domain()){
-    AddHistoryOutput("TIME_ITER", "Time_Iter", FORMAT_INTEGER,  "ITER", "Time iteration index");
+    AddHistoryOutput("TIME_ITER", "Time_Iter", ScreenOutputFormat::INTEGER,  "ITER", "Time iteration index");
   }
-  AddHistoryOutput("OUTER_ITER", "Outer_Iter", FORMAT_INTEGER,  "ITER", "Outer iteration index");
+  AddHistoryOutput("OUTER_ITER", "Outer_Iter", ScreenOutputFormat::INTEGER,  "ITER", "Outer iteration index");
   
   
   /*--- Set the fields ---*/
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 99c718e046c1..1f011eb6006e 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -147,26 +147,26 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL",  "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL",  "Residual of the linear solver.");
+  AddHistoryOutput("LINSOL_ITER", "LinSolIter", ScreenOutputFormat::INTEGER, "LINSOL",  "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL",  "Residual of the linear solver.");
   
   // Residuals
 
-  AddHistoryOutput("RMS_UTOL",   "rms[U]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_RTOL",   "rms[R]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_ETOL",   "rms[E]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_UTOL",   "rms[U]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("RMS_RTOL",   "rms[R]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("RMS_ETOL",   "rms[E]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
 
-  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", FORMAT_FIXED,  "RMS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DISP_X", "rms[DispX]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Y", "rms[DispY]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("RMS_DISP_Z", "rms[DispZ]", ScreenOutputFormat::FIXED,  "RMS_RES", "", HistoryFieldType::RESIDUAL);
 
-  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", FORMAT_FIXED,  "BGS_RES", "", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DISP_X", "bgs[DispX]", ScreenOutputFormat::FIXED,  "BGS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Y", "bgs[DispY]", ScreenOutputFormat::FIXED,  "BGS_RES", "", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", ScreenOutputFormat::FIXED,  "BGS_RES", "", HistoryFieldType::RESIDUAL);
 
-  AddHistoryOutput("VMS",            "VonMises", FORMAT_SCIENTIFIC, "", "VMS");
-  AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  FORMAT_FIXED, "", "LOAD_INCREMENT");
-  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       FORMAT_FIXED, "", "LOAD_RAMP");
+  AddHistoryOutput("VMS",            "VonMises", ScreenOutputFormat::SCIENTIFIC, "", "VMS");
+  AddHistoryOutput("LOAD_INCREMENT", "Load_Increment",  ScreenOutputFormat::FIXED, "", "LOAD_INCREMENT");
+  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       ScreenOutputFormat::FIXED, "", "LOAD_RAMP");
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index f616a7543c4e..06e541fca658 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -101,34 +101,34 @@ void CFlowCompFEMOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
-  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the density.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum x-component.
-  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum y-component.
-  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the momentum y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the momentum y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED,   "RMS_RES",  "Root-mean square residual of the momentum z-component.", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", ScreenOutputFormat::FIXED,   "RMS_RES",  "Root-mean square residual of the momentum z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the energy.
-  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the energy.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the energy.", HistoryFieldType::RESIDUAL);
   /// END_GROUP
    
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the density.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the momentum y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the z-component.", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the energy.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the energy.", HistoryFieldType::RESIDUAL);
   /// END_GROUP
    
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", ScreenOutputFormat::INTEGER, "LINSOL_ITER", "Number of iterations of the linear solver.");
   
-  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+  AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
  
   /*--- Add analyze surface history fields --- */
   
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index c3b54258456a..1a18462d3432 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -103,26 +103,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the density.
-  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the density.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_DENSITY",    "rms[Rho]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum x-component.
-  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-X", "rms[RhoU]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum y-component.
-  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_MOMENTUM-Y", "rms[RhoV]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the momentum y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the momentum z-component.
-  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the momentum z-component.", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_MOMENTUM-Z", "rms[RhoW]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the momentum z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the energy.
-  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the energy.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_ENERGY",     "rms[RhoE]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the energy.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-    AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-    AddHistoryOutput("RMS_DISSIPATION", "rms[w]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISSIPATION", "rms[w]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
     break;
   default: break;
   }
@@ -130,26 +130,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
    
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the density.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_DENSITY",    "max[Rho]",  ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-X", "max[RhoU]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", FORMAT_FIXED,   "MAX_RES", "Maximum square residual of the momentum y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_MOMENTUM-Y", "max[RhoV]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum square residual of the momentum y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", FORMAT_FIXED,"MAX_RES", "Maximum residual of the z-component.", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("MAX_MOMENTUM-Z", "max[RhoW]", ScreenOutputFormat::FIXED,"MAX_RES", "Maximum residual of the z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the energy.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_ENERGY",     "max[RhoE]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the energy.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", TYPE_RESIDUAL); 
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", HistoryFieldType::RESIDUAL); 
     break;
   default: break;
   }
@@ -157,26 +157,26 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block Gauss Seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the density.
-  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  FORMAT_FIXED,   "BGS_RES", "BGS residual of the density.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_DENSITY",    "bgs[Rho]",  ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the density.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum x-component. 
-  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the momentum x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_MOMENTUM-X", "bgs[RhoU]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the momentum x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum y-component. 
-  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the momentum y-component.",  TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_MOMENTUM-Y", "bgs[RhoV]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the momentum y-component.",  HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the momentum z-component. 
-  if (nDim == 3) AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", FORMAT_FIXED, "BGS_RES", "BGS residual of the z-component.",  TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("BGS_MOMENTUM-Z", "bgs[RhoW]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the z-component.",  HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the energy.  
-  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the energy.",  TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_ENERGY",     "bgs[RhoE]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the energy.",  HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).",  TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).",  HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).",  TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).",  HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", TYPE_RESIDUAL); 
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", HistoryFieldType::RESIDUAL); 
     break;
   default: break;
   }
@@ -188,59 +188,59 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   }  
   /// BEGIN_GROUP: AEROELASTIC, DESCRIPTION: Aeroelastic plunge, pitch
   /// DESCRIPTION: Aeroelastic plunge
-  AddHistoryOutputPerSurface("PLUNGE", "plunge", FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("PLUNGE", "plunge", ScreenOutputFormat::FIXED, "AEROELASTIC", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Aeroelastic pitch
-  AddHistoryOutputPerSurface("PITCH",  "pitch",  FORMAT_FIXED, "AEROELASTIC", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("PITCH",  "pitch",  ScreenOutputFormat::FIXED, "AEROELASTIC", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// END_GROUP
    
 
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL", "Residual of the linear solver.");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
  
   /// BEGIN_GROUP: ENGINE_OUTPUT, DESCRIPTION: Engine output
   /// DESCRIPTION: Aero CD drag
-  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Aero CD drag", TYPE_COEFFICIENT);
+  AddHistoryOutput("AEROCDRAG",                  "AeroCDrag",                  ScreenOutputFormat::SCIENTIFIC, "ENGINE_OUTPUT", "Aero CD drag", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Solid CD drag  
-  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Solid CD drag ", TYPE_COEFFICIENT);
+  AddHistoryOutput("SOLIDCDRAG",                 "SolidCDrag",                 ScreenOutputFormat::SCIENTIFIC, "ENGINE_OUTPUT", "Solid CD drag ", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Radial distortion 
-  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Radial distortion ", TYPE_COEFFICIENT);
+  AddHistoryOutput("RADIAL_DISTORTION",          "Radial_Distortion",          ScreenOutputFormat::SCIENTIFIC, "ENGINE_OUTPUT", "Radial distortion ", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Circumferential distortion
-  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", FORMAT_SCIENTIFIC, "ENGINE_OUTPUT", "Circumferential distortion", TYPE_COEFFICIENT);
+  AddHistoryOutput("CIRCUMFERENTIAL_DISTORTION", "Circumferential_Distortion", ScreenOutputFormat::SCIENTIFIC, "ENGINE_OUTPUT", "Circumferential distortion", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
   /// BEGIN_GROUP: ROTATING_FRAME, DESCRIPTION: Coefficients related to a rotating frame of reference.
   /// DESCRIPTION: Merit  
-  AddHistoryOutput("MERIT", "CMerit", FORMAT_SCIENTIFIC, "ROTATING_FRAME", "Merit", TYPE_COEFFICIENT);
+  AddHistoryOutput("MERIT", "CMerit", ScreenOutputFormat::SCIENTIFIC, "ROTATING_FRAME", "Merit", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: CT 
-  AddHistoryOutput("CT",    "CT",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", "CT", TYPE_COEFFICIENT);
+  AddHistoryOutput("CT",    "CT",     ScreenOutputFormat::SCIENTIFIC, "ROTATING_FRAME", "CT", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: CQ  
-  AddHistoryOutput("CQ",    "CQ",     FORMAT_SCIENTIFIC, "ROTATING_FRAME", "CQ", TYPE_COEFFICIENT);
+  AddHistoryOutput("CQ",    "CQ",     ScreenOutputFormat::SCIENTIFIC, "ROTATING_FRAME", "CQ", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
   /// BEGIN_GROUP: EQUIVALENT_AREA, DESCRIPTION: Equivalent area.  
   /// DESCRIPTION: Equivalent area    
-  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", "Equivalent area", TYPE_COEFFICIENT);
+  AddHistoryOutput("EQUIV_AREA",   "CEquiv_Area",  ScreenOutputFormat::SCIENTIFIC, "EQUIVALENT_AREA", "Equivalent area", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Nearfield obj. function      
-  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", FORMAT_SCIENTIFIC, "EQUIVALENT_AREA", "Nearfield obj. function ", TYPE_COEFFICIENT);
+  AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", ScreenOutputFormat::SCIENTIFIC, "EQUIVALENT_AREA", "Nearfield obj. function ", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
 
   ///   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
   /// DESCRIPTION: Total heatflux
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX", "HF",      ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Maximal heatflux  
-  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Temperature
-  AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("TEMPERATURE", "Temp", ScreenOutputFormat::SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
-  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+  AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
   
   if (config->GetDeform_Mesh()){
-    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
-    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
-    AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
-    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
+    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", ScreenOutputFormat::SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
+    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", ScreenOutputFormat::SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
+    AddHistoryOutput("DEFORM_ITER", "DeformIter", ScreenOutputFormat::INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", ScreenOutputFormat::FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
@@ -257,7 +257,7 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   
   /*--- Add combo obj value --- */
   
-  AddHistoryOutput("COMBO", "ComboObj", FORMAT_SCIENTIFIC, "COMBO", "Combined obj. function value.", TYPE_COEFFICIENT);
+  AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
 }
 
 void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index d03f03afc7f1..df5e9a2dce0d 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -102,26 +102,26 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: RMS_RES, DESCRIPTION: The root-mean-square residuals of the SOLUTION variables. 
   /// DESCRIPTION: Root-mean square residual of the pressure.
-  AddHistoryOutput("RMS_PRESSURE",   "rms[P]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the pressure.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_PRESSURE",   "rms[P]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the pressure.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity x-component.  
-  AddHistoryOutput("RMS_VELOCITY-X", "rms[U]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-X", "rms[U]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the velocity x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity y-component.  
-  AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_VELOCITY-Y", "rms[V]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the velocity y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Root-mean square residual of the velocity z-component.  
-  if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", FORMAT_FIXED,   "RMS_RES", "Root-mean square residual of the velocity z-component.", TYPE_RESIDUAL);
+  if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of the temperature.", TYPE_RESIDUAL);
+  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Root-mean square residual of nu tilde (SA model).  
-    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", FORMAT_FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_NU_TILDE",       "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).    
-    AddHistoryOutput("RMS_TKE", "rms[k]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_TKE", "rms[k]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Root-mean square residual of the dissipation (SST model).    
-    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  FORMAT_FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("RMS_DISSIPATION",    "rms[w]",  ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
     break;
   default: break;
   }
@@ -129,28 +129,28 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: MAX_RES, DESCRIPTION: The maximum residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
-  AddHistoryOutput("MAX_PRESSURE",   "max[P]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the pressure.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_PRESSURE",   "max[P]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the pressure.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   
-  AddHistoryOutput("MAX_VELOCITY-X", "max[U]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-X", "max[U]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the velocity x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity y-component.   
-  AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("MAX_VELOCITY-Y", "max[V]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the velocity y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity z-component.   
   if (nDim == 3) 
-    AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", FORMAT_FIXED,   "MAX_RES", "Maximum residual of the velocity z-component.", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   if (heat || weakly_coupled_heat) 
-    AddHistoryOutput("MAX_HEAT", "max[T]", FORMAT_FIXED, "MAX_RES", "Root-mean square residual of the temperature.", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_HEAT", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", FORMAT_FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_NU_TILDE",       "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("MAX_TKE", "max[k]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("MAX_TKE", "max[k]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  FORMAT_FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", TYPE_RESIDUAL); 
+    AddHistoryOutput("MAX_DISSIPATION",    "max[w]",  ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", HistoryFieldType::RESIDUAL); 
     break;
   default: break;
   }
@@ -158,28 +158,28 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   
   /// BEGIN_GROUP: BGS_RES, DESCRIPTION: The block-gauss seidel residuals of the SOLUTION variables. 
   /// DESCRIPTION: Maximum residual of the pressure.
-  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the pressure.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_PRESSURE",   "bgs[P]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the pressure.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity x-component.   
-  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity x-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-X", "bgs[U]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the velocity x-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity y-component.   
-  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity y-component.", TYPE_RESIDUAL);
+  AddHistoryOutput("BGS_VELOCITY-Y", "bgs[V]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the velocity y-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the velocity z-component.   
   if (nDim == 3) 
-    AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", FORMAT_FIXED,   "BGS_RES", "BGS residual of the velocity z-component.", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   if (heat || weakly_coupled_heat) 
-    AddHistoryOutput("BGS_HEAT", "bgs[T]", FORMAT_FIXED, "BGS_RES", "BGS residual of the temperature.", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_HEAT", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
     /// DESCRIPTION: Maximum residual of nu tilde (SA model).
-    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", FORMAT_FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_NU_TILDE",       "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
     break;  
   case SST: case SST_SUST:
     /// DESCRIPTION: Maximum residual of kinetic energy (SST model). 
-    AddHistoryOutput("BGS_TKE", "bgs[k]",  FORMAT_FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", TYPE_RESIDUAL);
+    AddHistoryOutput("BGS_TKE", "bgs[k]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
     /// DESCRIPTION: Maximum residual of the dissipation (SST model).   
-    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  FORMAT_FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", TYPE_RESIDUAL); 
+    AddHistoryOutput("BGS_DISSIPATION",    "bgs[w]",  ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", HistoryFieldType::RESIDUAL); 
     break;
   default: break;
   }
@@ -187,25 +187,25 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
 
   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
   /// DESCRIPTION: Total heatflux
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX", "HF",      ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Maximal heatflux  
-  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "maxHF",    ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total maximum heatflux on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Temperature
-  AddHistoryOutput("TEMPERATURE", "Temp", FORMAT_SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", TYPE_COEFFICIENT);
+  AddHistoryOutput("TEMPERATURE", "Temp", ScreenOutputFormat::SCIENTIFIC, "HEAT",  "Total avg. temperature on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
   /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA",         "AoA",                      FORMAT_SCIENTIFIC,"AOA", "Angle of attack");
+  AddHistoryOutput("AOA",         "AoA",                      ScreenOutputFormat::SCIENTIFIC,"AOA", "Angle of attack");
   /// DESCRIPTION: Linear solver iterations   
-  AddHistoryOutput("LINSOL_ITER", "LinSolIter", FORMAT_INTEGER, "LINSOL", "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", FORMAT_FIXED, "LINSOL", "Residual of the linear solver.");
-  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
+  AddHistoryOutput("LINSOL_ITER", "LinSolIter", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
+  AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");  
   
   if (config->GetDeform_Mesh()){
-    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", FORMAT_SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
-    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", FORMAT_SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
-    AddHistoryOutput("DEFORM_ITER", "DeformIter", FORMAT_INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
-    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", FORMAT_FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
+    AddHistoryOutput("DEFORM_MIN_VOLUME", "MinVolume", ScreenOutputFormat::SCIENTIFIC, "DEFORM", "Minimum volume in the mesh");
+    AddHistoryOutput("DEFORM_MAX_VOLUME", "MaxVolume", ScreenOutputFormat::SCIENTIFIC, "DEFORM", "Maximum volume in the mesh");
+    AddHistoryOutput("DEFORM_ITER", "DeformIter", ScreenOutputFormat::INTEGER, "DEFORM", "Linear solver iterations for the mesh deformation");
+    AddHistoryOutput("DEFORM_RESIDUAL", "DeformRes", ScreenOutputFormat::FIXED, "DEFORM", "Residual of the linear solver for the mesh deformation");    
   }
   
   /*--- Add analyze surface history fields --- */
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 694c3c66460c..2ebad2e19ee5 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -49,33 +49,33 @@ void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   
   
   /// DESCRIPTION: Average mass flow    
-  AddHistoryOutput("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average mass flow on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_MASSFLOW",             "Avg_Massflow",              ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average mass flow on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Mach number      
-  AddHistoryOutput("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average mach number on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_MACH",                 "Avg_Mach",                  ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average mach number on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Temperature        
-  AddHistoryOutput("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average temperature on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TEMP",                 "Avg_Temp",                  ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average temperature on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Pressure  
-  AddHistoryOutput("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average pressure on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_PRESS",                "Avg_Press",                 ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average pressure on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Density  
-  AddHistoryOutput("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average density on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_DENSITY",              "Avg_Density",               ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average density on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutput("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average enthalpy on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_ENTHALPY",             "Avg_Enthalpy",              ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average enthalpy on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutput("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average normal velocity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_NORMALVEL",            "Avg_NormalVel",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average normal velocity on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutput("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total flow uniformity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("UNIFORMITY",               "Uniformity",                ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total flow uniformity on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Secondary strength
-  AddHistoryOutput("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total secondary strength on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("SECONDARY_STRENGTH",       "Secondary_Strength",        ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total secondary strength on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutput("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total momentum distortion on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENTUM_DISTORTION",      "Momentum_Distortion",       ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total momentum distortion on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutput("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total secondary over uniformity on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total secondary over uniformity on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average total temperature  
-  AddHistoryOutput("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average total temperature all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TOTALTEMP",            "Avg_TotalTemp",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average total temperature all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average total pressure   
-  AddHistoryOutput("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total average total pressure on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("AVG_TOTALPRESS",           "Avg_TotalPress",            ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average total pressure on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Pressure drop    
-  AddHistoryOutput("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF", "Total pressure drop on all markers set in MARKER_ANALYZE", TYPE_COEFFICIENT);
+  AddHistoryOutput("PRESSURE_DROP",            "Pressure_Drop",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total pressure drop on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
   
@@ -86,33 +86,33 @@ void CFlowOutput::AddAnalyzeSurfaceOutput(CConfig *config){
   }  
   
   /// DESCRIPTION: Average mass flow    
-  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_MASSFLOW",             "Avg_Massflow",              ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Mach number      
-  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_MACH",                 "Avg_Mach",                  ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Temperature        
-  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TEMP",                 "Avg_Temp",                  ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Pressure  
-  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_PRESS",                "Avg_Press",                 ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Density  
-  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_DENSITY",              "Avg_Density",               ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average Enthalpy  
-  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_ENTHALPY",             "Avg_Enthalpy",              ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average velocity in normal direction of the surface
-  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_NORMALVEL",            "Avg_NormalVel",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Flow uniformity 
-  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("UNIFORMITY",               "Uniformity",                ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Secondary strength
-  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_STRENGTH",       "Secondary_Strength",        ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Momentum distortion  
-  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENTUM_DISTORTION",      "Momentum_Distortion",       ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Secondary over uniformity 
-  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SECONDARY_OVER_UNIFORMITY", "Secondary_Over_Uniformity", ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average total temperature  
-  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALTEMP",            "Avg_TotalTemp",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Average total pressure   
-  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("AVG_TOTALPRESS",           "Avg_TotalPress",            ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Pressure drop    
-  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             FORMAT_SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("PRESSURE_DROP",            "Pressure_Drop",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF_SURF", Marker_Analyze, HistoryFieldType::COEFFICIENT);
   /// END_GROUP
   
 }
@@ -685,25 +685,25 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
   
   /// BEGIN_GROUP: AERO_COEFF, DESCRIPTION: Sum of the aerodynamic coefficients and forces on all surfaces (markers) set with MARKER_MONITORING.
   /// DESCRIPTION: Drag coefficient 
-  AddHistoryOutput("DRAG",       "CD",   FORMAT_FIXED, "AERO_COEFF", "Total drag coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("DRAG",       "CD",   ScreenOutputFormat::FIXED, "AERO_COEFF", "Total drag coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Lift coefficient 
-  AddHistoryOutput("LIFT",       "CL",   FORMAT_FIXED, "AERO_COEFF", "Total lift coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("LIFT",       "CL",   ScreenOutputFormat::FIXED, "AERO_COEFF", "Total lift coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient   
-  AddHistoryOutput("SIDEFORCE",  "CSF",  FORMAT_FIXED, "AERO_COEFF", "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("SIDEFORCE",  "CSF",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  FORMAT_FIXED, "AERO_COEFF", "Total momentum x-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-X",   "CMx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  FORMAT_FIXED, "AERO_COEFF", "Total momentum y-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Y",   "CMy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  FORMAT_FIXED, "AERO_COEFF", "Total momentum z-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("MOMENT-Z",   "CMz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  FORMAT_FIXED, "AERO_COEFF", "Total force x-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-X",    "CFx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  FORMAT_FIXED, "AERO_COEFF", "Total force y-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Y",    "CFy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  FORMAT_FIXED, "AERO_COEFF", "Total force z-component on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("FORCE-Z",    "CFz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio
-  AddHistoryOutput("EFFICIENCY", "CEff", FORMAT_FIXED, "AERO_COEFF", "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", TYPE_COEFFICIENT);
+  AddHistoryOutput("EFFICIENCY", "CEff", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// END_GROUP  
   
   /// BEGIN_GROUP: AERO_COEFF_SURF, DESCRIPTION: Aerodynamic coefficients and forces per surface.
@@ -712,29 +712,29 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
     Marker_Monitoring.push_back(config->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
   }  
   /// DESCRIPTION: Drag coefficient   
-  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("DRAG_ON_SURFACE",       "CD",   ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Lift coefficient   
-  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("LIFT_ON_SURFACE",       "CL",   ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Sideforce coefficient     
-  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("SIDEFORCE_ON_SURFACE",  "CSF",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis      
-  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-X_ON_SURFACE",   "CMx",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis      
-  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Y_ON_SURFACE",   "CMy",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis        
-  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("MOMENT-Z_ON_SURFACE",   "CMz",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in x direction      
-  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-X_ON_SURFACE",    "CFx",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in y direction      
-  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Y_ON_SURFACE",    "CFy",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in z direction        
-  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("FORCE-Z_ON_SURFACE",    "CFz",  ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio  
-  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", FORMAT_FIXED, "AERO_COEFF_SURF", Marker_Monitoring, TYPE_COEFFICIENT);
+  AddHistoryOutputPerSurface("EFFICIENCY_ON_SURFACE", "CEff", ScreenOutputFormat::FIXED, "AERO_COEFF_SURF", Marker_Monitoring, HistoryFieldType::COEFFICIENT);
   /// END_GROUP 
 
   /// DESCRIPTION: Angle of attack  
-  AddHistoryOutput("AOA", "AoA", FORMAT_SCIENTIFIC, "AOA", "Angle of attack");
+  AddHistoryOutput("AOA", "AoA", ScreenOutputFormat::SCIENTIFIC, "AOA", "Angle of attack");
 }
 
 void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
@@ -782,7 +782,7 @@ void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solv
 
 void CFlowOutput::Add_CpInverseDesignOutput(CConfig *config){
   
-  AddHistoryOutput("CP_DIFF", "Cp_Diff", FORMAT_FIXED, "CP_DIFF", "Cp difference for inverse design");
+  AddHistoryOutput("CP_DIFF", "Cp_Diff", ScreenOutputFormat::FIXED, "CP_DIFF", "Cp difference for inverse design");
   
 }
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 78ba2ad828de..c6cdcc95d59f 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -107,16 +107,16 @@ void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver
 
 void CHeatOutput::SetHistoryOutputFields(CConfig *config){
   
-  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", FORMAT_INTEGER, "LINSOL_ITER", "Linear solver iterations");
+  AddHistoryOutput("LINSOL_ITER", "Linear_Solver_Iterations", ScreenOutputFormat::INTEGER, "LINSOL_ITER", "Linear solver iterations");
   
-  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", FORMAT_FIXED, "RMS_RES", "Root mean square residual of the temperature", TYPE_RESIDUAL);
-  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", FORMAT_FIXED, "MAX_RES", "Maximum residual of the temperature", TYPE_RESIDUAL);
-  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", FORMAT_FIXED, "BGS_RES", "Block-Gauss seidel residual of the temperature", TYPE_RESIDUAL);
+  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root mean square residual of the temperature", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "Block-Gauss seidel residual of the temperature", HistoryFieldType::RESIDUAL);
   
-  AddHistoryOutput("HEATFLUX", "HF",      FORMAT_SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
-  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    FORMAT_SCIENTIFIC, "HEAT", "Total maximal heatflux on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
-  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", FORMAT_SCIENTIFIC, "HEAT", "Total average temperature on all surfaces defined in MARKER_MONITORING", TYPE_COEFFICIENT);
-  AddHistoryOutput("CFL_NUMBER", "CFL number", FORMAT_SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+  AddHistoryOutput("HEATFLUX", "HF",      ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("HEATFLUX_MAX", "MaxHF",    ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total maximal heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total average temperature on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
   
 }
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 9ae335f4b49f..2dbb7b086577 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -724,7 +724,7 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     
     /*--- Cauchy based convergence criteria ---*/
     
-    if (historyOutput_Map[convField].fieldType == TYPE_COEFFICIENT) {
+    if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT) {
       
       if (Iteration == 0){
         for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
@@ -754,7 +754,8 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     
     /*--- Residual based convergence criteria ---*/
     
-    if (historyOutput_Map[convField].fieldType == TYPE_RESIDUAL || historyOutput_Map[convField].fieldType == TYPE_AUTO_RESIDUAL) {
+    if (historyOutput_Map[convField].fieldType == HistoryFieldType::RESIDUAL || 
+        historyOutput_Map[convField].fieldType == HistoryFieldType::AUTO_RESIDUAL) {
       
       /*--- Check the convergence ---*/
       
@@ -825,7 +826,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
     for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
       const string & requestedField = requestedHistoryFields[iReqField];   
       if (requestedField == field.outputGroup || (requestedField == fieldIdentifier)){
-        if (field.screenFormat == FORMAT_INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
+        if (field.screenFormat == ScreenOutputFormat::INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
         else{ width = std::max((int)field.fieldName.size()+2, 18);}
         historyFileTable->AddColumn("\"" + field.fieldName + "\"", width);
       }
@@ -839,7 +840,7 @@ void COutput::SetHistoryFile_Header(CConfig *config) {
       for (iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
         const string &requestedField = requestedHistoryFields[iReqField];   
         if (requestedField == field.outputGroup || (requestedField == fieldIdentifier)){
-          if (field.screenFormat == FORMAT_INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
+          if (field.screenFormat == ScreenOutputFormat::INTEGER) width = std::max((int)field.fieldName.size()+2, 10);  
           else{ width = std::max((int)field.fieldName.size()+2, 18);}
           historyFileTable->AddColumn("\"" + field.fieldName + "\"", width);          
         }
@@ -907,26 +908,26 @@ void COutput::SetScreen_Output(CConfig *config) {
     RequestedField = requestedScreenFields[iReqField]; 
     if (historyOutput_Map.count(RequestedField) > 0){  
       switch (historyOutput_Map[RequestedField].screenFormat) {
-        case FORMAT_INTEGER:
+        case ScreenOutputFormat::INTEGER:
           PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(historyOutput_Map[RequestedField].value), fieldWidth);
           break;
-        case FORMAT_FIXED:
+        case ScreenOutputFormat::FIXED:
           PrintingToolbox::PrintScreenFixed(out, historyOutput_Map[RequestedField].value, fieldWidth);
           break;
-        case FORMAT_SCIENTIFIC:
+        case ScreenOutputFormat::SCIENTIFIC:
           PrintingToolbox::PrintScreenScientific(out, historyOutput_Map[RequestedField].value, fieldWidth);
           break;      
       }
     }
     if (historyOutputPerSurface_Map.count(RequestedField) > 0){
       switch (historyOutputPerSurface_Map[RequestedField][0].screenFormat) {
-        case FORMAT_INTEGER:
+        case ScreenOutputFormat::INTEGER:
           PrintingToolbox::PrintScreenInteger(out, SU2_TYPE::Int(historyOutputPerSurface_Map[RequestedField][0].value), fieldWidth);
           break;
-        case FORMAT_FIXED:
+        case ScreenOutputFormat::FIXED:
           PrintingToolbox::PrintScreenFixed(out, historyOutputPerSurface_Map[RequestedField][0].value, fieldWidth);
           break;
-        case FORMAT_SCIENTIFIC:
+        case ScreenOutputFormat::SCIENTIFIC:
           PrintingToolbox::PrintScreenScientific(out, historyOutputPerSurface_Map[RequestedField][0].value, fieldWidth);
           break;   
       }
@@ -1268,7 +1269,7 @@ void COutput::LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver**
   unsigned long iVertex = 0;
   
   /*--- Reset the offset cache and index --- */
-  curFieldIndex = 0;
+  cachePosition = 0;
   fieldIndexCache.clear();
   curGetFieldIndex = 0;
   fieldGetIndexCache.clear();
@@ -1312,7 +1313,7 @@ void COutput::LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver**
     }
     
     /*--- Reset the offset cache and index --- */
-    curFieldIndex = 0;
+    cachePosition = 0;
     fieldIndexCache.clear();
     curGetFieldIndex = 0;
     fieldGetIndexCache.clear();
@@ -1357,12 +1358,12 @@ void COutput::SetVolumeOutputValue(string name, unsigned long iPoint, su2double
     
     /*--- Use the offset cache for the access ---*/
     
-    const short Offset = fieldIndexCache[curFieldIndex++];
+    const short Offset = fieldIndexCache[cachePosition++];
     if (Offset != -1){
       volumeDataSorter->SetUnsorted_Data(iPoint, Offset, value);
     }   
-    if (curFieldIndex == fieldIndexCache.size()){
-      curFieldIndex = 0;
+    if (cachePosition == fieldIndexCache.size()){
+      cachePosition = 0;
     }
   }
   
@@ -1429,7 +1430,7 @@ void COutput::SetAvgVolumeOutputValue(string name, unsigned long iPoint, su2doub
     
     /*--- Use the offset cache for the access ---*/
     
-    const short Offset = fieldIndexCache[curFieldIndex++];
+    const short Offset = fieldIndexCache[cachePosition++];
     if (Offset != -1){
       
       const su2double old_value = volumeDataSorter->GetUnsorted_Data(iPoint, Offset);
@@ -1437,8 +1438,8 @@ void COutput::SetAvgVolumeOutputValue(string name, unsigned long iPoint, su2doub
       
       volumeDataSorter->SetUnsorted_Data(iPoint, Offset, new_value);
     }   
-    if (curFieldIndex == fieldIndexCache.size()){
-      curFieldIndex = 0;
+    if (cachePosition == fieldIndexCache.size()){
+      cachePosition = 0;
     }
   }
   
@@ -1456,7 +1457,7 @@ void COutput::Postprocess_HistoryData(CConfig *config){
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     const string &fieldIdentifier = historyOutput_List[iField];
     const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
-    if (currentField.fieldType == TYPE_RESIDUAL){
+    if (currentField.fieldType == HistoryFieldType::RESIDUAL){
       if ( SetInit_Residuals(config) || (currentField.value > initialResiduals[fieldIdentifier]) ) {
         initialResiduals[fieldIdentifier] = currentField.value;
       }
@@ -1467,7 +1468,7 @@ void COutput::Postprocess_HistoryData(CConfig *config){
       Average[currentField.outputGroup].second++;
            
     }
-    if (currentField.fieldType == TYPE_COEFFICIENT){
+    if (currentField.fieldType == HistoryFieldType::COEFFICIENT){
       if(SetUpdate_Averages(config)){
         if (config->GetTime_Domain()){
           SetHistoryOutputValue("TAVG_" + fieldIdentifier,
@@ -1502,27 +1503,27 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
     const string &fieldIdentifier = historyOutput_List[iField];    
     const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
-    if (currentField.fieldType == TYPE_RESIDUAL){
+    if (currentField.fieldType == HistoryFieldType::RESIDUAL){
       AddHistoryOutput("REL_" + fieldIdentifier, "rel" + currentField.fieldName, currentField.screenFormat,
-                       "REL_" + currentField.outputGroup,  "Relative residual.", TYPE_AUTO_RESIDUAL);
+                       "REL_" + currentField.outputGroup,  "Relative residual.", HistoryFieldType::AUTO_RESIDUAL);
       Average[currentField.outputGroup] = true;
     }
   }
   
   map<string, bool>::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
-    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", FORMAT_FIXED,
-                     "AVG_" + it->first , "Average residual over all solution variables.", TYPE_AUTO_RESIDUAL);
+    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", ScreenOutputFormat::FIXED,
+                     "AVG_" + it->first , "Average residual over all solution variables.", HistoryFieldType::AUTO_RESIDUAL);
   }  
   
   if (config->GetTime_Domain()){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       const string &fieldIdentifier = historyOutput_List[iField];    
       const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
-      if (currentField.fieldType == TYPE_COEFFICIENT){
+      if (currentField.fieldType == HistoryFieldType::COEFFICIENT){
         AddHistoryOutput("TAVG_"   + fieldIdentifier, "tavg["  + currentField.fieldName + "]",
                          currentField.screenFormat, "TAVG_"   + currentField.outputGroup, "Time averaged values.", 
-                         TYPE_AUTO_COEFFICIENT);
+                         HistoryFieldType::AUTO_COEFFICIENT);
       }
     }
   }
@@ -1531,10 +1532,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       const string &fieldIdentifier = historyOutput_List[iField];    
       const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
-      if (currentField.fieldType == TYPE_COEFFICIENT){
+      if (currentField.fieldType == HistoryFieldType::COEFFICIENT){
         AddHistoryOutput("D_"      + fieldIdentifier, "d["     + currentField.fieldName + "]",
                          currentField.screenFormat, "D_"      + currentField.outputGroup, 
-                         "Derivative value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+                         "Derivative value (DIRECT_DIFF=YES)", HistoryFieldType::AUTO_COEFFICIENT);  
       }
     }
   }
@@ -1543,17 +1544,17 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     for (unsigned short iField = 0; iField < historyOutput_List.size(); iField++){
       const string &fieldIdentifier = historyOutput_List[iField];    
       const HistoryOutputField &currentField = historyOutput_Map[fieldIdentifier];
-      if (currentField.fieldType == TYPE_COEFFICIENT){
+      if (currentField.fieldType == HistoryFieldType::COEFFICIENT){
         AddHistoryOutput("D_TAVG_" + fieldIdentifier, "dtavg[" + currentField.fieldName + "]",
                          currentField.screenFormat, "D_TAVG_" + currentField.outputGroup, 
-                         "Derivative of the time averaged value (DIRECT_DIFF=YES)", TYPE_AUTO_COEFFICIENT);  
+                         "Derivative of the time averaged value (DIRECT_DIFF=YES)", HistoryFieldType::AUTO_COEFFICIENT);  
       }
     }
   }
   
-  if (historyOutput_Map[convField].fieldType == TYPE_COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", FORMAT_SCIENTIFIC, "CAUCHY",
-                     "Cauchy residual value of field set with CONV_FIELD." ,TYPE_AUTO_COEFFICIENT);
+  if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT){
+    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", ScreenOutputFormat::SCIENTIFIC, "CAUCHY",
+                     "Cauchy residual value of field set with CONV_FIELD." ,HistoryFieldType::AUTO_COEFFICIENT);
   }
 
 }
@@ -1697,21 +1698,21 @@ void COutput::SetCommonHistoryFields(CConfig *config){
   
   /// BEGIN_GROUP: ITERATION, DESCRIPTION: Iteration identifier.
   /// DESCRIPTION: The time iteration index.
-  AddHistoryOutput("TIME_ITER",     "Time_Iter",  FORMAT_INTEGER, "ITER", "Time iteration index"); 
+  AddHistoryOutput("TIME_ITER",     "Time_Iter",  ScreenOutputFormat::INTEGER, "ITER", "Time iteration index"); 
   /// DESCRIPTION: The outer iteration index.
-  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  FORMAT_INTEGER, "ITER", "Outer iteration index"); 
+  AddHistoryOutput("OUTER_ITER",   "Outer_Iter",  ScreenOutputFormat::INTEGER, "ITER", "Outer iteration index"); 
   /// DESCRIPTION: The inner iteration index.
-  AddHistoryOutput("INNER_ITER",   "Inner_Iter", FORMAT_INTEGER,  "ITER", "Inner iteration index"); 
+  AddHistoryOutput("INNER_ITER",   "Inner_Iter", ScreenOutputFormat::INTEGER,  "ITER", "Inner iteration index"); 
   /// END_GROUP
   
   /// BEGIN_GROUP: TIME_DOMAIN, DESCRIPTION: Time integration information
   /// Description: The current time
-  AddHistoryOutput("CUR_TIME", "Cur_Time", FORMAT_SCIENTIFIC, "TIME_DOMAIN", "Current physical time (s)");
+  AddHistoryOutput("CUR_TIME", "Cur_Time", ScreenOutputFormat::SCIENTIFIC, "TIME_DOMAIN", "Current physical time (s)");
   /// Description: The current time step
-  AddHistoryOutput("TIME_STEP", "Time_Step", FORMAT_SCIENTIFIC, "TIME_DOMAIN", "Current time step (s)");
+  AddHistoryOutput("TIME_STEP", "Time_Step", ScreenOutputFormat::SCIENTIFIC, "TIME_DOMAIN", "Current time step (s)");
  
   /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(sec)", FORMAT_SCIENTIFIC, "PHYS_TIME", "Average wall-clock time"); 
+  AddHistoryOutput("PHYS_TIME",   "Time(sec)", ScreenOutputFormat::SCIENTIFIC, "PHYS_TIME", "Average wall-clock time"); 
   
 }
 
@@ -1781,13 +1782,15 @@ void COutput::PrintHistoryFields(){
       
       HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField]];
       
-      if (Field.fieldType == TYPE_DEFAULT || Field.fieldType == TYPE_COEFFICIENT || Field.fieldType == TYPE_RESIDUAL){
+      if (Field.fieldType == HistoryFieldType::DEFAULT 
+          || Field.fieldType == HistoryFieldType::COEFFICIENT
+          || Field.fieldType == HistoryFieldType::RESIDUAL){
         string type;
         switch (Field.fieldType) {
-          case TYPE_COEFFICIENT:
+          case HistoryFieldType::COEFFICIENT:
             type = "C";
             break;
-          case TYPE_RESIDUAL:
+          case HistoryFieldType::RESIDUAL:
             type = "R";
             break;
           default:
@@ -1822,13 +1825,14 @@ void COutput::PrintHistoryFields(){
       
       HistoryOutputField &Field = historyOutput_Map[historyOutput_List[iField]];
       
-      if ((Field.fieldType == TYPE_AUTO_COEFFICIENT || Field.fieldType == TYPE_AUTO_RESIDUAL) && (GroupVisited.count(Field.outputGroup) == 0)){
+      if ((Field.fieldType == HistoryFieldType::AUTO_COEFFICIENT ||
+           Field.fieldType == HistoryFieldType::AUTO_RESIDUAL) && (GroupVisited.count(Field.outputGroup) == 0)){
         string type;
         switch (Field.fieldType) {
-          case TYPE_AUTO_COEFFICIENT:
+          case HistoryFieldType::AUTO_COEFFICIENT:
             type = "AC";
             break;
-          case TYPE_AUTO_RESIDUAL:
+          case HistoryFieldType::AUTO_RESIDUAL:
             type = "AR";
             break;
           default:

From 7a8d1c6dbcca7cb6e2d68c362cce316a176a43c7 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 14:40:11 +0200
Subject: [PATCH 518/539] Changed size determination of dataBuffer

---
 SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
index f1f300ea05ce..b0c7b1aa2c99 100644
--- a/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
+++ b/SU2_CFD/src/output/filewriter/CParallelDataSorter.cpp
@@ -320,9 +320,10 @@ void CParallelDataSorter::PrepareSendBuffers(std::vector<unsigned long>& globalI
   connSend = NULL;
   connSend = new su2double[VARS_PER_POINT*nPoint_Send[size]]();
   
-  /*--- Allocate the data buffer to hold the sorted data. ---*/
-  assert(sizeof(su2double) >= sizeof (double));
-  dataBuffer = new char[VARS_PER_POINT*nPoint_Recv[size]*sizeof(su2double)];
+  /*--- Allocate the data buffer to hold the sorted data. We have to make it large enough
+   * to hold passivedoubles and su2doubles ---*/
+  unsigned short maxSize = max(sizeof(passivedouble), sizeof(su2double));
+  dataBuffer = new char[VARS_PER_POINT*nPoint_Recv[size]*maxSize];
   
   /*--- doubleBuffer and passiveDouble buffer use the same memory allocated above using the dataBuffer. ---*/
   

From b2142dd90c04b644a4bbc770ac908aeb8b4b28e5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 18:20:37 +0200
Subject: [PATCH 519/539] Fixed warning

---
 Common/include/config_structure.hpp                    | 2 +-
 Common/src/config_structure.cpp                        | 2 +-
 SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index 430455a1ac1c..bdab0e9c1bb8 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -5506,7 +5506,7 @@ class CConfig {
    * \param[in] val_iter - Unsteady iteration number or time instance.
    * \return Name of the file with the iteration number for an unsteady solution file.
    */
-  string GetUnsteady_FileName(string val_filename, long val_iter, string ext);
+  string GetUnsteady_FileName(string val_filename, int val_iter, string ext);
   
   /*!
    * \brief Append the input filename string with the appropriate objective function extension.
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 640f9334a800..38784346fde9 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -7500,7 +7500,7 @@ string CConfig::GetFilename(string filename, string ext, unsigned long Iter){
   return filename;
 }
 
-string CConfig::GetUnsteady_FileName(string val_filename, long val_iter, string ext) {
+string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, string ext) {
 
   string UnstExt="", UnstFilename = val_filename;
   char buffer[50];
diff --git a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
index 64f8e736a63e..5d528e5cd4aa 100644
--- a/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2BinaryFileWriter.cpp
@@ -16,7 +16,6 @@ void CSU2BinaryFileWriter::Write_Data(){
   /*--- Local variables ---*/
 
   unsigned short iVar;
-  unsigned long iPoint;
   
   unsigned short GlobalField_Counter = fieldnames.size();
   unsigned long nParallel_Poin = dataSorter->GetnPoints();

From 62165308b3c246384760073cf11b72594ab8cf30 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 18:22:06 +0200
Subject: [PATCH 520/539] Added function to get heat flux in heat solver

---
 SU2_CFD/include/solver_structure.hpp  | 10 +++++++++-
 SU2_CFD/include/solver_structure.inl  |  2 ++
 SU2_CFD/src/output/CFlowIncOutput.cpp |  7 ++++++-
 SU2_CFD/src/solver_direct_heat.cpp    | 25 ++++++++++++++-----------
 SU2_DEF/src/SU2_DEF.cpp               |  5 +----
 SU2_GEO/src/SU2_GEO.cpp               |  1 -
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp
index 63f04c64e9c7..e3a73b180fc0 100644
--- a/SU2_CFD/include/solver_structure.hpp
+++ b/SU2_CFD/include/solver_structure.hpp
@@ -11274,7 +11274,7 @@ class CWaveSolver : public CSolver {
 class CHeatSolverFVM : public CSolver {
 protected:
   unsigned short nVarFlow, nMarker, CurrentMesh;
-  su2double *Heat_Flux, *Surface_HF, Total_HeatFlux, AllBound_HeatFlux,
+  su2double **HeatFlux, *Surface_HF, Total_HeatFlux, AllBound_HeatFlux,
             *AvgTemperature, Total_AvgTemperature, AllBound_AvgTemperature,
             *Primitive, *Primitive_Flow_i, *Primitive_Flow_j,
             *Surface_Areas, Total_HeatFlux_Areas, Total_HeatFlux_Areas_Monitor;
@@ -11522,6 +11522,14 @@ class CHeatSolverFVM : public CSolver {
    */
   void SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                             unsigned short iRKStep, unsigned short iMesh, unsigned short RunTime_EqSystem);
+  
+  /*!
+   * \brief Get the heat flux.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the heat flux.
+   */
+  su2double GetHeatFlux(unsigned short val_marker, unsigned long val_vertex);  
 
 };
 
diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl
index 69ef61761607..bc52af2becb3 100644
--- a/SU2_CFD/include/solver_structure.inl
+++ b/SU2_CFD/include/solver_structure.inl
@@ -2257,6 +2257,8 @@ inline void CIncNSSolver::SetConjugateHeatVariable(unsigned short val_marker, un
 
 inline su2double CHeatSolverFVM::GetTotal_HeatFlux() { return Total_HeatFlux; }
 
+inline su2double CHeatSolverFVM::GetHeatFlux(unsigned short val_marker, unsigned long val_vertex) { return HeatFlux[val_marker][val_vertex]; }
+
 inline su2double CHeatSolverFVM::GetTotal_AvgTemperature() { return Total_AvgTemperature; }
 
 inline su2double CHeatSolverFVM::GetConjugateHeatVariable(unsigned short val_marker, unsigned long val_vertex, unsigned short pos_var) { return ConjugateVar[val_marker][val_vertex][pos_var]; }
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index df5e9a2dce0d..d93cad2574bb 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -590,7 +590,12 @@ void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolv
     if (nDim == 3)
       SetVolumeOutputValue("SKIN_FRICTION-Z", iPoint, solver[FLOW_SOL]->GetCSkinFriction(iMarker, iVertex, 2));
   
-    SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+    if (weakly_coupled_heat)
+      SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[HEAT_SOL]->GetHeatFlux(iMarker, iVertex));
+    else {
+      SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[FLOW_SOL]->GetHeatFlux(iMarker, iVertex));
+      
+    }
     SetVolumeOutputValue("Y_PLUS", iPoint, solver[FLOW_SOL]->GetYPlus(iMarker, iVertex));
   }
 }
diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp
index ca97a11dae29..4a43ca0321aa 100644
--- a/SU2_CFD/src/solver_direct_heat.cpp
+++ b/SU2_CFD/src/solver_direct_heat.cpp
@@ -158,12 +158,12 @@ CHeatSolverFVM::CHeatSolverFVM(CGeometry *geometry, CConfig *config, unsigned sh
       Smatrix[iDim] = new su2double [nDim];
   }
 
-  Heat_Flux = new su2double[nMarker];
+  HeatFlux = new su2double*[nMarker];
   AvgTemperature = new su2double[nMarker];
   Surface_Areas = new su2double[config->GetnMarker_HeatFlux()];
 
   for(iMarker = 0; iMarker < nMarker; iMarker++) {
-    Heat_Flux[iMarker] = 0.0;
+    HeatFlux[iMarker] = new su2double[geometry->GetnVertex(iMarker)];
     AvgTemperature[iMarker] = 0.0;
   }
   for(iMarker = 0; iMarker < config->GetnMarker_HeatFlux(); iMarker++) {
@@ -1204,8 +1204,6 @@ void CHeatSolverFVM::Heat_Fluxes(CGeometry *geometry, CSolver **solver_container
     Marker_Tag = config->GetMarker_All_TagBound(iMarker);
     Monitoring = config->GetMarker_All_Monitoring(iMarker);
 
-    Heat_Flux[iMarker] = 0.0;
-
     if ( Boundary == ISOTHERMAL ) {
 
       Twall = config->GetIsothermal_Temperature(Marker_Tag)/config->GetTemperature_Ref();
@@ -1240,7 +1238,11 @@ void CHeatSolverFVM::Heat_Fluxes(CGeometry *geometry, CSolver **solver_container
             thermal_conductivity = config->GetThermalDiffusivity_Solid()*rho_cp_solid;
           }
 
-          Heat_Flux[iMarker] += thermal_conductivity*dTdn*config->GetTemperature_Ref()*Area;
+          HeatFlux[iMarker][iVertex] = thermal_conductivity*dTdn*config->GetTemperature_Ref()*Area;
+          
+          if (Monitoring){
+            AllBound_HeatFlux += HeatFlux[iMarker][iVertex];            
+          }
         }
       }
     }
@@ -1278,22 +1280,23 @@ void CHeatSolverFVM::Heat_Fluxes(CGeometry *geometry, CSolver **solver_container
             thermal_conductivity = config->GetThermalDiffusivity_Solid()*rho_cp_solid;
           }
 
-          Heat_Flux[iMarker] += thermal_conductivity*dTdn*config->GetTemperature_Ref()*Area;
-
+          HeatFlux[iMarker][iVertex] = thermal_conductivity*dTdn*config->GetTemperature_Ref()*Area;
+          
+          if (Monitoring){
+            AllBound_HeatFlux += HeatFlux[iMarker][iVertex];            
+          }
+          
           /*--- We do only aim to compute averaged temperatures on the (interesting) heat flux walls ---*/
           if ( Boundary == HEAT_FLUX ) {
 
             AvgTemperature[iMarker] += Twall*config->GetTemperature_Ref()*Area;
           }
-
         }
       }
     }
 
     if (Monitoring == YES) {
-
-    AllBound_HeatFlux += Heat_Flux[iMarker];
-    AllBound_AvgTemperature += AvgTemperature[iMarker];
+      AllBound_AvgTemperature += AvgTemperature[iMarker];
     }
   }
 
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
index bf44cd55af49..ad035c7f17e7 100644
--- a/SU2_DEF/src/SU2_DEF.cpp
+++ b/SU2_DEF/src/SU2_DEF.cpp
@@ -338,10 +338,7 @@ int main(int argc, char *argv[]) {
   
   /*--- Output deformed grid for visualization, if requested (surface and volumetric), in parallel
    requires to move all the data to the master node---*/
-  
-  bool NewFile = false;
-  if (config_container[ZONE_0]->GetDesign_Variable(0) == NO_DEFORMATION) NewFile = true;
-  
+
   for (iZone = 0; iZone < nZone; iZone++){
     
     /*--- Load the data --- */
diff --git a/SU2_GEO/src/SU2_GEO.cpp b/SU2_GEO/src/SU2_GEO.cpp
index 938d8713803b..9059ed22de1a 100644
--- a/SU2_GEO/src/SU2_GEO.cpp
+++ b/SU2_GEO/src/SU2_GEO.cpp
@@ -61,7 +61,6 @@ int main(int argc, char *argv[]) {
   vector<su2double> *Xcoord_Airfoil, *Ycoord_Airfoil, *Zcoord_Airfoil, *Variable_Airfoil;
   vector<su2double> Xcoord_Fan, Ycoord_Fan, Zcoord_Fan;
   char config_file_name[MAX_STRING_SIZE];
- 	char *cstr;
   bool Local_MoveSurface, MoveSurface = false;
   ofstream Gradient_file, ObjFunc_file;
   int rank, size;

From 4ed59ac784ec1f687f19b67d2878b6b075457d15 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Thu, 26 Sep 2019 18:22:23 +0200
Subject: [PATCH 521/539] Fixed bug in surface output

---
 SU2_CFD/src/output/COutput.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 2dbb7b086577..8d1a25bd2aca 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1319,18 +1319,20 @@ void COutput::LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver**
     fieldGetIndexCache.clear();
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-      for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
-        
-        iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-        
-        /*--- Load the surface data into the data sorter. --- */
-  
-        if(geometry->node[iPoint]->GetDomain()){
+      if (config->GetSolid_Wall(iMarker)){
+        for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
           
-          buildFieldIndexCache = fieldIndexCache.empty();
-   
-          LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+          iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
+          
+          /*--- Load the surface data into the data sorter. --- */
           
+          if(geometry->node[iPoint]->GetDomain()){
+            
+            buildFieldIndexCache = fieldIndexCache.empty();
+            
+            LoadSurfaceData(config, geometry, solver, iPoint, iMarker, iVertex);
+            
+          }
         }
       }   
     }

From 3e150f58986dd3b331ca9daef1c9746032599a8f Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 27 Sep 2019 16:04:22 +0200
Subject: [PATCH 522/539] Added option to provide list of conv. critera

---
 Common/include/config_structure.hpp           |  15 +-
 Common/include/config_structure.inl           |   4 +-
 Common/src/config_structure.cpp               |   2 +-
 ...CDriverOutput.hpp => CMultizoneOutput.hpp} |   0
 SU2_CFD/include/output/COutput.hpp            |  16 +-
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp     |   7 +-
 SU2_CFD/src/output/CAdjElasticityOutput.cpp   |   2 +-
 SU2_CFD/src/output/CAdjFlowCompOutput.cpp     |   2 +-
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp      |   2 +-
 SU2_CFD/src/output/CAdjHeatOutput.cpp         |   2 +-
 SU2_CFD/src/output/CBaselineOutput.cpp        |   4 -
 SU2_CFD/src/output/CElasticityOutput.cpp      |   2 +-
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp     |   3 +-
 SU2_CFD/src/output/CFlowCompOutput.cpp        |   3 +-
 SU2_CFD/src/output/CFlowIncOutput.cpp         |   2 +-
 SU2_CFD/src/output/CHeatOutput.cpp            |   2 +-
 ...CDriverOutput.cpp => CMultizoneOutput.cpp} |   0
 SU2_CFD/src/output/COutput.cpp                | 313 +++++++++++-------
 18 files changed, 234 insertions(+), 147 deletions(-)
 rename SU2_CFD/include/output/{CDriverOutput.hpp => CMultizoneOutput.hpp} (100%)
 rename SU2_CFD/src/output/{CDriverOutput.cpp => CMultizoneOutput.cpp} (100%)

diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp
index bdab0e9c1bb8..4a2e5339e1b5 100644
--- a/Common/include/config_structure.hpp
+++ b/Common/include/config_structure.hpp
@@ -91,7 +91,8 @@ class CConfig {
   su2double* EA_IntLimit; /*!< \brief Integration limits of the Equivalent Area computation */
   su2double AdjointLimit; /*!< \brief Adjoint variable limit */
   su2double* Obj_ChainRuleCoeff; /*!< \brief Array defining objective function for adjoint problem based on chain rule in terms of gradient w.r.t. density, velocity, pressure */
-  string ConvField;
+  string* ConvField;
+  unsigned short nConvField;
   bool MG_AdjointFlow; /*!< \brief MG with the adjoint flow problem */
   su2double* SubsonicEngine_Cyl; /*!< \brief Coordinates of the box subsonic region */
   su2double* SubsonicEngine_Values; /*!< \brief Values of the box subsonic region */
@@ -9146,9 +9147,17 @@ class CConfig {
   string GetVolumeOutput_Field(unsigned short iField);
 
   /*
-  * \brief Get the convergence field for monitoring
+  * \brief Get the convergence fields for monitoring
+  * \param[in] iField - Index of the field
+  * return Field name for monitoring convergence
   */
-  string GetConv_Field();
+  string GetConv_Field(unsigned short iField);
+  
+  /*
+  * \brief Get the number of convergence monitoring fields.
+  * return Number of convergence monitoring fields.
+  */
+  unsigned short GetnConv_Field();  
   
   /*!
    * \brief Set_StartTime
diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl
index c7ec3eba0dae..b5ec5fbf3df1 100644
--- a/Common/include/config_structure.inl
+++ b/Common/include/config_structure.inl
@@ -2054,7 +2054,9 @@ inline su2double CConfig::GetMeshBoxLength(unsigned short val_iDim) { return Mes
 
 inline su2double CConfig::GetMeshBoxOffset(unsigned short val_iDim) { return Mesh_Box_Offset[val_iDim]; }
 
-inline string CConfig::GetConv_Field(){ return ConvField; }
+inline string CConfig::GetConv_Field(unsigned short iField){ return ConvField[iField]; }
+
+inline unsigned short CConfig::GetnConv_Field(){ return nConvField; }
 
 inline void  CConfig::Set_StartTime(su2double starttime){StartTime = starttime;}
 
diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
index 38784346fde9..0735fdcbfecb 100644
--- a/Common/src/config_structure.cpp
+++ b/Common/src/config_structure.cpp
@@ -1506,7 +1506,7 @@ void CConfig::SetConfig_Options() {
   /*!\brief CONV_CAUCHY_EPS\n DESCRIPTION: Epsilon to control the series convergence \n DEFAULT: 1e-10 \ingroup Config*/
   addDoubleOption("CONV_CAUCHY_EPS", Cauchy_Eps, 1E-10);
   /*!\brief CONV_FIELD\n DESCRIPTION: Output field to monitor \n Default: depends on solver \ingroup Config*/
-  addStringOption("CONV_FIELD", ConvField, "");
+  addStringListOption("CONV_FIELD", nConvField, ConvField);
 
   /*!\par CONFIG_CATEGORY: Multi-grid \ingroup Config*/
   /*--- Options related to Multi-grid ---*/
diff --git a/SU2_CFD/include/output/CDriverOutput.hpp b/SU2_CFD/include/output/CMultizoneOutput.hpp
similarity index 100%
rename from SU2_CFD/include/output/CDriverOutput.hpp
rename to SU2_CFD/include/output/CMultizoneOutput.hpp
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 31db8cd846d7..a2b36bd73c7a 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -227,12 +227,15 @@ class COutput {
   su2double cauchyValue,         /*!< \brief Summed value of the convergence indicator. */
   cauchyFunc;                    /*!< \brief Current value of the convergence indicator at one iteration. */
   unsigned short Cauchy_Counter; /*!< \brief Number of elements of the Cauchy serial. */
-  su2double *cauchySerie;        /*!< \brief Complete Cauchy serial. */
-  su2double oldFunc,             /*!< \brief Old value of the coefficient. */
+  vector<vector<su2double>> cauchySerie;        /*!< \brief Complete Cauchy serial. */
+  unsigned long nCauchy_Elems;  /*!< \brief Total number of cauchy elems to monitor */ 
+  su2double cauchyEps;           /*!< \brief Defines the threshold when to stop the solver. */   
+  su2double minLogResidual;     /*!< \brief Minimum value of the residual to reach */     
+  vector<su2double> oldFunc,             /*!< \brief Old value of the coefficient. */
   newFunc;                       /*!< \brief Current value of the coefficient. */
-  bool convergence;              /*!< \brief To indicate if the solver  has converged or not. */
+  bool convergence;              /*!< \brief To indicate if the solver has converged or not. */
   su2double initResidual;        /*!< \brief Initial value of the residual to evaluate the convergence level. */
-  string convField;              /*!< \brief Name of the field to be monitored for convergence */
+  vector<string> convFields;      /*!< \brief Name of the field to be monitored for convergence */
   
   /*----------------------------- Adaptive CFL ----------------------------*/     
   
@@ -415,6 +418,11 @@ class COutput {
    */
   bool Convergence_Monitoring(CConfig *config, unsigned long Iteration);
 
+  /*!
+   * \brief Print a summary of the convergence to screen.
+   */
+  void PrintConvergenceSummary();
+  
   /*!
    * \brief Get convergence of the problem.
    * \return Boolean indicating whether the problem is converged.
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 8c3fa1fd8859..08eddce9f237 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -270,9 +270,10 @@ bool CSinglezoneDriver::Monitor(unsigned long TimeIter){
     MaxIterationsReached = InnerIter+1 >= nInnerIter;
         
     if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
-      cout << endl << "----------------------------- Solver Exit -------------------------------";
-      if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
-      else cout << endl << "Maximum number of iterations reached (ITER = " << nInnerIter << " )." << endl;
+      cout << endl << "----------------------------- Solver Exit -------------------------------" << endl;
+      if (InnerConvergence) cout << "All convergence criteria satisfied." << endl;
+      else cout << endl << "Maximum number of iterations reached (ITER = " << nInnerIter << " ) before convergence." << endl;
+      output_container[ZONE_0]->PrintConvergenceSummary();
       cout << "-------------------------------------------------------------------------" << endl;
     }
     
diff --git a/SU2_CFD/src/output/CAdjElasticityOutput.cpp b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
index 485c4491a317..3f44b4eeb48d 100644
--- a/SU2_CFD/src/output/CAdjElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CAdjElasticityOutput.cpp
@@ -97,7 +97,7 @@ CAdjElasticityOutput::CAdjElasticityOutput(CConfig *config, unsigned short nDim)
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "ADJOINT_DISP_X";
+  if (convFields.empty() ) convFields.emplace_back("ADJOINT_DISP_X");
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
index 0358f31f29e0..aee945be59d1 100644
--- a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -95,7 +95,7 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_ADJ_DENSITY";
+  if (convFields.empty() ) convFields.emplace_back("RMS_ADJ_DENSITY");
   
 }
 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index 3c61bef15c8d..e0e4a67b9d99 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -99,7 +99,7 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COu
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_ADJ_PRESSURE";
+  if (convFields.empty() ) convFields.emplace_back("RMS_ADJ_PRESSURE");
 
 }
 
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
index c71f239adcba..feabf5c5adbd 100644
--- a/SU2_CFD/src/output/CAdjHeatOutput.cpp
+++ b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -88,7 +88,7 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_ADJ_TEMPERATURE";
+  if (convFields.empty() ) convFields.emplace_back("RMS_ADJ_TEMPERATURE");
 
 }
 
diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 5b41f0cc64c9..6fe117ba80dc 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -72,10 +72,6 @@ CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver*
   
   surfaceFilename = "surface_baseline";
   
-  /*--- Conv field --- */
-  
-  convField = "NONE";
-  
 }
 
 CBaselineOutput::~CBaselineOutput(void) {}
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
index 1f011eb6006e..9d041cb55a69 100644
--- a/SU2_CFD/src/output/CElasticityOutput.cpp
+++ b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -102,7 +102,7 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_DISP_X";
+  if (convFields.empty() ) convFields.emplace_back("RMS_DISP_X");
 
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index 06e541fca658..b594e8f2ed4f 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -88,8 +88,7 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_DENSITY";
-
+  if (convFields.empty() ) convFields.emplace_back("RMS_DENSITY");
 
 }
 
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index 1a18462d3432..8d22c4faddc0 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -89,8 +89,7 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_DENSITY";
-
+  if (convFields.empty() ) convFields.emplace_back("RMS_DENSITY");
   
 }
 
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index d93cad2574bb..59a0fac57b62 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -90,7 +90,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_PRESSURE";
+  if (convFields.empty() ) convFields.emplace_back("RMS_PRESSURE");
 
 
 }
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index c6cdcc95d59f..2e51d7387403 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -80,7 +80,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : COutput(config,
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "RMS_TEMPERATURE";
+  if (convFields.empty() ) convFields.emplace_back("RMS_TEMPERATURE");
 
 
 }
diff --git a/SU2_CFD/src/output/CDriverOutput.cpp b/SU2_CFD/src/output/CMultizoneOutput.cpp
similarity index 100%
rename from SU2_CFD/src/output/CDriverOutput.cpp
rename to SU2_CFD/src/output/CMultizoneOutput.cpp
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 8d1a25bd2aca..90050e3d7a9d 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -122,15 +122,28 @@ COutput::COutput(CConfig *config, unsigned short nDim, bool fem_output): femOutp
 
   noWriting = false;
 
-  cauchySerie = new su2double[config->GetCauchy_Elems()];
-
-  convField = config->GetConv_Field();
+  /*--- Initialize convergence monitoring structure ---*/
+  
+  nCauchy_Elems = config->GetCauchy_Elems();
+  cauchyEps = config->GetCauchy_Eps();
+  minLogResidual = config->GetMinLogResidual();
+  
+  for (unsigned short iField = 0; iField < config->GetnConv_Field(); iField++){
+    convFields.emplace_back(config->GetConv_Field(iField));
+  }
 
+  newFunc = vector<su2double>(convFields.size());
+  oldFunc = vector<su2double>(convFields.size());
+  cauchySerie = vector<vector<su2double>>(convFields.size(), vector<su2double>(nCauchy_Elems, 0.0));
   cauchyValue = 0.0;
-  for (unsigned short iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-    cauchySerie[iCounter] = 0.0;
-
   convergence = false;
+
+  
+  /*--- Check that the number of cauchy elems is not too large ---*/
+  
+  if (nCauchy_Elems > 1000){
+    SU2_MPI::Error("Number of Cauchy Elems must be smaller than 1000", CURRENT_FUNCTION);    
+  }
   
   /*--- Initialize all convergence flags to false. ---*/
   
@@ -155,8 +168,6 @@ COutput::~COutput(void) {
   delete multiZoneHeaderTable;
   delete fileWritingTable;
   delete historyFileTable;
-
-  delete [] cauchySerie;
   
   if (volumeDataSorter != nullptr)
     delete volumeDataSorter;
@@ -711,105 +722,147 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
   return false;
 }
 
+void COutput::PrintConvergenceSummary(){
+
+  PrintingToolbox::CTablePrinter  ConvSummary(&cout);
+  
+  ConvSummary.AddColumn("Convergence Field", 28);
+  ConvSummary.AddColumn("Value", 14);
+  ConvSummary.AddColumn("Criterion", 14);
+  ConvSummary.AddColumn("Converged",12);
+  ConvSummary.SetAlign(PrintingToolbox::CTablePrinter::CENTER);
+  ConvSummary.PrintHeader();
+  for (unsigned short iField_Conv = 0; iField_Conv < convFields.size(); iField_Conv++){
+    const string &convField = convFields[iField_Conv];
+    if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT) {
+      string convMark = "";
+      if ( historyOutput_Map["CAUCHY_" + convField].value < cauchyEps) convMark = "*";
+      ConvSummary << historyOutput_Map["CAUCHY_" + convField].fieldName 
+          <<  historyOutput_Map["CAUCHY_" + convField].value 
+          << " < " + PrintingToolbox::to_string(cauchyEps) << convMark;
+    }
+    else if (historyOutput_Map[convField].fieldType == HistoryFieldType::RESIDUAL || 
+        historyOutput_Map[convField].fieldType == HistoryFieldType::AUTO_RESIDUAL)  {
+      string convMark = "";
+      if (historyOutput_Map[convField].value < minLogResidual) convMark = "*";
+      ConvSummary << historyOutput_Map[convField].fieldName 
+          << historyOutput_Map[convField].value 
+          << " < " + PrintingToolbox::to_string(minLogResidual) << convMark;
+    }
+  }
+  ConvSummary.PrintFooter();
+}
 
 bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
   unsigned short iCounter;
     
-  convergence = false;
+  convergence = true;
   
-  if( historyOutput_Map.count(convField) > 0 ){
+  for (unsigned short iField_Conv = 0; iField_Conv < convFields.size(); iField_Conv++){
     
-    su2double monitor = historyOutput_Map[convField].value;
+    bool fieldConverged = false;
     
-    /*--- Cauchy based convergence criteria ---*/
-    
-    if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT) {
-      
-      if (Iteration == 0){
-        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++){
-          cauchySerie[iCounter] = 0.0;
-        }
-        newFunc = monitor;
-      }
+    const string &convField = convFields[iField_Conv];
+    if (historyOutput_Map.count(convField) > 0){
+      su2double monitor = historyOutput_Map[convField].value;
       
-      oldFunc = newFunc;
-      newFunc = monitor;
-      cauchyFunc = fabs(newFunc - oldFunc);
+      /*--- Cauchy based convergence criteria ---*/
       
-      cauchySerie[Iteration % config->GetCauchy_Elems()] = cauchyFunc;
-      cauchyValue = 1.0;
-      if (Iteration >= config->GetCauchy_Elems()){     
+      if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT) {
+        
+        if (Iteration == 0){
+          for (iCounter = 0; iCounter < nCauchy_Elems; iCounter++){
+            cauchySerie[iField_Conv][iCounter] = 0.0;
+          }
+          newFunc[iField_Conv] = monitor;
+        }
+
+        oldFunc[iField_Conv] = newFunc[iField_Conv];
+        newFunc[iField_Conv] = monitor;
+        cauchyFunc = fabs(newFunc[iField_Conv] - oldFunc[iField_Conv])/fabs(monitor);
+        
+        cauchySerie[iField_Conv][Iteration % nCauchy_Elems] = cauchyFunc;
         cauchyValue = 0.0;
-        for (iCounter = 0; iCounter < config->GetCauchy_Elems(); iCounter++)
-          cauchyValue += cauchySerie[iCounter];
+        for (iCounter = 0; iCounter < nCauchy_Elems; iCounter++)
+          cauchyValue += cauchySerie[iField_Conv][iCounter];
+        
+        cauchyValue /= nCauchy_Elems;
+        
+        if (cauchyValue >= cauchyEps) { fieldConverged = false;}
+        else { fieldConverged = true;}
+        
+        /*--- Start monitoring only if the current iteration
+         *  is larger than the number of cauchy elements and
+         * the number of start-up iterations --- */
+        
+        if (Iteration < max(config->GetStartConv_Iter(), nCauchy_Elems)){
+          fieldConverged = false;
+        }
+            
+        SetHistoryOutputValue("CAUCHY_" + convField, cauchyValue);
+        
       }
       
-      if (cauchyValue >= config->GetCauchy_Eps()) { convergence = false;}
-      else { convergence = true; newFunc = 0.0;}
       
-      SetHistoryOutputValue("CAUCHY", cauchyValue);
+      /*--- Residual based convergence criteria ---*/
       
-    }
-    
-    /*--- Residual based convergence criteria ---*/
-    
-    if (historyOutput_Map[convField].fieldType == HistoryFieldType::RESIDUAL || 
-        historyOutput_Map[convField].fieldType == HistoryFieldType::AUTO_RESIDUAL) {
+      if (historyOutput_Map[convField].fieldType == HistoryFieldType::RESIDUAL || 
+          historyOutput_Map[convField].fieldType == HistoryFieldType::AUTO_RESIDUAL) {
+        
+        /*--- Check the convergence ---*/
+        
+        if (Iteration != 0 && (monitor <= minLogResidual)) { fieldConverged = true;  }
+        else { fieldConverged = false; }
+        
+      }
       
-      /*--- Check the convergence ---*/
+      /*--- Do not apply any convergence criteria of the number
+     of iterations is less than a particular value ---*/
       
-      if (Iteration != 0 && (monitor <= config->GetMinLogResidual())) { convergence = true;  }
-      else { convergence = false; }
+      if (Iteration < config->GetStartConv_Iter()) {
+        fieldConverged = false;
+      }
       
+      convergence = fieldConverged && convergence;
     }
-    
-    /*--- Do not apply any convergence criteria of the number
-     of iterations is less than a particular value ---*/
-    
-    if (Iteration < config->GetStartConv_Iter()) {
-      convergence = false;
-    }
-    
-    /*--- Apply the same convergence criteria to all the processors ---*/
-    
+  }
+  if (convFields.empty()) convergence = false;
+   
+  /*--- Apply the same convergence criteria to all the processors ---*/
+  
 #ifdef HAVE_MPI
-    
-    unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
-    sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
-    rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
-    
-    /*--- Convergence criteria ---*/
-    
-    sbuf_conv[0] = convergence;
-    SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
-    
-    /*-- Compute global convergence criteria in the master node --*/
-    
-    sbuf_conv[0] = 0;
-    if (rank == MASTER_NODE) {
-      if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
-      else sbuf_conv[0] = 0;
-    }
-    
-    SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
-    
-    if (sbuf_conv[0] == 1) { convergence = true; }
-    else { convergence = false;  }
-    
-    delete [] sbuf_conv;
-    delete [] rbuf_conv;
-    
-#endif
-    
-    /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
-    
-    if (monitor != monitor) {
-      SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
-    }
-    
+  
+  unsigned short *sbuf_conv = NULL, *rbuf_conv = NULL;
+  sbuf_conv = new unsigned short[1]; sbuf_conv[0] = 0;
+  rbuf_conv = new unsigned short[1]; rbuf_conv[0] = 0;
+  
+  /*--- Convergence criteria ---*/
+  
+  sbuf_conv[0] = convergence;
+  SU2_MPI::Reduce(sbuf_conv, rbuf_conv, 1, MPI_UNSIGNED_SHORT, MPI_SUM, MASTER_NODE, MPI_COMM_WORLD);
+  
+  /*-- Compute global convergence criteria in the master node --*/
+  
+  sbuf_conv[0] = 0;
+  if (rank == MASTER_NODE) {
+    if (rbuf_conv[0] == size) sbuf_conv[0] = 1;
+    else sbuf_conv[0] = 0;
   }
-  return convergence;
+  
+  SU2_MPI::Bcast(sbuf_conv, 1, MPI_UNSIGNED_SHORT, MASTER_NODE, MPI_COMM_WORLD);
+  
+  if (sbuf_conv[0] == 1) { convergence = true; }
+  else { convergence = false;  }
+  
+  delete [] sbuf_conv;
+  delete [] rbuf_conv;
+  
+#endif
+  
+  
+  
+    return convergence;
 }
 
 void COutput::SetHistoryFile_Header(CConfig *config) { 
@@ -1106,23 +1159,27 @@ void COutput::CheckHistoryOutput(){
   
   for (unsigned short iField_Output = 0; iField_Output < historyOutput_List.size(); iField_Output++){
     const string &fieldReference = historyOutput_List[iField_Output];
-    const HistoryOutputField &field = historyOutput_Map[fieldReference];
-    for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-      requestedField = requestedHistoryFields[iReqField];   
-      if (requestedField == field.outputGroup){
-        FoundField[iReqField] = true;
+    if (historyOutput_Map.count(fieldReference) > 0){
+      const HistoryOutputField &field = historyOutput_Map[fieldReference];
+      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+        requestedField = requestedHistoryFields[iReqField];   
+        if (requestedField == field.outputGroup){
+          FoundField[iReqField] = true;
+        }
       }
     }
   }
   
   for (unsigned short iField_Output = 0; iField_Output < historyOutputPerSurface_List.size(); iField_Output++){
-    const string &fieldReference = historyOutputPerSurface_List[iField_Output];    
-    for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[fieldReference].size(); iMarker++){
-      const HistoryOutputField &Field = historyOutputPerSurface_Map[fieldReference][iMarker];
-      for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
-        requestedField = requestedHistoryFields[iReqField];   
-        if (requestedField == Field.outputGroup){
-          FoundField[iReqField] = true;
+    const string &fieldReference = historyOutputPerSurface_List[iField_Output]; 
+    if (historyOutputPerSurface_Map.count(fieldReference) > 0){
+      for (unsigned short iMarker = 0; iMarker < historyOutputPerSurface_Map[fieldReference].size(); iMarker++){
+        const HistoryOutputField &Field = historyOutputPerSurface_Map[fieldReference][iMarker];
+        for (unsigned short iReqField = 0; iReqField < nRequestedHistoryFields; iReqField++){
+          requestedField = requestedHistoryFields[iReqField];   
+          if (requestedField == Field.outputGroup){
+            FoundField[iReqField] = true;
+          }
         }
       }
     }
@@ -1160,15 +1217,24 @@ void COutput::CheckHistoryOutput(){
       requestedField = requestedHistoryFields[iReqField];            
       cout << requestedHistoryFields[iReqField];
       if (iReqField != nRequestedHistoryFields - 1) cout << ", ";
-    }
+    } 
     cout << endl;
   }
   
   /*--- Check that the requested convergence monitoring field is available ---*/
-
-  if (historyOutput_Map.count(convField) == 0){
-    SU2_MPI::Error(string("Convergence monitoring field ") + convField + string(" not available"), CURRENT_FUNCTION);
+  bool removedField = false;
+  for (unsigned short iField_Conv = 0; iField_Conv < convFields.size(); iField_Conv++){
+    if (historyOutput_Map.count(convFields[iField_Conv]) == 0){
+      if (!removedField) {
+        cout << "Ignoring Convergence Fields: ";
+        removedField = true;
+      }
+      cout << convFields[iField_Conv] << " ";
+      convFields.erase(std::find(convFields.begin(),
+                                 convFields.end(), convFields[iField_Conv]));
+    }
   }
+  if (removedField) cout << endl;
 }
 
 void COutput::PreprocessVolumeOutput(CConfig *config){
@@ -1208,22 +1274,24 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
   for (unsigned short iField_Output = 0; iField_Output < volumeOutput_List.size(); iField_Output++){
     
     const string &fieldReference = volumeOutput_List[iField_Output];
-    VolumeOutputField &Field = volumeOutput_Map[fieldReference];
-    
-    /*--- Loop through all fields specified in the config ---*/
-    
-    for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
+    if (volumeOutput_Map.count(fieldReference) > 0){
+      VolumeOutputField &Field = volumeOutput_Map[fieldReference];
       
-      RequestedField = requestedVolumeFields[iReqField];  
-            
-      if (((RequestedField == Field.outputGroup) || (RequestedField == fieldReference)) && (Field.offset == -1)){
-        Field.offset = nVolumeFields;
-        volumeFieldNames.push_back(Field.fieldName);
-        nVolumeFields++;
+      /*--- Loop through all fields specified in the config ---*/
+      
+      for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
         
-        FoundField[iReqField] = true;
-      }
-    }    
+        RequestedField = requestedVolumeFields[iReqField];  
+        
+        if (((RequestedField == Field.outputGroup) || (RequestedField == fieldReference)) && (Field.offset == -1)){
+          Field.offset = nVolumeFields;
+          volumeFieldNames.push_back(Field.fieldName);
+          nVolumeFields++;
+          
+          FoundField[iReqField] = true;
+        }
+      }    
+    }
   }
   
   for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){
@@ -1554,11 +1622,16 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
     }
   }
   
-  if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT){
-    AddHistoryOutput("CAUCHY", "C["  + historyOutput_Map[convField].fieldName + "]", ScreenOutputFormat::SCIENTIFIC, "CAUCHY",
-                     "Cauchy residual value of field set with CONV_FIELD." ,HistoryFieldType::AUTO_COEFFICIENT);
+  for (unsigned short iFieldConv = 0; iFieldConv < convFields.size(); iFieldConv++){
+    const string &convField = convFields[iFieldConv];
+    if (historyOutput_Map.count(convField) > 0){
+      if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT){
+        AddHistoryOutput("CAUCHY_" + convField, "Cauchy["  + historyOutput_Map[convField].fieldName + "]", ScreenOutputFormat::SCIENTIFIC, "CAUCHY",
+                         "Cauchy residual value of field set with CONV_FIELD." ,HistoryFieldType::AUTO_COEFFICIENT);
+      }
+    }
   }
-
+  
 }
 
 bool COutput::WriteScreen_Header(CConfig *config) {  

From 7346b88b64bf1212cfd640b2148e2e97c9ef34c1 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 27 Sep 2019 16:05:02 +0200
Subject: [PATCH 523/539] Renamed CDriverOutput to CMultizoneOutput

---
 SU2_CFD/include/drivers/CDriver.hpp         |  2 +-
 SU2_CFD/include/output/CMultizoneOutput.hpp |  6 +++---
 SU2_CFD/src/drivers/CDriver.cpp             |  2 +-
 SU2_CFD/src/meson.build                     |  2 +-
 SU2_CFD/src/output/CMultizoneOutput.cpp     | 20 ++++++++++----------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index 51d2de3a1566..e77961bbb260 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -66,7 +66,7 @@
 #include "../output/COutputLegacy.hpp"
 
 #include "../output/COutput.hpp"
-#include "../output/CDriverOutput.hpp"
+#include "../output/CMultizoneOutput.hpp"
 #include "../output/CElasticityOutput.hpp"
 #include "../output/CAdjElasticityOutput.hpp"
 #include "../output/CFlowCompOutput.hpp"
diff --git a/SU2_CFD/include/output/CMultizoneOutput.hpp b/SU2_CFD/include/output/CMultizoneOutput.hpp
index 28bcbbda0192..754d57b830d1 100644
--- a/SU2_CFD/include/output/CMultizoneOutput.hpp
+++ b/SU2_CFD/include/output/CMultizoneOutput.hpp
@@ -60,7 +60,7 @@ using namespace std;
  * \brief Class for writing the multizone output.
  * \author R. Sanchez, T. Albring.
  */
-class CDriverOutput final: public COutput {
+class CMultizoneOutput final: public COutput {
 
 protected:
   unsigned short nZone; //!< Number of zones
@@ -73,12 +73,12 @@ class CDriverOutput final: public COutput {
   /*!
    * \brief Constructor of the class.
    */
-  CDriverOutput(CConfig *driver_config, CConfig** config, unsigned short nDim);
+  CMultizoneOutput(CConfig *driver_config, CConfig** config, unsigned short nDim);
 
   /*!
    * \brief Destructor of the class.
    */
-  ~CDriverOutput(void) override;
+  ~CMultizoneOutput(void) override;
 
   /*!
    * \brief Load the multizone history output field values
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index f44405af326b..8274d888b1fa 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3754,7 +3754,7 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
   }
 
   if (driver_config->GetMultizone_Problem()){
-    driver_output = new CDriverOutput(driver_config, config, nDim);
+    driver_output = new CMultizoneOutput(driver_config, config, nDim);
     driver_output->PreprocessMultizoneHistoryOutput(output, config);
   }
   
diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build
index b3c8593c1e65..3195c085eff5 100644
--- a/SU2_CFD/src/meson.build
+++ b/SU2_CFD/src/meson.build
@@ -41,7 +41,7 @@ su2_cfd_src += files(['output/CAdjElasticityOutput.cpp',
                       'output/CAdjFlowIncOutput.cpp',
                       'output/CAdjHeatOutput.cpp',
                       'output/CBaselineOutput.cpp',
-                      'output/CDriverOutput.cpp',
+                      'output/CMultizoneOutput.cpp',
                       'output/CElasticityOutput.cpp',
                       'output/CFlowCompOutput.cpp',
                       'output/CFlowCompFEMOutput.cpp',
diff --git a/SU2_CFD/src/output/CMultizoneOutput.cpp b/SU2_CFD/src/output/CMultizoneOutput.cpp
index 554fe534a5fa..3c5d93b37b4a 100644
--- a/SU2_CFD/src/output/CMultizoneOutput.cpp
+++ b/SU2_CFD/src/output/CMultizoneOutput.cpp
@@ -1,5 +1,5 @@
 /*!
- * \file output_driver.cpp
+ * \file CMultizoneOutput.cpp
  * \brief Main subroutines for multizone output
  * \author R. Sanchez, T. Albring
  * \version 6.2.0 "Falcon"
@@ -35,9 +35,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/output/CDriverOutput.hpp"
+#include "../../include/output/CMultizoneOutput.hpp"
 
-CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned short nDim) : COutput(driver_config, nDim, false) {
+CMultizoneOutput::CMultizoneOutput(CConfig* driver_config, CConfig** config, unsigned short nDim) : COutput(driver_config, nDim, false) {
 
   unsigned short iZone = 0;
   rank = SU2_MPI::GetRank();
@@ -87,14 +87,14 @@ CDriverOutput::CDriverOutput(CConfig* driver_config, CConfig** config, unsigned
 
   /*--- Set the default convergence field --- */
 
-  if (convField.size() == 0 ) convField = "AVG_BGS_RES[0]";
+  if (convFields.empty() ) convFields.emplace_back("AVG_BGS_RES[0]");
 
 }
 
-CDriverOutput::~CDriverOutput() {}
+CMultizoneOutput::~CMultizoneOutput() {}
 
 
-void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config) {
+void CMultizoneOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config) {
 
   unsigned short iZone, iField, nField;
   string name, header;
@@ -127,7 +127,7 @@ void CDriverOutput::LoadMultizoneHistoryData(COutput **output, CConfig **config)
   }
 }
 
-void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {
+void CMultizoneOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **config) {
   
   unsigned short iZone, iField, nField;
   string name, header, group;
@@ -162,7 +162,7 @@ void CDriverOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig **
   }
 }
 
-bool CDriverOutput::WriteScreen_Header(CConfig *config) {
+bool CMultizoneOutput::WriteScreen_Header(CConfig *config) {
 
   /*--- Print header if the outer iteration is zero or zonal convergence is printed ---*/
   
@@ -178,7 +178,7 @@ bool CDriverOutput::WriteScreen_Header(CConfig *config) {
   return false;
 }
 
-bool CDriverOutput::WriteScreen_Output(CConfig *config) {
+bool CMultizoneOutput::WriteScreen_Output(CConfig *config) {
   
   unsigned long ScreenWrt_Freq_Outer = config->GetScreen_Wrt_Freq(1);
   unsigned long ScreenWrt_Freq_Time  = config->GetScreen_Wrt_Freq(0);    
@@ -204,7 +204,7 @@ bool CDriverOutput::WriteScreen_Output(CConfig *config) {
   return true;
 }
 
-bool CDriverOutput::WriteHistoryFile_Output(CConfig *config){
+bool CMultizoneOutput::WriteHistoryFile_Output(CConfig *config){
   
   unsigned long HistoryWrt_Freq_Outer = config->GetHistory_Wrt_Freq(1);
   unsigned long HistoryWrt_Freq_Time  = config->GetHistory_Wrt_Freq(0);    

From a55e6e5da02dc31265a0648758ee363346641877 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 27 Sep 2019 16:05:29 +0200
Subject: [PATCH 524/539] Couple of other fixes mention in review

---
 Common/src/geometry_structure.cpp            |  2 +-
 SU2_CFD/include/output/CAdjFlowIncOutput.hpp |  2 --
 SU2_CFD/src/output/CAdjFlowIncOutput.cpp     | 16 +++++++---------
 SU2_CFD/src/output/COutput.cpp               |  7 +++++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
index 30f8e5e61010..381a8506d866 100644
--- a/Common/src/geometry_structure.cpp
+++ b/Common/src/geometry_structure.cpp
@@ -15456,7 +15456,7 @@ void CPhysicalGeometry::Compute_Nacelle(CConfig *config, bool original_surface,
     
     /*--- Write an output file---*/
     
-    if (config->GetTabular_FileFormat() == CSV) {
+    if (config->GetTabular_FileFormat() == TAB_CSV) {
       Nacelle_File.open("nacelle_description.csv", ios::out);
       if (config->GetSystemMeasurements() == US)
         Nacelle_File << "\"Theta (deg)\",\"Area (in^2)\",\"Max. Thickness (in)\",\"Chord (in)\",\"Leading Edge Radius (1/in)\",\"Max. Thickness/Chord\",\"Twist (deg)\",\"Leading Edge XLoc\",\"Leading Edge ZLoc\",\"Trailing Edge XLoc\",\"Trailing Edge ZLoc\"" << endl;
diff --git a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
index 0189b2bb01fa..59b7d464a334 100644
--- a/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
+++ b/SU2_CFD/include/output/CAdjFlowIncOutput.hpp
@@ -47,8 +47,6 @@
 class CAdjFlowIncOutput final: public COutput {
 private:
   
-  bool cont_adj; /*!< \brief Boolean indicating whether we run a cont. adjoint problem */ 
-
   unsigned short turb_model; /*!< \brief The kind of turbulence model*/ 
   bool heat,                 /*!< \brief Boolean indicating whether have a heat problem*/ 
   weakly_coupled_heat; /*!< \brief Boolean indicating whether have a weakly coupled heat equation*/ 
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index e0e4a67b9d99..0dd430963119 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -41,9 +41,7 @@
 #include "../../include/solver_structure.hpp"
 
 CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
-  
-  cont_adj = config->GetContinuous_Adjoint();
-   
+     
   turb_model = config->GetKind_Turb_Model();
   
   heat = config->GetEnergy_Equation();
@@ -118,7 +116,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("RMS_ADJ_HEAT", "rms[A_T]", ScreenOutputFormat::FIXED, "RMS_RES", " Root-mean square residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
-  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+  if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Root-mean square residual of the adjoint nu tilde.
@@ -146,7 +144,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("MAX_ADJ_VELOCITY-Z", "max[A_RhoW]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the adjoint Velocity z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: Maximum residual of the temperature.
   AddHistoryOutput("MAX_ADJ_HEAT", "max[A_T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature.", HistoryFieldType::RESIDUAL);
-  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+  if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: Maximum residual of the adjoint nu tilde.
@@ -174,7 +172,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("BGS_ADJ_VELOCITY-Z", "bgs[A_RhoW]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint Velocity z-component", HistoryFieldType::RESIDUAL); 
   /// DESCRIPTION: BGS residual of the temperature.
   AddHistoryOutput("BGS_ADJ_HEAT", "bgs[A_T]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
-  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+  if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       /// DESCRIPTION: BGS residual of the adjoint nu tilde.
@@ -225,7 +223,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     if (nDim == 3) SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(4)));
     else           SetHistoryOutputValue("RMS_ADJ_HEAT",         log10(adjflow_solver->GetRes_RMS(3)));
   }
-  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+  if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("RMS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_RMS(0)));
@@ -250,7 +248,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     if (nDim == 3) SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(4)));
     else           SetHistoryOutputValue("MAX_ADJ_HEAT",         log10(adjflow_solver->GetRes_Max(3)));
   }
-  if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+  if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
       SetHistoryOutputValue("MAX_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_Max(0)));
@@ -277,7 +275,7 @@ void CAdjFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
       if (nDim == 3) SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(4)));
       else           SetHistoryOutputValue("BGS_ADJ_HEAT",         log10(adjflow_solver->GetRes_BGS(3)));
     }
-    if ((!config->GetFrozen_Visc_Disc() && !cont_adj) || (!config->GetFrozen_Visc_Cont() && cont_adj)){
+    if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
       switch(turb_model){
       case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
         SetHistoryOutputValue("BGS_ADJ_NU_TILDE", log10(adjturb_solver->GetRes_BGS(0)));
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 90050e3d7a9d..d875386f31f5 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1008,8 +1008,8 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
     /*--- We use a fixed size of the file output summary table ---*/
     
     int total_width = 72;    
-    fileWritingTable->AddColumn("File Writing Summary", (total_width-1)/2); 
-    fileWritingTable->AddColumn("Filename", total_width/2);  
+    fileWritingTable->AddColumn("File Writing Summary", (total_width)/2-1); 
+    fileWritingTable->AddColumn("Filename", total_width/2-1);  
     fileWritingTable->SetAlign(PrintingToolbox::CTablePrinter::LEFT);
     
     if (rank == MASTER_NODE && !noWriting){
@@ -1387,6 +1387,9 @@ void COutput::LoadDataIntoSorter(CConfig* config, CGeometry* geometry, CSolver**
     fieldGetIndexCache.clear();
     
     for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      
+      /*--- We only want to have surface values on solid walls ---*/
+      
       if (config->GetSolid_Wall(iMarker)){
         for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++){
           

From 0ae03f8fb6e9cbe28567d2ca69757b9ee374425e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Fri, 27 Sep 2019 17:32:58 +0200
Subject: [PATCH 525/539] Properly added multizone history preprocessing

---
 SU2_CFD/src/drivers/CMultizoneDriver.cpp |  7 ++++---
 SU2_CFD/src/output/COutput.cpp           | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index e1f40db9d990..658f6eacc241 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -661,9 +661,10 @@ bool CMultizoneDriver::Monitor(unsigned long TimeIter){
     MaxIterationsReached = OuterIter+1 >= nOuterIter;
         
     if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
-      cout << endl << "----------------------------- Solver Exit -------------------------------";
-      if (InnerConvergence) cout << endl << "Convergence criteria satisfied." << endl;
-      else cout << endl << "Maximum number of iterations reached (OUTER_ITER = " << nOuterIter << " )." << endl;
+      cout << endl << "----------------------------- Solver Exit -------------------------------" << endl;
+      if (InnerConvergence) cout << "All convergence criteria satisfied." << endl;
+      else cout << endl << "Maximum number of iterations reached (OUTER_ITER = " << OuterIter+1 << " ) before convergence." << endl;
+      driver_output->PrintConvergenceSummary();
       cout << "-------------------------------------------------------------------------" << endl;
     }
     
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index d875386f31f5..ccaeb41add50 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -257,6 +257,8 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CCo
   
   Convergence_Monitoring(driver_config, curOuterIter);  
   
+  Postprocess_HistoryData(driver_config);
+  
   /*--- Output using only the master node ---*/
   
   if (rank == MASTER_NODE && !noWriting) {
@@ -735,16 +737,16 @@ void COutput::PrintConvergenceSummary(){
   for (unsigned short iField_Conv = 0; iField_Conv < convFields.size(); iField_Conv++){
     const string &convField = convFields[iField_Conv];
     if (historyOutput_Map[convField].fieldType == HistoryFieldType::COEFFICIENT) {
-      string convMark = "";
-      if ( historyOutput_Map["CAUCHY_" + convField].value < cauchyEps) convMark = "*";
+      string convMark = "No";
+      if ( historyOutput_Map["CAUCHY_" + convField].value < cauchyEps) convMark = "Yes";
       ConvSummary << historyOutput_Map["CAUCHY_" + convField].fieldName 
           <<  historyOutput_Map["CAUCHY_" + convField].value 
           << " < " + PrintingToolbox::to_string(cauchyEps) << convMark;
     }
     else if (historyOutput_Map[convField].fieldType == HistoryFieldType::RESIDUAL || 
         historyOutput_Map[convField].fieldType == HistoryFieldType::AUTO_RESIDUAL)  {
-      string convMark = "";
-      if (historyOutput_Map[convField].value < minLogResidual) convMark = "*";
+      string convMark = "No";
+      if (historyOutput_Map[convField].value < minLogResidual) convMark = "Yes";
       ConvSummary << historyOutput_Map[convField].fieldName 
           << historyOutput_Map[convField].value 
           << " < " + PrintingToolbox::to_string(minLogResidual) << convMark;
@@ -1046,6 +1048,10 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
   
   SetMultizoneHistoryOutputFields(output, config);
   
+  /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
+ 
+  Postprocess_HistoryFields(config[ZONE_0]);
+  
   /*--- We use a fixed size of the file output summary table ---*/
   
   int total_width = 72;    
@@ -1055,10 +1061,7 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
 
   if (rank == MASTER_NODE && !noWriting){
     
-    /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
-   
-    //Postprocess_HistoryFields(config[ZONE_0]);
-    
+
     /*--- Check for consistency and remove fields that are requested but not available --- */
     
     CheckHistoryOutput();

From eb0ccef3c4229d2a7e3651a7528281dacffb512b Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 10:36:54 +0200
Subject: [PATCH 526/539] Fixing multizone output

---
 SU2_CFD/include/output/COutput.hpp        |  2 +-
 SU2_CFD/obj/Makefile.am                   |  2 +-
 SU2_CFD/src/drivers/CDriver.cpp           |  5 ++++-
 SU2_CFD/src/drivers/CMultizoneDriver.cpp  | 14 +++++++++---
 SU2_CFD/src/drivers/CSinglezoneDriver.cpp |  8 +++++++
 SU2_CFD/src/output/CMultizoneOutput.cpp   | 12 ----------
 SU2_CFD/src/output/COutput.cpp            | 27 ++++++++++++++---------
 7 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index a2b36bd73c7a..d9b3cb6be8b3 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -279,7 +279,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem per zone.
    * \param[in] wrt - If <TRUE> prepares history file for writing.
    */
-  void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt = true);  
+  void PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, CConfig *driver_config, bool wrt = true);  
   
   /*!
    * \brief Collects history data from the solvers, monitors the convergence and writes to screen and history file.
diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am
index 26429c4f45c5..1860eacd7947 100644
--- a/SU2_CFD/obj/Makefile.am
+++ b/SU2_CFD/obj/Makefile.am
@@ -113,7 +113,7 @@ libSU2Core_sources = ../src/definition_structure.cpp \
   ../src/output/CAdjHeatOutput.cpp \
   ../src/output/CAdjFlowCompOutput.cpp \
   ../src/output/CAdjFlowIncOutput.cpp \
-  ../src/output/CDriverOutput.cpp \
+  ../src/output/CMultizoneOutput.cpp \
   ../src/output/output_structure_legacy.cpp \
   ../src/python_wrapper_structure.cpp \
   ../src/solver_adjoint_mean.cpp \
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 8274d888b1fa..bc29748aac0f 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3754,8 +3754,11 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
   }
 
   if (driver_config->GetMultizone_Problem()){
+    if (rank == MASTER_NODE)
+      cout << endl <<"------------------- Output Preprocessing ( Multizone ) ------------------" << endl;
+    
     driver_output = new CMultizoneOutput(driver_config, config, nDim);
-    driver_output->PreprocessMultizoneHistoryOutput(output, config);
+    driver_output->PreprocessMultizoneHistoryOutput(output, config, driver_config);
   }
   
 
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 658f6eacc241..4485732a3fa9 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -148,7 +148,15 @@ CMultizoneDriver::~CMultizoneDriver(void) {
 }
 
 void CMultizoneDriver::StartSolver() {
-
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
+  driver_config->Set_StartTime(StartTime);
+  
   /*--- Main external loop of the solver. Runs for the number of time steps required. ---*/
 
   if (rank == MASTER_NODE)
@@ -507,7 +515,7 @@ void CMultizoneDriver::Output(unsigned long TimeIter) {
 #else
     StartTime = MPI_Wtime();
 #endif
-    config_container[ZONE_0]->Set_StartTime(StartTime);
+    driver_config->Set_StartTime(StartTime);
   }
 
 }
@@ -663,7 +671,7 @@ bool CMultizoneDriver::Monitor(unsigned long TimeIter){
     if ((MaxIterationsReached || InnerConvergence) && (rank == MASTER_NODE)) {
       cout << endl << "----------------------------- Solver Exit -------------------------------" << endl;
       if (InnerConvergence) cout << "All convergence criteria satisfied." << endl;
-      else cout << endl << "Maximum number of iterations reached (OUTER_ITER = " << OuterIter+1 << " ) before convergence." << endl;
+      else cout << endl << "Maximum number of iterations reached (OUTER_ITER = " << OuterIter+1 << ") before convergence." << endl;
       driver_output->PrintConvergenceSummary();
       cout << "-------------------------------------------------------------------------" << endl;
     }
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
index 08eddce9f237..4e9e8a066faf 100644
--- a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -55,6 +55,14 @@ CSinglezoneDriver::~CSinglezoneDriver(void) {
 }
 
 void CSinglezoneDriver::StartSolver() {
+  
+#ifndef HAVE_MPI
+  StartTime = su2double(clock())/su2double(CLOCKS_PER_SEC);
+#else
+  StartTime = MPI_Wtime();
+#endif
+  
+  config_container[ZONE_0]->Set_StartTime(StartTime);
 
   /*--- Main external loop of the solver. Runs for the number of time steps required. ---*/
 
diff --git a/SU2_CFD/src/output/CMultizoneOutput.cpp b/SU2_CFD/src/output/CMultizoneOutput.cpp
index 3c5d93b37b4a..167e22451e9f 100644
--- a/SU2_CFD/src/output/CMultizoneOutput.cpp
+++ b/SU2_CFD/src/output/CMultizoneOutput.cpp
@@ -99,12 +99,6 @@ void CMultizoneOutput::LoadMultizoneHistoryData(COutput **output, CConfig **conf
   unsigned short iZone, iField, nField;
   string name, header;
 
-  if (config[ZONE_0]->GetTime_Domain()){
-    SetHistoryOutputValue("TIME_ITER", curTimeIter);
-  }
-  SetHistoryOutputValue("OUTER_ITER", curOuterIter);
-  
-  
   for (iZone = 0; iZone < nZone; iZone++){
     
     map<string, HistoryOutputField> ZoneHistoryFields = output[iZone]->GetHistoryFields();
@@ -131,12 +125,6 @@ void CMultizoneOutput::SetMultizoneHistoryOutputFields(COutput **output, CConfig
   
   unsigned short iZone, iField, nField;
   string name, header, group;
-
-  if (config[ZONE_0]->GetTime_Domain()){
-    AddHistoryOutput("TIME_ITER", "Time_Iter", ScreenOutputFormat::INTEGER,  "ITER", "Time iteration index");
-  }
-  AddHistoryOutput("OUTER_ITER", "Outer_Iter", ScreenOutputFormat::INTEGER,  "ITER", "Outer iteration index");
-  
   
   /*--- Set the fields ---*/
   for (iZone = 0; iZone < nZone; iZone++){
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index ccaeb41add50..994be9cf0076 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -253,6 +253,8 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CCo
   
   /*--- Retrieve residual and extra data -----------------------------------------------------------------*/
   
+  LoadCommonHistoryData(driver_config);
+  
   LoadMultizoneHistoryData(output, config);
   
   Convergence_Monitoring(driver_config, curOuterIter);  
@@ -1035,22 +1037,24 @@ void COutput::PreprocessHistoryOutput(CConfig *config, bool wrt){
       }
 
     }
-    
-
-    
+ 
 }
 
-void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, bool wrt){
+void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **config, CConfig* driver_config, bool wrt){
     
   noWriting = !wrt;
-
+  
+  /*--- Set the common history fields for all solvers ---*/
+  
+  SetCommonHistoryFields(driver_config);
+  
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
   
   SetMultizoneHistoryOutputFields(output, config);
   
   /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
  
-  Postprocess_HistoryFields(config[ZONE_0]);
+  Postprocess_HistoryFields(driver_config);
   
   /*--- We use a fixed size of the file output summary table ---*/
   
@@ -1068,7 +1072,7 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
     
     /*--- Open history file and print the header ---*/
     
-    PrepareHistoryFile(config[ZONE_0]);
+    PrepareHistoryFile(driver_config);
     
     total_width = nRequestedScreenFields*fieldWidth + (nRequestedScreenFields-1);    
     
@@ -1566,7 +1570,8 @@ void COutput::Postprocess_HistoryData(CConfig *config){
     const su2double& value = it->second.first;
     const int& count = it->second.second;
     const su2double average = value/count;
-    SetHistoryOutputValue("AVG_" + it->first, average);
+    if (historyOutput_Map.count("AVG_" + it->first) > 0 )
+      SetHistoryOutputValue("AVG_" + it->first, average);
   }
   
 }
@@ -1588,8 +1593,10 @@ void COutput::Postprocess_HistoryFields(CConfig *config){
   
   map<string, bool>::iterator it = Average.begin();
   for (it = Average.begin(); it != Average.end(); it++){
-    AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", ScreenOutputFormat::FIXED,
-                     "AVG_" + it->first , "Average residual over all solution variables.", HistoryFieldType::AUTO_RESIDUAL);
+    if (AverageGroupName.count(it->first) > 0) {
+      AddHistoryOutput("AVG_" + it->first, "avg[" + AverageGroupName[it->first] + "]", ScreenOutputFormat::FIXED,
+          "AVG_" + it->first , "Average residual over all solution variables.", HistoryFieldType::AUTO_RESIDUAL);
+    }
   }  
   
   if (config->GetTime_Domain()){

From b6c51102baa2a48bf53742fb40898f18c3345216 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 10:37:25 +0200
Subject: [PATCH 527/539] Couple of misc. fixes

---
 SU2_CFD/src/output/CFlowIncOutput.cpp         | 22 +++++++++----------
 SU2_CFD/src/output/CFlowOutput.cpp            |  2 +-
 SU2_CFD/src/output/COutput.cpp                |  4 ++--
 .../output/filewriter/CSU2MeshFileWriter.cpp  |  2 --
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 59a0fac57b62..87633de48fae 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -110,7 +110,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Root-mean square residual of the velocity z-component.  
   if (nDim == 3) AddHistoryOutput("RMS_VELOCITY-Z", "rms[W]", ScreenOutputFormat::FIXED,   "RMS_RES", "Root-mean square residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_HEAT", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
+  if (heat || weakly_coupled_heat) AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
@@ -139,7 +139,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     AddHistoryOutput("MAX_VELOCITY-Z", "max[W]", ScreenOutputFormat::FIXED,   "MAX_RES", "Maximum residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   if (heat || weakly_coupled_heat) 
-    AddHistoryOutput("MAX_HEAT", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
+    AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Root-mean square residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
@@ -168,7 +168,7 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
     AddHistoryOutput("BGS_VELOCITY-Z", "bgs[W]", ScreenOutputFormat::FIXED,   "BGS_RES", "BGS residual of the velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
   if (heat || weakly_coupled_heat) 
-    AddHistoryOutput("BGS_HEAT", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the temperature.", HistoryFieldType::RESIDUAL);
+    AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of the temperature.", HistoryFieldType::RESIDUAL);
   
   switch(turb_model){
   case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
@@ -276,22 +276,22 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
     SetHistoryOutputValue("HEATFLUX",     heat_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", heat_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  heat_solver->GetTotal_AvgTemperature());
-    SetHistoryOutputValue("RMS_HEAT",         log10(heat_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("MAX_HEAT",         log10(heat_solver->GetRes_Max(0)));
+    SetHistoryOutputValue("RMS_TEMPERATURE",         log10(heat_solver->GetRes_RMS(0)));
+    SetHistoryOutputValue("MAX_TEMPERATURE",         log10(heat_solver->GetRes_Max(0)));
     if (multiZone) SetHistoryOutputValue("BGS_HEAT",         log10(heat_solver->GetRes_BGS(0)));
   }
   if (heat){
     SetHistoryOutputValue("HEATFLUX",     flow_solver->GetTotal_HeatFlux());
     SetHistoryOutputValue("HEATFLUX_MAX", flow_solver->GetTotal_MaxHeatFlux());
     SetHistoryOutputValue("TEMPERATURE",  flow_solver->GetTotal_AvgTemperature());
-    if (nDim == 3) SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(4)));
-    else           SetHistoryOutputValue("RMS_HEAT",         log10(flow_solver->GetRes_RMS(3)));
+    if (nDim == 3) SetHistoryOutputValue("RMS_TEMPERATURE",         log10(flow_solver->GetRes_RMS(4)));
+    else           SetHistoryOutputValue("RMS_TEMPERATURE",         log10(flow_solver->GetRes_RMS(3)));
     
-    if (nDim == 3) SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(4)));
-    else           SetHistoryOutputValue("MAX_HEAT",         log10(flow_solver->GetRes_Max(3)));
+    if (nDim == 3) SetHistoryOutputValue("MAX_TEMPERATURE",         log10(flow_solver->GetRes_Max(4)));
+    else           SetHistoryOutputValue("MAX_TEMPERATURE",         log10(flow_solver->GetRes_Max(3)));
     if (multiZone){
-      if (nDim == 3) SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(4)));
-      else           SetHistoryOutputValue("BGS_HEAT",         log10(flow_solver->GetRes_BGS(3)));
+      if (nDim == 3) SetHistoryOutputValue("BGS_TEMPERATURE",         log10(flow_solver->GetRes_BGS(4)));
+      else           SetHistoryOutputValue("BGS_TEMPERATURE",         log10(flow_solver->GetRes_BGS(3)));
     }
 
   }  
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index 2ebad2e19ee5..a305c33a59e5 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -940,7 +940,7 @@ void CFlowOutput::WriteMetaData(CConfig *config, CGeometry *geometry){
   
   string filename = "flow";
   
-  filename = config->GetFilename(filename, "meta", curTimeIter);
+  filename = config->GetFilename(filename, ".meta", curTimeIter);
   
   /*--- All processors open the file. ---*/
 
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 994be9cf0076..d1ac736830ef 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1800,7 +1800,7 @@ void COutput::SetCommonHistoryFields(CConfig *config){
   AddHistoryOutput("TIME_STEP", "Time_Step", ScreenOutputFormat::SCIENTIFIC, "TIME_DOMAIN", "Current time step (s)");
  
   /// DESCRIPTION: Currently used wall-clock time.
-  AddHistoryOutput("PHYS_TIME",   "Time(sec)", ScreenOutputFormat::SCIENTIFIC, "PHYS_TIME", "Average wall-clock time"); 
+  AddHistoryOutput("WALL_TIME",   "Time(sec)", ScreenOutputFormat::SCIENTIFIC, "WALL_TIME", "Average wall-clock time"); 
   
 }
 
@@ -1826,7 +1826,7 @@ void COutput::LoadCommonHistoryData(CConfig *config){
   
   UsedTime = (StopTime - config->Get_StartTime())/((curOuterIter + 1) * (curInnerIter+1));
   
-  SetHistoryOutputValue("PHYS_TIME", UsedTime);
+  SetHistoryOutputValue("WALL_TIME", UsedTime);
   
 }
 
diff --git a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
index b68d439284e2..fcdd823d590a 100644
--- a/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
+++ b/SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp
@@ -122,8 +122,6 @@ void CSU2MeshFileWriter::Write_Data(){
   /*--- Write the node coordinates ---*/
   if (rank == MASTER_NODE){
     output_file << "NPOIN= " << dataSorter->GetnPointsGlobal();
-//    if (geometry->GetGlobal_nPointDomain() != nGlobal_Poin_Par)
-//      output_file << "\t" << geometry->GetGlobal_nPointDomain();
     output_file << endl;
     output_file.flush();    
   }

From 7f280abc04c257be866d26c900a152950b2d1f38 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 11:14:58 +0200
Subject: [PATCH 528/539] Fixed baseline output

---
 SU2_CFD/src/output/CBaselineOutput.cpp | 2 ++
 SU2_CFD/src/output/COutput.cpp         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/SU2_CFD/src/output/CBaselineOutput.cpp b/SU2_CFD/src/output/CBaselineOutput.cpp
index 6fe117ba80dc..9139c03eb724 100644
--- a/SU2_CFD/src/output/CBaselineOutput.cpp
+++ b/SU2_CFD/src/output/CBaselineOutput.cpp
@@ -45,6 +45,8 @@ CBaselineOutput::CBaselineOutput(CConfig *config, unsigned short nDim, CSolver*
   
   /*--- Set the requested volume fields to all fields in the solver ---*/
   
+  requestedVolumeFields.clear();
+  
   requestedVolumeFields.emplace_back("COORDINATES");
   requestedVolumeFields.emplace_back("SOLUTION");
   
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index d1ac736830ef..df756497af54 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -1326,6 +1326,8 @@ void COutput::PreprocessVolumeOutput(CConfig *config){
                                           requestedVolumeFields.end(), FieldsToRemove[iReqField]));
   }
   
+  nRequestedVolumeFields = requestedVolumeFields.size();
+  
   if (rank == MASTER_NODE){
     cout <<"Volume output fields: ";
     for (unsigned short iReqField = 0; iReqField < nRequestedVolumeFields; iReqField++){

From 25fb8f98fd6727bd1550d4d928fe735368e66185 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 11:30:49 +0200
Subject: [PATCH 529/539] Adding flow.meta to python scripts

---
 SU2_PY/SU2/eval/functions.py | 6 ++++++
 SU2_PY/SU2/eval/gradients.py | 9 ++++++++-
 SU2_PY/SU2/io/state.py       | 3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/SU2_PY/SU2/eval/functions.py b/SU2_PY/SU2/eval/functions.py
index 28ea181c61f6..370d9c3fced2 100644
--- a/SU2_PY/SU2/eval/functions.py
+++ b/SU2_PY/SU2/eval/functions.py
@@ -220,6 +220,9 @@ def aerodynamics( config, state=None ):
     name = su2io.expand_part(name,config)
     link.extend(name)
     
+    if 'FLOW_META' in files:
+        pull.append(files['FLOW_META'])
+
     # files: direct solution
     if 'DIRECT' in files:
         name = files['DIRECT']
@@ -272,6 +275,9 @@ def aerodynamics( config, state=None ):
             if 'TARGET_HEATFLUX' in info.FILES:
                 push.append(info.FILES['TARGET_HEATFLUX'])
                 
+            if 'FLOW_META' in info.FILES:
+                push.append(info.FILES['FLOW_META'])
+                
     #: with output redirection
     su2io.update_persurface(config,state)
     # return output 
diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py
index 62a5b0da3e8c..936ac97807d1 100644
--- a/SU2_PY/SU2/eval/gradients.py
+++ b/SU2_PY/SU2/eval/gradients.py
@@ -243,7 +243,10 @@ def adjoint( func_name, config, state=None ):
     name = su2io.expand_zones(name,config)
     name = su2io.expand_time(name,config)
     link.extend(name)
-
+    
+    if 'FLOW_META' in files:
+        pull.append(files['FLOW_META'])
+        
     # files: adjoint solution
     if ADJ_NAME in files:
         name = files[ADJ_NAME]
@@ -1041,6 +1044,10 @@ def directdiff( config, state=None ):
     name = files['MESH']
     name = su2io.expand_part(name,konfig)
     link.extend(name)
+
+    if 'FLOW_META' in files:
+        pull.append(files['FLOW_META'])
+
     # files: direct solution
     if 'DIRECT' in files:
         name = files['DIRECT']
diff --git a/SU2_PY/SU2/io/state.py b/SU2_PY/SU2/io/state.py
index 2c1264f2b4b3..837ad459b612 100644
--- a/SU2_PY/SU2/io/state.py
+++ b/SU2_PY/SU2/io/state.py
@@ -356,6 +356,9 @@ def register_file(label,filename):
         if 'INV_DESIGN_HEATFLUX' in special_cases:
             register_file('TARGET_HEATFLUX',targetheatflux_name)
         
+        # flow meta data file
+        register_file('FLOW_META', 'flow.meta')
+
         return
     
     def __setitem__(self,k,v):

From 07eab29f12ca3fa5ba83b6300c9ca979a649a888 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 12:15:15 +0200
Subject: [PATCH 530/539] Fixing screen output for incomp test case

---
 QuickStart/inv_NACA0012.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index 25ef1b974c9e..3d160fc0136f 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -21,7 +21,7 @@ MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
 RESTART_SOL= NO
-
+SCREEN_OUTPUT=(INNER_ITER, WALL_TIME, RMS_DENSITY, LIFT, DRAG, CAUCHY_SENS_PRESS, CAUCHY_DRAG)
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)

From 75399a3a650575217cd4ed7f7cad8e6e3c2fffd4 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 12:25:32 +0200
Subject: [PATCH 531/539] Fixing screen output for incomp test case

---
 .../incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg | 2 +-
 TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 7003f39cf3ee..46b76fcb8658 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -268,7 +268,7 @@ WRT_SOL_FREQ= 100
 WRT_CON_FREQ= 1
 %
 % Screen output fields
-SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_HEAT, LIFT, DRAG)
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG)
 
 % ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
 %
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 17b16456b5e0..bf6242eeb176 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -299,4 +299,4 @@ WRT_SOL_FREQ= 250
 WRT_CON_FREQ= 1
 %
 % Screen output fields
-SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_HEAT, LIFT, DRAG)
+SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG)

From 208bd3a147542a7b603246b35fcad26bfdd7cc0d Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Mon, 30 Sep 2019 13:30:26 +0200
Subject: [PATCH 532/539] Enabled restart for fixed cl test case

---
 TestCases/fixed_cl/naca0012/inv_NACA0012.cfg | 7 +++++--
 TestCases/parallel_regression.py             | 4 ++--
 TestCases/serial_regression.py               | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 37580bd2358f..dfb0dcc5032b 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -20,10 +20,12 @@ SOLVER= EULER
 MATH_PROBLEM= DIRECT
 %
 % Restart solution (NO, YES)
-RESTART_SOL= NO
+RESTART_SOL= YES
 %
 % New singlezone driver
 SINGLEZONE_DRIVER= YES
+%
+READ_BINARY_RESTART=NO
 
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
@@ -315,7 +317,8 @@ WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
-
+%
+OUTPUT_FILES= (RESTART_ASCII)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index d2d8867810fb..96c65ae62e36 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -100,8 +100,8 @@ def main():
     fixedCL_naca0012           = TestCase('fixedcl_naca0012')
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    fixedCL_naca0012.test_iter = 100
-    fixedCL_naca0012.test_vals = [-2.474140, 2.927471, 0.290169, 0.019080] #last 4 columns
+    fixedCL_naca0012.test_iter = 10
+    fixedCL_naca0012.test_vals = [-13.118618, -7.594336, 0.300000, 0.019389] #last 4 columns
     fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
     fixedCL_naca0012.timeout   = 1600
     fixedCL_naca0012.tol       = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 1de122c429cc..f9c71b17629d 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -102,8 +102,8 @@ def main():
     fixedCL_naca0012           = TestCase('fixedcl_naca0012')
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
-    fixedCL_naca0012.test_iter = 100
-    fixedCL_naca0012.test_vals = [-2.582897, 2.820443, 0.295158, 0.019324] #last 4 columns
+    fixedCL_naca0012.test_iter = 10
+    fixedCL_naca0012.test_vals = [-13.082182, -7.559617, 0.300000, 0.019389] #last 4 columns
     fixedCL_naca0012.su2_exec  = "SU2_CFD"
     fixedCL_naca0012.new_output = True
     fixedCL_naca0012.timeout   = 1600

From 081e6a532afbd5fe2d4b4d56ac4ab239012a3832 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 1 Oct 2019 17:11:47 +0200
Subject: [PATCH 533/539] Changed aero coeff names to be consistent with python
 scripts

---
 SU2_CFD/src/output/CFlowCompFEMOutput.cpp | 33 -----------------------
 SU2_CFD/src/output/CFlowOutput.cpp        | 24 ++++++++---------
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
index b594e8f2ed4f..20769af8def6 100644
--- a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -271,39 +271,6 @@ void CFlowCompFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
     SetHistoryOutputValue("MAX_ENERGY", log10(flow_solver->GetRes_Max(4)));
   }
   
-  SetHistoryOutputValue("DRAG", flow_solver->GetTotal_CD());
-  SetHistoryOutputValue("LIFT", flow_solver->GetTotal_CL());
-  if (nDim == 3)
-    SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
-  if (nDim == 3){
-    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
-    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
-  }
-  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
-  if (nDim == 3)
-    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
-  SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
-  
-  for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {
-    SetHistoryOutputPerSurfaceValue("DRAG_ON_SURFACE", flow_solver->GetSurface_CD(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("LIFT_ON_SURFACE", flow_solver->GetSurface_CL(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("SIDEFORCE_ON_SURFACE", flow_solver->GetSurface_CSF(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3){
-      SetHistoryOutputPerSurfaceValue("MOMENT-X_ON_SURFACE", flow_solver->GetSurface_CMx(iMarker_Monitoring), iMarker_Monitoring);
-      SetHistoryOutputPerSurfaceValue("MOMENT-Y_ON_SURFACE", flow_solver->GetSurface_CMy(iMarker_Monitoring), iMarker_Monitoring);
-    }
-    SetHistoryOutputPerSurfaceValue("MOMENT-Z_ON_SURFACE", flow_solver->GetSurface_CMz(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-X_ON_SURFACE", flow_solver->GetSurface_CFx(iMarker_Monitoring), iMarker_Monitoring);
-    SetHistoryOutputPerSurfaceValue("FORCE-Y_ON_SURFACE", flow_solver->GetSurface_CFy(iMarker_Monitoring), iMarker_Monitoring);
-    if (nDim == 3)
-      SetHistoryOutputPerSurfaceValue("FORCE-Z_ON_SURFACE", flow_solver->GetSurface_CFz(iMarker_Monitoring), iMarker_Monitoring);   
-    
-    SetHistoryOutputPerSurfaceValue("EFFICIENCY_ON_SURFACE", flow_solver->GetSurface_CEff(iMarker_Monitoring), iMarker_Monitoring);
-  }
-  
   SetHistoryOutputValue("AOA", config->GetAoA());
   SetHistoryOutputValue("LINSOL_ITER", flow_solver->GetIterLinSolver());
   SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index a305c33a59e5..76208552ba1d 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -691,17 +691,17 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
   /// DESCRIPTION: Sideforce coefficient   
   AddHistoryOutput("SIDEFORCE",  "CSF",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the x-axis    
-  AddHistoryOutput("MOMENT-X",   "CMx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("MOMENT_X",   "CMx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the y-axis    
-  AddHistoryOutput("MOMENT-Y",   "CMy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("MOMENT_Y",   "CMy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Moment around the z-axis      
-  AddHistoryOutput("MOMENT-Z",   "CMz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("MOMENT_Z",   "CMz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total momentum z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in x direction    
-  AddHistoryOutput("FORCE-X",    "CFx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("FORCE_X",    "CFx",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force x-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in y direction    
-  AddHistoryOutput("FORCE-Y",    "CFy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("FORCE_Y",    "CFy",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force y-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Force in z direction      
-  AddHistoryOutput("FORCE-Z",    "CFz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("FORCE_Z",    "CFz",  ScreenOutputFormat::FIXED, "AERO_COEFF", "Total force z-component on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Lift-to-drag ratio
   AddHistoryOutput("EFFICIENCY", "CEff", ScreenOutputFormat::FIXED, "AERO_COEFF", "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
   /// END_GROUP  
@@ -744,14 +744,14 @@ void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solv
   if (nDim == 3)
     SetHistoryOutputValue("SIDEFORCE", flow_solver->GetTotal_CSF());
   if (nDim == 3){
-    SetHistoryOutputValue("MOMENT-X", flow_solver->GetTotal_CMx());
-    SetHistoryOutputValue("MOMENT-Y", flow_solver->GetTotal_CMy());
+    SetHistoryOutputValue("MOMENT_X", flow_solver->GetTotal_CMx());
+    SetHistoryOutputValue("MOMENT_Y", flow_solver->GetTotal_CMy());
   }
-  SetHistoryOutputValue("MOMENT-Z", flow_solver->GetTotal_CMz());
-  SetHistoryOutputValue("FORCE-X", flow_solver->GetTotal_CFx());
-  SetHistoryOutputValue("FORCE-Y", flow_solver->GetTotal_CFy());
+  SetHistoryOutputValue("MOMENT_Z", flow_solver->GetTotal_CMz());
+  SetHistoryOutputValue("FORCE_X", flow_solver->GetTotal_CFx());
+  SetHistoryOutputValue("FORCE_Y", flow_solver->GetTotal_CFy());
   if (nDim == 3)
-    SetHistoryOutputValue("FORCE-Z", flow_solver->GetTotal_CFz());
+    SetHistoryOutputValue("FORCE_Z", flow_solver->GetTotal_CFz());
   SetHistoryOutputValue("EFFICIENCY", flow_solver->GetTotal_CEff());
   
   for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config->GetnMarker_Monitoring(); iMarker_Monitoring++) {

From 39dbebc574a0886fa7c165d342dce8490947dbbe Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 1 Oct 2019 17:16:16 +0200
Subject: [PATCH 534/539] Added a new history mapping procedure for python
 scripts

---
 SU2_PY/Makefile.am                            |   1 +
 SU2_PY/SU2/eval/functions.py                  |  20 +-
 SU2_PY/SU2/eval/gradients.py                  |  44 +-
 SU2_PY/SU2/io/__init__.py                     |   1 +
 SU2_PY/SU2/io/config.py                       |  19 +-
 SU2_PY/SU2/io/historyMap.py                   | 855 ++++++++++++++++++
 SU2_PY/SU2/io/tools.py                        | 220 +----
 SU2_PY/SU2/opt/project.py                     |   7 +-
 SU2_PY/meson.build                            |   1 +
 SU2_PY/updateHistoryMap.py                    |  96 ++
 .../naca0012/of_grad_directdiff.dat.ref       |   8 +-
 .../naca0012/of_grad_directdiff.dat.ref       |   6 +-
 12 files changed, 1044 insertions(+), 234 deletions(-)
 create mode 100644 SU2_PY/SU2/io/historyMap.py
 create mode 100644 SU2_PY/updateHistoryMap.py

diff --git a/SU2_PY/Makefile.am b/SU2_PY/Makefile.am
index 4809bee01553..ec9151027334 100644
--- a/SU2_PY/Makefile.am
+++ b/SU2_PY/Makefile.am
@@ -70,6 +70,7 @@ nobase_dist_mypkg_DATA= \
     SU2/io/redirect.py \
     SU2/io/state.py \
     SU2/io/tools.py \
+    SU2/io/historyMap.py \
     SU2/io/__init__.py \
     SU2/mesh/adapt.py \
     SU2/mesh/tools.py \
diff --git a/SU2_PY/SU2/eval/functions.py b/SU2_PY/SU2/eval/functions.py
index 370d9c3fced2..1293c5c79d63 100644
--- a/SU2_PY/SU2/eval/functions.py
+++ b/SU2_PY/SU2/eval/functions.py
@@ -94,9 +94,13 @@ def function( func_name, config, state=None ):
     if not func_name_string in state['FUNCTIONS']:
 
         # Aerodynamics
-        if multi_objective or func_name == 'ALL' or func_name in su2io.optnames_aero + su2io.grad_names_directdiff + su2io.optnames_turbo:
+        if multi_objective or func_name == 'ALL':
             aerodynamics( config, state )
-            
+
+        elif func_name in su2io.historyOutFields:
+            if su2io.historyOutFields[func_name]['TYPE'] == 'COEFFICIENT' or su2io.historyOutFields[func_name]['TYPE'] == 'D_COEFFICIENT':
+                aerodynamics( config, state )
+
         # Stability
         elif func_name in su2io.optnames_stab:
             stability( config, state )
@@ -199,13 +203,17 @@ def aerodynamics( config, state=None ):
     # ----------------------------------------------------    
     #  Direct Solution
     # ----------------------------------------------------    
-    
+    opt_names = []
+    for key in su2io.historyOutFields:
+        if su2io.historyOutFields[key]['TYPE'] == 'COEFFICIENT':
+            opt_names.append(key)
+
     # redundancy check
-    direct_done = all([key in state.FUNCTIONS for key in su2io.optnames_aero[:9]])
+    direct_done = all([key in state.FUNCTIONS for key in opt_names])
     if direct_done:
         # return aerodynamic function values
         aero = su2util.ordered_bunch()
-        for key in su2io.optnames_aero:
+        for key in opt_names:
             if key in state.FUNCTIONS:
                 aero[key] = state.FUNCTIONS[key]
         return copy.deepcopy(aero)    
@@ -282,7 +290,7 @@ def aerodynamics( config, state=None ):
     su2io.update_persurface(config,state)
     # return output 
     funcs = su2util.ordered_bunch()
-    for key in su2io.optnames_aero + su2io.grad_names_directdiff + su2io.optnames_turbo:
+    for key in su2io.historyOutFields:
         if key in state['FUNCTIONS']:
             funcs[key] = state['FUNCTIONS'][key]
             
diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py
index 936ac97807d1..4a34c5384dc5 100644
--- a/SU2_PY/SU2/eval/gradients.py
+++ b/SU2_PY/SU2/eval/gradients.py
@@ -101,11 +101,13 @@ def gradient( func_name, method, config, state=None ):
         if any([method == 'CONTINUOUS_ADJOINT', method == 'DISCRETE_ADJOINT']):
               
             # Aerodynamics
-            if func_output in su2io.optnames_aero + su2io.optnames_turbo:
-                grads = adjoint( func_name, config, state )
+            if func_output in su2io.historyOutFields:
+                if su2io.historyOutFields[func_output]['TYPE'] == 'COEFFICIENT':
+                    grads = adjoint( func_name, config, state )
 
-            elif func_name in su2io.optnames_aero + su2io.optnames_turbo:
-                grads = adjoint( func_name, config, state )
+            elif func_name in su2io.historyOutFields:
+                if su2io.historyOutFields[func_name]['TYPE'] == 'COEFFICIENT':
+                    grads = adjoint( func_name, config, state )
                 
             # Stability
             elif func_output in su2io.optnames_stab:
@@ -712,7 +714,10 @@ def findiff( config, state=None ):
     # ----------------------------------------------------    
 
     # master redundancy check
-    opt_names = su2io.optnames_aero + su2io.optnames_geo 
+    opt_names = []
+    for key in su2io.historyOutFields:
+        if su2io.historyOutFields[key]['TYPE'] == 'COEFFICIENT':
+            opt_names.append(key)
     findiff_todo = all([key in state.GRADIENTS for key in opt_names])
     if findiff_todo:
         grads = state['GRADIENTS']
@@ -752,8 +757,7 @@ def findiff( config, state=None ):
         dvs_base = konfig['DV_VALUE_NEW']
 
     # initialize gradients
-    func_keys = list(func_base.keys())
-    func_keys = ['VARIABLE'] + func_keys + ['FINDIFF_STEP']
+    func_keys = ['VARIABLE'] + opt_names + ['FINDIFF_STEP']
     grads = su2util.ordered_bunch.fromkeys(func_keys)
     for key in grads.keys(): grads[key] = []
 
@@ -816,6 +820,12 @@ def findiff( config, state=None ):
                 meshfiles = this_state.FILES.MESH
                 meshfiles = su2io.expand_part(meshfiles,this_konfig)
                 for name in meshfiles: os.remove(name)
+                        
+                for key in grads.keys():
+                    if key == 'VARIABLE' or key == 'FINDIFF_STEP':
+                        pass
+                    elif not key in func_step:
+                        del grads[key]  
 
                 # calc finite difference and store
                 for key in grads.keys():
@@ -1006,7 +1016,11 @@ def directdiff( config, state=None ):
     # ----------------------------------------------------
 
     # master redundancy check
-    opt_names = su2io.optnames_aero + su2io.optnames_geo
+    opt_names = []
+    for key in su2io.historyOutFields:
+        if su2io.historyOutFields[key]['TYPE'] == 'COEFFICIENT':
+            opt_names.append(key)
+
     directdiff_todo = all([key in state.GRADIENTS for key in opt_names])
     if directdiff_todo:
         grads = state['GRADIENTS']
@@ -1032,7 +1046,7 @@ def directdiff( config, state=None ):
     n_dv = sum(Definition_DV['SIZE'])
 
     # initialize gradients
-    func_keys = list(su2io.grad_names_map.keys())
+    func_keys = opt_names
     func_keys = ['VARIABLE'] + func_keys
     grads = su2util.ordered_bunch.fromkeys(func_keys)
     for key in grads.keys(): grads[key] = []
@@ -1090,15 +1104,19 @@ def directdiff( config, state=None ):
                 # Direct Solution
                 func_step = function( 'ALL', this_konfig, this_state )
 
+                # delete keys not returned by the solver
+                for key in grads.keys():
+                    if key == 'VARIABLE':
+                        pass
+                    elif not 'D_' + key in func_step:
+                        del grads[key]
+
                 # store
                 for key in grads.keys():
                     if key == 'VARIABLE':
                         grads[key].append(i_dv)
                     else:
-                        if su2io.grad_names_map[key] in func_step:
-                          this_grad = func_step[su2io.grad_names_map[key]]
-                        else:
-                          this_grad = 0.0
+                        this_grad = func_step['D_' + key]
                         grads[key].append(this_grad)
                 #: for each grad name
 
diff --git a/SU2_PY/SU2/io/__init__.py b/SU2_PY/SU2/io/__init__.py
index 3c9419ac93c5..d79c0aa59c28 100644
--- a/SU2_PY/SU2/io/__init__.py
+++ b/SU2_PY/SU2/io/__init__.py
@@ -8,3 +8,4 @@
 
 from .config   import Config
 from .state    import State_Factory as State
+from .historyMap import history_header_map as historyOutFields
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 11c1d1f60259..7285a8854daa 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -420,8 +420,13 @@ def read_config(filename):
             
             if case("OUTPUT_FILES"):
                 data_dict[this_param] = this_value.strip("()").split(",")
+                data_dict[this_param] = [i.strip(" ") for i in data_dict[this_param]]
                 break
-
+            if case("HISTORY_OUTPUT"):
+                data_dict[this_param] = this_value.strip("()").split(",")
+                data_dict[this_param] = [i.strip(" ") for i in data_dict[this_param]]
+                break
+            
             # unitary design variable definition
             if case("DEFINITION_DV"):
                 # remove white space
@@ -735,7 +740,9 @@ def read_config(filename):
         Mesh_List +=  str(Mesh_Filename)
       Mesh_List += ")"
       data_dict['MULTIPOINT_MESH_FILENAME'] = Mesh_List  
-      
+
+    if 'HISTORY_OUTPUT' not in data_dict:
+        data_dict['HISTORY_OUTPUT'] = ['ITER', 'RMS_RES']
 
     #
     # Default values for optimization parameters (needed for some eval functions
@@ -855,6 +862,14 @@ def write_config(filename,param_dict):
                         output_file.write(", ")
                 output_file.write(")")
                 break
+            
+            if case("HISTORY_OUTPUT"):
+                n_lists = len(new_value)
+                for i_value in range(n_lists):
+                    output_file.write(new_value[i_value])
+                    if i_value+1 < n_lists:
+                        output_file.write(", ")
+                break
 
             # semicolon delimited lists of comma delimited lists
             if case("DV_PARAM") :
diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py
new file mode 100644
index 000000000000..9e6c867c7750
--- /dev/null
+++ b/SU2_PY/SU2/io/historyMap.py
@@ -0,0 +1,855 @@
+history_header_map = {'ADJOINT_DISP_X': {'DESCRIPTION': '',
+                    'GROUP': 'RESIDUALS',
+                    'HEADER': 'Res[Ux_adj]',
+                    'TYPE': 'DEFAULT'},
+ 'ADJOINT_DISP_Y': {'DESCRIPTION': '',
+                    'GROUP': 'RESIDUALS',
+                    'HEADER': 'Res[Uy_adj]',
+                    'TYPE': 'DEFAULT'},
+ 'ADJOINT_DISP_Z': {'DESCRIPTION': '',
+                    'GROUP': 'RESIDUALS',
+                    'HEADER': 'Res[Uz_adj]',
+                    'TYPE': 'DEFAULT'},
+ 'AEROCDRAG': {'DESCRIPTION': 'Aero CD drag',
+               'GROUP': 'ENGINE_OUTPUT',
+               'HEADER': 'AeroCDrag',
+               'TYPE': 'COEFFICIENT'},
+ 'AOA': {'DESCRIPTION': 'Angle of attack',
+         'GROUP': 'AOA',
+         'HEADER': 'AoA',
+         'TYPE': 'DEFAULT'},
+ 'AVG_DENSITY': {'DESCRIPTION': 'Total average density on all markers set in '
+                                'MARKER_ANALYZE',
+                 'GROUP': 'FLOW_COEFF',
+                 'HEADER': 'Avg_Density',
+                 'TYPE': 'COEFFICIENT'},
+ 'AVG_ENTHALPY': {'DESCRIPTION': 'Total average enthalpy on all markers set in '
+                                 'MARKER_ANALYZE',
+                  'GROUP': 'FLOW_COEFF',
+                  'HEADER': 'Avg_Enthalpy',
+                  'TYPE': 'COEFFICIENT'},
+ 'AVG_MACH': {'DESCRIPTION': 'Total average mach number on all markers set in '
+                             'MARKER_ANALYZE',
+              'GROUP': 'FLOW_COEFF',
+              'HEADER': 'Avg_Mach',
+              'TYPE': 'COEFFICIENT'},
+ 'AVG_MASSFLOW': {'DESCRIPTION': 'Total average mass flow on all markers set '
+                                 'in MARKER_ANALYZE',
+                  'GROUP': 'FLOW_COEFF',
+                  'HEADER': 'Avg_Massflow',
+                  'TYPE': 'COEFFICIENT'},
+ 'AVG_NORMALVEL': {'DESCRIPTION': 'Total average normal velocity on all '
+                                  'markers set in MARKER_ANALYZE',
+                   'GROUP': 'FLOW_COEFF',
+                   'HEADER': 'Avg_NormalVel',
+                   'TYPE': 'COEFFICIENT'},
+ 'AVG_PRESS': {'DESCRIPTION': 'Total average pressure on all markers set in '
+                              'MARKER_ANALYZE',
+               'GROUP': 'FLOW_COEFF',
+               'HEADER': 'Avg_Press',
+               'TYPE': 'COEFFICIENT'},
+ 'AVG_TEMP': {'DESCRIPTION': 'Total average temperature on all markers set in '
+                             'MARKER_ANALYZE',
+              'GROUP': 'FLOW_COEFF',
+              'HEADER': 'Avg_Temp',
+              'TYPE': 'COEFFICIENT'},
+ 'AVG_TEMPERATURE': {'DESCRIPTION': 'Total average temperature on all surfaces '
+                                    'defined in MARKER_MONITORING',
+                     'GROUP': 'HEAT',
+                     'HEADER': 'AvgTemp',
+                     'TYPE': 'COEFFICIENT'},
+ 'AVG_TOTALPRESS': {'DESCRIPTION': 'Total average total pressure on all '
+                                   'markers set in MARKER_ANALYZE',
+                    'GROUP': 'FLOW_COEFF',
+                    'HEADER': 'Avg_TotalPress',
+                    'TYPE': 'COEFFICIENT'},
+ 'AVG_TOTALTEMP': {'DESCRIPTION': 'Total average total temperature all markers '
+                                  'set in MARKER_ANALYZE',
+                   'GROUP': 'FLOW_COEFF',
+                   'HEADER': 'Avg_TotalTemp',
+                   'TYPE': 'COEFFICIENT'},
+ 'BGS_ADJ_DENSITY': {'DESCRIPTION': 'BGS residual of the adjoint density.',
+                     'GROUP': 'BGS_RES',
+                     'HEADER': 'bgs[A_Rho]',
+                     'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_DISSIPATION': {'DESCRIPTION': 'BGS residual of the adjoint '
+                                        'dissipation.',
+                         'GROUP': 'BGS_RES',
+                         'HEADER': 'bgs[A_w]',
+                         'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_ENERGY': {'DESCRIPTION': 'BGS residual of the adjoint energy.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[A_E]',
+                    'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_HEAT': {'DESCRIPTION': 'BGS residual of the adjoint temperature.',
+                  'GROUP': 'BGS_RES',
+                  'HEADER': 'bgs[A_T]',
+                  'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_MOMENTUM-X': {'DESCRIPTION': 'BGS residual of the adjoint momentum '
+                                       'x-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bgs[A_RhoU]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_MOMENTUM-Y': {'DESCRIPTION': 'BGS residual of the adjoint momentum '
+                                       'y-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bgs[A_RhoV]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_MOMENTUM-Z': {'DESCRIPTION': 'BGS residual of the adjoint momentum '
+                                       'z-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bgs[A_RhoW]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_NU_TILDE': {'DESCRIPTION': 'BGS residual of the adjoint nu tilde.',
+                      'GROUP': 'BGS_RES',
+                      'HEADER': 'bgs[A_nu]',
+                      'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_PRESSURE': {'DESCRIPTION': 'BGS residual of the adjoint Pressure.',
+                      'GROUP': 'BGS_RES',
+                      'HEADER': 'bgs[A_Rho]',
+                      'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_TKE': {'DESCRIPTION': 'BGS residual of the adjoint kinetic energy.',
+                 'GROUP': 'BGS_RES',
+                 'HEADER': 'bgs[A_k]',
+                 'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_VELOCITY-X': {'DESCRIPTION': 'BGS residual of the adjoint Velocity '
+                                       'x-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bsg[A_RhoU]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_VELOCITY-Y': {'DESCRIPTION': 'BGS residual of the adjoint Velocity '
+                                       'y-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bgs[A_RhoV]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_ADJ_VELOCITY-Z': {'DESCRIPTION': 'BGS residual of the adjoint Velocity '
+                                       'z-component',
+                        'GROUP': 'BGS_RES',
+                        'HEADER': 'bgs[A_RhoW]',
+                        'TYPE': 'RESIDUAL'},
+ 'BGS_DENSITY': {'DESCRIPTION': 'BGS residual of the density.',
+                 'GROUP': 'BGS_RES',
+                 'HEADER': 'bgs[Rho]',
+                 'TYPE': 'RESIDUAL'},
+ 'BGS_DISP_X': {'DESCRIPTION': '',
+                'GROUP': 'BGS_RES',
+                'HEADER': 'bgs[DispX]',
+                'TYPE': 'RESIDUAL'},
+ 'BGS_DISP_Y': {'DESCRIPTION': '',
+                'GROUP': 'BGS_RES',
+                'HEADER': 'bgs[DispY]',
+                'TYPE': 'RESIDUAL'},
+ 'BGS_DISP_Z': {'DESCRIPTION': '',
+                'GROUP': 'BGS_RES',
+                'HEADER': 'bgs[DispZ]',
+                'TYPE': 'RESIDUAL'},
+ 'BGS_DISSIPATION': {'DESCRIPTION': 'BGS residual of dissipation (SST model).',
+                     'GROUP': 'BGS_RES',
+                     'HEADER': 'bgs[w]',
+                     'TYPE': 'RESIDUAL'},
+ 'BGS_ENERGY': {'DESCRIPTION': 'BGS residual of the energy.',
+                'GROUP': 'BGS_RES',
+                'HEADER': 'bgs[RhoE]',
+                'TYPE': 'RESIDUAL'},
+ 'BGS_MOMENTUM-X': {'DESCRIPTION': 'BGS residual of the momentum x-component.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[RhoU]',
+                    'TYPE': 'RESIDUAL'},
+ 'BGS_MOMENTUM-Y': {'DESCRIPTION': 'BGS residual of the momentum y-component.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[RhoV]',
+                    'TYPE': 'RESIDUAL'},
+ 'BGS_NU_TILDE': {'DESCRIPTION': 'BGS residual of nu tilde (SA model).',
+                  'GROUP': 'BGS_RES',
+                  'HEADER': 'bgs[nu]',
+                  'TYPE': 'RESIDUAL'},
+ 'BGS_PRESSURE': {'DESCRIPTION': 'BGS residual of the pressure.',
+                  'GROUP': 'BGS_RES',
+                  'HEADER': 'bgs[P]',
+                  'TYPE': 'RESIDUAL'},
+ 'BGS_TEMPERATURE': {'DESCRIPTION': 'Block-Gauss seidel residual of the '
+                                    'temperature',
+                     'GROUP': 'BGS_RES',
+                     'HEADER': 'bgs[T]',
+                     'TYPE': 'RESIDUAL'},
+ 'BGS_TKE': {'DESCRIPTION': 'BGS residual of kinetic energy (SST model).',
+             'GROUP': 'BGS_RES',
+             'HEADER': 'bgs[k]',
+             'TYPE': 'RESIDUAL'},
+ 'BGS_VELOCITY-X': {'DESCRIPTION': 'BGS residual of the velocity x-component.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[U]',
+                    'TYPE': 'RESIDUAL'},
+ 'BGS_VELOCITY-Y': {'DESCRIPTION': 'BGS residual of the velocity y-component.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[V]',
+                    'TYPE': 'RESIDUAL'},
+ 'BGS_VELOCITY-Z': {'DESCRIPTION': 'BGS residual of the velocity z-component.',
+                    'GROUP': 'BGS_RES',
+                    'HEADER': 'bgs[W]',
+                    'TYPE': 'RESIDUAL'},
+ 'CFL_NUMBER': {'DESCRIPTION': 'Current value of the CFL number',
+                'GROUP': 'CFL_NUMBER',
+                'HEADER': 'CFL number',
+                'TYPE': 'DEFAULT'},
+ 'CIRCUMFERENTIAL_DISTORTION': {'DESCRIPTION': 'Circumferential distortion',
+                                'GROUP': 'ENGINE_OUTPUT',
+                                'HEADER': 'Circumferential_Distortion',
+                                'TYPE': 'COEFFICIENT'},
+ 'COMBO': {'DESCRIPTION': 'Combined obj. function value.',
+           'GROUP': 'COMBO',
+           'HEADER': 'ComboObj',
+           'TYPE': 'COEFFICIENT'},
+ 'CP_DIFF': {'DESCRIPTION': 'Cp difference for inverse design',
+             'GROUP': 'CP_DIFF',
+             'HEADER': 'Cp_Diff',
+             'TYPE': 'DEFAULT'},
+ 'CQ': {'DESCRIPTION': 'CQ',
+        'GROUP': 'ROTATING_FRAME',
+        'HEADER': 'CQ',
+        'TYPE': 'COEFFICIENT'},
+ 'CT': {'DESCRIPTION': 'CT',
+        'GROUP': 'ROTATING_FRAME',
+        'HEADER': 'CT',
+        'TYPE': 'COEFFICIENT'},
+ 'DEFORM_ITER': {'DESCRIPTION': 'Linear solver iterations for the mesh '
+                                'deformation',
+                 'GROUP': 'DEFORM',
+                 'HEADER': 'DeformIter',
+                 'TYPE': 'DEFAULT'},
+ 'DEFORM_MAX_VOLUME': {'DESCRIPTION': 'Maximum volume in the mesh',
+                       'GROUP': 'DEFORM',
+                       'HEADER': 'MaxVolume',
+                       'TYPE': 'DEFAULT'},
+ 'DEFORM_MIN_VOLUME': {'DESCRIPTION': 'Minimum volume in the mesh',
+                       'GROUP': 'DEFORM',
+                       'HEADER': 'MinVolume',
+                       'TYPE': 'DEFAULT'},
+ 'DEFORM_RESIDUAL': {'DESCRIPTION': 'Residual of the linear solver for the '
+                                    'mesh deformation',
+                     'GROUP': 'DEFORM',
+                     'HEADER': 'DeformRes',
+                     'TYPE': 'DEFAULT'},
+ 'DRAG': {'DESCRIPTION': 'Total drag coefficient on all surfaces set with '
+                         'MARKER_MONITORING',
+          'GROUP': 'AERO_COEFF',
+          'HEADER': 'CD',
+          'TYPE': 'COEFFICIENT'},
+ 'D_AEROCDRAG': {'DESCRIPTION': 'Derivative value',
+                 'GROUP': 'D_ENGINE_OUTPUT',
+                 'HEADER': 'd[AeroCDrag]',
+                 'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_DENSITY': {'DESCRIPTION': 'Derivative value',
+                   'GROUP': 'D_FLOW_COEFF',
+                   'HEADER': 'd[Avg_Density]',
+                   'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_ENTHALPY': {'DESCRIPTION': 'Derivative value',
+                    'GROUP': 'D_FLOW_COEFF',
+                    'HEADER': 'd[Avg_Enthalpy]',
+                    'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_MACH': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_FLOW_COEFF',
+                'HEADER': 'd[Avg_Mach]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_MASSFLOW': {'DESCRIPTION': 'Derivative value',
+                    'GROUP': 'D_FLOW_COEFF',
+                    'HEADER': 'd[Avg_Massflow]',
+                    'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_NORMALVEL': {'DESCRIPTION': 'Derivative value',
+                     'GROUP': 'D_FLOW_COEFF',
+                     'HEADER': 'd[Avg_NormalVel]',
+                     'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_PRESS': {'DESCRIPTION': 'Derivative value',
+                 'GROUP': 'D_FLOW_COEFF',
+                 'HEADER': 'd[Avg_Press]',
+                 'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_TEMP': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_FLOW_COEFF',
+                'HEADER': 'd[Avg_Temp]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_TEMPERATURE': {'DESCRIPTION': 'Derivative value',
+                       'GROUP': 'D_HEAT',
+                       'HEADER': 'd[AvgTemp]',
+                       'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_TOTALPRESS': {'DESCRIPTION': 'Derivative value',
+                      'GROUP': 'D_FLOW_COEFF',
+                      'HEADER': 'd[Avg_TotalPress]',
+                      'TYPE': 'D_COEFFICIENT'},
+ 'D_AVG_TOTALTEMP': {'DESCRIPTION': 'Derivative value',
+                     'GROUP': 'D_FLOW_COEFF',
+                     'HEADER': 'd[Avg_TotalTemp]',
+                     'TYPE': 'D_COEFFICIENT'},
+ 'D_CIRCUMFERENTIAL_DISTORTION': {'DESCRIPTION': 'Derivative value',
+                                  'GROUP': 'D_ENGINE_OUTPUT',
+                                  'HEADER': 'd[Circumferential_Distortion]',
+                                  'TYPE': 'D_COEFFICIENT'},
+ 'D_COMBO': {'DESCRIPTION': 'Derivative value',
+             'GROUP': 'D_COMBO',
+             'HEADER': 'd[ComboObj]',
+             'TYPE': 'D_COEFFICIENT'},
+ 'D_CQ': {'DESCRIPTION': 'Derivative value',
+          'GROUP': 'D_ROTATING_FRAME',
+          'HEADER': 'd[CQ]',
+          'TYPE': 'D_COEFFICIENT'},
+ 'D_CT': {'DESCRIPTION': 'Derivative value',
+          'GROUP': 'D_ROTATING_FRAME',
+          'HEADER': 'd[CT]',
+          'TYPE': 'D_COEFFICIENT'},
+ 'D_DRAG': {'DESCRIPTION': 'Derivative value',
+            'GROUP': 'D_AERO_COEFF',
+            'HEADER': 'd[CD]',
+            'TYPE': 'D_COEFFICIENT'},
+ 'D_EFFICIENCY': {'DESCRIPTION': 'Derivative value',
+                  'GROUP': 'D_AERO_COEFF',
+                  'HEADER': 'd[CEff]',
+                  'TYPE': 'D_COEFFICIENT'},
+ 'D_EQUIV_AREA': {'DESCRIPTION': 'Derivative value',
+                  'GROUP': 'D_EQUIVALENT_AREA',
+                  'HEADER': 'd[CEquiv_Area]',
+                  'TYPE': 'D_COEFFICIENT'},
+ 'D_FORCE_X': {'DESCRIPTION': 'Derivative value',
+               'GROUP': 'D_AERO_COEFF',
+               'HEADER': 'd[CFx]',
+               'TYPE': 'D_COEFFICIENT'},
+ 'D_FORCE_Y': {'DESCRIPTION': 'Derivative value',
+               'GROUP': 'D_AERO_COEFF',
+               'HEADER': 'd[CFy]',
+               'TYPE': 'D_COEFFICIENT'},
+ 'D_FORCE_Z': {'DESCRIPTION': 'Derivative value',
+               'GROUP': 'D_AERO_COEFF',
+               'HEADER': 'd[CFz]',
+               'TYPE': 'D_COEFFICIENT'},
+ 'D_HEATFLUX': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_HEAT',
+                'HEADER': 'd[HF]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_HEATFLUX_MAX': {'DESCRIPTION': 'Derivative value',
+                    'GROUP': 'D_HEAT',
+                    'HEADER': 'd[MaxHF]',
+                    'TYPE': 'D_COEFFICIENT'},
+ 'D_LIFT': {'DESCRIPTION': 'Derivative value',
+            'GROUP': 'D_AERO_COEFF',
+            'HEADER': 'd[CL]',
+            'TYPE': 'D_COEFFICIENT'},
+ 'D_MERIT': {'DESCRIPTION': 'Derivative value',
+             'GROUP': 'D_ROTATING_FRAME',
+             'HEADER': 'd[CMerit]',
+             'TYPE': 'D_COEFFICIENT'},
+ 'D_MOMENTUM_DISTORTION': {'DESCRIPTION': 'Derivative value',
+                           'GROUP': 'D_FLOW_COEFF',
+                           'HEADER': 'd[Momentum_Distortion]',
+                           'TYPE': 'D_COEFFICIENT'},
+ 'D_MOMENT_X': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_AERO_COEFF',
+                'HEADER': 'd[CMx]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_MOMENT_Y': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_AERO_COEFF',
+                'HEADER': 'd[CMy]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_MOMENT_Z': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_AERO_COEFF',
+                'HEADER': 'd[CMz]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_NEARFIELD_OF': {'DESCRIPTION': 'Derivative value',
+                    'GROUP': 'D_EQUIVALENT_AREA',
+                    'HEADER': 'd[CNearFieldOF]',
+                    'TYPE': 'D_COEFFICIENT'},
+ 'D_PRESSURE_DROP': {'DESCRIPTION': 'Derivative value',
+                     'GROUP': 'D_FLOW_COEFF',
+                     'HEADER': 'd[Pressure_Drop]',
+                     'TYPE': 'D_COEFFICIENT'},
+ 'D_RADIAL_DISTORTION': {'DESCRIPTION': 'Derivative value',
+                         'GROUP': 'D_ENGINE_OUTPUT',
+                         'HEADER': 'd[Radial_Distortion]',
+                         'TYPE': 'D_COEFFICIENT'},
+ 'D_SECONDARY_OVER_UNIFORMITY': {'DESCRIPTION': 'Derivative value',
+                                 'GROUP': 'D_FLOW_COEFF',
+                                 'HEADER': 'd[Secondary_Over_Uniformity]',
+                                 'TYPE': 'D_COEFFICIENT'},
+ 'D_SECONDARY_STRENGTH': {'DESCRIPTION': 'Derivative value',
+                          'GROUP': 'D_FLOW_COEFF',
+                          'HEADER': 'd[Secondary_Strength]',
+                          'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_AOA': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_SENSITIVITY',
+                'HEADER': 'd[Sens_AoA]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_GEO': {'DESCRIPTION': 'Derivative value',
+                'GROUP': 'D_SENSITIVITY',
+                'HEADER': 'd[Sens_Geo]',
+                'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_MACH': {'DESCRIPTION': 'Derivative value',
+                 'GROUP': 'D_SENSITIVITY',
+                 'HEADER': 'd[Sens_Mach]',
+                 'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_PRESS': {'DESCRIPTION': 'Derivative value',
+                  'GROUP': 'D_SENSITIVITY',
+                  'HEADER': 'd[Sens_Press]',
+                  'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_PRESS_OUT': {'DESCRIPTION': 'Derivative value',
+                      'GROUP': 'D_SENSITIVITY',
+                      'HEADER': 'd[Sens_Pout]',
+                      'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_TEMP': {'DESCRIPTION': 'Derivative value',
+                 'GROUP': 'D_SENSITIVITY',
+                 'HEADER': 'd[Sens_Temp]',
+                 'TYPE': 'D_COEFFICIENT'},
+ 'D_SENS_VEL_IN': {'DESCRIPTION': 'Derivative value',
+                   'GROUP': 'D_SENSITIVITY',
+                   'HEADER': 'd[Sens_Vin]',
+                   'TYPE': 'D_COEFFICIENT'},
+ 'D_SIDEFORCE': {'DESCRIPTION': 'Derivative value',
+                 'GROUP': 'D_AERO_COEFF',
+                 'HEADER': 'd[CSF]',
+                 'TYPE': 'D_COEFFICIENT'},
+ 'D_SOLIDCDRAG': {'DESCRIPTION': 'Derivative value',
+                  'GROUP': 'D_ENGINE_OUTPUT',
+                  'HEADER': 'd[SolidCDrag]',
+                  'TYPE': 'D_COEFFICIENT'},
+ 'D_TEMPERATURE': {'DESCRIPTION': 'Derivative value',
+                   'GROUP': 'D_HEAT',
+                   'HEADER': 'd[Temp]',
+                   'TYPE': 'D_COEFFICIENT'},
+ 'D_UNIFORMITY': {'DESCRIPTION': 'Derivative value',
+                  'GROUP': 'D_FLOW_COEFF',
+                  'HEADER': 'd[Uniformity]',
+                  'TYPE': 'D_COEFFICIENT'},
+ 'EFFICIENCY': {'DESCRIPTION': 'Total lift-to-drag ratio on all surfaces set '
+                               'with MARKER_MONITORING',
+                'GROUP': 'AERO_COEFF',
+                'HEADER': 'CEff',
+                'TYPE': 'COEFFICIENT'},
+ 'EQUIV_AREA': {'DESCRIPTION': 'Equivalent area',
+                'GROUP': 'EQUIVALENT_AREA',
+                'HEADER': 'CEquiv_Area',
+                'TYPE': 'COEFFICIENT'},
+ 'FORCE_X': {'DESCRIPTION': 'Total force x-component on all surfaces set with '
+                            'MARKER_MONITORING',
+             'GROUP': 'AERO_COEFF',
+             'HEADER': 'CFx',
+             'TYPE': 'COEFFICIENT'},
+ 'FORCE_Y': {'DESCRIPTION': 'Total force y-component on all surfaces set with '
+                            'MARKER_MONITORING',
+             'GROUP': 'AERO_COEFF',
+             'HEADER': 'CFy',
+             'TYPE': 'COEFFICIENT'},
+ 'FORCE_Z': {'DESCRIPTION': 'Total force z-component on all surfaces set with '
+                            'MARKER_MONITORING',
+             'GROUP': 'AERO_COEFF',
+             'HEADER': 'CFz',
+             'TYPE': 'COEFFICIENT'},
+ 'HEATFLUX': {'DESCRIPTION': 'Total heatflux on all surfaces defined in '
+                             'MARKER_MONITORING',
+              'GROUP': 'HEAT',
+              'HEADER': 'HF',
+              'TYPE': 'COEFFICIENT'},
+ 'HEATFLUX_MAX': {'DESCRIPTION': 'Total maximal heatflux on all surfaces '
+                                 'defined in MARKER_MONITORING',
+                  'GROUP': 'HEAT',
+                  'HEADER': 'MaxHF',
+                  'TYPE': 'COEFFICIENT'},
+ 'LIFT': {'DESCRIPTION': 'Total lift coefficient on all surfaces set with '
+                         'MARKER_MONITORING',
+          'GROUP': 'AERO_COEFF',
+          'HEADER': 'CL',
+          'TYPE': 'COEFFICIENT'},
+ 'LINSOL_ITER': {'DESCRIPTION': 'Number of iterations of the linear solver.',
+                 'GROUP': 'LINSOL',
+                 'HEADER': 'LinSolIter',
+                 'TYPE': 'DEFAULT'},
+ 'LINSOL_RESIDUAL': {'DESCRIPTION': 'Residual of the linear solver.',
+                     'GROUP': 'LINSOL',
+                     'HEADER': 'LinSolRes',
+                     'TYPE': 'DEFAULT'},
+ 'LOAD_INCREMENT': {'DESCRIPTION': 'LOAD_INCREMENT',
+                    'GROUP': '',
+                    'HEADER': 'Load_Increment',
+                    'TYPE': 'DEFAULT'},
+ 'LOAD_RAMP': {'DESCRIPTION': 'LOAD_RAMP',
+               'GROUP': '',
+               'HEADER': 'Load_Ramp',
+               'TYPE': 'DEFAULT'},
+ 'MAX_ADJ_DENSITY': {'DESCRIPTION': 'Maximum residual of the adjoint density.',
+                     'GROUP': 'MAX_RES',
+                     'HEADER': 'max[A_Rho]',
+                     'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_DISSIPATION': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                        'dissipation.',
+                         'GROUP': 'MAX_RES',
+                         'HEADER': 'max[A_w]',
+                         'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_ENERGY': {'DESCRIPTION': 'Maximum residual of the adjoint energy.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[A_E]',
+                    'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_HEAT': {'DESCRIPTION': 'Maximum residual of the temperature.',
+                  'GROUP': 'MAX_RES',
+                  'HEADER': 'max[A_T]',
+                  'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_MOMENTUM-X': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'momentum x-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoU]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_MOMENTUM-Y': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'momentum y-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoV]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_MOMENTUM-Z': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'momentum z-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoW]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_NU_TILDE': {'DESCRIPTION': 'Maximum residual of the adjoint nu '
+                                     'tilde.',
+                      'GROUP': 'MAX_RES',
+                      'HEADER': 'max[A_nu]',
+                      'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_PRESSURE': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                     'Pressure.',
+                      'GROUP': 'MAX_RES',
+                      'HEADER': 'max[A_Rho]',
+                      'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_TEMPERATURE': {'DESCRIPTION': 'BGS residual of the adjoint '
+                                        'temperature.',
+                         'GROUP': 'BGS_RES',
+                         'HEADER': 'max[A_T]',
+                         'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_TKE': {'DESCRIPTION': 'Maximum residual of the adjoint kinetic '
+                                'energy.',
+                 'GROUP': 'MAX_RES',
+                 'HEADER': 'max[A_k]',
+                 'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_VELOCITY-X': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'Velocity x-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoU]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_VELOCITY-Y': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'Velocity y-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoV]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_ADJ_VELOCITY-Z': {'DESCRIPTION': 'Maximum residual of the adjoint '
+                                       'Velocity z-component',
+                        'GROUP': 'MAX_RES',
+                        'HEADER': 'max[A_RhoW]',
+                        'TYPE': 'RESIDUAL'},
+ 'MAX_DENSITY': {'DESCRIPTION': 'Maximum square residual of the density.',
+                 'GROUP': 'MAX_RES',
+                 'HEADER': 'max[Rho]',
+                 'TYPE': 'RESIDUAL'},
+ 'MAX_DISSIPATION': {'DESCRIPTION': 'Maximum residual of dissipation (SST '
+                                    'model).',
+                     'GROUP': 'MAX_RES',
+                     'HEADER': 'max[w]',
+                     'TYPE': 'RESIDUAL'},
+ 'MAX_ENERGY': {'DESCRIPTION': 'Maximum residual of the energy.',
+                'GROUP': 'MAX_RES',
+                'HEADER': 'max[RhoE]',
+                'TYPE': 'RESIDUAL'},
+ 'MAX_MOMENTUM-X': {'DESCRIPTION': 'Maximum square residual of the momentum '
+                                   'x-component.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[RhoU]',
+                    'TYPE': 'RESIDUAL'},
+ 'MAX_MOMENTUM-Y': {'DESCRIPTION': 'Maximum square residual of the momentum '
+                                   'y-component.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[RhoV]',
+                    'TYPE': 'RESIDUAL'},
+ 'MAX_NU_TILDE': {'DESCRIPTION': 'Maximum residual of nu tilde (SA model).',
+                  'GROUP': 'MAX_RES',
+                  'HEADER': 'max[nu]',
+                  'TYPE': 'RESIDUAL'},
+ 'MAX_PRESSURE': {'DESCRIPTION': 'Maximum residual of the pressure.',
+                  'GROUP': 'MAX_RES',
+                  'HEADER': 'max[P]',
+                  'TYPE': 'RESIDUAL'},
+ 'MAX_TEMPERATURE': {'DESCRIPTION': 'Maximum residual of the temperature',
+                     'GROUP': 'MAX_RES',
+                     'HEADER': 'max[T]',
+                     'TYPE': 'RESIDUAL'},
+ 'MAX_TKE': {'DESCRIPTION': 'Maximum residual of kinetic energy (SST model).',
+             'GROUP': 'MAX_RES',
+             'HEADER': 'max[k]',
+             'TYPE': 'RESIDUAL'},
+ 'MAX_VELOCITY-X': {'DESCRIPTION': 'Maximum residual of the velocity '
+                                   'x-component.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[U]',
+                    'TYPE': 'RESIDUAL'},
+ 'MAX_VELOCITY-Y': {'DESCRIPTION': 'Maximum residual of the velocity '
+                                   'y-component.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[V]',
+                    'TYPE': 'RESIDUAL'},
+ 'MAX_VELOCITY-Z': {'DESCRIPTION': 'Maximum residual of the velocity '
+                                   'z-component.',
+                    'GROUP': 'MAX_RES',
+                    'HEADER': 'max[W]',
+                    'TYPE': 'RESIDUAL'},
+ 'MERIT': {'DESCRIPTION': 'Merit',
+           'GROUP': 'ROTATING_FRAME',
+           'HEADER': 'CMerit',
+           'TYPE': 'COEFFICIENT'},
+ 'MOMENTUM_DISTORTION': {'DESCRIPTION': 'Total momentum distortion on all '
+                                        'markers set in MARKER_ANALYZE',
+                         'GROUP': 'FLOW_COEFF',
+                         'HEADER': 'Momentum_Distortion',
+                         'TYPE': 'COEFFICIENT'},
+ 'MOMENT_X': {'DESCRIPTION': 'Total momentum x-component on all surfaces set '
+                             'with MARKER_MONITORING',
+              'GROUP': 'AERO_COEFF',
+              'HEADER': 'CMx',
+              'TYPE': 'COEFFICIENT'},
+ 'MOMENT_Y': {'DESCRIPTION': 'Total momentum y-component on all surfaces set '
+                             'with MARKER_MONITORING',
+              'GROUP': 'AERO_COEFF',
+              'HEADER': 'CMy',
+              'TYPE': 'COEFFICIENT'},
+ 'MOMENT_Z': {'DESCRIPTION': 'Total momentum z-component on all surfaces set '
+                             'with MARKER_MONITORING',
+              'GROUP': 'AERO_COEFF',
+              'HEADER': 'CMz',
+              'TYPE': 'COEFFICIENT'},
+ 'NEARFIELD_OF': {'DESCRIPTION': 'Nearfield obj. function',
+                  'GROUP': 'EQUIVALENT_AREA',
+                  'HEADER': 'CNearFieldOF',
+                  'TYPE': 'COEFFICIENT'},
+ 'PRESSURE_DROP': {'DESCRIPTION': 'Total pressure drop on all markers set in '
+                                  'MARKER_ANALYZE',
+                   'GROUP': 'FLOW_COEFF',
+                   'HEADER': 'Pressure_Drop',
+                   'TYPE': 'COEFFICIENT'},
+ 'RADIAL_DISTORTION': {'DESCRIPTION': 'Radial distortion',
+                       'GROUP': 'ENGINE_OUTPUT',
+                       'HEADER': 'Radial_Distortion',
+                       'TYPE': 'COEFFICIENT'},
+ 'RMS_ADJ_DENSITY': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                    'density.',
+                     'GROUP': 'RMS_RES',
+                     'HEADER': 'rms[A_Rho]',
+                     'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_DISSIPATION': {'DESCRIPTION': 'Root-mean square residual of the '
+                                        'adjoint dissipation.',
+                         'GROUP': 'RMS_RES',
+                         'HEADER': 'rms[A_w]',
+                         'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_ENERGY': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                   'energy.',
+                    'GROUP': 'RMS_RES',
+                    'HEADER': 'rms[A_E]',
+                    'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_HEAT': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                 'temperature.',
+                  'GROUP': 'RMS_RES',
+                  'HEADER': 'rms[A_T]',
+                  'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_MOMENTUM-X': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint momentum x-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_RhoU]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_MOMENTUM-Y': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint momentum y-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_RhoV]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_MOMENTUM-Z': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint momentum z-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_RhoW]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_NU_TILDE': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                     'nu tilde.',
+                      'GROUP': 'RMS_RES',
+                      'HEADER': 'rms[A_nu]',
+                      'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_PRESSURE': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                     'Pressure.',
+                      'GROUP': 'RMS_RES',
+                      'HEADER': 'rms[A_P]',
+                      'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_TEMPERATURE': {'DESCRIPTION': 'Root-mean square residual of the '
+                                        'adjoint temperature.',
+                         'GROUP': 'RMS_RES',
+                         'HEADER': 'rms[A_T]',
+                         'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_TKE': {'DESCRIPTION': 'Root-mean square residual of the adjoint '
+                                'kinetic energy.',
+                 'GROUP': 'RMS_RES',
+                 'HEADER': 'rms[A_k]',
+                 'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_VELOCITY-X': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint Velocity x-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_U]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_VELOCITY-Y': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint Velocity y-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_V]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_ADJ_VELOCITY-Z': {'DESCRIPTION': 'Root-mean square residual of the '
+                                       'adjoint Velocity z-component.',
+                        'GROUP': 'RMS_RES',
+                        'HEADER': 'rms[A_W]',
+                        'TYPE': 'RESIDUAL'},
+ 'RMS_DENSITY': {'DESCRIPTION': 'Root-mean square residual of the density.',
+                 'GROUP': 'RMS_RES',
+                 'HEADER': 'rms[Rho]',
+                 'TYPE': 'RESIDUAL'},
+ 'RMS_DISP_X': {'DESCRIPTION': '',
+                'GROUP': 'RMS_RES',
+                'HEADER': 'rms[DispX]',
+                'TYPE': 'RESIDUAL'},
+ 'RMS_DISP_Y': {'DESCRIPTION': '',
+                'GROUP': 'RMS_RES',
+                'HEADER': 'rms[DispY]',
+                'TYPE': 'RESIDUAL'},
+ 'RMS_DISP_Z': {'DESCRIPTION': '',
+                'GROUP': 'RMS_RES',
+                'HEADER': 'rms[DispZ]',
+                'TYPE': 'RESIDUAL'},
+ 'RMS_DISSIPATION': {'DESCRIPTION': 'Root-mean square residual of dissipation '
+                                    '(SST model).',
+                     'GROUP': 'RMS_RES',
+                     'HEADER': 'rms[w]',
+                     'TYPE': 'RESIDUAL'},
+ 'RMS_ENERGY': {'DESCRIPTION': 'Root-mean square residual of the energy.',
+                'GROUP': 'RMS_RES',
+                'HEADER': 'rms[RhoE]',
+                'TYPE': 'RESIDUAL'},
+ 'RMS_ETOL': {'DESCRIPTION': '',
+              'GROUP': 'RMS_RES',
+              'HEADER': 'rms[E]',
+              'TYPE': 'RESIDUAL'},
+ 'RMS_MOMENTUM-X': {'DESCRIPTION': 'Root-mean square residual of the momentum '
+                                   'x-component.',
+                    'GROUP': 'RMS_RES',
+                    'HEADER': 'rms[RhoU]',
+                    'TYPE': 'RESIDUAL'},
+ 'RMS_MOMENTUM-Y': {'DESCRIPTION': 'Root-mean square residual of the momentum '
+                                   'y-component.',
+                    'GROUP': 'RMS_RES',
+                    'HEADER': 'rms[RhoV]',
+                    'TYPE': 'RESIDUAL'},
+ 'RMS_NU_TILDE': {'DESCRIPTION': 'Root-mean square residual of nu tilde (SA '
+                                 'model).',
+                  'GROUP': 'RMS_RES',
+                  'HEADER': 'rms[nu]',
+                  'TYPE': 'RESIDUAL'},
+ 'RMS_PRESSURE': {'DESCRIPTION': 'Root-mean square residual of the pressure.',
+                  'GROUP': 'RMS_RES',
+                  'HEADER': 'rms[P]',
+                  'TYPE': 'RESIDUAL'},
+ 'RMS_RTOL': {'DESCRIPTION': '',
+              'GROUP': 'RMS_RES',
+              'HEADER': 'rms[R]',
+              'TYPE': 'RESIDUAL'},
+ 'RMS_TEMPERATURE': {'DESCRIPTION': 'Root mean square residual of the '
+                                    'temperature',
+                     'GROUP': 'RMS_RES',
+                     'HEADER': 'rms[T]',
+                     'TYPE': 'RESIDUAL'},
+ 'RMS_TKE': {'DESCRIPTION': 'Root-mean square residual of kinetic energy (SST '
+                            'model).',
+             'GROUP': 'RMS_RES',
+             'HEADER': 'rms[k]',
+             'TYPE': 'RESIDUAL'},
+ 'RMS_UTOL': {'DESCRIPTION': '',
+              'GROUP': 'RMS_RES',
+              'HEADER': 'rms[U]',
+              'TYPE': 'RESIDUAL'},
+ 'RMS_VELOCITY-X': {'DESCRIPTION': 'Root-mean square residual of the velocity '
+                                   'x-component.',
+                    'GROUP': 'RMS_RES',
+                    'HEADER': 'rms[U]',
+                    'TYPE': 'RESIDUAL'},
+ 'RMS_VELOCITY-Y': {'DESCRIPTION': 'Root-mean square residual of the velocity '
+                                   'y-component.',
+                    'GROUP': 'RMS_RES',
+                    'HEADER': 'rms[V]',
+                    'TYPE': 'RESIDUAL'},
+ 'SECONDARY_OVER_UNIFORMITY': {'DESCRIPTION': 'Total secondary over uniformity '
+                                              'on all markers set in '
+                                              'MARKER_ANALYZE',
+                               'GROUP': 'FLOW_COEFF',
+                               'HEADER': 'Secondary_Over_Uniformity',
+                               'TYPE': 'COEFFICIENT'},
+ 'SECONDARY_STRENGTH': {'DESCRIPTION': 'Total secondary strength on all '
+                                       'markers set in MARKER_ANALYZE',
+                        'GROUP': 'FLOW_COEFF',
+                        'HEADER': 'Secondary_Strength',
+                        'TYPE': 'COEFFICIENT'},
+ 'SENS_AOA': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                             'respect to the angle of attack (only for '
+                             'compressible solver).',
+              'GROUP': 'SENSITIVITY',
+              'HEADER': 'Sens_AoA',
+              'TYPE': 'COEFFICIENT'},
+ 'SENS_E': {'DESCRIPTION': '',
+            'GROUP': 'SENSITIVITY',
+            'HEADER': 'Sens[E]',
+            'TYPE': 'DEFAULT'},
+ 'SENS_GEO': {'DESCRIPTION': 'Sum of the geometrical sensitivities on all '
+                             'markers set in MARKER_MONITORING.',
+              'GROUP': 'SENSITIVITY',
+              'HEADER': 'Sens_Geo',
+              'TYPE': 'COEFFICIENT'},
+ 'SENS_MACH': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                              'respect to the Mach number (only of '
+                              'compressible solver).',
+               'GROUP': 'SENSITIVITY',
+               'HEADER': 'Sens_Mach',
+               'TYPE': 'COEFFICIENT'},
+ 'SENS_NU': {'DESCRIPTION': '',
+             'GROUP': 'SENSITIVITY',
+             'HEADER': 'Sens[Nu]',
+             'TYPE': 'DEFAULT'},
+ 'SENS_PRESS': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                               'respect to the far-field pressure.',
+                'GROUP': 'SENSITIVITY',
+                'HEADER': 'Sens_Press',
+                'TYPE': 'COEFFICIENT'},
+ 'SENS_PRESS_OUT': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                                   'respect to the outlet pressure.',
+                    'GROUP': 'SENSITIVITY',
+                    'HEADER': 'Sens_Pout',
+                    'TYPE': 'COEFFICIENT'},
+ 'SENS_TEMP': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                              'respect to the far-field temperature.',
+               'GROUP': 'SENSITIVITY',
+               'HEADER': 'Sens_Temp',
+               'TYPE': 'COEFFICIENT'},
+ 'SENS_VEL_IN': {'DESCRIPTION': 'Sensitivity of the objective function with '
+                                'respect to the inlet velocity.',
+                 'GROUP': 'SENSITIVITY',
+                 'HEADER': 'Sens_Vin',
+                 'TYPE': 'COEFFICIENT'},
+ 'SIDEFORCE': {'DESCRIPTION': 'Total sideforce coefficient on all surfaces set '
+                              'with MARKER_MONITORING',
+               'GROUP': 'AERO_COEFF',
+               'HEADER': 'CSF',
+               'TYPE': 'COEFFICIENT'},
+ 'SOLIDCDRAG': {'DESCRIPTION': 'Solid CD drag',
+                'GROUP': 'ENGINE_OUTPUT',
+                'HEADER': 'SolidCDrag',
+                'TYPE': 'COEFFICIENT'},
+ 'TEMPERATURE': {'DESCRIPTION': 'Total avg. temperature on all surfaces set '
+                                'with MARKER_MONITORING.',
+                 'GROUP': 'HEAT',
+                 'HEADER': 'Temp',
+                 'TYPE': 'COEFFICIENT'},
+ 'UNIFORMITY': {'DESCRIPTION': 'Total flow uniformity on all markers set in '
+                               'MARKER_ANALYZE',
+                'GROUP': 'FLOW_COEFF',
+                'HEADER': 'Uniformity',
+                'TYPE': 'COEFFICIENT'},
+ 'VMS': {'DESCRIPTION': 'VMS',
+         'GROUP': '',
+         'HEADER': 'VonMises',
+         'TYPE': 'DEFAULT'}}
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index 84a12c3ddefc..264cc64f48ff 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -42,6 +42,7 @@
 import os
 import shutil, glob
 from SU2.util import ordered_bunch
+from .historyMap import history_header_map as historyOutFields
 
 # -------------------------------------------------------------------
 #  Read SU2_DOT Gradient Values
@@ -158,16 +159,13 @@ def read_history( History_filename, nZones = 1):
     
     # initialize history data dictionary
     history_data = ordered_bunch()    
-    
-    # header name to config file name map
-    map_dict = get_headerMap(nZones)    
-    
+
     # map header names
     for key in plot_data.keys():
-        if key in map_dict:
-            var = map_dict[key]
-        else:
-            var = key
+        var = key
+        for field in historyOutFields:
+            if key == historyOutFields[field]['HEADER']:
+                var = field
         history_data[var] = plot_data[key]
     
     return history_data
@@ -182,88 +180,11 @@ def read_history( History_filename, nZones = 1):
 
 def get_headerMap(nZones = 1):
 
-    """ returns a dictionary that maps history file header names
-        to optimization problem function names
-    """
-    # header name to config file name map
-    history_header_map = { "Iteration"       : "ITERATION"               ,
-                 "CL"              : "LIFT"                    ,
-                 "CD"              : "DRAG"                    ,
-                 "CSF"             : "SIDEFORCE"               ,
-                 "Cp_Diff"         : "INVERSE_DESIGN_PRESSURE" ,
-                 "HeatFlux_Diff"   : "INVERSE_DESIGN_HEATFLUX" ,
-                 "HeatFlux_Total"  : "TOTAL_HEATFLUX"          ,
-                 "HeatFlux_Maximum": "MAXIMUM_HEATFLUX"        ,
-                 "Temperature_Total": "TOTAL_TEMPERATURE"        ,
-                 "CMx"             : "MOMENT_X"                ,
-                 "CMy"             : "MOMENT_Y"                ,
-                 "CMz"             : "MOMENT_Z"                ,
-                 "CFx"             : "FORCE_X"                 ,
-                 "CFy"             : "FORCE_Y"                 ,
-                 "CFz"             : "FORCE_Z"                 ,
-                 "CL/CD"           : "EFFICIENCY"              ,
-                 "AoA"             : "AOA"                     ,
-                 "Custom_ObjFunc"  : "CUSTOM_OBJFUNC"          ,
-                 "CMerit"          : "FIGURE_OF_MERIT"         ,
-                 "Buffet_Metric"   : "BUFFET"                  ,
-                 "CQ"              : "TORQUE"                  ,
-                 "CT"              : "THRUST"                  ,
-                 "CEquivArea"      : "EQUIVALENT_AREA"         ,
-                 "CNearFieldOF"    : "NEARFIELD_PRESSURE"      ,
-                 "Avg_TotalPress"  : "SURFACE_TOTAL_PRESSURE"  ,
-                 "Avg_Press"       : "SURFACE_STATIC_PRESSURE" ,
-                 "Avg_MassFlow"    : "SURFACE_MASSFLOW"        ,
-                 "Avg_Mach"        : "SURFACE_MACH"            ,
-                 "Uniformity"                : "SURFACE_UNIFORMITY"            ,
-                 "Secondary_Strength"        : "SURFACE_SECONDARY"            ,
-                 "Momentum_Distortion"       : "SURFACE_MOM_DISTORTION"            ,
-                 "Secondary_Over_Uniformity" : "SURFACE_SECOND_OVER_UNIFORM"            ,
-                 "Pressure_Drop"        : "SURFACE_PRESSURE_DROP"            ,
-                 "ComboObj"        : "COMBO"                   ,
-                 "Time(min)"       : "TIME"                    ,
-                 'Time(min)"\n'    : "TIME"                    , # TDE hack for paraview
-                 "d[CL]"           : "D_LIFT"                  ,
-                 "d[CD]"           : "D_DRAG"                  ,
-                 "d[CSF]"          : "D_SIDEFORCE"             ,
-                 "d[CMx]"          : "D_MOMENT_X"              ,
-                 "d[CMy]"          : "D_MOMENT_Y"              ,
-                 "d[CMz]"          : "D_MOMENT_Z"              ,
-                 "d[CFx]"          : "D_FORCE_X"               ,
-                 "d[CFy]"          : "D_FORCE_Y"               ,
-                 "d[CFz]"          : "D_FORCE_Z"               ,
-                 "d[CEff]"        : "D_EFFICIENCY"            ,
-                 "D(Custom_ObjFunc)" : "D_CUSTOM_OBJFUNC"      ,
-                 "D(HeatFlux_Total)" : "D_HEAT"                ,
-                 "D(HeatFlux_Maximum)" : "D_HEAT_MAX"          ,
-                 "TotalPressureLoss_1"     : "TOTAL_PRESSURE_LOSS"    ,
-                 "KineticEnergyLoss_1"     : "KINETIC_ENERGY_LOSS"    ,
-                 "EntropyGen_" + str(getTurboPerfIndex(nZones)) : "ENTROPY_GENERATION"     ,                   
-                 "FlowAngleOut_1"          : "FLOW_ANGLE_OUT"         ,
-                 "FlowAngleIn_1"           : "FLOW_ANGLE_IN"          ,
-                 "MassFlowIn_1"            : "MASS_FLOW_IN"           ,
-                 "MassFlowOut_1"           : "MASS_FLOW_OUT"          ,
-                 "PressureRatio_1"         : "PRESSURE_RATIO"         ,
-                 "TotalEfficiency_" + str(getTurboPerfIndex(nZones))  : "TOTAL_EFFICIENCY"       ,
-                 "TotalStaticEfficiency_3" : "TOTAL_STATIC_EFFICIENCY",
-                 "D(TotalPressureLoss_0)"  : "D_TOTAL_PRESSURE_LOSS"  ,
-                 "D(TotalEfficiency_0)"       : "D_TOTAL_EFFICIENCY"       ,
-                 "D(TotalPressureLoss_0)"     : "D_TOTAL_PRESSURE_LOSS"    ,
-                 "D(KineticEnergyLoss_0)"     : "D_KINETIC_ENERGY_LOSS"    ,
-                 "D(TotalStaticEfficiency_0)" : "D_TOTAL_STATIC_EFFICIENCY",
-                 "D(FlowAngleOut_0)"          : "D_FLOW_ANGLE_OUT"         ,
-                 "D(FlowAngleIn_0)"           : "D_FLOW_ANGLE_IN"          ,
-                 "D(MassFlowIn_0)"            : "D_MASS_FLOW_IN"           ,
-                 "D(MassFlowOut_0)"           : "D_MASS_FLOW_OUT"          ,
-                 "D(PressureRatio_0)"         : "D_PRESSURE_RATIO"         ,
-                 "D(EnthalpyOut_0)"           : "D_ENTHALPY_OUT"           ,
-                 "D(TotalEnthalpy_0)"         : "D_TOTAL_ENTHALPY_OUT"     ,
-                 "D(Uniformity)"                : "D_SURFACE_UNIFORMITY"            ,
-                 "D(Secondary_Strength)"        : "D_SURFACE_SECONDARY"             ,
-                 "D(Momentum_Distortion)"       : "D_SURFACE_MOM_DISTORTION"        ,
-                 "D(Secondary_Over_Uniformity)" : "D_SURFACE_SECOND_OVER_UNIFORM"   ,
-                 "D(Pressure_Drop)"             : "D_SURFACE_PRESSURE_DROP"         }
- 
-    return history_header_map        
+    headerMap = dict()
+    for outputField in historyOutFields:
+        headerMap[outputField] = historyOutFields[outputField]['HEADER']
+
+    return headerMap        
 
 def getTurboPerfIndex(nZones = 1):
 
@@ -281,54 +202,7 @@ def getTurboPerfIndex(nZones = 1):
 #  Optimizer Function Names
 # -------------------------------------------------------------------
 
-# Aerodynamic Optimizer Function Names
-
-optnames_aero = [ "LIFT"                        ,
-                  "DRAG"                        ,
-                  "SIDEFORCE"                   ,
-                  "MOMENT_X"                    ,
-                  "MOMENT_Y"                    ,
-                  "MOMENT_Z"                    ,
-                  "FORCE_X"                     ,
-                  "FORCE_Y"                     ,
-                  "FORCE_Z"                     ,
-                  "EFFICIENCY"                  ,
-                  "FIGURE_OF_MERIT"             ,
-                  "BUFFET"                      ,
-                  "TORQUE"                      ,
-                  "THRUST"                      ,
-                  "SURFACE_TOTAL_PRESSURE"      ,
-                  "SURFACE_STATIC_PRESSURE"     ,
-                  "SURFACE_MASSFLOW"            ,
-                  "SURFACE_MACH"                ,
-                  "SURFACE_UNIFORMITY"          ,
-                  "SURFACE_SECONDARY"           ,
-                  "SURFACE_MOM_DISTORTION"      ,
-                  "SURFACE_SECOND_OVER_UNIFORM" ,
-                  "SURFACE_PRESSURE_DROP"       ,
-                  "EQUIVALENT_AREA"             ,
-                  "NEARFIELD_PRESSURE"          ,
-                  "INVERSE_DESIGN_PRESSURE"     ,
-                  "INVERSE_DESIGN_HEATFLUX"     ,
-                  "TOTAL_HEATFLUX"              ,
-                  "MAXIMUM_HEATFLUX"            ,
-                  "CUSTOM_OBJFUNC"              ,
-                  "COMBO"]
-
-# Turbo performance optimizer Function Names
-optnames_turbo = ["TOTAL_PRESSURE_LOSS"     ,
-                  "KINETIC_ENERGY_LOSS"     ,
-                  "ENTROPY_GENERATION"      ,
-                  "EULERIAN_WORK"           ,
-                  "FLOW_ANGLE_IN"           ,
-                  "FLOW_ANGLE_OUT"          ,
-                  "MASS_FLOW_IN"            ,
-                  "MASS_FLOW_OUT"           ,
-                  "PRESSURE_RATIO"          ,
-                  "TOTAL_EFFICIENCY"        ,
-                  "TOTAL_STATIC_EFFICIENCY" ,
-                 ]
-#: optnames_aero
+#: optnames_stab
 
 optnames_stab = [ "D_LIFT_D_ALPHA"               ,
                   "D_DRAG_D_ALPHA"               ,
@@ -408,68 +282,6 @@ def getTurboPerfIndex(nZones = 1):
                  
 #: optnames_geo
 
-grad_names_directdiff = ["D_LIFT",
-                         "D_DRAG",
-                         "D_SIDEFORCE",
-                         "D_MOMENT_X",
-                         "D_MOMENT_Y",
-                         "D_MOMENT_Z",
-                         "D_FORCE_X",
-                         "D_FORCE_Y",
-                         "D_FORCE_Z",
-                         "D_EFFICIENCY",
-                         "D_CUSTOM_OBJFUNC",
-                         "D_HEAT",
-                         "D_MAX_HEAT",
-                         "D_TOTAL_PRESSURE_LOSS",
-                         "D_TOTAL_EFFICIENCY",
-                         "D_TOTAL_PRESSURE_LOSS",
-                         "D_KINETIC_ENERGY_LOSS",
-                         "D_TOTAL_STATIC_EFFICIENCY",
-                         "D_FLOW_ANGLE_OUT",
-                         "D_FLOW_ANGLE_IN",
-                         "D_MASS_FLOW_IN",
-                         "D_MASS_FLOW_OUT",
-                         "D_PRESSURE_RATIO",
-                         "D_ENTHALPY_OUT",
-                         "D_TOTAL_ENTHALPY_OUT",
-                         "D_SURFACE_UNIFORMITY",
-                         "D_SURFACE_SECONDARY",
-                         "D_SURFACE_MOM_DISTORTION",
-                         "D_SURFACE_SECOND_OVER_UNIFORM",
-                         "D_SURFACE_PRESSURE_DROP"]
-
-grad_names_map = ordered_bunch()
-grad_names_map.MASS_FLOW_IN = "D_MASS_FLOW_IN"
-grad_names_map.MOMENT_Z = "D_MOMENT_Z"
-grad_names_map.FLOW_ANGLE_OUT = "D_FLOW_ANGLE_OUT"
-grad_names_map.MASS_FLOW_OUT = "D_MASS_FLOW_OUT"
-grad_names_map.FLOW_ANGLE_IN = "D_FLOW_ANGLE_IN"
-grad_names_map.FORCE_Z = "D_FORCE_Z"
-grad_names_map.FORCE_Y = "D_FORCE_Y"
-grad_names_map.FORCE_X = "D_FORCE_X"
-grad_names_map.TOTAL_EFFICIENCY = "D_TOTAL_EFFICIENCY"
-grad_names_map.TOTAL_STATIC_EFFICIENCY = "D_TOTAL_STATIC_EFFICIENCY"
-grad_names_map.PRESSURE_RATIO = "D_PRESSURE_RATIO"
-grad_names_map.EFFICIENCY = "D_EFFICIENCY"
-grad_names_map.DRAG = "D_DRAG"
-grad_names_map.LIFT = "D_LIFT"
-grad_names_map.TOTAL_ENTHALPY_OUT = "D_TOTAL_ENTHALPY_OUT"
-grad_names_map.TOTAL_PRESSURE_LOSS = "D_TOTAL_PRESSURE_LOSS"
-grad_names_map.MOMENT_Y = "D_MOMENT_Y"
-grad_names_map.MOMENT_X="D_MOMENT_X"
-grad_names_map.SIDEFORCE = "D_SIDEFORCE"
-grad_names_map.ENTHALPY_OUT = "D_ENTHALPY_OUT"
-grad_names_map.KINETIC_ENERGY_LOSS = "D_KINETIC_ENERGY_LOSS"
-grad_names_map.CUSTOM_OBJFUNC = "D_CUSTOM_OBJFUNC"
-grad_names_map.HEAT = "D_HEAT"
-grad_names_map.MAX_HEAT = "D_MAX_HEAT"
-grad_names_map.SURFACE_UNIFORMITY = "D_SURFACE_UNIFORMITY"
-grad_names_map.SURFACE_SECONDARY = "D_SURFACE_SECONDARY"
-grad_names_map.SURFACE_MOM_DISTORTION = "D_SURFACE_MOM_DISTORTION"
-grad_names_map.SURFACE_SECOND_OVER_UNIFORM = "D_SURFACE_SECOND_OVER_UNIFORM"
-grad_names_map.SURFACE_PRESSURE_DROP = "D_SURFACE_PRESSURE_DROP"
-
 # per-surface functions
 per_surface_map = {"LIFT"       :   "CL" ,
                   "DRAG"        :   "CD" ,
@@ -518,14 +330,12 @@ def read_aerodynamics( History_filename , nZones = 1, special_cases=[], final_av
     # read the history data
     history_data = read_history(History_filename, nZones)
     
-    # list of functions to pull
-    func_names = optnames_aero + grad_names_directdiff + optnames_turbo
-
     # pull only these functions
     Func_Values = ordered_bunch()
-    for this_objfun in func_names:
+    for this_objfun in historyOutFields:
         if this_objfun in history_data:
-            Func_Values[this_objfun] = history_data[this_objfun] 
+            if historyOutFields[this_objfun]['TYPE'] == 'COEFFICIENT' or historyOutFields[this_objfun]['TYPE'] == 'D_COEFFICIENT':
+                Func_Values[this_objfun] = history_data[this_objfun] 
     
     # for unsteady cases, average time-accurate objective function values
     if 'TIME_MARCHING' in special_cases and not final_avg:
diff --git a/SU2_PY/SU2/opt/project.py b/SU2_PY/SU2/opt/project.py
index 5fc3246e2d54..72ae05579c7a 100644
--- a/SU2_PY/SU2/opt/project.py
+++ b/SU2_PY/SU2/opt/project.py
@@ -48,7 +48,7 @@
 from .. import eval as su2eval
 from .. import util as su2util
 from ..io import redirect_folder
-
+from ..io import historyOutFields
 from warnings import warn, simplefilter
 #simplefilter(Warning,'ignore')
 
@@ -133,6 +133,11 @@ def __init__( self, config, state=None ,
             config['OBJECTIVE_WEIGHT'] = ",".join(weights)
             config['OBJECTIVE_FUNCTION'] = ",".join(objectives)
         
+        for this_obj in def_objs:
+            group = historyOutFields[this_obj]['GROUP']
+            if not group in config.HISTORY_OUTPUT:
+                config.HISTORY_OUTPUT.append(group)
+
         # setup state
         if state is None:
             state = su2io.State()
diff --git a/SU2_PY/meson.build b/SU2_PY/meson.build
index fc5d7a5213ea..319fad083049 100644
--- a/SU2_PY/meson.build
+++ b/SU2_PY/meson.build
@@ -31,6 +31,7 @@ install_data(['SU2/io/config.py',
               'SU2/io/redirect.py',
               'SU2/io/state.py',
               'SU2/io/tools.py',
+              'SU2/io/historyMap.py',
               'SU2/io/__init__.py'], 
 	      install_dir: join_paths(get_option('bindir'), 'SU2/io'))
 
diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py
new file mode 100644
index 000000000000..0bed2643929e
--- /dev/null
+++ b/SU2_PY/updateHistoryMap.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python 
+
+## \file updateHistoryMap.py
+#  \brief Python script for updating the historyMap.py file.
+#  \author T. Albring
+#  \version 6.2.0 "Falcon"
+#
+# The current SU2 release has been coordinated by the
+# SU2 International Developers Society <www.su2devsociety.org>
+# with selected contributions from the open-source community.
+#
+# The main research teams contributing to the current release are:
+#  - Prof. Juan J. Alonso's group at Stanford University.
+#  - Prof. Piero Colonna's group at Delft University of Technology.
+#  - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
+#  - Prof. Alberto Guardone's group at Polytechnic University of Milan.
+#  - Prof. Rafael Palacios' group at Imperial College London.
+#  - Prof. Vincent Terrapon's group at the University of Liege.
+#  - Prof. Edwin van der Weide's group at the University of Twente.
+#  - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
+#
+# Copyright 2012-2019, Francisco D. Palacios, Thomas D. Economon,
+#                      Tim Albring, and the SU2 contributors.
+#
+# SU2 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, or (at your option) any later version.
+#
+# SU2 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+import os,sys, pprint
+
+su2_home = os.environ['SU2_HOME'] 
+
+fileList = ['CFlowOutput.cpp', 
+'CFlowIncOutput.cpp', 
+'CFlowCompOutput.cpp',
+'CHeatOutput.cpp',
+'CFlowCompFEMOutput.cpp',
+'CElasticityOutput.cpp',
+'CAdjHeatOutput.cpp',
+'CAdjFlowIncOutput.cpp',
+'CAdjFlowCompOutput.cpp',
+'CAdjElasticityOutput.cpp']
+
+fileList = [os.path.join(su2_home, 'SU2_CFD/src/output/' + i) for i in fileList]
+
+def parse_output(files):
+    outputFields = dict()
+
+    for file in files:
+        print('Parsing ' + file)
+        f = open(file,'r')
+        while(1):
+            s = f.readline().strip(' ')
+            if not s:
+                break
+            if s.startswith('AddHistoryOutput('):
+                s = s.replace('AddHistoryOutput', '').strip('()').split(',')
+                curOutputField = dict()
+                name = s[0].strip(' ()"\n;')
+                curOutputField['HEADER']  = s[1].strip(' ()"\n;')
+                curOutputField['GROUP']   = s[3].strip(' ()"\n;')
+                curOutputField['DESCRIPTION'] = s[4].strip(' ()"\n;')
+                if len(s) == 6:
+                    curOutputField['TYPE'] = s[5].strip(' ()"\n;').split('::')[1]
+                else:
+                    curOutputField['TYPE'] = 'DEFAULT'
+                outputFields[name] = curOutputField
+        f.close()
+
+    addedOutputFields = dict()
+
+    for field in outputFields:
+        if outputFields[field]['TYPE'] == 'COEFFICIENT':
+            curOutputField = dict()
+            name = 'D_' + field
+            curOutputField['HEADER'] = 'd[' + outputFields[field]['HEADER'] + ']'
+            curOutputField['GROUP'] = 'D_' + outputFields[field]['GROUP'] 
+            curOutputField['TYPE'] = 'D_COEFFICIENT'
+            curOutputField['DESCRIPTION'] = 'Derivative value'
+            addedOutputFields[name] = curOutputField
+
+    outputFields.update(addedOutputFields)
+    f = open(os.path.join(su2_home) + 'SU2_PY/SU2/io/historyMap.py', 'w')
+    f.write('history_header_map = ')
+    pprint.pprint(outputFields, f)
+    f.close()
+
+parse_output(fileList)
diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
index a418b7ce91e5..6a52f98bf92c 100644
--- a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
@@ -1,4 +1,4 @@
-VARIABLES="VARIABLE"      , "MASS_FLOW_IN"  , "MOMENT_Z"      , "FLOW_ANGLE_OUT", "MASS_FLOW_OUT" , "FLOW_ANGLE_IN" , "FORCE_Z"       , "FORCE_Y"       , "FORCE_X"       , "TOTAL_EFFICIENCY", "TOTAL_STATIC_EFFICIENCY", "PRESSURE_RATIO", "EFFICIENCY"    , "DRAG"          , "LIFT"          , "TOTAL_ENTHALPY_OUT", "TOTAL_PRESSURE_LOSS", "MOMENT_Y"      , "MOMENT_X"      , "SIDEFORCE"     , "ENTHALPY_OUT"  , "KINETIC_ENERGY_LOSS", "CUSTOM_OBJFUNC", "HEAT"          , "MAX_HEAT"      , "SURFACE_UNIFORMITY", "SURFACE_SECONDARY", "SURFACE_MOM_DISTORTION", "SURFACE_SECOND_OVER_UNIFORM", "SURFACE_PRESSURE_DROP"
-          0               , 0.0             , 1.248824622     , 0.0             , 0.0             , 0.0             , 0.0             , -1.446707472    , 0.2585308027    , 0.0             , 0.0                    , 0.0             , -114.8514349    , 0.2269095222    , -1.452003014    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          1               , 0.0             , 1.076816959     , 0.0             , 0.0             , 0.0             , 0.0             , -2.31689972     , 0.439484635     , 0.0             , 0.0                    , 0.0             , -191.0349825    , 0.3888371485    , -2.325935668    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          2               , 0.0             , 0.6472872764    , 0.0             , 0.0             , 0.0             , 0.0             , -3.05682473     , 0.5945724268    , 0.0             , 0.0                    , 0.0             , -256.155045     , 0.5277466546    , -3.069067817    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+VARIABLES="VARIABLE"      , "DRAG"          , "EFFICIENCY"    , "FORCE_X"       , "FORCE_Y"       , "FORCE_Z"       , "LIFT"          , "MOMENT_X"      , "MOMENT_Y"      , "MOMENT_Z"      , "SIDEFORCE"     
+          0               , 0.2269095222    , -114.8514349    , 0.2585308027    , -1.446707472    , 0.0             , -1.452003014    , 0.0             , 0.0             , 1.248824622     , 0.0             
+          1               , 0.3888371485    , -191.0349825    , 0.439484635     , -2.31689972     , 0.0             , -2.325935668    , 0.0             , 0.0             , 1.076816959     , 0.0             
+          2               , 0.5277466546    , -256.155045     , 0.5945724268    , -3.05682473     , 0.0             , -3.069067817    , 0.0             , 0.0             , 0.6472872764    , 0.0             
diff --git a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
index a4dc7015f6a8..462ee5c256f2 100644
--- a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
@@ -1,3 +1,3 @@
-VARIABLES="VARIABLE"      , "MASS_FLOW_IN"  , "MOMENT_Z"      , "FLOW_ANGLE_OUT", "MASS_FLOW_OUT" , "FLOW_ANGLE_IN" , "FORCE_Z"       , "FORCE_Y"       , "FORCE_X"       , "TOTAL_EFFICIENCY", "TOTAL_STATIC_EFFICIENCY", "PRESSURE_RATIO", "EFFICIENCY"    , "DRAG"          , "LIFT"          , "TOTAL_ENTHALPY_OUT", "TOTAL_PRESSURE_LOSS", "MOMENT_Y"      , "MOMENT_X"      , "SIDEFORCE"     , "ENTHALPY_OUT"  , "KINETIC_ENERGY_LOSS", "CUSTOM_OBJFUNC", "HEAT"          , "MAX_HEAT"      , "SURFACE_UNIFORMITY", "SURFACE_SECONDARY", "SURFACE_MOM_DISTORTION", "SURFACE_SECOND_OVER_UNIFORM", "SURFACE_PRESSURE_DROP"
-          0               , 0.0             , 0.001131098374  , 0.0             , 0.0             , 0.0             , 0.0             , 0.1441512641    , 0.05894794873   , 0.0             , 0.0                    , 0.0             , -0.539364673    , 0.06207856396   , 0.1428310173    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
-          1               , 0.0             , -0.01524801339  , 0.0             , 0.0             , 0.0             , 0.0             , 0.3151637036    , -0.08290702685  , 0.0             , 0.0                    , 0.0             , 10.48401316     , -0.07601203726  , 0.3168973105    , 0.0               , 0.0                , 0.0             , 0.0             , 0.0             , 0.0             , 0.0                , 0.0             , 0.0             , 0.0             , 0.0               , 0.0              , 0.0                   , 0.0                        , 0.0                  
+VARIABLES="VARIABLE"      , "DRAG"          , "EFFICIENCY"    , "FORCE_X"       , "FORCE_Y"       , "FORCE_Z"       , "LIFT"          , "MOMENT_X"      , "MOMENT_Y"      , "MOMENT_Z"      , "SIDEFORCE"     
+          0               , 0.06207856396   , -0.539364673    , 0.05894794873   , 0.1441512641    , 0.0             , 0.1428310173    , 0.0             , 0.0             , 0.001131098374  , 0.0             
+          1               , -0.07601203726  , 10.48401316     , -0.08290702685  , 0.3151637036    , 0.0             , 0.3168973105    , 0.0             , 0.0             , -0.01524801339  , 0.0             

From 96b8d5ffdcbe01088931044d59321e0c2caea399 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 1 Oct 2019 17:16:54 +0200
Subject: [PATCH 535/539] Added consistency check for direct diff python script

---
 SU2_PY/direct_differentiation.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SU2_PY/direct_differentiation.py b/SU2_PY/direct_differentiation.py
index e80f30bcc650..c51e30fc9daa 100755
--- a/SU2_PY/direct_differentiation.py
+++ b/SU2_PY/direct_differentiation.py
@@ -89,7 +89,17 @@ def direct_differentiation( filename           ,
     # State
     state = SU2.io.State()
     state.find_files(config)
+
+    foundDerivativeField = False
+    for fields in SU2.io.historyOutFields:
+        group = SU2.io.historyOutFields[fields]['GROUP']
+        if group in config.HISTORY_OUTPUT:
+            if SU2.io.historyOutFields[fields]['TYPE'] == 'D_COEFFICIENT':
+                foundDerivativeField = True
     
+    if not foundDerivativeField:
+        sys.exit('No derivative field found in HISTORY_OUTPUT')
+
     # Direct Differentiation Gradients
     SU2.eval.gradients.directdiff(config,state)
     

From 9937172a580ef5e0c4892ed1b3a6b1254b635b32 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Tue, 1 Oct 2019 17:17:33 +0200
Subject: [PATCH 536/539] Updated fixed cl test values

---
 TestCases/parallel_regression.py | 2 +-
 TestCases/serial_regression.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 96c65ae62e36..300ddd72a85f 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -101,7 +101,7 @@ def main():
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
     fixedCL_naca0012.test_iter = 10
-    fixedCL_naca0012.test_vals = [-13.118618, -7.594336, 0.300000, 0.019389] #last 4 columns
+    fixedCL_naca0012.test_vals = [-13.122966, -7.573235, 0.300000, 0.019389] #last 4 columns
     fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
     fixedCL_naca0012.timeout   = 1600
     fixedCL_naca0012.tol       = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index f9c71b17629d..c623a21cc42b 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -103,7 +103,7 @@ def main():
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
     fixedCL_naca0012.test_iter = 10
-    fixedCL_naca0012.test_vals = [-13.082182, -7.559617, 0.300000, 0.019389] #last 4 columns
+    fixedCL_naca0012.test_vals = [-13.124577, -7.586825, 0.300000, 0.019389] #last 4 columns
     fixedCL_naca0012.su2_exec  = "SU2_CFD"
     fixedCL_naca0012.new_output = True
     fixedCL_naca0012.timeout   = 1600

From e67de4a0c3dd9f0ca6d4c6ff4d7eb52054cb96b5 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 2 Oct 2019 10:31:58 +0200
Subject: [PATCH 537/539] Adapting test case values after merge with develop

---
 .../naca0012/of_grad_directdiff.dat.ref       |  6 ++--
 .../naca0012/inv_NACA0012_ContAdj.cfg         |  4 ++-
 .../naca0012/of_grad_directdiff.dat.ref       |  4 +--
 TestCases/parallel_regression.py              | 28 +++++++++----------
 TestCases/parallel_regression_AD.py           |  4 +--
 TestCases/serial_regression.py                | 26 ++++++++---------
 TestCases/serial_regression_AD.py             |  6 ++--
 7 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
index 6a52f98bf92c..ae821034f0f1 100644
--- a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref
@@ -1,4 +1,4 @@
 VARIABLES="VARIABLE"      , "DRAG"          , "EFFICIENCY"    , "FORCE_X"       , "FORCE_Y"       , "FORCE_Z"       , "LIFT"          , "MOMENT_X"      , "MOMENT_Y"      , "MOMENT_Z"      , "SIDEFORCE"     
-          0               , 0.2269095222    , -114.8514349    , 0.2585308027    , -1.446707472    , 0.0             , -1.452003014    , 0.0             , 0.0             , 1.248824622     , 0.0             
-          1               , 0.3888371485    , -191.0349825    , 0.439484635     , -2.31689972     , 0.0             , -2.325935668    , 0.0             , 0.0             , 1.076816959     , 0.0             
-          2               , 0.5277466546    , -256.155045     , 0.5945724268    , -3.05682473     , 0.0             , -3.069067817    , 0.0             , 0.0             , 0.6472872764    , 0.0             
+          0               , 0.2372492479    , -114.3125628    , 0.2709181595    , -1.540436284    , 0.0             , -1.54597975     , 0.0             , 0.0             , 1.213847013     , 0.0             
+          1               , 0.4025511296    , -185.8275927    , 0.45451385      , -2.377026434    , 0.0             , -2.386375933    , 0.0             , 0.0             , 1.049077447     , 0.0             
+          2               , 0.5395721612    , -245.7671599    , 0.6071179277    , -3.089692602    , 0.0             , -3.102201546    , 0.0             , 0.0             , 0.6299667538    , 0.0             
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index eed68dd71c3b..54615e658a60 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -23,13 +23,15 @@ MATH_PROBLEM= CONTINUOUS_ADJOINT
 RESTART_SOL= NO
 %
 % Write binary restart files (YES, NO)
-WRT_BINARY_RESTART= NO
+WRT_BINARY_RESTART= YES
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
 %
 % New singlezone driver
 SINGLEZONE_DRIVER=YES
+%
+OUTPUT_FILES= (RESTART_ASCII)
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
index 462ee5c256f2..9b26b8580cf2 100644
--- a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
+++ b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref
@@ -1,3 +1,3 @@
 VARIABLES="VARIABLE"      , "DRAG"          , "EFFICIENCY"    , "FORCE_X"       , "FORCE_Y"       , "FORCE_Z"       , "LIFT"          , "MOMENT_X"      , "MOMENT_Y"      , "MOMENT_Z"      , "SIDEFORCE"     
-          0               , 0.06207856396   , -0.539364673    , 0.05894794873   , 0.1441512641    , 0.0             , 0.1428310173    , 0.0             , 0.0             , 0.001131098374  , 0.0             
-          1               , -0.07601203726  , 10.48401316     , -0.08290702685  , 0.3151637036    , 0.0             , 0.3168973105    , 0.0             , 0.0             , -0.01524801339  , 0.0             
+          0               , 0.06235436973   , -0.3961427924   , 0.05921156151   , 0.1447130695    , 0.0             , 0.1433869383    , 0.0             , 0.0             , 0.002242588997  , 0.0             
+          1               , -0.07730334353  , 10.18344094     , -0.08433952825  , 0.3216204983    , 0.0             , 0.3233838184    , 0.0             , 0.0             , -0.01225607819  , 0.0             
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 5156a53635d0..ee9448831311 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -101,7 +101,7 @@ def main():
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
     fixedCL_naca0012.test_iter = 10
-    fixedCL_naca0012.test_vals = [-13.122966, -7.573235, 0.300000, 0.019389] #last 4 columns
+    fixedCL_naca0012.test_vals = [-4.054559, 1.470661, 0.300113, 0.019483] #last 4 columns
     fixedCL_naca0012.su2_exec  = "parallel_computation.py -f"
     fixedCL_naca0012.timeout   = 1600
     fixedCL_naca0012.tol       = 0.00001
@@ -563,7 +563,7 @@ def main():
     contadj_fixed_CL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     contadj_fixed_CL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
     contadj_fixed_CL_naca0012.test_iter = 100
-    contadj_fixed_CL_naca0012.test_vals = [0.378865, -5.157403, 0.268320, -0.000149] #last 4 columns
+    contadj_fixed_CL_naca0012.test_vals = [0.378722, -5.157473, 0.268300, -0.000151] #last 4 columns
     contadj_fixed_CL_naca0012.su2_exec  = "parallel_computation.py -f"
     contadj_fixed_CL_naca0012.timeout   = 1600
     contadj_fixed_CL_naca0012.tol       = 0.00001
@@ -919,7 +919,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 5
-    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631539] #last 4 columns
+    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631531] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -932,7 +932,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 2
-    channel_2D.test_vals = [2.000000, 0.000000, 0.400157, 0.352002, 0.407541] #last 4 columns
+    channel_2D.test_vals = [2.000000, 0.000000, 0.399698, 0.351908, 0.405704] #last 4 columns
     channel_2D.su2_exec  = "parallel_computation.py -f"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -945,7 +945,7 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 2
-    channel_3D.test_vals = [2.000000, 0.000000, 0.626497, 0.511330, 0.422653] #last 4 columns
+    channel_3D.test_vals = [2.000000, 0.000000, 0.624073, 0.502950, 0.417050] #last 4 columns
     channel_3D.su2_exec  = "parallel_computation.py -f"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
@@ -958,7 +958,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [0.112416, 0.486612, 0.617747, 0.950972, 1.018949] #last 4 columns
+    pipe.test_vals = [0.117226, 0.491935, 0.676389, 0.974442, 1.024041] #last 4 columns
     pipe.su2_exec  = "parallel_computation.py -f"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -971,7 +971,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.716123, 1.095620, 1.136616] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.754346, 1.111512, 1.194307] #last 4 columns
     rotating_cylinders.su2_exec  = "parallel_computation.py -f"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -984,7 +984,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208652, 1.128007] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.220915, 1.568306] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "parallel_computation.py -f"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1060,7 +1060,7 @@ def main():
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641483] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.801272, -4.123968] #last 4 columns
     fsi2d.su2_exec  = "parallel_computation_fsi.py -f"
     fsi2d.timeout   = 1600
     fsi2d.multizone= True
@@ -1073,7 +1073,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-3.307431, -4.955885, 4.1224e-08, 46.0000] #last 5 columns
+    stat_fsi.test_vals = [3.312222, -4.959311, 0.000000, 46.000000] #last 5 columns
     stat_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
@@ -1085,7 +1085,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [ -4.413916, -4.837043, 4.7367e-08, 64.0000] #last 5 columns
+    dyn_fsi.test_vals = [-4.389734, -4.060117, 0.000000, 64.000000] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
@@ -1098,7 +1098,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [-3.388879, -4.968790, 4.1230e-08, 46.00000] #last 5 columns
+    stat_fsi_restart.test_vals = [-3.422307, -4.212725, 0.000000, 46.000000] #last 5 columns
     stat_fsi_restart.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi_restart.multizone = True
     stat_fsi_restart.timeout   = 1600
@@ -1130,7 +1130,7 @@ def main():
     pywrapper_naca0012.cfg_dir   = "euler/naca0012"
     pywrapper_naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
     pywrapper_naca0012.test_iter = 100
-    pywrapper_naca0012.test_vals = [-7.123252, -6.535236, 0.333431, 0.021236] #last 4 columns
+    pywrapper_naca0012.test_vals = [ -6.078651, -5.482900, 0.334875, 0.022224] #last 4 columns
     pywrapper_naca0012.su2_exec  = "mpirun -np 2 SU2_CFD.py --parallel -f"
     pywrapper_naca0012.timeout   = 1600
     pywrapper_naca0012.tol       = 0.00001
@@ -1164,7 +1164,7 @@ def main():
     pywrapper_aeroelastic.cfg_dir   = "aeroelastic"
     pywrapper_aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
     pywrapper_aeroelastic.test_iter = 2
-    pywrapper_aeroelastic.test_vals = [0.081587, 0.033262, -0.001666, -0.000155] #last 4 columns
+    pywrapper_aeroelastic.test_vals = [0.078209, 0.036447, -0.001686, -0.000113] #last 4 columns
     pywrapper_aeroelastic.su2_exec  = "mpirun -np 2 SU2_CFD.py --parallel -f"
     pywrapper_aeroelastic.timeout   = 1600
     pywrapper_aeroelastic.tol       = 0.00001
diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
index 8bb1b5fcc278..c7debc389a0c 100644
--- a/TestCases/parallel_regression_AD.py
+++ b/TestCases/parallel_regression_AD.py
@@ -120,7 +120,7 @@ def main():
     discadj_incomp_NACA0012.cfg_dir   = "disc_adj_incomp_euler/naca0012"
     discadj_incomp_NACA0012.cfg_file  = "incomp_NACA0012_disc.cfg"
     discadj_incomp_NACA0012.test_iter = 20
-    discadj_incomp_NACA0012.test_vals = [20.000000, -3.595580, -2.549720, 0.000000] #last 4 columns
+    discadj_incomp_NACA0012.test_vals = [20.000000, -3.566362, -2.541739, 0.000000] #last 4 columns
     discadj_incomp_NACA0012.su2_exec  = "parallel_computation.py -f"
     discadj_incomp_NACA0012.timeout   = 1600
     discadj_incomp_NACA0012.tol       = 0.00001
@@ -208,7 +208,7 @@ def main():
     discadj_pitchingNACA0012.cfg_dir   = "disc_adj_euler/naca0012_pitching"
     discadj_pitchingNACA0012.cfg_file  = "inv_NACA0012_pitching.cfg"
     discadj_pitchingNACA0012.test_iter = 4
-    discadj_pitchingNACA0012.test_vals = [ -1.158032, -1.626499, -2.1372e-02, 4.9309e-05] #last 4 columns
+    discadj_pitchingNACA0012.test_vals = [-1.167347, -1.635137, -0.020862, 0.000050] #last 4 columns
     discadj_pitchingNACA0012.su2_exec  = "parallel_computation.py -f"
     discadj_pitchingNACA0012.timeout   = 1600
     discadj_pitchingNACA0012.tol       = 0.00001
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 7ba59627f28f..8c08d12f6344 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -103,7 +103,7 @@ def main():
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
     fixedCL_naca0012.test_iter = 10
-    fixedCL_naca0012.test_vals = [-13.124577, -7.586825, 0.300000, 0.019389] #last 4 columns
+    fixedCL_naca0012.test_vals = [-4.017851, 1.517860, 0.300231, 0.019491] #last 4 columns
     fixedCL_naca0012.su2_exec  = "SU2_CFD"
     fixedCL_naca0012.new_output = True
     fixedCL_naca0012.timeout   = 1600
@@ -600,7 +600,7 @@ def main():
     contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
     contadj_fixedCL_naca0012.test_iter = 100
-    contadj_fixedCL_naca0012.test_vals = [0.341038, -5.166613, 0.265510, -0.000322] #last 4 columns
+    contadj_fixedCL_naca0012.test_vals = [0.340935, -5.166616, 0.265490, -0.000323] #last 4 columns
     contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
     contadj_fixedCL_naca0012.new_output= True
     contadj_fixedCL_naca0012.timeout   = 1600
@@ -990,7 +990,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 2
-    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.253885] #last 4 columns
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.252668] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -1003,7 +1003,7 @@ def main():
     channel_2D.cfg_dir   = "sliding_interface/channel_2D"
     channel_2D.cfg_file  = "channel_2D_WA.cfg"
     channel_2D.test_iter = 2
-    channel_2D.test_vals = [2.000000, 0.000000, 0.400117, 0.352029, 0.407521] #last 4 columns
+    channel_2D.test_vals = [2.000000, 0.000000, 0.399677, 0.351915, 0.405680] #last 4 columns
     channel_2D.su2_exec  = "SU2_CFD"
     channel_2D.timeout   = 100
     channel_2D.tol       = 0.00001
@@ -1016,7 +1016,7 @@ def main():
     channel_3D.cfg_dir   = "sliding_interface/channel_3D"
     channel_3D.cfg_file  = "channel_3D_WA.cfg"
     channel_3D.test_iter = 1
-    channel_3D.test_vals = [1.000000, 0.000000, 0.649093, 0.797702, 0.718414] #last 5 columns
+    channel_3D.test_vals = [1.000000, 0.000000, 0.671143, 0.781742, 0.712844] #last 5 columns
     channel_3D.su2_exec  = "SU2_CFD"
     channel_3D.timeout   = 1600
     channel_3D.tol       = 0.00001
@@ -1029,7 +1029,7 @@ def main():
     pipe.cfg_dir   = "sliding_interface/pipe"
     pipe.cfg_file  = "pipe_NN.cfg"
     pipe.test_iter = 2
-    pipe.test_vals = [0.486616, 0.617750, 0.950973, 1.018949] #last 4 columns
+    pipe.test_vals = [0.491948, 0.676394, 0.974444, 1.024041] #last 4 columns
     pipe.su2_exec  = "SU2_CFD"
     pipe.timeout   = 1600
     pipe.tol       = 0.00001
@@ -1042,7 +1042,7 @@ def main():
     rotating_cylinders.cfg_dir   = "sliding_interface/rotating_cylinders"
     rotating_cylinders.cfg_file  = "rot_cylinders_WA.cfg"
     rotating_cylinders.test_iter = 3
-    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.716122, 1.095620, 1.136611] #last 4 columns
+    rotating_cylinders.test_vals = [3.000000, 0.000000, 0.754350, 1.111514, 1.194297] #last 4 columns
     rotating_cylinders.su2_exec  = "SU2_CFD"
     rotating_cylinders.timeout   = 1600
     rotating_cylinders.tol       = 0.00001
@@ -1055,7 +1055,7 @@ def main():
     supersonic_vortex_shedding.cfg_dir   = "sliding_interface/supersonic_vortex_shedding"
     supersonic_vortex_shedding.cfg_file  = "sup_vor_shed_WA.cfg"
     supersonic_vortex_shedding.test_iter = 5
-    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.208652, 1.128008] #last 4 columns
+    supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.220867, 1.568306] #last 4 columns
     supersonic_vortex_shedding.su2_exec  = "SU2_CFD"
     supersonic_vortex_shedding.timeout   = 1600
     supersonic_vortex_shedding.tol       = 0.00001
@@ -1144,7 +1144,7 @@ def main():
     fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     fsi2d.cfg_file  = "configFSI.cfg"
     fsi2d.test_iter = 4
-    fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641487] #last 4 columns
+    fsi2d.test_vals = [4.000000, 0.000000, -3.801272, -4.123970] #last 4 columns
     fsi2d.su2_exec  = "SU2_CFD"
     fsi2d.timeout   = 1600
     fsi2d.multizone = True
@@ -1157,7 +1157,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [-3.316390, -4.968266, 4.1223e-08, 47] #last 5 columns
+    stat_fsi.test_vals = [-3.322483, -4.978664, 0.000000, 47.000000] #last 5 columns
     stat_fsi.su2_exec  = "SU2_CFD"
     stat_fsi.timeout   = 1600
     stat_fsi.multizone = True
@@ -1169,7 +1169,7 @@ def main():
     stat_fsi_restart.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi_restart.cfg_file  = "config_restart.cfg"
     stat_fsi_restart.test_iter = 1
-    stat_fsi_restart.test_vals = [ -3.384533, -5.026176, 4.1231e-08, 47] #last 5 columns
+    stat_fsi_restart.test_vals = [-3.407098, -4.248366, 0.000000, 47.000000] #last 5 columns
     stat_fsi_restart.multizone = True
     stat_fsi_restart.su2_exec  = "SU2_CFD"
     stat_fsi_restart.timeout   = 1600
@@ -1181,7 +1181,7 @@ def main():
     dyn_fsi.cfg_dir   = "fea_fsi/dyn_fsi"
     dyn_fsi.cfg_file  = "config.cfg"
     dyn_fsi.test_iter = 4
-    dyn_fsi.test_vals = [ -4.413915, -4.837076, 4.7367e-08, 59] #last 5 columns
+    dyn_fsi.test_vals = [-4.389732, -4.060110, 0.000000, 59.000000] #last 5 columns
     dyn_fsi.multizone = True
     dyn_fsi.unsteady  = True
     dyn_fsi.su2_exec  = "SU2_CFD"
@@ -1194,7 +1194,7 @@ def main():
     airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
     airfoilRBF.cfg_file  = "config.cfg"
     airfoilRBF.test_iter = 0
-    airfoilRBF.test_vals = [0.000000, 1.442130, -2.231734] #last 4 columns
+    airfoilRBF.test_vals = [0.000000, 1.440246, -2.236518] #last 4 columns
     airfoilRBF.su2_exec  = "SU2_CFD"
     airfoilRBF.timeout   = 1600
     airfoilRBF.multizone = True
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
index 6df8aea3b223..bbe94ac14f5d 100644
--- a/TestCases/serial_regression_AD.py
+++ b/TestCases/serial_regression_AD.py
@@ -79,7 +79,7 @@ def main():
     discadj_arina2k.cfg_dir      = "disc_adj_euler/arina2k"
     discadj_arina2k.cfg_file     = "Arina2KRS.cfg"
     discadj_arina2k.test_iter    = 20
-    discadj_arina2k.test_vals    = [2.206814, 1.674391, 4.7250e+04, 0.0000e+00]#last 4 columns
+    discadj_arina2k.test_vals    = [2.244006, 1.701303, 47250.000000, 0.000000]#last 4 columns
     discadj_arina2k.su2_exec     = "SU2_CFD_AD"
     discadj_arina2k.timeout      = 8400
     discadj_arina2k.tol          = 0.00001
@@ -120,7 +120,7 @@ def main():
     discadj_incomp_NACA0012.cfg_dir   = "disc_adj_incomp_euler/naca0012"
     discadj_incomp_NACA0012.cfg_file  = "incomp_NACA0012_disc.cfg"
     discadj_incomp_NACA0012.test_iter = 20
-    discadj_incomp_NACA0012.test_vals = [20.000000, -3.633197, -2.544956, 0.000000] #last 4 columns
+    discadj_incomp_NACA0012.test_vals = [20.000000, -3.606555, -2.538181, 0.000000] #last 4 columns
     discadj_incomp_NACA0012.su2_exec  = "SU2_CFD_AD"
     discadj_incomp_NACA0012.timeout   = 1600
     discadj_incomp_NACA0012.tol       = 0.00001
@@ -208,7 +208,7 @@ def main():
     discadj_pitchingNACA0012.cfg_dir   = "disc_adj_euler/naca0012_pitching"
     discadj_pitchingNACA0012.cfg_file  = "inv_NACA0012_pitching.cfg"
     discadj_pitchingNACA0012.test_iter = 4
-    discadj_pitchingNACA0012.test_vals = [-1.161102, -1.630297, -2.1294e-02, 3.9226e-05] #last 4 columns
+    discadj_pitchingNACA0012.test_vals = [-1.170348, -1.639086, -0.020749, 0.000040] #last 4 columns
     discadj_pitchingNACA0012.su2_exec  = "SU2_CFD_AD"
     discadj_pitchingNACA0012.timeout   = 1600
     discadj_pitchingNACA0012.tol       = 0.00001

From e52d2a317c46e7bab9d4bc75bec5f6339f6cce0e Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 2 Oct 2019 11:29:29 +0200
Subject: [PATCH 538/539] Fixed unused import

---
 SU2_PY/updateHistoryMap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py
index 0bed2643929e..78c1c4369f99 100644
--- a/SU2_PY/updateHistoryMap.py
+++ b/SU2_PY/updateHistoryMap.py
@@ -34,7 +34,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with SU2. If not, see <http://www.gnu.org/licenses/>.
-import os,sys, pprint
+import os, pprint
 
 su2_home = os.environ['SU2_HOME'] 
 

From e5d724503dae89c76b6e69375f7cb250540fe755 Mon Sep 17 00:00:00 2001
From: Tim Albring <tim.albring@scicomp.uni-kl.de>
Date: Wed, 2 Oct 2019 12:34:11 +0200
Subject: [PATCH 539/539] Further update to test values

---
 .../cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg    |  3 ++-
 TestCases/parallel_regression.py                       | 10 +++++-----
 TestCases/serial_regression.py                         |  8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 3c5b89ef98dd..f03b97607dc6 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -29,7 +29,8 @@ NZONES= 1
 %
 % New single zone driver
 SINGLEZONE_DRIVER= YES
-
+%
+OUTPUT_FILES=(RESTART_ASCII)
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index ee9448831311..520867292dd0 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -919,7 +919,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 5
-    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631531] #last 4 columns
+    uniform_flow.test_vals = [5.000000, 0.000000, -0.188747, -10.631530] #last 4 columns
     uniform_flow.su2_exec  = "parallel_computation.py -f"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -1073,7 +1073,7 @@ def main():
     stat_fsi.cfg_dir   = "fea_fsi/stat_fsi"
     stat_fsi.cfg_file  = "config.cfg"
     stat_fsi.test_iter = 7
-    stat_fsi.test_vals = [3.312222, -4.959311, 0.000000, 46.000000] #last 5 columns
+    stat_fsi.test_vals = [-3.312222, -4.959311, 0.000000, 46.000000] #last 5 columns
     stat_fsi.su2_exec  = "mpirun -n 2 SU2_CFD"
     stat_fsi.multizone = True
     stat_fsi.timeout   = 1600
@@ -1130,7 +1130,7 @@ def main():
     pywrapper_naca0012.cfg_dir   = "euler/naca0012"
     pywrapper_naca0012.cfg_file  = "inv_NACA0012_Roe.cfg"
     pywrapper_naca0012.test_iter = 100
-    pywrapper_naca0012.test_vals = [ -6.078651, -5.482900, 0.334875, 0.022224] #last 4 columns
+    pywrapper_naca0012.test_vals = [-7.123252, -6.535236, 0.333431, 0.021236] #last 4 columns
     pywrapper_naca0012.su2_exec  = "mpirun -np 2 SU2_CFD.py --parallel -f"
     pywrapper_naca0012.timeout   = 1600
     pywrapper_naca0012.tol       = 0.00001
@@ -1164,7 +1164,7 @@ def main():
     pywrapper_aeroelastic.cfg_dir   = "aeroelastic"
     pywrapper_aeroelastic.cfg_file  = "aeroelastic_NACA64A010.cfg"
     pywrapper_aeroelastic.test_iter = 2
-    pywrapper_aeroelastic.test_vals = [0.078209, 0.036447, -0.001686, -0.000113] #last 4 columns
+    pywrapper_aeroelastic.test_vals = [0.081587, 0.033262, -0.001667, -0.000155] #last 4 columns
     pywrapper_aeroelastic.su2_exec  = "mpirun -np 2 SU2_CFD.py --parallel -f"
     pywrapper_aeroelastic.timeout   = 1600
     pywrapper_aeroelastic.tol       = 0.00001
@@ -1176,7 +1176,7 @@ def main():
     pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     pywrapper_fsi2d.cfg_file  = "configFSI.cfg"
     pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641483] #last 4 columns
+    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.801272, -4.123968] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "mpirun -np 2 SU2_CFD.py --nZone 2 --fsi True --parallel -f"
     pywrapper_fsi2d.timeout   = 1600
     pywrapper_fsi2d.unsteady  = True
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
index 8c08d12f6344..c2bb796f75ff 100644
--- a/TestCases/serial_regression.py
+++ b/TestCases/serial_regression.py
@@ -103,7 +103,7 @@ def main():
     fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     fixedCL_naca0012.cfg_file  = "inv_NACA0012.cfg"
     fixedCL_naca0012.test_iter = 10
-    fixedCL_naca0012.test_vals = [-4.017851, 1.517860, 0.300231, 0.019491] #last 4 columns
+    fixedCL_naca0012.test_vals = [-4.031390, 1.500719, 0.300135, 0.019485] #last 4 columns
     fixedCL_naca0012.su2_exec  = "SU2_CFD"
     fixedCL_naca0012.new_output = True
     fixedCL_naca0012.timeout   = 1600
@@ -600,7 +600,7 @@ def main():
     contadj_fixedCL_naca0012.cfg_dir   = "fixed_cl/naca0012"
     contadj_fixedCL_naca0012.cfg_file  = "inv_NACA0012_ContAdj.cfg"
     contadj_fixedCL_naca0012.test_iter = 100
-    contadj_fixedCL_naca0012.test_vals = [0.340935, -5.166616, 0.265490, -0.000323] #last 4 columns
+    contadj_fixedCL_naca0012.test_vals = [0.340921, -5.166616, 0.265490, -0.000324] #last 4 columns
     contadj_fixedCL_naca0012.su2_exec  = "SU2_CFD"
     contadj_fixedCL_naca0012.new_output= True
     contadj_fixedCL_naca0012.timeout   = 1600
@@ -990,7 +990,7 @@ def main():
     uniform_flow.cfg_dir   = "sliding_interface/uniform_flow"
     uniform_flow.cfg_file  = "uniform_NN.cfg"
     uniform_flow.test_iter = 2
-    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.252668] #last 4 columns
+    uniform_flow.test_vals = [2.000000, 0.000000, -0.205134, -13.254849] #last 4 columns
     uniform_flow.su2_exec  = "SU2_CFD"
     uniform_flow.timeout   = 1600
     uniform_flow.tol       = 0.000001
@@ -1637,7 +1637,7 @@ def main():
     pywrapper_fsi2d.cfg_dir   = "fea_fsi/WallChannel_2d"
     pywrapper_fsi2d.cfg_file  = "configFSI.cfg"
     pywrapper_fsi2d.test_iter = 4
-    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.822809, -4.641487] #last 4 columns
+    pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.801272, -4.123970] #last 4 columns
     pywrapper_fsi2d.su2_exec  = "SU2_CFD.py --nZone 2 --fsi True -f"
     pywrapper_fsi2d.new_output  = True
     pywrapper_fsi2d.unsteady  = True